3 files changed, 5 insertions, 30 deletions
diff --git a/app/assets/javascripts/boards/graphql/board_labels.query.graphql b/app/assets/javascripts/boards/graphql/board_labels.query.graphql
index 42a94419a97..b19a24e8808 100644
--- a/app/assets/javascripts/boards/graphql/board_labels.query.graphql
+++ b/app/assets/javascripts/boards/graphql/board_labels.query.graphql
@@ -7,14 +7,14 @@ query BoardLabels(
   $isProject: Boolean = false
 ) {
   group(fullPath: $fullPath) @include(if: $isGroup) {
-    labels(searchTerm: $searchTerm) {
+    labels(searchTerm: $searchTerm, onlyGroupLabels: true, includeAncestorGroups: true) {
       nodes {
         ...Label
       }
     }
   }
   project(fullPath: $fullPath) @include(if: $isProject) {
-    labels(searchTerm: $searchTerm) {
+    labels(searchTerm: $searchTerm, includeAncestorGroups: true) {
       nodes {
         ...Label
       }
diff --git a/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql b/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql
index f78a21baa7f..3eb23f62940 100644
--- a/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql
+++ b/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql
@@ -1,21 +1,7 @@
-#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
+#import "./board_list.fragment.graphql"
 
-mutation CreateBoardList(
-  $boardId: BoardID!
-  $backlog: Boolean
-  $labelId: LabelID
-  $milestoneId: MilestoneID
-  $assigneeId: UserID
-) {
-  boardListCreate(
-    input: {
-      boardId: $boardId
-      backlog: $backlog
-      labelId: $labelId
-      milestoneId: $milestoneId
-      assigneeId: $assigneeId
-    }
-  ) {
+mutation CreateBoardList($boardId: BoardID!, $backlog: Boolean, $labelId: LabelID) {
+  boardListCreate(input: { boardId: $boardId, backlog: $backlog, labelId: $labelId }) {
     list {
       ...BoardListFragment
     }
diff --git a/app/assets/javascripts/boards/graphql/users_search.query.graphql b/app/assets/javascripts/boards/graphql/users_search.query.graphql
deleted file mode 100644
index ca016495d79..00000000000
--- a/app/assets/javascripts/boards/graphql/users_search.query.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-query usersSearch($search: String!) {
-  users(search: $search) {
-    nodes {
-      username
-      name
-      webUrl
-      avatarUrl
-      id
-    }
-  }
-}