Commit e1dff736 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'sh-workaround-object-storage-test-failure' into 'master'

Work around test failure due to stub_storage_settings issue

See merge request gitlab-org/gitlab!48219
parents cdb3114b 0181faf4
...@@ -132,7 +132,7 @@ class ObjectStoreSettings ...@@ -132,7 +132,7 @@ class ObjectStoreSettings
# If a storage type such as Pages defines its own connection and does not # If a storage type such as Pages defines its own connection and does not
# use Workhorse acceleration, we allow it to override the consolidated form. # use Workhorse acceleration, we allow it to override the consolidated form.
next if allowed_storage_specific_settings?(store_type, section) next if allowed_storage_specific_settings?(store_type, section.to_h)
# Map bucket (external name) -> remote_directory (internal representation) # Map bucket (external name) -> remote_directory (internal representation)
target_config['remote_directory'] = target_config.delete('bucket') target_config['remote_directory'] = target_config.delete('bucket')
......
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