diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-20 15:29:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 15:29:12 +0000 |
| commit | 529c9f9e2c5779590d880aafd65724e24baf49d6 (patch) | |
| tree | c9afef2e58fbc5f5c7a62d22690e745e3205bd19 /lib/api/files.rb | |
| parent | 82e441fe6e5c13008d79c1bfe9872e3db3e1a21a (diff) | |
| parent | db98474df1fe577eaa557306ccabc987468a4128 (diff) | |
| download | gitlab-ce-529c9f9e2c5779590d880aafd65724e24baf49d6.tar.gz | |
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/api/files.rb')
0 files changed, 0 insertions, 0 deletions