summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-30 07:25:26 +0000
committerDouwe Maan <douwe@gitlab.com>2017-08-30 07:25:26 +0000
commite5c98c1ed94e090d2ddce3460b4106b298f30114 (patch)
tree6bd83830cddb4c33b62721d283e2fe7cac90327a /app
parent499b640679c0dca5b5d93da945da0ca26db8e58e (diff)
parentb870ae1f59ab0b3f4a10f9dbb2d64324b90ba38b (diff)
downloadgitlab-ce-e5c98c1ed94e090d2ddce3460b4106b298f30114.tar.gz
Merge branch 'mr-index-eager-load' into 'master'
Eager load head pipeline projects for MRs index See merge request !13877
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/issuable_collections.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index b43b2c5621f..a34a82b7ba6 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -15,7 +15,17 @@ module IssuableCollections
end
def merge_requests_collection
- merge_requests_finder.execute.preload(:source_project, :target_project, :author, :assignee, :labels, :milestone, :head_pipeline, target_project: :namespace, merge_request_diff: :merge_request_diff_commits)
+ merge_requests_finder.execute.preload(
+ :source_project,
+ :target_project,
+ :author,
+ :assignee,
+ :labels,
+ :milestone,
+ head_pipeline: :project,
+ target_project: :namespace,
+ merge_request_diff: :merge_request_diff_commits
+ )
end
def issues_finder