summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-07-01 16:20:07 +0200
committerSytse Sijbrandij <sytses@gmail.com>2014-07-01 16:20:07 +0200
commite12a517e8310f8ec9961b9faddeaec061af383b7 (patch)
tree9b35ef44637f6d0ce0854e215972fceeb01a238e /config
parentb5543be19dc4e6c546e5fb98eb8dc5ff47f66815 (diff)
downloadgitlab-ce-e12a517e8310f8ec9961b9faddeaec061af383b7.tar.gz
Improve the documentation of the signup item, password items is outdated now since people are used to the behaviour.
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example8
1 files changed, 5 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index b7ea591b415..e0afdc0400e 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -112,12 +112,14 @@ production: &base
# 2. Auth settings
# ==========================
- ## TODO This seems to be the ability to sign yourself up, but it is disabled by default
- # default: false - Account passwords are not sent via the email if signup is enabled.
+ ## Users can create accounts
+ # This also allows normal users to sign up for accounts themselves
+ # default: false - By default GitLab administrators must create all new accounts
# signup_enabled: true
## Standard login settings
- # default: true - If set to false, standard login form won't be shown on the sign-in page
+ # The standard login can be disabled to force login via LDAP
+ # default: true - If set to false the standard login form won't be shown on the sign-in page
# signin_enabled: false
## LDAP settings