Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-24 18:10:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-24 18:10:36 +0300
commit234dc40a12a1cdaef0cdb825ca4acc3f271c6394 (patch)
treefb9875dca8b558acafa54c36a591b4d2ed10fc49 /app/models/concerns/cache_markdown_field.rb
parentc7864d3d50b4002c621c7cba2e1ebfb5d23ac7ed (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/cache_markdown_field.rb')
-rw-r--r--app/models/concerns/cache_markdown_field.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/cache_markdown_field.rb b/app/models/concerns/cache_markdown_field.rb
index 44d9beff27e..3753a14ad40 100644
--- a/app/models/concerns/cache_markdown_field.rb
+++ b/app/models/concerns/cache_markdown_field.rb
@@ -171,7 +171,7 @@ module CacheMarkdownField
# One retry is enough as next time `model_user_mention` should return the existing mention record,
# that threw the `ActiveRecord::RecordNotUnique` exception in first place.
- self.class.safe_ensure_unique(retries: 1) do
+ self.class.safe_ensure_unique(retries: 1) do # rubocop:disable Performance/ActiveRecordSubtransactionMethods
user_mention = model_user_mention
# this may happen due to notes polymorphism, so noteable_id may point to a record