diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-03 23:51:25 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-10 16:48:18 +0200 |
| commit | ea4eb460479a24fea9ee890c8ba8f6f4dec7f44b (patch) | |
| tree | 0d035c07e2853a30bc56da0d4a226920e278f5ba /app/controllers/groups_controller.rb | |
| parent | e5e94618c573fc85118ae76c1582be1ab30a72af (diff) | |
| download | gitlab-ce-ea4eb460479a24fea9ee890c8ba8f6f4dec7f44b.tar.gz | |
Merge branch 'tc-fix-private-subgroups-shown' into 'security'
Use GroupsFinder to find subgroups the user has access to
See merge request !2096
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 46c3ff10694..1515173d0ac 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -64,7 +64,7 @@ class GroupsController < Groups::ApplicationController end def subgroups - @nested_groups = group.children + @nested_groups = GroupsFinder.new(current_user, parent: group).execute @nested_groups = @nested_groups.search(params[:filter_groups]) if params[:filter_groups].present? end |