Merge branch 'fix-edit-project-service-cancel-button-position' into 'master'

Fix edit project service cancel button position

See merge request gitlab-org/gitlab-ce!14596

app/views/projects/services/_form.html.haml

@@ -23,7 +23,7 @@
               - disabled_class = 'disabled'
               - disabled_title = @service.disabled_title
 
-        = link_to 'Cancel', project_settings_integrations_path(@project), class: 'btn btn-cancel'
+          = link_to 'Cancel', project_settings_integrations_path(@project), class: 'btn btn-cancel'
 
 - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
   %hr

changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml

+---
+title: Fix edit project service cancel button position
+merge_request: 14596
+author: Matt Coleman
+type: fixed