diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-29 15:49:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-29 15:49:56 +0000 |
| commit | 26bcef97d64f449b5073ac767c02961763c20b18 (patch) | |
| tree | 4a0ba9af1b670ee1c2743ff37988799142c33ff5 /app/controllers/groups_controller.rb | |
| parent | 7dc8961af99d2a30b0a3210f7a4ee43c8779c6d2 (diff) | |
| parent | 27d5f99e508024b5c2fb8509f83e8e4c6a214865 (diff) | |
| download | gitlab-ce-26bcef97d64f449b5073ac767c02961763c20b18.tar.gz | |
Merge branch 'rework-authorizations-performance' into 'master'
Rework project authorizations and nested groups for better performance
See merge request !10885
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 3e921a1b1cb..18a2d69db29 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -64,6 +64,8 @@ class GroupsController < Groups::ApplicationController end def subgroups + return not_found unless Group.supports_nested_groups? + @nested_groups = GroupsFinder.new(current_user, parent: group).execute @nested_groups = @nested_groups.search(params[:filter_groups]) if params[:filter_groups].present? end |