diff --git a/data/deprecations/15-7-deprecate-zentao-integration.yml b/data/deprecations/15-7-deprecate-zentao-integration.yml index 72da0544ac36a073c05b593e7371158563995ef8..f637931c4457bba2d62099a0b20938057b473467 100644 --- a/data/deprecations/15-7-deprecate-zentao-integration.yml +++ b/data/deprecations/15-7-deprecate-zentao-integration.yml @@ -1,6 +1,6 @@ - title: "ZenTao integration" # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "The maximum number of characters in a job name will be limited to 250." announcement_milestone: "15.7" # (required) The milestone when this feature was first announced as deprecated. - removal_milestone: "16.0" # (required) The milestone when this feature is planned to be removed + removal_milestone: "18.0" # (required) The milestone when this feature is planned to be removed breaking_change: true # (required) If this deprecation is a breaking change, set this value to true reporter: arturoherrero # (required) GitLab username of the person reporting the deprecation stage: Manage # (required) String value of the stage that the feature was created in. e.g., Growth diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md index cfdfdd6aa8330bde615fcdbc078091445647b675..4797c14c935f9a835f4fcfb20de4139a33f7a2c6 100644 --- a/doc/update/deprecations.md +++ b/doc/update/deprecations.md @@ -620,6 +620,21 @@ Toggling notes confidentiality with REST and GraphQL APIs is being deprecated. U <div class="deprecation breaking-change" data-milestone="18.0"> +### ZenTao integration + +<div class="deprecation-notes"> +- Announced in GitLab <span class="milestone">15.7</span> +- Removal in GitLab <span class="milestone">18.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change)) +- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/377825). +</div> + +The [ZenTao product integration](https://docs.gitlab.com/ee/user/project/integrations/zentao.html) has been deprecated +and will be moved to the JiHu GitLab codebase. + +</div> + +<div class="deprecation breaking-change" data-milestone="18.0"> + ### `GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN` is deprecated <div class="deprecation-notes"> @@ -3940,21 +3955,6 @@ In GitLab 16.0 we will remove the ability to use a global ID in the work items p <div class="deprecation breaking-change" data-milestone="16.0"> -### ZenTao integration - -<div class="deprecation-notes"> -- Announced in GitLab <span class="milestone">15.7</span> -- Removal in GitLab <span class="milestone">16.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change)) -- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/377825). -</div> - -The [ZenTao product integration](https://docs.gitlab.com/ee/user/project/integrations/zentao.html) has been deprecated -and will be moved to the JiHu GitLab codebase. - -</div> - -<div class="deprecation breaking-change" data-milestone="16.0"> - ### `CI_BUILD_*` predefined variables <div class="deprecation-notes"> diff --git a/doc/user/project/integrations/zentao.md b/doc/user/project/integrations/zentao.md index 15f7bf4970c31f601d51806ea66728873f61f4ac..5c3db1d7b706a223d873a8f0aeaf5e00ec6d2c3d 100644 --- a/doc/user/project/integrations/zentao.md +++ b/doc/user/project/integrations/zentao.md @@ -4,6 +4,8 @@ group: Import and Integrate info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments --- +<!--- start_remove The following content will be removed on remove_date: '2025-08-01' --> + # ZenTao (deprecated) DETAILS: @@ -11,7 +13,8 @@ DETAILS: **Offering:** GitLab.com, Self-managed, GitLab Dedicated WARNING: -This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/377825) in GitLab 15.7. +This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/377825) in GitLab 15.7 +and is planned for removal in 18.0. This change is a breaking change. [ZenTao](https://www.zentao.net/) is a web-based project management platform. @@ -53,3 +56,5 @@ Complete these steps in GitLab: 1. Optional. Select **Test settings**. 1. Select **Save changes**. + +<!--- end_remove -->