diff options
| author | Islam Amer <islam.amer@jollamobile.com> | 2013-09-02 15:36:05 +0000 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-10-08 09:32:00 +0200 |
| commit | 29c807ced3303f60379940d34d9724480938e192 (patch) | |
| tree | ca5e70fa5ef5fec5bb390ccf4d7e343367977ede | |
| parent | 07437ac3d436d427e4e8554f685f09a17d31e171 (diff) | |
| download | gitlab-ce-29c807ced3303f60379940d34d9724480938e192.tar.gz | |
Expose votes in merge request api
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
| -rw-r--r-- | doc/api/merge_requests.md | 8 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index e69d4bc99b9..dae12f03ef5 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -20,6 +20,8 @@ Parameters: "project_id":3, "title":"test1", "state":"opened", + "upvotes":0, + "downvotes":0, "author":{ "id":1, "username": "admin", @@ -62,6 +64,8 @@ Parameters: "project_id":3, "title":"test1", "state":"merged", + "upvotes":0, + "downvotes":0, "author":{ "id":1, "username": "admin", @@ -106,6 +110,8 @@ Parameters: "project_id":3, "title":"test1", "state":"opened", + "upvotes":0, + "downvotes":0, "author":{ "id":1, "username": "admin", @@ -152,6 +158,8 @@ Parameters: "project_id":3, "title":"test1", "state":"opened", + "upvotes":0, + "downvotes":0, "author":{ "id":1, "username": "admin", diff --git a/lib/api/entities.rb b/lib/api/entities.rb index ab949f530ab..b4771eecc7f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -112,7 +112,7 @@ module API end 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 :author, :assignee, using: Entities::UserBasic end |