summaryrefslogtreecommitdiff
path: root/app/controllers/projects/hooks_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-18 11:37:16 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-18 11:37:16 +0000
commit8e9c073a146f655cea2fd13f259bd68dc2c37259 (patch)
tree01bd2ec14fd6406b1deb1947935b36463a7e4529 /app/controllers/projects/hooks_controller.rb
parentd617c24f59f9cc1c068301ec755caa2de6cd6b73 (diff)
parent6ef1b94ccf9eb60d5cff43d7e1302129d1b43cc3 (diff)
downloadgitlab-ce-8e9c073a146f655cea2fd13f259bd68dc2c37259.tar.gz
Merge branch 'feature/merge-request-system-hook' into 'master'
System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
Diffstat (limited to 'app/controllers/projects/hooks_controller.rb')
-rw-r--r--app/controllers/projects/hooks_controller.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 6f51e7b9b40..dd7aa1a67b9 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -64,18 +64,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