diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-01 17:16:05 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-01 17:16:05 +0000 |
commit | b227355973fac017905833409e8cb721f9dbd36d (patch) | |
tree | c2aa3adcf451c9c7a65f4b4d5e9f45b4c8538802 | |
parent | 97424d0dd29c73c5f97285e36bcca82f8a17c741 (diff) | |
parent | d71983f599afd3b81bdda42eec3e989ef7ea02d3 (diff) | |
download | gitlab-ce-b227355973fac017905833409e8cb721f9dbd36d.tar.gz |
Merge branch '19388-fix-snippets-notes-not-shown' into 'master'
Fix snippets comments not displayed
## What does this MR do?
Fix an issue where comments body were not displayed for project snippets anymore (see commit for details).
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Because of #19388.
## What are the relevant issue numbers?
Fixes #19388.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5045
-rw-r--r-- | app/controllers/projects/snippets_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 6d2901a24a4..6d0a7ee1031 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -54,7 +54,7 @@ class Projects::SnippetsController < Projects::ApplicationController def show @note = @project.notes.new(noteable: @snippet) - @notes = @snippet.notes.fresh + @notes = Banzai::NoteRenderer.render(@snippet.notes.fresh, @project, current_user) @noteable = @snippet end |