diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:00 +0300 |
commit | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch) | |
tree | d572a6d931152ae0dd10427237f5811893438552 /spec/controllers | |
parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/application_settings_controller_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb index 66deb2359db..05c4743ed7f 100644 --- a/spec/controllers/admin/application_settings_controller_spec.rb +++ b/spec/controllers/admin/application_settings_controller_spec.rb @@ -16,6 +16,7 @@ describe Admin::ApplicationSettingsController do describe 'GET #usage_data with no access' do before do + allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) sign_in(user) end @@ -28,6 +29,7 @@ describe Admin::ApplicationSettingsController do describe 'GET #usage_data' do before do + allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) sign_in(admin) end |