Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 5 insertions, 9 deletions

diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue
index ca86894ca40..92f79e61f14 100644
--- a/app/assets/javascripts/boards/components/board_content.vue
+++ b/app/assets/javascripts/boards/components/board_content.vue
@@ -9,7 +9,7 @@ import { s__ } from '~/locale';
 import { formatBoardLists } from 'ee_else_ce/boards/boards_util';
 import BoardAddNewColumn from 'ee_else_ce/boards/components/board_add_new_column.vue';
 import { defaultSortableOptions } from '~/sortable/constants';
-import { DraggableItemTypes, BoardType, listsQuery } from 'ee_else_ce/boards/constants';
+import { DraggableItemTypes, listsQuery } from 'ee_else_ce/boards/constants';
 import BoardColumn from './board_column.vue';
 
 export default {
@@ -35,13 +35,11 @@ export default {
     'issuableType',
     'isIssueBoard',
     'isEpicBoard',
+    'isGroupBoard',
+    'disabled',
     'isApolloBoard',
   ],
   props: {
-    disabled: {
-      type: Boolean,
-      required: true,
-    },
     boardId: {
       type: String,
       required: true,
@@ -89,8 +87,8 @@ export default {
     queryVariables() {
       return {
         ...(this.isIssueBoard && {
-          isGroup: this.boardType === BoardType.group,
-          isProject: this.boardType === BoardType.project,
+          isGroup: this.isGroupBoard,
+          isProject: !this.isGroupBoard,
         }),
         fullPath: this.fullPath,
         boardId: this.boardId,
@@ -176,7 +174,6 @@ export default {
         ref="board"
         :list="list"
         :data-draggable-item-type="$options.draggableItemTypes.list"
-        :disabled="disabled"
         :class="{ 'gl-xs-display-none!': addColumnFormVisible }"
       />
 
@@ -190,7 +187,6 @@ export default {
       ref="swimlanes"
       :lists="boardListsToUse"
       :can-admin-list="canAdminList"
-      :disabled="disabled"
       :style="{ height: boardHeight }"
     />