diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-27 19:14:11 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-27 19:14:11 +0000 |
| commit | 52711b5321e5dd781b07273ca9f9577997eaed8f (patch) | |
| tree | 0649ea2727545cfb7f66166e6cd4bae38b3febb3 | |
| parent | 90578f4ad091f80428a661005060af65a0c7151e (diff) | |
| parent | 256dfa13921fbf5607607d70fb805c3997290cc8 (diff) | |
| download | gitlab-ce-52711b5321e5dd781b07273ca9f9577997eaed8f.tar.gz | |
Merge branch 'includes-projects-to-render-issue-notes' into 'master'
Fix IssuesController#show degradation including project on loaded notes
See merge request !6540
| -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 b5827cc128a..c125d010d77 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,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 - Make JWT messages Docker-compatible 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) |