summaryrefslogtreecommitdiff
path: root/lib/gitlab/ldap
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-21 18:26:40 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-21 18:26:40 +0300
commitda21b9e7d045a1f9b044563b62f09992ac685065 (patch)
tree1014f2c4ed79d9ce427f5420b19c12e57beee60f /lib/gitlab/ldap
parentee068e76f334040fee7f328c67832489dd0de51a (diff)
downloadgitlab-ce-da21b9e7d045a1f9b044563b62f09992ac685065.tar.gz
Fix rake gitlab:ldap:check
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/gitlab/ldap')
-rw-r--r--lib/gitlab/ldap/adapter.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index c4d0a20d89a..256cdb4c2f1 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -22,7 +22,7 @@ module Gitlab
Gitlab::LDAP::Config.new(provider)
end
- def users(field, value)
+ def users(field, value, limit = nil)
if field.to_sym == :dn
options = {
base: value,
@@ -45,6 +45,10 @@ module Gitlab
end
end
+ if limit.present?
+ options.merge!(size: limit)
+ end
+
entries = ldap_search(options).select do |entry|
entry.respond_to? config.uid
end