summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-04 12:08:34 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-04 12:08:34 +0000
commit1f5a6eb2576b17deee3942ea5e1f598bf3d4da8c (patch)
tree0403572b4aa4eae6210050de272019e155395a50 /lib
parent0c377a79d45e71a054e07ec20c502643591d0181 (diff)
parentc366e81da7fb6c9ef921cbd57e5ac662999f0bc0 (diff)
downloadgitlab-ce-1f5a6eb2576b17deee3942ea5e1f598bf3d4da8c.tar.gz
Merge branch 'mr-commits-api' into 'master'
Add API endpoint to fetch merge request commits list Fixes #3748 See merge request !1984
Diffstat (limited to 'lib')
-rw-r--r--lib/api/merge_requests.rb16
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: