diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-21 00:06:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-21 00:06:17 +0300 |
commit | 886c682334a62391c885d4b7ebd8b73d766f764b (patch) | |
tree | 94d59dd1240da7f88a2f15dbd989573aa337b5cd /spec | |
parent | 5fe23e59a703eb3531d42b6dfdebaf51521dd969 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/initializers/6_validations_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/action_mailer_hooks_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/asset_proxy_setting_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/attr_encrypted_no_db_connection_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/direct_upload_support_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/doorkeeper_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/fog_google_https_private_urls_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/rest-client-hostname_override_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/secret_token_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/settings_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/trusted_proxies_spec.rb | 2 | ||||
-rw-r--r-- | spec/initializers/zz_metrics_spec.rb | 2 |
12 files changed, 24 insertions, 0 deletions
diff --git a/spec/initializers/6_validations_spec.rb b/spec/initializers/6_validations_spec.rb index 73fbd4c7a44..248f967311b 100644 --- a/spec/initializers/6_validations_spec.rb +++ b/spec/initializers/6_validations_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require_relative '../../config/initializers/6_validations.rb' diff --git a/spec/initializers/action_mailer_hooks_spec.rb b/spec/initializers/action_mailer_hooks_spec.rb index 3826ed9b00a..ce6e1ed0fa2 100644 --- a/spec/initializers/action_mailer_hooks_spec.rb +++ b/spec/initializers/action_mailer_hooks_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'ActionMailer hooks' do diff --git a/spec/initializers/asset_proxy_setting_spec.rb b/spec/initializers/asset_proxy_setting_spec.rb index 42e4d4aa594..7eab5de155b 100644 --- a/spec/initializers/asset_proxy_setting_spec.rb +++ b/spec/initializers/asset_proxy_setting_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'Asset proxy settings initialization' do diff --git a/spec/initializers/attr_encrypted_no_db_connection_spec.rb b/spec/initializers/attr_encrypted_no_db_connection_spec.rb index 2da9f1cbd96..14e0e1f2167 100644 --- a/spec/initializers/attr_encrypted_no_db_connection_spec.rb +++ b/spec/initializers/attr_encrypted_no_db_connection_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'GitLab monkey-patches to AttrEncrypted' do diff --git a/spec/initializers/direct_upload_support_spec.rb b/spec/initializers/direct_upload_support_spec.rb index e51d404e030..4b3fe871cef 100644 --- a/spec/initializers/direct_upload_support_spec.rb +++ b/spec/initializers/direct_upload_support_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'Direct upload support' do diff --git a/spec/initializers/doorkeeper_spec.rb b/spec/initializers/doorkeeper_spec.rb index 1a78196e33d..47c196cb3a3 100644 --- a/spec/initializers/doorkeeper_spec.rb +++ b/spec/initializers/doorkeeper_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require_relative '../../config/initializers/doorkeeper' diff --git a/spec/initializers/fog_google_https_private_urls_spec.rb b/spec/initializers/fog_google_https_private_urls_spec.rb index 08346b71fee..8a0d7ad8f15 100644 --- a/spec/initializers/fog_google_https_private_urls_spec.rb +++ b/spec/initializers/fog_google_https_private_urls_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'Fog::Storage::GoogleXML::File', :fog_requests do diff --git a/spec/initializers/rest-client-hostname_override_spec.rb b/spec/initializers/rest-client-hostname_override_spec.rb index 3707e001d41..90a0305c9a9 100644 --- a/spec/initializers/rest-client-hostname_override_spec.rb +++ b/spec/initializers/rest-client-hostname_override_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'rest-client dns rebinding protection' do diff --git a/spec/initializers/secret_token_spec.rb b/spec/initializers/secret_token_spec.rb index 726ce07a2d1..c29f46e7779 100644 --- a/spec/initializers/secret_token_spec.rb +++ b/spec/initializers/secret_token_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require_relative '../../config/initializers/01_secret_token' diff --git a/spec/initializers/settings_spec.rb b/spec/initializers/settings_spec.rb index 57f5adbbc40..6cb45b4c86b 100644 --- a/spec/initializers/settings_spec.rb +++ b/spec/initializers/settings_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require_relative '../../config/initializers/1_settings' unless defined?(Settings) diff --git a/spec/initializers/trusted_proxies_spec.rb b/spec/initializers/trusted_proxies_spec.rb index 02a9446ad7b..a2bd0ff9f1c 100644 --- a/spec/initializers/trusted_proxies_spec.rb +++ b/spec/initializers/trusted_proxies_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'trusted_proxies' do diff --git a/spec/initializers/zz_metrics_spec.rb b/spec/initializers/zz_metrics_spec.rb index 3eaccfe8d8b..b9a1919ceae 100644 --- a/spec/initializers/zz_metrics_spec.rb +++ b/spec/initializers/zz_metrics_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'instrument_classes' do |