root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Auth: Net::BER::BerIdentifiedStrings to Strings

This commit is contained in:
Maxim Filatov 2012-09-28 14:00:04 +00:00
parent a79eb84289
commit 93cb01ea9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/gitlab/auth.rb
View File

@ -20,8 +20,9 @@ module Gitlab
def create_from_omniauth(auth, ldap = false) def create_from_omniauth(auth, ldap = false)
provider = auth.provider provider = auth.provider
uid = auth.info.uid || auth.uid uid = auth.info.uid || auth.uid
name = auth.info.name.force_encoding("utf-8") uid = uid.to_s.force_encoding("utf-8")
email = auth.info.email.downcase unless auth.info.email.nil? name = auth.info.name.to_s.force_encoding("utf-8")
email = auth.info.email.to_s.downcase unless auth.info.email.nil?
ldap_prefix = ldap ? '(LDAP) ' : '' ldap_prefix = ldap ? '(LDAP) ' : ''
raise OmniAuth::Error, "#{ldap_prefix}#{provider} does not provide an email"\ raise OmniAuth::Error, "#{ldap_prefix}#{provider} does not provide an email"\