diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-19 11:14:54 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-19 11:14:54 +0000 |
| commit | 706426d527f682efb56d5bff14419b0572875a33 (patch) | |
| tree | 36ad4492970c23a259f657b790a4accd38d6e6da | |
| parent | 404a56235f86a69b05991efcf4cc5d7c5f5c4567 (diff) | |
| parent | 3b9c45a317e2197b823cea6676679a2acb3dc336 (diff) | |
| download | gitlab-ce-706426d527f682efb56d5bff14419b0572875a33.tar.gz | |
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
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-stop-loading-issue-discussions.yml | 5 |
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 |