Commit 84bfaedf authored by Douwe Maan's avatar Douwe Maan

Merge branch 'unify-admin-controllers' into 'master'

Unify some admin controllers

See merge request gitlab-org/gitlab-ce!20147
parents fe03ff90 b23428d6
...@@ -72,10 +72,10 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -72,10 +72,10 @@ class Admin::GroupsController < Admin::ApplicationController
end end
def group_params def group_params
params.require(:group).permit(group_params_ce) params.require(:group).permit(allowed_group_params)
end end
def group_params_ce def allowed_group_params
[ [
:avatar, :avatar,
:description, :description,
......
...@@ -187,10 +187,10 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -187,10 +187,10 @@ class Admin::UsersController < Admin::ApplicationController
end end
def user_params def user_params
params.require(:user).permit(user_params_ce) params.require(:user).permit(allowed_user_params)
end end
def user_params_ce def allowed_user_params
[ [
:access_level, :access_level,
:avatar, :avatar,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment