floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2024-03-07 15:49:23 +08:00
parent f422350895 a8997ae160
commit a7b6dbc1a0
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/api/v1/projects/actions/runs/index.json.jbuilder
View File

@ -15,8 +15,8 @@ if @result_object[:data]["Runs"].present?
end end
json.status run["Status"] json.status run["Status"]
json.time_ago time_from_now(run["Updated"]) json.time_ago time_from_now(run["Started"])
json.holding_time run["Updated"]-run["Started"] json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Started"] : run["Stopped"] - run["Started"]
end end
else else
json.runs [] json.runs []