diff options
| author | mabdullah-cinglevue <mustafa.motiwala@cinglevue.com> | 2014-04-16 10:14:05 +0800 |
|---|---|---|
| committer | Mustafa <mustafa.motiwala@cinglevue.com> | 2014-08-01 18:29:23 +0800 |
| commit | 4a36d669b5cb9c4727e82e68dd3a573f5cb1f53f (patch) | |
| tree | 03db47f13ca55bdb8de438a46516bbc898979487 | |
| parent | ec18f0bae557c6368c4ac211041a81bfe05492e8 (diff) | |
| download | gitlab-ce-4a36d669b5cb9c4727e82e68dd3a573f5cb1f53f.tar.gz | |
# This is a combination of 2 commits.
# The first commit's message is:
Patched `MergeRequest` to return more data.
Patched `MergeRequest` to return the `description` & `milestone`
Conflicts:
lib/api/entities.rb
# This is the 2nd commit message:
Update merge_requests.md
Update documentation for merge request endpoint adding support for description.
| -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 |