From 5f4dc226252a03b31cb6a5c0eb6fa7313e69a4bb Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 14:15:16 +0800 Subject: [PATCH] change branches --- app/jobs/sync_repository_job.rb | 2 +- app/models/project.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/jobs/sync_repository_job.rb b/app/jobs/sync_repository_job.rb index d748592df..632dcc7bc 100644 --- a/app/jobs/sync_repository_job.rb +++ b/app/jobs/sync_repository_job.rb @@ -21,8 +21,8 @@ class SyncRepositoryJob < ApplicationJob check_clone = system("cd #{path} && git clone #{image_url}") SyncLog.sync_log("========check_clone:====cd #{path} && git clone #{image_url}===================") - SyncLog.sync_log("========gitlab_branches:#{gitlab_branches}===================") if check_clone + SyncLog.sync_project_log("========gitlab_branches:#{gitlab_branches}===================") new_gitlab_url = "http://root:_Trustie_10010@#{gitea_main}/#{user_login}/#{identifier}.git" shell_remote_1 = system("cd #{path}/#{image_repo_name} && git remote set-url origin #{new_gitlab_url}") gitlab_branches.each do |branch| diff --git a/app/models/project.rb b/app/models/project.rb index b288c0cbd..f4fb1122f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -18,7 +18,6 @@ class Project < ApplicationRecord has_many :project_trends, dependent: :destroy has_many :watchers, as: :watchable, dependent: :destroy has_many :fork_users, dependent: :destroy - # has_many :commits, dependent: :destroy has_one :project_score, dependent: :destroy