diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-23 13:04:58 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-23 13:04:58 +0100 |
| commit | 41498864a083663fa29131f8af74c69e82213055 (patch) | |
| tree | b838012a9480b20acb9b80ba9a2bd5e649d117e4 /lib/api/members.rb | |
| parent | d327277c39df1537b41073912d9b4e9f765d8da5 (diff) | |
| parent | 4dc42845f2ceadcff76a99908220e61610c5b608 (diff) | |
| download | gitlab-ce-41498864a083663fa29131f8af74c69e82213055.tar.gz | |
Merge branch 'master' into qa/gb/ci-cd-qa-pipelines
* master: (69 commits)
Conflicts:
qa/qa.rb
Diffstat (limited to 'lib/api/members.rb')
| -rw-r--r-- | lib/api/members.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index 5446f6b54b1..130c6d6da71 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -22,7 +22,7 @@ module API source = find_source(source_type, params[:id]) users = source.users - users = users.merge(User.search(params[:query])) if params[:query] + users = users.merge(User.search(params[:query])) if params[:query].present? present paginate(users), with: Entities::Member, source: source end |