Add latest changes from gitlab-org/gitlab@master

3 files changed, 24 insertions, 5 deletions

diff --git a/data/deprecations/14-5-remove-package-pipelines-api.yml b/data/deprecations/14-5-remove-package-pipelines-api.yml
index f6a091c7c4b..ebb39ee6999 100644
--- a/data/deprecations/14-5-remove-package-pipelines-api.yml
+++ b/data/deprecations/14-5-remove-package-pipelines-api.yml
@@ -1,11 +1,11 @@
 - title: "Package pipelines in API payload is paginated"  # The name of the feature to be deprecated
   announcement_milestone: "14.5"  # The milestone when this feature was first announced as deprecated.
-  removal_milestone: "16.0"  # The milestone when this feature is planned to be removed
+  removal_milestone: "17.0"  # The milestone when this feature is planned to be removed
   breaking_change: true
   body: |  # Do not modify this line, instead modify the lines below.
     A request to the API for `/api/v4/projects/:id/packages` returns a paginated result of packages. Each package lists all of its pipelines in this response. This is a performance concern, as it's possible for a package to have hundreds or thousands of associated pipelines.
 
-    In milestone 16.0, we will remove the `pipelines` attribute from the API response.
+    In milestone 17.0, we will remove the `pipelines` attribute from the API response.
   stage: package
   tiers: Free
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289956
diff --git a/data/deprecations/15-8-raise-permissions-settings-package-stage.yml b/data/deprecations/15-8-raise-permissions-settings-package-stage.yml
index 72b53ee8c9b..a7d211622ff 100644
--- a/data/deprecations/15-8-raise-permissions-settings-package-stage.yml
+++ b/data/deprecations/15-8-raise-permissions-settings-package-stage.yml
@@ -1,17 +1,17 @@
 - title: "Maintainer role providing the ability to change Package settings using GraphQL API"
   announcement_milestone: "15.8"
-  removal_milestone: "16.0"
+  removal_milestone: "17.0"
   breaking_change: true
   reporter: trizzi
   stage: Package
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370471
   body: |
     The ability for users with the Maintainer role to change the **Packages and registries** settings for a group using
-    the GraphQL API is deprecated in GitLab 15.8 and will be removed in GitLab 16.0. These settings include:
+    the GraphQL API is deprecated in GitLab 15.8 and will be removed in GitLab 17.0. These settings include:
 
     - [Allowing or preventing duplicate package uploads](https://docs.gitlab.com/ee/user/packages/maven_repository/#do-not-allow-duplicate-maven-packages).
     - [Package request forwarding](https://docs.gitlab.com/ee/user/packages/maven_repository/#request-forwarding-to-maven-central).
     - [Enabling lifecycle rules for the Dependency Proxy](https://docs.gitlab.com/ee/user/packages/dependency_proxy/reduce_dependency_proxy_storage.html).
 
-    In GitLab 16.0 and later, you must have Owner role for a group to change the **Packages and registries**
+    In GitLab 17.0 and later, you must have the Owner role for a group to change the **Packages and registries**
     settings for the group using either the GitLab UI or GraphQL API.
diff --git a/data/removals/16_0/16-0-gitaly-legacy-config-vars.yml b/data/removals/16_0/16-0-gitaly-legacy-config-vars.yml
new file mode 100644
index 00000000000..05bc10114aa
--- /dev/null
+++ b/data/removals/16_0/16-0-gitaly-legacy-config-vars.yml
@@ -0,0 +1,19 @@
+---
+- title: "Legacy Gitaly configuration methods with variables"
+  announcement_milestone: "14.8"
+  removal_milestone: "16.0"
+  breaking_change: true
+  reporter: mjwood
+  stage: Gitaly
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352609
+  body: |
+    The environment variables `GIT_CONFIG_SYSTEM` and `GIT_CONFIG_GLOBAL` were deprecated in GitLab 14.8 and are removed
+    in GitLab 16.0. These variables are replaced with standard
+    [`config.toml` Gitaly configuration](https://docs.gitlab.com/ee/administration/gitaly/reference.html).
+
+    GitLab instances that use `GIT_CONFIG_SYSTEM` and `GIT_CONFIG_GLOBAL` to configure Gitaly must switch to configuring
+    using `config.toml`.
+  tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
+  documentation_url: https://docs.gitlab.com/ee/administration/gitaly/reference.html # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg