diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-01 17:16:05 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-06 12:47:20 -0400 |
commit | 1b85f5572a0cdd8326bf1453f5afe0bb981a3609 (patch) | |
tree | 039007c91c7c0774863a99d3ac24d7731c979124 | |
parent | 28cd940f227a8cb853a1bd74989765fdecec5685 (diff) | |
download | gitlab-ce-1b85f5572a0cdd8326bf1453f5afe0bb981a3609.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
(cherry picked from commit b227355973fac017905833409e8cb721f9dbd36d)
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/controllers/projects/snippets_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3a0804b2bc2..2326ce5aac5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.9.5 + - Fix snippets comments not displayed. !5045 - Fix emoji paths in relative root configurations. !5027 - Fix issues importing events in Import/Export. !4987 - Fixed 'use shortcuts' button on docs. !4979 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 |