diff options
author | Andrew8xx8 <avk@8xx8.ru> | 2013-02-18 13:07:49 +0400 |
---|---|---|
committer | Andrew8xx8 <avk@8xx8.ru> | 2013-02-18 14:43:50 +0400 |
commit | 29f70acc987abe0b188ef187c70f179088d79589 (patch) | |
tree | b58731491782fe569b58f1fd1648dbd4b94cd18f /lib/api/entities.rb | |
parent | b45e9aefd3207c00f9d83a0cbfcca457c9562a59 (diff) | |
download | gitlab-ce-29f70acc987abe0b188ef187c70f179088d79589.tar.gz |
Merge Request uses StateMachine now
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 2cd8aa6c265..8d965b6066e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -81,7 +81,7 @@ module Gitlab end class MergeRequest < Grape::Entity - expose :id, :target_branch, :source_branch, :project_id, :title, :closed, :merged + expose :id, :target_branch, :source_branch, :project_id, :title, :state expose :author, :assignee, using: Entities::UserBasic end |