diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-22 15:17:23 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-22 15:17:23 +0000 |
| commit | e48851de62086b65c75a3dd802743e722d5d7be8 (patch) | |
| tree | e41184b94bd2945a8d8fbaf6004cc8247fdd8ea4 /app/controllers/admin/groups_controller.rb | |
| parent | ffb39001616f0c9457785e44bcabfc7342e9f919 (diff) | |
| parent | 6c4ddc409fe95215502b6427452715edd31b41ab (diff) | |
| download | gitlab-ce-e48851de62086b65c75a3dd802743e722d5d7be8.tar.gz | |
Merge branch 'maintainers-can-create-subgroup' into 'master'
Add a group setting to allow Maintainers to create sub-groups
See merge request gitlab-org/gitlab-ce!29718
Diffstat (limited to 'app/controllers/admin/groups_controller.rb')
| -rw-r--r-- | app/controllers/admin/groups_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 15f7ef881c8..6317fa7c8d1 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -90,7 +90,8 @@ class Admin::GroupsController < Admin::ApplicationController :visibility_level, :require_two_factor_authentication, :two_factor_grace_period, - :project_creation_level + :project_creation_level, + :subgroup_creation_level ] end end |