deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1586 from Bregor/ber_to_string

Browse source 
Auth: Net::BER::BerIdentifiedStrings to Strings
This commit is contained in:
Dmitriy Zaporozhets 2013-01-16 04:55:52 -08:00
parent c9e6818ab6 93cb01ea9b
commit 369dbaf396
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"\