diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
commit | 606b5094c15f36ebd9d697440446c48b54d40e6c (patch) | |
tree | ddb7bf3dfa8d925c38307bca0ff8837cc9d3741f /lib/api/merge_requests.rb | |
parent | 7f7a18c0c37a11b1eba2ac5575087b7b85c3ec5f (diff) | |
parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
download | gitlab-ce-improve-table-pagination-spec.tar.gz |
Merge branch 'master' into improve-table-pagination-specimprove-table-pagination-spec
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r-- | lib/api/merge_requests.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 02f2b75ab9d..8f665b39fa8 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -185,6 +185,16 @@ module API present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project end + desc 'Get the participants of a merge request' do + success Entities::UserBasic + end + get ':id/merge_requests/:merge_request_iid/participants' do + merge_request = find_merge_request_with_access(params[:merge_request_iid]) + participants = ::Kaminari.paginate_array(merge_request.participants) + + present paginate(participants), with: Entities::UserBasic + end + desc 'Get the commits of a merge request' do success Entities::Commit end |