From 337ced28bcdff25a2d2d4c726d37c782c4cc2d24 Mon Sep 17 00:00:00 2001 From: Alexis Reigel Date: Mon, 18 Dec 2017 11:14:51 +0100 Subject: reference triggers.values for permitted parameters --- app/controllers/admin/hooks_controller.rb | 7 ++----- app/controllers/projects/hooks_controller.rb | 10 +--------- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb index 1c90c298f66..2b47819303e 100644 --- a/app/controllers/admin/hooks_controller.rb +++ b/app/controllers/admin/hooks_controller.rb @@ -59,12 +59,9 @@ class Admin::HooksController < Admin::ApplicationController def hook_params params.require(:hook).permit( :enable_ssl_verification, - :push_events, - :tag_push_events, - :repository_update_events, - :merge_requests_events, :token, - :url + :url, + *SystemHook.triggers.values ) end end diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 85d35900c71..b83d6543096 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -63,18 +63,10 @@ class Projects::HooksController < Projects::ApplicationController def hook_params params.require(:hook).permit( - :job_events, - :pipeline_events, :enable_ssl_verification, - :issues_events, - :confidential_issues_events, - :merge_requests_events, - :note_events, - :push_events, - :tag_push_events, :token, :url, - :wiki_page_events + *ProjectHook.triggers.values ) end end -- cgit v1.2.1