diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-20 18:29:12 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 12:15:56 +0300 |
commit | ed3cda00edf7d45edfbde5a8567b88ecfd8d1d3d (patch) | |
tree | 18a7e041e2cf495b62e638477dc4f44caa03f9a5 /lib | |
parent | d5cf8894bae880f456b0a7ee7b32f71418367a5b (diff) |
Merge branch '17862-honour-limit-in-ldap-check' into 'master'
Resolve "gitlab:setup rake task fails on 8.8.1 source install"
_Originally opened at !4788 by @rickettm._
- - -
## What does this MR do?
Fix bug #15344, so that the limit parameter that is already passed in to the print_users function is actually used, rather than using a hardcoded value.
## Are there points in the code the reviewer needs to double check?
No, it is a trivial change.
## Why was this MR needed?
This bug causes 100 LDAP users to be displayed even when a different limit is given, which can be annoying.
## What are the relevant issue numbers?
Fixes #15344.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5364
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index e9a4e37ec48..60f4636e737 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -784,7 +784,7 @@ namespace :gitlab do servers.each do |server| puts "Server: #{server}" Gitlab::LDAP::Adapter.open(server) do |adapter| - users = adapter.users(adapter.config.uid, '*', 100) + users = adapter.users(adapter.config.uid, '*', limit) users.each do |user| puts "\tDN: #{user.dn}\t #{adapter.config.uid}: #{user.uid}" end |