Add latest changes from gitlab-org/gitlab@master

10 files changed, 40 insertions, 40 deletions

diff --git a/data/deprecations/  16_3_runner-terminationgracepriodseconds.yml b/data/deprecations/  16_3_runner-terminationgracepriodseconds.yml
deleted file mode 100644
index 032032b2196..00000000000
--- a/data/deprecations/  16_3_runner-terminationgracepriodseconds.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- title: "Deprecate `terminationGracePeriodSeconds` in the GitLab Runner Kubernetes executor" # (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.3" # (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: deastman # (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-runner/-/issues/28165"  # (required) Link to the deprecation issue in GitLab
-  body: | # (required) Do not modify this line, instead modify the lines below.
-    The GitLab Runner Kubernetes executor setting, `terminationGracePeriodSeconds`, is deprecated and will be removed in GitLab 17.0. To manage the cleanup and termination of GitLab Runner worker pods on Kubernetes, customers should instead configure `cleanupGracePeriodSeconds` and `podTerminationGracePeriodSeconds`. For information about how to use the `cleanupGracePeriodSeconds` and `podTerminationGracePeriodSeconds, see the [GitLab Runner Executor documentation](https://docs.gitlab.com/runner/executors/kubernetes.html#other-configtoml-settings).
-
-#
-# 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: 17.0 # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
-  #
-  # OTHER OPTIONAL FIELDS
-  #
-  tiers: [Free, 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/runner/executors/kubernetes.html" # (optional) This is a link to the current documentation page
diff --git a/data/deprecations/15.8-kas-private-tls.yml b/data/deprecations/15-8-kas-private-tls.yml
index 3d1a6e7830f..3d1a6e7830f 100644
--- a/data/deprecations/15.8-kas-private-tls.yml
+++ b/data/deprecations/15-8-kas-private-tls.yml
diff --git a/data/deprecations/16-0-deprecate-omnibus-grafana.yml b/data/deprecations/16-0-deprecate-omnibus-grafana.yml
index 61c04e9f042..4035c3ce44a 100644
--- a/data/deprecations/16-0-deprecate-omnibus-grafana.yml
+++ b/data/deprecations/16-0-deprecate-omnibus-grafana.yml
@@ -19,5 +19,5 @@
     In GitLab versions 16.0 to 16.2, you can still [re-enable the bundled Grafana](https://docs.gitlab.com/ee/administration/monitoring/performance/grafana_configuration.html#temporary-workaround).
     However, enabling the bundled Grafana will no longer work from GitLab 16.3.
   end_of_support_milestone:
-  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]
+  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/omnibus/settings/grafana.html
diff --git a/data/deprecations/16.0-eol-windows-server-2004-and-20H2.yml b/data/deprecations/16-0-eol-windows-server-2004-and-20H2.yml
index 267304f6a13..267304f6a13 100644
--- a/data/deprecations/16.0-eol-windows-server-2004-and-20H2.yml
+++ b/data/deprecations/16-0-eol-windows-server-2004-and-20H2.yml
diff --git a/data/deprecations/16-1-unified-approval-rules.yml b/data/deprecations/16-1-unified-approval-rules.yml
index 8622ed86d5f..802daded7f7 100644
--- a/data/deprecations/16-1-unified-approval-rules.yml
+++ b/data/deprecations/16-1-unified-approval-rules.yml
@@ -24,6 +24,6 @@
   # OTHER OPTIONAL FIELDS
   #
   tiers: [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/ci/environments/deployment_approvals.html # (optional) This is a link to the current documentation page
+  documentation_url: https://docs.gitlab.com/ee/ci/environments/deployment_approvals.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/16-1-windows-cmd-runner-shell-executor.yml b/data/deprecations/16-1-windows-cmd-runner-shell-executor.yml
index c4c2435ba6f..12334f764b7 100644
--- a/data/deprecations/16-1-windows-cmd-runner-shell-executor.yml
+++ b/data/deprecations/16-1-windows-cmd-runner-shell-executor.yml
@@ -2,12 +2,12 @@
   announcement_milestone: "16.1"  # (required) The milestone when this feature was first announced as deprecated.
   announcement_date: "2023-06-22"  # (required) The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
-  removal_date: "2024-05-22" # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  removal_date: "2024-05-22"  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
   reporter: DarrenEastman  # (required) GitLab username of the person reporting the deprecation
-  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/414864 # (required) Link to the deprecation issue in GitLab
+  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/414864  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
     In GitLab 11.11 the Windows Batch executor, the CMD shell was deprecated in GitLab Runner in favor of PowerShell. Since then, the CMD shell has continued to be supported in GitLab Runner. However this has resulted in additional complexity for both the engineering team and customers using the Runner on Windows. We plan to fully remove support for Windows CMD from GitLab Runner in 17.0. Customers should plan to use PowerShell when using the runner on Windows with the shell executor. Customers can provide feedback or ask questions in the removal issue, [issue 29479](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29479).
   end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
-  end_of_support_date: "2024-05-22" # (optional) The date of the milestone release when support for this feature will end.
+  end_of_support_date: "2024-05-22"  # (optional) The date of the milestone release when support for this feature will end.
diff --git a/data/deprecations/16-2-custom_sign_in_fields.yml b/data/deprecations/16-2-custom_sign_in_fields.yml
new file mode 100644
index 00000000000..e9931ee5dce
--- /dev/null
+++ b/data/deprecations/16-2-custom_sign_in_fields.yml
@@ -0,0 +1,11 @@
+- title: 'Deprecated parameters related to custom text in the sign-in page'  # (required) The name of the feature to be deprecated
+  announcement_milestone: '16.2'  # (required) The milestone when this feature was first announced as deprecated.
+  announcement_date: '2023-07-22'  # (required) The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  removal_milestone: '17.0'  # (required) The milestone when this feature is planned to be removed
+  removal_date: '2024-04-22'  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: eduardosanz  # (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
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124461  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The parameters, `sign_in_text` and `help_text`, are deprecated in the [Settings API](https://docs.gitlab.com/ee/api/settings.html). To add a custom text to the sign-in and sign-up pages, use the `description` field in the [Appearance API](https://docs.gitlab.com/ee/api/appearance.html).
diff --git a/data/deprecations/16-3-runner-terminationgracepriodseconds.yml b/data/deprecations/16-3-runner-terminationgracepriodseconds.yml
new file mode 100644
index 00000000000..bdb54ab3981
--- /dev/null
+++ b/data/deprecations/16-3-runner-terminationgracepriodseconds.yml
@@ -0,0 +1,22 @@
+- title: "Deprecate `terminationGracePeriodSeconds` in the GitLab Runner Kubernetes executor"  # (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.3"  # (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: deastman  # (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-runner/-/issues/28165"  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The GitLab Runner Kubernetes executor setting, `terminationGracePeriodSeconds`, is deprecated and will be removed in GitLab 17.0. To manage the cleanup and termination of GitLab Runner worker pods on Kubernetes, customers should instead configure `cleanupGracePeriodSeconds` and `podTerminationGracePeriodSeconds`. For information about how to use the `cleanupGracePeriodSeconds` and `podTerminationGracePeriodSeconds, see the [GitLab Runner Executor documentation](https://docs.gitlab.com/runner/executors/kubernetes.html#other-configtoml-settings).
+
+#
+# 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: 17.0  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  #
+  # OTHER OPTIONAL FIELDS
+  #
+  tiers: [Free, 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/runner/executors/kubernetes.html"  # (optional) This is a link to the current documentation page
diff --git a/data/deprecations/16-4-ci_job_token_scope_enabled-attribute-deprecation.yml b/data/deprecations/16-4-ci_job_token_scope_enabled-attribute-deprecation.yml
index 57e42f17cc8..698e5c1a7c9 100644
--- a/data/deprecations/16-4-ci_job_token_scope_enabled-attribute-deprecation.yml
+++ b/data/deprecations/16-4-ci_job_token_scope_enabled-attribute-deprecation.yml
@@ -7,7 +7,7 @@
   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/423091 # (required) Link to the deprecation issue in GitLab
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423091  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
     GitLab 16.1 introduced [API endpoints for the job token scope](https://gitlab.com/gitlab-org/gitlab/-/issues/351740). In the [projects API](https://docs.gitlab.com/ee/api/projects.html), the `ci_job_token_scope_enabled` attribute is deprecated, and will be removed in 17.0. You should use the [job token scope APIs](https://docs.gitlab.com/ee/api/project_job_token_scopes.html) instead.
 #
diff --git a/data/deprecations/16_2-custom_sign_in_fields.yml b/data/deprecations/16_2-custom_sign_in_fields.yml
deleted file mode 100644
index 80184a3c096..00000000000
--- a/data/deprecations/16_2-custom_sign_in_fields.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- title: 'Deprecated parameters related to custom text in the sign-in page' # (required) The name of the feature to be deprecated
-  announcement_milestone: '16.2' # (required) The milestone when this feature was first announced as deprecated.
-  announcement_date: '2023-07-22' # (required) The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
-  removal_milestone: '17.0' # (required) The milestone when this feature is planned to be removed
-  removal_date: '2024-04-22' # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
-  breaking_change: true # (required) If this deprecation is a breaking change, set this value to true
-  reporter: eduardosanz # (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
-  issue_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124461 # (required) Link to the deprecation issue in GitLab
-  body: | # (required) Do not modify this line, instead modify the lines below.
-    The parameters, `sign_in_text` and `help_text`, are deprecated in the [Settings API](https://docs.gitlab.com/ee/api/settings.html). To add a custom text to the sign-in and sign-up pages, use the `description` field in the [Appearance API](https://docs.gitlab.com/ee/api/appearance.html).