summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Papa <fabtheman@gmail.com>2019-06-27 13:45:58 -0700
committerFabio Papa <fabtheman@gmail.com>2019-06-27 15:52:37 -0700
commit5f9bc7992d042eebd425ae3e0a6a3f35b73a7804 (patch)
tree6ea24b3114940a01c6102da679de6a56a8e954dc
parent58e4c7fea3a4ffcccac77290bd54f1b59475af0e (diff)
downloadgitlab-ce-5f9bc7992d042eebd425ae3e0a6a3f35b73a7804.tar.gz
Add subgroup_creation_level to the list of allowed group params
For both groups_controller and admin/groups_controller
-rw-r--r--app/controllers/admin/groups_controller.rb3
-rw-r--r--app/controllers/groups_controller.rb3
2 files changed, 4 insertions, 2 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
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index e936d771502..6bb72476959 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -188,7 +188,8 @@ class GroupsController < Groups::ApplicationController
:chat_team_name,
:require_two_factor_authentication,
:two_factor_grace_period,
- :project_creation_level
+ :project_creation_level,
+ :subgroup_creation_level
]
end