diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue index 4880e7de9d2c1d7c4fedf4517df23d55f462b924..eed6eb2b6eefb4955f45327b27987162fae3acaf 100644 --- a/app/assets/javascripts/work_items/components/work_item_actions.vue +++ b/app/assets/javascripts/work_items/components/work_item_actions.vue @@ -185,7 +185,7 @@ export default { }; }, canLockWorkItem() { - return this.canUpdate && this.glFeatures.workItemsMvc; + return this.canUpdate && this.glFeatures.workItemsBeta; }, canPromoteToObjective() { return this.canUpdate && this.workItemType === WORK_ITEM_TYPE_VALUE_KEY_RESULT; diff --git a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue index 662edda13f18e817c542436c09a2b6010b011d21..356ccf659da0c73f860281c9e94896ad2b55b945 100644 --- a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue +++ b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue @@ -310,7 +310,7 @@ export default { @error="$emit('error', $event)" /> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/398649) in GitLab 16.9 [with a flag](../administration/feature_flags.md) named `work_items_mvc`. Disabled by default. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/398649) in GitLab 16.9 [with a flag](../administration/feature_flags.md) named `work_items_beta`. Disabled by default. FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../administration/feature_flags.md) named `work_items_mvc`. +On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../administration/feature_flags.md) named `work_items_beta`. On GitLab.com, this feature is not available. This feature is not ready for production use. diff --git a/doc/user/tasks.md b/doc/user/tasks.md index 86dd1b4a7741573449e0caa144a185ca2adc940a..3338c911202500e4ce2f7ed0bcb47c89f8ead076 100644 --- a/doc/user/tasks.md +++ b/doc/user/tasks.md @@ -492,10 +492,10 @@ system note in the task's comments, for example: ## Lock discussion -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/398649) in GitLab 16.9 [with a flag](../administration/feature_flags.md) named `work_items_mvc`. Disabled by default. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/398649) in GitLab 16.9 [with a flag](../administration/feature_flags.md) named `work_items_beta`. Disabled by default. FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../administration/feature_flags.md) named `work_items_mvc`. +On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../administration/feature_flags.md) named `work_items_beta`. On GitLab.com, this feature is not available. This feature is not ready for production use. diff --git a/spec/frontend/work_items/components/work_item_actions_spec.js b/spec/frontend/work_items/components/work_item_actions_spec.js index b838c9a6a2869d073e56f04f53f0f036c181d6e0..f16960f24145072037c8cac5eb352507dafc6703 100644 --- a/spec/frontend/work_items/components/work_item_actions_spec.js +++ b/spec/frontend/work_items/components/work_item_actions_spec.js @@ -140,7 +140,7 @@ describe('WorkItemActions component', () => { }, provide: { isGroup: false, - glFeatures: { workItemsMvc: true, workItemsMvc2: true }, + glFeatures: { workItemsBeta: true, workItemsMvc2: true }, }, mocks: { $toast, diff --git a/spec/frontend/work_items/components/work_item_attributes_wrapper_spec.js b/spec/frontend/work_items/components/work_item_attributes_wrapper_spec.js index 5dfe27c41817b73a81af3ad85a8be16189e0114f..e91c9cd0d5e1313850954248009f13f3b98af627 100644 --- a/spec/frontend/work_items/components/work_item_attributes_wrapper_spec.js +++ b/spec/frontend/work_items/components/work_item_attributes_wrapper_spec.js @@ -50,7 +50,7 @@ describe('WorkItemAttributesWrapper component', () => { hasIssuableHealthStatusFeature: true, projectNamespace: 'namespace', glFeatures: { - workItemsMvc: true, + workItemsBeta: true, workItemsMvc2, }, }, diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 697235339435fb184f38be7db96355708b9c5420..9c3c990bdbdb3231f6fe763869f02d4a3cb52931 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -3621,10 +3621,10 @@ def define_cache_expectations(cache_key) end end - describe '#work_items_mvc_feature_flag_enabled?' do + describe '#work_items_beta_feature_flag_enabled?' do it_behaves_like 'checks self and root ancestor feature flag' do - let(:feature_flag) { :work_items_mvc } - let(:feature_flag_method) { :work_items_mvc_feature_flag_enabled? } + let(:feature_flag) { :work_items_beta } + let(:feature_flag_method) { :work_items_beta_feature_flag_enabled? } end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 936303d0be60e46186948cc951695337be1f25ce..192a46598e1540a285626576c344e5495218b56f 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -8627,12 +8627,12 @@ def has_external_wiki end end - describe '#work_items_mvc_feature_flag_enabled?' do + describe '#work_items_beta_feature_flag_enabled?' do let_it_be(:group_project) { create(:project, :in_subgroup) } it_behaves_like 'checks parent group feature flag' do - let(:feature_flag_method) { :work_items_mvc_feature_flag_enabled? } - let(:feature_flag) { :work_items_mvc } + let(:feature_flag_method) { :work_items_beta_feature_flag_enabled? } + let(:feature_flag) { :work_items_beta } let(:subject_project) { group_project } end end