From bd049e5e7c80259689eb4494a3e7eea4bd5a66b0 Mon Sep 17 00:00:00 2001 From: Valeriy Sizov Date: Sun, 21 Oct 2012 14:00:27 +0300 Subject: API:merge request show && list --- lib/api/entities.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/api/entities.rb') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index ee693de699e..8c405f29568 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -63,5 +63,11 @@ module Gitlab class SSHKey < Grape::Entity expose :id, :title, :key end + + class MergeRequest < Grape::Entity + expose :id, :target_branch, :source_branch, :project_id, + :title, :closed, :merged + expose :author, :assignee, using: Entities::UserBasic + end end end -- cgit v1.2.1