diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 09:20:19 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 09:20:19 +0000 |
| commit | c353426650877956bf2db3111f9964f68e5940f6 (patch) | |
| tree | 43ba7e90110e742bd14c8c417254e6e104f497f1 /spec/support | |
| parent | 9dd330576ac374cd7ec7e97863e0b5228dfd3205 (diff) | |
| parent | ddfc661f794ca02654853a9e223b9a5f3fb983ab (diff) | |
| download | gitlab-ce-c353426650877956bf2db3111f9964f68e5940f6.tar.gz | |
Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' into 'master'
Use shard name in Git::GitlabProjects instead of shard path
Closes gitaly#1110
See merge request gitlab-org/gitlab-ce!18015
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index f14e69b1041..d87f265cdf0 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -62,6 +62,7 @@ module TestEnv }.freeze TMP_TEST_PATH = Rails.root.join('tmp', 'tests', '**') + REPOS_STORAGE = 'default'.freeze # Test environment # @@ -225,7 +226,7 @@ module TestEnv end def repos_path - Gitlab.config.repositories.storages.default.legacy_disk_path + Gitlab.config.repositories.storages[REPOS_STORAGE].legacy_disk_path end def backup_path |