diff options
| author | Matt Coleman <matt@datto.com> | 2017-09-29 18:52:07 -0400 |
|---|---|---|
| committer | Matt Coleman <matt@datto.com> | 2017-09-29 19:14:46 -0400 |
| commit | 10aa165e8a3ee1b4c49747c09e9231a450e9c8ce (patch) | |
| tree | f6218915276ae9bcea65bb1f96f16cfc6d61e23b | |
| parent | 53b3ad5f7ce50bfdb1dd0c72b3cc2b020f52abe1 (diff) | |
| download | gitlab-ce-10aa165e8a3ee1b4c49747c09e9231a450e9c8ce.tar.gz | |
Fix edit project service cancel button position
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index b842fd57cf3..c0b1c62e8ef 100644 --- a/app/views/projects/services/_form.html.haml +++ b/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 diff --git a/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml b/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml new file mode 100644 index 00000000000..efb993eff71 --- /dev/null +++ b/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml @@ -0,0 +1,5 @@ +--- +title: Fix edit project service cancel button position +merge_request: 14596 +author: Matt Coleman +type: fixed |