diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index dd10ddad1..ed5e90743 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -99,8 +99,8 @@ class PullRequestsController < ApplicationController return render_forbidden("你没有权限操作.") unless @project.operator?(current_user) if params[:title].nil? normal_status(-1, "名称不能为空") - elsif params[:issue_tag_ids].nil? - normal_status(-1, "标记不能为空") + # elsif params[:issue_tag_ids].nil? + # normal_status(-1, "标记不能为空") else ActiveRecord::Base.transaction do begin diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder index 860f8bb68..e09efc8ec 100644 --- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder +++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder @@ -18,7 +18,7 @@ if @has_file json.status run["Status"] json.detail_status @result_object[:data]["DetailStatusList"].select{|s| s["RunID"] == run["ID"]}[0].present? ? @result_object[:data]["DetailStatusList"].select{|s| s["RunID"] == run["ID"]}[0]["Status"].sort![0] : run["Status"] - json.time_ago time_from_now(run["Started"]) + json.time_ago run["Started"].zero? ? "未开始" : time_from_now(run["Started"]) json.started run["Started"] json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Started"] : run["Stopped"] - run["Started"] end