diff options
| author | Quanqi Jing <jqq@readboy.com> | 2019-08-23 09:32:11 +0800 |
|---|---|---|
| committer | Quanqi Jing <jqq@readboy.com> | 2019-08-23 14:49:38 +0800 |
| commit | ded7695f07df7c02d705a2f6f51d43ee4aeeb65e (patch) | |
| tree | 5ccae031a8405303b1568b89fa76d64f5a720c71 | |
| parent | 67b071f5add93820b792506e3087adcc2588df15 (diff) | |
| download | gitlab-ce-mk/test-something.tar.gz | |
Update docs and comments about saml with allow_bypass_two_factormk/test-something
allow_bypass_two_factor configration dose not work with saml provider
| -rw-r--r-- | config/gitlab.yml.example | 10 | ||||
| -rw-r--r-- | doc/integration/omniauth.md | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index fc2d77cead3..a488eecc781 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -772,10 +772,12 @@ production: &base external_providers: [] # CAUTION! - # This allows users to login with specified provider without two factor. Define the allowed providers - # using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none. - # This option should be configured for providers which already has two factor only. - allow_bypass_two_factor: ["saml"] + # 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 diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 3ccdb624598..4ab1cfb2ec6 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -279,12 +279,13 @@ omniauth: ``` ## Bypassing two factor authentication -Starting with GitLab 12.3, this allows users to login with the specified +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 +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. +for providers which already have two factor authentication (default: false). +This configration dose not apply to SAML. ```ruby omniauth['allow_bypass_two_factor'] = ['twitter', 'google_oauth2'] |