diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-21 18:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-21 18:09:01 +0300 |
| commit | c39e93b52ed569635a9ae178115f77ae563b3332 (patch) | |
| tree | d58e66290883100d57dc95bdb39a6169f90a0490 /data | |
| parent | 0c4570435d417b69efd433057f95f01810618837 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'data')
| -rw-r--r-- | data/deprecations/templates/_deprecation_template.md.erb | 2 | ||||
| -rw-r--r-- | data/removals/16_1/.gitkeep | 0 | ||||
| -rw-r--r-- | data/removals/templates/_removal_template.md.erb | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb index 1817942eac5..3735e43a96f 100644 --- a/data/deprecations/templates/_deprecation_template.md.erb +++ b/data/deprecations/templates/_deprecation_template.md.erb @@ -59,7 +59,7 @@ For deprecation reviewers (Technical Writers only): - End of Support: GitLab <span class="milestone"><%= deprecation["end_of_support_milestone"]%></span> <% end -%> <% if deprecation["breaking_change"] -%> -- This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/). +- This is a [breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change). <%- end -%> <% if deprecation["issue_url"] -%> - To discuss this change or learn more, see the [deprecation issue](<%= deprecation["issue_url"]%>). diff --git a/data/removals/16_1/.gitkeep b/data/removals/16_1/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 --- a/data/removals/16_1/.gitkeep +++ /dev/null diff --git a/data/removals/templates/_removal_template.md.erb b/data/removals/templates/_removal_template.md.erb index aa2ae993f45..c3d7bc499d0 100644 --- a/data/removals/templates/_removal_template.md.erb +++ b/data/removals/templates/_removal_template.md.erb @@ -44,7 +44,7 @@ For removal reviewers (Technical Writers only): <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. +- This is a [breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change). 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"]%>). |