diff options
| author | iqualisoni <italo.qualisoni@gmail.com> | 2016-01-11 01:02:27 -0200 |
|---|---|---|
| committer | iqualisoni <italo.qualisoni@gmail.com> | 2016-01-11 01:02:27 -0200 |
| commit | e304a76eb6f15310dc53f560e12db0eae7816856 (patch) | |
| tree | 9f55619bcfdf506f3a9da5908cba56ff4cc6ab1e | |
| parent | be76e402f9a5cb3f71b94d886e7545d9d41ce43b (diff) | |
| download | gitlab-ce-e304a76eb6f15310dc53f560e12db0eae7816856.tar.gz | |
Issue #5817 wording of the web hooks updated on issue and merge events
| -rw-r--r-- | app/views/projects/hooks/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/_service_settings.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index b18d9197d0b..a0511819c9f 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -47,14 +47,14 @@ = f.label :issues_events, class: 'list-label' do %strong Issues events %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 = f.check_box :merge_requests_events, class: 'pull-left' .prepend-left-20 = f.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 + This url will be triggered when a merge request is created/updated/merged %div = f.check_box :build_events, class: 'pull-left' .prepend-left-20 diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 28d6f421fea..5a60ff5a5da 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -50,7 +50,7 @@ = form.label :issues_events, class: 'list-label' do %strong Issues events %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") %div = form.check_box :merge_requests_events, class: 'pull-left' @@ -58,7 +58,7 @@ = 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 + This url will be triggered when a merge request is created/updated/merged - if @service.supported_events.include?("build") %div = form.check_box :build_events, class: 'pull-left' |