diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-26 16:01:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-26 16:01:39 +0000 |
| commit | 15f2a440a8728bb076c155eee170af2b51946caa (patch) | |
| tree | f51db3a0b1cf7ad8a546ae172d996bf168a157a6 | |
| parent | 5a6ab1d0facfd9dfd570d5206ff209ce0a4be483 (diff) | |
| parent | c9f0de0598a6b47412ecdf2bb8931b8e1d4dcab8 (diff) | |
| download | gitlab-ce-15f2a440a8728bb076c155eee170af2b51946caa.tar.gz | |
Merge branch 'patch-12' into 'master'
make a note to highlight 2FA needs time sync'd
See merge request !8810
| -rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index 0f959b956a5..df33d54cc26 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -207,8 +207,12 @@ after the administrator disables it. ## Note to GitLab administrators -You need to take special care to that 2FA keeps working after -[restoring a GitLab backup](../../../raketasks/backup_restore.md). +- You need to take special care to that 2FA keeps working after +[restoring a GitLab backup](../raketasks/backup_restore.md). + +- To ensure 2FA authorizes correctly with TOTP server, you may want to ensure +your GitLab server's time is synchronized via a service like NTP. Otherwise, +you may have cases where authorization always fails because of time differences. [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en [FreeOTP]: https://fedorahosted.org/freeotp/ |