diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 16:47:51 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-13 16:47:51 +0300 |
| commit | 71f87ffb66659fea20c49601b8897e4bc9b47dd1 (patch) | |
| tree | 518b31e6ac77eb1ec6ca9ada1f825e9b2594a6aa | |
| parent | 32de6691599a2e3b14b5ebce84950eb6ab73e31e (diff) | |
| parent | d048a27771c9e6916083b074d254c708fd78d508 (diff) | |
| download | gitlab-ce-71f87ffb66659fea20c49601b8897e4bc9b47dd1.tar.gz | |
Merge pull request #6788 from CingleVue/master
Patched `MergeRequest` to return more data.
| -rw-r--r-- | doc/api/merge_requests.md | 9 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
2 files changed, 8 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 8731db59e57..fc7d391fd30 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 |