diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 20:34:14 -0600 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
commit | fe26b8af94e8e12a66249e28e34196a4f8b987c4 (patch) | |
tree | d4a2978d3d28afdb45b69f177293167dd018717a /app/helpers/diff_helper.rb | |
parent | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (diff) | |
download | gitlab-ce-fe26b8af94e8e12a66249e28e34196a4f8b987c4.tar.gz |
Correctly display multiple separate discussions on the same diff line
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index aed1d7c839f..5e0886cc599 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -62,19 +62,19 @@ module DiffHelper end def parallel_diff_discussions(left, right, diff_file) - discussion_left = discussion_right = nil + discussions_left = discussions_right = nil if left && (left.unchanged? || left.removed?) line_code = diff_file.line_code(left) - discussion_left = @grouped_diff_discussions[line_code] + discussions_left = @grouped_diff_discussions[line_code] end if right && right.added? line_code = diff_file.line_code(right) - discussion_right = @grouped_diff_discussions[line_code] + discussions_right = @grouped_diff_discussions[line_code] end - [discussion_left, discussion_right] + [discussions_left, discussions_right] end def inline_diff_btn |