diff options
author | dodocat <jingqq5210@gmail.com> | 2019-08-27 06:46:32 +0300 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-08-27 06:46:32 +0300 |
commit | 6e2032f24e0428189f8c9fe9e296a9630277155e (patch) | |
tree | 79ed8e273c4ee80512a11ca1029cd20426625457 /doc/integration | |
parent | 5e59c919d780441a5605d76e76ce63a69166464d (diff) |
Update docs and comments about saml with allow_bypass_two_factor
allow_bypass_two_factor configration dose not work with saml provider
Diffstat (limited to 'doc/integration')
-rw-r--r-- | doc/integration/omniauth.md | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 7a92ed994c7..0fc5a25ae33 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -277,3 +277,23 @@ omniauth: sync_profile_from_provider: ['twitter', 'google_oauth2'] sync_profile_attributes: ['email', 'location'] ``` +## Bypassing two factor authentication + +Starting with GitLab 12.3, this allows users to login with the specified +providers without two factor authentication. + +Define the allowed providers using an array, e.g. `["twitter", 'google_oauth2']`, or as +`true`/`false` to allow all providers or none. This option should only be configured +for providers which already have two factor authentication (default: false). +This configration dose not apply to SAML. + +```ruby +gitlab_rails['omniauth_allow_bypass_two_factor'] = ['twitter', 'google_oauth2'] +``` + +**For installations from source** + +```yaml +omniauth: + allow_bypass_two_factor: ['twitter', 'google_oauth2'] +``` |