diff options
| -rw-r--r-- | doc/api/merge_requests.md | 9 | ||||
| -rw-r--r-- | lib/api/entities.rb | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index a46472a0812..794d46ed7c9 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 42715d2be3b..a206b7731e3 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -136,6 +136,7 @@ module API expose :author, :assignee, using: Entities::UserBasic expose :source_project_id, :target_project_id expose :label_names, as: :labels + expose :description, :milestone_id end class SSHKey < Grape::Entity |