Commit b5543be1 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Move standard login form to the auth settings where users expect them.

parent 8fb76a83
...@@ -49,15 +49,6 @@ production: &base ...@@ -49,15 +49,6 @@ production: &base
## COLOR = 5 ## COLOR = 5
# default_theme: 2 # default: 2 # default_theme: 2 # default: 2
## Users management
# default: false - Account passwords are not sent via the email if signup is enabled.
# signup_enabled: true
#
# default: true - If set to false, 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" ]
...@@ -121,6 +112,14 @@ production: &base ...@@ -121,6 +112,14 @@ production: &base
# 2. Auth settings # 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.
# signup_enabled: true
## Standard login settings
# default: true - If set to false, 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