diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-07-01 11:17:48 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-07-01 11:17:48 +0000 |
| commit | cbf4ddd89382cb086ac43ac4f7410ca8dd32b1f9 (patch) | |
| tree | 1dcc8e58ab44be50153af71c05b914617aa657e6 /app | |
| parent | 8611291dcf5dc3f7b54478d800e396565f4c6145 (diff) | |
| parent | b5952294cefa52d58f6cb58e88460ca3551cf377 (diff) | |
| download | gitlab-ce-cbf4ddd89382cb086ac43ac4f7410ca8dd32b1f9.tar.gz | |
Merge branch '44106-include-subgroups-in-group-activity' into 'master'
Include events from subgroups in group's activity
Closes #44106
See merge request gitlab-org/gitlab-ce!29953
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/groups_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 316da8f129d..797833e3f91 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -201,8 +201,7 @@ class GroupsController < Groups::ApplicationController params[:sort] ||= 'latest_activity_desc' options = {} - options[:only_owned] = true if params[:shared] == '0' - options[:only_shared] = true if params[:shared] == '1' + options[:include_subgroups] = true @projects = GroupProjectsFinder.new(params: params, group: group, options: options, current_user: current_user) .execute |