Commit b985f294 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'bbodenmiller-master-patch-30574' into 'master'

Fix Storage-specific configuration header depth

See merge request gitlab-org/gitlab!64864
parents e983e727 32d70285
...@@ -537,7 +537,7 @@ the original form is omitted. To move to the consolidated form, remove the ...@@ -537,7 +537,7 @@ the original form is omitted. To move to the consolidated form, remove the
original configuration (for example, `artifacts_object_store_enabled`, or original configuration (for example, `artifacts_object_store_enabled`, or
`uploads_object_store_connection`) `uploads_object_store_connection`)
## Storage-specific configuration ### Storage-specific configuration
For configuring object storage in GitLab 13.1 and earlier, or for storage types not For configuring object storage in GitLab 13.1 and earlier, or for storage types not
supported by consolidated configuration form, refer to the following guides: supported by consolidated configuration form, refer to the following guides:
...@@ -580,7 +580,7 @@ There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab ...@@ -580,7 +580,7 @@ There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab
in the future. in the future.
Helm-based installs require separate buckets to Helm-based installs require separate buckets to
[handle backup restorations](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer) [handle backup restorations](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer).
### S3 API compatibility issues ### S3 API compatibility issues
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment