Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorAirat Shigapov <contact@airatshigapov.com>2016-10-21 14:38:08 +0300
committerAirat Shigapov <contact@airatshigapov.com>2016-10-24 22:56:27 +0300
commit1a04a51b5249d78e4a3cfd47572a5e3dba3c4ad3 (patch)
treed408674e07dc1d2136b96e4a2b1bda2fcf2efd35 /lib/api
parentc99d12e5b378661250ee23abc1a5ece03a813d6f (diff)
Fix events order in user contributions API
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/users.rb3
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