diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-28 12:14:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-28 12:14:07 +0000 |
commit | 22ecb1e3fc02bb923c3e9941b1baa849348a036f (patch) | |
tree | c01d9e91564f50e790a63c71675dd0f6e7735153 /spec/support/helpers | |
parent | 5eab6dcdd923ca375b86d6993f20a3e37dbd7a51 (diff) | |
download | gitlab-ce-22ecb1e3fc02bb923c3e9941b1baa849348a036f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers')
-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:) |