diff options
| author | Maxim Filatov <pipopolam@gmail.com> | 2012-09-28 14:00:04 +0000 |
|---|---|---|
| committer | Maxim Filatov <pipopolam@gmail.com> | 2012-09-28 18:08:13 +0400 |
| commit | 93cb01ea9b620762c1641b585de153a686067d4d (patch) | |
| tree | 062dbbb395eb672c6872599c7c71663e386073e6 /lib/gitlab | |
| parent | a79eb8428946152021b6f3a25398c49f2e9e7099 (diff) | |
| download | gitlab-ce-93cb01ea9b620762c1641b585de153a686067d4d.tar.gz | |
Auth: Net::BER::BerIdentifiedStrings to Strings
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/auth.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 500cb64df48..ee28497f068 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -20,8 +20,9 @@ module Gitlab def create_from_omniauth(auth, ldap = false) provider = auth.provider uid = auth.info.uid || auth.uid - name = auth.info.name.force_encoding("utf-8") - email = auth.info.email.downcase unless auth.info.email.nil? + uid = uid.to_s.force_encoding("utf-8") + 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) ' : '' raise OmniAuth::Error, "#{ldap_prefix}#{provider} does not provide an email"\ |