diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 00:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 00:09:19 +0300 |
| commit | 5c2568f176708552dfdefa9fc8d5f01ec6a019a1 (patch) | |
| tree | dca0281e3b7b973d9c06ec9a9470323f0a4cc581 /app/models/diff_note.rb | |
| parent | 84e315459585e3339b964e06236dd3f41e70ba2b (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 25418696369..944a64f5419 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -19,7 +19,7 @@ class DiffNote < Note # EE might have added a type when the module was prepended validates :noteable_type, inclusion: { in: -> (_note) { noteable_types } } validate :positions_complete - validate :verify_supported + validate :verify_supported, unless: :importing? before_validation :set_line_code, if: :on_text?, unless: :importing? after_save :keep_around_commits, unless: :importing? |