diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-04-30 05:34:31 -0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-05-02 10:32:01 -0300 |
| commit | 00ced598ea65f1b957c43576bc1564ed3f67d749 (patch) | |
| tree | 99b2dfc8972df739730da450849264e43f51d322 /app/controllers/admin/hooks_controller.rb | |
| parent | 0cd5edf35cfaca74344dd389aadd65f0f179d395 (diff) | |
| download | gitlab-ce-feature/backport-safewebhooks.tar.gz | |
Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooks
Codestyle changes to easy EE merge
Diffstat (limited to 'app/controllers/admin/hooks_controller.rb')
| -rw-r--r-- | app/controllers/admin/hooks_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb index 93c4894ea0f..4e85b6b4cf2 100644 --- a/app/controllers/admin/hooks_controller.rb +++ b/app/controllers/admin/hooks_controller.rb @@ -39,6 +39,12 @@ class Admin::HooksController < Admin::ApplicationController end def hook_params - params.require(:hook).permit(:url, :enable_ssl_verification, :push_events, :tag_push_events) + params.require(:hook).permit( + :enable_ssl_verification, + :push_events, + :tag_push_events, + :token, + :url + ) end end |