From edaa33dee2ff2f7ea3fac488d41558eb5f86d68c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Jan 2022 09:16:11 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-7-stable-ee

---
 app/mailers/previews/notify_preview.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/mailers')

diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index 13b24e099c9..8e30eeee73f 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -246,7 +246,7 @@ class NotifyPreview < ActionMailer::Preview
   def cleanup
     email = nil
 
-    ActiveRecord::Base.transaction do # rubocop: disable Database/MultipleDatabases
+    ApplicationRecord.transaction do
       email = yield
       raise ActiveRecord::Rollback
     end
-- 
cgit v1.2.1