diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 22:40:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 22:40:33 +0300 |
commit | d7c5be92af9c10cf20e78363c188c1a707a6bb90 (patch) | |
tree | df2d354bc4277c7a0324fb8240bd4e24d58007f2 /app/assets/javascripts | |
parent | b28d1361dd1ec63053dbfae475097928c6d01116 (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-ee
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/branches/components/delete_branch_modal.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/header.js | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/branches/components/delete_branch_modal.vue b/app/assets/javascripts/branches/components/delete_branch_modal.vue index 383fa5f7512..d5631337cec 100644 --- a/app/assets/javascripts/branches/components/delete_branch_modal.vue +++ b/app/assets/javascripts/branches/components/delete_branch_modal.vue @@ -76,7 +76,9 @@ export default { this.$refs.modal.show(); }, submitForm() { - this.$refs.form.submit(); + if (!this.deleteButtonDisabled) { + this.$refs.form.submit(); + } }, closeModal() { this.$refs.modal.hide(); @@ -127,7 +129,7 @@ export default { </div> </gl-alert> - <form ref="form" :action="deletePath" method="post"> + <form ref="form" :action="deletePath" method="post" @submit.prevent> <div v-if="isProtectedBranch" class="gl-mt-4"> <p> <gl-sprintf :message="undoneWarning"> @@ -150,6 +152,7 @@ export default { class="gl-mt-4" aria-labelledby="input-label" autocomplete="off" + @keyup.enter="submitForm" /> </p> </div> diff --git a/app/assets/javascripts/header.js b/app/assets/javascripts/header.js index 9b6113c7444..4d03a523486 100644 --- a/app/assets/javascripts/header.js +++ b/app/assets/javascripts/header.js @@ -84,6 +84,8 @@ function initStatusTriggers() { }) .catch(() => {}); }); + + setStatusModalTriggerEl.classList.add('ready'); } } |