Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/object_store_settings.rb')
-rw-r--r--config/object_store_settings.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 22194d8c2de..4e8e950c797 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -31,8 +31,6 @@ class ObjectStoreSettings
object_store['proxy_download'] = false if object_store['proxy_download'].nil?
object_store['storage_options'] ||= {}
- # Convert upload connection settings to use string keys, to make Fog happy
- object_store['connection']&.deep_stringify_keys!
object_store
end
@@ -131,8 +129,7 @@ class ObjectStoreSettings
main_config = settings['object_store']
common_config = main_config.slice('enabled', 'connection', 'proxy_download', 'storage_options')
- # Convert connection settings to use string keys, to make Fog happy
- common_config['connection']&.deep_stringify_keys!
+
# These are no longer configurable if common config is used
common_config['direct_upload'] = true
common_config['storage_options'] ||= {}