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/controllers/projects/merge_requests_controller.rb | |
| parent | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (diff) | |
| download | gitlab-ce-fe26b8af94e8e12a66249e28e34196a4f8b987c4.tar.gz | |
Correctly display multiple separate discussions on the same diff line
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rwxr-xr-x | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |