diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/spec_helper.rb | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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| |