summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 06:09:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 06:09:43 +0000
commit213da19cda5309148952ab770e2a9e122fe32e22 (patch)
tree80a48af510839497fa83625a34530543d255a957 /app/assets
parent3591ecba91126089ebf916f9bd95fe497609920c (diff)
downloadgitlab-ce-213da19cda5309148952ab770e2a9e122fe32e22.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
index 098917f2b56..4b6f581d76d 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
@@ -5,7 +5,6 @@ import Draggable from 'vuedraggable';
import { isLoggedIn } from '~/lib/utils/common_utils';
import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
import { defaultSortableOptions } from '~/sortable/constants';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { WORK_ITEM_TYPE_VALUE_OBJECTIVE } from '../../constants';
import { findHierarchyWidgets, getWorkItemQuery } from '../../utils';
@@ -18,7 +17,6 @@ export default {
components: {
WorkItemLinkChild,
},
- mixins: [glFeatureFlagsMixin()],
inject: ['fullPath'],
props: {
workItemType: {
@@ -57,7 +55,7 @@ export default {
},
computed: {
canReorder() {
- return this.glFeatures.workItemsMvc2 && isLoggedIn() && this.canUpdate;
+ return isLoggedIn() && this.canUpdate;
},
treeRootWrapper() {
return this.canReorder ? Draggable : 'div';