Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ldap/user.rb')
-rw-r--r--lib/gitlab/ldap/user.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index 456a61b9e43..6bc587df3ce 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -86,11 +86,7 @@ module Gitlab
end
def username
- (auth.info.nickname || samaccountname).to_s.force_encoding("utf-8")
- end
-
- def samaccountname
- (auth.extra[:raw_info][:samaccountname] || []).first
+ auth.info.nickname.to_s.force_encoding("utf-8")
end
def provider