root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Expose votes in merge request api 

Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
This commit is contained in:
Islam Amer 2013-09-02 15:36:05 +00:00 committed by Jacob Vosmaer
parent 07437ac3d4
commit 29c807ced3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/api/merge_requests.md
View File

@ -20,6 +20,8 @@ Parameters:
"project_id":3, "project_id":3,
"title":"test1", "title":"test1",
"state":"opened", "state":"opened",
"upvotes":0,
"downvotes":0,
"author":{ "author":{
"id":1, "id":1,
"username": "admin", "username": "admin",
@ -62,6 +64,8 @@ Parameters:
"project_id":3, "project_id":3,
"title":"test1", "title":"test1",
"state":"merged", "state":"merged",
"upvotes":0,
"downvotes":0,
"author":{ "author":{
"id":1, "id":1,
"username": "admin", "username": "admin",
@ -106,6 +110,8 @@ Parameters:
"project_id":3, "project_id":3,
"title":"test1", "title":"test1",
"state":"opened", "state":"opened",
"upvotes":0,
"downvotes":0,
"author":{ "author":{
"id":1, "id":1,
"username": "admin", "username": "admin",
@ -152,6 +158,8 @@ Parameters:
"project_id":3, "project_id":3,
"title":"test1", "title":"test1",
"state":"opened", "state":"opened",
"upvotes":0,
"downvotes":0,
"author":{ "author":{
"id":1, "id":1,
"username": "admin", "username": "admin",

2
lib/api/entities.rb
View File

@ -112,7 +112,7 @@ module API
end end
class MergeRequest < Grape::Entity class MergeRequest < Grape::Entity
expose :id, :target_branch, :source_branch, :title, :state expose :id, :target_branch, :source_branch, :title, :state, :upvotes, :downvotes
expose :target_project_id, as: :project_id expose :target_project_id, as: :project_id
expose :author, :assignee, using: Entities::UserBasic expose :author, :assignee, using: Entities::UserBasic
end end