From 8f391fd373a3789b021d07bb23dc837e91c65da2 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Thu, 19 Jan 2017 16:11:48 -0600 Subject: Renamed a file to make the transition to EE easier --- app/views/projects/hooks/_project_hook.html.haml | 15 --------------- .../settings/integrations/_project_hook.html.haml | 15 +++++++++++++++ app/views/shared/web_hooks/_form.html.haml | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 app/views/projects/hooks/_project_hook.html.haml create mode 100644 app/views/projects/settings/integrations/_project_hook.html.haml diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/hooks/_project_hook.html.haml deleted file mode 100644 index 5a22e6cdf99..00000000000 --- a/app/views/projects/hooks/_project_hook.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -%li - .row - .col-md-8.col-lg-7 - %strong.light-header= hook.url - %div - - %w(push_events tag_push_events issues_events confidential_issues_events note_events merge_requests_events build_events pipeline_events wiki_page_events).each do |trigger| - - if hook.send(trigger) - %span.label.label-gray.deploy-project-label= trigger.titleize - .col-md-4.col-lg-5.text-right-lg.prepend-top-5 - %span.append-right-10.inline - SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"} - = link_to "Test", test_namespace_project_hook_path(@project.namespace, @project, hook), class: "btn btn-sm" - = link_to namespace_project_settings_integrations_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent" do - %span.sr-only Remove - = icon('trash') diff --git a/app/views/projects/settings/integrations/_project_hook.html.haml b/app/views/projects/settings/integrations/_project_hook.html.haml new file mode 100644 index 00000000000..ceabe2eab3d --- /dev/null +++ b/app/views/projects/settings/integrations/_project_hook.html.haml @@ -0,0 +1,15 @@ +%li + .row + .col-md-8.col-lg-7 + %strong.light-header= hook.url + %div + - %w(push_events tag_push_events issues_events confidential_issues_events note_events merge_requests_events build_events pipeline_events wiki_page_events).each do |trigger| + - if hook.send(trigger) + %span.label.label-gray.deploy-project-label= trigger.titleize + .col-md-4.col-lg-5.text-right-lg.prepend-top-5 + %span.append-right-10.inline + SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"} + = link_to "Test", test_namespace_project_hook_path(@project.namespace, @project, hook), class: "btn btn-sm" + = link_to namespace_project_hook_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent" do + %span.sr-only Remove + = icon('trash') diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index edbaa885780..13586a5a12a 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -96,7 +96,7 @@ - if hooks.any? %ul.well-list - hooks.each do |hook| - = render "projects/hooks/project_hook", hook: hook + = render "project_hook", hook: hook - else %p.settings-message.text-center.append-bottom-0 No webhooks found, add one in the form above. -- cgit v1.2.1