diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /lib/backup | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'lib/backup')
| -rw-r--r-- | lib/backup/repositories.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/backup/repositories.rb b/lib/backup/repositories.rb index d15114a72a3..79b7b2c61f2 100644 --- a/lib/backup/repositories.rb +++ b/lib/backup/repositories.rb @@ -201,7 +201,12 @@ module Backup PoolRepository.includes(:source_project).find_each do |pool| progress.puts " - Object pool #{pool.disk_path}..." - pool.source_project ||= pool.member_projects.first.root_of_fork_network + pool.source_project ||= pool.member_projects.first&.root_of_fork_network + unless pool.source_project + progress.puts " - Object pool #{pool.disk_path}... " + "[SKIPPED]".color(:cyan) + next + end + pool.state = 'none' pool.save |