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, 5 insertions, 0 deletions
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 938129757f1..8cbb3451a16 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -144,6 +144,11 @@ class ObjectStoreSettings
target_config['remote_directory'] = target_config.delete('bucket')
target_config['consolidated_settings'] = true
section['object_store'] = target_config
+ # Settingslogic internally stores data as a Hash, but it also
+ # creates a Settings object for every key. To avoid confusion, we should
+ # update both so that Settings.artifacts and Settings['artifacts'] return
+ # the same result.
+ settings[store_type]['object_store'] = target_config
end
settings