diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-04 16:47:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-04 16:47:40 +0000 |
| commit | 4155a62f3bdc6e412e91b641412f0a03ecc49d59 (patch) | |
| tree | 6fb372c4ede2a864e91c791d730a3e4bcaef770f | |
| parent | 6552ec3d266298fe3ff52de45aadda579dfd79ae (diff) | |
| parent | 10aa165e8a3ee1b4c49747c09e9231a450e9c8ce (diff) | |
| download | gitlab-ce-4155a62f3bdc6e412e91b641412f0a03ecc49d59.tar.gz | |
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
| -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 |