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/commit_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/commit_controller.rb') diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 98cd4ce344a..d1558bdfba8 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -123,7 +123,7 @@ class Projects::CommitController < Projects::ApplicationController @grouped_diff_discussions = commit.grouped_diff_discussions @discussions = commit.discussions - @notes = (@grouped_diff_discussions.values + @discussions).flat_map(&:notes) + @notes = (@grouped_diff_discussions.values.flatten + @discussions).flat_map(&:notes) @notes = prepare_notes_for_rendering(@notes) end -- cgit v1.2.1