Commit 9c9b0eef authored by Robert Speicher's avatar Robert Speicher

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

Fix rendering of commit notes

See merge request !4953
parents e0e32562 c6f75fa4
......@@ -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',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment