diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:54 +0000 |
| commit | f697dc5e76dfc5894df006d53b2b7e751653cf05 (patch) | |
| tree | 1387cd225039e611f3683f96b318bb17d4c422cb /spec/controllers/application_controller_spec.rb | |
| parent | 874ead9c3a50de4c4ca4551eaf5b7eb976d26b50 (diff) | |
| download | gitlab-ce-f697dc5e76dfc5894df006d53b2b7e751653cf05.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
| -rw-r--r-- | spec/controllers/application_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 4a3d591e94d..2a913069acc 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -748,7 +748,7 @@ describe ApplicationController do end end - describe '#current_user_mode', :do_not_mock_admin_mode do + describe '#current_user_mode' do include_context 'custom session' controller(described_class) do |