diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-06-11 18:06:57 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-06-11 18:06:57 +0200 |
| commit | 8f142c4aaeac73743196b1648677eb712f70c87b (patch) | |
| tree | bbc416fa35d9d766836a3d6eb2c373c6a6be7488 | |
| parent | 8362293025ddd3636af03517ebd24ac99fe08354 (diff) | |
| parent | 148178fb9884b131d64f4e39f39064a8821e737a (diff) | |
| download | gitlab-ce-8f142c4aaeac73743196b1648677eb712f70c87b.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/views/profiles/two_factor_auths/new.html.haml | 13 | ||||
| -rw-r--r-- | doc/workflow/two_factor_authentication.md | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/app/views/profiles/two_factor_auths/new.html.haml b/app/views/profiles/two_factor_auths/new.html.haml index b9f3e2380fe..74268c9bde2 100644 --- a/app/views/profiles/two_factor_auths/new.html.haml +++ b/app/views/profiles/two_factor_auths/new.html.haml @@ -2,8 +2,10 @@ %h2.page-title Two-Factor Authentication (2FA) %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('workflow', 'two_factor_authentication'))}. %hr @@ -12,10 +14,9 @@ .alert.alert-danger = @error .form-group - .col-sm-2 - .col-sm-2 + .col-lg-2.col-lg-offset-2 = raw @qr_code - .col-sm-8.manual-instructions + .col-lg-7.col-lg-offset-1.manual-instructions %h3 Can't scan the code? %p @@ -33,7 +34,7 @@ %dd Yes .form-group = 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 .form-actions = submit_tag 'Submit', class: 'btn btn-success' diff --git a/doc/workflow/two_factor_authentication.md b/doc/workflow/two_factor_authentication.md index 7c45d23c99d..fb215c8b269 100644 --- a/doc/workflow/two_factor_authentication.md +++ b/doc/workflow/two_factor_authentication.md @@ -45,7 +45,7 @@ storage in a safe place. **Each code can be used only once** to log in to your account. 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 @@ -60,8 +60,8 @@ your phone's application or a recovery code to log in. 1. Log in to your GitLab account. 1. Go to your **Profile Settings**. -1. Go to **Acount**. +1. Go to **Account**. 1. Click **Disable Two-factor Authentication**. [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en -[FreeOTP]: https://fedorahosted.org/freeotp/
\ No newline at end of file +[FreeOTP]: https://fedorahosted.org/freeotp/ |