Commit fefe60db authored by Evan Read's avatar Evan Read

Merge branch 'docs-blunceford-clarify-autolink-ldap' into 'master'

Clarify description for auto_link_ldap_user setting

See merge request gitlab-org/gitlab!20315
parents 184a4f17 4ec74303
......@@ -51,7 +51,7 @@ that are in common for all providers that we need to consider.
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
created through OmniAuth will be linked to their LDAP entry as well.
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
they are able to sign in.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment