summaryrefslogtreecommitdiff
path: root/doc/integration/omniauth.md
diff options
context:
space:
mode:
authorQuanqi Jing <jqq@readboy.com>2019-08-23 09:32:11 +0800
committerQuanqi Jing <jqq@readboy.com>2019-08-23 14:49:38 +0800
commitded7695f07df7c02d705a2f6f51d43ee4aeeb65e (patch)
tree5ccae031a8405303b1568b89fa76d64f5a720c71 /doc/integration/omniauth.md
parent67b071f5add93820b792506e3087adcc2588df15 (diff)
downloadgitlab-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
Diffstat (limited to 'doc/integration/omniauth.md')
-rw-r--r--doc/integration/omniauth.md7
1 files changed, 4 insertions, 3 deletions
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']