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:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-20 06:08:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-20 06:08:24 +0300
commitda87ccca5c1e2cdb077702fcb63884d652179c2f (patch)
tree69daae8b0c5541c50c9b98c166298074f83f2741 /doc/administration/pages/index.md
parent81377eafe174ecc408597fbb3578ea127952190e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/pages/index.md')
-rw-r--r--doc/administration/pages/index.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 5749afded13..2a28df96ef4 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -941,6 +941,10 @@ If you want to stop using and disconnect the NFS server, you need to
#### S3-compatible connection settings
+In GitLab 13.2 and later, you should use the
+[consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration).
+This section describes the earlier configuration format.
+
See [the available connection settings for different providers](../object_storage.md#connection-settings).
In Omnibus installations: