diff options
| author | dodocat <jingqq5210@gmail.com> | 2019-08-27 03:46:32 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-08-27 03:46:32 +0000 |
| commit | 6e2032f24e0428189f8c9fe9e296a9630277155e (patch) | |
| tree | 79ed8e273c4ee80512a11ca1029cd20426625457 /config/gitlab.yml.example | |
| parent | 5e59c919d780441a5605d76e76ce63a69166464d (diff) | |
| download | gitlab-ce-6e2032f24e0428189f8c9fe9e296a9630277155e.tar.gz | |
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 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 973c2747838..20b1020e025 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -780,6 +780,14 @@ production: &base # (default: []) external_providers: [] + # CAUTION! + # This allows users to login with the specified providers without two factor. 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. + # This configration dose not apply to SAML. + # (default: false) + allow_bypass_two_factor: ["twitter", 'google_oauth2'] + ## Auth providers # Uncomment the following lines and fill in the data of the auth provider you want to use # If your favorite auth provider is not listed you can use others: |