Correctly display multiple separate discussions on the same diff line

2 files changed, 5 insertions, 20 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
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 61805021b39..8ec72d5f43a 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -32,27 +32,12 @@ module NotesHelper
   def diff_view_line_data(line_code, position, line_type)
     return if @diff_notes_disabled
 
-    use_legacy_diff_note = @use_legacy_diff_notes
-    # If the controller doesn't force the use of legacy diff notes, we
-    # determine this on a line-by-line basis by seeing if there already exist
-    # active legacy diff notes at this line, in which case newly created notes
-    # will use the legacy technology as well.
-    # We do this because the discussion_id values of legacy and "new" diff
-    # notes, which are used to group notes on the merge request discussion tab,
-    # are incompatible.
-    # If we didn't, diff notes that would show for the same line on the changes
-    # tab, would show in different discussions on the discussion tab.
-    use_legacy_diff_note ||= begin
-      discussion = @grouped_diff_discussions[line_code]
-      discussion && discussion.legacy_diff_discussion?
-    end
-
     data = {
       line_code: line_code,
       line_type: line_type,
     }
 
-    if use_legacy_diff_note
+    if @use_legacy_diff_notes
       data[:note_type] = LegacyDiffNote.name
     else
       data[:note_type] = DiffNote.name