summaryrefslogtreecommitdiff
path: root/lib/api/users.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
committerPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
commita2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch)
treee7d5e3e097ef85b871c7ab5b4673e6903c294144 /lib/api/users.rb
parent13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff)
parent3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff)
downloadgitlab-ce-issue-board-sidebar.tar.gz
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r--lib/api/users.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index e868f628404..c28e07a76b7 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -333,11 +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.
- page(params[:page])
+ recent
present paginate(events), with: Entities::Event
end