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
Boxiang Sun
gitlab-ce
Commits
325b6636
Commit
325b6636
authored
Apr 13, 2015
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove special cases for the 'ldap' provider
parent
896ea248
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
lib/gitlab/ldap/config.rb
lib/gitlab/ldap/config.rb
+0
-2
lib/gitlab/ldap/user.rb
lib/gitlab/ldap/user.rb
+1
-1
No files found.
lib/gitlab/ldap/config.rb
View file @
325b6636
...
@@ -27,8 +27,6 @@ module Gitlab
...
@@ -27,8 +27,6 @@ module Gitlab
def
initialize
(
provider
)
def
initialize
(
provider
)
if
self
.
class
.
valid_provider?
(
provider
)
if
self
.
class
.
valid_provider?
(
provider
)
@provider
=
provider
@provider
=
provider
elsif
provider
==
'ldap'
@provider
=
self
.
class
.
providers
.
first
else
else
self
.
class
.
invalid_provider
(
provider
)
self
.
class
.
invalid_provider
(
provider
)
end
end
...
...
lib/gitlab/ldap/user.rb
View file @
325b6636
...
@@ -13,7 +13,7 @@ module Gitlab
...
@@ -13,7 +13,7 @@ module Gitlab
def
find_by_uid_and_provider
(
uid
,
provider
)
def
find_by_uid_and_provider
(
uid
,
provider
)
# LDAP distinguished name is case-insensitive
# LDAP distinguished name is case-insensitive
identity
=
::
Identity
.
identity
=
::
Identity
.
where
(
provider:
[
provider
,
:ldap
]
).
where
(
provider:
provider
).
where
(
'lower(extern_uid) = ?'
,
uid
.
downcase
).
last
where
(
'lower(extern_uid) = ?'
,
uid
.
downcase
).
last
identity
&&
identity
.
user
identity
&&
identity
.
user
end
end
...
...
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