diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 17:38:28 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 17:38:28 +0300 |
| commit | d32ecb23eb10065b1cc5eea95f4271ef402f0059 (patch) | |
| tree | 0a741d5611f6b591710e58193d8a66ceb68bb338 /app/controllers/snippets_controller.rb | |
| parent | ac3796b3d3b0e0ceaeceabd3d5783da60f673779 (diff) | |
| parent | 8c3a03c1b9bf5c80571c9dc07ba258fa10dd61c8 (diff) | |
Merge branch '12910-personal-snippets-notes-show' into 'master'
Display comments for personal snippets
See merge request !10974
Diffstat (limited to 'app/controllers/snippets_controller.rb')
| -rw-r--r-- | app/controllers/snippets_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 906833505d1..e338db8353b 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -1,4 +1,5 @@ class SnippetsController < ApplicationController + include RendersNotes include ToggleAwardEmoji include SpammableActions include SnippetsActions @@ -64,6 +65,11 @@ class SnippetsController < ApplicationController blob = @snippet.blob override_max_blob_size(blob) + @noteable = @snippet + + @discussions = @snippet.discussions + @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes)) + respond_to do |format| format.html do render 'show' |