Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9c9b0eef
Commit
9c9b0eef
authored
Jun 27, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cherry-pick-5734e266' into 'master'
Fix rendering of commit notes See merge request !4953
parents
e0e32562
c6f75fa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+8
-1
No files found.
CHANGELOG
View file @
9c9b0eef
...
...
@@ -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
...
...
app/controllers/projects/commit_controller.rb
View file @
9c9b0eef
...
...
@@ -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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment