kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Douwe Maan 2017-09-19 11:14:54 +00:00
parent 404a56235f 3b9c45a317
commit 706426d527
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/projects/issues_controller.rb
View File

@ -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

5
changelogs/unreleased/sh-stop-loading-issue-discussions.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove unnecessary loading of discussions in `IssuesController#show`
merge_request:
author:
type: fixed