diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-05 09:19:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-05 09:19:08 +0300 |
commit | 856f7ae4d12afea169d4929c0c1b34bc40a6ca28 (patch) | |
tree | 33b9f8ee7b0ce781d8d6811502be3684b4a81301 /app | |
parent | f1bf55111e2da793469b992bbc5c0db0a73edbe2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/blob_edit/blob_bundle.js | 2 | ||||
-rw-r--r-- | app/views/projects/_commit_button.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js index 2d9ffda06d0..5d1c1e15d15 100644 --- a/app/assets/javascripts/blob_edit/blob_bundle.js +++ b/app/assets/javascripts/blob_edit/blob_bundle.js @@ -71,7 +71,7 @@ export default () => { const isMarkdown = editBlobForm.data('is-markdown'); const previewMarkdownPath = editBlobForm.data('previewMarkdownPath'); const commitButton = $('.js-commit-button'); - const cancelLink = $('.btn.btn-cancel'); + const cancelLink = $('#cancel-changes'); import('./edit_blob') .then(({ default: EditBlob } = {}) => { diff --git a/app/views/projects/_commit_button.html.haml b/app/views/projects/_commit_button.html.haml index 2c18921d874..d987c4b1033 100644 --- a/app/views/projects/_commit_button.html.haml +++ b/app/views/projects/_commit_button.html.haml @@ -2,6 +2,6 @@ = button_tag 'Commit changes', id: 'commit-changes', class: 'gl-button btn btn-confirm js-commit-button qa-commit-button' = link_to _('Cancel'), cancel_path, - class: 'gl-button btn btn-default gl-ml-3', data: {confirm: leave_edit_message} + id: 'cancel-changes', class: 'gl-button btn btn-default gl-ml-3', data: {confirm: leave_edit_message, confirm_btn_variant: "danger"}, aria: { label: _('Discard changes') } = render 'shared/projects/edit_information' |