diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 16:55:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 16:55:03 +0000 |
| commit | a5db7f54252d22e3ecd49786a3fdff7c46658fa3 (patch) | |
| tree | 71a947d3274aadf2a2896166a6709174b910a2d0 /lib/backup | |
| parent | ba3ce6bd39ffdcc03c1b435c8c69ddfc4ff688e2 (diff) | |
| parent | 0b9d56f960e272047ac749cff7a29f2b5f03f7a5 (diff) | |
| download | gitlab-ce-a5db7f54252d22e3ecd49786a3fdff7c46658fa3.tar.gz | |
Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard
See merge request !9597
Diffstat (limited to 'lib/backup')
| -rw-r--r-- | lib/backup/repository.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 3c4ba5d50e6..cd745d35e7c 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -68,7 +68,8 @@ module Backup end def restore - Gitlab.config.repositories.storages.each do |name, path| + Gitlab.config.repositories.storages.each do |name, repository_storage| + path = repository_storage['path'] next unless File.exist?(path) # Move repos dir to 'repositories.old' dir @@ -199,7 +200,7 @@ module Backup private def repository_storage_paths_args - Gitlab.config.repositories.storages.values + Gitlab.config.repositories.storages.values.map { |rs| rs['path'] } end end end |