fix the sample configuration

config/gitlab.yml.example

@@ -145,15 +145,15 @@ production: &base
     enabled: true
     # The location where build artifacts are stored (default: shared/artifacts).
     # path: shared/artifacts
-    # object_store:
-    #   enabled: false
-    #   remote_directory: artifacts # The bucket name
-    #   background_upload: false # Temporary option to limit automatic upload (Default: true)
-    #   connection:
-    #     provider: AWS # Only AWS supported at the moment
-    #     aws_access_key_id: AWS_ACCESS_KEY_ID
-    #     aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-    #     region: eu-central-1
+    object_store:
+      enabled: false
+      remote_directory: artifacts # The bucket name
+      # background_upload: false # Temporary option to limit automatic upload (Default: true)
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: eu-central-1
 
   ## Git LFS
   lfs:
@@ -801,6 +801,11 @@ test:
     enabled: true
     object_store:
       enabled: false
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: eu-central-1
   gitlab:
     host: localhost
     port: 80

config/initializers/1_settings.rb

@@ -378,10 +378,9 @@ Settings.artifacts['storage_path'] = Settings.absolute(Settings.artifacts.values
 Settings.artifacts['max_size']   ||= 100 # in megabytes
 
 Settings.artifacts['object_store'] ||= Settingslogic.new({})
-
-Settings.artifacts['object_store']['enabled'] = false if Settings.artifacts['object_store']['enabled'].nil?
-Settings.artifacts['object_store']['remote_directory'] ||= nil
-Settings.artifacts['object_store']['background_upload'] = true if Settings.artifacts['object_store']['background_upload'].nil?
+Settings.artifacts['object_store']['enabled']           ||= false
+Settings.artifacts['object_store']['remote_directory']  ||= nil
+Settings.artifacts['object_store']['background_upload'] ||= true
 # Convert upload connection settings to use string keys, to make Fog happy
 Settings.artifacts['object_store']['connection']&.deep_stringify_keys!
 
@@ -391,13 +390,12 @@ Settings.artifacts['object_store']['connection']&.deep_stringify_keys!
 Settings['lfs'] ||= Settingslogic.new({})
 Settings.lfs['enabled']      = true if Settings.lfs['enabled'].nil?
 Settings.lfs['storage_path'] = Settings.absolute(Settings.lfs['storage_path'] || File.join(Settings.shared['path'], "lfs-objects"))
-Settings.lfs['object_store'] ||= Settingslogic.new({}).tap do |object_store|
-  object_store['enabled']           ||= false
-  object_store['remote_directory']  ||= nil
-  object_store['background_upload'] ||= true
-  # Convert upload connection settings to use string keys, to make Fog happy
-  object_store['connection']&.deep_stringify_keys!
-end
+Settings.lfs['object_store'] ||= Settingslogic.new({})
+Settings.lfs['object_store']['enabled']           ||= false
+Settings.lfs['object_store']['remote_directory']  ||= nil
+Settings.lfs['object_store']['background_upload'] ||= true
+# Convert upload connection settings to use string keys, to make Fog happy
+Settings.lfs['object_store']['connection']&.deep_stringify_keys!
 
 #
 # Uploads
@@ -406,9 +404,9 @@ Settings['uploads'] ||= Settingslogic.new({})
 Settings.uploads['storage_path'] = Settings.absolute(Settings.uploads['storage_path'] || 'public')
 Settings.uploads['base_dir'] = Settings.uploads['base_dir'] || 'uploads/-/system'
 Settings.uploads['object_store'] ||= Settingslogic.new({})
-Settings.uploads['object_store']['enabled'] = false if Settings.uploads['object_store']['enabled'].nil?
-Settings.uploads['object_store']['remote_directory'] ||= nil
-Settings.uploads['object_store']['background_upload'] = true if Settings.uploads['object_store']['background_upload'].nil?
+Settings.uploads['object_store']['enabled']           ||= false
+Settings.uploads['object_store']['remote_directory']  ||= 'uploads'
+Settings.uploads['object_store']['background_upload'] ||= true
 # Convert upload connection settings to use string keys, to make Fog happy
 Settings.uploads['object_store']['connection']&.deep_stringify_keys!