summaryrefslogtreecommitdiff
path: root/data/deprecations
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-17 00:08:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-17 00:08:12 +0000
commitf52c68bbac191605f793686c472425b000a0879a (patch)
tree1d85443e61577794ce0df8c28534411c4e2bf979 /data/deprecations
parent9a107fa4c14448945a3189fef35b11e0cafb0285 (diff)
downloadgitlab-ce-f52c68bbac191605f793686c472425b000a0879a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'data/deprecations')
-rw-r--r--data/deprecations/15-10-gitaly-legacy-config.yml3
-rw-r--r--data/deprecations/15-9-legacy-praefect-configuration.yml4
2 files changed, 5 insertions, 2 deletions
diff --git a/data/deprecations/15-10-gitaly-legacy-config.yml b/data/deprecations/15-10-gitaly-legacy-config.yml
index c65282ca86c..77f045defb1 100644
--- a/data/deprecations/15-10-gitaly-legacy-config.yml
+++ b/data/deprecations/15-10-gitaly-legacy-config.yml
@@ -16,6 +16,9 @@
configuration structure. You should update the configuration of Gitaly at your earliest convenience.
The change improves consistency between Omnibus GitLab and source installs and enables us to provide better documentation and tooling for both.
+
+ You should update to the new configuration structure as soon as possible using
+ [the upgrade instructions](https://docs.gitlab.com/ee/update/#gitaly-omnibus-gitlab-configuration-structure-change).
#
# OPTIONAL END OF SUPPORT FIELDS
#
diff --git a/data/deprecations/15-9-legacy-praefect-configuration.yml b/data/deprecations/15-9-legacy-praefect-configuration.yml
index a5ed314bb5a..247fc05f2d5 100644
--- a/data/deprecations/15-9-legacy-praefect-configuration.yml
+++ b/data/deprecations/15-9-legacy-praefect-configuration.yml
@@ -13,8 +13,8 @@
Praefect configuration so the previous configuration method is deprecated.
The single configuration structure available from GitLab 15.9, though backwards compatibility is maintained. Once removed, Praefect must be configured using the single
- configuration structure. You should update the configuration of Praefect at your earliest convenience. See
- [GitLab 15.9 upgrade information](https://docs.gitlab.com/ee/update/#1590).
+ configuration structure. You should update your Praefect configuration as soon as possible using
+ [the upgrade instructions](https://docs.gitlab.com/ee/update/#praefect-omnibus-gitlab-configuration-structure-change).
This change brings Praefect configuration in Omnibus GitLab in line with the configuration structure of Praefect. Previously, the hierarchies and configuration keys
didn't match. The change improves consistency between Omnibus GitLab and source installs and enables us to provide better documentation and tooling for both.