diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2016-12-30 13:27:51 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-18 15:19:35 -0600 |
| commit | 1ee4f98694f482099de9f21dc957071e53395313 (patch) | |
| tree | e04958c79acc57c21c16fa3c9b21a359b03b2450 /app | |
| parent | 9f0d794513d2ce1c990e61f4d21efe1dcad845fd (diff) | |
| download | gitlab-ce-1ee4f98694f482099de9f21dc957071e53395313.tar.gz | |
Fixed spinach feature tests for the services and hooks controllers
Added a test for the integrations controller
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/hooks/_project_hook.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/web_hooks/_form.html.haml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/hooks/_project_hook.html.haml index ceabe2eab3d..5a22e6cdf99 100644 --- a/app/views/projects/hooks/_project_hook.html.haml +++ b/app/views/projects/hooks/_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_hook_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent" do + = 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/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index 5d659eb83a9..070c70d28ea 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -1,4 +1,3 @@ -- page_title "Webhooks" - context_title = @project ? 'project' : 'group' .row.prepend-top-default @@ -99,7 +98,7 @@ - if hooks.any? %ul.well-list - hooks.each do |hook| - = render "project_hook", hook: hook + = render "projects/hooks/project_hook", hook: hook - else %p.settings-message.text-center.append-bottom-0 No webhooks found, add one in the form above. |