From 6889196116140577e2bce62be0a7784dbfa6e4ff Mon Sep 17 00:00:00 2001
From: Sean Carroll <scarroll@gitlab.com>
Date: Mon, 2 Sep 2019 10:44:52 +0200
Subject: Backport EE issue 12996

---
 lib/gitlab/optimistic_locking.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/optimistic_locking.rb b/lib/gitlab/optimistic_locking.rb
index 0c0f46d3b77..d51d718c826 100644
--- a/lib/gitlab/optimistic_locking.rb
+++ b/lib/gitlab/optimistic_locking.rb
@@ -4,7 +4,8 @@ module Gitlab
   module OptimisticLocking
     module_function
 
-    def retry_lock(subject, retries = 100, &block)
+    def retry_lock(subject, retries = nil, &block)
+      retries ||= 100
       # TODO(Observability): We should be recording details of the number of retries and the duration of the total execution here
       ActiveRecord::Base.transaction do
         yield(subject)
-- 
cgit v1.2.1