diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-21 14:00:27 +0300 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-22 23:09:21 +0300 |
| commit | bd049e5e7c80259689eb4494a3e7eea4bd5a66b0 (patch) | |
| tree | 6a328d424f3ddb3cf9c684e69052ef24ccc30744 /lib/api/entities.rb | |
| parent | 42abdf69d59ecf28688af5994ff2e324c50a6d33 (diff) | |
| download | gitlab-ce-bd049e5e7c80259689eb4494a3e7eea4bd5a66b0.tar.gz | |
API:merge request show && list
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 6 |
1 files changed, 6 insertions, 0 deletions
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 |