diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue index 26cd0c3affa..7929c1ad488 100644 --- a/app/assets/javascripts/boards/components/board_content_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue @@ -16,6 +16,7 @@ import SidebarSeverityWidget from '~/sidebar/components/severity/sidebar_severit import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue'; import SidebarTodoWidget from '~/sidebar/components/todo_toggle/sidebar_todo_widget.vue'; import SidebarLabelsWidget from '~/sidebar/components/labels/labels_select_widget/labels_select_root.vue'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { setError } from '../graphql/cache_updates'; export default { @@ -39,6 +40,7 @@ export default { SidebarWeightWidget: () => import('ee_component/sidebar/components/weight/sidebar_weight_widget.vue'), }, + mixins: [glFeatureFlagMixin()], inject: { multipleAssigneesFeatureAvailable: { default: false, @@ -143,6 +145,17 @@ export default { const { referencePath = '' } = this.activeBoardIssuable; return referencePath.slice(0, referencePath.indexOf('#')); }, + showWorkItemEpics() { + return this.glFeatures.displayWorkItemEpicIssueSidebar; + }, + showEpicSidebarDropdownWidget() { + return this.epicFeatureAvailable && !this.isIncidentSidebar && this.activeBoardIssuable.id; + }, + showIterationSidebarDropdownWidget() { + return ( + this.iterationFeatureAvailable && !this.isIncidentSidebar && this.activeBoardIssuable.id + ); + }, }, methods: { handleClose() { @@ -189,29 +202,34 @@ export default { :editable="canUpdate" />
{{ file.filePath }} +
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_search.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_search.vue index 1020cd0c533..df50f5a52b4 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_search.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_search.vue @@ -1,10 +1,13 @@