diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-31 17:42:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-31 17:42:42 +0000 |
| commit | 560c93e60efd0ae5a1a6bed68a1ee3e74bf23737 (patch) | |
| tree | 2ff5f532b835327666358752109315d641fd926b | |
| parent | 9c34c023808b38303d4988a20f62645c552951e3 (diff) | |
| parent | 406e10b89c41db709217367d8093d80ad00b02df (diff) | |
| download | gitlab-ce-560c93e60efd0ae5a1a6bed68a1ee3e74bf23737.tar.gz | |
Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-group' into 'master'
Refactor groups controller to match EE
Closes gitlab-ee#4761
See merge request gitlab-org/gitlab-ce!16832
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 75270a0889b..bb652832cb1 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -118,10 +118,10 @@ class GroupsController < Groups::ApplicationController end def group_params - params.require(:group).permit(group_params_ce) + params.require(:group).permit(group_params_attributes) end - def group_params_ce + def group_params_attributes [ :avatar, :description, |