diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 00:10:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 00:10:16 +0000 |
| commit | 186e045e14c941ac0b8490a0ff92694b186990ad (patch) | |
| tree | b23da6dbe8e716ab6b798b28d3ceb5ba30e36e0e /doc/security/two_factor_authentication.md | |
| parent | 15229b03e058208b2feac568832eb43f109ac3cd (diff) | |
| download | gitlab-ce-186e045e14c941ac0b8490a0ff92694b186990ad.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/security/two_factor_authentication.md')
| -rw-r--r-- | doc/security/two_factor_authentication.md | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md index 9d49e1d3af2..0c2d616b003 100644 --- a/doc/security/two_factor_authentication.md +++ b/doc/security/two_factor_authentication.md @@ -68,6 +68,17 @@ The following are important notes about 2FA: ## Disabling 2FA for everyone +CAUTION: **Caution:** +Disabling 2FA for everyone does not disable the [enforce 2FA for all users](#enforcing-2fa-for-all-users) +or [enforce 2FA for all users in a group](#enforcing-2fa-for-all-users-in-a-group) +settings. In addition to the steps in this section, you will need to disable any enforced 2FA +settings so users aren't asked to set up 2FA again, the next time the user signs in to GitLab. +Disabling 2FA for everyone does not disable the [enforce 2FA for all users](#enforcing-2fa-for-all-users) +or [enforce 2FA for all users in a group](#enforcing-2fa-for-all-users-in-a-group) +settings if they have been configured. In addition to the steps in this section, +you will need to disable any enforced 2FA settings so users aren't asked to setup +2FA again when the next login to GitLab. + There may be some special situations where you want to disable 2FA for everyone even when forced 2FA is disabled. There is a Rake task for that: |