diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /doc/integration/omniauth.md | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'doc/integration/omniauth.md')
| -rw-r--r-- | doc/integration/omniauth.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 5634ad95cf7..2afdeccb764 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -51,7 +51,7 @@ that are in common for all providers that we need to consider. automatically create an account. It defaults to `false`. If `false` users must be created manually or they will not be able to sign in via OmniAuth. - `auto_link_ldap_user` can be used if you have [LDAP / ActiveDirectory](ldap.md) - integration enabled. It defaults to false. When enabled, users automatically + integration enabled. It defaults to `false`. When enabled, users automatically created through an OmniAuth provider will have their LDAP identity created in GitLab as well. - `block_auto_created_users` defaults to `true`. If `true` auto created users will be blocked by default and will have to be unblocked by an administrator before |