summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2015-05-04 09:13:53 +0000
committerJob van der Voort <job@gitlab.com>2015-05-04 09:13:53 +0000
commit2587334a79fbc08bf8551085eb57b8b36eb64afe (patch)
tree03964efd5ca3bf796e6a59924a7445de6ea715cd /doc
parente9e79fdfdf7eee14efa9c5e8038b46538b6ac5e3 (diff)
parent2530141aceaaf4452cc2308648846fd52c48aa8c (diff)
downloadgitlab-ce-2587334a79fbc08bf8551085eb57b8b36eb64afe.tar.gz
Merge branch 'Add_doc_block_new_users_by_default' into 'master'
Added " How to maintain tight control over the number of active users..." Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation. Please check that documentation is OK before accepting Merge. I took if from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L149 cc/ @sytse See merge request !1792
Diffstat (limited to 'doc')
-rw-r--r--doc/raketasks/user_management.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index 80b01ca4043..4fbd20762da 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -47,3 +47,12 @@ sudo gitlab-rake gitlab:import:all_users_to_all_groups
# installation from source
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 (default: false).
+
+
+```
+block_auto_created_users: false
+```