Merge branch 'dev_trustie' into dev_devops
This commit is contained in:
commit
f2df2e84cc
|
@ -195,7 +195,7 @@ class SyncForgeController < ApplicationController
|
|||
SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------")
|
||||
if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i
|
||||
diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
|
||||
SyncLog.sync_log("***2--02. diff_issue_ids-#{diff_issue_ids}--------------")
|
||||
|
||||
if diff_issue_ids.size == 0 #issue数量一样,判断评论是否有增减
|
||||
forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
|
||||
diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
|
||||
|
@ -216,7 +216,7 @@ class SyncForgeController < ApplicationController
|
|||
}
|
||||
end
|
||||
end
|
||||
|
||||
SyncLog.sync_log("***2--02. sync_projects_params-#{sync_projects_params}--------------")
|
||||
SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
|
||||
SyncLog.sync_log("***2. end_to_syncissues---------------")
|
||||
rescue Exception => e
|
||||
|
|
Loading…
Reference in New Issue