From 2530141aceaaf4452cc2308648846fd52c48aa8c Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Mon, 4 May 2015 11:13:07 +0200 Subject: update doc by removing unnecessary parts --- doc/raketasks/user_management.md | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'doc/raketasks') diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md index 04a8126c161..4fbd20762da 100644 --- a/doc/raketasks/user_management.md +++ b/doc/raketasks/user_management.md @@ -50,35 +50,9 @@ bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production ## 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 +- Enable this setting to keep new users blocked until they have been cleared by the admin (default: false). -```bash -(default: false). -block_auto_created_users: false - -Base where we can search for users - -Ex. ou=People,dc=gitlab,dc=example - -base: '' - -Filter LDAP users - -Format: RFC 4515 http://tools.ietf.org/search/rfc4515 -Ex. (employeeType=developer) -Note: GitLab does not support omniauth-ldap's custom filter syntax. - -user_filter: '' ``` - -- GitLab EE only: add more LDAP servers - -```bash -Choose an ID made of a-z and 0-9 . This ID will be stored in the database -so that GitLab can remember which LDAP server a user belongs to. -uswest2: -label: -host: -.... -``` \ No newline at end of file +block_auto_created_users: false +``` -- cgit v1.2.1