diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-20 09:11:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-20 09:11:03 +0300 |
| commit | 0c51dc19cb6b2a6d9919b129bc6231e3fc1f0bb2 (patch) | |
| tree | 77ea819381f0b98a25b5b3f457b5762dfca81e3f /app/models/shard.rb | |
| parent | a7c6b8d26986b253c5fbe1db1e16ef8d0223093f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/shard.rb')
| -rw-r--r-- | app/models/shard.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/shard.rb b/app/models/shard.rb index 335a279c6aa..9f0039d8bf9 100644 --- a/app/models/shard.rb +++ b/app/models/shard.rb @@ -18,10 +18,6 @@ class Shard < ApplicationRecord end def self.by_name(name) - transaction(requires_new: true) do - find_or_create_by(name: name) - end - rescue ActiveRecord::RecordNotUnique - retry + safe_find_or_create_by(name: name) end end |