Commit 67136007 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'remove-2fa-status' into 'master'

Remove 2FA status on enable page

The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled.

### Before

![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png)

### After
![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png)

See merge request !3436
parents 8f958642 a1597d22
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
%p %p
Increase your account's security by enabling two-factor authentication (2FA). Increase your account's security by enabling two-factor authentication (2FA).
.col-lg-9 .col-lg-9
%p
Status: #{current_user.two_factor_enabled? ? 'enabled' : 'disabled'}
%p %p
Download the Google Authenticator application from App Store for iOS or Google Play for Android and scan this code. Download the Google Authenticator application from App Store for iOS or Google Play for Android and scan this code.
More information is available in the #{link_to('documentation', help_page_path('profile', 'two_factor_authentication'))}. More information is available in the #{link_to('documentation', help_page_path('profile', 'two_factor_authentication'))}.
......
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