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
Kazuhiko Shiozaki
gitlab-ce
Commits
f4bca105
Commit
f4bca105
authored
May 14, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport Adapter#ldap_search from EE
parent
f18f8e67
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/adapter.rb
+17
-1
No files found.
lib/gitlab/ldap/adapter.rb
View file @
f4bca105
...
@@ -64,7 +64,7 @@ module Gitlab
...
@@ -64,7 +64,7 @@ module Gitlab
end
end
end
end
entries
=
ldap
.
search
(
options
).
select
do
|
entry
|
entries
=
ldap
_
search
(
options
).
select
do
|
entry
|
entry
.
respond_to?
config
.
uid
entry
.
respond_to?
config
.
uid
end
end
...
@@ -77,6 +77,22 @@ module Gitlab
...
@@ -77,6 +77,22 @@ module Gitlab
users
(
*
args
).
first
users
(
*
args
).
first
end
end
def
ldap_search
(
*
args
)
results
=
ldap
.
search
(
*
args
)
if
results
.
nil?
response
=
ldap
.
get_operation_result
unless
response
.
code
.
zero?
Rails
.
logger
.
warn
(
"LDAP search error:
#{
response
.
message
}
"
)
end
[]
else
results
end
end
private
private
def
config
def
config
...
...
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