Commit 4155a62f authored by Rémy Coutable's avatar Rémy Coutable

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
parents 6552ec3d 10aa165e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
- disabled_class = 'disabled' - disabled_class = 'disabled'
- disabled_title = @service.disabled_title - 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) - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
%hr %hr
......
---
title: Fix edit project service cancel button position
merge_request: 14596
author: Matt Coleman
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment