summaryrefslogtreecommitdiff
path: root/app/controllers/admin/groups_controller.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-06-25 21:11:00 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-06-25 21:11:00 +0800
commitb23428d664067929089ffe8e5353b76839394048 (patch)
tree02089de253774718a4d128871623e1b2a1bcd054 /app/controllers/admin/groups_controller.rb
parent901159bbae51d818cd6f643da713eee8319923da (diff)
downloadgitlab-ce-b23428d664067929089ffe8e5353b76839394048.tar.gz
Bring changes from EE
Diffstat (limited to 'app/controllers/admin/groups_controller.rb')
-rw-r--r--app/controllers/admin/groups_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 001f6520093..96b7bc65ac9 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -72,10 +72,10 @@ class Admin::GroupsController < Admin::ApplicationController
end
def group_params
- params.require(:group).permit(group_params_ce)
+ params.require(:group).permit(allowed_group_params)
end
- def group_params_ce
+ def allowed_group_params
[
:avatar,
:description,