diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-20 10:52:29 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 16:37:20 +0300 |
| commit | 082d59d21f7f8857eca2715c1a58fbce30f9b92d (patch) | |
| tree | da4f9d43e7206d80d69ef68d60e038678f300900 | |
| parent | 564c4138e914abab570ad92c4850dd2b35d37198 (diff) | |
| download | gitlab-ce-082d59d21f7f8857eca2715c1a58fbce30f9b92d.tar.gz | |
Ask the wiki repo, not Gollum, if it's empty
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.
| -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)) |