diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index a46472a0812a7dd9c49f7e7f766e59c29d02ca04..794d46ed7c9c4116067c93955d321ed7c595cdba 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -42,7 +42,8 @@ Parameters: "name": "Administrator", "state": "active", "created_at": "2012-04-29T08:46:00Z" - } + }, + "description":"fixed login page css paddings" } ] ``` @@ -86,7 +87,8 @@ Parameters: "name": "Administrator", "state": "active", "created_at": "2012-04-29T08:46:00Z" - } + }, + "description":"fixed login page css paddings" } ``` @@ -132,7 +134,8 @@ Parameters: "name": "Administrator", "state": "active", "created_at": "2012-04-29T08:46:00Z" - } + }, + "description":"fixed login page css paddings" } ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8731db59e579818c2f4361565caae955e6593985..fc7d391fd30e94f02c56606ddc86fb0e1909b269 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -137,6 +137,8 @@ module API expose :author, :assignee, using: Entities::UserBasic expose :source_project_id, :target_project_id expose :label_names, as: :labels + expose :description + expose :milestone, using: Entities::Milestone end class SSHKey < Grape::Entity