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

Merge branch '17862-honour-limit-in-ldap-check' into 'master'
529c9f9e · Rémy Coutable · 82e441fe · db98474d · 529c9f9e · 529c9f9e
Commit 529c9f9e authored Jul 20, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

check.rake lib/tasks/gitlab/check.rake +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.10.0 (unreleased)
  - Upgrade to Rails 4.2.7. !5236
  - Extend exposed environment variables for CI builds
  - Allow to pull code with deploy key from public projects
+  - Use limit parameter rather than hardcoded value in `ldap:check` rake task (Mike Ricketts)
  - Add Sidekiq queue duration to transaction metrics.
  - Add a new column `artifacts_size` to table `ci_builds` !4964
  - Let Workhorse serve format-patch diffs

--- 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