diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-07-21 17:10:28 +0200 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-07-21 17:10:28 +0200 |
commit | 285bb09b98bf5532e1fc149492fc5d50db9f2ab9 (patch) | |
tree | fa1b76e0d574feedc90ad2dd1bf4ef0747b188ec /config | |
parent | cfde0936ea20edab82081c3f1288098c882e7de9 (diff) | |
download | gitlab-ce-285bb09b98bf5532e1fc149492fc5d50db9f2ab9.tar.gz |
Move signup_enabled and signin_enabled back
This partially reverts b5543be19dc4e6c546e5f by restoring the nesting
for the signup_enabled and signin_enabled attributes.
Diffstat (limited to 'config')
-rw-r--r-- | config/gitlab.yml.example | 20 |
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 |