summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-19 16:11:48 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-19 16:11:48 -0600
commit8f391fd373a3789b021d07bb23dc837e91c65da2 (patch)
tree2da3855c03b945b7d0db11e0b21e602ef171f879 /app
parent7b3ea49a4449686e512a5236c2d4073641afce77 (diff)
downloadgitlab-ce-8f391fd373a3789b021d07bb23dc837e91c65da2.tar.gz
Renamed a file to make the transition to EE easier
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/settings/integrations/_project_hook.html.haml (renamed from app/views/projects/hooks/_project_hook.html.haml)2
-rw-r--r--app/views/shared/web_hooks/_form.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/settings/integrations/_project_hook.html.haml
index 5a22e6cdf99..ceabe2eab3d 100644
--- a/app/views/projects/hooks/_project_hook.html.haml
+++ b/app/views/projects/settings/integrations/_project_hook.html.haml
@@ -10,6 +10,6 @@
%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
+ = 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.