diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 17:30:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 17:30:09 +0000 |
| commit | 858d175c1527d650ea5d83e201777d0cf8ae84c9 (patch) | |
| tree | 147344d5699ea84eda6f980867e4d2045e0f22b9 /spec/support/helpers/stub_object_storage.rb | |
| parent | f6262510e6642bb91d112f1bf2ea70db8b7b772c (diff) | |
| download | gitlab-ce-858d175c1527d650ea5d83e201777d0cf8ae84c9.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'spec/support/helpers/stub_object_storage.rb')
| -rw-r--r-- | spec/support/helpers/stub_object_storage.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index c163ce1d880..6b633856228 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -15,7 +15,7 @@ module StubObjectStorage direct_upload: false, cdn: {} ) - + old_config = Settingslogic.new(config.deep_stringify_keys) new_config = config.to_h.deep_symbolize_keys.merge({ enabled: enabled, proxy_download: proxy_download, @@ -37,7 +37,7 @@ module StubObjectStorage return unless enabled stub_object_storage(connection_params: uploader.object_store_credentials, - remote_directory: config.remote_directory) + remote_directory: old_config.remote_directory) end def stub_object_storage(connection_params:, remote_directory:) |