diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:31:50 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:32:38 -0300 |
| commit | d2971315abd0e6e94860505e50ec71082c3679da (patch) | |
| tree | 0f3dcf23406ec9fb3d6362b7f746e978ace692b3 /app/controllers/projects/commit_controller.rb | |
| parent | 36d48120f66d52dcc8697893ca1ab85322ba7c8b (diff) | |
| parent | bef4294c58e0bbadc01f633fc8bea514801de7ae (diff) | |
| download | gitlab-ce-issue_3359_3.tar.gz | |
Merge branch 'master' into issue_3359_3issue_3359_3
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 9 |
1 files changed, 8 insertions, 1 deletions
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', |