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.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 7bf05622bac..d85ff394dcc 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -1,13 +1,15 @@
# Set default values for object_store settings
class ObjectStoreSettings
- def initialize(object_store)
+ def self.parse(object_store)
object_store ||= Settingslogic.new({})
object_store['enabled'] = false if object_store['enabled'].nil?
object_store['remote_directory'] ||= nil
object_store['direct_upload'] = false if object_store['direct_upload'].nil?
object_store['background_upload'] = true if object_store['background_upload'].nil?
object_store['proxy_download'] = false if object_store['proxy_download'].nil?
+
# Convert upload connection settings to use string keys, to make Fog happy
object_store['connection']&.deep_stringify_keys!
+ object_store
end
end