diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-27 01:21:57 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-27 01:21:57 -0700 |
| commit | cd7c131b23e89883a435923560e6af3a1b2b0c9e (patch) | |
| tree | 29fa414e8b6f43fbf41f9994f2f8510a90ad0133 /lib/api | |
| parent | 0787726ae7b1692e019ca9d209f5a99ba6e9f294 (diff) | |
| parent | 45280499b8d0135ad7a2d088e24bae1eddd7eb74 (diff) | |
| download | gitlab-ce-cd7c131b23e89883a435923560e6af3a1b2b0c9e.tar.gz | |
Merge pull request #4916 from marbindrakon/merge_request_api
Fix project_id field in MergeRequest API
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index c8531e80af1..f15ca35e954 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -107,7 +107,8 @@ module API end class MergeRequest < Grape::Entity - expose :id, :target_branch, :source_branch, :project_id, :title, :state + expose :id, :target_branch, :source_branch, :title, :state + expose :target_project_id, as: :project_id expose :author, :assignee, using: Entities::UserBasic end |