Commit 51a9f711 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Add a custom storage config instead of overwriting

Otherwise the ApplicationSetting that is currently stored would be
invalid as it specifies a storage that is not configured
parent e6568d80
...@@ -35,7 +35,9 @@ describe API::Settings, 'Settings' do ...@@ -35,7 +35,9 @@ describe API::Settings, 'Settings' do
context "custom repository storage type set in the config" do context "custom repository storage type set in the config" do
before do before do
storages = { 'custom' => 'tmp/tests/custom_repositories' } # Add a possible storage to the config
storages = Gitlab.config.repositories.storages
.merge({ 'custom' => 'tmp/tests/custom_repositories' })
allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment