From c2223efe840e344da8d6e1347bd028899bb6117a Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Sun, 26 Jun 2016 10:09:42 -0400 Subject: Fix rendering of commit notes --- app/controllers/projects/commit_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 6751737d15e..d162a5a3165 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -18,9 +18,16 @@ class Projects::CommitController < Projects::ApplicationController apply_diff_view_cookie! @grouped_diff_notes = commit.notes.grouped_diff_notes + @notes = commit.notes.non_diff_notes.fresh + + Banzai::NoteRenderer.render( + @grouped_diff_notes.values.flatten + @notes, + @project, + current_user, + ) @note = @project.build_commit_note(commit) - @notes = commit.notes.non_diff_notes.fresh + @noteable = @commit @comments_target = { noteable_type: 'Commit', -- cgit v1.2.1 From c6f75fa4f41a9f96e517d8a9a3e1056db7947e47 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 27 Jun 2016 18:02:03 +0000 Subject: Update CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 6defffefb77..56369d604cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.10.0 (unreleased) v 8.9.2 - Update omniauth-saml to 1.6.0 !4951 + - Fix rendering of commit notes !4953 v 8.9.1 - Refactor labels documentation. !3347 -- cgit v1.2.1