diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-09 19:29:11 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 08bbb9fce66cb46d3262e6cd4c4379b59f065be0 (patch) | |
| tree | 159eeb7ca43419f29926d6e77637db18bddd20a9 /app/controllers/projects/snippets_controller.rb | |
| parent | 8bdfee8ba5fb0a8f48501e63274c8f9ce5708007 (diff) | |
| download | gitlab-ce-08bbb9fce66cb46d3262e6cd4c4379b59f065be0.tar.gz | |
Add option to start a new discussion on an MR
Diffstat (limited to 'app/controllers/projects/snippets_controller.rb')
| -rw-r--r-- | app/controllers/projects/snippets_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index ea1a97b7cf0..2600a9d7256 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -1,4 +1,5 @@ class Projects::SnippetsController < Projects::ApplicationController + include NotesHelper include ToggleAwardEmoji include SpammableActions include SnippetsActions @@ -55,8 +56,10 @@ class Projects::SnippetsController < Projects::ApplicationController def show @note = @project.notes.new(noteable: @snippet) - @notes = Banzai::NoteRenderer.render(@snippet.notes.fresh, @project, current_user) @noteable = @snippet + + @discussions = @snippet.discussions + @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes)) end def destroy |