summaryrefslogtreecommitdiff
path: root/app/views/admin/hooks
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-20 11:44:39 +0200
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-01-04 09:33:41 +0100
commit630c3380510d4ada5d33b3dee0966e6dfb163dcf (patch)
tree9738774923fb0f52249fb3f2708772c80eb689c4 /app/views/admin/hooks
parentd71d8ad7f8363d7ffa55d52e1dcbc6bfadaf070e (diff)
downloadgitlab-ce-630c3380510d4ada5d33b3dee0966e6dfb163dcf.tar.gz
merge requests on system hook admin page
Diffstat (limited to 'app/views/admin/hooks')
-rw-r--r--app/views/admin/hooks/_form.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml
index 645005c6deb..1b6de917f5a 100644
--- a/app/views/admin/hooks/_form.html.haml
+++ b/app/views/admin/hooks/_form.html.haml
@@ -38,6 +38,13 @@
%strong Tag push events
%p.light
This URL will be triggered when a new tag is pushed to the repository
+ %div
+ = form.check_box :merge_requests_events, class: 'pull-left'
+ .prepend-left-20
+ = form.label :merge_requests_events, class: 'list-label' do
+ %strong Merge Request events
+ %p.light
+ This URL will be triggered when a merge request is created/updated/merged
.form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'control-label checkbox'
.col-sm-10