diff --git a/app/models/group.rb b/app/models/group.rb index 1f64be67632e8bcc65981d587eeeff8df896b16a..be615b3420427a155a8c01021fe1e4fd394a4959 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1104,7 +1104,7 @@ def work_items_alpha_feature_flag_enabled? end def work_item_status_feature_available? - feature_flag_enabled_for_self_or_ancestor?(:work_item_status_feature_flag, type: :wip) && + feature_flag_enabled_for_self_or_ancestor?(:work_item_status_feature_flag, type: :beta) && licensed_feature_available?(:work_item_status) end diff --git a/app/models/project.rb b/app/models/project.rb index 3f175def1fc6eda7fcffd54df52cb9df8ed73677..9bdfccbf2e45217df8d2aa7ff3749e4325563c92 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -3447,7 +3447,7 @@ def work_items_alpha_feature_flag_enabled? end def work_item_status_feature_available? - (group&.work_item_status_feature_available? || Feature.enabled?(:work_item_status_feature_flag, type: :wip)) && + (group&.work_item_status_feature_available? || Feature.enabled?(:work_item_status_feature_flag)) && licensed_feature_available?(:work_item_status) end diff --git a/config/feature_flags/wip/work_item_status_feature_flag.yml b/config/feature_flags/beta/work_item_status_feature_flag.yml similarity index 84% rename from config/feature_flags/wip/work_item_status_feature_flag.yml rename to config/feature_flags/beta/work_item_status_feature_flag.yml index fda8f3bc784cb9ce41a172dae1845164acfbbae5..b8956c5e04edabcdd7bc976721b6aa2cf4395db9 100644 --- a/config/feature_flags/wip/work_item_status_feature_flag.yml +++ b/config/feature_flags/beta/work_item_status_feature_flag.yml @@ -3,7 +3,7 @@ name: work_item_status_feature_flag feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/5099 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182225 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/521286 -milestone: '17.10' +milestone: '18.2' group: group::project management -type: wip -default_enabled: false +type: beta +default_enabled: true diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index 9e0d3b85364b09310c73673693956c9f1d3e1489..c5433fc7b8c7fc955169eb5eac0eddce66cb7fa5 100644 --- a/doc/user/project/issue_board.md +++ b/doc/user/project/issue_board.md @@ -342,13 +342,13 @@ To change the iteration of issues, [drag issue cards](#move-issues-and-lists) to {{< details >}} - Tier: Premium, Ultimate -- Offering: GitLab.com, GitLab Self-Managed +- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated {{< /details >}} {{< history >}} -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Disabled by default. +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Enabled by default. {{< /history >}} @@ -356,7 +356,6 @@ To change the iteration of issues, [drag issue cards](#move-issues-and-lists) to The availability of this feature is controlled by a feature flag. For more information, see the history. -This feature is available for testing, but not ready for production use. {{< /alert >}} diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md index 7539efbf0017e9d9f141046321b5d8a1b7ea0634..db695b7e53730d5c26c8bd3b7b67bb11866ab0b2 100644 --- a/doc/user/project/issues/managing_issues.md +++ b/doc/user/project/issues/managing_issues.md @@ -966,13 +966,13 @@ You can also set and clear health statuses using the `/health_status` and `/clea {{< details >}} - Tier: Premium, Ultimate -- Offering: GitLab.com, GitLab Self-Managed +- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated {{< /details >}} {{< history >}} -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../../../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Disabled by default. +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../../../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Enabled by default. {{< /history >}} @@ -980,7 +980,6 @@ You can also set and clear health statuses using the `/health_status` and `/clea The availability of this feature is controlled by a feature flag. For more information, see the history. -This feature is available for testing, but not ready for production use. {{< /alert >}} diff --git a/doc/user/tasks.md b/doc/user/tasks.md index b72400b83ec9f9ecfb1c1e79c9af447a249fbf6f..ad7deeef7a39344659e543e8190a78962e3f12b4 100644 --- a/doc/user/tasks.md +++ b/doc/user/tasks.md @@ -309,13 +309,13 @@ To reorder them, drag them around. {{< details >}} - Tier: Premium, Ultimate -- Offering: GitLab.com, GitLab Self-Managed +- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated {{< /details >}} {{< history >}} -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Disabled by default. +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Enabled by default. {{< /history >}} @@ -323,7 +323,6 @@ To reorder them, drag them around. The availability of this feature is controlled by a feature flag. For more information, see the history. -This feature is available for testing, but not ready for production use. {{< /alert >}} diff --git a/doc/user/work_items/status.md b/doc/user/work_items/status.md index a95d8e4b516bc2a84163effdf4a10abd97be4956..917ef41177eaf2ae595669d9c40581509e55a8d5 100644 --- a/doc/user/work_items/status.md +++ b/doc/user/work_items/status.md @@ -9,13 +9,13 @@ title: Status {{< details >}} - Tier: Premium, Ultimate -- Offering: GitLab.com, GitLab Self-Managed +- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated {{< /details >}} {{< history >}} -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Disabled by default. +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/543862) in GitLab 18.2 [with a flag](../../administration/feature_flags/_index.md) named `work_item_status_feature_flag`. Enabled by default. {{< /history >}} @@ -23,7 +23,6 @@ title: Status The availability of this feature is controlled by a feature flag. For more information, see the history. -This feature is available for testing, but not ready for production use. {{< /alert >}}