Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 4 deletions

diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md
index 772167af3e9..4edfd2a8c8e 100644
--- a/.gitlab/merge_request_templates/Quarantine End to End Test.md
+++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md
@@ -22,6 +22,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
   - [ ] Follow the [Quarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests).
   - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantined-test-types).
   - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/execution_context_selection.html#quarantine-a-test-for-a-specific-environment).
+  - [ ] (Optionally) In case of an emergency (e.g. blocked deployments), consider adding labels to pick into auto-deploy (~"Pick into auto-deploy" ~"priority::1" ~"severity::1").
 - [ ] Dequarantine test check-list
   - [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#dequarantining-tests).
   - [ ] Confirm the test consistently passes on the target GitLab environment(s).
@@ -31,9 +32,6 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
 <!-- Base labels. -->
 /label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance"
 
-<!-- Labels to pick into auto-deploy. -->
-/label ~"Pick into auto-deploy" ~"priority::1" ~"severity::1"
-
 <!--
 Choose the stage that appears in the test path, e.g. ~"devops::create" for
 `qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb`.
diff --git a/data/deprecations/templates/example.yml b/data/deprecations/templates/example.yml
index 2bd92cc4b28..18ec63c0a46 100644
--- a/data/deprecations/templates/example.yml
+++ b/data/deprecations/templates/example.yml
@@ -11,6 +11,7 @@
 # Please delete this line and above before submitting your merge request.
 
 - name: "Feature name" # The name of the feature to be deprecated
+  announcement_milestone: "XX.YY" # The milestone when this feature was first announced as deprecated.
   removal_milestone: "XX.YY" # the milestone when this feature is planned to be removed
   body: | # Do not modify this line, instead modify the lines below.
     <!-- START OF BODY COMMENT
@@ -30,6 +31,5 @@
   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
-  announcement_milestone: # (optional - may be required in the future) XX.YY format - the milestone when this feature was first announced as deprecated
   announcement_date: # (optional - may be required in the future) YYYY-MM-DD format - the date of the milestone release when this feature was first announced as deprecated
   removal_date: # (optional - may be required in the future) YYYY-MM-DD format - the date of the milestone release when this feature is planned to be removed
diff --git a/doc/user/application_security/policies/index.md b/doc/user/application_security/policies/index.md
index 633d15a7578..47d015a78e3 100644
--- a/doc/user/application_security/policies/index.md
+++ b/doc/user/application_security/policies/index.md
@@ -386,6 +386,7 @@ scan_execution_policy:
         - deployment
   actions:
   - scan: cluster_image_scanning
+```
 
 In this example: