Merge branch 'cherry-pick-5734e266' into 'master'

Fix rendering of commit notes See merge request !4953
2026-08-23 11:36:09 +10:00 · 2016-06-27 18:31:45 +00:00
parent e0e325625e c6f75fa4f4
commit 9c9b0eef46
2 changed files with 9 additions and 1 deletions
@@ -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
@@ -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',