Commit e304a76e authored by iqualisoni's avatar iqualisoni

Issue #5817 wording of the web hooks updated on issue and merge events

parent be76e402
...@@ -47,14 +47,14 @@ ...@@ -47,14 +47,14 @@
= f.label :issues_events, class: 'list-label' do = f.label :issues_events, class: 'list-label' do
%strong Issues events %strong Issues events
%p.light %p.light
This url will be triggered when an issue is created This url will be triggered when an issue is created/updated/merged
%div %div
= f.check_box :merge_requests_events, class: 'pull-left' = f.check_box :merge_requests_events, class: 'pull-left'
.prepend-left-20 .prepend-left-20
= f.label :merge_requests_events, class: 'list-label' do = f.label :merge_requests_events, class: 'list-label' do
%strong Merge Request events %strong Merge Request events
%p.light %p.light
This url will be triggered when a merge request is created This url will be triggered when a merge request is created/updated/merged
%div %div
= f.check_box :build_events, class: 'pull-left' = f.check_box :build_events, class: 'pull-left'
.prepend-left-20 .prepend-left-20
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
= form.label :issues_events, class: 'list-label' do = form.label :issues_events, class: 'list-label' do
%strong Issues events %strong Issues events
%p.light %p.light
This url will be triggered when an issue is created This url will be triggered when an issue is created/updated/merged
- if @service.supported_events.include?("merge_request") - if @service.supported_events.include?("merge_request")
%div %div
= form.check_box :merge_requests_events, class: 'pull-left' = form.check_box :merge_requests_events, class: 'pull-left'
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
= form.label :merge_requests_events, class: 'list-label' do = form.label :merge_requests_events, class: 'list-label' do
%strong Merge Request events %strong Merge Request events
%p.light %p.light
This url will be triggered when a merge request is created This url will be triggered when a merge request is created/updated/merged
- if @service.supported_events.include?("build") - if @service.supported_events.include?("build")
%div %div
= form.check_box :build_events, class: 'pull-left' = form.check_box :build_events, class: 'pull-left'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment