Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 7 insertions, 3 deletions

diff --git a/spec/support/database/prevent_cross_database_modification.rb b/spec/support/database/prevent_cross_database_modification.rb
index c509aecf9b8..759e8316cc5 100644
--- a/spec/support/database/prevent_cross_database_modification.rb
+++ b/spec/support/database/prevent_cross_database_modification.rb
@@ -14,18 +14,22 @@ RSpec.configure do |config|
   # By default allow cross-modifications as we want to observe only transactions
   # within a specific block of execution which is defined be `before(:each)` and `after(:each)`
   config.before(:all) do
-    ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.suppress = true
+    ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.suppress_in_rspec = true
   end
 
   # Using before and after blocks because the around block causes problems with the let_it_be
   # record creations. It makes an extra savepoint which breaks the transaction count logic.
   config.before do |example_file|
-    ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.suppress =
+    ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.suppress_in_rspec =
       CROSS_DB_MODIFICATION_ALLOW_LIST.include?(example_file.file_path_rerun_argument)
   end
 
   # Reset after execution to preferred state
   config.after do |example_file|
-    ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.suppress = true
+    ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.suppress_in_rspec = true
+
+    [::ApplicationRecord, ::Ci::ApplicationRecord].each do |base_class|
+      base_class.gitlab_transactions_stack.clear if base_class.respond_to?(:gitlab_transactions_stack)
+    end
   end
 end