summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorFabian Schneider <fabbbbbi+git@googlemail.com>2019-07-01 11:17:47 +0000
committerBob Van Landuyt <bob@gitlab.com>2019-07-01 11:17:47 +0000
commitb5952294cefa52d58f6cb58e88460ca3551cf377 (patch)
tree1dcc8e58ab44be50153af71c05b914617aa657e6 /app/controllers
parent8611291dcf5dc3f7b54478d800e396565f4c6145 (diff)
downloadgitlab-ce-b5952294cefa52d58f6cb58e88460ca3551cf377.tar.gz
Revert "Include subgroups in shared_projects"
This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups_controller.rb3
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