Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-04-24 14:06:05 +0300
committerSean McGivern <sean@gitlab.com>2018-04-24 14:06:05 +0300
commit943fc87d9f5c817970d268e1a70ab43ed74cd6b1 (patch)
tree77856a0bce2aabf3803ca0ed062ffd2df866f71b /app
parent26147b730f0f41650c2b7ff6ab21d645b36273c9 (diff)
Fix an N+1 for MRs from forks on the MR index page
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/issuable_collections.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index 4114ca6bf7c..34228cf0b82 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -165,8 +165,8 @@ module IssuableCollections
[:project, :author, :assignees, :labels, :milestone, project: :namespace]
when 'MergeRequest'
[
- :source_project, :target_project, :author, :assignee, :labels, :milestone,
- head_pipeline: :project, target_project: :namespace, latest_merge_request_diff: :merge_request_diff_commits
+ :target_project, :author, :assignee, :labels, :milestone,
+ source_project: :route, head_pipeline: :project, target_project: :namespace, latest_merge_request_diff: :merge_request_diff_commits
]
end
end