From 1ee94423230b26be023cb4ebcb8aed6472c25ed2 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 21 Jan 2014 13:33:29 +0100
Subject: [PATCH] Further explain userPrincipalName settings
---
config/gitlab.yml.example | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index cdab54faaf8..3a46a0a521b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -134,7 +134,8 @@ production: &base
# - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials;
# - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'.
#
- # Disable this setting if you are using "uid: 'userPrincipalName'" on ActiveDirectory.
+ # 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
## OmniAuth settings
--
GitLab