Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

same as #274

This commit is contained in:
Alexander Machehin 2013-08-22 20:02:10 +06:00
parent 54cadb0526
commit 5099f3e748
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/api/v1/pull_requests/show.json.jbuilder
View File

@ -2,12 +2,16 @@ json.pull_request do
json.partial! 'pull', :pull => @pull
json.body @pull.body
json.closed_at @pull.issue.closed_at.to_i if @pull.merged? || @pull.closed?
json.closed_by do
json.partial! 'api/v1/shared/member', :member => @pull.issue.closer
end if @pull.issue.closer
json.merged_by do
json.partial! 'api/v1/shared/member', :member => @pull.issue.closer
end if @pull.merged?
if @pull.issue.closer
json.closed_by do
json.(@pull.issue.closer, :id, :name, :uname)
end
json.merged_by do
json.(@pull.issue.closer, :id, :name, :uname)
end if @pull.merged?
end
json.created_at @pull.issue.created_at.to_i
json.updated_at @pull.issue.updated_at.to_i
end