diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-23 20:19:28 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-23 20:19:28 +0300 |
| commit | 170fef0bd34a853bc2499cc7335705f73bc98edb (patch) | |
| tree | f7af5116b41b7d697f9ac783bc647aba0d2902ab /lib/gitlab/optimistic_locking.rb | |
| parent | 6a39888344a2478db022fdf8b5e41fd7625d83ab (diff) | |
| parent | ade5e0b1ba04047c72cb0aff3d635a2cdaaab43c (diff) | |
Merge branch 'dm-meer-blauw-op-straat' into 'master'
Enable (and disable) more RuboCops
See merge request !9432
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 8c47c807bf9..962ff4d3985 100644 --- a/lib/gitlab/optimistic_locking.rb +++ b/lib/gitlab/optimistic_locking.rb @@ -6,7 +6,7 @@ module Gitlab loop do begin ActiveRecord::Base.transaction do - return block.call(subject) + return yield(subject) end rescue ActiveRecord::StaleObjectError retries -= 1 |