kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Jacob Schatz 2016-04-04 23:14:04 +00:00
parent 8f9586421d a1597d22ae
commit 6713600793
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/profiles/two_factor_auths/new.html.haml
View File

@ -7,8 +7,6 @@
%p
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'))}.