From 46fb01852a17aea7235d4df0162a3abb1b49700b Mon Sep 17 00:00:00 2001
From: Nate Rosandich <nrosandich@gitlab.com>
Date: Mon, 12 Feb 2024 00:11:39 +0000
Subject: [PATCH] Breaking change notices for renaming
 require_password_to_approve field

---
 ...-rename-require_password_to_approve-field.yml | 11 +++++++++++
 doc/update/deprecations.md                       | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 data/deprecations/17-0-rename-require_password_to_approve-field.yml

diff --git a/data/deprecations/17-0-rename-require_password_to_approve-field.yml b/data/deprecations/17-0-rename-require_password_to_approve-field.yml
new file mode 100644
index 0000000000000..f22600aa585f0
--- /dev/null
+++ b/data/deprecations/17-0-rename-require_password_to_approve-field.yml
@@ -0,0 +1,11 @@
+- title: "Rename the 'require_password_to_approve' field"
+  removal_milestone: "17.0"
+  announcement_milestone: "16.9"
+  breaking_change: true
+  reporter: nrosandich
+  stage: Govern
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431346
+  body: |  # (required) Don't change this line.
+    In GitLab 16.7, we added the ability to re-authenticate with SAML SSO for the [Require user re-authentication to approve](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/settings.html#require-user-re-authentication-to-approve) feature.
+
+    For this reason, in GitLab 17.0, we are renaming the `require_password_to_approve` field to `require_reauthentication_to_approve` in the UI, API, and the database.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 7abd6cd106d92..25cba3dbb5348 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1456,6 +1456,22 @@ This change is a breaking change. You should [create a runner in the UI](../ci/r
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### Rename the 'require_password_to_approve' field
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.9</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/431346).
+</div>
+
+In GitLab 16.7, we added the ability to re-authenticate with SAML SSO for the [Require user re-authentication to approve](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/settings.html#require-user-re-authentication-to-approve) feature.
+
+For this reason, in GitLab 17.0, we are renaming the `require_password_to_approve` field to `require_reauthentication_to_approve` in the UI, API, and the database.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Required Pipeline Configuration is deprecated
 
 <div class="deprecation-notes">
-- 
GitLab