Add latest changes from gitlab-org/gitlab@master

7 files changed, 9 insertions, 4 deletions

diff --git a/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml b/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
index d02577d34fe..f3f6553729e 100644
--- a/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
+++ b/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
@@ -1,5 +1,6 @@
 - name: "Legacy database configuration"
   announcement_milestone: "14.3"
+  announcement_date: "2021-09-22"
   removal_milestone: "15.0"
   body: |
    The syntax of [GitLabs database](https://docs.gitlab.com/omnibus/settings/database.html)
diff --git a/data/deprecations/14-3-repository-push-audit-events.yml b/data/deprecations/14-3-repository-push-audit-events.yml
index 6fafd7ba6db..3a39c1f4304 100644
--- a/data/deprecations/14-3-repository-push-audit-events.yml
+++ b/data/deprecations/14-3-repository-push-audit-events.yml
@@ -11,4 +11,4 @@
   tiers: Premium
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337993
   documentation_url: https://docs.gitlab.com/ee/administration/audit_events.html#repository-push
-  announcement_date: 2021-09-02 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69024
+  announcement_date: "2021-09-02" # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69024
diff --git a/data/deprecations/deprecation_omniauth-kerberos_gem.yml b/data/deprecations/deprecation_omniauth-kerberos_gem.yml
index f7068552ff9..8adbeb19416 100644
--- a/data/deprecations/deprecation_omniauth-kerberos_gem.yml
+++ b/data/deprecations/deprecation_omniauth-kerberos_gem.yml
@@ -11,5 +11,5 @@
   tiers: [Premium, Ultimate]
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337384
   documentation_url: https://docs.gitlab.com/ee/integration/kerberos.html#upgrading-from-password-based-to-ticket-based-kerberos-sign-ins
-  announcement_date: 2021-22-09
+  announcement_date: "2021-09-22"
 
diff --git a/data/deprecations/distribution_deprecations_14-3.yml b/data/deprecations/distribution_deprecations_14-3.yml
index e43cc7baf09..05263383151 100644
--- a/data/deprecations/distribution_deprecations_14-3.yml
+++ b/data/deprecations/distribution_deprecations_14-3.yml
@@ -1,5 +1,6 @@
 - name: "Rename Task Runner pod to Toolbox" # The name of the feature to be deprecated
   announcement_milestone: "14.2" # The milestone when this feature was first announced as deprecated.
+  announcement_date: "2021-09-22"
   removal_milestone: "14.4" # the milestone when this feature is planned to be removed
   body: | # Do not modify this line, instead modify the lines below.
     The Task Runner pod is used to execute periodic housekeeping tasks within the GitLab application and is often confused with the GitLab Runner. Thus, [Task Runner will be renamed to Toolbox](https://gitlab.com/groups/gitlab-org/charts/-/epics/25).
diff --git a/data/deprecations/serverless.yml b/data/deprecations/serverless.yml
index 5f4a039a9c0..1b99ece154f 100644
--- a/data/deprecations/serverless.yml
+++ b/data/deprecations/serverless.yml
@@ -1,5 +1,6 @@
 - name: "GitLab Serverless"
   announcement_milestone: "14.3"
+  announcement_date: "2021-09-22"
   removal_milestone: "15.0"
   body: |
     [GitLab Serverless](https://docs.gitlab.com/ee/user/project/clusters/serverless/) is a feature set to support Knative-based serverless development with automatic deployments and monitoring.
diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb
index b6f532147fd..64bd6a75a5e 100644
--- a/data/deprecations/templates/_deprecation_template.md.erb
+++ b/data/deprecations/templates/_deprecation_template.md.erb
@@ -22,6 +22,8 @@ then run `bin/rake gitlab:docs:compile_deprecations`.
 ### <%= deprecation["name"]%>
 
 <%= deprecation["body"] -%>
+
+Announced: <%= deprecation["announcement_date"]%>
     <%- end -%>
   <%- end -%>
 <%- else -%>
diff --git a/data/deprecations/templates/example.yml b/data/deprecations/templates/example.yml
index 59e478ab83e..f665dd21530 100644
--- a/data/deprecations/templates/example.yml
+++ b/data/deprecations/templates/example.yml
@@ -12,7 +12,8 @@
 
 - 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
+  announcement_date: "YYYY-MM-DD" # The date of the milestone release 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
 
@@ -29,5 +30,4 @@
   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_date: # 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