Merge branch...

Merge branch '5672-consolidated-form-for-object-storage-does-not-work-in-docker-install-of-gitlab' into 'master'

Resolve "Consolidated form for object storage does not work in docker install of GitLab"

Closes #5672

See merge request gitlab-org/omnibus-gitlab!4656

changelogs/unreleased/5672-consolidated-form-for-object-storage-does-not-work-in-docker-install-of-gitlab.yml

+---
+title: Fix onsolidated form object storage configuration template
+merge_request: 4656
+author:
+type: fixed

files/gitlab-config-template/gitlab.rb.template

@@ -278,18 +278,17 @@ external_url 'GENERATED_EXTERNAL_URL'
 ###!
 ###! Be sure to use different buckets for each type of object.
 ###! Docs: https://docs.gitlab.com/ee/administration/object_storage.html
-gitlab_rails['object_store']['enabled'] = false
-gitlab_rails['object_store']['connection'] = {}
-gitlab_rails['object_store']['storage_options'] = {}
-gitlab_rails['object_store']['proxy_download'] = false
-gitlab_rails['object_store']['objects']['artifacts']['bucket'] = nil
-gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = nil
-gitlab_rails['object_store']['objects']['lfs']['bucket'] = nil
-gitlab_rails['object_store']['objects']['uploads']['bucket'] = nil
-gitlab_rails['object_store']['objects']['packages']['bucket'] = nil
-gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = nil
-gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil
-gitlab_rails['object_store']['objects']['pages']['bucket'] = nil
+# gitlab_rails['object_store']['enabled'] = false
+# gitlab_rails['object_store']['connection'] = {}
+# gitlab_rails['object_store']['storage_options'] = {}
+# gitlab_rails['object_store']['proxy_download'] = false
+# gitlab_rails['object_store']['objects']['artifacts']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['lfs']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['uploads']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['packages']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil
 ### Job Artifacts
 # gitlab_rails['artifacts_enabled'] = true