Fix N+1 with source projects in merge requests API

Now that we are checking `MergeRequest#for_fork?`, we also need the source project preloaded for a merge request.

Fix N+1 with source projects in merge requests API
bd4bfcc6 · Stan Hu · fe0ebf76 · bd4bfcc6 · bd4bfcc6
Commit bd4bfcc6 authored Jun 03, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

sh-fix-source-project-nplus-one.yml changelogs/unreleased/sh-fix-source-project-nplus-one.yml +5 -0

merge_requests.rb lib/api/merge_requests.rb +1 -1

No files found.
--- a/changelogs/unreleased/sh-fix-source-project-nplus-one.yml
+++ b/changelogs/unreleased/sh-fix-source-project-nplus-one.yml
+---
+title: Fix N+1 with source_projects in merge requests API
+merge_request:
+author:
+type: performance
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -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'