diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-20 12:20:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-20 12:20:29 +0000 |
| commit | 44e6b802711ca1f3472af183cce38eb2a0585d9a (patch) | |
| tree | cf975ad5e64924b559a8e05640f7a7713076dcc0 | |
| parent | c0a5d043819d6ad52912e2ba68c7fcb12e237978 (diff) | |
| parent | 8ad1330b6a8648406bcd392ad5884498a25fbceb (diff) | |
| download | gitlab-ce-44e6b802711ca1f3472af183cce38eb2a0585d9a.tar.gz | |
Merge branch 'empty_wiki_backup_check' into 'master'
Empty wiki backup check
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
See merge request !1195
| -rw-r--r-- | lib/backup/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 4e99d4bbe5c..380beac708d 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -30,7 +30,7 @@ module Backup if File.exists?(path_to_repo(wiki)) print " * #{wiki.path_with_namespace} ... " - if wiki.empty? + if wiki.repository.empty? puts " [SKIPPED]".cyan else output, status = Gitlab::Popen.popen(%W(git --git-dir=#{path_to_repo(wiki)} bundle create #{path_to_bundle(wiki)} --all)) |