From 00f21ef490c4b823afa0a19cc354d402e95dd54c Mon Sep 17 00:00:00 2001
From: Tim Rizzi <trizzi@gitlab.com>
Date: Tue, 3 May 2022 10:26:25 +0000
Subject: [PATCH] Removals and deprecations for Composer permission

---
 ...4-9-deprecate-composer-download-permissions.yml |  4 ++--
 .../14-10-package-permissions-composer-change.yml  | 12 ++++++++++++
 doc/update/deprecations.md                         |  4 ++--
 doc/update/removals.md                             | 14 ++++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 data/removals/14_10/14-10-package-permissions-composer-change.yml

diff --git a/data/deprecations/14-9-deprecate-composer-download-permissions.yml b/data/deprecations/14-9-deprecate-composer-download-permissions.yml
index 68d9d77d072db..e44f1c551677b 100644
--- a/data/deprecations/14-9-deprecate-composer-download-permissions.yml
+++ b/data/deprecations/14-9-deprecate-composer-download-permissions.yml
@@ -1,8 +1,8 @@
 - name: "Permissions change for downloading Composer dependencies"
   announcement_milestone: "14.9"
   announcement_date: "2022-03-22"
-  removal_milestone: "15.0"
-  removal_date: "2022-05-22"
+  removal_milestone: "14.10"
+  removal_date: "2022-04-22"
   breaking_change: true
   reporter: trizzi
   body: |  # Do not modify this line, instead modify the lines below.
diff --git a/data/removals/14_10/14-10-package-permissions-composer-change.yml b/data/removals/14_10/14-10-package-permissions-composer-change.yml
new file mode 100644
index 0000000000000..e44f1c551677b
--- /dev/null
+++ b/data/removals/14_10/14-10-package-permissions-composer-change.yml
@@ -0,0 +1,12 @@
+- name: "Permissions change for downloading Composer dependencies"
+  announcement_milestone: "14.9"
+  announcement_date: "2022-03-22"
+  removal_milestone: "14.10"
+  removal_date: "2022-04-22"
+  breaking_change: true
+  reporter: trizzi
+  body: |  # Do not modify this line, instead modify the lines below.
+    The GitLab Composer repository can be used to push, search, fetch metadata about, and download PHP dependencies. All these actions require authentication, except for downloading dependencies.
+
+    Downloading Composer dependencies without authentication is deprecated in GitLab 14.9, and will be removed in GitLab 15.0. Starting with GitLab 15.0, you must authenticate to download Composer dependencies.
+  stage: package
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 06b15d38e6cad..37fa9f6e8989f 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -202,7 +202,7 @@ The [`custom_hooks_dir`](https://docs.gitlab.com/ee/administration/server_hooks.
 ### Permissions change for downloading Composer dependencies
 
 WARNING:
-This feature will be changed or removed in 15.0
+This feature will be changed or removed in 14.10
 as a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
 Before updating GitLab, review the details carefully to determine if you need to make any
 changes to your code, settings, or workflow.
@@ -211,7 +211,7 @@ The GitLab Composer repository can be used to push, search, fetch metadata about
 
 Downloading Composer dependencies without authentication is deprecated in GitLab 14.9, and will be removed in GitLab 15.0. Starting with GitLab 15.0, you must authenticate to download Composer dependencies.
 
-**Planned removal milestone: 15.0 (2022-05-22)**
+**Planned removal milestone: 14.10 (2022-04-22)**
 
 ### htpasswd Authentication for the Container Registry
 
diff --git a/doc/update/removals.md b/doc/update/removals.md
index 65f7234b177a5..ffd8afabd476a 100644
--- a/doc/update/removals.md
+++ b/doc/update/removals.md
@@ -173,6 +173,20 @@ The new security approvals feature is similar to vulnerability check. For exampl
 - A two-step approval process can be enforced for any desired changes to security approval rules.
 - A single set of security policies can be applied to multiple development projects to allow for ease in maintaining a single, centralized ruleset.
 
+## 14.10
+
+### Permissions change for downloading Composer dependencies
+
+WARNING:
+This feature was changed or removed in 14.10
+as a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
+Before updating GitLab, review the details carefully to determine if you need to make any
+changes to your code, settings, or workflow.
+
+The GitLab Composer repository can be used to push, search, fetch metadata about, and download PHP dependencies. All these actions require authentication, except for downloading dependencies.
+
+Downloading Composer dependencies without authentication is deprecated in GitLab 14.9, and will be removed in GitLab 15.0. Starting with GitLab 15.0, you must authenticate to download Composer dependencies.
+
 ## 14.9
 
 ### Integrated error tracking disabled by default
-- 
GitLab