summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@me.com>2014-04-14 20:12:07 -0500
committerDrew Blessing <drew.blessing@me.com>2014-05-13 06:41:36 -0500
commit5f25cdfe19c7c0a8c1ada592307e9017e2a754e1 (patch)
tree82e2dde5c25c8dc9b6fa56dc1f2440910b2c1412 /lib/api/entities.rb
parent172ad9624599647df5682f7f2a9d2d74d947d068 (diff)
downloadgitlab-ce-5f25cdfe19c7c0a8c1ada592307e9017e2a754e1.tar.gz
Implement Merge Request Labels
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index abe6fceff14..1fd29acefe1 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -135,6 +135,7 @@ module API
expose :target_branch, :source_branch, :upvotes, :downvotes
expose :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id
+ expose :label_list, as: :labels
end
class SSHKey < Grape::Entity