diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 10:20:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 10:20:45 +0000 |
| commit | bb9d360c0a7daed6aa08a0635e084c314c2c8b3e (patch) | |
| tree | 2320d72d11cf226ff35ccc5f00c9e4cd8af5fee1 /spec/migrations | |
| parent | 963e445f58f1cbe03f821167a3bf1d0b8cc8a56d (diff) | |
| parent | 008a6a6ce6fa943adcfecf3a606b845cfa282680 (diff) | |
| download | gitlab-ce-bb9d360c0a7daed6aa08a0635e084c314c2c8b3e.tar.gz | |
Merge branch 'mark-legacy-git-access' into 'master'
Route path lookups through legacy_disk_path
See merge request gitlab-org/gitlab-ce!17743
Diffstat (limited to 'spec/migrations')
| -rw-r--r-- | spec/migrations/remove_dot_git_from_usernames_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/migrations/remove_dot_git_from_usernames_spec.rb b/spec/migrations/remove_dot_git_from_usernames_spec.rb index 129374cb38c..3a88a66a476 100644 --- a/spec/migrations/remove_dot_git_from_usernames_spec.rb +++ b/spec/migrations/remove_dot_git_from_usernames_spec.rb @@ -29,7 +29,9 @@ describe RemoveDotGitFromUsernames do update_namespace(user, 'test.git') update_namespace(user2, 'test_git') - storages = { 'default' => 'tmp/tests/custom_repositories' } + default_hash = Gitlab.config.repositories.storages.default.to_h + default_hash['path'] = 'tmp/tests/custom_repositories' + storages = { 'default' => Gitlab::GitalyClient::StorageSettings.new(default_hash) } allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) allow(migration).to receive(:route_exists?).with('test_git').and_return(true) |