Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

19 files changed, 164 insertions, 66 deletions

diff --git a/data/deprecations/14-5-package-container-registry-api-group-update.yml b/data/deprecations/14-5-package-container-registry-api-group-update.yml
index d7dbf841c72..9f467709d53 100644
--- a/data/deprecations/14-5-package-container-registry-api-group-update.yml
+++ b/data/deprecations/14-5-package-container-registry-api-group-update.yml
@@ -1,9 +1,9 @@
-- title: "Update to the Container Registry group-level API"
+- title: "Update to the container registry group-level API"
   announcement_milestone: "14.5"  # The milestone when this feature was first announced as deprecated.
   removal_milestone: "15.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.
-    In milestone 15.0, support for the `tags` and `tags_count` parameters will be removed from the Container Registry API that [gets registry repositories from a group](../api/container_registry.md#within-a-group).
+    In milestone 15.0, support for the `tags` and `tags_count` parameters will be removed from the container registry API that [gets registry repositories from a group](../api/container_registry.md#within-a-group).
 
     The `GET /groups/:id/registry/repositories` endpoint will remain, but won't return any info about tags. To get the info about tags, you can use the existing `GET /registry/repositories/:id` endpoint, which will continue to support the `tags` and `tag_count` options as it does today. The latter must be called once per image repository.
   stage: Package
diff --git a/data/deprecations/14-9-deprecate-permissions-change-package-settings.yml b/data/deprecations/14-9-deprecate-permissions-change-package-settings.yml
index 8f2aaf3b743..cc16a1155a4 100644
--- a/data/deprecations/14-9-deprecate-permissions-change-package-settings.yml
+++ b/data/deprecations/14-9-deprecate-permissions-change-package-settings.yml
@@ -4,12 +4,12 @@
   breaking_change: true
   reporter: trizzi
   body: |  # Do not modify this line, instead modify the lines below.
-    The GitLab Package stage offers a Package Registry, Container Registry, and Dependency Proxy to help you manage all of your dependencies using GitLab. Each of these product categories has a variety of settings that can be adjusted using the API.
+    The GitLab Package stage offers a Package Registry, container registry, and Dependency Proxy to help you manage all of your dependencies using GitLab. Each of these product categories has a variety of settings that can be adjusted using the API.
 
     The permissions model for GraphQL is being updated. After 15.0, users with the Guest, Reporter, and Developer role can no longer update these settings:
 
     - [Package Registry settings](https://docs.gitlab.com/ee/api/graphql/reference/#packagesettings)
-    - [Container Registry cleanup policy](https://docs.gitlab.com/ee/api/graphql/reference/#containerexpirationpolicy)
+    - [Container registry cleanup policy](https://docs.gitlab.com/ee/api/graphql/reference/#containerexpirationpolicy)
     - [Dependency Proxy time-to-live policy](https://docs.gitlab.com/ee/api/graphql/reference/#dependencyproxyimagettlgrouppolicy)
     - [Enabling the Dependency Proxy for your group](https://docs.gitlab.com/ee/api/graphql/reference/#dependencyproxysetting)
   stage: package
diff --git a/data/deprecations/14-9-deprecation-htpassword-authentication-container-registry.yml b/data/deprecations/14-9-deprecation-htpassword-authentication-container-registry.yml
index 9dbe6c24968..0e626887edc 100644
--- a/data/deprecations/14-9-deprecation-htpassword-authentication-container-registry.yml
+++ b/data/deprecations/14-9-deprecation-htpassword-authentication-container-registry.yml
@@ -1,10 +1,10 @@
-- title: "htpasswd Authentication for the Container Registry"
+- title: "htpasswd Authentication for the container registry"
   announcement_milestone: "14.9"
   removal_milestone: "15.0"
   breaking_change: true
   reporter: trizzi
   body: |  # Do not modify this line, instead modify the lines below.
-    The Container Registry supports [authentication](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md#auth) with `htpasswd`. It relies on an [Apache `htpasswd` file](https://httpd.apache.org/docs/2.4/programs/htpasswd.html), with passwords hashed using `bcrypt`.
+    The container registry supports [authentication](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md#auth) with `htpasswd`. It relies on an [Apache `htpasswd` file](https://httpd.apache.org/docs/2.4/programs/htpasswd.html), with passwords hashed using `bcrypt`.
 
     Since it isn't used in the context of GitLab (the product), `htpasswd` authentication will be deprecated in GitLab 14.9 and removed in GitLab 15.0.
   stage: package
diff --git a/data/deprecations/14-9-global-search-deprecate-user-email-lookup-limit.yml b/data/deprecations/14-9-global-search-deprecate-user-email-lookup-limit.yml
index 667995981e2..ac787783047 100644
--- a/data/deprecations/14-9-global-search-deprecate-user-email-lookup-limit.yml
+++ b/data/deprecations/14-9-global-search-deprecate-user-email-lookup-limit.yml
@@ -1,9 +1,9 @@
-- title: "user_email_lookup_limit API field"
+- title: "`user_email_lookup_limit` API field"
   announcement_milestone: "14.9"
-  removal_milestone: "15.0"
+  removal_milestone: "16.7"
   breaking_change: true
   reporter: fzimmer
   body: |  # Do not modify this line, instead modify the lines below.
-    The `user_email_lookup_limit` [API field](https://docs.gitlab.com/ee/api/settings.html) is deprecated and will be removed in GitLab 15.0. Until GitLab 15.0, `user_email_lookup_limit` is aliased to `search_rate_limit` and existing workflows will continue to work.
+    The `user_email_lookup_limit` [API field](https://docs.gitlab.com/ee/api/settings.html) is deprecated in GitLab 14.9 and removed in GitLab 16.7. Until the feature is removed, `user_email_lookup_limit` is aliased to `search_rate_limit` and existing workflows still work.
 
-    Any API calls attempting to change the rate limits for `user_email_lookup_limit` should use `search_rate_limit` instead.
+    Any API calls to change the rate limits for `user_email_lookup_limit` must use `search_rate_limit` instead.
diff --git a/data/deprecations/15-6-deprecate-post-api-v4-runner.yml b/data/deprecations/15-6-deprecate-post-api-v4-runner.yml
index 81c56d914d2..5b0feeba8a1 100644
--- a/data/deprecations/15-6-deprecate-post-api-v4-runner.yml
+++ b/data/deprecations/15-6-deprecate-post-api-v4-runner.yml
@@ -22,7 +22,7 @@
     - `--tag-list`
     - `--maintenance-note`
 
-    This change is a breaking change. You should [create a runner in the UI](../ci/runners/register_runner.md) to add configurations, and use the authentication token in the `gitlab-runner register` command instead.
+    This change is a breaking change. You should [create a runner in the UI](../ci/runners/runners_scope.html) to add configurations, and use the authentication token in the `gitlab-runner register` command instead.
   end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
   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/api/runners.html#register-a-new-runner  # (optional) This is a link to the current documentation page
diff --git a/data/deprecations/15-6-deprecate-runner-register-command.yml b/data/deprecations/15-6-deprecate-runner-register-command.yml
index 4fcde11ce16..93852ef8323 100644
--- a/data/deprecations/15-6-deprecate-runner-register-command.yml
+++ b/data/deprecations/15-6-deprecate-runner-register-command.yml
@@ -20,5 +20,5 @@
     - `--tag-list`
     - `--maintenance-note`
 
-    This change is a breaking change. You should [create a runner in the UI](../ci/runners/register_runner.md) to add configurations, and use the authentication token in the `gitlab-runner register` command instead.
+    This change is a breaking change. You should [create a runner in the UI](../ci/runners/runners_scope.html) to add configurations, and use the authentication token in the `gitlab-runner register` command instead.
   end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
diff --git a/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml b/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml
index 5bbe75efa42..9b4aeded6fd 100644
--- a/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml
+++ b/data/deprecations/15-6-deprecate-runner-register-token-k8s-operator.yml
@@ -16,7 +16,7 @@
     - `--run-untagged`
     - `--tag-list`
 
-    This change is a breaking change. You should use an [authentication token](../ci/runners/register_runner.md) in the `gitlab-runner register` command instead.
+    This change is a breaking change. You should use an [authentication token](../ci/runners/runners_scope.html) in the `gitlab-runner register` command instead.
   end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
   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/runner/install/operator.html#install-the-kubernetes-operator  # (optional) This is a link to the current documentation page
diff --git a/data/deprecations/15-7-deprecate-shimo-integration.yml b/data/deprecations/15-7-deprecate-shimo-integration.yml
index f9437a9f44e..0a9d2dc4825 100644
--- a/data/deprecations/15-7-deprecate-shimo-integration.yml
+++ b/data/deprecations/15-7-deprecate-shimo-integration.yml
@@ -1,6 +1,6 @@
 - title: "Shimo integration"  # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "The maximum number of characters in a job name will be limited to 250."
   announcement_milestone: "15.7"  # (required) The milestone when this feature was first announced as deprecated.
-  removal_milestone: "16.0"  # (required) The milestone when this feature is planned to be removed
+  removal_milestone: "16.7"  # (required) The milestone when this feature is planned to be removed
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: arturoherrero  # (required) GitLab username of the person reporting the deprecation
   stage: Manage  # (required) String value of the stage that the feature was created in. e.g., Growth
@@ -19,6 +19,5 @@
   # OTHER OPTIONAL FIELDS
   #
   tiers: [Core, Premium, Ultimate]  # (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/user/project/integrations/shimo.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
diff --git a/data/deprecations/15-8-pull-through-cache-container-registry.yml b/data/deprecations/15-8-pull-through-cache-container-registry.yml
index 6a59dd606e2..18c17f321ff 100644
--- a/data/deprecations/15-8-pull-through-cache-container-registry.yml
+++ b/data/deprecations/15-8-pull-through-cache-container-registry.yml
@@ -1,4 +1,4 @@
-- title: "Container Registry pull-through cache"  # (required) Actionable title. e.g., The `confidential` field for a `Note` is deprecated. Use `internal` instead.
+- title: "Container registry pull-through cache"  # (required) Actionable title. e.g., The `confidential` field for a `Note` is deprecated. Use `internal` instead.
   announcement_milestone: "15.8"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "16.0"  # (required) The milestone when this feature is planned to be removed
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
@@ -6,4 +6,4 @@
   stage: Package  # (required) String value of the stage that the feature was created in. e.g., Growth
   issue_url: https://gitlab.com/gitlab-org/container-registry/-/issues/842  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
-    The Container Registry [pull-through cache](https://docs.docker.com/registry/recipes/mirror/) is deprecated in GitLab 15.8 and will be removed in GitLab 16.0. The pull-through cache is part of the upstream [Docker Distribution project](https://github.com/distribution/distribution). However, we are removing the pull-through cache in favor of the GitLab Dependency Proxy, which allows you to proxy and cache container images from Docker Hub. Removing the pull-through cache allows us also to remove the upstream client code without sacrificing functionality.
+    The container registry [pull-through cache](https://docs.docker.com/registry/recipes/mirror/) is deprecated in GitLab 15.8 and will be removed in GitLab 16.0. The pull-through cache is part of the upstream [Docker Distribution project](https://github.com/distribution/distribution). However, we are removing the pull-through cache in favor of the GitLab Dependency Proxy, which allows you to proxy and cache container images from Docker Hub. Removing the pull-through cache allows us also to remove the upstream client code without sacrificing functionality.
diff --git a/data/deprecations/15-8-third-party-registries.yml b/data/deprecations/15-8-third-party-registries.yml
index c4eddf2e64f..6607835c675 100644
--- a/data/deprecations/15-8-third-party-registries.yml
+++ b/data/deprecations/15-8-third-party-registries.yml
@@ -8,13 +8,13 @@
   body: |  # (required) Do not modify this line, instead modify the lines below.
     Using third-party container registries with GitLab as an auth endpoint is deprecated in GitLab 15.8 and the [end of support](https://docs.gitlab.com/ee/development/deprecation_guidelines/#terminology) is scheduled for GitLab 16.0. This impacts self-managed customers that have connected their external registry to the GitLab user interface to find, view, and delete container images.
 
-    Supporting both GitLab's Container Registry as well as third-party container registries is challenging for maintenance, code quality, and backward compatibility. This hinders our ability to stay [efficient](https://about.gitlab.com/handbook/values/#efficiency). As a result we will not support this functionality moving forward.
+    Supporting both GitLab's container registry as well as third-party container registries is challenging for maintenance, code quality, and backward compatibility. This hinders our ability to stay [efficient](https://about.gitlab.com/handbook/values/#efficiency). As a result we will not support this functionality moving forward.
 
     This change will not impact your ability to pull and push container images to external registries using pipelines.
 
-    Since we released the new [GitLab Container Registry](https://gitlab.com/groups/gitlab-org/-/epics/5523) version for GitLab.com, we've started to implement additional features that are not available in third-party container registries. These new features have allowed us to achieve significant performance improvements, such as [cleanup policies](https://gitlab.com/groups/gitlab-org/-/epics/8379). We are focusing on delivering [new features](https://gitlab.com/groups/gitlab-org/-/epics/5136), most of which will require functionalities only available on the GitLab Container Registry. This deprecation allows us to reduce fragmentation and user frustration in the long term by focusing on delivering a more robust integrated registry experience and feature set.
+    Since we released the new [GitLab container registry](https://gitlab.com/groups/gitlab-org/-/epics/5523) version for GitLab.com, we've started to implement additional features that are not available in third-party container registries. These new features have allowed us to achieve significant performance improvements, such as [cleanup policies](https://gitlab.com/groups/gitlab-org/-/epics/8379). We are focusing on delivering [new features](https://gitlab.com/groups/gitlab-org/-/epics/5136), most of which will require functionalities only available on the GitLab container registry. This deprecation allows us to reduce fragmentation and user frustration in the long term by focusing on delivering a more robust integrated registry experience and feature set.
 
-    Moving forward, we'll continue to invest in developing and releasing new features that will only be available in the GitLab Container Registry.
+    Moving forward, we'll continue to invest in developing and releasing new features that will only be available in the GitLab container registry.
 #
 # OPTIONAL END OF SUPPORT FIELDS
 #
diff --git a/data/deprecations/16-4_support_for_delete_tags_endpoint.yml b/data/deprecations/16-4_support_for_delete_tags_endpoint.yml
index 5805653c027..ccaf26e4a4f 100644
--- a/data/deprecations/16-4_support_for_delete_tags_endpoint.yml
+++ b/data/deprecations/16-4_support_for_delete_tags_endpoint.yml
@@ -1,4 +1,4 @@
-- title: "Internal Container Registry API tag deletion endpoint"  # (required) Actionable title. e.g., The `confidential` field for a `Note` is deprecated. Use `internal` instead.
+- title: "Internal container registry API tag deletion endpoint"  # (required) Actionable title. e.g., The `confidential` field for a `Note` is deprecated. Use `internal` instead.
   announcement_milestone: "16.4"  # (required) The milestone when this feature was first announced as deprecated.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
@@ -8,7 +8,7 @@
   body: |  # (required) Do not modify this line, instead modify the lines below.
     The [Docker Registry HTTP API V2 Spec](https://docs.docker.com/registry/spec/api/), later replaced by the [OCI Distribution Spec](https://github.com/opencontainers/distribution-spec/blob/main/spec.md) did not include a tag delete operation, and an unsafe and slow workaround (involving deleting manifests, not tags) had to be used to achieve the same end.
 
-    Tag deletion is an important function, so we added a tag deletion operation to the GitLab Container Registry, extending the V2 API beyond the scope of the Docker and OCI distribution spec.
+    Tag deletion is an important function, so we added a tag deletion operation to the GitLab container registry, extending the V2 API beyond the scope of the Docker and OCI distribution spec.
 
     Since then, the OCI Distribution Spec has had some updates and it now has a tag delete operation, using the [`DELETE /v2/<name>/manifests/<tag>` endpoint](https://github.com/opencontainers/distribution-spec/blob/main/spec.md#deleting-tags).
 
@@ -16,6 +16,6 @@
 
     Support for the custom GitLab tag delete endpoint is deprecated in GitLab 16.4, and it will be removed in GitLab 17.0.
 
-    This endpoint is used by the **internal** Container Registry application API, not the public [GitLab Container Registry API](https://docs.gitlab.com/ee/api/container_registry.html). No action should be required by the majority of container registry users. All the GitLab UI and API functionality related to tag deletions will remain intact as we transition to the new OCI-compliant endpoint.
+    This endpoint is used by the **internal** container registry application API, not the public [GitLab container registry API](https://docs.gitlab.com/ee/api/container_registry.html). No action should be required by the majority of container registry users. All the GitLab UI and API functionality related to tag deletions will remain intact as we transition to the new OCI-compliant endpoint.
 
     If you do access the internal container registry API and use the original tag deletion endpoint, you must update to the new endpoint.
diff --git a/data/deprecations/16-5-container-registry-support-storage-drivers-swift-oss.yml b/data/deprecations/16-5-container-registry-support-storage-drivers-swift-oss.yml
index 0d7364d05ff..3190e02b7f0 100644
--- a/data/deprecations/16-5-container-registry-support-storage-drivers-swift-oss.yml
+++ b/data/deprecations/16-5-container-registry-support-storage-drivers-swift-oss.yml
@@ -1,4 +1,4 @@
-- title: "Container Registry support for the Swift and OSS storage drivers"
+- title: "Container registry support for the Swift and OSS storage drivers"
   announcement_milestone: "16.6"
   removal_milestone: "17.0"
   breaking_change: true
diff --git a/data/deprecations/16-6-deprecating-temporary-storage-increase.yml b/data/deprecations/16-6-deprecating-temporary-storage-increase.yml
new file mode 100644
index 00000000000..1a727168a7e
--- /dev/null
+++ b/data/deprecations/16-6-deprecating-temporary-storage-increase.yml
@@ -0,0 +1,9 @@
+- title: "Deprecate GraphQL fields related to the temporary storage increase"  # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "CI/CD job names will be limited to 250 characters."
+  removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  announcement_milestone: "16.7"  # (required) The milestone when this feature was first announced as deprecated.
+  breaking_change: false  # (required) Change to false if this is not a breaking change.
+  reporter: aalakkad  # (required) GitLab username of the person reporting the change
+  stage: fulfillment  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385720  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The GraphQL fields, `isTemporaryStorageIncreaseEnabled` and `temporaryStorageIncreaseEndsOn`, have been deprecated. These GraphQL fields are related to the temporary storage increase project. The project has been cancelled and the fields were not used.
diff --git a/data/deprecations/16-7-dependency-proxy-group-deploy-token.yml b/data/deprecations/16-7-dependency-proxy-group-deploy-token.yml
new file mode 100644
index 00000000000..bb86a53e382
--- /dev/null
+++ b/data/deprecations/16-7-dependency-proxy-group-deploy-token.yml
@@ -0,0 +1,13 @@
+- title: "Dependency Proxy: Access tokens to have additional scope checks"
+  announcement_milestone: "16.7"
+  removal_milestone: "17.0"
+  breaking_change: true
+  reporter: trizzi
+  stage: Package
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431386
+  body: |
+    When using the Dependency Proxy for containers with a group access token or personal access token, `docker login` and `docker pull` requests with insufficient scopes for Dependency Proxy are not rejected.
+
+    GitLab 17.0 adds checks for group or personal access tokens authenticating with the dependency proxy for containers. This is a breaking change, because tokens without the required scopes will fail.
+
+    To help avoid being impacted by this breaking change, create new access tokens with the [required scopes](https://docs.gitlab.com/ee/user/packages/dependency_proxy/#authenticate-with-the-dependency-proxy), and update your workflow variables and scripts with those new tokens.
diff --git a/data/deprecations/16-7-list-repos-rake-task.yml b/data/deprecations/16-7-list-repos-rake-task.yml
new file mode 100644
index 00000000000..f5b2cd929be
--- /dev/null
+++ b/data/deprecations/16-7-list-repos-rake-task.yml
@@ -0,0 +1,12 @@
+- title: "List repository directories Rake task"
+  removal_milestone: "17.0"
+  announcement_milestone: "16.7"
+  breaking_change: true
+  reporter: mkozono
+  stage: enablement
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384361
+  body: |
+    The `gitlab-rake gitlab:list_repos` Rake task does not work and will be removed in GitLab 17.0.
+    If you're migrating GitLab, use
+    [backup and restore](https://docs.gitlab.com/ee/administration/operations/moving_repositories.html#recommended-approach-in-all-cases)
+    instead.
diff --git a/data/deprecations/16-7-remove-jwks-endpoint.yml b/data/deprecations/16-7-remove-jwks-endpoint.yml
new file mode 100644
index 00000000000..6d59f4ff3be
--- /dev/null
+++ b/data/deprecations/16-7-remove-jwks-endpoint.yml
@@ -0,0 +1,26 @@
+#
+# REQUIRED FIELDS
+#
+- title: "JWT `/-/jwks` instance endpoint is deprecated"
+  removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  announcement_milestone: "16.7"  # (required) The milestone when this feature was first announced as deprecated.
+  breaking_change: true  # (required) Change to false if this is not a breaking change.
+  reporter: jocelynjane  # (required) GitLab username of the person reporting the change
+  stage: verify  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/221031  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    With the [deprecation of old JSON web token versions](https://docs.gitlab.com/ee/update/deprecations.html?removal_milestone=17.0#old-versions-of-json-web-tokens-are-deprecated) in GitLab 17.0, the associated `/-/jwks` endpoint which is an alias for `/oauth/discovery/keys` is no longer necessary and will be removed. Please replace any uses of `/-/jwks` with `/oauth/discovery/keys`, for example change `https://gitlab.example.com/-/jwks` to `https://gitlab.example.com/oauth/discovery/keys`.
+#
+# OPTIONAL END OF SUPPORT FIELDS
+#
+# If an End of Support period applies, the announcement should be shared with GitLab Support
+# in the `#spt_managers` channel in Slack, and mention `@gitlab-com/support` in this MR.
+#
+  end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  #
+  # OTHER OPTIONAL FIELDS
+  #
+  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:  # (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
diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb
index 2e0d2696f0f..4b072e8b695 100644
--- a/data/deprecations/templates/_deprecation_template.md.erb
+++ b/data/deprecations/templates/_deprecation_template.md.erb
@@ -1,7 +1,7 @@
 ---
 stage: none
 group: none
-info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
+info: "See the Technical Writers assigned to Development Guidelines: https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines"
 toc: false
 ---
 
diff --git a/data/deprecations/templates/example.yml b/data/deprecations/templates/example.yml
index d3b1a8d72a6..a1ca50f0e1d 100644
--- a/data/deprecations/templates/example.yml
+++ b/data/deprecations/templates/example.yml
@@ -1,57 +1,61 @@
-# This is a template for announcing a feature deprecation or other important planned change.
+# Use this template tp announce a feature deprecation or other
+# important planned changes at least three releases prior to removal.
+# Breaking changes must happen in a major release.
 #
-# Please refer to the deprecation guidelines to confirm your understanding of GitLab's definitions.
+# See the deprecation guidelines to confirm your understanding of GitLab's definitions:
 # https://docs.gitlab.com/ee/development/deprecation_guidelines/#terminology
 #
-# Deprecations and other future breaking changes must be announced at least
-# three releases prior to removal.
-#
-# Breaking changes must happen in a major release.
-#
-# See the OPTIONAL END OF SUPPORT FIELDS section below if an End of Support period also applies.
+# If an End of Support period applies, see the OPTIONAL section below.
 #
-# For more information please refer to the handbook documentation here:
+# For more information, see the handbook:
 # https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecations-and-other-planned-breaking-change-announcements
-#
-# Please delete this line and above before submitting your merge request.
-#
+
+# ===================
 # REQUIRED FIELDS
-#
-- title: "Feature A is deprecated"  # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "CI/CD job names will be limited to 250 characters."
-  removal_milestone: "XX.YY"  # (required) The milestone when this feature is planned to be removed
-  announcement_milestone: "XX.YY"  # (required) The milestone when this feature was first announced as deprecated.
-  breaking_change: true  # (required) Change to false if this is not a breaking change.
-  reporter: exampleuser  # (required) GitLab username of the person reporting the change
-  stage: stage  # (required) String value of the stage that the feature was created in. e.g., Growth
-  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/000000  # (required) Link to the deprecation issue in GitLab
-  body: |  # (required) Do not modify this line, instead modify the lines below.
+# ===================
+
+# ----- DELETE EVERYTHING ABOVE THIS LINE -----
+
+- title: "Feature A is deprecated"
+  # The milestones for the deprecation announcement, and the removal.
+  removal_milestone: "XX.YY"
+  announcement_milestone: "XX.YY"
+  # Change breaking_change to false if needed.
+  breaking_change: true
+  # The stage and GitLab username of the person reporting the change,
+  # and a link to the deprecation issue
+  reporter: exampleuser
+  stage: stage
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/000000
+  body: |  # (required) Don't change this line.
     <!-- START OF BODY COMMENT
 
-    Be clear and concise. Give a brief explanation of the details or reasons for the change.
+    This area supports markdown. Replace this comment with your markdown content.
 
-    Additionally, deprecations and other planned changes should be actionable, so add details that explain what users need to do to address the change. For example:
+    Explain, *briefly*, the details or reasons for the change. Deprecations and other planned changes should be actionable, so tell users how to address the change. For example:
 
     - "Use the `internal` keyword instead of `confidential`."
-    - "Reduce the number of characters in all job names to be 250 characters or less."
-    - "Give an expiration date to any access tokens that have no expiration date."
     - "Stop using the `omniauth_crowd` gem. It will be removed and will not be replaced."
 
     When ready, assign to your tech writer for review. They will run `bin/rake gitlab:docs:compile_deprecations` to update the deprecations doc, then merge.
 
-    This area supports markdown. Delete this entire comment and replace it with your markdown content.
-
     END OF BODY COMMENT -->
-#
-# OPTIONAL END OF SUPPORT FIELDS
-#
-# If an End of Support period applies, the announcement should be shared with GitLab Support
-# in the `#spt_managers` channel in Slack, and mention `@gitlab-com/support` in this MR.
-#
-  end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
-  #
-  # OTHER OPTIONAL FIELDS
-  #
-  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:  # (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
+
+# ==============================
+# OPTIONAL END-OF-SUPPORT FIELDS
+# ==============================
+#
+# If an End of Support period applies:
+# 1) Share this announcement in the `#spt_managers` Support channel in Slack
+# 2) Mention `@gitlab-com/support` in this merge request.
+#
+  # When support for this feature ends, in XX.YY milestone format.
+  end_of_support_milestone:
+  # Array of tiers the feature is currently available to,
+  # like [Free, Silver, Gold, Core, Premium, Ultimate]
+  tiers:
+  # Links to documentation and thumbnail image
+  documentation_url:
+  image_url:
+  # Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
+  video_url:
diff --git a/data/whats_new/202311160001_16_6.yml b/data/whats_new/202311160001_16_6.yml
new file mode 100644
index 00000000000..659c29d81dd
--- /dev/null
+++ b/data/whats_new/202311160001_16_6.yml
@@ -0,0 +1,35 @@
+- name: Automatic claims of enterprise users
+  description: |  # Do not modify this line, instead modify the lines below.
+    When a GitLab.com user's primary email address matches an existing verified domain, the user is automatically claimed as an enterprise user. This gives the group Owner more user management controls and visibility into the user's account. After a user becomes an enterprise user, they can only change their primary email to an email their organization owns as per its verified domains.
+  stage: govern
+  self-managed: false
+  gitlab-com: true
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/enterprise_user/#automatic-claims-of-enterprise-users
+  image_url: https://about.gitlab.com/images/16_6/automatic-claims-of-enterprise-users.png
+  published_at: 2023-11-16
+  release: 16.6
+
+- name: Minimal forking - only include the default branch
+  description: |  # Do not modify this line, instead modify the lines below.
+    In previous versions of GitLab, when forking a repository, the fork always included all branches within the repository. Now you can create a fork with only the default branch, reducing complexity and storage space. Create minimal forks if you don't need the changes that are currently being worked on in other branches. The default method of forking will not change and continue to include all branches within the repository. The new option shows which branch is the default, so that you are aware of exactly which branch will be included in the new fork.
+  stage: Create
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#create-a-fork
+  image_url: https://about.gitlab.com/images/16_6/create-minimal-forking-default-branch.png
+  published_at: 2023-11-16
+  release: 16.6
+
+- name: Improved UI for CI/CD variable management
+  description: |  # Do not modify this line, instead modify the lines below.
+    CI/CD variables are a fundamental part of GitLab CI/CD, and we felt that we could offer a better experience for working with variables from the settings UI. So in this release we've updated the UI to use a new drawer that improves the flow of adding and editing CI/CD variables. For example, the masking validation used to only happen when you tried to save the CI/CD variable, and if it failed you'd have to restart from scratch. But now with the new drawer, you get real time validation so you can adjust on the fly without needed to redo anything! Your [feedback for this change](https://gitlab.com/gitlab-org/gitlab/-/issues/428807) is always valued and appreciated.
+  stage: verify
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/ci/variables/#define-a-cicd-variable-in-the-ui
+  image_url: https://about.gitlab.com/images/16_6/ci_variables_drawer.png
+  published_at: 2023-11-16
+  release: 16.6