diff options
Diffstat (limited to 'doc/security')
-rw-r--r-- | doc/security/rack_attack.md | 2 | ||||
-rw-r--r-- | doc/security/two_factor_authentication.md | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md index d3de2222c39..b386917f399 100644 --- a/doc/security/rack_attack.md +++ b/doc/security/rack_attack.md @@ -4,8 +4,6 @@ type: reference, howto # Rack Attack initializer -## Overview - [Rack Attack](https://github.com/kickstarter/rack-attack), also known as Rack::Attack, is a Ruby gem that is meant to protect GitLab with the ability to customize throttling and to block user IP addresses. 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: |