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

df9550c7 · Dmitriy Zaporozhets · 65455278 · cd7c131b · df9550c7
Commit df9550c7 authored Aug 27, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lib/api/entities.rb lib/api/entities.rb +2 -1

No files found.
--- 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