summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-17 17:59:06 +0100
committerRémy Coutable <remy@rymai.me>2018-12-17 17:59:06 +0100
commit9a562d946b907f17938f6d04ee71813af75920ff (patch)
tree5de368057c58dc628e2041dab0d69313b8b5f805 /app/controllers
parentd82b6d120eb54e389d775223b0c1615332143a42 (diff)
downloadgitlab-ce-9a562d946b907f17938f6d04ee71813af75920ff.tar.gz
Use the EE version of ServiceParams
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/service_params.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
index 8bd93a349ef..c6ae4fe15bf 100644
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -70,7 +70,7 @@ module ServiceParams
def service_params
dynamic_params = @service.event_channel_names + @service.event_names # rubocop:disable Gitlab/ModuleWithInstanceVariables
- service_params = params.permit(:id, service: ALLOWED_PARAMS_CE + dynamic_params)
+ service_params = params.permit(:id, service: allowed_service_params + dynamic_params)
if service_params[:service].is_a?(Hash)
FILTER_BLANK_PARAMS.each do |param|
@@ -80,4 +80,8 @@ module ServiceParams
service_params
end
+
+ def allowed_service_params
+ ALLOWED_PARAMS_CE
+ end
end