From d6035e281909f1ea9e30a4ebc4cd931971340208 Mon Sep 17 00:00:00 2001 From: Deepika Guliani Date: Thu, 19 Jun 2025 15:29:23 +1000 Subject: [PATCH 1/3] Enable `work_item_status_feature_flag` by default --- .../{wip => beta}/work_item_status_feature_flag.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename config/feature_flags/{wip => beta}/work_item_status_feature_flag.yml (84%) 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 fda8f3bc784cb9..b8956c5e04edab 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 -- GitLab From 7a6ebff82fcd363d5e7ad980263a1a6071c9e1f2 Mon Sep 17 00:00:00 2001 From: Agnes Slota Date: Thu, 3 Jul 2025 08:57:30 +1000 Subject: [PATCH 2/3] Fix work item statuses feature flag type --- app/models/group.rb | 2 +- app/models/project.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/group.rb b/app/models/group.rb index 1f64be67632e8b..be615b3420427a 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 3f175def1fc6ed..9bdfccbf2e4521 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 -- GitLab From f3e6a993ea18c2ecfed65198c6d1414702546a51 Mon Sep 17 00:00:00 2001 From: Marc Saleiko Date: Wed, 9 Jul 2025 16:46:56 +0200 Subject: [PATCH 3/3] Updates documentation --- doc/user/project/issue_board.md | 5 ++--- doc/user/project/issues/managing_issues.md | 5 ++--- doc/user/tasks.md | 5 ++--- doc/user/work_items/status.md | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index 9e0d3b85364b09..c5433fc7b8c7fc 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 7539efbf0017e9..db695b7e53730d 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 b72400b83ec9f9..ad7deeef7a3934 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 a95d8e4b516bc2..917ef41177eaf2 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 >}} -- GitLab