summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Austin <aaustin@terremark.com>2013-08-27 01:54:09 +0000
committerAndrew Austin <aaustin@terremark.com>2013-08-27 01:54:09 +0000
commit45280499b8d0135ad7a2d088e24bae1eddd7eb74 (patch)
tree32b7f3e2ef6b395988cf2d1b851e8cf67fcd6005
parent21e3d848b464f8cabbbddb3d2d4e2b697d4476b0 (diff)
downloadgitlab-ce-45280499b8d0135ad7a2d088e24bae1eddd7eb74.tar.gz
Fix project_id field in MergeRequest API
-rw-r--r--lib/api/entities.rb3
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