diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-21 15:08:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-21 15:08:46 +0300 |
commit | 7f521d27811b472c43203ed3d1bde4460a617f89 (patch) | |
tree | 47f1a10b776991e86c6db002bc6e03e83acc356a /app/assets/javascripts/authentication | |
parent | 83e3316a189d3b709b23af30647b5f9ea5377bac (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/authentication')
-rw-r--r-- | app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/authentication/two_factor_auth/index.js | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue index 98ed2a31730..907b68e6ffc 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue @@ -7,7 +7,6 @@ export const i18n = { currentPassword: __('Current password'), confirmTitle: __('Are you sure?'), confirmWebAuthn: __('This will invalidate your registered applications and WebAuthn devices.'), - confirm: __('This will invalidate your registered applications and WebAuthn devices.'), disableTwoFactor: __('Disable two-factor authentication'), disable: __('Disable'), cancel: __('Cancel'), @@ -41,7 +40,6 @@ export default { GlModal, }, inject: [ - 'webauthnEnabled', 'isCurrentPasswordRequired', 'profileTwoFactorAuthPath', 'profileTwoFactorAuthMethod', @@ -59,11 +57,7 @@ export default { }, computed: { confirmText() { - if (this.webauthnEnabled) { - return i18n.confirmWebAuthn; - } - - return i18n.confirm; + return i18n.confirmWebAuthn; }, }, methods: { diff --git a/app/assets/javascripts/authentication/two_factor_auth/index.js b/app/assets/javascripts/authentication/two_factor_auth/index.js index 7d21c19ac4c..cec80335ba0 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/index.js +++ b/app/assets/javascripts/authentication/two_factor_auth/index.js @@ -13,7 +13,6 @@ export const initManageTwoFactorForm = () => { } const { - webauthnEnabled = false, currentPasswordRequired, profileTwoFactorAuthPath = '', profileTwoFactorAuthMethod = '', @@ -26,7 +25,6 @@ export const initManageTwoFactorForm = () => { return new Vue({ el, provide: { - webauthnEnabled, isCurrentPasswordRequired, profileTwoFactorAuthPath, profileTwoFactorAuthMethod, |