Add latest changes from gitlab-org/gitlab@master

29 files changed, 346 insertions, 339 deletions

diff --git a/app/assets/javascripts/boards/issue_board_filters.js b/app/assets/javascripts/boards/issue_board_filters.js
index 27efb3f775c..aa9dc0fc158 100644
--- a/app/assets/javascripts/boards/issue_board_filters.js
+++ b/app/assets/javascripts/boards/issue_board_filters.js
@@ -1,5 +1,7 @@
+import { BoardType } from 'ee_else_ce/boards/constants';
 import groupBoardMembers from '~/boards/graphql/group_board_members.query.graphql';
 import projectBoardMembers from '~/boards/graphql/project_board_members.query.graphql';
+import usersAutocompleteQuery from '~/graphql_shared/queries/users_autocomplete.query.graphql';
 import groupBoardMilestonesQuery from './graphql/group_board_milestones.query.graphql';
 import projectBoardMilestonesQuery from './graphql/project_board_milestones.query.graphql';
 import boardLabels from './graphql/board_labels.query.graphql';
@@ -14,6 +16,17 @@ export default function issueBoardFilters(apollo, fullPath, isGroupBoard) {
   };
 
   const fetchUsers = (usersSearchTerm) => {
+    if (gon.features?.newGraphqlUsersAutocomplete) {
+      const namespace = isGroupBoard ? BoardType.group : BoardType.project;
+
+      return apollo
+        .query({
+          query: usersAutocompleteQuery,
+          variables: { fullPath, search: usersSearchTerm, isProject: !isGroupBoard },
+        })
+        .then(({ data }) => data[namespace]?.autocompleteUsers);
+    }
+
     return apollo
       .query({
         query: boardAssigneesQuery(),
diff --git a/app/assets/javascripts/jobs/components/job/sidebar/sidebar.vue b/app/assets/javascripts/jobs/components/job/sidebar/sidebar.vue
index 92e1557ada2..530109f9dfd 100644
--- a/app/assets/javascripts/jobs/components/job/sidebar/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/job/sidebar/sidebar.vue
@@ -1,5 +1,4 @@
 <script>
-import { GlButton, GlIcon } from '@gitlab/ui';
 import { isEmpty } from 'lodash';
 // eslint-disable-next-line no-restricted-imports
 import { mapActions, mapGetters, mapState } from 'vuex';
@@ -23,8 +22,6 @@ export default {
   components: {
     ArtifactsBlock,
     CommitBlock,
-    GlButton,
-    GlIcon,
     JobsContainer,
     JobRetryForwardDeploymentModal,
     JobSidebarDetailsContainer,
@@ -83,36 +80,12 @@ export default {
           :job-id="job.id"
           @updateVariables="$emit('updateVariables')"
         />
-        <div
-          v-if="job.terminal_path || job.new_issue_path"
-          class="gl-py-5"
-          :class="$options.borderTopClass"
-        >
-          <gl-button
-            v-if="job.new_issue_path"
-            :href="job.new_issue_path"
-            category="secondary"
-            variant="confirm"
-            data-testid="job-new-issue"
-          >
-            {{ $options.i18n.newIssue }}
-          </gl-button>
-          <gl-button
-            v-if="job.terminal_path"
-            :href="job.terminal_path"
-            target="_blank"
-            data-testid="terminal-link"
-          >
-            {{ $options.i18n.debug }}
-            <gl-icon name="external-link" />
-          </gl-button>
-        </div>
 
-        <job-sidebar-details-container class="gl-py-5" :class="$options.borderTopClass" />
+        <job-sidebar-details-container class="gl-py-4" :class="$options.borderTopClass" />
 
         <artifacts-block
           v-if="hasArtifact"
-          class="gl-py-5"
+          class="gl-py-4"
           :class="$options.borderTopClass"
           :artifact="job.artifact"
           :help-url="artifactHelpUrl"
@@ -120,21 +93,21 @@ export default {
 
         <trigger-block
           v-if="hasTriggers"
-          class="gl-py-5"
+          class="gl-py-4"
           :class="$options.borderTopClass"
           :trigger="job.trigger"
         />
 
         <commit-block
           :commit="commit"
-          class="gl-py-5"
+          class="gl-py-4"
           :class="$options.borderTopClass"
           :merge-request="job.merge_request"
         />
 
         <stages-dropdown
           v-if="job.pipeline"
-          class="gl-py-5"
+          class="gl-py-4"
           :class="$options.borderTopClass"
           :pipeline="job.pipeline"
           :selected-stage="selectedStage"
diff --git a/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue b/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue
index 56fcd8738d7..778c0cd6d65 100644
--- a/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue
+++ b/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue
@@ -90,27 +90,47 @@ export default {
 </script>
 
 <template>
-  <div class="gl-py-5 gl-display-flex gl-align-items-center">
+  <div class="gl-py-4">
     <tooltip-on-truncate :title="job.name" truncate-target="child"
-      ><h4 class="gl-my-0 gl-mr-3 gl-text-truncate" data-testid="job-name">{{ job.name }}</h4>
+      ><h4 class="gl-mt-0 gl-mb-3 gl-text-truncate" data-testid="job-name">{{ job.name }}</h4>
     </tooltip-on-truncate>
-    <div class="gl-flex-grow-1 gl-flex-shrink-0 gl-text-right">
+    <div class="gl-display-flex gl-gap-3">
       <gl-button
         v-if="restJob.erase_path"
-        v-gl-tooltip.left
+        v-gl-tooltip.bottom
         :title="$options.i18n.eraseLogButtonLabel"
         :aria-label="$options.i18n.eraseLogButtonLabel"
         :href="restJob.erase_path"
         :data-confirm="$options.i18n.eraseLogConfirmText"
-        class="gl-mr-2"
         data-testid="job-log-erase-link"
         data-confirm-btn-variant="danger"
         data-method="post"
         icon="remove"
       />
+      <gl-button
+        v-if="restJob.new_issue_path"
+        v-gl-tooltip.bottom
+        :href="restJob.new_issue_path"
+        :title="$options.i18n.newIssue"
+        :aria-label="$options.i18n.newIssue"
+        category="secondary"
+        variant="confirm"
+        data-testid="job-new-issue"
+        icon="issue-new"
+      />
+      <gl-button
+        v-if="restJob.terminal_path"
+        v-gl-tooltip.bottom
+        :href="restJob.terminal_path"
+        :title="$options.i18n.debug"
+        :aria-label="$options.i18n.debug"
+        target="_blank"
+        icon="external-link"
+        data-testid="terminal-link"
+      />
       <job-sidebar-retry-button
         v-if="canShowJobRetryButton"
-        v-gl-tooltip.left
+        v-gl-tooltip.bottom
         :title="buttonTitle"
         :aria-label="buttonTitle"
         :is-manual-job="isManualJob"
@@ -124,7 +144,7 @@ export default {
       />
       <gl-button
         v-if="restJob.cancel_path"
-        v-gl-tooltip.left
+        v-gl-tooltip.bottom
         :title="$options.i18n.cancelJobButtonLabel"
         :aria-label="$options.i18n.cancelJobButtonLabel"
         :href="restJob.cancel_path"
diff --git a/app/assets/javascripts/notes/components/sidebar_subscription.vue b/app/assets/javascripts/notes/components/sidebar_subscription.vue
index f60a17eb36b..c02c7a57dfa 100644
--- a/app/assets/javascripts/notes/components/sidebar_subscription.vue
+++ b/app/assets/javascripts/notes/components/sidebar_subscription.vue
@@ -3,7 +3,7 @@
 import { mapActions } from 'vuex';
 import { TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants';
 import { fetchPolicies } from '~/lib/graphql';
-import { confidentialityQueries } from '~/sidebar/constants';
+import { confidentialityQueries } from '~/sidebar/queries/constants';
 import { defaultClient as gqlClient } from '~/graphql_shared/issuable_client';
 
 export default {
diff --git a/app/assets/javascripts/sentry/init_sentry.js b/app/assets/javascripts/sentry/init_sentry.js
index 6075c960668..d3b75a4aa8c 100644
--- a/app/assets/javascripts/sentry/init_sentry.js
+++ b/app/assets/javascripts/sentry/init_sentry.js
@@ -1,4 +1,4 @@
-import * as Sentry from 'sentrybrowser7';
+import * as Sentry from 'sentrybrowser';
 
 const initSentry = function index() {
   if (!gon?.sentry_dsn) {
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue
index 319699b88f3..cf77a5ca82c 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue
@@ -1,6 +1,6 @@
 <script>
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { assigneesQueries } from '../../constants';
+import { assigneesQueries } from '../../queries/constants';
 
 export default {
   subscription: null,
diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue
index ae81dcb95de..4ff12824008 100644
--- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue
@@ -6,7 +6,7 @@ import { TYPE_ALERT, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
 import { __, n__ } from '~/locale';
 import UserSelect from '~/vue_shared/components/user_select/user_select.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import { assigneesQueries } from '../../constants';
+import { assigneesQueries } from '../../queries/constants';
 import SidebarEditableItem from '../sidebar_editable_item.vue';
 import SidebarAssigneesRealtime from './assignees_realtime.vue';
 import IssuableAssignees from './issuable_assignees.vue';
diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue
index 3038cec03eb..96d72e9545e 100644
--- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue
@@ -3,7 +3,7 @@ import { GlSprintf, GlButton } from '@gitlab/ui';
 import { createAlert } from '~/alert';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { __, sprintf } from '~/locale';
-import { confidentialityQueries } from '../../constants';
+import { confidentialityQueries } from '../../queries/constants';
 
 export default {
   i18n: {
diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue
index 9177baec246..295d37671cc 100644
--- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue
@@ -3,7 +3,8 @@ import produce from 'immer';
 import Vue from 'vue';
 import { createAlert } from '~/alert';
 import { __, sprintf } from '~/locale';
-import { confidentialityQueries, Tracking } from '../../constants';
+import { Tracking } from '../../constants';
+import { confidentialityQueries } from '../../queries/constants';
 import SidebarEditableItem from '../sidebar_editable_item.vue';
 import SidebarConfidentialityContent from './sidebar_confidentiality_content.vue';
 import SidebarConfidentialityForm from './sidebar_confidentiality_form.vue';
diff --git a/app/assets/javascripts/sidebar/components/copy/sidebar_reference_widget.vue b/app/assets/javascripts/sidebar/components/copy/sidebar_reference_widget.vue
index 3287539e502..7a488bb379f 100644
--- a/app/assets/javascripts/sidebar/components/copy/sidebar_reference_widget.vue
+++ b/app/assets/javascripts/sidebar/components/copy/sidebar_reference_widget.vue
@@ -1,6 +1,6 @@
 <script>
 import { __ } from '~/locale';
-import { referenceQueries } from '../../constants';
+import { referenceQueries } from '../../queries/constants';
 import CopyableField from './copyable_field.vue';
 
 export default {
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
index 5a9545f3460..89bc4b126d6 100644
--- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
+++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
@@ -4,7 +4,8 @@ import { createAlert } from '~/alert';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility';
 import { __, sprintf } from '~/locale';
-import { dateFields, dateTypes, dueDateQueries, startDateQueries, Tracking } from '../../constants';
+import { dateFields, dateTypes, Tracking } from '../../constants';
+import { dueDateQueries, startDateQueries } from '../../queries/constants';
 import SidebarEditableItem from '../sidebar_editable_item.vue';
 import SidebarFormattedDate from './sidebar_formatted_date.vue';
 import SidebarInheritDate from './sidebar_inherit_date.vue';
diff --git a/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue b/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue
index 6db332a82da..576043963de 100644
--- a/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue
+++ b/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue
@@ -3,11 +3,8 @@ import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
 import { createAlert } from '~/alert';
 import { logError } from '~/lib/logger';
 import EscalationStatus from 'ee_else_ce/sidebar/components/incidents/escalation_status.vue';
-import {
-  escalationStatusQuery,
-  escalationStatusMutation,
-  INCIDENTS_I18N as i18n,
-} from '../../constants';
+import { INCIDENTS_I18N as i18n } from '../../constants';
+import { escalationStatusQuery, escalationStatusMutation } from '../../queries/constants';
 import { getStatusLabel } from '../../utils';
 import SidebarEditableItem from '../sidebar_editable_item.vue';
 
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue
index 45778640957..8bbec6794ca 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue
@@ -11,7 +11,7 @@ import produce from 'immer';
 import { createAlert } from '~/alert';
 import { WORKSPACE_GROUP } from '~/issues/constants';
 import { __ } from '~/locale';
-import { workspaceLabelsQueries } from '../../../constants';
+import { workspaceLabelsQueries } from '../../../queries/constants';
 import createLabelMutation from './graphql/create_label.mutation.graphql';
 import { DEFAULT_LABEL_COLOR } from './constants';
 
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue
index d8d07b4b221..fc8834a97d4 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue
@@ -4,7 +4,7 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import { createAlert } from '~/alert';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { __ } from '~/locale';
-import { workspaceLabelsQueries } from '../../../constants';
+import { workspaceLabelsQueries } from '../../../queries/constants';
 import LabelItem from './label_item.vue';
 
 export default {
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue
index 74c3f08a47b..f9a9cc316c1 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue
@@ -7,7 +7,7 @@ import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { TYPE_EPIC, TYPE_ISSUE, TYPE_MERGE_REQUEST, TYPE_TEST_CASE } from '~/issues/constants';
 
 import { __ } from '~/locale';
-import { issuableLabelsQueries } from '../../../constants';
+import { issuableLabelsQueries } from '../../../queries/constants';
 import SidebarEditableItem from '../../sidebar_editable_item.vue';
 import { DEBOUNCE_DROPDOWN_DELAY, VARIANT_SIDEBAR } from './constants';
 import DropdownContents from './dropdown_contents.vue';
diff --git a/app/assets/javascripts/sidebar/components/participants/sidebar_participants_widget.vue b/app/assets/javascripts/sidebar/components/participants/sidebar_participants_widget.vue
index b0556e22a8d..b764d660d63 100644
--- a/app/assets/javascripts/sidebar/components/participants/sidebar_participants_widget.vue
+++ b/app/assets/javascripts/sidebar/components/participants/sidebar_participants_widget.vue
@@ -1,6 +1,6 @@
 <script>
 import { __ } from '~/locale';
-import { participantsQueries } from '../../constants';
+import { participantsQueries } from '../../queries/constants';
 import Participants from './participants.vue';
 
 export default {
diff --git a/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue b/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue
index 50b4284cde0..c9450244b40 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue
@@ -20,13 +20,13 @@ import {
   defaultEpicSort,
   dropdowni18nText,
   epicIidPattern,
-  issuableAttributesQueries,
   IssuableAttributeState,
   IssuableAttributeType,
   IssuableAttributeTypeKeyMap,
   LocalizedIssuableAttributeType,
   noAttributeId,
 } from 'ee_else_ce/sidebar/constants';
+import { issuableAttributesQueries } from 'ee_else_ce/sidebar/queries/constants';
 import { createAlert } from '~/alert';
 import { PathIdSeparator } from '~/related_issues/constants';
 
diff --git a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
index 4721c6fee61..7fde43a360d 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
@@ -11,10 +11,10 @@ import {
   dropdowni18nText,
   LocalizedIssuableAttributeType,
   IssuableAttributeTypeKeyMap,
-  issuableAttributesQueries,
   IssuableAttributeType,
   Tracking,
 } from 'ee_else_ce/sidebar/constants';
+import { issuableAttributesQueries } from 'ee_else_ce/sidebar/queries/constants';
 import SidebarDropdown from './sidebar_dropdown.vue';
 import SidebarEditableItem from './sidebar_editable_item.vue';
 
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
index d6e1847aecb..568962cddc7 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
@@ -13,7 +13,8 @@ import { isLoggedIn } from '~/lib/utils/common_utils';
 import { __, sprintf } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import toast from '~/vue_shared/plugins/global_toast';
-import { subscribedQueries, Tracking } from '../../constants';
+import { Tracking } from '../../constants';
+import { subscribedQueries } from '../../queries/constants';
 import SidebarEditableItem from '../sidebar_editable_item.vue';
 
 const ICON_ON = 'notifications';
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/report.vue b/app/assets/javascripts/sidebar/components/time_tracking/report.vue
index 70d8024f46a..9bd4c7f5c68 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/report.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/report.vue
@@ -7,7 +7,7 @@ import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { formatDate, parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility';
 import { __, s__ } from '~/locale';
-import { timelogQueries } from '../../constants';
+import { timelogQueries } from '../../queries/constants';
 import deleteTimelogMutation from '../../queries/delete_timelog.mutation.graphql';
 
 const TIME_DATE_FORMAT = 'mmmm d, yyyy, HH:MM ("UTC:" o)';
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
index 1d427a871e1..91b23689f0d 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
@@ -12,7 +12,8 @@ import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
 import { BV_SHOW_MODAL } from '~/lib/utils/constants';
 import { s__, __ } from '~/locale';
 
-import { HOW_TO_TRACK_TIME, timeTrackingQueries } from '../../constants';
+import { HOW_TO_TRACK_TIME } from '../../constants';
+import { timeTrackingQueries } from '../../queries/constants';
 import eventHub from '../../event_hub';
 import TimeTrackingCollapsedState from './collapsed_state.vue';
 import TimeTrackingComparisonPane from './comparison_pane.vue';
diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
index 551d306a9c4..1099dcb832f 100644
--- a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
@@ -6,7 +6,8 @@ import { TYPE_MERGE_REQUEST } from '~/issues/constants';
 import { __, sprintf } from '~/locale';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import Tracking from '~/tracking';
-import { todoQueries, TodoMutationTypes, todoMutations } from '../../constants';
+import { TodoMutationTypes } from '../../constants';
+import { todoQueries, todoMutations } from '../../queries/constants';
 import { todoLabel } from '../../utils';
 import TodoButton from './todo_button.vue';
 
diff --git a/app/assets/javascripts/sidebar/constants.js b/app/assets/javascripts/sidebar/constants.js
index 752d0315227..f13f613733b 100644
--- a/app/assets/javascripts/sidebar/constants.js
+++ b/app/assets/javascripts/sidebar/constants.js
@@ -1,173 +1,10 @@
 import { invert } from 'lodash';
 import { s__, __, sprintf } from '~/locale';
-import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
-import userAutocompleteQuery from '~/graphql_shared/queries/project_autocomplete_users.query.graphql';
-import userAutocompleteWithMRPermissionsQuery from '~/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql';
-import {
-  TYPE_ALERT,
-  TYPE_EPIC,
-  TYPE_ISSUE,
-  TYPE_MERGE_REQUEST,
-  TYPE_TEST_CASE,
-  WORKSPACE_GROUP,
-  WORKSPACE_PROJECT,
-} from '~/issues/constants';
-import updateAlertAssigneesMutation from '~/vue_shared/alert_details/graphql/mutations/alert_set_assignees.mutation.graphql';
-import issuableDatesUpdatedSubscription from '../graphql_shared/subscriptions/work_item_dates.subscription.graphql';
-import updateTestCaseLabelsMutation from './components/labels/labels_select_widget/graphql/update_test_case_labels.mutation.graphql';
-import epicLabelsQuery from './components/labels/labels_select_widget/graphql/epic_labels.query.graphql';
-import updateEpicLabelsMutation from './components/labels/labels_select_widget/graphql/epic_update_labels.mutation.graphql';
-import groupLabelsQuery from './components/labels/labels_select_widget/graphql/group_labels.query.graphql';
-import issueLabelsQuery from './components/labels/labels_select_widget/graphql/issue_labels.query.graphql';
-import mergeRequestLabelsQuery from './components/labels/labels_select_widget/graphql/merge_request_labels.query.graphql';
-import projectLabelsQuery from './components/labels/labels_select_widget/graphql/project_labels.query.graphql';
-import epicConfidentialQuery from './queries/epic_confidential.query.graphql';
-import epicDueDateQuery from './queries/epic_due_date.query.graphql';
-import epicParticipantsQuery from './queries/epic_participants.query.graphql';
-import epicReferenceQuery from './queries/epic_reference.query.graphql';
-import epicStartDateQuery from './queries/epic_start_date.query.graphql';
-import epicSubscribedQuery from './queries/epic_subscribed.query.graphql';
-import epicTodoQuery from './queries/epic_todo.query.graphql';
-import issuableAssigneesSubscription from './queries/issuable_assignees.subscription.graphql';
-import issueConfidentialQuery from './queries/issue_confidential.query.graphql';
-import issueDueDateQuery from './queries/issue_due_date.query.graphql';
-import issueReferenceQuery from './queries/issue_reference.query.graphql';
-import issueSubscribedQuery from './queries/issue_subscribed.query.graphql';
-import issueTimeTrackingQuery from './queries/issue_time_tracking.query.graphql';
-import issueTodoQuery from './queries/issue_todo.query.graphql';
-import mergeRequestMilestone from './queries/merge_request_milestone.query.graphql';
-import mergeRequestReferenceQuery from './queries/merge_request_reference.query.graphql';
-import mergeRequestSubscribed from './queries/merge_request_subscribed.query.graphql';
-import mergeRequestTimeTrackingQuery from './queries/merge_request_time_tracking.query.graphql';
-import mergeRequestTodoQuery from './queries/merge_request_todo.query.graphql';
-import todoCreateMutation from './queries/todo_create.mutation.graphql';
-import todoMarkDoneMutation from './queries/todo_mark_done.mutation.graphql';
-import updateEpicConfidentialMutation from './queries/update_epic_confidential.mutation.graphql';
-import updateEpicDueDateMutation from './queries/update_epic_due_date.mutation.graphql';
-import updateEpicStartDateMutation from './queries/update_epic_start_date.mutation.graphql';
-import updateEpicSubscriptionMutation from './queries/update_epic_subscription.mutation.graphql';
-import updateIssueConfidentialMutation from './queries/update_issue_confidential.mutation.graphql';
-import updateIssueDueDateMutation from './queries/update_issue_due_date.mutation.graphql';
-import updateIssueSubscriptionMutation from './queries/update_issue_subscription.mutation.graphql';
-import mergeRequestMilestoneMutation from './queries/update_merge_request_milestone.mutation.graphql';
-import updateMergeRequestLabelsMutation from './queries/update_merge_request_labels.mutation.graphql';
-import updateMergeRequestSubscriptionMutation from './queries/update_merge_request_subscription.mutation.graphql';
-import getAlertAssignees from './queries/get_alert_assignees.query.graphql';
-import getIssueAssignees from './queries/get_issue_assignees.query.graphql';
-import issueParticipantsQuery from './queries/get_issue_participants.query.graphql';
-import getIssueTimelogsQuery from './queries/get_issue_timelogs.query.graphql';
-import getMergeRequestAssignees from './queries/get_mr_assignees.query.graphql';
-import getMergeRequestParticipants from './queries/get_mr_participants.query.graphql';
-import getMrTimelogsQuery from './queries/get_mr_timelogs.query.graphql';
-import updateIssueAssigneesMutation from './queries/update_issue_assignees.mutation.graphql';
-import updateMergeRequestAssigneesMutation from './queries/update_mr_assignees.mutation.graphql';
-import getEscalationStatusQuery from './queries/escalation_status.query.graphql';
-import updateEscalationStatusMutation from './queries/update_escalation_status.mutation.graphql';
-import groupMilestonesQuery from './queries/group_milestones.query.graphql';
-import projectIssueMilestoneMutation from './queries/project_issue_milestone.mutation.graphql';
-import projectIssueMilestoneQuery from './queries/project_issue_milestone.query.graphql';
-import projectMilestonesQuery from './queries/project_milestones.query.graphql';
 
 export const defaultEpicSort = 'TITLE_ASC';
 
 export const epicIidPattern = /^&(?<iid>\d+)$/;
 
-export const assigneesQueries = {
-  [TYPE_ISSUE]: {
-    query: getIssueAssignees,
-    subscription: issuableAssigneesSubscription,
-    mutation: updateIssueAssigneesMutation,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: getMergeRequestAssignees,
-    mutation: updateMergeRequestAssigneesMutation,
-  },
-  [TYPE_ALERT]: {
-    query: getAlertAssignees,
-    mutation: updateAlertAssigneesMutation,
-  },
-};
-
-export const participantsQueries = {
-  [TYPE_ISSUE]: {
-    query: issueParticipantsQuery,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: getMergeRequestParticipants,
-  },
-  [TYPE_EPIC]: {
-    query: epicParticipantsQuery,
-  },
-  [TYPE_ALERT]: {
-    query: '',
-    skipQuery: true,
-  },
-};
-
-export const userSearchQueries = {
-  [TYPE_ISSUE]: {
-    query: userAutocompleteQuery,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: userAutocompleteWithMRPermissionsQuery,
-  },
-};
-
-export const confidentialityQueries = {
-  [TYPE_ISSUE]: {
-    query: issueConfidentialQuery,
-    mutation: updateIssueConfidentialMutation,
-  },
-  [TYPE_EPIC]: {
-    query: epicConfidentialQuery,
-    mutation: updateEpicConfidentialMutation,
-  },
-};
-
-export const referenceQueries = {
-  [TYPE_ISSUE]: {
-    query: issueReferenceQuery,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: mergeRequestReferenceQuery,
-  },
-  [TYPE_EPIC]: {
-    query: epicReferenceQuery,
-  },
-};
-
-export const workspaceLabelsQueries = {
-  [WORKSPACE_PROJECT]: {
-    query: projectLabelsQuery,
-  },
-  [WORKSPACE_GROUP]: {
-    query: groupLabelsQuery,
-  },
-};
-
-export const issuableLabelsQueries = {
-  [TYPE_ISSUE]: {
-    issuableQuery: issueLabelsQuery,
-    mutation: updateIssueLabelsMutation,
-    mutationName: 'updateIssue',
-  },
-  [TYPE_MERGE_REQUEST]: {
-    issuableQuery: mergeRequestLabelsQuery,
-    mutation: updateMergeRequestLabelsMutation,
-    mutationName: 'mergeRequestSetLabels',
-  },
-  [TYPE_EPIC]: {
-    issuableQuery: epicLabelsQuery,
-    mutation: updateEpicLabelsMutation,
-    mutationName: 'updateEpic',
-  },
-  [TYPE_TEST_CASE]: {
-    issuableQuery: issueLabelsQuery,
-    mutation: updateTestCaseLabelsMutation,
-    mutationName: 'updateTestCaseLabels',
-  },
-};
-
 export const dateTypes = {
   start: 'startDate',
   due: 'dueDate',
@@ -186,91 +23,13 @@ export const dateFields = {
   },
 };
 
-export const subscribedQueries = {
-  [TYPE_ISSUE]: {
-    query: issueSubscribedQuery,
-    mutation: updateIssueSubscriptionMutation,
-  },
-  [TYPE_EPIC]: {
-    query: epicSubscribedQuery,
-    mutation: updateEpicSubscriptionMutation,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: mergeRequestSubscribed,
-    mutation: updateMergeRequestSubscriptionMutation,
-  },
-};
-
 export const Tracking = {
   editEvent: 'click_edit_button',
   rightSidebarLabel: 'right_sidebar',
 };
 
-export const timeTrackingQueries = {
-  [TYPE_ISSUE]: {
-    query: issueTimeTrackingQuery,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: mergeRequestTimeTrackingQuery,
-  },
-};
-
-export const dueDateQueries = {
-  [TYPE_ISSUE]: {
-    query: issueDueDateQuery,
-    mutation: updateIssueDueDateMutation,
-    subscription: issuableDatesUpdatedSubscription,
-  },
-  [TYPE_EPIC]: {
-    query: epicDueDateQuery,
-    mutation: updateEpicDueDateMutation,
-  },
-};
-
-export const startDateQueries = {
-  [TYPE_EPIC]: {
-    query: epicStartDateQuery,
-    mutation: updateEpicStartDateMutation,
-  },
-};
-
-export const timelogQueries = {
-  [TYPE_ISSUE]: {
-    query: getIssueTimelogsQuery,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: getMrTimelogsQuery,
-  },
-};
-
 export const noAttributeId = null;
 
-export const issuableMilestoneQueries = {
-  [TYPE_ISSUE]: {
-    query: projectIssueMilestoneQuery,
-    mutation: projectIssueMilestoneMutation,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: mergeRequestMilestone,
-    mutation: mergeRequestMilestoneMutation,
-  },
-};
-
-export const milestonesQueries = {
-  [TYPE_ISSUE]: {
-    query: {
-      [WORKSPACE_GROUP]: groupMilestonesQuery,
-      [WORKSPACE_PROJECT]: projectMilestonesQuery,
-    },
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: {
-      [WORKSPACE_GROUP]: groupMilestonesQuery,
-      [WORKSPACE_PROJECT]: projectMilestonesQuery,
-    },
-  },
-};
-
 export const IssuableAttributeType = {
   Milestone: 'milestone',
 };
@@ -285,35 +44,11 @@ export const IssuableAttributeState = {
   [IssuableAttributeType.Milestone]: 'active',
 };
 
-export const issuableAttributesQueries = {
-  [IssuableAttributeType.Milestone]: {
-    current: issuableMilestoneQueries,
-    list: milestonesQueries,
-  },
-};
-
-export const todoQueries = {
-  [TYPE_EPIC]: {
-    query: epicTodoQuery,
-  },
-  [TYPE_ISSUE]: {
-    query: issueTodoQuery,
-  },
-  [TYPE_MERGE_REQUEST]: {
-    query: mergeRequestTodoQuery,
-  },
-};
-
 export const TodoMutationTypes = {
   Create: 'create',
   MarkDone: 'mark-done',
 };
 
-export const todoMutations = {
-  [TodoMutationTypes.Create]: todoCreateMutation,
-  [TodoMutationTypes.MarkDone]: todoMarkDoneMutation,
-};
-
 export function dropdowni18nText(issuableAttribute, issuableType) {
   return {
     noAttribute: sprintf(s__('DropdownWidget|No %{issuableAttribute}'), {
@@ -362,9 +97,6 @@ export function dropdowni18nText(issuableAttribute, issuableType) {
   };
 }
 
-export const escalationStatusQuery = getEscalationStatusQuery;
-export const escalationStatusMutation = updateEscalationStatusMutation;
-
 export const HOW_TO_TRACK_TIME = __('How to track time');
 
 export const statusDropdownOptions = [
diff --git a/app/assets/javascripts/sidebar/queries/constants.js b/app/assets/javascripts/sidebar/queries/constants.js
new file mode 100644
index 00000000000..9f71091b8fc
--- /dev/null
+++ b/app/assets/javascripts/sidebar/queries/constants.js
@@ -0,0 +1,270 @@
+import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
+import userAutocompleteQuery from '~/graphql_shared/queries/project_autocomplete_users.query.graphql';
+import userAutocompleteWithMRPermissionsQuery from '~/graphql_shared/queries/project_autocomplete_users_with_mr_permissions.query.graphql';
+import issuableDatesUpdatedSubscription from '~/graphql_shared/subscriptions/work_item_dates.subscription.graphql';
+import {
+  TYPE_ALERT,
+  TYPE_EPIC,
+  TYPE_ISSUE,
+  TYPE_MERGE_REQUEST,
+  TYPE_TEST_CASE,
+  WORKSPACE_GROUP,
+  WORKSPACE_PROJECT,
+} from '~/issues/constants';
+import updateAlertAssigneesMutation from '~/vue_shared/alert_details/graphql/mutations/alert_set_assignees.mutation.graphql';
+import updateTestCaseLabelsMutation from '../components/labels/labels_select_widget/graphql/update_test_case_labels.mutation.graphql';
+import epicLabelsQuery from '../components/labels/labels_select_widget/graphql/epic_labels.query.graphql';
+import updateEpicLabelsMutation from '../components/labels/labels_select_widget/graphql/epic_update_labels.mutation.graphql';
+import groupLabelsQuery from '../components/labels/labels_select_widget/graphql/group_labels.query.graphql';
+import issueLabelsQuery from '../components/labels/labels_select_widget/graphql/issue_labels.query.graphql';
+import mergeRequestLabelsQuery from '../components/labels/labels_select_widget/graphql/merge_request_labels.query.graphql';
+import projectLabelsQuery from '../components/labels/labels_select_widget/graphql/project_labels.query.graphql';
+import { IssuableAttributeType, TodoMutationTypes } from '../constants';
+import epicConfidentialQuery from './epic_confidential.query.graphql';
+import epicDueDateQuery from './epic_due_date.query.graphql';
+import epicParticipantsQuery from './epic_participants.query.graphql';
+import epicReferenceQuery from './epic_reference.query.graphql';
+import epicStartDateQuery from './epic_start_date.query.graphql';
+import epicSubscribedQuery from './epic_subscribed.query.graphql';
+import epicTodoQuery from './epic_todo.query.graphql';
+import issuableAssigneesSubscription from './issuable_assignees.subscription.graphql';
+import issueConfidentialQuery from './issue_confidential.query.graphql';
+import issueDueDateQuery from './issue_due_date.query.graphql';
+import issueReferenceQuery from './issue_reference.query.graphql';
+import issueSubscribedQuery from './issue_subscribed.query.graphql';
+import issueTimeTrackingQuery from './issue_time_tracking.query.graphql';
+import issueTodoQuery from './issue_todo.query.graphql';
+import mergeRequestMilestone from './merge_request_milestone.query.graphql';
+import mergeRequestReferenceQuery from './merge_request_reference.query.graphql';
+import mergeRequestSubscribed from './merge_request_subscribed.query.graphql';
+import mergeRequestTimeTrackingQuery from './merge_request_time_tracking.query.graphql';
+import mergeRequestTodoQuery from './merge_request_todo.query.graphql';
+import todoCreateMutation from './todo_create.mutation.graphql';
+import todoMarkDoneMutation from './todo_mark_done.mutation.graphql';
+import updateEpicConfidentialMutation from './update_epic_confidential.mutation.graphql';
+import updateEpicDueDateMutation from './update_epic_due_date.mutation.graphql';
+import updateEpicStartDateMutation from './update_epic_start_date.mutation.graphql';
+import updateEpicSubscriptionMutation from './update_epic_subscription.mutation.graphql';
+import updateIssueConfidentialMutation from './update_issue_confidential.mutation.graphql';
+import updateIssueDueDateMutation from './update_issue_due_date.mutation.graphql';
+import updateIssueSubscriptionMutation from './update_issue_subscription.mutation.graphql';
+import mergeRequestMilestoneMutation from './update_merge_request_milestone.mutation.graphql';
+import updateMergeRequestLabelsMutation from './update_merge_request_labels.mutation.graphql';
+import updateMergeRequestSubscriptionMutation from './update_merge_request_subscription.mutation.graphql';
+import getAlertAssignees from './get_alert_assignees.query.graphql';
+import getIssueAssignees from './get_issue_assignees.query.graphql';
+import issueParticipantsQuery from './get_issue_participants.query.graphql';
+import getIssueTimelogsQuery from './get_issue_timelogs.query.graphql';
+import getMergeRequestAssignees from './get_mr_assignees.query.graphql';
+import getMergeRequestParticipants from './get_mr_participants.query.graphql';
+import getMrTimelogsQuery from './get_mr_timelogs.query.graphql';
+import updateIssueAssigneesMutation from './update_issue_assignees.mutation.graphql';
+import updateMergeRequestAssigneesMutation from './update_mr_assignees.mutation.graphql';
+import getEscalationStatusQuery from './escalation_status.query.graphql';
+import updateEscalationStatusMutation from './update_escalation_status.mutation.graphql';
+import groupMilestonesQuery from './group_milestones.query.graphql';
+import projectIssueMilestoneMutation from './project_issue_milestone.mutation.graphql';
+import projectIssueMilestoneQuery from './project_issue_milestone.query.graphql';
+import projectMilestonesQuery from './project_milestones.query.graphql';
+
+export const assigneesQueries = {
+  [TYPE_ISSUE]: {
+    query: getIssueAssignees,
+    subscription: issuableAssigneesSubscription,
+    mutation: updateIssueAssigneesMutation,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: getMergeRequestAssignees,
+    mutation: updateMergeRequestAssigneesMutation,
+  },
+  [TYPE_ALERT]: {
+    query: getAlertAssignees,
+    mutation: updateAlertAssigneesMutation,
+  },
+};
+
+export const participantsQueries = {
+  [TYPE_ISSUE]: {
+    query: issueParticipantsQuery,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: getMergeRequestParticipants,
+  },
+  [TYPE_EPIC]: {
+    query: epicParticipantsQuery,
+  },
+  [TYPE_ALERT]: {
+    query: '',
+    skipQuery: true,
+  },
+};
+
+export const userSearchQueries = {
+  [TYPE_ISSUE]: {
+    query: userAutocompleteQuery,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: userAutocompleteWithMRPermissionsQuery,
+  },
+};
+
+export const confidentialityQueries = {
+  [TYPE_ISSUE]: {
+    query: issueConfidentialQuery,
+    mutation: updateIssueConfidentialMutation,
+  },
+  [TYPE_EPIC]: {
+    query: epicConfidentialQuery,
+    mutation: updateEpicConfidentialMutation,
+  },
+};
+
+export const referenceQueries = {
+  [TYPE_ISSUE]: {
+    query: issueReferenceQuery,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: mergeRequestReferenceQuery,
+  },
+  [TYPE_EPIC]: {
+    query: epicReferenceQuery,
+  },
+};
+
+export const workspaceLabelsQueries = {
+  [WORKSPACE_PROJECT]: {
+    query: projectLabelsQuery,
+  },
+  [WORKSPACE_GROUP]: {
+    query: groupLabelsQuery,
+  },
+};
+
+export const issuableLabelsQueries = {
+  [TYPE_ISSUE]: {
+    issuableQuery: issueLabelsQuery,
+    mutation: updateIssueLabelsMutation,
+    mutationName: 'updateIssue',
+  },
+  [TYPE_MERGE_REQUEST]: {
+    issuableQuery: mergeRequestLabelsQuery,
+    mutation: updateMergeRequestLabelsMutation,
+    mutationName: 'mergeRequestSetLabels',
+  },
+  [TYPE_EPIC]: {
+    issuableQuery: epicLabelsQuery,
+    mutation: updateEpicLabelsMutation,
+    mutationName: 'updateEpic',
+  },
+  [TYPE_TEST_CASE]: {
+    issuableQuery: issueLabelsQuery,
+    mutation: updateTestCaseLabelsMutation,
+    mutationName: 'updateTestCaseLabels',
+  },
+};
+
+export const subscribedQueries = {
+  [TYPE_ISSUE]: {
+    query: issueSubscribedQuery,
+    mutation: updateIssueSubscriptionMutation,
+  },
+  [TYPE_EPIC]: {
+    query: epicSubscribedQuery,
+    mutation: updateEpicSubscriptionMutation,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: mergeRequestSubscribed,
+    mutation: updateMergeRequestSubscriptionMutation,
+  },
+};
+
+export const timeTrackingQueries = {
+  [TYPE_ISSUE]: {
+    query: issueTimeTrackingQuery,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: mergeRequestTimeTrackingQuery,
+  },
+};
+
+export const dueDateQueries = {
+  [TYPE_ISSUE]: {
+    query: issueDueDateQuery,
+    mutation: updateIssueDueDateMutation,
+    subscription: issuableDatesUpdatedSubscription,
+  },
+  [TYPE_EPIC]: {
+    query: epicDueDateQuery,
+    mutation: updateEpicDueDateMutation,
+  },
+};
+
+export const startDateQueries = {
+  [TYPE_EPIC]: {
+    query: epicStartDateQuery,
+    mutation: updateEpicStartDateMutation,
+  },
+};
+
+export const timelogQueries = {
+  [TYPE_ISSUE]: {
+    query: getIssueTimelogsQuery,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: getMrTimelogsQuery,
+  },
+};
+
+export const issuableMilestoneQueries = {
+  [TYPE_ISSUE]: {
+    query: projectIssueMilestoneQuery,
+    mutation: projectIssueMilestoneMutation,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: mergeRequestMilestone,
+    mutation: mergeRequestMilestoneMutation,
+  },
+};
+
+export const milestonesQueries = {
+  [TYPE_ISSUE]: {
+    query: {
+      [WORKSPACE_GROUP]: groupMilestonesQuery,
+      [WORKSPACE_PROJECT]: projectMilestonesQuery,
+    },
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: {
+      [WORKSPACE_GROUP]: groupMilestonesQuery,
+      [WORKSPACE_PROJECT]: projectMilestonesQuery,
+    },
+  },
+};
+
+export const issuableAttributesQueries = {
+  [IssuableAttributeType.Milestone]: {
+    current: issuableMilestoneQueries,
+    list: milestonesQueries,
+  },
+};
+
+export const todoQueries = {
+  [TYPE_EPIC]: {
+    query: epicTodoQuery,
+  },
+  [TYPE_ISSUE]: {
+    query: issueTodoQuery,
+  },
+  [TYPE_MERGE_REQUEST]: {
+    query: mergeRequestTodoQuery,
+  },
+};
+
+export const todoMutations = {
+  [TodoMutationTypes.Create]: todoCreateMutation,
+  [TodoMutationTypes.MarkDone]: todoMarkDoneMutation,
+};
+
+export const escalationStatusQuery = getEscalationStatusQuery;
+
+export const escalationStatusMutation = updateEscalationStatusMutation;
diff --git a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
index 1e79d2cdcd7..863c43b0e55 100644
--- a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
+++ b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
@@ -13,7 +13,7 @@ import { __ } from '~/locale';
 import SidebarParticipant from '~/sidebar/components/assignees/sidebar_participant.vue';
 import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
-import { participantsQueries, userSearchQueries } from '~/sidebar/constants';
+import { participantsQueries, userSearchQueries } from '~/sidebar/queries/constants';
 import { TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 
diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb
index 6bb807be1c4..cf0b6cd815a 100644
--- a/app/controllers/groups/boards_controller.rb
+++ b/app/controllers/groups/boards_controller.rb
@@ -8,6 +8,7 @@ class Groups::BoardsController < Groups::ApplicationController
   before_action do
     push_frontend_feature_flag(:board_multi_select, group)
     push_frontend_feature_flag(:apollo_boards, group)
+    push_frontend_feature_flag(:new_graphql_users_autocomplete, group)
     experiment(:prominent_create_board_btn, subject: current_user) do |e|
       e.control {}
       e.candidate {}
diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb
index 84872d1e978..1c3463fb70c 100644
--- a/app/controllers/projects/boards_controller.rb
+++ b/app/controllers/projects/boards_controller.rb
@@ -8,6 +8,7 @@ class Projects::BoardsController < Projects::ApplicationController
   before_action do
     push_frontend_feature_flag(:board_multi_select, project)
     push_frontend_feature_flag(:apollo_boards, project)
+    push_frontend_feature_flag(:new_graphql_users_autocomplete, project)
     experiment(:prominent_create_board_btn, subject: current_user) do |e|
       e.control {}
       e.candidate {}
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index fe0e842f542..2231b1dd6bd 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -154,13 +154,6 @@ module Ci
 
           duration >= LOG_MAX_CREATION_THRESHOLD
         end
-
-        l.log_when do |observations|
-          pipeline_includes_count = observations['pipeline_includes_count']
-          next false unless pipeline_includes_count
-
-          pipeline_includes_count.to_i > Gitlab::Ci::Config::External::Context::TEMP_MAX_INCLUDES
-        end
       end
     end
   end
diff --git a/app/services/merge_requests/create_ref_service.rb b/app/services/merge_requests/create_ref_service.rb
index b0039cfbf69..e0f10183bac 100644
--- a/app/services/merge_requests/create_ref_service.rb
+++ b/app/services/merge_requests/create_ref_service.rb
@@ -25,7 +25,9 @@ module MergeRequests
       source_sha = initial_source_sha # the SHA to be the merged result of the source (minus the merge commit)
       expected_old_oid = ""           # the SHA we expect target_ref to be at prior to an update (an optimistic lock)
 
-      return ServiceResponse.error(message: 'Invalid merge source') unless first_parent_sha.present?
+      # TODO: Update this message with the removal of FF merge_trains_create_ref_service and update tests
+      # This is for compatibility with MergeToRefService during the rollout.
+      return ServiceResponse.error(message: '3:Invalid merge source') unless first_parent_sha.present?
 
       commit_sha, source_sha, expected_old_oid = maybe_squash!(commit_sha, source_sha, expected_old_oid)
       commit_sha, source_sha, expected_old_oid = maybe_rebase!(commit_sha, source_sha, expected_old_oid)