diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-07 10:29:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-07 10:29:04 +0000 |
| commit | 3781cbe0c3e56067ce60f63f83d7e3d292a03403 (patch) | |
| tree | fbdae8333ac916715076d3bc41ed25bcd3810bfb /lib/api/merge_requests.rb | |
| parent | 5a75aa59dbafc8f0c25800f952df1e0aaa2d4dd5 (diff) | |
| parent | 062efe4f7a83fb2b6d951b314692cca9ee8731cd (diff) | |
| download | gitlab-ce-3781cbe0c3e56067ce60f63f83d7e3d292a03403.tar.gz | |
Merge branch 'sh-optimize-todos-api' into 'master'
Significantly reduce N+1 queries in /api/v4/todos endpoint
Closes #40378
See merge request gitlab-org/gitlab-ce!25711
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 6518ebbcff5..98dcc388f44 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -48,7 +48,7 @@ module API return merge_requests if args[:view] == 'simple' merge_requests - .preload(:notes, :author, :assignee, :milestone, :latest_merge_request_diff, :labels, :timelogs, metrics: [:latest_closed_by, :merged_by]) + .with_api_entity_associations end # rubocop: enable CodeReuse/ActiveRecord |