diff options
author | Sytse Sijbrandij <sytses@gmail.com> | 2014-07-01 16:49:40 +0400 |
---|---|---|
committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-07-01 16:49:40 +0400 |
commit | b5543be19dc4e6c546e5fb98eb8dc5ff47f66815 (patch) | |
tree | 74cc26ab307ba64da1fd932be4d07d87c7cfae04 /config | |
parent | 8fb76a8308292d991a32ea76e50fb5ecfa3284b2 (diff) |
Move standard login form to the auth settings where users expect them.
Diffstat (limited to 'config')
-rw-r--r-- | config/gitlab.yml.example | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 806984e8d40..b7ea591b415 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -49,15 +49,6 @@ production: &base ## COLOR = 5 # 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. # The default is to allow all levels. #restricted_visibility_levels: [ "public" ] @@ -121,6 +112,14 @@ production: &base # 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 # You can inspect a sample of the LDAP users with login access by running: # bundle exec rake gitlab:ldap:check RAILS_ENV=production |