diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-09 06:40:19 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-09 06:40:19 +0000 |
| commit | b8115e76a4ba8b2ac6ec79c43217d4ecff1e44bb (patch) | |
| tree | ef27d25fef52d687c1e299d4ba8508a2a4fd26a3 | |
| parent | 23ae3911aa55f075e30da9da4e687e064e59a9fa (diff) | |
| parent | 0f29ccffd2b9805545db63d8266bb8367de1e35c (diff) | |
| download | gitlab-ce-b8115e76a4ba8b2ac6ec79c43217d4ecff1e44bb.tar.gz | |
Merge branch 'backup_wiki_skip_bug' into 'master'
Fix wiki backup skip bug
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/backup/repository.rb | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG index 61eb24f1c53..e43edc5d7ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 6.9.0 - Improve issue and merge request mobile UI (Drew Blessing) - Document how to convert a backup to PostgreSQL - Fix locale bug in backup manager + - Fix wiki backup skip bug v 6.8.0 - Ability to at mention users that are participating in issue and merge req. discussion diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 214d9824ee1..6f7c4f7c909 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -10,15 +10,12 @@ module Backup Project.find_each(batch_size: 1000) do |project| print " * #{project.path_with_namespace} ... " - if project.empty_repo? - puts "[SKIPPED]".cyan - next - end - # Create namespace dir if missing FileUtils.mkdir_p(File.join(backup_repos_path, project.namespace.path)) if project.namespace - if system(*%W(git --git-dir=#{path_to_repo(project)} bundle create #{path_to_bundle(project)} --all), silent) + if project.empty_repo? + puts "[SKIPPED]".cyan + elsif system(*%W(git --git-dir=#{path_to_repo(project)} bundle create #{path_to_bundle(project)} --all), silent) puts "[DONE]".green else puts "[FAILED]".red |