diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index e69d4bc99b984a39c990edeaf82a01cdb773cf71..dae12f03ef5e9682bfcc1b5952162cdf273cd645 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 ab949f530ab74f365da34b99324eb90aaff2e2e8..b4771eecc7f713f4a7ca2a422271655073e96dc5 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