diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /config/object_store_settings.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'config/object_store_settings.rb')
| -rw-r--r-- | config/object_store_settings.rb | 5 |
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 |