diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-19 11:25:21 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-19 11:50:46 -0500 |
| commit | 5e8aca215243d2eaacb0a1b744909af2b7264a32 (patch) | |
| tree | de0f75c16f746c62fbe19a74514f1f9fe7beb64c /app | |
| parent | c0c394262833a4a35e3b2f7006ba6a4e93ef80d1 (diff) | |
| download | gitlab-ce-5e8aca215243d2eaacb0a1b744909af2b7264a32.tar.gz | |
Don't display comment on unchanged line on both sides in parallel diff
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 |