Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-07 19:55:03 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-03-07 19:55:03 +0300
commita5db7f54252d22e3ecd49786a3fdff7c46658fa3 (patch)
tree71a947d3274aadf2a2896166a6709174b910a2d0 /spec/tasks
parentba3ce6bd39ffdcc03c1b435c8c69ddfc4ff688e2 (diff)
parent0b9d56f960e272047ac749cff7a29f2b5f03f7a5 (diff)
Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard See merge request !9597
Diffstat (limited to 'spec/tasks')
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index dfbfbd05f43..10458966cb9 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -227,8 +227,8 @@ describe 'gitlab:app namespace rake task' do
FileUtils.mkdir('tmp/tests/default_storage')
FileUtils.mkdir('tmp/tests/custom_storage')
storages = {
- 'default' => 'tmp/tests/default_storage',
- 'custom' => 'tmp/tests/custom_storage'
+ 'default' => { 'path' => 'tmp/tests/default_storage' },
+ 'custom' => { 'path' => 'tmp/tests/custom_storage' }
}
allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)