summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-27 09:52:09 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-27 11:53:51 -0600
commitf68eceadcbf511d6dd2869e298850634562b6c07 (patch)
tree9c16c355384d4625b6a0b7c4213ef8c9987e6347
parentd777e6f1da98be64b872a2bea2222f3e037a3d4d (diff)
downloadgitlab-ce-fix-cancel-integration-settings.tar.gz
Fixed cancel button in the services form not redirecting back to the integrations settings viewfix-cancel-integration-settings
-rw-r--r--app/views/projects/services/_form.html.haml2
-rw-r--r--changelogs/unreleased/fix-cancel-integration-settings.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index fc338dcf887..f1a80f1d5e1 100644
--- 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"
diff --git a/changelogs/unreleased/fix-cancel-integration-settings.yml b/changelogs/unreleased/fix-cancel-integration-settings.yml
new file mode 100644
index 00000000000..294b0aa5db9
--- /dev/null
+++ b/changelogs/unreleased/fix-cancel-integration-settings.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed services form cancel not redirecting back the integrations settings view
+merge_request: 8843
+author: