Commit c5678d4e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix_signup_config' into 'master'

Fix signup config

See merge request !983
parents 648cd134 285bb09b
...@@ -49,6 +49,16 @@ production: &base ...@@ -49,6 +49,16 @@ production: &base
## COLOR = 5 ## COLOR = 5
# default_theme: 2 # default: 2 # 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. # Restrict setting visibility levels for non-admin users.
# The default is to allow all levels. # The default is to allow all levels.
#restricted_visibility_levels: [ "public" ] #restricted_visibility_levels: [ "public" ]
...@@ -112,16 +122,6 @@ production: &base ...@@ -112,16 +122,6 @@ production: &base
# 2. Auth settings # 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 ## LDAP settings
# You can inspect a sample of the LDAP users with login access by running: # You can inspect a sample of the LDAP users with login access by running:
# bundle exec rake gitlab:ldap:check RAILS_ENV=production # bundle exec rake gitlab:ldap:check RAILS_ENV=production
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment