Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents 65455278 cd7c131b
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
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
...	...	@@ -107,7 +107,8 @@ module API
107	107	end
108	108
109	109	class MergeRequest < Grape::Entity
110		- expose :id, :target_branch, :source_branch, :project_id, :title, :state
	110	+ expose :id, :target_branch, :source_branch, :title, :state
	111	+ expose :target_project_id, as: :project_id
111	112	expose :author, :assignee, using: Entities::UserBasic
112	113	end
113	114
...	...