Commit 55d086ba authored by Douwe Maan's avatar Douwe Maan

Clarify config var and add to LDAP docs.

parent 238e4f02
...@@ -146,7 +146,9 @@ production: &base ...@@ -146,7 +146,9 @@ production: &base
# disable this setting, because the userPrincipalName contains an '@'. # disable this setting, because the userPrincipalName contains an '@'.
allow_username_or_email_login: false allow_username_or_email_login: false
# Locks down those users until they have been cleared by the admin (default: false). # To maintain tight control over the number of active users on your GitLab installation,
# enable this setting to keep new users blocked until they have been cleared by the admin
# (default: false).
block_auto_created_users: false block_auto_created_users: false
# Base where we can search for users # Base where we can search for users
......
...@@ -51,6 +51,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server ...@@ -51,6 +51,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
# disable this setting, because the userPrincipalName contains an '@'. # disable this setting, because the userPrincipalName contains an '@'.
allow_username_or_email_login: false allow_username_or_email_login: false
# To maintain tight control over the number of active users on your GitLab installation,
# enable this setting to keep new users blocked until they have been cleared by the admin
# (default: false).
block_auto_created_users: false
# Base where we can search for users # Base where we can search for users
# #
# Ex. ou=People,dc=gitlab,dc=example # Ex. ou=People,dc=gitlab,dc=example
......
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