diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-09-27 15:00:04 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-09-27 17:37:35 +0200 |
| commit | 256dfa13921fbf5607607d70fb805c3997290cc8 (patch) | |
| tree | 638d3334f40a36cbc247840cf568f38832fae65b | |
| parent | 3820ca5876ecb550d4d7eba0db98296f467125d8 (diff) | |
| download | gitlab-ce-includes-projects-to-render-issue-notes.tar.gz | |
Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notes
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 28c5d23d604..14d5aeba7c4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.12.2 (unreleased) - Fix Import/Export not recognising correctly the imported services. - Fix snippets pagination - Fix List-Unsubscribe header in emails + - Fix IssuesController#show degradation including project on loaded notes - Fix an issue with the "Commits" section of the cycle analytics summary. !6513 - Fix errors importing project feature and milestone models using GitLab project import diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 3eb13a121bf..ef13e0677d2 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -54,7 +54,7 @@ class Projects::IssuesController < Projects::ApplicationController end def show - raw_notes = @issue.notes_with_associations.fresh + raw_notes = @issue.notes.inc_relations_for_view.fresh @notes = Banzai::NoteRenderer. render(raw_notes, @project, current_user, @path, @project_wiki, @ref) |