Add latest changes from gitlab-org/gitlab@15-6-stable-ee

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');
   }
 }