Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 20 deletions

diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb
index bbca07fbd3c..1817942eac5 100644
--- a/data/deprecations/templates/_deprecation_template.md.erb
+++ b/data/deprecations/templates/_deprecation_template.md.erb
@@ -7,6 +7,18 @@ toc: false
 
 # Deprecations by version
 
+These GitLab features are deprecated and no longer recommended for use.
+Each deprecated feature will be removed in a future release.
+Some features cause breaking changes when they are removed.
+
+On GitLab.com, deprecated features can be removed at any time during the month leading up to the release.
+
+**{rss}** **To be notified of upcoming breaking changes**,
+add this URL to your RSS feed reader: `https://about.gitlab.com/breaking-changes.xml`
+
+You can also view [REST API](https://docs.gitlab.com/ee/api/rest/deprecations.html)
+and [GraphQL](https://docs.gitlab.com/ee/api/graphql/removed_items.html) deprecations/removals.
+
 <!-- vale off -->
 
 <!--
@@ -31,18 +43,6 @@ For deprecation reviewers (Technical Writers only):
 
 {::options parse_block_html="true" /}
 
-These GitLab features are deprecated and no longer recommended for use.
-Each deprecated feature will be removed in a future release.
-Some features cause breaking changes when they are removed.
-
-On GitLab.com, deprecated features can be removed at any time during the month leading up to the release.
-
-**{rss}** **To be notified of upcoming breaking changes**,
-add this URL to your RSS feed reader: `https://about.gitlab.com/breaking-changes.xml`
-
-You can also view [REST API](https://docs.gitlab.com/ee/api/rest/deprecations.html)
-and [GraphQL](https://docs.gitlab.com/ee/api/graphql/removed_items.html) deprecations/removals.
-
 <% if milestones.any? -%><div class="js-deprecation-filters"></div><%- end -%>
 <%- milestones.each do |milestone| %>
 <div class="milestone-wrapper" data-milestone="<%= milestone %>">
diff --git a/data/removals/templates/_removal_template.md.erb b/data/removals/templates/_removal_template.md.erb
index 89e25c76e04..aa2ae993f45 100644
--- a/data/removals/templates/_removal_template.md.erb
+++ b/data/removals/templates/_removal_template.md.erb
@@ -6,7 +6,7 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo
 
 # Removals by version
 
-In each release, GitLab removes features that were deprecated in an earlier release.
+In each release, GitLab removes features that were [deprecated](deprecations.md) in an earlier release.
 Some features cause breaking changes when they are removed.
 
 **{rss}** **To be notified of upcoming breaking changes**,
@@ -33,19 +33,25 @@ For removal reviewers (Technical Writers only):
 - For more information about updating the removal doc, see the removal doc update guidance:
   https://about.gitlab.com/handbook/marketing/blog/release-posts/#update-the-removals-doc
 -->
+
+{::options parse_block_html="true" /}
 <% if milestones.any? -%>
   <%- milestones.each do |milestone| %>
 ## Removed in <%= milestone %>
     <%- entries.select{|entry| entry["removal_milestone"] == milestone}.each do |removal| %>
 ### <%= removal["title"]%>
-<% if removal["breaking_change"] -%>
 
-WARNING:
-This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
-Review the details carefully before upgrading.
-
-<%= removal["body"] -%><% else %>
-<%= removal["body"] -%><% end %><%- end -%><%- end -%>
+<div class="deprecation-notes">
+- Announced in: GitLab <span class="milestone"><%= removal["announcement_milestone"]%></span>
+<% if removal["breaking_change"] -%>
+- This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/). Review the details carefully before upgrading.
+<%- end -%>
+<% if removal["issue_url"] -%>
+- To discuss this change or learn more, see the [deprecation issue](<%= removal["issue_url"]%>).
+<%- end -%>
+</div>
+
+<%= removal["body"] -%><%- end -%><%- end -%>
 <%- else -%>
 Features scheduled for removal will be listed here, sorted by GitLab version.
 <% end -%>