From 7fe7897c56046ade852def480d2cebe1be584512 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 21 Jan 2014 11:45:46 +0100
Subject: [PATCH] Explain how to use AD userPrincipalName for logins
---
config/gitlab.yml.example | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index f628ac9121f..cdab54faaf8 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -129,9 +129,12 @@ production: &base
password: '_the_password_of_the_bind_user'
# If allow_username_or_email_login is enabled, GitLab will ignore everything
# after the first '@' in the LDAP username submitted by the user on login.
+ #
# Example:
# - 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.
allow_username_or_email_login: true
## OmniAuth settings
--
GitLab