diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-06-06 13:11:01 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-06-06 13:11:01 +0000 |
| commit | 509fe1159a76f325840987bd3d1a1db577569772 (patch) | |
| tree | f167361a48901807edda6f25b3e5f23f8fd61e6e /doc/workflow | |
| parent | e73d7b6766aa2e22fafe247a4061698a148e72aa (diff) | |
| parent | 975d11068833048eb50da8b4b79c7f7220c33b9a (diff) | |
| download | gitlab-ce-509fe1159a76f325840987bd3d1a1db577569772.tar.gz | |
Merge branch 'master' into 'master'
Doc: Added FreeOTP to 2FA
I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.
See merge request !777
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/two_factor_authentication.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/workflow/two_factor_authentication.md b/doc/workflow/two_factor_authentication.md index 8ac1ca4b351..7c45d23c99d 100644 --- a/doc/workflow/two_factor_authentication.md +++ b/doc/workflow/two_factor_authentication.md @@ -21,7 +21,8 @@ is to know your username and password *and* have access to your phone. **On your phone:** -1. Install a compatible application. We recommend [Google Authenticator]. +1. Install a compatible application. We recommend [Google Authenticator] +\(proprietary\) or [FreeOTP] \(open source\). 1. In the application, add a new entry in one of two ways: * Scan the code with your phone's camera to add the entry automatically. * Enter the details provided to add the entry manually. @@ -63,3 +64,4 @@ your phone's application or a recovery code to log in. 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 |