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

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Browse source
This commit is contained in:
Sytse Sijbrandij 2015-06-11 18:06:57 +02:00
commit 8f142c4aae
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/views/profiles/two_factor_auths/new.html.haml
View file

@ -2,8 +2,10 @@
%h2.page-title Two-Factor Authentication (2FA) %h2.page-title Two-Factor Authentication (2FA)
%p %p
Download the Google Authenticator application from App Store for iOS or Download the Google Authenticator application from App Store for iOS or Google
Google Play for Android and scan this code. Play for Android and scan this code.
More information is available in the #{link_to('documentation', help_page_path('workflow', 'two_factor_authentication'))}.
%hr %hr
@ -12,10 +14,9 @@
.alert.alert-danger .alert.alert-danger
= @error = @error
.form-group .form-group
.col-sm-2 .col-lg-2.col-lg-offset-2
.col-sm-2
= raw @qr_code = raw @qr_code
.col-sm-8.manual-instructions .col-lg-7.col-lg-offset-1.manual-instructions
%h3 Can't scan the code? %h3 Can't scan the code?
%p %p
@ -33,7 +34,7 @@
%dd Yes %dd Yes
.form-group .form-group
= label_tag :pin_code, nil, class: "control-label" = label_tag :pin_code, nil, class: "control-label"
.col-sm-10 .col-lg-10
= text_field_tag :pin_code, nil, class: "form-control", required: true, autofocus: true = text_field_tag :pin_code, nil, class: "form-control", required: true, autofocus: true
.form-actions .form-actions
= submit_tag 'Submit', class: 'btn btn-success' = submit_tag 'Submit', class: 'btn btn-success'

6
doc/workflow/two_factor_authentication.md
View file

@ -45,7 +45,7 @@ storage in a safe place. **Each code can be used only once** to log in to your
account. account.
If you lose the recovery codes or just want to generate new ones, you can do so If you lose the recovery codes or just want to generate new ones, you can do so
from the **Profile Settings** > **Acount** page where you first enabled 2FA. from the **Profile Settings** > **Account** page where you first enabled 2FA.
## Logging in with 2FA Enabled ## Logging in with 2FA Enabled
@ -60,8 +60,8 @@ your phone's application or a recovery code to log in.
1. Log in to your GitLab account. 1. Log in to your GitLab account.
1. Go to your **Profile Settings**. 1. Go to your **Profile Settings**.
1. Go to **Acount**. 1. Go to **Account**.
1. Click **Disable Two-factor Authentication**. 1. Click **Disable Two-factor Authentication**.
[Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
[FreeOTP]: https://fedorahosted.org/freeotp/ [FreeOTP]: https://fedorahosted.org/freeotp/