Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/hooks')
-rw-r--r--app/views/projects/hooks/index.html.haml27
1 files changed, 13 insertions, 14 deletions
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index e1166742b2e..dac6a698bdc 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -7,20 +7,18 @@
%hr.clearfix
-= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
+= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f|
-if @hook.errors.any?
- .alert.alert-error
+ .alert.alert-danger
- @hook.errors.full_messages.each do |msg|
%p= msg
- .control-group
- = f.label :url, "URL"
- .controls
- = f.text_field :url, class: "text_field input-xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
-  
- = f.submit "Add Web Hook", class: "btn btn-create"
- .control-group
- = f.label :url, "Trigger"
- .controls
+ .form-group
+ = f.label :url, "URL", class: 'control-label'
+ .col-sm-10
+ = f.text_field :url, class: "form-control", placeholder: 'http://example.com/trigger-ci.json'
+ .form-group
+ = f.label :url, "Trigger", class: 'control-label'
+ .col-sm-10
%div
= f.check_box :push_events, class: 'pull-left'
.prepend-left-20
@@ -42,18 +40,19 @@
%strong Merge Request events
%p.light
This url will be triggered for created merge requests
-%hr
+ .form-actions
+ = f.submit "Add Web Hook", class: "btn btn-create"
-if @hooks.any?
.ui-box
.title
- Web Hooks (#{@hooks.count})
+ Web hooks (#{@hooks.count})
%ul.well-list
- @hooks.each do |hook|
%li
.pull-right
= link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
- = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
+ = link_to 'Remove', project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-small grouped"
.clearfix
%span.monospace= hook.url
%p