Make sure the filters are applied
This commit is contained in:
parent
b229b0f003
commit
d3056feb11
1 changed files with 9 additions and 8 deletions
|
@ -48,15 +48,16 @@ module Gitlab
|
|||
end
|
||||
|
||||
def user_filter(login)
|
||||
Net::LDAP::Filter.eq(config.uid, login).tap do |filter|
|
||||
# Apply LDAP user filter if present
|
||||
if config.user_filter.present?
|
||||
Net::LDAP::Filter.join(
|
||||
filter,
|
||||
Net::LDAP::Filter.construct(config.user_filter)
|
||||
)
|
||||
end
|
||||
filter = Net::LDAP::Filter.eq(config.uid, login)
|
||||
|
||||
# Apply LDAP user filter if present
|
||||
if config.user_filter.present?
|
||||
filter = Net::LDAP::Filter.join(
|
||||
filter,
|
||||
Net::LDAP::Filter.construct(config.user_filter)
|
||||
)
|
||||
end
|
||||
filter
|
||||
end
|
||||
|
||||
def user
|
||||
|
|
Loading…
Reference in a new issue