From 47ac48c03127b62212108442a8e61f41a7cee6ec Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 12 Aug 2014 17:43:02 +0200 Subject: [PATCH] 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'. --- config/gitlab.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #