diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-05-31 12:27:41 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-05-31 12:27:41 +0000 |
| commit | 2fdd8982f8204340e6413a57f46e6c41d8ecb429 (patch) | |
| tree | e59052d88a15cf9ba7f6f77518223ab180a44be0 | |
| parent | a53a0487aeed592509e76bfeb7146b5825edcc47 (diff) | |
| parent | ef253a1ee7c03edf9773574a843b5c458e9add36 (diff) | |
| download | gitlab-ce-2fdd8982f8204340e6413a57f46e6c41d8ecb429.tar.gz | |
Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'
Eliminate cached N+1 queries for projects in Issue API
See merge request gitlab-org/gitlab-ce!19269
| -rw-r--r-- | changelogs/unreleased/sh-fix-issue-api-perf-n-plus-one.yml | 5 | ||||
| -rw-r--r-- | lib/api/issues.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-fix-issue-api-perf-n-plus-one.yml b/changelogs/unreleased/sh-fix-issue-api-perf-n-plus-one.yml new file mode 100644 index 00000000000..57ba081326f --- /dev/null +++ b/changelogs/unreleased/sh-fix-issue-api-perf-n-plus-one.yml @@ -0,0 +1,5 @@ +--- +title: Eliminate cached N+1 queries for projects in Issue API +merge_request: +author: +type: performance diff --git a/lib/api/issues.rb b/lib/api/issues.rb index 6d75e8817c4..b64f465ce56 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -16,7 +16,7 @@ module API args[:scope] = args[:scope].underscore if args[:scope] issues = IssuesFinder.new(current_user, args).execute - .preload(:assignees, :labels, :notes, :timelogs) + .preload(:assignees, :labels, :notes, :timelogs, :project) issues.reorder(args[:order_by] => args[:sort]) end |