kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Clement Ho 2017-01-27 19:37:44 +00:00
parent 2f78ee2989 f68eceadcb
commit 437722be38
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/services/_form.html.haml
View File

@ -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"

4
changelogs/unreleased/fix-cancel-integration-settings.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fixed services form cancel not redirecting back the integrations settings view
merge_request: 8843
author: