diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-12 17:43:02 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-29 15:38:05 +0200 |
| commit | 47ac48c03127b62212108442a8e61f41a7cee6ec (patch) | |
| tree | 15d0ad4994cfd2602f924b9995767c24e2d12e42 /config | |
| parent | 8aca1ff0034c34590828df265a933d45fa7c95a4 (diff) | |
| download | gitlab-ce-47ac48c03127b62212108442a8e61f41a7cee6ec.tar.gz | |
Disable allow_username_or_email_login in example
The example LDAP configuration in gitlab.yml enables the
allow_username_or_email_login setting. Because the effect of this
setting is somewhat counterintuitive, I propose we make 'false' the
example default. The settings initializer already sets this setting to
'false'.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 47865ff4b44..0a0d9241e27 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -143,7 +143,7 @@ production: &base # # If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to # disable this setting, because the userPrincipalName contains an '@'. - allow_username_or_email_login: true + allow_username_or_email_login: false # Base where we can search for users # |