Further explain userPrincipalName settings

1ee94423 · Jacob Vosmaer · 7fe7897c · 1ee94423
Commit 1ee94423 authored Jan 21, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

config/gitlab.yml.example config/gitlab.yml.example +2 -1

No files found.
--- 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