diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-14 12:25:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-14 12:25:14 +0000 |
| commit | fb7abd87daa8930682b05870361fe9dd112f050f (patch) | |
| tree | 3b7e73b8985666bef1d1ae5af69cea2453cbab2f /app | |
| parent | acc60818caf34db81f276fa94daea7b6c3a37be4 (diff) | |
| parent | aefefbf11701042ae59a60818e3f957b30831dfd (diff) | |
| download | gitlab-ce-fb7abd87daa8930682b05870361fe9dd112f050f.tar.gz | |
Merge branch 'issue_40058' into 'master'
Prevent position update for image diff notes
Closes #40058
See merge request gitlab-org/gitlab-ce!15357
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/diff_note.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index d88a92dc027..ae5f138a920 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -18,7 +18,8 @@ class DiffNote < Note validate :positions_complete validate :verify_supported - before_validation :set_original_position, :update_position, on: :create + before_validation :set_original_position, on: :create + before_validation :update_position, on: :create, if: :on_text? before_validation :set_line_code after_save :keep_around_commits |