diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-20 16:18:18 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-20 16:18:18 -0600 |
| commit | 79214be727aaa0704a1be5b50aa6dd3011629bc2 (patch) | |
| tree | 8be3ad3775acebb43b114cd90a8fc919097a7b2c /app/controllers/projects/commit_controller.rb | |
| parent | 5a77eb153669bfbac4ab1f05615d11965beb826d (diff) | |
| download | gitlab-ce-79214be727aaa0704a1be5b50aa6dd3011629bc2.tar.gz | |
Add Discussion model to represent MR/diff discussiondiscussion-model
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 727e84b40a1..7ae034f9398 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -115,11 +115,11 @@ class Projects::CommitController < Projects::ApplicationController end def define_note_vars - @grouped_diff_notes = commit.notes.grouped_diff_notes + @grouped_diff_discussions = commit.notes.grouped_diff_discussions @notes = commit.notes.non_diff_notes.fresh Banzai::NoteRenderer.render( - @grouped_diff_notes.values.flatten + @notes, + @grouped_diff_discussions.values.flat_map(&:notes) + @notes, @project, current_user, ) |