diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 10:30:46 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 10:30:46 +0000 |
commit | c1ee45953edac729bc43f676cfad3359f9b2a2f5 (patch) | |
tree | c6f3a8de12ea59f14ebeb0ff39c1f1bd5a4e152b /app/helpers/diff_helper.rb | |
parent | 8e4ba54aa44a5636684b2b99741e372d657d4316 (diff) | |
parent | b417fc0329ec10ccbaa1c282893f8710ff81db9d (diff) | |
download | gitlab-ce-c1ee45953edac729bc43f676cfad3359f9b2a2f5.tar.gz |
Merge branch 'fix_diff_line_comments' into 'master'
Fix: A diff comment on a change at last line of a file shows as two comments in discussion
Closes #32353
See merge request !11802
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 0726dc6eafd..2ae3a616933 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.removed?) + if left && (left.unchanged? || left.discussable?) line_code = diff_file.line_code(left) discussions_left = @grouped_diff_discussions[line_code] end - if right && right.added? + if right&.discussable? line_code = diff_file.line_code(right) discussions_right = @grouped_diff_discussions[line_code] end |