diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 18:11:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 18:11:23 +0300 |
| commit | 8d3aee3636da5181ae94d23b47c6794b5610ab01 (patch) | |
| tree | 73236b3e4b5d103c926df08449b2071ec19e4d18 /app/models/note.rb | |
| parent | 98420be3dddf5a093c39d96a8ca109aa21d0eaf8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 4e3700f3eaa..f5f6ecf6336 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -155,9 +155,9 @@ class Note < ApplicationRecord after_initialize :ensure_discussion_id before_validation :nullify_blank_type, :nullify_blank_line_code before_validation :set_discussion_id, on: :create - after_save :keep_around_commit, if: :for_project_noteable? - after_save :expire_etag_cache - after_save :touch_noteable + after_save :keep_around_commit, if: :for_project_noteable?, unless: :importing? + after_save :expire_etag_cache, unless: :importing? + after_save :touch_noteable, unless: :importing? after_destroy :expire_etag_cache class << self |