Commit 4a36d669 authored by mabdullah-cinglevue's avatar mabdullah-cinglevue Committed by Mustafa

# 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.
parent ec18f0ba
...@@ -42,7 +42,8 @@ Parameters: ...@@ -42,7 +42,8 @@ Parameters:
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
} },
"description":"fixed login page css paddings"
} }
] ]
``` ```
...@@ -86,7 +87,8 @@ Parameters: ...@@ -86,7 +87,8 @@ Parameters:
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
} },
"description":"fixed login page css paddings"
} }
``` ```
...@@ -132,7 +134,8 @@ Parameters: ...@@ -132,7 +134,8 @@ Parameters:
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
} },
"description":"fixed login page css paddings"
} }
``` ```
......
...@@ -136,6 +136,7 @@ module API ...@@ -136,6 +136,7 @@ module API
expose :author, :assignee, using: Entities::UserBasic expose :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id expose :source_project_id, :target_project_id
expose :label_names, as: :labels expose :label_names, as: :labels
expose :description, :milestone_id
end end
class SSHKey < Grape::Entity class SSHKey < Grape::Entity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment