Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 11 insertions, 1 deletions

diff --git a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
index a8a89d0644a..1adb6f9c26f 100644
--- a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
+++ b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
@@ -2,7 +2,15 @@ import Vue from 'vue';
 
 export function confirmAction(
   message,
-  { primaryBtnVariant, primaryBtnText, modalHtmlMessage, title, hideCancel } = {},
+  {
+    primaryBtnVariant,
+    primaryBtnText,
+    secondaryBtnVariant,
+    secondaryBtnText,
+    modalHtmlMessage,
+    title,
+    hideCancel,
+  } = {},
 ) {
   return new Promise((resolve) => {
     let confirmed = false;
@@ -16,6 +24,8 @@ export function confirmAction(
           'confirm-modal',
           {
             props: {
+              secondaryText: secondaryBtnText,
+              secondaryVariant: secondaryBtnVariant,
               primaryVariant: primaryBtnVariant,
               primaryText: primaryBtnText,
               title,