diff options
author | Valery Sizov <valery@gitlab.com> | 2016-12-14 12:36:27 +0200 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2016-12-14 12:36:27 +0200 |
commit | 468d575fc73881900f4a4cb1fa71c187d77429a7 (patch) | |
tree | 05b00d7f00e04202c34de41e6feb566426e19e3f /lib/api/members.rb | |
parent | 8f0cef0b6e5e950efdf3ebfe8f9f846095fff9d9 (diff) | |
parent | 78f89f7ad900ec2f2993a70caa2eb5dbf9e2496f (diff) | |
download | gitlab-ce-468d575fc73881900f4a4cb1fa71c187d77429a7.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2
Diffstat (limited to 'lib/api/members.rb')
-rw-r--r-- | lib/api/members.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index 2d4d5cedf20..d85f1f78cd6 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -1,5 +1,7 @@ module API class Members < Grape::API + include PaginationParams + before { authenticate! } helpers ::API::Helpers::MembersHelpers @@ -14,15 +16,15 @@ module API end params do optional :query, type: String, desc: 'A query string to search for members' + use :pagination end get ":id/members" do source = find_source(source_type, params[:id]) users = source.users users = users.merge(User.search(params[:query])) if params[:query] - users = paginate(users) - present users, with: Entities::Member, source: source + present paginate(users), with: Entities::Member, source: source end desc 'Gets a member of a group or project.' do |