diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 06:07:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 06:07:19 +0300 |
commit | 0c437c3e2fc1a7def9334fad6d9476e4e7c4af9a (patch) | |
tree | 5efc8046fe617f04b57d91dcd42b88a8f0b7cf7b | |
parent | 012e59c2afa2d5ae8842abc788e399fe3541fb82 (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | spec/factories_spec.rb | 2 | ||||
-rw-r--r-- | spec/fast_spec_helper.rb | 2 | ||||
-rw-r--r-- | spec/rake_helper.rb | 2 | ||||
-rw-r--r-- | spec/simplecov_env.rb | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb index 66b71d0f556..aa72a116be2 100644 --- a/spec/factories_spec.rb +++ b/spec/factories_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'factories' do diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index a7810d72671..3fe3f9ff9a9 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'bundler/setup' ENV['GITLAB_ENV'] = 'test' diff --git a/spec/rake_helper.rb b/spec/rake_helper.rb index 298a520f5ca..77fece5842d 100644 --- a/spec/rake_helper.rb +++ b/spec/rake_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require 'rake' diff --git a/spec/simplecov_env.rb b/spec/simplecov_env.rb index 82236bb4201..c5b8a6db605 100644 --- a/spec/simplecov_env.rb +++ b/spec/simplecov_env.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'simplecov' require 'active_support/core_ext/numeric/time' require_relative '../lib/gitlab/utils' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2142a43177a..bf87c078ac6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require './spec/simplecov_env' SimpleCovEnv.start! |