Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.stories.js b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.stories.js
index 6629b293eb9..8481280f25f 100644
--- a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.stories.js
+++ b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.stories.js
@@ -14,6 +14,8 @@ const Template = (args, { argTypes }) => ({
     additionalInformation: args.additionalInformation || null,
     confirmDangerMessage: args.confirmDangerMessage || 'You require more Vespene Gas',
     htmlConfirmationMessage: args.confirmDangerMessage || false,
+    confirmButtonText: args.confirmButtonText || 'Cancel',
+    cancelButtonText: args.cancelButtonText || 'Confirm',
   },
 });
 
diff --git a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue
index 88890b3332d..37e480f7e41 100644
--- a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue
+++ b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue
@@ -12,7 +12,7 @@ import {
   CONFIRM_DANGER_MODAL_TITLE,
   CONFIRM_DANGER_PHRASE_TEXT,
   CONFIRM_DANGER_WARNING,
-  CONFIRM_DANGER_MODAL_ERROR,
+  CONFIRM_DANGER_MODAL_CANCEL,
 } from './constants';
 
 export default {
@@ -40,6 +40,9 @@ export default {
     additionalInformation: {
       default: CONFIRM_DANGER_WARNING,
     },
+    cancelButtonText: {
+      default: CONFIRM_DANGER_MODAL_CANCEL,
+    },
   },
   props: {
     modalId: {
@@ -66,6 +69,11 @@ export default {
         attributes: [{ variant: 'danger', disabled: !this.isValid, class: 'qa-confirm-button' }],
       };
     },
+    actionCancel() {
+      return {
+        text: this.cancelButtonText,
+      };
+    },
   },
   methods: {
     equalString(a, b) {
@@ -77,7 +85,6 @@ export default {
     CONFIRM_DANGER_MODAL_TITLE,
     CONFIRM_DANGER_WARNING,
     CONFIRM_DANGER_PHRASE_TEXT,
-    CONFIRM_DANGER_MODAL_ERROR,
   },
 };
 </script>
@@ -88,6 +95,7 @@ export default {
     :data-testid="modalId"
     :title="$options.i18n.CONFIRM_DANGER_MODAL_TITLE"
     :action-primary="actionPrimary"
+    :action-cancel="actionCancel"
     @primary="$emit('confirm')"
   >
     <gl-alert
@@ -110,7 +118,7 @@ export default {
         </template>
       </gl-sprintf>
     </p>
-    <gl-form-group :state="isValid" :invalid-feedback="$options.i18n.CONFIRM_DANGER_MODAL_ERROR">
+    <gl-form-group :state="isValid">
       <gl-form-input
         id="confirm_name_input"
         v-model="confirmationPhrase"
diff --git a/app/assets/javascripts/vue_shared/components/confirm_danger/constants.js b/app/assets/javascripts/vue_shared/components/confirm_danger/constants.js
index fa44a9be411..90d55d0f93f 100644
--- a/app/assets/javascripts/vue_shared/components/confirm_danger/constants.js
+++ b/app/assets/javascripts/vue_shared/components/confirm_danger/constants.js
@@ -2,7 +2,6 @@ import { __ } from '~/locale';
 
 export const CONFIRM_DANGER_MODAL_ID = 'confirm-danger-modal';
 export const CONFIRM_DANGER_MODAL_TITLE = __('Confirmation required');
-export const CONFIRM_DANGER_MODAL_ERROR = __('Confirmation required');
 export const CONFIRM_DANGER_MODAL_BUTTON = __('Confirm');
 export const CONFIRM_DANGER_WARNING = __(
   'This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention.',
@@ -10,3 +9,4 @@ export const CONFIRM_DANGER_WARNING = __(
 export const CONFIRM_DANGER_PHRASE_TEXT = __(
   'Please type %{phrase_code} to proceed or close this modal to cancel.',
 );
+export const CONFIRM_DANGER_MODAL_CANCEL = __('Cancel');