diff options
| author | Airat Shigapov <contact@airatshigapov.com> | 2016-10-21 14:38:08 +0300 |
|---|---|---|
| committer | Airat Shigapov <contact@airatshigapov.com> | 2016-10-24 22:56:27 +0300 |
| commit | 1a04a51b5249d78e4a3cfd47572a5e3dba3c4ad3 (patch) | |
| tree | d408674e07dc1d2136b96e4a2b1bda2fcf2efd35 | |
| parent | c99d12e5b378661250ee23abc1a5ece03a813d6f (diff) | |
| download | gitlab-ce-1a04a51b5249d78e4a3cfd47572a5e3dba3c4ad3.tar.gz | |
Fix events order in user contributions API
| -rw-r--r-- | lib/api/users.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index e868f628404..20801b7e294 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -333,10 +333,11 @@ module API user = User.find_by(id: declared(params).id) not_found!('User') unless user - events = user.recent_events. + events = user.events. merge(ProjectsFinder.new.execute(current_user)). references(:project). with_associations. + recent. page(params[:page]) present paginate(events), with: Entities::Event |