diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 15:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 15:09:05 +0300 |
commit | ab8eecd62cc11a31568b25304f5fd31c8b7f437f (patch) | |
tree | b73b765c3cea414112840fd8041c62f886d8ce53 /app/mailers/previews/notify_preview.rb | |
parent | 00a889ea7a115ebbda95a071dd630f93b79261e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/previews/notify_preview.rb')
-rw-r--r-- | app/mailers/previews/notify_preview.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index ceeb178e9c2..13b24e099c9 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 + ActiveRecord::Base.transaction do # rubocop: disable Database/MultipleDatabases email = yield raise ActiveRecord::Rollback end |