summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-05-10 02:53:16 +0100
committerGabriel Mazetto <brodock@gmail.com>2017-05-12 23:26:48 +0100
commitdffeb1a48db1a3becc8e11885fd28c0b5030eed7 (patch)
treeca4d9494c65f574d4e92bcc589d1abb3426de4b4
parent551c000d6175d037cb896115d920dfd9f0c79e20 (diff)
downloadgitlab-ce-dffeb1a48db1a3becc8e11885fd28c0b5030eed7.tar.gz
Minor cosmetic fixes in hooks admin screen
-rw-r--r--app/views/admin/hooks/_form.html.haml6
-rw-r--r--app/views/admin/hooks/index.html.haml2
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml
index 7f7377b1da1..645005c6deb 100644
--- a/app/views/admin/hooks/_form.html.haml
+++ b/app/views/admin/hooks/_form.html.haml
@@ -23,21 +23,21 @@
= form.label :repository_update_events, class: 'list-label' do
%strong Repository update events
%p.light
- This url will be triggered when repository is updated
+ This URL will be triggered when repository is updated
%div
= form.check_box :push_events, class: 'pull-left'
.prepend-left-20
= form.label :push_events, class: 'list-label' do
%strong Push events
%p.light
- This url will be triggered for each branch updated to the repository
+ This URL will be triggered for each branch updated to the repository
%div
= form.check_box :tag_push_events, class: 'pull-left'
.prepend-left-20
= form.label :tag_push_events, class: 'list-label' do
%strong Tag push events
%p.light
- This url will be triggered when a new tag is pushed to the repository
+ This URL will be triggered when a new tag is pushed to the repository
.form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'control-label checkbox'
.col-sm-10
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 43df8b62367..3338b677bf5 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -27,7 +27,7 @@
= link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: 'btn btn-remove btn-sm'
.monospace= hook.url
%div
- - %w(push_events tag_push_events issues_events note_events merge_requests_events build_events repository_update_events).each do |trigger|
+ - %w(repository_update_events push_events tag_push_events issues_events note_events merge_requests_events build_events).each do |trigger|
- if hook.send(trigger)
%span.label.label-gray= trigger.titleize
%span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}