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 90d55d0f93f9cce25e0a3acdc53af2e9cb34a41c..c6b9e61b85f4322c1e910b0a43a62737fd65ccf8 100644 --- a/app/assets/javascripts/vue_shared/components/confirm_danger/constants.js +++ b/app/assets/javascripts/vue_shared/components/confirm_danger/constants.js @@ -6,7 +6,5 @@ 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.', ); -export const CONFIRM_DANGER_PHRASE_TEXT = __( - 'Please type %{phrase_code} to proceed or close this modal to cancel.', -); +export const CONFIRM_DANGER_PHRASE_TEXT = __('Please type %{phrase_code} to proceed.'); export const CONFIRM_DANGER_MODAL_CANCEL = __('Cancel'); diff --git a/ee/spec/features/groups/sso_spec.rb b/ee/spec/features/groups/sso_spec.rb index 28e6128219941505fbad24ab1efd317158f1a7c4..af4309b13dad9d362c59da796d54a6a41180527b 100644 --- a/ee/spec/features/groups/sso_spec.rb +++ b/ee/spec/features/groups/sso_spec.rb @@ -55,7 +55,7 @@ click_button('Transfer ownership') expect(page).to have_content('This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention.') - expect(page).to have_content("Please type #{user.username} to proceed or close this modal to cancel.") + expect(page).to have_content("Please type #{user.username} to proceed.") fill_in 'confirm_name_input', with: user.username click_button 'Confirm' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8357366ae54ff72db73e976d6406f0b73ad4f7c1..ff7bea3df77d5c9b84b4c5c801a4acff89f53e0f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -34328,7 +34328,7 @@ msgstr "" msgid "Please try and refresh the page. If the problem persists please contact support." msgstr "" -msgid "Please type %{phrase_code} to proceed or close this modal to cancel." +msgid "Please type %{phrase_code} to proceed." msgstr "" msgid "Please use this form to report to the administrator users who create spam issues, comments or behave inappropriately." diff --git a/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js b/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js index d7f94c00d093d1bd43d131cd66c8838860c13392..0b5c8d9afc3230582dcbe6c43ae8b1c6a09b555b 100644 --- a/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js +++ b/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js @@ -60,9 +60,7 @@ describe('Confirm Danger Modal', () => { }); it('renders the correct confirmation phrase', () => { - expect(findConfirmationPhrase().text()).toBe( - `Please type ${phrase} to proceed or close this modal to cancel.`, - ); + expect(findConfirmationPhrase().text()).toBe(`Please type ${phrase} to proceed.`); }); describe('without injected data', () => {