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

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

Browse source 
Fix edit project service cancel button position

See merge request gitlab-org/gitlab-ce!14596
This commit is contained in:
Rémy Coutable 2017-10-04 16:47:40 +00:00
commit 4155a62f3b
2 changed files with 6 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

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

5
changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix edit project service cancel button position
merge_request: 14596
author: Matt Coleman
type: fixed