diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-07 12:03:34 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-07 12:03:34 +0100 |
commit | 0bca65b28344cfb4f4a6577c32b448268e7d9465 (patch) | |
tree | 682ed6bb606f2a45c9a333e921ad68b387852b62 /lib/api/merge_requests.rb | |
parent | dbbd2b863b402e460ac1dc90f852fcae617a2351 (diff) | |
parent | 234f4bf20fb338f2164976fd39203fbc671afd29 (diff) | |
download | gitlab-ce-0bca65b28344cfb4f4a6577c32b448268e7d9465.tar.gz |
Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-date
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r-- | lib/api/merge_requests.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 6eb84baf9cb..e7c5f808aea 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -76,6 +76,22 @@ module API present merge_request, with: Entities::MergeRequest end + # Show MR commits + # + # Parameters: + # id (required) - The ID of a project + # merge_request_id (required) - The ID of MR + # + # Example: + # GET /projects/:id/merge_request/:merge_request_id/commits + # + get ':id/merge_request/:merge_request_id/commits' do + merge_request = user_project.merge_requests. + find(params[:merge_request_id]) + authorize! :read_merge_request, merge_request + present merge_request.commits, with: Entities::RepoCommit + end + # Show MR changes # # Parameters: |