diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 00:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 00:09:53 +0300 |
| commit | e32167eb636d14acd5e431ccc1e367f9a57d8a4e (patch) | |
| tree | 6abf2993e8ec10e2690c6b2fcda55cbc8fba3a57 /app/views/profiles/two_factor_auths | |
| parent | b07852468f800d751ddecc9e327119d7295f538e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles/two_factor_auths')
| -rw-r--r-- | app/views/profiles/two_factor_auths/_codes.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/two_factor_auths/create.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/two_factor_auths/_codes.html.haml b/app/views/profiles/two_factor_auths/_codes.html.haml index 177e6d5453e..178a9d3f8b4 100644 --- a/app/views/profiles/two_factor_auths/_codes.html.haml +++ b/app/views/profiles/two_factor_auths/_codes.html.haml @@ -1,6 +1,6 @@ - show_success_alert = local_assigns.fetch(:show_success_alert, nil) -- if Feature.enabled?(:vue_2fa_recovery_codes, current_user) +- if Feature.enabled?(:vue_2fa_recovery_codes, current_user, default_enabled: true) .js-2fa-recovery-codes{ data: { codes: @codes.to_json, profile_account_path: profile_account_path(two_factor_auth_enabled_successfully: show_success_alert) } } - else %p.slead diff --git a/app/views/profiles/two_factor_auths/create.html.haml b/app/views/profiles/two_factor_auths/create.html.haml index 5895b88df73..be4800024cf 100644 --- a/app/views/profiles/two_factor_auths/create.html.haml +++ b/app/views/profiles/two_factor_auths/create.html.haml @@ -1,7 +1,7 @@ - page_title _('Two-factor Authentication'), _('Account') - add_page_specific_style 'page_bundles/profile_two_factor_auth' -- unless Feature.enabled?(:vue_2fa_recovery_codes, current_user) +- unless Feature.enabled?(:vue_2fa_recovery_codes, current_user, default_enabled: true) .gl-alert.gl-alert-success.gl-mb-5 = _('Congratulations! You have enabled Two-factor Authentication!') |