summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-31 16:51:06 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-31 16:51:06 +0000
commitdbadf5a57660bea6edf38597af17a32094d5fe1f (patch)
tree5e19a2f03293eec085159b7295c1612401a366a0 /lib
parent2519027442a5645cc9467e842172143e3f56c7c3 (diff)
parenta459e45eac290914c864616468f1527f6b1fdaab (diff)
downloadgitlab-ce-dbadf5a57660bea6edf38597af17a32094d5fe1f.tar.gz
Merge branch 'mk-fix-wiki-backup' into 'master'
Fix improperly skipped backups of wikis Closes #28854 See merge request !13096
Diffstat (limited to 'lib')
-rw-r--r--lib/backup/repository.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index a1685c77916..02ed1e49ef8 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -189,6 +189,7 @@ module Backup
end
def empty_repo?(project_or_wiki)
+ project_or_wiki.repository.expire_exists_cache # protect backups from stale cache
project_or_wiki.repository.empty_repo?
rescue => e
progress.puts "Ignoring repository error and continuing backing up project: #{project_or_wiki.path_with_namespace} - #{e.message}".color(:orange)