diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-25 16:28:10 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-25 16:28:10 +0000 |
commit | 774548be1fbc88041d58a2e66e19971e6f678d4c (patch) | |
tree | b8447989c7c512fce9cdf68c95af8ff921aba1f4 /.gitlab-ci.yml | |
parent | 6fc544968b882b62c706fb82f3b951a27bd18eb2 (diff) | |
parent | 05084a456596c7ebf853f2963551ea5475b34928 (diff) | |
download | gitlab-ce-774548be1fbc88041d58a2e66e19971e6f678d4c.tar.gz |
Merge branch 'fix-events-api' into 'master'
Fix events order in users/:id/events endpoint
## What does this MR do?
Order of events in contributions API is currently being lost, though docs are saying:
> Get the contribution events for the specified user, sorted **from newest to oldest**.
Order becomes different after `.merge(ProjectsFinder.new.execute(current_user))` call, so I moved ordering below this line.
This MR also removes extra `.page(params[:page])` call in the method chain, since [`paginate(events)` already does it](https://gitlab.com/airat/gitlab-ce/blob/master/lib/api/helpers.rb#L112).
See merge request !7039
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions