summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-21 15:57:46 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-21 15:57:46 +0000
commitc5678d4ecb9e557c9e70ddddbef493470d2fc229 (patch)
tree49747140fcbb245852d3101a1924d22d4cd7f8e0
parent648cd134387a32e83cc9f3f42c0cb214444912bc (diff)
parent285bb09b98bf5532e1fc149492fc5d50db9f2ab9 (diff)
downloadgitlab-ce-c5678d4ecb9e557c9e70ddddbef493470d2fc229.tar.gz
Merge branch 'fix_signup_config' into 'master'
Fix signup config See merge request !983
-rw-r--r--config/gitlab.yml.example20
1 files changed, 10 insertions, 10 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 9b46aa07a56..d57f3b508bb 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -49,6 +49,16 @@ production: &base
## COLOR = 5
# default_theme: 2 # default: 2
+ ## 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
+ # 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
+
# Restrict setting visibility levels for non-admin users.
# The default is to allow all levels.
#restricted_visibility_levels: [ "public" ]
@@ -112,16 +122,6 @@ production: &base
# 2. Auth settings
# ==========================
- ## 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
- # 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
# You can inspect a sample of the LDAP users with login access by running:
# bundle exec rake gitlab:ldap:check RAILS_ENV=production