summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 18:17:46 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 18:17:46 +0200
commit55d086ba08313e0cd7c649f38b45529b2a0968bb (patch)
tree5d049f3c0fdd1231c94351fde4462a68d799d1e5 /config/gitlab.yml.example
parent238e4f02954e910cab14c0be3b8b2569e08b5e87 (diff)
downloadgitlab-ce-55d086ba08313e0cd7c649f38b45529b2a0968bb.tar.gz
Clarify config var and add to LDAP docs.ldap-block_auto_created_users
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 6a78a032c58..ba40671b162 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -146,7 +146,9 @@ production: &base
# disable this setting, because the userPrincipalName contains an '@'.
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
# Base where we can search for users