diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 18:09:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 18:09:48 +0300 |
commit | f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d (patch) | |
tree | 7ae3da76e824c435167dd108721c0124ad2ee484 /spec/controllers | |
parent | 2dedd78ef505a0ab0a379c7340a3fcba56ada663 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/sessions_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/repositories/git_http_controller_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/admin/sessions_controller_spec.rb b/spec/controllers/admin/sessions_controller_spec.rb index 5fa7a7f278d..dc1bed63850 100644 --- a/spec/controllers/admin/sessions_controller_spec.rb +++ b/spec/controllers/admin/sessions_controller_spec.rb @@ -179,7 +179,7 @@ RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do context 'on a read-only instance' do before do - allow(Gitlab::Database).to receive(:read_only?).and_return(true) + allow(Gitlab::Database.main).to receive(:read_only?).and_return(true) end it 'does not attempt to write to the database with valid otp' do diff --git a/spec/controllers/repositories/git_http_controller_spec.rb b/spec/controllers/repositories/git_http_controller_spec.rb index 04d5008cb34..f80f5956c43 100644 --- a/spec/controllers/repositories/git_http_controller_spec.rb +++ b/spec/controllers/repositories/git_http_controller_spec.rb @@ -24,7 +24,7 @@ RSpec.describe Repositories::GitHttpController do context 'on a read-only instance' do before do - allow(Gitlab::Database).to receive(:read_only?).and_return(true) + allow(Gitlab::Database.main).to receive(:read_only?).and_return(true) end it 'does not update project statistics' do |