Merge branch 'ldap_user_creation_fix' of /home/git/repositories/gitlab/gitlab-ee

4a1ed00a · Dmitriy Zaporozhets · e316324b · 9b7174c3 · 4a1ed00a
Commit 4a1ed00a authored Nov 06, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lib/gitlab/ldap/user.rb lib/gitlab/ldap/user.rb +5 -1

No files found.
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -86,7 +86,11 @@ module Gitlab
        end

        def username
-          auth.info.nickname.to_s.force_encoding("utf-8")
+          (auth.info.nickname || samaccountname).to_s.force_encoding("utf-8")
+        end
+
+        def samaccountname
+          (auth.extra[:raw_info][:samaccountname] || []).first
        end

        def provider