summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-13 14:43:46 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-13 14:43:46 +0300
commit1f1c59b61d30b76d69f0f925b43a0b96465f38ed (patch)
tree3e77115afc63a5d571798d4dda23f9f30e0a49b5 /lib/api/entities.rb
parent0c621708658da4b3cf88d805da5dbad920f3d27f (diff)
parent5f25cdfe19c7c0a8c1ada592307e9017e2a754e1 (diff)
downloadgitlab-ce-1f1c59b61d30b76d69f0f925b43a0b96465f38ed.tar.gz
Merge pull request #6778 from dblessing/feature/mr_labels
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 c1bd6d02c68..457af52fe9d 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -136,6 +136,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