diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue
index 77e6b299a1b5a42c9b9bee7b6847c4f2877a9d51..f678f5270f2d4964b265fd5a93539c3ac93d8f60 100644
--- a/app/assets/javascripts/boards/components/board_content_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue
@@ -164,7 +164,7 @@ export default {
return referencePath.slice(0, referencePath.indexOf('#'));
},
showWorkItemEpics() {
- return this.glFeatures.displayWorkItemEpicIssueSidebar;
+ return this.glFeatures.workItemEpics;
},
showEpicSidebarDropdownWidget() {
return this.epicFeatureAvailable && !this.isIncidentSidebar && this.activeBoardIssuable.id;
diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb
index 1e546908214ac65e654861df760660785b1fa590..c3492a6621d40bf0df6a6be7faaf9f7ced4d8e9b 100644
--- a/app/controllers/groups/boards_controller.rb
+++ b/app/controllers/groups/boards_controller.rb
@@ -7,7 +7,6 @@ class Groups::BoardsController < Groups::ApplicationController
before_action do
push_frontend_feature_flag(:board_multi_select, group)
- push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, group)
end
feature_category :team_planning
diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb
index d95f44a2646d3219956afbc66f428c03da1dcea9..98588a02801e03a617e85227e3a6f2932e77048d 100644
--- a/app/controllers/projects/boards_controller.rb
+++ b/app/controllers/projects/boards_controller.rb
@@ -7,7 +7,6 @@ class Projects::BoardsController < Projects::ApplicationController
before_action :check_issues_available!
before_action do
push_frontend_feature_flag(:board_multi_select, project)
- push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, project)
end
feature_category :team_planning
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index e4993dd43edcc2e6ae5bd552e54b18dfa5a15791..83413b938cff791e6d65e12105237a7d97efa461 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -48,7 +48,6 @@ class Projects::IssuesController < Projects::ApplicationController
push_frontend_feature_flag(:issues_grid_view)
push_frontend_feature_flag(:service_desk_ticket)
push_frontend_feature_flag(:issues_list_drawer, project)
- push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, project)
push_frontend_feature_flag(:notifications_todos_buttons, current_user)
end
@@ -66,7 +65,6 @@ class Projects::IssuesController < Projects::ApplicationController
push_force_frontend_feature_flag(:work_items_beta, project&.work_items_beta_feature_flag_enabled?)
push_force_frontend_feature_flag(:work_items_alpha, project&.work_items_alpha_feature_flag_enabled?)
push_frontend_feature_flag(:epic_widget_edit_confirmation, project)
- push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, project)
push_frontend_feature_flag(:namespace_level_work_items, project&.group)
end
diff --git a/config/feature_flags/development/display_work_item_epic_issue_sidebar.yml b/config/feature_flags/development/display_work_item_epic_issue_sidebar.yml
deleted file mode 100644
index b981895228acb9d182f64f52691f91b8e04ff966..0000000000000000000000000000000000000000
--- a/config/feature_flags/development/display_work_item_epic_issue_sidebar.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: display_work_item_epic_issue_sidebar
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135480
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430337
-milestone: '16.8'
-type: development
-group: group::product planning
-default_enabled: false
diff --git a/ee/app/assets/javascripts/sidebar/mount_sidebar.js b/ee/app/assets/javascripts/sidebar/mount_sidebar.js
index e750022fc1d0065c962d2f1fb383576bc05890c0..31f6bd75573a09c244a3d6d5e2485c77c5fcab59 100644
--- a/ee/app/assets/javascripts/sidebar/mount_sidebar.js
+++ b/ee/app/assets/javascripts/sidebar/mount_sidebar.js
@@ -140,7 +140,7 @@ function mountSidebarCveIdRequest(store) {
function mountSidebarEpicWidget() {
const el = document.querySelector('.js-sidebar-epic-widget-root');
- const displayWorkItemEpicIssueSidebar = window.gon?.features?.displayWorkItemEpicIssueSidebar;
+ const workItemEpics = window.gon?.features?.workItemEpics;
if (!el) {
return null;
@@ -164,7 +164,7 @@ function mountSidebarEpicWidget() {
issueId,
issuableType: TYPE_ISSUE,
issuableAttribute: IssuableAttributeType.Epic,
- showWorkItemEpics: displayWorkItemEpicIssueSidebar,
+ showWorkItemEpics: workItemEpics,
},
}),
});
diff --git a/ee/app/controllers/ee/groups/boards_controller.rb b/ee/app/controllers/ee/groups/boards_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..801e58cfba10fdc6380a102492366370b4361224
--- /dev/null
+++ b/ee/app/controllers/ee/groups/boards_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module EE
+ module Groups
+ module BoardsController
+ extend ActiveSupport::Concern
+
+ prepended do
+ before_action do
+ push_frontend_feature_flag(:work_item_epics, group)
+ end
+ end
+ end
+ end
+end
diff --git a/ee/app/controllers/ee/projects/boards_controller.rb b/ee/app/controllers/ee/projects/boards_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..13b09e606513b0fae12354cc38f0e98c5d6870de
--- /dev/null
+++ b/ee/app/controllers/ee/projects/boards_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module EE
+ module Projects
+ module BoardsController
+ extend ActiveSupport::Concern
+
+ prepended do
+ before_action do
+ push_frontend_feature_flag(:work_item_epics, project&.group)
+ end
+ end
+ end
+ end
+end
diff --git a/ee/app/controllers/ee/projects/issues_controller.rb b/ee/app/controllers/ee/projects/issues_controller.rb
index 784a67ef16b14bbfc8176639bf6f3a59a9eeece4..8325840ad8b651bd81557e50764ca5aae47d54a5 100644
--- a/ee/app/controllers/ee/projects/issues_controller.rb
+++ b/ee/app/controllers/ee/projects/issues_controller.rb
@@ -43,6 +43,7 @@ module IssuesController
before_action do
push_frontend_feature_flag(:namespace_level_work_items, project&.group)
+ push_frontend_feature_flag(:work_item_epics, project&.group)
end
before_action only: %i[show index] do
diff --git a/ee/app/controllers/groups/epic_boards_controller.rb b/ee/app/controllers/groups/epic_boards_controller.rb
index 0223bb5f942fcf5315e7444a33bcdab78e02e9e2..73bf943cbcd70f91a93cd95945e5fff7b1c483de 100644
--- a/ee/app/controllers/groups/epic_boards_controller.rb
+++ b/ee/app/controllers/groups/epic_boards_controller.rb
@@ -7,7 +7,7 @@ class Groups::EpicBoardsController < Groups::ApplicationController
extend ::Gitlab::Utils::Override
before_action do
- push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, group)
+ push_frontend_feature_flag(:work_item_epics, group)
end
track_event :index, :show, name: 'g_project_management_users_viewing_epic_boards'
diff --git a/ee/spec/features/boards/sidebar_spec.rb b/ee/spec/features/boards/sidebar_spec.rb
index 20ea34750a71a2c7e47159c8cb36572184696033..720602ac8d8534a9c5f04807a13b6fc65da13f96 100644
--- a/ee/spec/features/boards/sidebar_spec.rb
+++ b/ee/spec/features/boards/sidebar_spec.rb
@@ -31,7 +31,7 @@
before do
stub_licensed_features(multiple_issue_assignees: true)
- stub_feature_flags(display_work_item_epic_issue_sidebar: false)
+ stub_feature_flags(work_item_epics: false)
project.add_maintainer(user)
project.team.add_developer(user2)
diff --git a/ee/spec/features/issues/epic_in_issue_sidebar_spec.rb b/ee/spec/features/issues/epic_in_issue_sidebar_spec.rb
index 207bceb78288431b7945a4715f8ff7464d36d381..d672486932637343e4523889369afae64bc6fac0 100644
--- a/ee/spec/features/issues/epic_in_issue_sidebar_spec.rb
+++ b/ee/spec/features/issues/epic_in_issue_sidebar_spec.rb
@@ -29,7 +29,7 @@
before do
group.add_owner(user)
- stub_feature_flags(display_work_item_epic_issue_sidebar: false)
+ stub_feature_flags(work_item_epics: false)
sign_in user
end
@@ -162,7 +162,7 @@
before do
group.add_owner(user)
stub_licensed_features(epics: true)
- stub_feature_flags(display_work_item_epic_issue_sidebar: true)
+ stub_feature_flags(work_item_epics: true)
sign_in(user)