diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-19 21:25:06 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-19 21:25:06 +0300 |
| commit | 365670d814bf57396a9ce02190fa297d15c79cb9 (patch) | |
| tree | 874e443734883f6bf020a9da42bfbe79af5e2d59 /app | |
| parent | 435d1a01749a2b0a3d96ef3802aaa382e5b78429 (diff) | |
| parent | 5e8aca215243d2eaacb0a1b744909af2b7264a32 (diff) | |
Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'
Don't display comment on unchanged line on both sides in parallel diff
Closes #33864
See merge request !12275
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/diff_helper.rb | 4 | ||||
| -rw-r--r-- | app/models/legacy_diff_note.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 06822747d11..16a99addd0b 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -66,12 +66,12 @@ module DiffHelper discussions_left = discussions_right = nil - if left && (left.unchanged? || left.discussable?) + if left && left.discussable? && (left.unchanged? || left.removed?) line_code = diff_file.line_code(left) discussions_left = @grouped_diff_discussions[line_code] end - if right&.discussable? + if right && right.discussable? && right.added? line_code = diff_file.line_code(right) discussions_right = @grouped_diff_discussions[line_code] end diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index 7126de2d488..2d5909ab25e 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -42,7 +42,7 @@ class LegacyDiffNote < Note end def for_line?(line) - !line.meta? && diff_file.line_code(line) == self.line_code + line.discussable? && diff_file.line_code(line) == self.line_code end def original_line_code |