Merge branch 'fix-cancel-integration-settings' into 'master'

Fixed cancel button in the services form not redirecting back to the integrations settings view Closes #27301 See merge request !8843

Merge branch 'fix-cancel-integration-settings' into 'master'
437722be · Clement Ho · 2f78ee29 · f68ecead · 437722be · 437722be
Commit 437722be authored Jan 27, 2017 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

_form.html.haml app/views/projects/services/_form.html.haml +1 -1

fix-cancel-integration-settings.yml changelogs/unreleased/fix-cancel-integration-settings.yml +4 -0

No files found.
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -17,4 +17,4 @@
            - disabled_title = @service.disabled_title

          = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title
-        = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
+        = link_to "Cancel", namespace_project_settings_integrations_path(@project.namespace, @project), class: "btn btn-cancel"
--- a/changelogs/unreleased/fix-cancel-integration-settings.yml
+++ b/changelogs/unreleased/fix-cancel-integration-settings.yml
+---
+title: Fixed services form cancel not redirecting back the integrations settings view
+merge_request: 8843
+author: