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/concerns/diff_positionable_note.rb | |
| parent | 98420be3dddf5a093c39d96a8ca109aa21d0eaf8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/diff_positionable_note.rb')
| -rw-r--r-- | app/models/concerns/diff_positionable_note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/diff_positionable_note.rb b/app/models/concerns/diff_positionable_note.rb index 195d9e107c5..6484a3157b1 100644 --- a/app/models/concerns/diff_positionable_note.rb +++ b/app/models/concerns/diff_positionable_note.rb @@ -5,7 +5,7 @@ module DiffPositionableNote included do delegate :on_text?, :on_image?, to: :position, allow_nil: true before_validation :set_original_position, on: :create - before_validation :update_position, on: :create, if: :on_text? + before_validation :update_position, on: :create, if: :on_text?, unless: :importing? serialize :original_position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize serialize :position, Gitlab::Diff::Position # rubocop:disable Cop/ActiveRecordSerialize |