Commit f8a7b3eb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Resolve web hooks conflicts after merge from CE

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a66986c0
= render "groups/settings_head" = render "groups/settings_head"
= render 'shared/web_hooks/form', hook: @hook, hooks: @hooks, url_components: [@group] .row.prepend-top-default
.col-lg-3
%h4.prepend-top-0
= page_title
%p
#{link_to 'Webhooks', help_page_path('user/project/integrations/webhooks')} can be
used for binding events when something is happening within the project.
.col-lg-9.append-bottom-default
= form_for @hook, as: :hook, url: polymorphic_path([@group, :hooks]) do |f|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
= f.submit 'Add webhook', class: 'btn btn-create'
%hr
%h5.prepend-top-default
Webhooks (#{@hooks.count})
- if @hooks.any?
%ul.well-list
- @hooks.each do |hook|
= render 'project_hook', hook: hook
- else
%p.settings-message.text-center.append-bottom-0
No webhooks found, add one in the form above.
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
.col-lg-9.append-bottom-default .col-lg-9.append-bottom-default
= form_for hook, as: :hook, url: polymorphic_path(url_components + [:hooks]) do |f| = form_for hook, as: :hook, url: polymorphic_path(url_components + [:hooks]) do |f|
= form_errors(hook) = form_errors(hook)
=======
= form_errors(hook) = form_errors(hook)
>>>>>>> ce-com/master
.form-group .form-group
= form.label :url, 'URL', class: 'label-light' = form.label :url, 'URL', class: 'label-light'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment