diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-06 09:09:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-06 09:09:17 +0300 |
| commit | 578fc865330cb9ce65746ea5c03e993348e62c96 (patch) | |
| tree | 3c8175f1d2192633a17a4a85b0824b07d055c990 /data | |
| parent | 23d951df2d16aea96dbd78fd8afe2e22a4794115 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'data')
| -rw-r--r-- | data/deprecations/templates/_deprecation_template.md.erb | 24 | ||||
| -rw-r--r-- | data/deprecations/templates/example.yml | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb index 20bccb88ce0..1a77689080e 100644 --- a/data/deprecations/templates/_deprecation_template.md.erb +++ b/data/deprecations/templates/_deprecation_template.md.erb @@ -2,10 +2,9 @@ stage: none group: none info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments-to-development-guidelines" -description: "View features that are currently deprecated" --- -# Deprecated features by planned removal milestone +# Deprecated feature removal schedule <!-- This page is automatically generated from the YAML files in `/data/deprecations` by the rake task @@ -16,15 +15,16 @@ Do not edit this page directly. To add a deprecation, use the example.yml file in `/data/deprecations/templates` as a template, then run `bin/rake gitlab:docs:compile_deprecations`. --> +<% if milestones.any? %> + <%- milestones.each do |milestone| %> +## <%= milestone %> + <%- deprecations.select{|d| d["removal_milestone"] == milestone}.each do |deprecation| %> +### <%= deprecation["name"]%> -<% if milestones.any? -%> - <% milestones.each do |milestone| %> -### <%= milestone %> - <% deprecations.select{|d| d["removal_milestone"] == milestone}.each do |deprecation| %> -#### <%= deprecation["name"] %> -<%= deprecation["body"]%> - <% end %> - <% end %> -<% else -%> -## There are no deprecated features for this version of GitLab +<%= deprecation["body"] -%> + <%- end -%> + <%- end -%> +<%- else -%> + +Deprecated features scheduled for removal will be listed here, sorted by GitLab milestone. <% end -%> diff --git a/data/deprecations/templates/example.yml b/data/deprecations/templates/example.yml index 2ae52cad568..2bd92cc4b28 100644 --- a/data/deprecations/templates/example.yml +++ b/data/deprecations/templates/example.yml @@ -10,8 +10,8 @@ # # Please delete this line and above before submitting your merge request. -- name: # The name of the feature to be deprecated - removal_milestone: # XX.YY format - the milestone when this feature is planned to be removed +- name: "Feature name" # The name of the feature to be 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 |