summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormabdullah-cinglevue <mustafa.motiwala@cinglevue.com>2014-04-16 10:14:05 +0800
committerMustafa <mustafa.motiwala@cinglevue.com>2014-08-01 18:41:09 +0800
commitd048a27771c9e6916083b074d254c708fd78d508 (patch)
tree005d803c771df94b6a11415bc3937b68f96a716f /lib
parent4a36d669b5cb9c4727e82e68dd3a573f5cb1f53f (diff)
downloadgitlab-ce-d048a27771c9e6916083b074d254c708fd78d508.tar.gz
Patched `MergeRequest` to return more data.
Added milestone to merge_requests instead of milestone id.
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index a206b7731e3..8b1ebb9c994 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -136,7 +136,8 @@ module API
expose :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id
expose :label_names, as: :labels
- expose :description, :milestone_id
+ expose :description
+ expose :milestone, using: Entities::Milestone
end
class SSHKey < Grape::Entity