From f2eb437ae7cbc71a8ce770cf2becc7402b681ab7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 8 Jul 2025 06:12:33 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 ...8-2-compliance-static-violation-report.yml | 22 +++++++++++++
 doc/update/deprecations.md                    | 31 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 data/deprecations/18-2-compliance-static-violation-report.yml

diff --git a/data/deprecations/18-2-compliance-static-violation-report.yml b/data/deprecations/18-2-compliance-static-violation-report.yml
new file mode 100644
index 00000000000..aeeae603555
--- /dev/null
+++ b/data/deprecations/18-2-compliance-static-violation-report.yml
@@ -0,0 +1,22 @@
+- title: 'Static compliance violations report'
+  removal_milestone: '18.8'
+  announcement_milestone: '18.2'
+  breaking_change: true
+  window: 1
+  reporter: nrosandich
+  stage: Software Supply Chain Security
+  issue_url: https://gitlab.com/groups/gitlab-org/-/epics/12774
+  impact: med
+  scope: group
+  body: |
+    The existing static compliance violations report is deprecated in GitLab 18.2 and will be removed in GitLab 18.8.
+
+    To replace the static compliance violations report:
+
+    - In GitLab 17.11, we released [custom compliance frameworks](https://docs.gitlab.com/user/compliance/compliance_frameworks/).
+    - In GitLab 18.2, we released the new [dynamic compliance violations report](https://docs.gitlab.com/user/compliance/compliance_center/compliance_violations_report/).
+
+    These features give all of the same functionality as the static violations report, but you can configure the violations that you require.
+
+    In GitLab 18.8, we'll replace the static compliance violations report with the dynamic report using compliance frameworks for more accurate reporting on requirements
+    and controls.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index ba8fc351590..733c617306e 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1114,6 +1114,37 @@ You should upgrade to Ubuntu 22.04 for continued support.
 </div>
 </div>
 
+<div class="milestone-wrapper" data-milestone="18.8">
+
+## GitLab 18.8
+
+<div class="deprecation breaking-change" data-milestone="18.8">
+
+### Static compliance violations report
+
+<div class="deprecation-notes">
+
+- Announced in GitLab <span class="milestone">18.2</span>
+- Removal in GitLab <span class="milestone">18.8</span> ([breaking change](https://docs.gitlab.com/update/terminology/#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/groups/gitlab-org/-/epics/12774).
+
+</div>
+
+The existing static compliance violations report is deprecated in GitLab 18.2 and will be removed in GitLab 18.8.
+
+To replace the static compliance violations report:
+
+- In GitLab 17.11, we released [custom compliance frameworks](https://docs.gitlab.com/user/compliance/compliance_frameworks/).
+- In GitLab 18.2, we released the new [dynamic compliance violations report](https://docs.gitlab.com/user/compliance/compliance_center/compliance_violations_report/).
+
+These features give all of the same functionality as the static violations report, but you can configure the violations that you require.
+
+In GitLab 18.8, we'll replace the static compliance violations report with the dynamic report using compliance frameworks for more accurate reporting on requirements
+and controls.
+
+</div>
+</div>
+
 <div class="milestone-wrapper" data-milestone="18.6">
 
 ## GitLab 18.6