diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-01-11 04:28:46 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-01-11 04:28:46 +0000 |
| commit | f394ccd584f7c2a58a172ad4dd501045cb388e9c (patch) | |
| tree | e446bad71ae217fee4a0a612af073c299104bb69 | |
| parent | af9bbadc4c14db580167ab2c2165ec666d16b48e (diff) | |
| parent | e304a76eb6f15310dc53f560e12db0eae7816856 (diff) | |
| download | gitlab-ce-f394ccd584f7c2a58a172ad4dd501045cb388e9c.tar.gz | |
Merge branch 'Issue#5817' into 'master'
Issue#5817 Improve wording of the web hooks page on the project's setting
Merge Request !2362 had a typo, I'm resubmitting the merge request about issue #5817.
See merge request !2363
| -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' |