From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Aug 2021 09:08:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d339ac67810..b95b7fad5a0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -230,7 +230,7 @@ RSpec.configure do |config| # We can't use an `around` hook here because the wrapping transaction # is not yet opened at the time that is triggered config.prepend_before do - Gitlab::Database.set_open_transactions_baseline + Gitlab::Database.main.set_open_transactions_baseline end config.append_before do @@ -238,7 +238,7 @@ RSpec.configure do |config| end config.append_after do - Gitlab::Database.reset_open_transactions_baseline + Gitlab::Database.main.reset_open_transactions_baseline end config.before do |example| -- cgit v1.2.3