diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-09-03 16:48:17 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-09-03 16:48:17 +0300 |
| commit | 1068ec2e9201af3de1fc5ebe9c8d9f7953c89b51 (patch) | |
| tree | 9734388ce494150076f3ee089506365e451f6b60 /spec/helpers | |
| parent | 1cb0fa18dfa781b754e3fd0eb2f24d6f603e16f4 (diff) | |
| parent | 19ff9d9899a9f1a69ca4cd9df357c7a9716edcbb (diff) | |
Merge branch '66741-remove-spec-rails_helper-rb' into 'master'
Remove spec/rails_helper.rb
Closes #66741
See merge request gitlab-org/gitlab-ce!32380
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/avatars_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/commits_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/form_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/import_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/page_layout_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/profiles_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/users_helper_spec.rb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/spec/helpers/avatars_helper_spec.rb b/spec/helpers/avatars_helper_spec.rb index 6fbb6147d84..9330e75af11 100644 --- a/spec/helpers/avatars_helper_spec.rb +++ b/spec/helpers/avatars_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe AvatarsHelper do include UploadHelpers diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb index 824b3ab4fc1..9e53bc05a48 100644 --- a/spec/helpers/commits_helper_spec.rb +++ b/spec/helpers/commits_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe CommitsHelper do describe 'commit_author_link' do diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb index 18cf0031d5f..a70d8333f30 100644 --- a/spec/helpers/form_helper_spec.rb +++ b/spec/helpers/form_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe FormHelper do describe 'form_errors' do diff --git a/spec/helpers/import_helper_spec.rb b/spec/helpers/import_helper_spec.rb index 6e8c13db9fe..8a1b1e859b1 100644 --- a/spec/helpers/import_helper_spec.rb +++ b/spec/helpers/import_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe ImportHelper do describe '#sanitize_project_name' do diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb index bf50763d06f..3b08fc511a3 100644 --- a/spec/helpers/page_layout_helper_spec.rb +++ b/spec/helpers/page_layout_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe PageLayoutHelper do describe 'page_description' do diff --git a/spec/helpers/profiles_helper_spec.rb b/spec/helpers/profiles_helper_spec.rb index 8e336469c27..da2dc229c35 100644 --- a/spec/helpers/profiles_helper_spec.rb +++ b/spec/helpers/profiles_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe ProfilesHelper do describe '#commit_email_select_options' do diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index a6623bc7941..9165e91ddcd 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' describe UsersHelper do include TermsHelper |