summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-01-08 13:29:39 +0000
committerSytse Sijbrandij <sytses@gmail.com>2014-01-08 13:29:39 +0000
commit8169941742dc84e745b2a78fc8c269fbd7af2e41 (patch)
tree720c976a6b62e556f7425958e46063f9553367fa
parent30c2f8fbdcd8e11527edb31df77541f9a654770a (diff)
parentacd2702ed3103baf8beef6e747791aaa91688bb6 (diff)
downloadgitlab-ce-8169941742dc84e745b2a78fc8c269fbd7af2e41.tar.gz
Merge branch 'hooks_spelling' of /mnt/ebs/repositories/mmoll/gitlab-ce
-rw-r--r--app/views/projects/hooks/index.html.haml8
1 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 dac6a698bdc..a095fd06d2f 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -3,7 +3,7 @@
%p.light
#{link_to "Web hooks ", help_web_hooks_path, class: "vlink"} can be
- used for binding events when something happends to the the project.
+ used for binding events when something is happening within the project.
%hr.clearfix
@@ -25,21 +25,21 @@
= f.label :push_events, class: 'list-label' do
%strong Push events
%p.light
- This url will be triggered in case of push to repository
+ This url will be triggered by a push to the repository
%div
= f.check_box :issues_events, class: 'pull-left'
.prepend-left-20
= f.label :issues_events, class: 'list-label' do
%strong Issues events
%p.light
- This url will be triggered for created issues
+ This url will be triggered when an issue is created
%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 for created merge requests
+ This url will be triggered when a merge request is created
.form-actions
= f.submit "Add Web Hook", class: "btn btn-create"