diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-09-03 13:48:17 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-09-03 13:48:17 +0000 |
| commit | 1068ec2e9201af3de1fc5ebe9c8d9f7953c89b51 (patch) | |
| tree | 9734388ce494150076f3ee089506365e451f6b60 /spec/controllers | |
| parent | 1cb0fa18dfa781b754e3fd0eb2f24d6f603e16f4 (diff) | |
| parent | 19ff9d9899a9f1a69ca4cd9df357c7a9716edcbb (diff) | |
| download | gitlab-ce-1068ec2e9201af3de1fc5ebe9c8d9f7953c89b51.tar.gz | |
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/controllers')
| -rw-r--r-- | spec/controllers/projects/blob_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/sent_notifications_controller_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 45aebd1554c..17964c78e8d 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require 'spec_helper' describe Projects::BlobController do include ProjectForksHelper diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb index 89857a9d21b..fafcd6927cd 100644 --- a/spec/controllers/sent_notifications_controller_spec.rb +++ b/spec/controllers/sent_notifications_controller_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'rails_helper' +require 'spec_helper' describe SentNotificationsController do let(:user) { create(:user) } |