diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-05 15:22:04 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-05 15:22:04 +0000 |
| commit | 6153a61633b7cd3e2e13c09065c0ead081644e3e (patch) | |
| tree | 11c7226e7128cd5e2aa5f704487f5bf72cfb0c6c /lib | |
| parent | 4deded6ef2f620dfb44cf4f079a78b245f69b3f0 (diff) | |
| parent | 6f4a0a92e6331b7033a8165c5b5e9cc7b0f880c2 (diff) | |
| download | gitlab-ce-6153a61633b7cd3e2e13c09065c0ead081644e3e.tar.gz | |
Merge branch 'sh-fix-events-nplus-one' into 'master'
Eliminate N+1 queries with authors and push_data_payload in Events API
See merge request gitlab-org/gitlab-ce!19347
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/events.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/events.rb b/lib/api/events.rb index b0713ff1d54..fc4ba5a3188 100644 --- a/lib/api/events.rb +++ b/lib/api/events.rb @@ -17,6 +17,7 @@ module API def present_events(events) events = events.reorder(created_at: params[:sort]) + .with_associations present paginate(events), with: Entities::Event end |