diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 15:06:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 15:06:48 +0300 |
| commit | bd860c22f6a4b9473cbddd34a53eead8235a7ea1 (patch) | |
| tree | 3f955a56c2ac90497863da26902a42dba49f3466 /spec/lib/gitlab/git | |
| parent | e567b4c2df7dc4085d213db029eff6b6fcde0152 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/git')
| -rw-r--r-- | spec/lib/gitlab/git/blame_spec.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/blob_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/conflict/file_spec.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/spec/lib/gitlab/git/blame_spec.rb b/spec/lib/gitlab/git/blame_spec.rb index 0010c0304eb..ac085e2c266 100644 --- a/spec/lib/gitlab/git/blame_spec.rb +++ b/spec/lib/gitlab/git/blame_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 require "spec_helper" describe Gitlab::Git::Blame, :seed_helper do diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb index 1c24244c3a6..7f680071969 100644 --- a/spec/lib/gitlab/git/blob_spec.rb +++ b/spec/lib/gitlab/git/blob_spec.rb @@ -1,5 +1,3 @@ -# encoding: utf-8 - require "spec_helper" describe Gitlab::Git::Blob, :seed_helper do diff --git a/spec/lib/gitlab/git/conflict/file_spec.rb b/spec/lib/gitlab/git/conflict/file_spec.rb index afed6c32af6..a6cabd4966a 100644 --- a/spec/lib/gitlab/git/conflict/file_spec.rb +++ b/spec/lib/gitlab/git/conflict/file_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 require 'spec_helper' describe Gitlab::Git::Conflict::File do diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index dccd50bc472..e455c4c99ab 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 require "spec_helper" describe Gitlab::Git::Repository, :seed_helper do |