Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
369dbaf3
Commit
369dbaf3
authored
Jan 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1586 from Bregor/ber_to_string
Auth: Net::BER::BerIdentifiedStrings to Strings
parents
c9e6818a
93cb01ea
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+3
-2
No files found.
lib/gitlab/auth.rb
View file @
369dbaf3
...
@@ -20,8 +20,9 @@ module Gitlab
...
@@ -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"
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment