Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration/omniauth.md')
-rw-r--r--doc/integration/omniauth.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 296de9e511a..aac2820a69e 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -293,16 +293,18 @@ When authenticating using LDAP, the user's name and email are always synced.
> Introduced in GitLab 12.3.
-With certain OmniAuth providers, users can sign in without
-using two-factor authentication.
+With certain OmniAuth providers, users can sign in without using two-factor authentication (2FA).
-To bypass two-factor authentication, you can either:
+Because of a [known issue](https://gitlab.com/gitlab-org/gitlab/-/issues/196131) users must
+[set up 2FA](../user/profile/account/two_factor_authentication.md#enable-two-factor-authentication) on their GitLab
+account to bypass 2FA. Otherwise, they are prompted to set up 2FA when they sign in to GitLab.
+
+To bypass 2FA, you can either:
- Define the allowed providers using an array (for example, `['twitter', 'google_oauth2']`).
- Specify `true` to allow all providers, or `false` to allow none.
-This option should be configured only for providers that already have
-two-factor authentication. The default is `false`.
+This option should be configured only for providers that already have 2FA. The default is `false`.
This configuration doesn't apply to SAML.