diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-04 23:14:04 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-04 23:14:04 +0000 |
commit | 67136007933425414293602bc75d2ba4822f2a93 (patch) | |
tree | e7cf1c00d7822ca9fccbbec15c4aff649e3880ba | |
parent | 8f9586421dc3327845e9ebc4b706daabf2e10ff6 (diff) | |
parent | a1597d22aecfb65dc1a3f063f574622cf6768d1d (diff) | |
download | gitlab-ce-67136007933425414293602bc75d2ba4822f2a93.tar.gz |
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
-rw-r--r-- | app/views/profiles/two_factor_auths/new.html.haml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/profiles/two_factor_auths/new.html.haml b/app/views/profiles/two_factor_auths/new.html.haml index 5d342ef58e5..69fc81cb45c 100644 --- a/app/views/profiles/two_factor_auths/new.html.haml +++ b/app/views/profiles/two_factor_auths/new.html.haml @@ -8,8 +8,6 @@ Increase your account's security by enabling two-factor authentication (2FA). .col-lg-9 %p - Status: #{current_user.two_factor_enabled? ? 'enabled' : 'disabled'} - %p 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'))}. .row.append-bottom-10 |