diff options
| author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-15 18:49:28 +0200 |
|---|---|---|
| committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-15 18:49:28 +0200 |
| commit | cd80a9075f5f2b3150c909a6cd56e7c8f239bd51 (patch) | |
| tree | 58f0fba91c72ec86cc744f026d62d06050b20efa /app/controllers/dashboard_controller.rb | |
| parent | 1d6ba597028142511af8c9863f81073278ccd927 (diff) | |
| parent | 97b768508c360d2ae767a559b5037fe464061440 (diff) | |
| download | gitlab-ce-cd80a9075f5f2b3150c909a6cd56e7c8f239bd51.tar.gz | |
Merge branch 'master' into sm-cherry-pick-list-commits-in-message
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index f9c31920302..19a5db6fd17 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -29,9 +29,9 @@ class DashboardController < Dashboard::ApplicationController current_user.authorized_projects end - @events = Event.in_projects(projects) - @events = @event_filter.apply_filter(@events).with_associations - @events = @events.limit(20).offset(params[:offset] || 0) + @events = EventCollection + .new(projects, offset: params[:offset].to_i, filter: @event_filter) + .to_a end def set_show_full_reference |