Download as
Browse Code »

Commit b8115e76a4ba8b2ac6ec79c43217d4ecff1e44bb

Authored by Dmitriy Zaporozhets
2 parents 23ae3911 0f29ccff
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'backup_wiki_skip_bug' into 'master' 

Fix wiki backup skip bug
Showing 2 changed files with 4 additions and 6 deletions   Show diff stats
@@ -11,6 +11,7 @@ v 6.9.0 @@ -11,6 +11,7 @@ v 6.9.0
11 - Improve issue and merge request mobile UI (Drew Blessing) 11 - Improve issue and merge request mobile UI (Drew Blessing)
12 - Document how to convert a backup to PostgreSQL 12 - Document how to convert a backup to PostgreSQL
13 - Fix locale bug in backup manager 13 - Fix locale bug in backup manager
  14 + - Fix wiki backup skip bug
14 15
15 v 6.8.0 16 v 6.8.0
16 - Ability to at mention users that are participating in issue and merge req. discussion 17 - Ability to at mention users that are participating in issue and merge req. discussion
lib/backup/repository.rb
  Diff comments   View file @b8115e7
@@ -10,15 +10,12 @@ module Backup @@ -10,15 +10,12 @@ module Backup
10 Project.find_each(batch_size: 1000) do |project| 10 Project.find_each(batch_size: 1000) do |project|
11 print " * #{project.path_with_namespace} ... " 11 print " * #{project.path_with_namespace} ... "
12 12
13 - if project.empty_repo?  
14 - puts "[SKIPPED]".cyan  
15 - next  
16 - end  
17 -  
18 # Create namespace dir if missing 13 # Create namespace dir if missing
19 FileUtils.mkdir_p(File.join(backup_repos_path, project.namespace.path)) if project.namespace 14 FileUtils.mkdir_p(File.join(backup_repos_path, project.namespace.path)) if project.namespace
20 15
21 - if system(*%W(git --git-dir=#{path_to_repo(project)} bundle create #{path_to_bundle(project)} --all), silent) 16 + if project.empty_repo?
  17 + puts "[SKIPPED]".cyan
  18 + elsif system(*%W(git --git-dir=#{path_to_repo(project)} bundle create #{path_to_bundle(project)} --all), silent)
22 puts "[DONE]".green 19 puts "[DONE]".green
23 else 20 else
24 puts "[FAILED]".red 21 puts "[FAILED]".red