summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-09-18 20:43:28 -0700
committerStan Hu <stanhu@gmail.com>2017-09-19 01:56:39 -0700
commit3b9c45a317e2197b823cea6676679a2acb3dc336 (patch)
tree556f8861f24d452243b60bdcd531c20ac64537fd
parent1f4911541d03a257c38a63c6aa36a1c7ca4c3b43 (diff)
downloadgitlab-ce-sh-stop-loading-issue-discussions.tar.gz
Remove unnecessary loading of discussions in `IssuesController#show`sh-stop-loading-issue-discussions
Discussions are now done asynchronously via the `IssuesController#discussions` endpoint, so this should no longer be needed. This was taking 32% of the load time for GitLab CE issue 1. Closes #38034
-rw-r--r--app/controllers/projects/issues_controller.rb3
-rw-r--r--changelogs/unreleased/sh-stop-loading-issue-discussions.yml5
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 42bfa4b9d4f..a3ec79a56d9 100644
--- 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
diff --git a/changelogs/unreleased/sh-stop-loading-issue-discussions.yml b/changelogs/unreleased/sh-stop-loading-issue-discussions.yml
new file mode 100644
index 00000000000..5e7b7387c0d
--- /dev/null
+++ b/changelogs/unreleased/sh-stop-loading-issue-discussions.yml
@@ -0,0 +1,5 @@
+---
+title: Remove unnecessary loading of discussions in `IssuesController#show`
+merge_request:
+author:
+type: fixed