Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 8 deletions

diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue
index ecac208b1e0..c10ff2e08da 100644
--- a/app/assets/javascripts/boards/components/board_card_inner.vue
+++ b/app/assets/javascripts/boards/components/board_card_inner.vue
@@ -14,6 +14,7 @@ import boardCardInner from 'ee_else_ce/boards/mixins/board_card_inner';
 import { isScopedLabel } from '~/lib/utils/common_utils';
 import { updateHistory } from '~/lib/utils/url_utility';
 import { sprintf, __, n__ } from '~/locale';
+import isShowingLabelsQuery from '~/graphql_shared/client/is_showing_labels.query.graphql';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue';
@@ -21,7 +22,6 @@ import IssuableBlockedIcon from '~/vue_shared/components/issuable_blocked_icon/i
 import { ListType } from '../constants';
 import eventHub from '../eventhub';
 import { setError } from '../graphql/cache_updates';
-import isShowingLabelsQuery from '../graphql/client/is_showing_labels.query.graphql';
 import IssueDueDate from './issue_due_date.vue';
 import IssueTimeEstimate from './issue_time_estimate.vue';
 
diff --git a/app/assets/javascripts/boards/components/board_top_bar.vue b/app/assets/javascripts/boards/components/board_top_bar.vue
index 7fd1a934381..31664c28831 100644
--- a/app/assets/javascripts/boards/components/board_top_bar.vue
+++ b/app/assets/javascripts/boards/components/board_top_bar.vue
@@ -4,6 +4,7 @@ import { s__ } from '~/locale';
 import BoardsSelector from 'ee_else_ce/boards/components/boards_selector.vue';
 import IssueBoardFilteredSearch from 'ee_else_ce/boards/components/issue_board_filtered_search.vue';
 import { getBoardQuery } from 'ee_else_ce/boards/boards_util';
+import ToggleLabels from '~/vue_shared/components/toggle_labels.vue';
 import { setError } from '../graphql/cache_updates';
 import ConfigToggle from './config_toggle.vue';
 import NewBoardButton from './new_board_button.vue';
@@ -17,7 +18,7 @@ export default {
     ConfigToggle,
     NewBoardButton,
     ToggleFocus,
-    ToggleLabels: () => import('ee_component/boards/components/toggle_labels.vue'),
+    ToggleLabels,
     ToggleEpicsSwimlanes: () => import('ee_component/boards/components/toggle_epics_swimlanes.vue'),
     EpicBoardFilteredSearch: () =>
       import('ee_component/boards/components/epic_filtered_search.vue'),
diff --git a/app/assets/javascripts/boards/graphql/client/is_showing_labels.query.graphql b/app/assets/javascripts/boards/graphql/client/is_showing_labels.query.graphql
deleted file mode 100644
index dc16f7ad313..00000000000
--- a/app/assets/javascripts/boards/graphql/client/is_showing_labels.query.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query isShowingLabels {
-  isShowingLabels @client
-}
diff --git a/app/assets/javascripts/boards/graphql/client/set_is_showing_labels.mutation.graphql b/app/assets/javascripts/boards/graphql/client/set_is_showing_labels.mutation.graphql
deleted file mode 100644
index 2f115291977..00000000000
--- a/app/assets/javascripts/boards/graphql/client/set_is_showing_labels.mutation.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation setIsShowingLabels($isShowingLabels: Boolean!) {
-  setIsShowingLabels(isShowingLabels: $isShowingLabels) @client
-}