Merge branch 'sh-stop-loading-issue-discussions' into 'master'

Remove unnecessary loading of discussions in `IssuesController#show` Closes #38034 See merge request gitlab-org/gitlab-ce!14351

Merge branch 'sh-stop-loading-issue-discussions' into 'master'
2421645d · Douwe Maan · Robert Speicher · abebf1f5 · 2421645d · 2421645d
Commit 2421645d authored Sep 19, 2017 by Douwe Maan Committed by Robert Speicher Sep 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

issues_controller.rb app/controllers/projects/issues_controller.rb +0 -3

sh-stop-loading-issue-discussions.yml changelogs/unreleased/sh-stop-loading-issue-discussions.yml +5 -0

No files found.
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -71,9 +71,6 @@ class Projects::IssuesController < Projects::ApplicationController
    @noteable = @issue
    @note     = @project.notes.new(noteable: @issue)

-    @discussions = @issue.discussions
-    @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable)
-
    respond_to do |format|
      format.html
      format.json do

--- a/changelogs/unreleased/sh-stop-loading-issue-discussions.yml
+++ b/changelogs/unreleased/sh-stop-loading-issue-discussions.yml
+---
+title: Remove unnecessary loading of discussions in `IssuesController#show`
+merge_request:
+author:
+type: fixed