diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /lib/gitlab/optimistic_locking.rb | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'lib/gitlab/optimistic_locking.rb')
-rw-r--r-- | lib/gitlab/optimistic_locking.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/optimistic_locking.rb b/lib/gitlab/optimistic_locking.rb index b5e304599ab..9f39b5f122f 100644 --- a/lib/gitlab/optimistic_locking.rb +++ b/lib/gitlab/optimistic_locking.rb @@ -11,7 +11,7 @@ module Gitlab retry_attempts = 0 begin - ActiveRecord::Base.transaction do # rubocop: disable Database/MultipleDatabases + subject.transaction do yield(subject) end rescue ActiveRecord::StaleObjectError |