Merge branch '19388-fix-snippets-notes-not-shown' into 'master'

Fix snippets comments not displayed ## What does this MR do? Fix an issue where comments body were not displayed for project snippets anymore (see commit for details). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because of #19388. ## What are the relevant issue numbers? Fixes #19388. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5045

Merge branch '19388-fix-snippets-notes-not-shown' into 'master'
b2273559 · Rémy Coutable · 97424d0d · d71983f5 · b2273559
Commit b2273559 authored Jul 01, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

snippets_controller.rb app/controllers/projects/snippets_controller.rb +1 -1

No files found.
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -54,7 +54,7 @@ class Projects::SnippetsController < Projects::ApplicationController

  def show
    @note = @project.notes.new(noteable: @snippet)
-    @notes = @snippet.notes.fresh
+    @notes = Banzai::NoteRenderer.render(@snippet.notes.fresh, @project, current_user)
    @noteable = @snippet
  end