diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-31 15:00:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-31 15:00:30 +0000 |
| commit | 1ff00cb2dd168d98b0d4f4995216ed909dae9349 (patch) | |
| tree | e25fe417a3a01e0bd73145475869a73e25c8a062 /lib/api/users.rb | |
| parent | decf0fefe17a574782d47504920b9a2cfc7b14dc (diff) | |
| parent | 490776517c394ced2780159fa3800e2accc27601 (diff) | |
| download | gitlab-ce-add-retry-limit-project-webhook.tar.gz | |
Merge branch 'master' into 'add-retry-limit-project-webhook'add-retry-limit-project-webhook
# Conflicts:
# app/workers/project_web_hook_worker.rb
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 4 |
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 |