summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-05 08:22:14 +0000
committerRémy Coutable <remy@rymai.me>2018-06-05 08:22:14 +0000
commit8576e45f28737f1e9f6b0b6e5649745c76751b06 (patch)
treefeb107fb138fee822a9a1b445cb876594cd94aa2 /lib
parenta8bfaf69feed226bc209171b5dcc5b1b2d95487e (diff)
parentcbc20d2b7f8c73e2892c0c458619df2a9fe0c9ab (diff)
downloadgitlab-ce-8576e45f28737f1e9f6b0b6e5649745c76751b06.tar.gz
Merge branch 'sh-add-uncached-query-limiter' into 'master'
Remove N+1 query for author in issues API See merge request gitlab-org/gitlab-ce!19345
Diffstat (limited to 'lib')
-rw-r--r--lib/api/issues.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index b64f465ce56..25185d6edc8 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, :project)
+ .preload(:assignees, :labels, :notes, :timelogs, :project, :author)
issues.reorder(args[:order_by] => args[:sort])
end