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/projects/hooks_controller.rb | |
| parent | 0cd5edf35cfaca74344dd389aadd65f0f179d395 (diff) | |
| download | gitlab-ce-00ced598ea65f1b957c43576bc1564ed3f67d749.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/projects/hooks_controller.rb')
| -rw-r--r-- | app/controllers/projects/hooks_controller.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 5fd4f855dec..dfa9bd259e8 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -52,8 +52,16 @@ class Projects::HooksController < Projects::ApplicationController end def hook_params - params.require(:hook).permit(:url, :push_events, :issues_events, - :merge_requests_events, :tag_push_events, :note_events, - :build_events, :enable_ssl_verification) + params.require(:hook).permit( + :build_events, + :enable_ssl_verification, + :issues_events, + :merge_requests_events, + :note_events, + :push_events, + :tag_push_events, + :token, + :url + ) end end |