Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 7 deletions

diff --git a/data/deprecations/15-8-deprecate-slack-notifications-integration.yml b/data/deprecations/15-8-deprecate-slack-notifications-integration.yml
index 33f9e6ce3a7..21c6cb7d0cf 100644
--- a/data/deprecations/15-8-deprecate-slack-notifications-integration.yml
+++ b/data/deprecations/15-8-deprecate-slack-notifications-integration.yml
@@ -1,17 +1,16 @@
 - title: "Slack notifications integration"  # (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."
   announcement_milestone: "15.9"  # (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
+  removal_milestone: "18.0"  # (required) The milestone when this feature is planned to be removed
   breaking_change: true  # (required) Change to false if this is not a breaking change.
   reporter: g.hickman  # (required) GitLab username of the person reporting the change
   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/-/issues/372411  # (required) Link to the deprecation issue in GitLab
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435909  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
     As we're consolidating all Slack capabilities into the
-    GitLab for Slack app, we're [deprecating the Slack notifications
-    integration](https://gitlab.com/gitlab-org/gitlab/-/issues/372411).
-    GitLab.com users can now use the GitLab for Slack app to manage notifications
-    to their Slack workspace. For self-managed users of the Slack notifications integration,
-    we'll be introducing support in [this epic](https://gitlab.com/groups/gitlab-org/-/epics/1211).
+    GitLab for Slack app, we've deprecated the Slack notifications
+    integration.
+    Use the GitLab for Slack app to manage notifications
+    to your Slack workspace.
 
 #
 # OPTIONAL END OF SUPPORT FIELDS
diff --git a/data/deprecations/16-7-remove-slsa-0.2-statement.yml b/data/deprecations/16-7-remove-slsa-0.2-statement.yml
new file mode 100644
index 00000000000..745036d2ecc
--- /dev/null
+++ b/data/deprecations/16-7-remove-slsa-0.2-statement.yml
@@ -0,0 +1,12 @@
+#
+# REQUIRED FIELDS
+#
+- title: "GitLab Runner provenance metadata SLSA v0.2 statement"
+  removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  announcement_milestone: "16.8"  # (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: sam.white  # (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-runner/-/issues/36869  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    Runners generate provenance metadata and currently defaults to generating statements that adhere to SLSA v0.2. Because SLSA v1.0 has been released and is now supported by GitLab, the v0.2 statement is now deprecated and removal is planned in GitLab 17.0. The SLSA v1.0 statement is planned to become the new default statement format in GitLab 17.0.