From fe26b8af94e8e12a66249e28e34196a4f8b987c4 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Mar 2017 20:34:14 -0600 Subject: Correctly display multiple separate discussions on the same diff line --- app/controllers/projects/merge_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/merge_requests_controller.rb') diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7863fe18f32..48a10fbe9cc 100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -591,7 +591,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs? @grouped_diff_discussions = @merge_request.grouped_diff_discussions - @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flat_map(&:notes)) + @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes)) end def define_pipelines_vars -- cgit v1.2.1