diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-27 06:11:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-27 06:11:36 +0300 |
| commit | 1f7ce4357df88bed6394d3ba91a7ecd90c244486 (patch) | |
| tree | 9227d482e7f96aff91d1c09056830c53dfff2900 /app/models/note.rb | |
| parent | f938050604aff3e141193dcd203d14c5fe2aa9fb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index a8f5c305d9b..2defa1d1ca5 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -149,7 +149,7 @@ class Note < ApplicationRecord scope :like_note_or_capitalized_note, ->(text) { where('(note LIKE ? OR note LIKE ?)', text, text.capitalize) } before_validation :nullify_blank_type, :nullify_blank_line_code - after_save :keep_around_commit, if: :for_project_noteable?, unless: :importing? + after_save :keep_around_commit, if: :for_project_noteable?, unless: -> { importing? || skip_keep_around_commits } after_save :expire_etag_cache, unless: :importing? after_save :touch_noteable, unless: :importing? after_destroy :expire_etag_cache |