Merge branch 'fix_signup_config' into 'master'
Fix signup config See merge request !983
This commit is contained in:
commit
c5678d4ecb
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue