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/diff_note.rb | |
| parent | 98420be3dddf5a093c39d96a8ca109aa21d0eaf8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 0623ba746c2..686d06d3ee0 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -21,8 +21,8 @@ class DiffNote < Note validate :positions_complete validate :verify_supported - before_validation :set_line_code, if: :on_text? - after_save :keep_around_commits + before_validation :set_line_code, if: :on_text?, unless: :importing? + after_save :keep_around_commits, unless: :importing? after_commit :create_diff_file, on: :create def discussion_class(*) |