diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-22 20:24:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-22 20:24:22 +0000 |
| commit | 7cf8e0981ad2492fb26c8f9b232bf548b383b08b (patch) | |
| tree | ecf15c47c0a2558d342b4b748e15ea3c268fb6dd /spec/support | |
| parent | 94c7acd10fff2bbd8fd4f6c8562f040380133110 (diff) | |
| parent | ba0ebbb510c4f19738b5e2ac2dee06193aafff3a (diff) | |
| download | gitlab-ce-7cf8e0981ad2492fb26c8f9b232bf548b383b08b.tar.gz | |
Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'
Allow the git circuit breaker to correctly handle missing repository storages
Closes #36549
See merge request gitlab-org/gitlab-ce!14417
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/stub_configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb index 45c10e78789..2dfb4d4a07f 100644 --- a/spec/support/stub_configuration.rb +++ b/spec/support/stub_configuration.rb @@ -42,7 +42,7 @@ module StubConfiguration # Default storage is always required messages['default'] ||= Gitlab.config.repositories.storages.default messages.each do |storage_name, storage_settings| - storage_settings['path'] ||= TestEnv.repos_path + storage_settings['path'] = TestEnv.repos_path unless storage_settings.key?('path') storage_settings['failure_count_threshold'] ||= 10 storage_settings['failure_wait_time'] ||= 30 storage_settings['failure_reset_time'] ||= 1800 |