Download as
Browse Code »

Commit 8169941742dc84e745b2a78fc8c269fbd7af2e41

Authored by Sytse Sijbrandij
2 parents 30c2f8fb acd2702e
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'hooks_spelling' of /mnt/ebs/repositories/mmoll/gitlab-ce

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
app/views/projects/hooks/index.html.haml
  Diff comments   View file @8169941
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 %p.light 4 %p.light
5 #{link_to "Web hooks ", help_web_hooks_path, class: "vlink"} can be 5 #{link_to "Web hooks ", help_web_hooks_path, class: "vlink"} can be
6 - used for binding events when something happends to the the project. 6 + used for binding events when something is happening within the project.
7 7
8 %hr.clearfix 8 %hr.clearfix
9 9
@@ -25,21 +25,21 @@ @@ -25,21 +25,21 @@
25 = f.label :push_events, class: 'list-label' do 25 = f.label :push_events, class: 'list-label' do
26 %strong Push events 26 %strong Push events
27 %p.light 27 %p.light
28 - This url will be triggered in case of push to repository 28 + This url will be triggered by a push to the repository
29 %div 29 %div
30 = f.check_box :issues_events, class: 'pull-left' 30 = f.check_box :issues_events, class: 'pull-left'
31 .prepend-left-20 31 .prepend-left-20
32 = f.label :issues_events, class: 'list-label' do 32 = f.label :issues_events, class: 'list-label' do
33 %strong Issues events 33 %strong Issues events
34 %p.light 34 %p.light
35 - This url will be triggered for created issues 35 + This url will be triggered when an issue is created
36 %div 36 %div
37 = f.check_box :merge_requests_events, class: 'pull-left' 37 = f.check_box :merge_requests_events, class: 'pull-left'
38 .prepend-left-20 38 .prepend-left-20
39 = f.label :merge_requests_events, class: 'list-label' do 39 = f.label :merge_requests_events, class: 'list-label' do
40 %strong Merge Request events 40 %strong Merge Request events
41 %p.light 41 %p.light
42 - This url will be triggered for created merge requests 42 + This url will be triggered when a merge request is created
43 .form-actions 43 .form-actions
44 = f.submit "Add Web Hook", class: "btn btn-create" 44 = f.submit "Add Web Hook", class: "btn btn-create"
45 45