diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-14 18:17:46 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-14 18:17:46 +0200 |
| commit | 55d086ba08313e0cd7c649f38b45529b2a0968bb (patch) | |
| tree | 5d049f3c0fdd1231c94351fde4462a68d799d1e5 | |
| parent | 238e4f02954e910cab14c0be3b8b2569e08b5e87 (diff) | |
| download | gitlab-ce-ldap-block_auto_created_users.tar.gz | |
Clarify config var and add to LDAP docs.ldap-block_auto_created_users
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | doc/integration/ldap.md | 5 |
2 files changed, 8 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 diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md index 125ce31b521..b67f793c591 100644 --- a/doc/integration/ldap.md +++ b/doc/integration/ldap.md @@ -51,6 +51,11 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server # disable this setting, because the userPrincipalName contains an '@'. 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 # # Ex. ou=People,dc=gitlab,dc=example |