BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7bf92b36
Commit
7bf92b36
authored
Mar 26, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ldap check recognize ldap user filter.
parent
78a7a9b0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
check.rake
lib/tasks/gitlab/check.rake
+14
-1
No files found.
lib/tasks/gitlab/check.rake
View file @
7bf92b36
...
...
@@ -677,7 +677,20 @@ namespace :gitlab do
end
def
filter
Net
::
LDAP
::
Filter
.
present?
(
ldap_config
.
uid
)
uid_filter
=
Net
::
LDAP
::
Filter
.
present?
(
ldap_config
.
uid
)
if
user_filter
Net
::
LDAP
::
Filter
.
join
(
uid_filter
,
user_filter
)
else
uid_filter
end
end
def
user_filter
if
ldap_config
[
'user_filter'
]
&&
ldap_config
.
user_filter
.
present?
Net
::
LDAP
::
Filter
.
construct
(
ldap_config
.
user_filter
)
else
nil
end
end
def
ldap
...
...
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