diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-06-06 21:29:12 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-06-06 21:29:12 +0200 |
| commit | 9efb1875b7b001f0bda8afea60be7145459eb496 (patch) | |
| tree | 6b1eb349cc5ad120c55f8e5af10df7b062b0c6b4 /lib/api/events.rb | |
| parent | 44be58836c826dfc0fbfa6d58641d34f84e292fb (diff) | |
| parent | dd6aade3bf54a6d72a5b98daa34d0798b158399f (diff) | |
| download | gitlab-ce-9efb1875b7b001f0bda8afea60be7145459eb496.tar.gz | |
Merge branch 'master' into 38542-application-control-panel-in-settings-page
Diffstat (limited to 'lib/api/events.rb')
| -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 |