From ed3cda00edf7d45edfbde5a8567b88ecfd8d1d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Wed, 20 Jul 2016 15:29:12 +0000 Subject: 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 --- CHANGELOG | 1 + lib/tasks/gitlab/check.rake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 56d6d8ab89b..5f3c57d5cf5 100644 --- 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 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 -- cgit v1.2.1