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

pull request: fix showing the closed time

This commit is contained in:
Alexander Machehin 2015-03-30 14:25:50 +05:00
parent bc9ebf46df
commit d2a30e2169
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/projects/pull_requests/show.json.jbuilder
View File

@ -33,8 +33,8 @@ json.pull_request do
json.merged_at_utc @pull.issue.closed_at.strftime('%Y-%m-%d %H:%M:%S UTC') json.merged_at_utc @pull.issue.closed_at.strftime('%Y-%m-%d %H:%M:%S UTC')
end end
if @pull.merged? || @pull.closed? if @pull.closed?
json.closed_at @pull.issue.closed_at.to_i json.closed_at @pull.issue.closed_at
json.closed_at_utc @pull.issue.closed_at.strftime('%Y-%m-%d %H:%M:%S UTC') json.closed_at_utc @pull.issue.closed_at.strftime('%Y-%m-%d %H:%M:%S UTC')
end end