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

Merge branch 'empty_wiki_backup_check' into 'master'
44e6b802 · Dmitriy Zaporozhets · c0a5d043 · 8ad1330b · 44e6b802
Commit 44e6b802 authored Oct 20, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

repository.rb lib/backup/repository.rb +1 -1

No files found.
--- 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))