| @@ -82,10 +82,10 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController | |||||
| params[:sync_repository_ids].split(",").each do |id| | params[:sync_repository_ids].split(",").each do |id| | ||||
| repo = SyncRepository.find_by_id id | repo = SyncRepository.find_by_id id | ||||
| branch = Reposync::CreateSyncBranchService.call(repo.repo_name, params[:gitlink_branch_name], params[:external_branch_name]) | |||||
| Reposync::CreateSyncBranchService.call(repo.repo_name, params[:gitlink_branch_name], params[:external_branch_name]) | |||||
| return render_error(branch[2]) if branch[0].to_i !=0 | return render_error(branch[2]) if branch[0].to_i !=0 | ||||
| SyncRepositoryBranch.create!(sync_repository_id: id, gitlink_branch_name: params[:gitlink_branch_name], external_branch_name: params[:external_branch_name], reposync_branch_id: branch[1]['id']) | |||||
| TouchSyncJob.perform_later(branch) if params[:first_sync_direction].to_i == repo.sync_direction | |||||
| sync_branch = SyncRepositoryBranch.create!(sync_repository_id: id, gitlink_branch_name: params[:gitlink_branch_name], external_branch_name: params[:external_branch_name], reposync_branch_id: branch[1]['id']) | |||||
| TouchSyncJob.perform_later(sync_branch) if params[:first_sync_direction].to_i == repo.sync_direction | |||||
| end | end | ||||
| render_ok | render_ok | ||||
| rescue Exception => e | rescue Exception => e | ||||
| @@ -109,6 +109,7 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController | |||||
| _, logs, _ = Reposync::GetLogsService.call(repo&.repo_name, branch_id) | _, logs, _ = Reposync::GetLogsService.call(repo&.repo_name, branch_id) | ||||
| @reposync_branch_logs += logs | @reposync_branch_logs += logs | ||||
| end | end | ||||
| @reposync_branch_logs = @reposync_branch_logs.sort_by{|log|log["update_at"]} | |||||
| end | end | ||||
| private | private | ||||