diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2017-12-18 10:58:18 +0100 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-01-17 09:55:00 +0100 |
| commit | eb5e0e921c017322ad8f9122d897b0cf39c0b294 (patch) | |
| tree | 890e6a7dec80519788bb56cd80b1b8cf9a0c08c5 | |
| parent | faadd9e0e4edcb332b41aceabd6c03a796e11978 (diff) | |
| download | gitlab-ce-eb5e0e921c017322ad8f9122d897b0cf39c0b294.tar.gz | |
add missing permitted param
| -rw-r--r-- | app/controllers/admin/hooks_controller.rb | 1 | ||||
| -rw-r--r-- | spec/controllers/admin/hooks_controller_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb index 77e3c95d197..1c90c298f66 100644 --- a/app/controllers/admin/hooks_controller.rb +++ b/app/controllers/admin/hooks_controller.rb @@ -62,6 +62,7 @@ class Admin::HooksController < Admin::ApplicationController :push_events, :tag_push_events, :repository_update_events, + :merge_requests_events, :token, :url ) diff --git a/spec/controllers/admin/hooks_controller_spec.rb b/spec/controllers/admin/hooks_controller_spec.rb index e6ba596117a..090a51be7c3 100644 --- a/spec/controllers/admin/hooks_controller_spec.rb +++ b/spec/controllers/admin/hooks_controller_spec.rb @@ -14,6 +14,7 @@ describe Admin::HooksController do push_events: true, tag_push_events: true, repository_update_events: true, + merge_requests_events: true, token: "TEST TOKEN", url: "http://example.com" } |