Commit 21c17c0f authored by Phil Hughes's avatar Phil Hughes

Merge branch 'accounts-show-scb' into 'master'

Resolve CE/EE diffs in accounts/show

Closes #11046

See merge request gitlab-org/gitlab-ee!12733
parents 0922941d 95118575
......@@ -8,17 +8,17 @@
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4.prepend-top-0
= s_("Profiles|Two-Factor Authentication")
= s_('Profiles|Two-Factor Authentication')
%p
= s_("Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)")
.col-lg-8
%p
#{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')}
- if current_user.two_factor_enabled?
= link_to _("Manage two-factor authentication"), profile_two_factor_auth_path, class: 'btn btn-info'
= link_to _('Manage two-factor authentication'), profile_two_factor_auth_path, class: 'btn btn-info'
- else
.append-bottom-10
= link_to _("Enable two-factor authentication"), profile_two_factor_auth_path, class: 'btn btn-success'
= link_to _('Enable two-factor authentication'), profile_two_factor_auth_path, class: 'btn btn-success'
%hr
- if display_providers_on_profile?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment