summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2017-12-18 10:58:18 +0100
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-01-17 09:55:00 +0100
commiteb5e0e921c017322ad8f9122d897b0cf39c0b294 (patch)
tree890e6a7dec80519788bb56cd80b1b8cf9a0c08c5 /app/controllers
parentfaadd9e0e4edcb332b41aceabd6c03a796e11978 (diff)
downloadgitlab-ce-eb5e0e921c017322ad8f9122d897b0cf39c0b294.tar.gz
add missing permitted param
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/hooks_controller.rb1
1 files changed, 1 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
)