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

Merge branch 'sh-fix-source-project-nplus-one' into 'master' 

Fix N+1 with source_projects in merge requests API

See merge request gitlab-org/gitlab-ce!19346
This commit is contained in:
Sean McGivern 2018-06-04 10:12:23 +00:00
parent c63cd738b1 bd4bfcc641
commit 0b4f9ff406
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/sh-fix-source-project-nplus-one.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix N+1 with source_projects in merge requests API
merge_request:
author:
type: performance

2
lib/api/merge_requests.rb
View File

@ -38,7 +38,7 @@ module API
merge_requests = MergeRequestsFinder.new(current_user, args).execute
.reorder(args[:order_by] => args[:sort])
merge_requests = paginate(merge_requests)
.preload(:target_project)
.preload(:source_project, :target_project)
return merge_requests if args[:view] == 'simple'