summaryrefslogtreecommitdiff
path: root/lib/api/system_hooks.rb
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2017-11-23 16:45:00 +0100
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-01-04 09:33:41 +0100
commit2a0a7b426e63dac685654cafb0904e7668ad1fde (patch)
tree93440648b4ab2ed5be6f75e847ae26b1d2bc7365 /lib/api/system_hooks.rb
parent9a5bfcfdc53bf9b6217121b8639b43cc603f91c1 (diff)
downloadgitlab-ce-2a0a7b426e63dac685654cafb0904e7668ad1fde.tar.gz
api support for merge_requests_events system hook
Diffstat (limited to 'lib/api/system_hooks.rb')
-rw-r--r--lib/api/system_hooks.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/system_hooks.rb b/lib/api/system_hooks.rb
index 6b6a03e3300..c7a460df46a 100644
--- a/lib/api/system_hooks.rb
+++ b/lib/api/system_hooks.rb
@@ -26,6 +26,7 @@ module API
optional :token, type: String, desc: 'The token used to validate payloads'
optional :push_events, type: Boolean, desc: "Trigger hook on push events"
optional :tag_push_events, type: Boolean, desc: "Trigger hook on tag push events"
+ optional :merge_requests_events, type: Boolean, desc: "Trigger hook on tag push events"
optional :enable_ssl_verification, type: Boolean, desc: "Do SSL verification when triggering the hook"
end
post do