1 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/optimistic_locking.rb b/lib/gitlab/optimistic_locking.rb
index 7668c518bc5..17010d73c57 100644
--- a/lib/gitlab/optimistic_locking.rb
+++ b/lib/gitlab/optimistic_locking.rb
@@ -1,10 +1,12 @@
 module Gitlab
-  module OptimisticLocking
-    def retry_lock(subject, &block)
-      while true do
+  class OptimisticLocking
+    def self.retry_lock(subject, &block)
+      loop do
         begin
-          return yield subject
-        rescue StaleObjectError
+          subject.transaction do
+            return block.call(subject)
+          end
+        rescue ActiveRecord::StaleObjectError
           subject.reload
         end
       end