diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-31 10:57:11 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-31 10:57:11 +0000 |
| commit | f8250f8fd0cfec10a639b8a010331197a9e1c40e (patch) | |
| tree | 651216ee5f425ba88cf1ec3faf1643634f9d0105 /app | |
| parent | bebb9c0c6d478e267b5b79bb9c6146ed519f6f20 (diff) | |
| parent | 30e6cfa05a361cbdc12ddb7c12061f4c7221c61b (diff) | |
| download | gitlab-ce-f8250f8fd0cfec10a639b8a010331197a9e1c40e.tar.gz | |
Merge branch 'sh-fix-events-collection' into 'master'
Fix not all events being shown in group dashboard
Closes #42560
See merge request gitlab-org/gitlab-ce!16819
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/groups_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index eb53a522f90..75270a0889b 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -150,7 +150,6 @@ class GroupsController < Groups::ApplicationController @projects = GroupProjectsFinder.new(params: params, group: group, options: options, current_user: current_user) .execute .includes(:namespace) - .page(params[:page]) @events = EventCollection .new(@projects, offset: params[:offset].to_i, filter: event_filter) |