diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-01-27 19:37:44 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-01-31 12:32:03 -0800 |
| commit | 440b31ed1602c71e34ec38f53bc3820f85eddaa9 (patch) | |
| tree | 9c4bf871d520c52a20616a51c918530fa9beac7d | |
| parent | 881f5225f2e5ce9613e2039d5ed242b29292935a (diff) | |
| download | gitlab-ce-440b31ed1602c71e34ec38f53bc3820f85eddaa9.tar.gz | |
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
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-cancel-integration-settings.yml | 4 |
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: |