Merge branch 'ab/optimistic-locking-txn' into 'master'

Use transaction on model instead of connection

See merge request gitlab-org/gitlab!68633

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