From bd860c22f6a4b9473cbddd34a53eead8235a7ea1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Sep 2019 12:06:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/container_registry/client_spec.rb | 1 - spec/lib/gitlab/encoding_helper_spec.rb | 1 - spec/lib/gitlab/git/blame_spec.rb | 1 - spec/lib/gitlab/git/blob_spec.rb | 2 -- spec/lib/gitlab/git/conflict/file_spec.rb | 1 - spec/lib/gitlab/git/repository_spec.rb | 1 - spec/lib/gitlab/git_spec.rb | 1 - spec/lib/gitlab/json_logger_spec.rb | 1 - spec/lib/gitlab/path_regex_spec.rb | 1 - spec/lib/gitlab/project_search_results_spec.rb | 1 - spec/lib/gitlab/regex_spec.rb | 1 - spec/lib/gitlab/search/found_blob_spec.rb | 1 - spec/lib/gitlab/url_blocker_spec.rb | 1 - 13 files changed, 14 deletions(-) (limited to 'spec/lib') diff --git a/spec/lib/container_registry/client_spec.rb b/spec/lib/container_registry/client_spec.rb index bc5fddd12ba..6c2b338bfcd 100644 --- a/spec/lib/container_registry/client_spec.rb +++ b/spec/lib/container_registry/client_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' diff --git a/spec/lib/gitlab/encoding_helper_spec.rb b/spec/lib/gitlab/encoding_helper_spec.rb index b24b71522ec..fc08719fb33 100644 --- a/spec/lib/gitlab/encoding_helper_spec.rb +++ b/spec/lib/gitlab/encoding_helper_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require "spec_helper" 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 diff --git a/spec/lib/gitlab/git_spec.rb b/spec/lib/gitlab/git_spec.rb index 6515be85ae3..505bc470644 100644 --- a/spec/lib/gitlab/git_spec.rb +++ b/spec/lib/gitlab/git_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 require 'spec_helper' describe Gitlab::Git do diff --git a/spec/lib/gitlab/json_logger_spec.rb b/spec/lib/gitlab/json_logger_spec.rb index d3d9fe9948a..3d4f9b5db86 100644 --- a/spec/lib/gitlab/json_logger_spec.rb +++ b/spec/lib/gitlab/json_logger_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 require 'spec_helper' describe Gitlab::JsonLogger do diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb index 7dcdad7ff92..0829a2b4334 100644 --- a/spec/lib/gitlab/path_regex_spec.rb +++ b/spec/lib/gitlab/path_regex_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' diff --git a/spec/lib/gitlab/project_search_results_spec.rb b/spec/lib/gitlab/project_search_results_spec.rb index e0b9581c75c..d6e50c672e6 100644 --- a/spec/lib/gitlab/project_search_results_spec.rb +++ b/spec/lib/gitlab/project_search_results_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb index e19210d8fbf..3036e3a9754 100644 --- a/spec/lib/gitlab/regex_spec.rb +++ b/spec/lib/gitlab/regex_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' diff --git a/spec/lib/gitlab/search/found_blob_spec.rb b/spec/lib/gitlab/search/found_blob_spec.rb index 3496fb29836..a575f6e2f11 100644 --- a/spec/lib/gitlab/search/found_blob_spec.rb +++ b/spec/lib/gitlab/search/found_blob_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' diff --git a/spec/lib/gitlab/url_blocker_spec.rb b/spec/lib/gitlab/url_blocker_spec.rb index 6ce002ad70e..0e66e959b24 100644 --- a/spec/lib/gitlab/url_blocker_spec.rb +++ b/spec/lib/gitlab/url_blocker_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' -- cgit v1.2.3