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

Merge branch 'Issue#5817' into 'master'
f394ccd5 · Stan Hu · af9bbadc · e304a76e · f394ccd5 · f394ccd5
Commit f394ccd5 authored Jan 11, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

index.html.haml app/views/projects/hooks/index.html.haml +2 -2

_service_settings.html.haml app/views/shared/_service_settings.html.haml +2 -2

No files found.
--- 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

--- 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'