diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 840efa82a2b..e76e33b35a3 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -160,7 +160,6 @@ RSpec/ContextWording:
     - 'ee/spec/features/projects/settings/push_rules_settings_spec.rb'
     - 'ee/spec/features/promotion_spec.rb'
     - 'ee/spec/features/protected_branches_spec.rb'
-    - 'ee/spec/features/signup_spec.rb'
     - 'ee/spec/features/users/login_spec.rb'
     - 'ee/spec/features/users/signup_spec.rb'
     - 'ee/spec/finders/approval_rules/group_finder_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml
index 4dc66e07f61..eefc37a3070 100644
--- a/.rubocop_todo/rspec/expect_in_hook.yml
+++ b/.rubocop_todo/rspec/expect_in_hook.yml
@@ -12,7 +12,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/features/projects/feature_flags/user_creates_feature_flag_spec.rb'
     - 'ee/spec/features/projects/feature_flags/user_deletes_feature_flag_spec.rb'
     - 'ee/spec/features/projects/settings/ee/service_desk_setting_spec.rb'
-    - 'ee/spec/features/signup_spec.rb'
     - 'ee/spec/finders/license_template_finder_spec.rb'
     - 'ee/spec/finders/projects/integrations/jira/issues_finder_spec.rb'
     - 'ee/spec/finders/template_finder_spec.rb'
diff --git a/app/assets/javascripts/ci/job_details/components/log/line.vue b/app/assets/javascripts/ci/job_details/components/log/line.vue
index eba8727c939..416f75372f9 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line.vue
@@ -56,7 +56,7 @@ export default {
 
     if (window.location.hash) {
       const hash = getLocationHash();
-      const lineToMatch = `L${line.lineNumber + 1}`;
+      const lineToMatch = `L${line.lineNumber}`;
 
       if (hash === lineToMatch) {
         applyHashHighlight = true;
diff --git a/app/assets/javascripts/ci/job_details/components/log/line_header.vue b/app/assets/javascripts/ci/job_details/components/log/line_header.vue
index f2e9e09c334..658a94e6af4 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line_header.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line_header.vue
@@ -46,7 +46,7 @@ export default {
   },
   mounted() {
     const hash = getLocationHash();
-    const lineToMatch = `L${this.line.lineNumber + 1}`;
+    const lineToMatch = `L${this.line.lineNumber}`;
 
     if (hash === lineToMatch) {
       this.applyHashHighlight = true;
diff --git a/app/assets/javascripts/ci/job_details/components/log/line_number.vue b/app/assets/javascripts/ci/job_details/components/log/line_number.vue
index 7ca9154d2fe..30b4c80f3fa 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line_number.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line_number.vue
@@ -14,8 +14,7 @@ export default {
   render(h, { props }) {
     const { lineNumber, path } = props;
 
-    const parsedLineNumber = lineNumber + 1;
-    const lineId = `L${parsedLineNumber}`;
+    const lineId = `L${lineNumber}`;
     const lineHref = `${path}#${lineId}`;
 
     return h(
@@ -27,7 +26,7 @@ export default {
           href: lineHref,
         },
       },
-      parsedLineNumber,
+      lineNumber,
     );
   },
 };
diff --git a/app/assets/javascripts/ci/job_details/store/utils.js b/app/assets/javascripts/ci/job_details/store/utils.js
index ccd04d52e30..b18a3fa162d 100644
--- a/app/assets/javascripts/ci/job_details/store/utils.js
+++ b/app/assets/javascripts/ci/job_details/store/utils.js
@@ -19,20 +19,17 @@ export const parseLine = (line = {}, lineNumber) => ({
  * @param Number lineNumber
  */
 export const parseHeaderLine = (line = {}, lineNumber, hash) => {
+  let isClosed = parseBoolean(line.section_options?.collapsed);
+
   // if a hash is present in the URL then we ensure
   // all sections are visible so we can scroll to the hash
   // in the DOM
   if (hash) {
-    return {
-      isClosed: false,
-      isHeader: true,
-      line: parseLine(line, lineNumber),
-      lines: [],
-    };
+    isClosed = false;
   }
 
   return {
-    isClosed: parseBoolean(line.section_options?.collapsed),
+    isClosed,
     isHeader: true,
     line: parseLine(line, lineNumber),
     lines: [],
@@ -80,27 +77,28 @@ export const isCollapsibleSection = (acc = [], last = {}, section = {}) =>
   section.section === last.line.section;
 
 /**
- * Returns the lineNumber of the last line in
- * a parsed log
+ * Returns the next line number in the parsed log
  *
  * @param Array acc
  * @returns Number
  */
-export const getIncrementalLineNumber = (acc) => {
-  let lineNumberValue;
-  const lastIndex = acc.length - 1;
-  const lastElement = acc[lastIndex];
+export const getNextLineNumber = (acc) => {
+  if (!acc?.length) {
+    return 1;
+  }
+
+  const lastElement = acc[acc.length - 1];
   const nestedLines = lastElement.lines;
 
   if (lastElement.isHeader && !nestedLines.length && lastElement.line) {
-    lineNumberValue = lastElement.line.lineNumber;
-  } else if (lastElement.isHeader && nestedLines.length) {
-    lineNumberValue = nestedLines[nestedLines.length - 1].lineNumber;
-  } else {
-    lineNumberValue = lastElement.lineNumber;
+    return lastElement.line.lineNumber + 1;
   }
 
-  return lineNumberValue === 0 ? 1 : lineNumberValue + 1;
+  if (lastElement.isHeader && nestedLines.length) {
+    return nestedLines[nestedLines.length - 1].lineNumber + 1;
+  }
+
+  return lastElement.lineNumber + 1;
 };
 
 /**
@@ -119,31 +117,28 @@ export const getIncrementalLineNumber = (acc) => {
  * @returns Array parsed log lines
  */
 export const logLinesParser = (lines = [], prevLogLines = [], hash = '') =>
-  lines.reduce(
-    (acc, line, index) => {
-      const lineNumber = acc.length > 0 ? getIncrementalLineNumber(acc) : index;
+  lines.reduce((acc, line) => {
+    const lineNumber = getNextLineNumber(acc);
 
-      const last = acc[acc.length - 1];
+    const last = acc[acc.length - 1];
 
-      // If the object is an header, we parse it into another structure
-      if (line.section_header) {
-        acc.push(parseHeaderLine(line, lineNumber, hash));
-      } else if (isCollapsibleSection(acc, last, line)) {
-        // if the object belongs to a nested section, we append it to the new `lines` array of the
-        // previously formatted header
-        last.lines.push(parseLine(line, lineNumber));
-      } else if (line.section_duration) {
-        // if the line has section_duration, we look for the correct header to add it
-        addDurationToHeader(acc, line);
-      } else {
-        // otherwise it's a regular line
-        acc.push(parseLine(line, lineNumber));
-      }
+    // If the object is an header, we parse it into another structure
+    if (line.section_header) {
+      acc.push(parseHeaderLine(line, lineNumber, hash));
+    } else if (isCollapsibleSection(acc, last, line)) {
+      // if the object belongs to a nested section, we append it to the new `lines` array of the
+      // previously formatted header
+      last.lines.push(parseLine(line, lineNumber));
+    } else if (line.section_duration) {
+      // if the line has section_duration, we look for the correct header to add it
+      addDurationToHeader(acc, line);
+    } else {
+      // otherwise it's a regular line
+      acc.push(parseLine(line, lineNumber));
+    }
 
-      return acc;
-    },
-    [...prevLogLines],
-  );
+    return acc;
+  }, prevLogLines);
 
 /**
  * Finds the repeated offset, removes the old one
diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue
index acbba216601..5735a518a3e 100644
--- a/app/assets/javascripts/issues/show/components/description.vue
+++ b/app/assets/javascripts/issues/show/components/description.vue
@@ -362,7 +362,12 @@ export default {
             },
           },
           update: (cache, { data: { workItemCreate } }) =>
-            addHierarchyChild(cache, this.fullPath, String(this.issueIid), workItemCreate.workItem),
+            addHierarchyChild({
+              cache,
+              fullPath: this.fullPath,
+              iid: String(this.issueIid),
+              workItem: workItemCreate.workItem,
+            }),
         });
 
         const { workItem, errors } = data.workItemCreate;
@@ -392,7 +397,12 @@ export default {
           mutation: deleteWorkItemMutation,
           variables: { input: { id } },
           update: (cache) =>
-            removeHierarchyChild(cache, this.fullPath, String(this.issueIid), { id }),
+            removeHierarchyChild({
+              cache,
+              fullPath: this.fullPath,
+              iid: String(this.issueIid),
+              workItem: { id },
+            }),
         });
 
         if (data.workItemDelete.errors?.length) {
diff --git a/app/assets/javascripts/jira_connect/subscriptions/constants.js b/app/assets/javascripts/jira_connect/subscriptions/constants.js
index 72fd25a6230..1a10360ed30 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/constants.js
+++ b/app/assets/javascripts/jira_connect/subscriptions/constants.js
@@ -37,11 +37,11 @@ export const I18N_OAUTH_FAILED_MESSAGE = s__(
 export const INTEGRATIONS_DOC_LINK = helpPagePath('integration/jira/development_panel', {
   anchor: 'use-the-integration',
 });
-export const OAUTH_SELF_MANAGED_DOC_LINK = helpPagePath('integration/jira/connect-app', {
-  anchor: 'connect-the-gitlab-for-jira-cloud-app-for-self-managed-instances',
+export const OAUTH_SELF_MANAGED_DOC_LINK = helpPagePath('administration/settings/jira_cloud_app', {
+  anchor: 'set-up-oauth-authentication',
 });
-export const FAILED_TO_UPDATE_DOC_LINK = helpPagePath('integration/jira/connect-app', {
-  anchor: 'failed-to-update-the-gitlab-instance-for-self-managed-instances',
+export const FAILED_TO_UPDATE_DOC_LINK = helpPagePath('administration/settings/jira_cloud_app', {
+  anchor: 'failed-to-update-the-gitlab-instance',
 });
 
 export const GITLAB_COM_BASE_PATH = 'https://gitlab.com';
diff --git a/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue b/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue
index 920febb0e67..68bfb99a139 100644
--- a/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue
+++ b/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue
@@ -77,7 +77,7 @@ export default {
 
 <template>
   <gl-disclosure-dropdown-item
-    data-qa-selector="delete_member_dropdown_item"
+    data-testid="delete-member-dropdown-item"
     @action="showRemoveMemberModal(modalData)"
   >
     <template #list-item>
diff --git a/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue b/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue
index 25dc4831b11..a8c97060915 100644
--- a/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue
+++ b/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue
@@ -109,7 +109,6 @@ export default {
     no-caret
     placement="right"
     data-testid="user-action-dropdown"
-    data-qa-selector="user_action_dropdown"
   >
     <disable-two-factor-dropdown-item
       v-if="permissions.canDisableTwoFactor"
diff --git a/app/assets/javascripts/pages/groups/work_items/show/index.js b/app/assets/javascripts/pages/groups/work_items/show/index.js
new file mode 100644
index 00000000000..c091fbcc2b2
--- /dev/null
+++ b/app/assets/javascripts/pages/groups/work_items/show/index.js
@@ -0,0 +1,4 @@
+import { WORKSPACE_GROUP } from '~/issues/constants';
+import { initWorkItemsRoot } from '~/work_items';
+
+initWorkItemsRoot(WORKSPACE_GROUP);
diff --git a/app/assets/javascripts/pages/projects/work_items/index.js b/app/assets/javascripts/pages/projects/work_items/index.js
index 11c257611f0..b44ca708b28 100644
--- a/app/assets/javascripts/pages/projects/work_items/index.js
+++ b/app/assets/javascripts/pages/projects/work_items/index.js
@@ -1,3 +1,3 @@
-import { initWorkItemsRoot } from '~/work_items/index';
+import { initWorkItemsRoot } from '~/work_items';
 
 initWorkItemsRoot();
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index 557e9cd168f..3da7daa3eec 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -118,7 +118,7 @@ export default {
         class="table tree-table"
         :class="{ 'gl-table-layout-fixed': !showParentRow }"
         aria-live="polite"
-        data-qa-selector="file_tree_table"
+        data-testid="file-tree-table"
       >
         <table-header v-once />
         <tbody>
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index a76d822317a..526757e6147 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -219,7 +219,7 @@ export default {
           'is-submodule': isSubmodule,
         }"
         class="tree-item-link str-truncated"
-        data-qa-selector="file_name_link"
+        data-testid="file-name-link"
       >
         <file-icon
           :file-name="fullPath"
diff --git a/app/assets/javascripts/super_sidebar/components/user_name_group.vue b/app/assets/javascripts/super_sidebar/components/user_name_group.vue
index 3c8059387fa..c9971639e74 100644
--- a/app/assets/javascripts/super_sidebar/components/user_name_group.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_name_group.vue
@@ -41,7 +41,7 @@ export default {
         item.extraAttrs = {
           ...USER_MENU_TRACKING_DEFAULTS,
           'data-track-label': 'user_profile',
-          'data-testid': 'user_profile_link',
+          'data-testid': 'user-profile-link',
         };
       }
 
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
index a17fa691404..f39a12bb6f9 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
@@ -5,6 +5,7 @@ import { ASC } from '~/notes/constants';
 import { __ } from '~/locale';
 import { clearDraft } from '~/lib/utils/autosave';
 import createNoteMutation from '../../graphql/notes/create_work_item_note.mutation.graphql';
+import groupWorkItemByIidQuery from '../../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../../graphql/work_item_by_iid.query.graphql';
 import { TRACKING_CATEGORY_SHOW, i18n } from '../../constants';
 import WorkItemNoteSignedOut from './work_item_note_signed_out.vue';
@@ -21,7 +22,7 @@ export default {
     WorkItemCommentForm,
   },
   mixins: [Tracking.mixin()],
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -90,7 +91,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_note.vue
index b5e3ea68725..0c1dac60bba 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_note.vue
@@ -3,7 +3,6 @@ import { GlAvatarLink, GlAvatar } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import toast from '~/vue_shared/plugins/global_toast';
 import { __ } from '~/locale';
-import { i18n, TRACKING_CATEGORY_SHOW } from '~/work_items/constants';
 import Tracking from '~/tracking';
 import { updateDraft, clearDraft } from '~/lib/utils/autosave';
 import { renderMarkdown } from '~/notes/utils';
@@ -11,15 +10,17 @@ import { getLocationHash } from '~/lib/utils/url_utility';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import EditedAt from '~/issues/show/components/edited.vue';
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
-import NoteBody from '~/work_items/components/notes/work_item_note_body.vue';
 import NoteHeader from '~/notes/components/note_header.vue';
-import NoteActions from '~/work_items/components/notes/work_item_note_actions.vue';
-import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
+import { i18n, TRACKING_CATEGORY_SHOW } from '../../constants';
+import groupWorkItemByIidQuery from '../../graphql/group_work_item_by_iid.query.graphql';
+import updateWorkItemMutation from '../../graphql/update_work_item.mutation.graphql';
 import updateWorkItemNoteMutation from '../../graphql/notes/update_work_item_note.mutation.graphql';
 import workItemByIidQuery from '../../graphql/work_item_by_iid.query.graphql';
 import { isAssigneesWidget } from '../../utils';
 import WorkItemCommentForm from './work_item_comment_form.vue';
+import NoteActions from './work_item_note_actions.vue';
 import WorkItemNoteAwardsList from './work_item_note_awards_list.vue';
+import NoteBody from './work_item_note_body.vue';
 
 export default {
   name: 'WorkItemNoteThread',
@@ -35,7 +36,7 @@ export default {
     EditedAt,
   },
   mixins: [Tracking.mixin()],
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -169,7 +170,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue
index 18aa4d55086..b19236e5961 100644
--- a/app/assets/javascripts/work_items/components/work_item_actions.vue
+++ b/app/assets/javascripts/work_items/components/work_item_actions.vue
@@ -15,7 +15,8 @@ import { __, s__ } from '~/locale';
 import Tracking from '~/tracking';
 import toast from '~/vue_shared/plugins/global_toast';
 import { isLoggedIn } from '~/lib/utils/common_utils';
-import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
+import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
 
 import {
   sprintfWorkItem,
@@ -70,7 +71,7 @@ export default {
   copyCreateNoteEmailTestId: TEST_ID_COPY_CREATE_NOTE_EMAIL_ACTION,
   deleteActionTestId: TEST_ID_DELETE_ACTION,
   promoteActionTestId: TEST_ID_PROMOTE_ACTION,
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -256,7 +257,7 @@ export default {
     },
     updateWorkItemNotificationsWidgetCache({ cache, issue }) {
       const query = {
-        query: workItemByIidQuery,
+        query: this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
         variables: { fullPath: this.fullPath, iid: this.workItemIid },
       };
       // Read the work item object
diff --git a/app/assets/javascripts/work_items/components/work_item_created_updated.vue b/app/assets/javascripts/work_items/components/work_item_created_updated.vue
index 14e55134048..ac1496cbc37 100644
--- a/app/assets/javascripts/work_items/components/work_item_created_updated.vue
+++ b/app/assets/javascripts/work_items/components/work_item_created_updated.vue
@@ -3,10 +3,11 @@ import { GlAvatarLink, GlSprintf, GlLoadingIcon } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { WORKSPACE_PROJECT } from '~/issues/constants';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-import WorkItemStateBadge from '~/work_items/components/work_item_state_badge.vue';
 import ConfidentialityBadge from '~/vue_shared/components/confidentiality_badge.vue';
-import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
+import WorkItemStateBadge from './work_item_state_badge.vue';
+import WorkItemTypeIcon from './work_item_type_icon.vue';
 
 export default {
   components: {
@@ -18,7 +19,7 @@ export default {
     ConfidentialityBadge,
     GlLoadingIcon,
   },
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemIid: {
       type: String,
@@ -59,7 +60,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
diff --git a/app/assets/javascripts/work_items/components/work_item_description.vue b/app/assets/javascripts/work_items/components/work_item_description.vue
index 58bf524f450..b1596183f6c 100644
--- a/app/assets/javascripts/work_items/components/work_item_description.vue
+++ b/app/assets/javascripts/work_items/components/work_item_description.vue
@@ -10,6 +10,7 @@ import Tracking from '~/tracking';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
 import { autocompleteDataSources, markdownPreviewPath } from '../utils';
 import updateWorkItemMutation from '../graphql/update_work_item.mutation.graphql';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
 import { i18n, TRACKING_CATEGORY_SHOW, WIDGET_TYPE_DESCRIPTION } from '../constants';
 import WorkItemDescriptionRendered from './work_item_description_rendered.vue';
@@ -25,7 +26,7 @@ export default {
     WorkItemDescriptionRendered,
   },
   mixins: [Tracking.mixin()],
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -55,7 +56,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index 29fa60926c3..ff1b45c4b9e 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -16,7 +16,6 @@ import { getParameterByName, updateHistory, setUrlParams } from '~/lib/utils/url
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { isLoggedIn } from '~/lib/utils/common_utils';
-import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue';
 import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
 import ConfidentialityBadge from '~/vue_shared/components/confidentiality_badge.vue';
 import { WORKSPACE_PROJECT } from '~/issues/constants';
@@ -37,6 +36,7 @@ import {
 import workItemUpdatedSubscription from '../graphql/work_item_updated.subscription.graphql';
 import updateWorkItemMutation from '../graphql/update_work_item.mutation.graphql';
 import updateWorkItemTaskMutation from '../graphql/update_work_item_task.mutation.graphql';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
 import { findHierarchyWidgetChildren } from '../utils';
 
@@ -52,6 +52,7 @@ import WorkItemDetailModal from './work_item_detail_modal.vue';
 import WorkItemAwardEmoji from './work_item_award_emoji.vue';
 import WorkItemStateToggleButton from './work_item_state_toggle_button.vue';
 import WorkItemRelationships from './work_item_relationships/work_item_relationships.vue';
+import WorkItemTypeIcon from './work_item_type_icon.vue';
 
 export default {
   i18n,
@@ -84,7 +85,7 @@ export default {
     WorkItemRelationships,
   },
   mixins: [glFeatureFlagMixin()],
-  inject: ['fullPath', 'reportAbusePath'],
+  inject: ['fullPath', 'isGroup', 'reportAbusePath'],
   props: {
     isModal: {
       type: Boolean,
@@ -118,7 +119,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
@@ -189,8 +192,8 @@ export default {
     canAssignUnassignUser() {
       return this.workItemAssignees && this.canSetWorkItemMetadata;
     },
-    fullPath() {
-      return this.workItem?.project.fullPath;
+    projectFullPath() {
+      return this.workItem?.project?.fullPath;
     },
     workItemsMvc2Enabled() {
       return this.glFeatures.workItemsMvc2;
@@ -460,7 +463,7 @@ export default {
             v-if="showWorkItemCurrentUserTodos"
             :work-item-id="workItem.id"
             :work-item-iid="workItemIid"
-            :work-item-fullpath="workItem.project.fullPath"
+            :work-item-fullpath="projectFullPath"
             :current-user-todos="currentUserTodos"
             @error="updateError = $event"
           />
@@ -535,7 +538,7 @@ export default {
                   v-if="showWorkItemCurrentUserTodos"
                   :work-item-id="workItem.id"
                   :work-item-iid="workItemIid"
-                  :work-item-fullpath="workItem.project.fullPath"
+                  :work-item-fullpath="projectFullPath"
                   :current-user-todos="currentUserTodos"
                   @error="updateError = $event"
                 />
@@ -585,7 +588,7 @@ export default {
             <work-item-award-emoji
               v-if="workItemAwardEmoji"
               :work-item-id="workItem.id"
-              :work-item-fullpath="workItem.project.fullPath"
+              :work-item-fullpath="projectFullPath"
               :award-emoji="workItemAwardEmoji.awardEmoji"
               :work-item-iid="workItemIid"
               @error="updateError = $event"
@@ -607,7 +610,7 @@ export default {
               v-if="showWorkItemLinkedItems"
               :work-item-id="workItem.id"
               :work-item-iid="workItemIid"
-              :work-item-full-path="workItem.project.fullPath"
+              :work-item-full-path="projectFullPath"
               :work-item-type="workItem.workItemType.name"
               @showModal="openInModal"
             />
diff --git a/app/assets/javascripts/work_items/components/work_item_labels.vue b/app/assets/javascripts/work_items/components/work_item_labels.vue
index 1405a12a101..c42186d1c27 100644
--- a/app/assets/javascripts/work_items/components/work_item_labels.vue
+++ b/app/assets/javascripts/work_items/components/work_item_labels.vue
@@ -8,6 +8,7 @@ import LabelItem from '~/sidebar/components/labels/labels_select_widget/label_it
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import { isScopedLabel } from '~/lib/utils/common_utils';
 import updateWorkItemMutation from '../graphql/update_work_item.mutation.graphql';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
 import { i18n, I18N_WORK_ITEM_ERROR_FETCHING_LABELS, TRACKING_CATEGORY_SHOW } from '../constants';
 import { isLabelsWidget } from '../utils';
@@ -37,7 +38,7 @@ export default {
     LabelItem,
   },
   mixins: [Tracking.mixin()],
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -65,7 +66,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
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 9d9414b5399..b74afbde44a 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
@@ -13,6 +13,7 @@ import { findHierarchyWidgets } from '../../utils';
 import { addHierarchyChild, removeHierarchyChild } from '../../graphql/cache_utils';
 import reorderWorkItem from '../../graphql/reorder_work_item.mutation.graphql';
 import updateWorkItemMutation from '../../graphql/update_work_item.mutation.graphql';
+import groupWorkItemByIidQuery from '../../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../../graphql/work_item_by_iid.query.graphql';
 import WorkItemLinkChild from './work_item_link_child.vue';
 
@@ -20,7 +21,7 @@ export default {
   components: {
     WorkItemLinkChild,
   },
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     workItemType: {
       type: String,
@@ -83,7 +84,14 @@ export default {
         const { data } = await this.$apollo.mutate({
           mutation: updateWorkItemMutation,
           variables: { input: { id: child.id, hierarchyWidget: { parentId: null } } },
-          update: (cache) => removeHierarchyChild(cache, this.fullPath, this.workItemIid, child),
+          update: (cache) =>
+            removeHierarchyChild({
+              cache,
+              fullPath: this.fullPath,
+              iid: this.workItemIid,
+              isGroup: this.isGroup,
+              workItem: child,
+            }),
         });
 
         if (data.workItemUpdate.errors.length) {
@@ -109,7 +117,14 @@ export default {
         const { data } = await this.$apollo.mutate({
           mutation: updateWorkItemMutation,
           variables: { input: { id: child.id, hierarchyWidget: { parentId: this.workItemId } } },
-          update: (cache) => addHierarchyChild(cache, this.fullPath, this.workItemIid, child),
+          update: (cache) =>
+            addHierarchyChild({
+              cache,
+              fullPath: this.fullPath,
+              iid: this.workItemIid,
+              isGroup: this.isGroup,
+              workItem: child,
+            }),
         });
 
         if (data.workItemUpdate.errors.length) {
@@ -124,7 +139,7 @@ export default {
     },
     addWorkItemQuery({ iid }) {
       this.$apollo.addSmartQuery('prefetchedWorkItem', {
-        query: workItemByIidQuery,
+        query: this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
         variables: {
           fullPath: this.fullPath,
           iid,
@@ -206,7 +221,7 @@ export default {
           update: (store) => {
             store.updateQuery(
               {
-                query: workItemByIidQuery,
+                query: this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
                 variables: { fullPath: this.fullPath, iid: this.workItemIid },
               },
               (sourceData) =>
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
index eb836007e75..c7dd7c5023d 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
@@ -18,6 +18,7 @@ import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_sel
 import { FORM_TYPES, WIDGET_ICONS, WORK_ITEM_STATUS_TEXT } from '../../constants';
 import { findHierarchyWidgetChildren } from '../../utils';
 import { removeHierarchyChild } from '../../graphql/cache_utils';
+import groupWorkItemByIidQuery from '../../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../../graphql/work_item_by_iid.query.graphql';
 import WidgetWrapper from '../widget_wrapper.vue';
 import WorkItemDetailModal from '../work_item_detail_modal.vue';
@@ -39,7 +40,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  inject: ['fullPath', 'reportAbusePath'],
+  inject: ['fullPath', 'isGroup', 'reportAbusePath'],
   props: {
     issuableId: {
       type: Number,
@@ -52,7 +53,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.fullPath,
@@ -171,7 +174,13 @@ export default {
     },
     handleWorkItemDeleted(child) {
       const { defaultClient: cache } = this.$apollo.provider.clients;
-      removeHierarchyChild(cache, this.fullPath, this.iid, child);
+      removeHierarchyChild({
+        cache,
+        fullPath: this.fullPath,
+        iid: this.iid,
+        isGroup: this.isGroup,
+        workItem: child,
+      });
       this.$toast.show(s__('WorkItem|Task deleted'));
     },
     updateWorkItemIdUrlQuery({ iid } = {}) {
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
index 456dee8dab1..2e5ba42c2e1 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
@@ -37,7 +37,7 @@ export default {
     GlTooltip,
     WorkItemTokenInput,
   },
-  inject: ['fullPath', 'hasIterationsFeature'],
+  inject: ['fullPath', 'hasIterationsFeature', 'isGroup'],
   props: {
     issuableGid: {
       type: String,
@@ -260,7 +260,13 @@ export default {
             input: this.workItemInput,
           },
           update: (cache, { data }) =>
-            addHierarchyChild(cache, this.fullPath, this.workItemIid, data.workItemCreate.workItem),
+            addHierarchyChild({
+              cache,
+              fullPath: this.fullPath,
+              iid: this.workItemIid,
+              isGroup: this.isGroup,
+              workItem: data.workItemCreate.workItem,
+            }),
         })
         .then(({ data }) => {
           if (data.workItemCreate?.errors?.length) {
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
index d32e3d3a5e5..6f02ea507e5 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
@@ -3,6 +3,7 @@ import { GlLoadingIcon, GlIcon, GlButton } from '@gitlab/ui';
 
 import { s__ } from '~/locale';
 
+import groupWorkItemByIidQuery from '../../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../../graphql/work_item_by_iid.query.graphql';
 import { WIDGET_TYPE_LINKED_ITEMS, LINKED_CATEGORIES_MAP } from '../../constants';
 
@@ -19,6 +20,7 @@ export default {
     WorkItemRelationshipList,
     WorkItemAddRelationshipForm,
   },
+  inject: ['isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -41,7 +43,9 @@ export default {
   },
   apollo: {
     workItem: {
-      query: workItemByIidQuery,
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
       variables() {
         return {
           fullPath: this.workItemFullPath,
diff --git a/app/assets/javascripts/work_items/components/work_item_todos.vue b/app/assets/javascripts/work_items/components/work_item_todos.vue
index b21abf21be5..e6d7f2067ba 100644
--- a/app/assets/javascripts/work_items/components/work_item_todos.vue
+++ b/app/assets/javascripts/work_items/components/work_item_todos.vue
@@ -4,9 +4,10 @@ import { produce } from 'immer';
 
 import { s__ } from '~/locale';
 import { updateGlobalTodoCount } from '~/sidebar/utils';
-import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
-import createWorkItemTodosMutation from '~/work_items/graphql/create_work_item_todos.mutation.graphql';
-import markDoneWorkItemTodosMutation from '~/work_items/graphql/mark_done_work_item_todos.mutation.graphql';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
+import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
+import createWorkItemTodosMutation from '../graphql/create_work_item_todos.mutation.graphql';
+import markDoneWorkItemTodosMutation from '../graphql/mark_done_work_item_todos.mutation.graphql';
 
 import {
   TODO_ADD_ICON,
@@ -28,6 +29,7 @@ export default {
     GlIcon,
     GlButton,
   },
+  inject: ['isGroup'],
   props: {
     workItemId: {
       type: String,
@@ -148,7 +150,7 @@ export default {
     },
     updateWorkItemCurrentTodosWidgetCache({ cache, todos }) {
       const query = {
-        query: workItemByIidQuery,
+        query: this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
         variables: { fullPath: this.workItemFullpath, iid: this.workItemIid },
       };
 
diff --git a/app/assets/javascripts/work_items/components/work_item_type_icon.vue b/app/assets/javascripts/work_items/components/work_item_type_icon.vue
index 5426f3965b3..76a73093206 100644
--- a/app/assets/javascripts/work_items/components/work_item_type_icon.vue
+++ b/app/assets/javascripts/work_items/components/work_item_type_icon.vue
@@ -36,6 +36,11 @@ export default {
       return this.workItemType.toUpperCase().split(' ').join('_');
     },
     iconName() {
+      // TODO Delete this conditional once we have an `issue-type-epic` icon
+      if (this.workItemIconName === 'issue-type-epic') {
+        return 'epic';
+      }
+
       return (
         this.workItemIconName ||
         WORK_ITEMS_TYPE_MAP[this.workItemTypeUppercase]?.icon ||
diff --git a/app/assets/javascripts/work_items/graphql/cache_utils.js b/app/assets/javascripts/work_items/graphql/cache_utils.js
index 14eedf5cdd8..aeeffea24e7 100644
--- a/app/assets/javascripts/work_items/graphql/cache_utils.js
+++ b/app/assets/javascripts/work_items/graphql/cache_utils.js
@@ -1,5 +1,6 @@
 import { produce } from 'immer';
 import { WIDGET_TYPE_NOTES } from '~/work_items/constants';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import { findHierarchyWidgetChildren } from '~/work_items/utils';
 
@@ -127,8 +128,11 @@ export const updateCacheAfterRemovingAwardEmojiFromNote = (currentNotes, note) =
   });
 };
 
-export const addHierarchyChild = (cache, fullPath, iid, workItem) => {
-  const queryArgs = { query: workItemByIidQuery, variables: { fullPath, iid } };
+export const addHierarchyChild = ({ cache, fullPath, iid, isGroup, workItem }) => {
+  const queryArgs = {
+    query: isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
+    variables: { fullPath, iid },
+  };
   const sourceData = cache.readQuery(queryArgs);
 
   if (!sourceData) {
@@ -143,8 +147,11 @@ export const addHierarchyChild = (cache, fullPath, iid, workItem) => {
   });
 };
 
-export const removeHierarchyChild = (cache, fullPath, iid, workItem) => {
-  const queryArgs = { query: workItemByIidQuery, variables: { fullPath, iid } };
+export const removeHierarchyChild = ({ cache, fullPath, iid, isGroup, workItem }) => {
+  const queryArgs = {
+    query: isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
+    variables: { fullPath, iid },
+  };
   const sourceData = cache.readQuery(queryArgs);
 
   if (!sourceData) {
diff --git a/app/assets/javascripts/work_items/graphql/group_work_item_by_iid.query.graphql b/app/assets/javascripts/work_items/graphql/group_work_item_by_iid.query.graphql
new file mode 100644
index 00000000000..f23bafa20c3
--- /dev/null
+++ b/app/assets/javascripts/work_items/graphql/group_work_item_by_iid.query.graphql
@@ -0,0 +1,12 @@
+#import "./work_item.fragment.graphql"
+
+query groupWorkItemByIid($fullPath: ID!, $iid: String) {
+  workspace: group(fullPath: $fullPath) @persist {
+    id
+    workItems(iid: $iid) {
+      nodes {
+        ...WorkItem
+      }
+    }
+  }
+}
diff --git a/app/assets/javascripts/work_items/index.js b/app/assets/javascripts/work_items/index.js
index 70bda7d3783..0b7f9290d6e 100644
--- a/app/assets/javascripts/work_items/index.js
+++ b/app/assets/javascripts/work_items/index.js
@@ -1,17 +1,25 @@
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
+import { WORKSPACE_GROUP } from '~/issues/constants';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { apolloProvider } from '~/graphql_shared/issuable_client';
 import App from './components/app.vue';
+import WorkItemRoot from './pages/work_item_root.vue';
 import { createRouter } from './router';
 
 Vue.use(VueApollo);
 
-export const initWorkItemsRoot = () => {
+export const initWorkItemsRoot = (workspace) => {
   const el = document.querySelector('#js-work-items');
+
+  if (!el) {
+    return undefined;
+  }
+
   const {
     fullPath,
     hasIssueWeightsFeature,
+    iid,
     issuesListPath,
     registerPath,
     signInPath,
@@ -22,6 +30,8 @@ export const initWorkItemsRoot = () => {
     reportAbusePath,
   } = el.dataset;
 
+  const Component = workspace === WORKSPACE_GROUP ? WorkItemRoot : App;
+
   return new Vue({
     el,
     name: 'WorkItemsRoot',
@@ -29,6 +39,7 @@ export const initWorkItemsRoot = () => {
     apolloProvider,
     provide: {
       fullPath,
+      isGroup: workspace === WORKSPACE_GROUP,
       hasIssueWeightsFeature: parseBoolean(hasIssueWeightsFeature),
       hasOkrsFeature: parseBoolean(hasOkrsFeature),
       issuesListPath,
@@ -40,7 +51,11 @@ export const initWorkItemsRoot = () => {
       reportAbusePath,
     },
     render(createElement) {
-      return createElement(App);
+      return createElement(Component, {
+        props: {
+          iid: workspace === WORKSPACE_GROUP ? iid : undefined,
+        },
+      });
     },
   });
 };
diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue
index b5705b21b5a..31e790254d9 100644
--- a/app/assets/javascripts/work_items/pages/create_work_item.vue
+++ b/app/assets/javascripts/work_items/pages/create_work_item.vue
@@ -10,6 +10,7 @@ import {
 } from '../constants';
 import createWorkItemMutation from '../graphql/create_work_item.mutation.graphql';
 import projectWorkItemTypesQuery from '../graphql/project_work_item_types.query.graphql';
+import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
 
 import ItemTitle from '../components/item_title.vue';
@@ -22,7 +23,7 @@ export default {
     ItemTitle,
     GlFormSelect,
   },
-  inject: ['fullPath'],
+  inject: ['fullPath', 'isGroup'],
   props: {
     initialTitle: {
       type: String,
@@ -94,7 +95,7 @@ export default {
             const { workItem } = workItemCreate;
 
             store.writeQuery({
-              query: workItemByIidQuery,
+              query: this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
               variables: {
                 fullPath: this.fullPath,
                 iid: workItem.iid,
diff --git a/app/controllers/repositories/lfs_api_controller.rb b/app/controllers/repositories/lfs_api_controller.rb
index da243a0301e..d9ca216b168 100644
--- a/app/controllers/repositories/lfs_api_controller.rb
+++ b/app/controllers/repositories/lfs_api_controller.rb
@@ -26,11 +26,7 @@ module Repositories
       end
 
       if download_request?
-        if Feature.enabled?(:lfs_batch_direct_downloads, project)
-          render json: { objects: download_objects! }, content_type: LfsRequest::CONTENT_TYPE
-        else
-          render json: { objects: legacy_download_objects! }, content_type: LfsRequest::CONTENT_TYPE
-        end
+        render json: { objects: download_objects! }, content_type: LfsRequest::CONTENT_TYPE
       elsif upload_request?
         render json: { objects: upload_objects! }, content_type: LfsRequest::CONTENT_TYPE
       else
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index b2b8ca2a120..bd63381e9d1 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -22,9 +22,7 @@ module WikiHelper
   end
 
   def wiki_sidebar_toggle_button
-    content_tag :button, class: 'gl-button btn btn-default btn-icon sidebar-toggle js-sidebar-wiki-toggle', role: 'button', type: 'button' do
-      sprite_icon('chevron-double-lg-left')
-    end
+    render Pajamas::ButtonComponent.new(icon: 'chevron-double-lg-left', button_options: { class: 'sidebar-toggle js-sidebar-wiki-toggle' })
   end
 
   # Produces a pure text breadcrumb for a given page.
@@ -60,17 +58,14 @@ module WikiHelper
   end
 
   def wiki_sort_controls(wiki, direction)
-    link_class = 'gl-button btn btn-default btn-icon has-tooltip reverse-sort-btn rspec-reverse-sort'
+    link_class = 'has-tooltip reverse-sort-btn rspec-reverse-sort'
     reversed_direction = direction == 'desc' ? 'asc' : 'desc'
     icon_class = direction == 'desc' ? 'highest' : 'lowest'
     title = direction == 'desc' ? _('Sort direction: Descending') : _('Sort direction: Ascending')
 
     link_options = { action: :pages, direction: reversed_direction }
 
-    link_to(wiki_path(wiki, **link_options),
-      type: 'button', class: link_class, title: title) do
-      sprite_icon("sort-#{icon_class}")
-    end
+    render Pajamas::ButtonComponent.new(href: wiki_path(wiki, **link_options), icon: "sort-#{icon_class}", button_options: { class: link_class, title: title })
   end
 
   def wiki_sort_title(key)
diff --git a/app/helpers/work_items_helper.rb b/app/helpers/work_items_helper.rb
index 1969c98de8b..d2e3d41377a 100644
--- a/app/helpers/work_items_helper.rb
+++ b/app/helpers/work_items_helper.rb
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module WorkItemsHelper
-  def work_items_index_data(project)
+  def work_items_index_data(resource_parent)
     {
-      full_path: project.full_path,
-      issues_list_path: project_issues_path(project),
+      full_path: resource_parent.full_path,
+      issues_list_path:
+        resource_parent.is_a?(Group) ? issues_group_path(resource_parent) : project_issues_path(resource_parent),
       register_path: new_user_registration_path(redirect_to_referer: 'yes'),
       sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'),
       new_comment_template_path: profile_comment_templates_path,
diff --git a/app/models/integrations/telegram.rb b/app/models/integrations/telegram.rb
index 7c196720386..6a79a31469e 100644
--- a/app/models/integrations/telegram.rb
+++ b/app/models/integrations/telegram.rb
@@ -60,6 +60,10 @@ module Integrations
       super - ['deployment']
     end
 
+    def avatar_url
+      ActionController::Base.helpers.image_path('illustrations/third-party-logos/integrations-logos/telegram.svg')
+    end
+
     private
 
     def set_webhook
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index a57b6f8daf7..a3a0ab70a43 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -695,7 +695,6 @@ class ProjectPolicy < BasePolicy
     enable :read_merge_request
     enable :read_note
     enable :read_pipeline
-    enable :read_pipeline_schedule
     enable :read_environment
     enable :read_deployment
     enable :read_commit_status
@@ -712,7 +711,10 @@ class ProjectPolicy < BasePolicy
     enable :read_issue
   end
 
-  rule { can?(:public_access) & public_builds }.enable :read_ci_cd_analytics
+  rule { can?(:public_access) & public_builds }.policy do
+    enable :read_ci_cd_analytics
+    enable :read_pipeline_schedule
+  end
 
   rule { public_builds }.policy do
     enable :read_build
diff --git a/app/services/issues/set_crm_contacts_service.rb b/app/services/issues/set_crm_contacts_service.rb
index 5836097f1fd..c2ed7c554be 100644
--- a/app/services/issues/set_crm_contacts_service.rb
+++ b/app/services/issues/set_crm_contacts_service.rb
@@ -13,7 +13,7 @@ module Issues
       return error_invalid_params unless valid_params?
 
       @existing_ids = issue.customer_relations_contact_ids
-      determine_changes if params[:replace_ids].present?
+      determine_changes if set_present?
       return error_too_many if too_many?
 
       @added_count = 0
@@ -108,7 +108,7 @@ module Issues
     end
 
     def set_present?
-      params[:replace_ids].present?
+      !params[:replace_ids].nil?
     end
 
     def add_or_remove_present?
diff --git a/app/views/groups/work_items/show.html.haml b/app/views/groups/work_items/show.html.haml
index eb962cc0b69..7def8b0d6e6 100644
--- a/app/views/groups/work_items/show.html.haml
+++ b/app/views/groups/work_items/show.html.haml
@@ -1 +1,7 @@
-.h1 Work Item
+- page_title "##{request.params['iid']}"
+- add_to_breadcrumbs _("Issues"), issues_group_path(@group)
+- add_page_specific_style 'page_bundles/work_items'
+- @gfm_form = true
+- @noteable_type = 'WorkItem'
+
+#js-work-items{ data: work_items_index_data(@group).merge(iid: request.params['iid']) }
diff --git a/app/views/projects/_commit_button.html.haml b/app/views/projects/_commit_button.html.haml
index 19943aa68a3..afb241dba7c 100644
--- a/app/views/projects/_commit_button.html.haml
+++ b/app/views/projects/_commit_button.html.haml
@@ -1,5 +1,5 @@
 .gl-display-flex.gl-mt-7
-  - submit_button_options = { type: :submit, variant: :confirm, button_options: { id: 'commit-changes', class: 'js-commit-button', data: { qa_selector: 'commit_button' } } }
+  - submit_button_options = { type: :submit, variant: :confirm, button_options: { id: 'commit-changes', class: 'js-commit-button', data: { testid: 'commit-button' } } }
   = render Pajamas::ButtonComponent.new(**submit_button_options) do
     = _('Commit changes')
   = render Pajamas::ButtonComponent.new(loading: true, disabled: true, **submit_button_options.merge({ button_options: { class: 'js-commit-button-loading gl-display-none' } })) do
diff --git a/app/views/users/_follow_user.html.haml b/app/views/users/_follow_user.html.haml
index 3ee8c81496c..71f8a462cbf 100644
--- a/app/views/users/_follow_user.html.haml
+++ b/app/views/users/_follow_user.html.haml
@@ -7,5 +7,5 @@
         = _('Unfollow')
   - else
     = form_tag user_follow_path(@user, :json), class: link_classes do
-      = render Pajamas::ButtonComponent.new(variant: :confirm, type: :submit, button_options: { class: 'gl-w-full', data: { qa_selector: 'follow_user_link', track_action: 'click_button', track_label: 'follow_from_profile' } }) do
+      = render Pajamas::ButtonComponent.new(variant: :confirm, type: :submit, button_options: { class: 'gl-w-full', data: { testid: 'follow-user-link', track_action: 'click_button', track_label: 'follow_from_profile' } }) do
         = _('Follow')
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml
index 0b76ed6c086..3649f72c956 100644
--- a/app/views/users/_overview.html.haml
+++ b/app/views/users/_overview.html.haml
@@ -33,7 +33,7 @@
             %h4.gl-flex-grow-1
               = Feature.enabled?(:security_auto_fix) && @user.bot? ? s_('UserProfile|Bot activity') : s_('UserProfile|Activity')
             = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
-          .overview-content-list{ data: { href: user_activity_path, qa_selector: 'user_activity_content' } }
+          .overview-content-list{ data: { href: user_activity_path, testid: 'user-activity-content' } }
             = gl_loading_icon(size: 'md', css_class: 'loading')
 
   - unless Feature.enabled?(:security_auto_fix) && @user.bot?
diff --git a/app/workers/gitlab_shell_worker.rb b/app/workers/gitlab_shell_worker.rb
index b3c0fa79658..af657cb3dbd 100644
--- a/app/workers/gitlab_shell_worker.rb
+++ b/app/workers/gitlab_shell_worker.rb
@@ -18,8 +18,6 @@ class GitlabShellWorker # rubocop:disable Scalability/IdempotentWorker
       raise(ArgumentError, "#{action} not allowed for #{self.class.name}")
     end
 
-    Gitlab::GitalyClient::NamespaceService.allow do
-      gitlab_shell.public_send(action, *arg) # rubocop:disable GitlabSecurity/PublicSend
-    end
+    gitlab_shell.public_send(action, *arg) # rubocop:disable GitlabSecurity/PublicSend
   end
 end
diff --git a/config/feature_flags/development/lfs_batch_direct_downloads.yml b/config/feature_flags/development/user_pat_rest_api.yml
similarity index 52%
rename from config/feature_flags/development/lfs_batch_direct_downloads.yml
rename to config/feature_flags/development/user_pat_rest_api.yml
index 33fe2a55b23..7c54664bebb 100644
--- a/config/feature_flags/development/lfs_batch_direct_downloads.yml
+++ b/config/feature_flags/development/user_pat_rest_api.yml
@@ -1,8 +1,8 @@
 ---
-name: lfs_batch_direct_downloads
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122221
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/421692
-milestone: '16.1'
+name: user_pat_rest_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131923
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425967
+milestone: '16.5'
 type: development
-group: group::source code
-default_enabled: true
+group: group::authentication and authorization
+default_enabled: false
diff --git a/doc/administration/object_storage.md b/doc/administration/object_storage.md
index 0b12d41eb4e..dfea1d2d077 100644
--- a/doc/administration/object_storage.md
+++ b/doc/administration/object_storage.md
@@ -845,6 +845,8 @@ these are separate buckets. Use of bucket prefixes
 Helm-based installs require separate buckets to
 [handle backup restorations](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-terraform-state-dependency-proxy).
 
+If the same bucket is used for multiple object types, only the first object type in the configuration uses the bucket. Other object types revert to their default local storage (for the default storage locations, see the [table in the linked section)[https://docs.gitlab.com/omnibus/settings/configuration.html#disable-the-varoptgitlab-directory-management)).
+
 ### S3 API compatibility issues
 
 Not all S3 providers [are fully compatible](../administration/backup_restore/backup_gitlab.md#other-s3-providers)
diff --git a/doc/administration/settings/jira_cloud_app.md b/doc/administration/settings/jira_cloud_app.md
index 8483b45ec1c..fb5780848fd 100644
--- a/doc/administration/settings/jira_cloud_app.md
+++ b/doc/administration/settings/jira_cloud_app.md
@@ -69,6 +69,7 @@ With this method:
 - The instance must be publicly available.
 - The instance must be on GitLab version 15.7 or later.
 - You must set up [OAuth authentication](#set-up-oauth-authentication).
+- If your instance is using HTTPS, your GitLab certificate must be publicly trusted or contain the full chained certificate.
 - Your network must allow inbound and outbound connections between GitLab and Jira. For self-managed instances that are behind a
   firewall and cannot be directly accessed from the internet:
   - Open your firewall and only allow inbound traffic from [Atlassian IP addresses](https://support.atlassian.com/organization-administration/docs/ip-addresses-and-domains-for-atlassian-cloud-products/#Outgoing-Connections).
diff --git a/doc/api/personal_access_tokens.md b/doc/api/personal_access_tokens.md
index 2131a29eb5b..90390acc343 100644
--- a/doc/api/personal_access_tokens.md
+++ b/doc/api/personal_access_tokens.md
@@ -328,3 +328,8 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git
 ## Create a personal access token (administrator only)
 
 See the [Users API documentation](users.md#create-a-personal-access-token) for information on creating a personal access token.
+
+## Create a personal access token with limited scopes for the currently authenticated user **(FREE SELF)**
+
+See the [Users API documentation](users.md#create-a-personal-access-token-with-limited-scopes-for-the-currently-authenticated-user)
+for information on creating a personal access token for the currently authenticated user.
diff --git a/doc/api/users.md b/doc/api/users.md
index 0652742c557..95fc4841b8c 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -2126,6 +2126,47 @@ Example response:
 }
 ```
 
+## Create a personal access token with limited scopes for the currently authenticated user **(FREE SELF)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131923) in GitLab 16.5 with a flag named `user_pat_rest_api`.
+
+Use this API to create a new personal access token for the currently authenticated user.
+For security purposes, the scopes are limited to only `k8s_proxy` and by default the token will expire by
+the end of the day it was created at.
+Token values are returned once so, make sure you save it as you can't access it again.
+
+```plaintext
+POST /user/personal_access_tokens
+```
+
+| Attribute    | Type   | Required | Description                                                                                                                                                                                                                                                                                           |
+|--------------|--------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `name`       | string | yes      | Name of the personal access token                                                                                                                                                                                                                                                                     |
+| `scopes`     | array  | yes      | Array of scopes of the personal access token. Possible values are `k8s_proxy`                                                                                                                                                                                                                         |
+| `expires_at` | array  | no       | Expiration date of the access token in ISO format (`YYYY-MM-DD`). If no date is set, the expiration is at the end of the current day. The expiration is subject to the [maximum allowable lifetime of an access token](../user/profile/personal_access_tokens.md#when-personal-access-tokens-expire). |
+
+```shell
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" --data "name=mytoken" --data "scopes[]=k8s_proxy" "https://gitlab.example.com/api/v4/user/personal_access_tokens"
+```
+
+Example response:
+
+```json
+{
+    "id": 3,
+    "name": "mytoken",
+    "revoked": false,
+    "created_at": "2020-10-14T11:58:53.526Z",
+    "scopes": [
+        "k8s_proxy"
+    ],
+    "user_id": 42,
+    "active": true,
+    "expires_at": "2020-10-15",
+    "token": "ggbfKkC4n-Lujy8jwCR2"
+}
+```
+
 ## Get user activities **(FREE SELF)**
 
 Pre-requisite:
diff --git a/doc/ci/jobs/job_artifacts_troubleshooting.md b/doc/ci/jobs/job_artifacts_troubleshooting.md
index ebed347e966..f2efa8da9eb 100644
--- a/doc/ci/jobs/job_artifacts_troubleshooting.md
+++ b/doc/ci/jobs/job_artifacts_troubleshooting.md
@@ -96,13 +96,21 @@ of each ref do not expire and are not deleted.
 
 ## Error message `This job could not start because it could not retrieve the needed artifacts.`
 
-A job configured with the [`needs:artifacts`](../yaml/index.md#needsartifacts) keyword
-fails to start and returns this error message if:
+A job fails to start and returns this error message if it can't fetch the artifacts
+it expects. This error is returned when:
 
-- The job's dependencies cannot be found.
+- The job's dependencies are not found. By default, jobs in later stages fetch artifacts
+  from jobs in all earlier stages, so the earlier jobs are all considered dependent.
+  If the job uses the [`dependencies`](../yaml/index.md#dependencies) keyword, only
+  the listed jobs are dependent.
+- The artifacts are already expired. You can set a longer expiry with [`artifacts:expire_in`](../yaml/index.md#artifactsexpire_in).
 - The job cannot access the relevant resources due to insufficient permissions.
 
-The troubleshooting steps to follow differ based on the syntax the job uses:
+See these additional troubleshooting steps if the job uses the [`needs:artifacts`](../yaml/index.md#needsartifacts):
+keyword with:
+
+- [`needs:project`](#for-a-job-configured-with-needsproject)
+- [`needs:pipeline:job`](#for-a-job-configured-with-needspipelinejob)
 
 - [`needs:project`](#for-a-job-configured-with-needsproject)
 - [`needs:pipeline:job`](#for-a-job-configured-with-needspipelinejob)
diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index 54d18b2d255..a6b2774dbde 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -38,6 +38,11 @@ On self-managed GitLab instances:
 - Administrators can [assign more compute minutes](#set-the-compute-quota-for-a-specific-namespace)
   if a namespace uses all its monthly quota.
 
+[Trigger jobs](../../ci/yaml/index.md#trigger) do not execute on runners, so they do not
+consume compute minutes, even when using [`strategy:depend`](../yaml/index.md#triggerstrategy)
+to wait for the [downstream pipeline](../pipelines/downstream_pipelines.md) status.
+The triggered downstream pipeline consumes compute minutes the same as other pipelines.
+
 [Project runners](../runners/runners_scope.md#project-runners) are not subject to a compute quota.
 
 ## Set the compute quota for all namespaces
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index c819037398a..110f3c9dfbb 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -898,6 +898,11 @@ job:
   - Select **Keep** on the job page.
   - [In GitLab 13.3 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/22761), set the value of
     `expire_in` to `never`.
+- If the expiry time is too short, jobs in later stages of a long pipeline might try to fetch
+  expired artifacts from earlier jobs. If the artifacts are expired, jobs that try to fetch
+  them fail with a [`could not retrieve the needed artifacts` error](../jobs/job_artifacts_troubleshooting.md#error-message-this-job-could-not-start-because-it-could-not-retrieve-the-needed-artifacts).
+  Set the expiry time to be longer, or use [`dependencies`](#dependencies) in later jobs
+  to ensure they don't try to fetch expired artifacts.
 
 #### `artifacts:expose_as`
 
@@ -1619,10 +1624,11 @@ to select a specific site profile and scanner profile.
 
 ### `dependencies`
 
-Use the `dependencies` keyword to define a list of jobs to fetch [artifacts](#artifacts) from.
-You can also set a job to download no artifacts at all.
+Use the `dependencies` keyword to define a list of specific jobs to fetch [artifacts](#artifacts)
+from. When `dependencies` is not defined in a job, all jobs in earlier stages are considered dependent
+and the job fetches all artifacts from those jobs.
 
-If you do not use `dependencies`, all artifacts from previous stages are passed to each job.
+You can also set a job to download no artifacts at all.
 
 **Keyword type**: Job keyword. You can use it only as part of a job.
 
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md
index 333af9ce7ae..1afaa6b7d52 100644
--- a/doc/integration/advanced_search/elasticsearch.md
+++ b/doc/integration/advanced_search/elasticsearch.md
@@ -869,7 +869,7 @@ Make sure to prepare for this task by having a
    bundle exec rake gitlab:elastic:index_users RAILS_ENV=production
    ```
 
-1. Enable replication and refreshing again after indexing (only if you previously disabled it):
+1. Enable replication and refreshing again after indexing (only if you previously increased the `refresh_interval`):
 
    ```shell
    curl --request PUT localhost:9200/gitlab-production/_settings --header 'Content-Type: application/json' \
diff --git a/doc/integration/mattermost/index.md b/doc/integration/mattermost/index.md
index cf7178c7540..73f3140db2b 100644
--- a/doc/integration/mattermost/index.md
+++ b/doc/integration/mattermost/index.md
@@ -338,6 +338,7 @@ Below is a list of Mattermost version changes for GitLab 14.0 and later:
 
 | GitLab version | Mattermost version | Notes                                                                                    |
 | :------------- | :----------------- | ---------------------------------------------------------------------------------------- |
+| 16.5           | 9.0                |                                                                                          |
 | 16.4           | 8.1                |                                                                                          |
 | 16.3           | 8.0                |                                                                                          |
 | 16.0           | 7.10               |                                                                                          |
diff --git a/doc/update/index.md b/doc/update/index.md
index 661026db6e6..f7e3a0e3403 100644
--- a/doc/update/index.md
+++ b/doc/update/index.md
@@ -193,7 +193,11 @@ When upgrading:
      GitLab instances with multiple web nodes) > [`15.4.6`](versions/gitlab_15_changes.md#1540) >
      [`15.11.13`](versions/gitlab_15_changes.md#15110).
    - GitLab 16: [`16.0.x`](versions/gitlab_16_changes.md#1600) (only
-     [instances with lots of users](versions/gitlab_16_changes.md#long-running-user-type-data-change)) > [`16.1`](versions/gitlab_16_changes.md#1610)(instances with NPM packages in their Package Registry) > [`16.3`](versions/gitlab_16_changes.md#1630) > [latest `16.Y.Z`](https://gitlab.com/gitlab-org/gitlab/-/releases).
+     instances with [lots of users](versions/gitlab_16_changes.md#long-running-user-type-data-change) or
+     [large pipeline variables history](versions/gitlab_16_changes.md#1610)) >
+     [`16.1`](versions/gitlab_16_changes.md#1610)(instances with NPM packages in their Package Registry) >
+     [`16.2.x`](versions/gitlab_16_changes.md#1620) (only instances with [large pipeline variables history](versions/gitlab_16_changes.md#1630)) >
+     [`16.3`](versions/gitlab_16_changes.md#1630) > [latest `16.Y.Z`](https://gitlab.com/gitlab-org/gitlab/-/releases).
 
 1. Check for [required upgrade stops](#required-upgrade-stops).
 1. Consult the [version-specific upgrade instructions](#version-specific-upgrading-instructions).
diff --git a/doc/update/versions/gitlab_16_changes.md b/doc/update/versions/gitlab_16_changes.md
index fde811c75b9..19b2edb5de6 100644
--- a/doc/update/versions/gitlab_16_changes.md
+++ b/doc/update/versions/gitlab_16_changes.md
@@ -100,6 +100,19 @@ For more information about upgrading GitLab Helm Chart, see [the release notes f
   for any of the applications above before
   upgrading.
 
+- A `BackfillCiPipelineVariablesForPipelineIdBigintConversion` background migration is finalized with
+  the `EnsureAgainBackfillForCiPipelineVariablesPipelineIdIsFinished` post-deploy migration.
+  GitLab 16.2.0 introduced a [batched background migration](../background_migrations.md#batched-background-migrations) to
+  [backfill bigint `pipeline_id` values on the `ci_pipeline_variables` table](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123132). This
+  migration may take a long time to complete on larger GitLab instances (4 hours to process 50 million rows reported in one case).
+  To avoid a prolonged upgrade downtime, make sure the migration has completed successfully before upgrading to 16.3.
+
+  You can check the size of the `ci_pipeline_variables` table in the [database console](../../administration/troubleshooting/postgresql.md#start-a-database-console):
+
+  ```sql
+  select count(*) from ci_pipeline_variables;
+  ```
+
 ### Linux package installations
 
 Specific information applies to Linux package installations:
@@ -204,6 +217,18 @@ Specific information applies to installations using Geo:
   migration may take multiple days to complete on larger GitLab instances. Make sure the migration
   has completed successfully before upgrading to 16.1.0.
 - GitLab 16.1.0 includes a [batched background migration](../background_migrations.md#batched-background-migrations) `MarkDuplicateNpmPackagesForDestruction` to mark duplicate NPM packages for destruction. Make sure the migration has completed successfully before upgrading to 16.3.0 or later.
+- A `BackfillCiPipelineVariablesForBigintConversion` background migration is finalized with
+  the `EnsureBackfillBigintIdIsCompleted` post-deploy migration.
+  GitLab 16.0.0 introduced a [batched background migration](../background_migrations.md#batched-background-migrations) to
+  [backfill bigint `id` values on the `ci_pipeline_variables` table](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118878). This
+  migration may take a long time to complete on larger GitLab instances (4 hours to process 50 million rows reported in one case).
+  To avoid a prolonged upgrade downtime, make sure the migration has completed successfully before upgrading to 16.1.
+
+  You can check the size of the `ci_pipeline_variables` table in the [database console](../../administration/troubleshooting/postgresql.md#start-a-database-console):
+
+  ```sql
+  select count(*) from ci_pipeline_variables;
+  ```
 
 ### Self-compiled installations
 
diff --git a/lib/api/users.rb b/lib/api/users.rb
index a01ace3a9c3..df56107ff4b 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -1373,6 +1373,35 @@ module API
       get 'status', feature_category: :user_profile do
         present current_user.status || {}, with: Entities::UserStatus
       end
+
+      resource :personal_access_tokens do
+        desc 'Create a personal access token with limited scopes for the currently authenticated user' do
+          detail 'This feature was introduced in GitLab 16.5'
+          success Entities::PersonalAccessTokenWithToken
+        end
+        params do
+          requires :name, type: String, desc: 'The name of the personal access token'
+          # NOTE: for security reasons only the k8s_proxy scope is allowed at the moment.
+          # See details in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131923#note_1571272897
+          # and in https://gitlab.com/gitlab-org/gitlab/-/issues/425171
+          requires :scopes, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, values: [::Gitlab::Auth::K8S_PROXY_SCOPE].map(&:to_s),
+                   desc: 'The array of scopes of the personal access token'
+          optional :expires_at, type: Date, default: -> { 1.day.from_now.to_date }, desc: 'The expiration date in the format YEAR-MONTH-DAY of the personal access token'
+        end
+        post feature_category: :system_access do
+          bad_request!('Endpoint is disabled via user_pat_rest_api feature flag. Please contact your administrator to enable it.') unless Feature.enabled?(:user_pat_rest_api)
+
+          response = ::PersonalAccessTokens::CreateService.new(
+            current_user: current_user, target_user: current_user, params: declared_params(include_missing: false)
+          ).execute
+
+          if response.success?
+            present response.payload[:personal_access_token], with: Entities::PersonalAccessTokenWithToken
+          else
+            render_api_error!(response.message, response.http_status || :unprocessable_entity)
+          end
+        end
+      end
     end
   end
 end
diff --git a/lib/bulk_imports/common/transformers/user_reference_transformer.rb b/lib/bulk_imports/common/transformers/user_reference_transformer.rb
deleted file mode 100644
index c330ea59113..00000000000
--- a/lib/bulk_imports/common/transformers/user_reference_transformer.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-# UserReferenceTransformer replaces specified user
-# reference key with a user id being either:
-#   - A user id found by `public_email` in the group
-#   - Current user id
-# under a new key `"#{@reference}_id"`.
-module BulkImports
-  module Common
-    module Transformers
-      class UserReferenceTransformer
-        DEFAULT_REFERENCE = 'user'
-
-        def initialize(options = {})
-          @reference = options[:reference].to_s.presence || DEFAULT_REFERENCE
-          @suffixed_reference = "#{@reference}_id"
-        end
-
-        def transform(context, data)
-          return unless data
-
-          user = find_user(context, data&.dig(@reference, 'public_email')) || context.current_user
-
-          data
-            .except(@reference)
-            .merge(@suffixed_reference => user.id)
-        end
-
-        private
-
-        def find_user(context, email)
-          return if email.blank?
-
-          context.group.users.find_by_any_email(email, confirmed: true) # rubocop: disable CodeReuse/ActiveRecord
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/gitaly_client/namespace_service.rb b/lib/gitlab/gitaly_client/namespace_service.rb
deleted file mode 100644
index 05aee2fa55d..00000000000
--- a/lib/gitlab/gitaly_client/namespace_service.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module GitalyClient
-    class NamespaceService
-      extend Gitlab::TemporarilyAllow
-
-      NamespaceServiceAccessError = Class.new(StandardError)
-      ALLOW_KEY = :allow_namespace
-
-      def self.allow
-        temporarily_allow(ALLOW_KEY) { yield }
-      end
-
-      def self.denied?
-        !temporarily_allowed?(ALLOW_KEY)
-      end
-
-      def initialize(storage)
-        raise NamespaceServiceAccessError if self.class.denied?
-
-        @storage = storage
-      end
-
-      def add(name)
-        request = Gitaly::AddNamespaceRequest.new(storage_name: @storage, name: name)
-
-        gitaly_client_call(:add_namespace, request, timeout: GitalyClient.fast_timeout)
-      end
-
-      def remove(name)
-        request = Gitaly::RemoveNamespaceRequest.new(storage_name: @storage, name: name)
-
-        gitaly_client_call(:remove_namespace, request, timeout: GitalyClient.long_timeout)
-      end
-
-      def rename(from, to)
-        request = Gitaly::RenameNamespaceRequest.new(storage_name: @storage, from: from, to: to)
-
-        gitaly_client_call(:rename_namespace, request, timeout: GitalyClient.fast_timeout)
-      end
-
-      def exists?(name)
-        request = Gitaly::NamespaceExistsRequest.new(storage_name: @storage, name: name)
-
-        response = gitaly_client_call(:namespace_exists, request, timeout: GitalyClient.fast_timeout)
-        response.exists
-      end
-
-      private
-
-      def gitaly_client_call(type, request, timeout: nil)
-        GitalyClient.call(@storage, :namespace_service, type, request, timeout: timeout)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/prometheus/parsing_error.rb b/lib/gitlab/prometheus/parsing_error.rb
deleted file mode 100644
index 20b5ef5ce55..00000000000
--- a/lib/gitlab/prometheus/parsing_error.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Prometheus
-    ParsingError = Class.new(StandardError)
-  end
-end
diff --git a/lib/gitlab/prometheus/queries/base_query.rb b/lib/gitlab/prometheus/queries/base_query.rb
deleted file mode 100644
index eabac6128b5..00000000000
--- a/lib/gitlab/prometheus/queries/base_query.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Prometheus
-    module Queries
-      class BaseQuery
-        attr_accessor :client
-
-        delegate :query_range, :query, :label_values, :series, to: :client, prefix: true
-
-        def raw_memory_usage_query(environment_slug)
-          %{avg(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}) / 2^20}
-        end
-
-        def raw_cpu_usage_query(environment_slug)
-          %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[2m])) * 100}
-        end
-
-        def initialize(client)
-          @client = client
-        end
-
-        def query(*args)
-          raise NotImplementedError
-        end
-
-        def self.transform_reactive_result(result)
-          result
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
deleted file mode 100644
index a870bb6bc5f..00000000000
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Prometheus
-    module Queries
-      module QueryAdditionalMetrics
-        def query_metrics(project, environment, query_context)
-          matched_metrics(project).map(&query_group(query_context))
-            .select(&method(:group_with_any_metrics))
-        end
-
-        protected
-
-        def query_group(query_context)
-          query_processor = method(:process_query).curry[query_context]
-
-          lambda do |group|
-            metrics = group.metrics.map do |metric|
-              metric_hsh = {
-                title: metric.title,
-                weight: metric.weight,
-                y_label: metric.y_label,
-                queries: metric.queries.map(&query_processor).select(&method(:query_with_result))
-              }
-
-              metric_hsh[:id] = metric.id if metric.id
-
-              metric_hsh
-            end
-
-            {
-              group: group.name,
-              priority: group.priority,
-              metrics: metrics.select(&method(:metric_with_any_queries))
-            }
-          end
-        end
-
-        private
-
-        def metric_with_any_queries(metric)
-          metric[:queries]&.count&.> 0
-        end
-
-        def group_with_any_metrics(group)
-          group[:metrics]&.count&.> 0
-        end
-
-        def query_with_result(query)
-          query[:result]&.any? do |item|
-            item&.[](:values)&.any? || item&.[](:value)&.any?
-          end
-        end
-
-        def process_query(context, query)
-          query = query.dup
-          result =
-            if query.key?(:query_range)
-              query[:query_range] %= context
-              client_query_range(query[:query_range], start_time: context[:timeframe_start], end_time: context[:timeframe_end])
-            else
-              query[:query] %= context
-              client_query(query[:query], time: context[:timeframe_end])
-            end
-
-          query[:result] = result&.map(&:deep_symbolize_keys)
-          query
-        end
-
-        def available_metrics
-          @available_metrics ||= client_label_values || []
-        end
-
-        def matched_metrics(project)
-          result = Gitlab::Prometheus::MetricGroup.for_project(project).map do |group|
-            group.metrics.select! do |metric|
-              metric.required_metrics.all?(&available_metrics.method(:include?))
-            end
-            group
-          end
-
-          result.select { |group| group.metrics.any? }
-        end
-
-        def common_query_context(environment, timeframe_start:, timeframe_end:)
-          base_query_context(timeframe_start, timeframe_end)
-            .merge(QueryVariables.call(environment))
-        end
-
-        def base_query_context(timeframe_start, timeframe_end)
-          {
-            timeframe_start: timeframe_start,
-            timeframe_end: timeframe_end
-          }
-        end
-      end
-    end
-  end
-end
-
-Gitlab::Prometheus::Queries::QueryAdditionalMetrics.prepend_mod_with('Gitlab::Prometheus::Queries::QueryAdditionalMetrics')
diff --git a/lib/gitlab/prometheus/query_variables.rb b/lib/gitlab/prometheus/query_variables.rb
deleted file mode 100644
index 6a6e5c22d63..00000000000
--- a/lib/gitlab/prometheus/query_variables.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Prometheus
-    module QueryVariables
-      # start_time and end_time should be Time objects.
-      def self.call(environment, start_time: nil, end_time: nil)
-        {
-          __range: range(start_time, end_time),
-          ci_environment_slug: environment.slug,
-          kube_namespace: environment.deployment_namespace || '',
-          environment_filter: %(container_name!="POD",environment="#{environment.slug}"),
-          ci_project_name: environment.project.name,
-          ci_project_namespace: environment.project.namespace.name,
-          ci_project_path: environment.project.full_path,
-          ci_environment_name: environment.name
-        }
-      end
-
-      private
-
-      def self.range(start_time, end_time)
-        if start_time && end_time
-          range_seconds = (end_time - start_time).to_i
-          "#{range_seconds}s"
-        end
-      end
-      private_class_method :range
-    end
-  end
-end
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
index 2476bfb82a5..87f4d3bb9bd 100644
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
@@ -15,8 +15,7 @@ module Gitlab
     Error = Class.new(StandardError)
 
     PERMITTED_ACTIONS = %w[
-      mv_repository remove_repository add_namespace mv_namespace
-      repository_exists?
+      mv_repository remove_repository repository_exists?
     ].freeze
 
     class << self
@@ -127,41 +126,6 @@ module Gitlab
       false
     end
 
-    # Add empty directory for storing repositories
-    #
-    # @example Add new namespace directory
-    #   add_namespace("default", "gitlab")
-    #
-    # @param [String] storage project's storage path
-    # @param [String] name namespace name
-    #
-    # @deprecated
-    def add_namespace(storage, name)
-      Gitlab::GitalyClient.allow_n_plus_1_calls do
-        Gitlab::GitalyClient::NamespaceService.new(storage).add(name)
-      end
-    rescue GRPC::InvalidArgument => e
-      raise ArgumentError, e.message
-    end
-
-    # Move namespace directory inside repositories storage
-    #
-    # @example Move/rename a namespace directory
-    #   mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
-    #
-    # @param [String] storage project's storage path
-    # @param [String] old_name current namespace name
-    # @param [String] new_name new namespace name
-    #
-    # @deprecated
-    def mv_namespace(storage, old_name, new_name)
-      Gitlab::GitalyClient::NamespaceService.new(storage).rename(old_name, new_name)
-    rescue GRPC::InvalidArgument => e
-      Gitlab::ErrorTracking.track_exception(e, old_name: old_name, new_name: new_name, storage: storage)
-
-      false
-    end
-
     # Check if repository exists on disk
     #
     # @example Check if repository exists
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 62a37987ef9..4fed8779e32 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -22882,7 +22882,7 @@ msgstr ""
 msgid "GroupSelect|Select a group"
 msgstr ""
 
-msgid "GroupSettings| %{link_start}What are Experiment features?%{link_end}"
+msgid "GroupSettings| %{link_start}What do Experiment and Beta mean?%{link_end}"
 msgstr ""
 
 msgid "GroupSettings|After the instance reaches the user cap, any user who is added or requests access must be approved by an administrator. Leave empty for an unlimited user cap. If you change the user cap to unlimited, you must re-enable %{project_sharing_docs_link_start}project sharing%{link_end} and %{group_sharing_docs_link_start}group sharing%{link_end}."
@@ -22960,7 +22960,7 @@ msgstr ""
 msgid "GroupSettings|Enabling these features is your acceptance of the %{link_start}GitLab Testing Agreement%{link_end}."
 msgstr ""
 
-msgid "GroupSettings|Experiment features"
+msgid "GroupSettings|Experiment and Beta features"
 msgstr ""
 
 msgid "GroupSettings|Export group"
@@ -23041,7 +23041,7 @@ msgstr ""
 msgid "GroupSettings|There was a problem updating the pipeline settings: %{error_messages}."
 msgstr ""
 
-msgid "GroupSettings|These features can cause performance and stability issues and may change over time."
+msgid "GroupSettings|These features are being developed and might be unstable."
 msgstr ""
 
 msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup."
@@ -23056,7 +23056,7 @@ msgstr ""
 msgid "GroupSettings|Transfer group"
 msgstr ""
 
-msgid "GroupSettings|Use Experiment features"
+msgid "GroupSettings|Use Experiment and Beta features"
 msgstr ""
 
 msgid "GroupSettings|Users can create %{link_start_project}project access tokens%{link_end} and %{link_start_group}group access tokens%{link_end} in this group"
diff --git a/qa/qa/page/component/members/members_table.rb b/qa/qa/page/component/members/members_table.rb
index 5add3a0ac7d..b71455373e7 100644
--- a/qa/qa/page/component/members/members_table.rb
+++ b/qa/qa/page/component/members/members_table.rb
@@ -27,11 +27,11 @@ module QA
             end
 
             base.view 'app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue' do
-              element :user_action_dropdown
+              element 'user-action-dropdown'
             end
 
             base.view 'app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue' do
-              element :delete_member_dropdown_item
+              element 'delete-member-dropdown-item'
             end
 
             base.view 'app/assets/javascripts/members/components/action_buttons/approve_access_request_button.vue' do
@@ -60,8 +60,8 @@ module QA
 
           def remove_member(username)
             within_element(:member_row, text: username) do
-              click_element :user_action_dropdown
-              click_element :delete_member_dropdown_item
+              click_element 'user-action-dropdown'
+              click_element 'delete-member-dropdown-item'
             end
 
             confirm_remove_member
diff --git a/qa/qa/page/file/shared/commit_button.rb b/qa/qa/page/file/shared/commit_button.rb
index c1c5907f27d..edab31b098b 100644
--- a/qa/qa/page/file/shared/commit_button.rb
+++ b/qa/qa/page/file/shared/commit_button.rb
@@ -11,12 +11,12 @@ module QA
             super
 
             base.view 'app/views/projects/_commit_button.html.haml' do
-              element :commit_button
+              element 'commit-button'
             end
           end
 
           def commit_changes
-            click_element(:commit_button)
+            click_element('commit-button')
 
             wait_until(reload: false, max_duration: 60) do
               finished_loading?
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 9bd0e52132f..98d00664854 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -22,7 +22,7 @@ module QA
         end
 
         view 'app/assets/javascripts/super_sidebar/components/user_name_group.vue' do
-          element :user_profile_link
+          element 'user-profile-link'
         end
 
         view 'app/assets/javascripts/super_sidebar/components/user_bar.vue' do
@@ -115,10 +115,10 @@ module QA
           return false unless has_personal_area?
 
           within_user_menu do
-            has_element?(:user_profile_link, text: /#{user.username}/)
+            has_element?('user-profile-link', text: /#{user.username}/)
           end
           # we need to close user menu because plain user link check will leave it open
-          click_element :user_avatar_content if has_element?(:user_profile_link, wait: 0)
+          click_element :user_avatar_content if has_element?('user-profile-link', wait: 0)
         end
 
         def not_signed_in?
@@ -159,7 +159,7 @@ module QA
 
         def click_user_profile_link
           within_user_menu do
-            click_element(:user_profile_link)
+            click_element('user-profile-link')
           end
         end
 
@@ -189,7 +189,7 @@ module QA
 
         def within_user_menu(&block)
           within_element(:navbar) do
-            click_element :user_avatar_content unless has_element?(:user_profile_link, wait: 1)
+            click_element :user_avatar_content unless has_element?('user-profile-link', wait: 1)
 
             within_element('user-dropdown', &block)
           end
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 59cccfd665a..235a6acce8a 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -18,11 +18,11 @@ module QA
         end
 
         view 'app/assets/javascripts/repository/components/table/row.vue' do
-          element :file_name_link
+          element 'file-name-link'
         end
 
         view 'app/assets/javascripts/repository/components/table/index.vue' do
-          element :file_tree_table
+          element 'file-tree-table'
         end
 
         view 'app/views/layouts/header/_new_dropdown.html.haml' do
@@ -102,15 +102,15 @@ module QA
         end
 
         def click_file(filename)
-          within_element(:file_tree_table) do
-            click_element(:file_name_link, text: filename)
+          within_element('file-tree-table') do
+            click_element('file-name-link', text: filename)
           end
         end
 
         def click_commit(commit_msg)
           wait_for_requests
 
-          within_element(:file_tree_table) do
+          within_element('file-tree-table') do
             click_on commit_msg
           end
         end
@@ -120,16 +120,16 @@ module QA
         end
 
         def has_file?(name)
-          return false unless has_element?(:file_tree_table)
+          return false unless has_element?('file-tree-table')
 
-          within_element(:file_tree_table) do
-            has_element?(:file_name_link, text: name)
+          within_element('file-tree-table') do
+            has_element?('file-name-link', text: name)
           end
         end
 
         def has_no_file?(name)
-          within_element(:file_tree_table) do
-            has_no_element?(:file_name_link, text: name)
+          within_element('file-tree-table') do
+            has_no_element?('file-name-link', text: name)
           end
         end
 
diff --git a/qa/qa/page/user/show.rb b/qa/qa/page/user/show.rb
index e5ee943a69d..62e08dc8c63 100644
--- a/qa/qa/page/user/show.rb
+++ b/qa/qa/page/user/show.rb
@@ -5,7 +5,7 @@ module QA
     module User
       class Show < Page::Base
         view 'app/views/users/_follow_user.html.haml' do
-          element :follow_user_link
+          element 'follow-user-link'
         end
 
         view 'app/views/shared/users/_user.html.haml' do
@@ -13,11 +13,11 @@ module QA
         end
 
         view 'app/views/users/_overview.html.haml' do
-          element :user_activity_content
+          element 'user-activity-content'
         end
 
         def click_follow_user_link
-          click_element(:follow_user_link)
+          click_element('follow-user-link')
         end
 
         def click_following_tab
@@ -29,7 +29,7 @@ module QA
         end
 
         def has_activity?(activity)
-          within_element(:user_activity_content) do
+          within_element('user-activity-content') do
             has_text?(activity)
           end
         end
diff --git a/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb b/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb
index c0ec71c4488..11ad1bb19b8 100644
--- a/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb
+++ b/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb
@@ -46,7 +46,7 @@ module QA
           Page::File::Show.perform(&:click_edit)
 
           Page::File::Form.perform do |file_form|
-            expect(file_form).to have_element(:commit_button)
+            expect(file_form).to have_element('commit-button')
           end
         end
       end
diff --git a/rubocop/check_graceful_task.rb b/rubocop/check_graceful_task.rb
index 7bf678def83..d16d3d315bf 100644
--- a/rubocop/check_graceful_task.rb
+++ b/rubocop/check_graceful_task.rb
@@ -15,17 +15,14 @@ module RuboCop
         --format RuboCop::Formatter::GracefulFormatter
       ]
 
-      available_cops = RuboCop::Cop::Registry.global.to_h
-
-      cop_names, paths = args.partition { available_cops.key?(_1) }
+      # Convert from Rake::TaskArguments into an Array to make `any?` work as expected.
+      cop_names = args.to_a
 
       if cop_names.any?
         list = cop_names.sort.join(',')
         options.concat ['--only', list]
       end
 
-      options.concat(paths)
-
       puts <<~MSG
         Running RuboCop in graceful mode:
           rubocop #{options.join(' ')}
diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb
index 26d6eef41e3..2397c3a2bdf 100644
--- a/spec/features/projects/pipeline_schedules_spec.rb
+++ b/spec/features/projects/pipeline_schedules_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe 'Pipeline Schedules', :js, feature_category: :continuous_integrat
         wait_for_requests
       end
 
-      describe 'The view' do
+      describe 'the view' do
         it 'displays the required information description' do
           page.within('[data-testid="pipeline-schedule-table-row"]') do
             expect(page).to have_content('pipeline schedule')
@@ -280,36 +280,47 @@ RSpec.describe 'Pipeline Schedules', :js, feature_category: :continuous_integrat
     end
   end
 
-  context 'logged in as non-member' do
-    before do
-      gitlab_sign_in(user)
-    end
-
+  shared_examples 'when not logged in' do
     describe 'GET /projects/pipeline_schedules' do
-      before do
-        visit_pipelines_schedules
-      end
-
-      describe 'The view' do
+      describe 'the view' do
         it 'does not show create schedule button' do
+          visit_pipelines_schedules
+
           expect(page).not_to have_link('New schedule')
         end
+
+        context 'when project is public' do
+          let_it_be(:project) { create(:project, :repository, :public, public_builds: true) }
+
+          it 'shows Pipelines Schedules page' do
+            visit_pipelines_schedules
+
+            expect(page).to have_link('New schedule')
+          end
+
+          context 'when public pipelines are disabled' do
+            before do
+              project.update!(public_builds: false)
+              visit_pipelines_schedules
+            end
+
+            it 'shows Not Found page' do
+              expect(page).to have_content('Page Not Found')
+            end
+          end
+        end
       end
     end
   end
 
-  context 'not logged in' do
-    describe 'GET /projects/pipeline_schedules' do
-      before do
-        visit_pipelines_schedules
-      end
+  it_behaves_like 'when not logged in'
 
-      describe 'The view' do
-        it 'does not show create schedule button' do
-          expect(page).not_to have_link('New schedule')
-        end
-      end
+  context 'logged in as non-member' do
+    before do
+      gitlab_sign_in(user)
     end
+
+    it_behaves_like 'when not logged in'
   end
 
   def visit_new_pipeline_schedule
diff --git a/spec/frontend/ci/job_details/components/log/collapsible_section_spec.js b/spec/frontend/ci/job_details/components/log/collapsible_section_spec.js
index b4d22c0d29a..5abf2a5ce53 100644
--- a/spec/frontend/ci/job_details/components/log/collapsible_section_spec.js
+++ b/spec/frontend/ci/job_details/components/log/collapsible_section_spec.js
@@ -31,7 +31,7 @@ describe('Job Log Collapsible Section', () => {
     });
 
     it('renders clickable header line', () => {
-      expect(findLogLineHeader().text()).toBe('2 foo');
+      expect(findLogLineHeader().text()).toBe('1 foo');
       expect(findLogLineHeader().attributes('role')).toBe('button');
     });
 
diff --git a/spec/frontend/ci/job_details/components/log/line_header_spec.js b/spec/frontend/ci/job_details/components/log/line_header_spec.js
index 7d1b05346f2..45296e4b6c2 100644
--- a/spec/frontend/ci/job_details/components/log/line_header_spec.js
+++ b/spec/frontend/ci/job_details/components/log/line_header_spec.js
@@ -16,7 +16,7 @@ describe('Job Log Header Line', () => {
           style: 'term-fg-l-green',
         },
       ],
-      lineNumber: 76,
+      lineNumber: 77,
     },
     isClosed: true,
     path: '/jashkenas/underscore/-/jobs/335',
diff --git a/spec/frontend/ci/job_details/components/log/line_number_spec.js b/spec/frontend/ci/job_details/components/log/line_number_spec.js
index d5c1d0fd985..db964e341b7 100644
--- a/spec/frontend/ci/job_details/components/log/line_number_spec.js
+++ b/spec/frontend/ci/job_details/components/log/line_number_spec.js
@@ -5,7 +5,7 @@ describe('Job Log Line Number', () => {
   let wrapper;
 
   const data = {
-    lineNumber: 0,
+    lineNumber: 1,
     path: '/jashkenas/underscore/-/jobs/335',
   };
 
diff --git a/spec/frontend/ci/job_details/components/log/line_spec.js b/spec/frontend/ci/job_details/components/log/line_spec.js
index b6f3a2b68df..dad41d0cd7f 100644
--- a/spec/frontend/ci/job_details/components/log/line_spec.js
+++ b/spec/frontend/ci/job_details/components/log/line_spec.js
@@ -224,7 +224,7 @@ describe('Job Log Line', () => {
             offset: 24526,
             content: [{ text: 'job log content' }],
             section: 'custom-section',
-            lineNumber: 76,
+            lineNumber: 77,
           },
           path: '/root/ci-project/-/jobs/6353',
         });
diff --git a/spec/frontend/ci/job_details/components/log/log_spec.js b/spec/frontend/ci/job_details/components/log/log_spec.js
index d076b9f6099..1931d5046dc 100644
--- a/spec/frontend/ci/job_details/components/log/log_spec.js
+++ b/spec/frontend/ci/job_details/components/log/log_spec.js
@@ -151,7 +151,7 @@ describe('Job Log', () => {
             ],
             section: 'prepare-executor',
             section_header: true,
-            lineNumber: 2,
+            lineNumber: 3,
           },
         ];
 
diff --git a/spec/frontend/ci/job_details/components/log/mock_data.js b/spec/frontend/ci/job_details/components/log/mock_data.js
index 3368f3527fe..14669872cc1 100644
--- a/spec/frontend/ci/job_details/components/log/mock_data.js
+++ b/spec/frontend/ci/job_details/components/log/mock_data.js
@@ -172,7 +172,7 @@ export const collapsibleSectionClosed = {
       offset: 80,
       content: [{ text: 'this is a collapsible nested section' }],
       section: 'prepare-script',
-      lineNumber: 3,
+      lineNumber: 2,
     },
   ],
 };
@@ -193,7 +193,7 @@ export const collapsibleSectionOpened = {
       offset: 80,
       content: [{ text: 'this is a collapsible nested section' }],
       section: 'prepare-script',
-      lineNumber: 3,
+      lineNumber: 2,
     },
   ],
 };
diff --git a/spec/frontend/ci/job_details/store/mutations_spec.js b/spec/frontend/ci/job_details/store/mutations_spec.js
index 0ecb97cd935..78b29efed68 100644
--- a/spec/frontend/ci/job_details/store/mutations_spec.js
+++ b/spec/frontend/ci/job_details/store/mutations_spec.js
@@ -106,7 +106,7 @@ describe('Jobs Store Mutations', () => {
               {
                 offset: 1,
                 content: [{ text: 'Running with gitlab-runner 11.12.1 (5a147c92)' }],
-                lineNumber: 0,
+                lineNumber: 1,
               },
             ]);
           });
@@ -127,7 +127,7 @@ describe('Jobs Store Mutations', () => {
               {
                 offset: 0,
                 content: [{ text: 'Running with gitlab-runner 11.11.1 (5a147c92)' }],
-                lineNumber: 0,
+                lineNumber: 1,
               },
             ]);
           });
diff --git a/spec/frontend/ci/job_details/store/utils_spec.js b/spec/frontend/ci/job_details/store/utils_spec.js
index f9f360ef754..394ce0ab737 100644
--- a/spec/frontend/ci/job_details/store/utils_spec.js
+++ b/spec/frontend/ci/job_details/store/utils_spec.js
@@ -6,7 +6,7 @@ import {
   addDurationToHeader,
   isCollapsibleSection,
   findOffsetAndRemove,
-  getIncrementalLineNumber,
+  getNextLineNumber,
 } from '~/ci/job_details/store/utils';
 import {
   mockJobLog,
@@ -192,14 +192,14 @@ describe('Jobs Store Utils', () => {
 
     describe('regular line', () => {
       it('adds a lineNumber property with correct index', () => {
-        expect(result[0].lineNumber).toEqual(0);
-        expect(result[1].lineNumber).toEqual(1);
-        expect(result[2].line.lineNumber).toEqual(2);
-        expect(result[2].lines[0].lineNumber).toEqual(3);
-        expect(result[2].lines[1].lineNumber).toEqual(4);
-        expect(result[3].line.lineNumber).toEqual(5);
-        expect(result[3].lines[0].lineNumber).toEqual(6);
-        expect(result[3].lines[1].lineNumber).toEqual(7);
+        expect(result[0].lineNumber).toEqual(1);
+        expect(result[1].lineNumber).toEqual(2);
+        expect(result[2].line.lineNumber).toEqual(3);
+        expect(result[2].lines[0].lineNumber).toEqual(4);
+        expect(result[2].lines[1].lineNumber).toEqual(5);
+        expect(result[3].line.lineNumber).toEqual(6);
+        expect(result[3].lines[0].lineNumber).toEqual(7);
+        expect(result[3].lines[1].lineNumber).toEqual(8);
       });
     });
 
@@ -326,17 +326,24 @@ describe('Jobs Store Utils', () => {
     });
   });
 
-  describe('getIncrementalLineNumber', () => {
-    describe('when last line is 0', () => {
+  describe('getNextLineNumber', () => {
+    describe('when there is no previous log', () => {
+      it('returns 1', () => {
+        expect(getNextLineNumber([])).toEqual(1);
+        expect(getNextLineNumber(undefined)).toEqual(1);
+      });
+    });
+
+    describe('when last line is 1', () => {
       it('returns 1', () => {
         const log = [
           {
             content: [],
-            lineNumber: 0,
+            lineNumber: 1,
           },
         ];
 
-        expect(getIncrementalLineNumber(log)).toEqual(1);
+        expect(getNextLineNumber(log)).toEqual(2);
       });
     });
 
@@ -353,7 +360,7 @@ describe('Jobs Store Utils', () => {
           },
         ];
 
-        expect(getIncrementalLineNumber(log)).toEqual(102);
+        expect(getNextLineNumber(log)).toEqual(102);
       });
     });
 
@@ -374,7 +381,7 @@ describe('Jobs Store Utils', () => {
           },
         ];
 
-        expect(getIncrementalLineNumber(log)).toEqual(102);
+        expect(getNextLineNumber(log)).toEqual(102);
       });
     });
 
@@ -401,7 +408,7 @@ describe('Jobs Store Utils', () => {
           },
         ];
 
-        expect(getIncrementalLineNumber(log)).toEqual(104);
+        expect(getNextLineNumber(log)).toEqual(104);
       });
     });
   });
@@ -420,7 +427,7 @@ describe('Jobs Store Utils', () => {
                 text: 'Downloading',
               },
             ],
-            lineNumber: 0,
+            lineNumber: 1,
           },
           {
             offset: 2,
@@ -429,7 +436,7 @@ describe('Jobs Store Utils', () => {
                 text: 'log line',
               },
             ],
-            lineNumber: 1,
+            lineNumber: 2,
           },
         ]);
       });
@@ -448,7 +455,7 @@ describe('Jobs Store Utils', () => {
                 text: 'log line',
               },
             ],
-            lineNumber: 0,
+            lineNumber: 1,
           },
         ]);
       });
@@ -472,7 +479,7 @@ describe('Jobs Store Utils', () => {
                 },
               ],
               section: 'section',
-              lineNumber: 0,
+              lineNumber: 1,
             },
             lines: [],
           },
@@ -498,7 +505,7 @@ describe('Jobs Store Utils', () => {
                 },
               ],
               section: 'section',
-              lineNumber: 0,
+              lineNumber: 1,
             },
             lines: [
               {
@@ -509,7 +516,7 @@ describe('Jobs Store Utils', () => {
                   },
                 ],
                 section: 'section',
-                lineNumber: 1,
+                lineNumber: 2,
               },
             ],
           },
diff --git a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
index 17ebdf8725d..af7eca6a52d 100644
--- a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
+++ b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
@@ -9,7 +9,7 @@ exports[`Repository table row component renders a symlink table row 1`] = `
   >
     <a
       class="str-truncated tree-item-link"
-      data-qa-selector="file_name_link"
+      data-testid="file-name-link"
       href="https://test.com"
       title="test"
     >
@@ -65,7 +65,7 @@ exports[`Repository table row component renders table row 1`] = `
   >
     <a
       class="str-truncated tree-item-link"
-      data-qa-selector="file_name_link"
+      data-testid="file-name-link"
       href="https://test.com"
       title="test"
     >
@@ -121,7 +121,7 @@ exports[`Repository table row component renders table row for path with special
   >
     <a
       class="str-truncated tree-item-link"
-      data-qa-selector="file_name_link"
+      data-testid="file-name-link"
       href="https://test.com"
       title="test"
     >
diff --git a/spec/frontend/work_items/components/notes/work_item_add_note_spec.js b/spec/frontend/work_items/components/notes/work_item_add_note_spec.js
index 826fc2b2230..e08e954d79e 100644
--- a/spec/frontend/work_items/components/notes/work_item_add_note_spec.js
+++ b/spec/frontend/work_items/components/notes/work_item_add_note_spec.js
@@ -10,9 +10,11 @@ import WorkItemCommentLocked from '~/work_items/components/notes/work_item_comme
 import WorkItemCommentForm from '~/work_items/components/notes/work_item_comment_form.vue';
 import createNoteMutation from '~/work_items/graphql/notes/create_work_item_note.mutation.graphql';
 import { TRACKING_CATEGORY_SHOW } from '~/work_items/constants';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import {
   createWorkItemNoteResponse,
+  groupWorkItemByIidResponseFactory,
   workItemByIidResponseFactory,
   workItemQueryResponse,
 } from '../../mock_data';
@@ -29,6 +31,7 @@ describe('Work item add note', () => {
 
   const mutationSuccessHandler = jest.fn().mockResolvedValue(createWorkItemNoteResponse);
   let workItemResponseHandler;
+  let groupWorkItemResponseHandler;
 
   const findCommentForm = () => wrapper.findComponent(WorkItemCommentForm);
   const findTextarea = () => wrapper.findByTestId('note-reply-textarea');
@@ -40,27 +43,30 @@ describe('Work item add note', () => {
     canCreateNote = true,
     workItemIid = '1',
     workItemResponse = workItemByIidResponseFactory({ canUpdate, canCreateNote }),
+    groupWorkItemResponse = groupWorkItemByIidResponseFactory({ canUpdate, canCreateNote }),
     signedIn = true,
     isEditing = true,
+    isGroup = false,
     workItemType = 'Task',
     isInternalThread = false,
   } = {}) => {
     workItemResponseHandler = jest.fn().mockResolvedValue(workItemResponse);
+    groupWorkItemResponseHandler = jest.fn().mockResolvedValue(groupWorkItemResponse);
     if (signedIn) {
       window.gon.current_user_id = '1';
       window.gon.current_user_avatar_url = 'avatar.png';
     }
 
-    const apolloProvider = createMockApollo([
-      [workItemByIidQuery, workItemResponseHandler],
-      [createNoteMutation, mutationHandler],
-    ]);
-
     const { id } = workItemQueryResponse.data.workItem;
     wrapper = shallowMountExtended(WorkItemAddNote, {
-      apolloProvider,
+      apolloProvider: createMockApollo([
+        [workItemByIidQuery, workItemResponseHandler],
+        [groupWorkItemByIidQuery, groupWorkItemResponseHandler],
+        [createNoteMutation, mutationHandler],
+      ]),
       provide: {
         fullPath: 'test-project-path',
+        isGroup,
       },
       propsData: {
         workItemId: id,
@@ -272,16 +278,44 @@ describe('Work item add note', () => {
     });
   });
 
-  it('calls the work item query', async () => {
-    await createComponent();
+  describe('when project context', () => {
+    it('calls the project work item query', async () => {
+      await createComponent();
 
-    expect(workItemResponseHandler).toHaveBeenCalled();
+      expect(workItemResponseHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', async () => {
+      await createComponent();
+
+      expect(groupWorkItemResponseHandler).not.toHaveBeenCalled();
+    });
+
+    it('skips calling the project work item query when missing workItemIid', async () => {
+      await createComponent({ workItemIid: '', isEditing: false });
+
+      expect(workItemResponseHandler).not.toHaveBeenCalled();
+    });
   });
 
-  it('skips calling the work item query when missing workItemIid', async () => {
-    await createComponent({ workItemIid: '', isEditing: false });
+  describe('when group context', () => {
+    it('skips calling the project work item query', async () => {
+      await createComponent({ isGroup: true });
 
-    expect(workItemResponseHandler).not.toHaveBeenCalled();
+      expect(workItemResponseHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', async () => {
+      await createComponent({ isGroup: true });
+
+      expect(groupWorkItemResponseHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query when missing workItemIid', async () => {
+      await createComponent({ isGroup: true, workItemIid: '', isEditing: false });
+
+      expect(groupWorkItemResponseHandler).not.toHaveBeenCalled();
+    });
   });
 
   it('wrapper adds `internal-note` class when internal thread', async () => {
diff --git a/spec/frontend/work_items/components/notes/work_item_note_spec.js b/spec/frontend/work_items/components/notes/work_item_note_spec.js
index 9049a69656a..4bc58f19bd6 100644
--- a/spec/frontend/work_items/components/notes/work_item_note_spec.js
+++ b/spec/frontend/work_items/components/notes/work_item_note_spec.js
@@ -15,8 +15,10 @@ import NoteActions from '~/work_items/components/notes/work_item_note_actions.vu
 import WorkItemCommentForm from '~/work_items/components/notes/work_item_comment_form.vue';
 import updateWorkItemNoteMutation from '~/work_items/graphql/notes/update_work_item_note.mutation.graphql';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import {
+  groupWorkItemByIidResponseFactory,
   mockAssignees,
   mockWorkItemCommentNote,
   updateWorkItemMutationResponse,
@@ -68,6 +70,9 @@ describe('Work Item Note', () => {
   });
 
   const workItemResponseHandler = jest.fn().mockResolvedValue(workItemByIidResponseFactory());
+  const groupWorkItemResponseHandler = jest
+    .fn()
+    .mockResolvedValue(groupWorkItemByIidResponseFactory());
   const workItemByAuthoredByDifferentUser = jest
     .fn()
     .mockResolvedValue(mockWorkItemByDifferentUser);
@@ -90,6 +95,7 @@ describe('Work Item Note', () => {
   const createComponent = ({
     note = mockWorkItemCommentNote,
     isFirstNote = false,
+    isGroup = false,
     updateNoteMutationHandler = successHandler,
     workItemId = mockWorkItemId,
     updateWorkItemMutationHandler = updateWorkItemMutationSuccessHandler,
@@ -99,6 +105,7 @@ describe('Work Item Note', () => {
     wrapper = shallowMount(WorkItemNote, {
       provide: {
         fullPath: 'test-project-path',
+        isGroup,
       },
       propsData: {
         workItemId,
@@ -112,6 +119,7 @@ describe('Work Item Note', () => {
       },
       apolloProvider: mockApollo([
         [workItemByIidQuery, workItemByIidResponseHandler],
+        [groupWorkItemByIidQuery, groupWorkItemResponseHandler],
         [updateWorkItemNoteMutation, updateNoteMutationHandler],
         [updateWorkItemMutation, updateWorkItemMutationHandler],
       ]),
@@ -442,4 +450,32 @@ describe('Work Item Note', () => {
       expect(findAwardsList().props('workItemIid')).toBe('1');
     });
   });
+
+  describe('when project context', () => {
+    it('calls the project work item query', () => {
+      createComponent();
+
+      expect(workItemResponseHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', () => {
+      createComponent();
+
+      expect(groupWorkItemResponseHandler).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when group context', () => {
+    it('skips calling the project work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(workItemResponseHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(groupWorkItemResponseHandler).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/spec/frontend/work_items/components/work_item_actions_spec.js b/spec/frontend/work_items/components/work_item_actions_spec.js
index 0098a2e0864..ab8e95e5252 100644
--- a/spec/frontend/work_items/components/work_item_actions_spec.js
+++ b/spec/frontend/work_items/components/work_item_actions_spec.js
@@ -132,6 +132,7 @@ describe('WorkItemActions component', () => {
       },
       provide: {
         fullPath: mockFullPath,
+        isGroup: false,
         glFeatures: { workItemsMvc2: true },
       },
       mocks: {
diff --git a/spec/frontend/work_items/components/work_item_created_updated_spec.js b/spec/frontend/work_items/components/work_item_created_updated_spec.js
index f77c5481906..e4da5a68a82 100644
--- a/spec/frontend/work_items/components/work_item_created_updated_spec.js
+++ b/spec/frontend/work_items/components/work_item_created_updated_spec.js
@@ -7,12 +7,18 @@ import waitForPromises from 'helpers/wait_for_promises';
 import WorkItemCreatedUpdated from '~/work_items/components/work_item_created_updated.vue';
 import ConfidentialityBadge from '~/vue_shared/components/confidentiality_badge.vue';
 import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
-import { workItemByIidResponseFactory, mockAssignees } from '../mock_data';
+import {
+  groupWorkItemByIidResponseFactory,
+  mockAssignees,
+  workItemByIidResponseFactory,
+} from '../mock_data';
 
 describe('WorkItemCreatedUpdated component', () => {
   let wrapper;
   let successHandler;
+  let groupSuccessHandler;
 
   Vue.use(VueApollo);
 
@@ -30,19 +36,26 @@ describe('WorkItemCreatedUpdated component', () => {
     updatedAt,
     confidential = false,
     updateInProgress = false,
+    isGroup = false,
   } = {}) => {
-    const workItemQueryResponse = workItemByIidResponseFactory({
+    const workItemQueryResponse = workItemByIidResponseFactory({ author, updatedAt, confidential });
+    const groupWorkItemQueryResponse = groupWorkItemByIidResponseFactory({
       author,
       updatedAt,
       confidential,
     });
 
     successHandler = jest.fn().mockResolvedValue(workItemQueryResponse);
+    groupSuccessHandler = jest.fn().mockResolvedValue(groupWorkItemQueryResponse);
 
     wrapper = shallowMount(WorkItemCreatedUpdated, {
-      apolloProvider: createMockApollo([[workItemByIidQuery, successHandler]]),
+      apolloProvider: createMockApollo([
+        [workItemByIidQuery, successHandler],
+        [groupWorkItemByIidQuery, groupSuccessHandler],
+      ]),
       provide: {
         fullPath: '/some/project',
+        isGroup,
       },
       propsData: { workItemIid, updateInProgress },
       stubs: {
@@ -54,10 +67,44 @@ describe('WorkItemCreatedUpdated component', () => {
     await waitForPromises();
   };
 
-  it('skips the work item query when workItemIid is not defined', async () => {
-    await createComponent({ workItemIid: null });
+  describe('when project context', () => {
+    it('calls the project work item query', async () => {
+      await createComponent();
 
-    expect(successHandler).not.toHaveBeenCalled();
+      expect(successHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', async () => {
+      await createComponent();
+
+      expect(groupSuccessHandler).not.toHaveBeenCalled();
+    });
+
+    it('skips calling the project work item query when workItemIid is not defined', async () => {
+      await createComponent({ workItemIid: null });
+
+      expect(successHandler).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when group context', () => {
+    it('skips calling the project work item query', async () => {
+      await createComponent({ isGroup: true });
+
+      expect(successHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', async () => {
+      await createComponent({ isGroup: true });
+
+      expect(groupSuccessHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query when workItemIid is not defined', async () => {
+      await createComponent({ isGroup: true, workItemIid: null });
+
+      expect(groupSuccessHandler).not.toHaveBeenCalled();
+    });
   });
 
   it('shows work item type metadata with type and icon', async () => {
diff --git a/spec/frontend/work_items/components/work_item_description_spec.js b/spec/frontend/work_items/components/work_item_description_spec.js
index 8b9963b2476..98df0dc1627 100644
--- a/spec/frontend/work_items/components/work_item_description_spec.js
+++ b/spec/frontend/work_items/components/work_item_description_spec.js
@@ -13,9 +13,11 @@ import WorkItemDescription from '~/work_items/components/work_item_description.v
 import WorkItemDescriptionRendered from '~/work_items/components/work_item_description_rendered.vue';
 import { TRACKING_CATEGORY_SHOW } from '~/work_items/constants';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import { autocompleteDataSources, markdownPreviewPath } from '~/work_items/utils';
 import {
+  groupWorkItemByIidResponseFactory,
   updateWorkItemMutationResponse,
   workItemByIidResponseFactory,
   workItemQueryResponse,
@@ -33,6 +35,7 @@ describe('WorkItemDescription', () => {
 
   const mutationSuccessHandler = jest.fn().mockResolvedValue(updateWorkItemMutationResponse);
   let workItemResponseHandler;
+  let groupWorkItemResponseHandler;
 
   const findForm = () => wrapper.findComponent(GlForm);
   const findMarkdownEditor = () => wrapper.findComponent(MarkdownEditor);
@@ -51,14 +54,19 @@ describe('WorkItemDescription', () => {
     canUpdate = true,
     workItemResponse = workItemByIidResponseFactory({ canUpdate }),
     isEditing = false,
+    isGroup = false,
     workItemIid = '1',
   } = {}) => {
     workItemResponseHandler = jest.fn().mockResolvedValue(workItemResponse);
+    groupWorkItemResponseHandler = jest
+      .fn()
+      .mockResolvedValue(groupWorkItemByIidResponseFactory({ canUpdate }));
 
     const { id } = workItemQueryResponse.data.workItem;
     wrapper = shallowMount(WorkItemDescription, {
       apolloProvider: createMockApollo([
         [workItemByIidQuery, workItemResponseHandler],
+        [groupWorkItemByIidQuery, groupWorkItemResponseHandler],
         [updateWorkItemMutation, mutationHandler],
       ]),
       propsData: {
@@ -67,6 +75,7 @@ describe('WorkItemDescription', () => {
       },
       provide: {
         fullPath: 'test-project-path',
+        isGroup,
       },
     });
 
@@ -247,9 +256,31 @@ describe('WorkItemDescription', () => {
     });
   });
 
-  it('calls the work item query', async () => {
-    await createComponent();
+  describe('when project context', () => {
+    it('calls the project work item query', () => {
+      createComponent();
 
-    expect(workItemResponseHandler).toHaveBeenCalled();
+      expect(workItemResponseHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', () => {
+      createComponent();
+
+      expect(groupWorkItemResponseHandler).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when group context', () => {
+    it('skips calling the project work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(workItemResponseHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(groupWorkItemResponseHandler).toHaveBeenCalled();
+    });
   });
 });
diff --git a/spec/frontend/work_items/components/work_item_detail_spec.js b/spec/frontend/work_items/components/work_item_detail_spec.js
index fec6d0673c6..28826748cb0 100644
--- a/spec/frontend/work_items/components/work_item_detail_spec.js
+++ b/spec/frontend/work_items/components/work_item_detail_spec.js
@@ -28,12 +28,14 @@ import WorkItemStateToggleButton from '~/work_items/components/work_item_state_t
 import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
 import WorkItemTodos from '~/work_items/components/work_item_todos.vue';
 import { i18n } from '~/work_items/constants';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
 import updateWorkItemTaskMutation from '~/work_items/graphql/update_work_item_task.mutation.graphql';
 import workItemUpdatedSubscription from '~/work_items/graphql/work_item_updated.subscription.graphql';
 
 import {
+  groupWorkItemByIidResponseFactory,
   mockParent,
   workItemByIidResponseFactory,
   objectiveType,
@@ -49,6 +51,10 @@ describe('WorkItemDetail component', () => {
   Vue.use(VueApollo);
 
   const workItemQueryResponse = workItemByIidResponseFactory({ canUpdate: true, canDelete: true });
+  const groupWorkItemQueryResponse = groupWorkItemByIidResponseFactory({
+    canUpdate: true,
+    canDelete: true,
+  });
   const workItemQueryResponseWithCannotUpdate = workItemByIidResponseFactory({
     canUpdate: false,
     canDelete: false,
@@ -59,6 +65,7 @@ describe('WorkItemDetail component', () => {
     canDelete: true,
   });
   const successHandler = jest.fn().mockResolvedValue(workItemQueryResponse);
+  const groupSuccessHandler = jest.fn().mockResolvedValue(groupWorkItemQueryResponse);
   const showModalHandler = jest.fn();
   const { id } = workItemQueryResponse.data.workspace.workItems.nodes[0];
   const workItemUpdatedSubscriptionHandler = jest
@@ -92,6 +99,7 @@ describe('WorkItemDetail component', () => {
   const findWorkItemTypeIcon = () => wrapper.findComponent(WorkItemTypeIcon);
 
   const createComponent = ({
+    isGroup = false,
     isModal = false,
     updateInProgress = false,
     workItemIid = '1',
@@ -101,14 +109,13 @@ describe('WorkItemDetail component', () => {
     workItemsMvc2Enabled = false,
     linkedWorkItemsEnabled = false,
   } = {}) => {
-    const handlers = [
-      [workItemByIidQuery, handler],
-      [workItemUpdatedSubscription, workItemUpdatedSubscriptionHandler],
-      confidentialityMock,
-    ];
-
     wrapper = shallowMountExtended(WorkItemDetail, {
-      apolloProvider: createMockApollo(handlers),
+      apolloProvider: createMockApollo([
+        [workItemByIidQuery, handler],
+        [groupWorkItemByIidQuery, groupSuccessHandler],
+        [workItemUpdatedSubscription, workItemUpdatedSubscriptionHandler],
+        confidentialityMock,
+      ]),
       isLoggedIn: isLoggedIn(),
       propsData: {
         isModal,
@@ -131,6 +138,7 @@ describe('WorkItemDetail component', () => {
         hasIssuableHealthStatusFeature: true,
         projectNamespace: 'namespace',
         fullPath: 'group/project',
+        isGroup,
         reportAbusePath: '/report/abuse/path',
       },
       stubs: {
@@ -484,25 +492,64 @@ describe('WorkItemDetail component', () => {
     expect(findAlert().text()).toBe(updateError);
   });
 
-  it('calls the work item query', async () => {
-    createComponent();
-    await waitForPromises();
+  describe('when project context', () => {
+    it('calls the project work item query', async () => {
+      createComponent();
+      await waitForPromises();
 
-    expect(successHandler).toHaveBeenCalledWith({ fullPath: 'group/project', iid: '1' });
+      expect(successHandler).toHaveBeenCalledWith({ fullPath: 'group/project', iid: '1' });
+    });
+
+    it('skips calling the group work item query', async () => {
+      createComponent();
+      await waitForPromises();
+
+      expect(groupSuccessHandler).not.toHaveBeenCalled();
+    });
+
+    it('skips calling the project work item query when there is no workItemIid', async () => {
+      createComponent({ workItemIid: null });
+      await waitForPromises();
+
+      expect(successHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the project work item query when isModal=true', async () => {
+      createComponent({ isModal: true });
+      await waitForPromises();
+
+      expect(successHandler).toHaveBeenCalledWith({ fullPath: 'group/project', iid: '1' });
+    });
   });
 
-  it('skips the work item query when there is no workItemIid', async () => {
-    createComponent({ workItemIid: null });
-    await waitForPromises();
+  describe('when group context', () => {
+    it('skips calling the project work item query', async () => {
+      createComponent({ isGroup: true });
+      await waitForPromises();
 
-    expect(successHandler).not.toHaveBeenCalled();
-  });
+      expect(successHandler).not.toHaveBeenCalled();
+    });
 
-  it('calls the work item query when isModal=true', async () => {
-    createComponent({ isModal: true });
-    await waitForPromises();
+    it('calls the group work item query', async () => {
+      createComponent({ isGroup: true });
+      await waitForPromises();
 
-    expect(successHandler).toHaveBeenCalledWith({ fullPath: 'group/project', iid: '1' });
+      expect(groupSuccessHandler).toHaveBeenCalledWith({ fullPath: 'group/project', iid: '1' });
+    });
+
+    it('skips calling the group work item query when there is no workItemIid', async () => {
+      createComponent({ isGroup: true, workItemIid: null });
+      await waitForPromises();
+
+      expect(groupSuccessHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query when isModal=true', async () => {
+      createComponent({ isGroup: true, isModal: true });
+      await waitForPromises();
+
+      expect(groupSuccessHandler).toHaveBeenCalledWith({ fullPath: 'group/project', iid: '1' });
+    });
   });
 
   describe('hierarchy widget', () => {
diff --git a/spec/frontend/work_items/components/work_item_labels_spec.js b/spec/frontend/work_items/components/work_item_labels_spec.js
index 4a20e654060..1e173776c68 100644
--- a/spec/frontend/work_items/components/work_item_labels_spec.js
+++ b/spec/frontend/work_items/components/work_item_labels_spec.js
@@ -7,10 +7,12 @@ import { mountExtended } from 'helpers/vue_test_utils_helper';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import labelSearchQuery from '~/sidebar/components/labels/labels_select_widget/graphql/project_labels.query.graphql';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import WorkItemLabels from '~/work_items/components/work_item_labels.vue';
 import { i18n, I18N_WORK_ITEM_ERROR_FETCHING_LABELS } from '~/work_items/constants';
 import {
+  groupWorkItemByIidResponseFactory,
   projectLabelsResponse,
   mockLabels,
   workItemByIidResponseFactory,
@@ -32,6 +34,9 @@ describe('WorkItemLabels component', () => {
   const workItemQuerySuccess = jest
     .fn()
     .mockResolvedValue(workItemByIidResponseFactory({ labels: null }));
+  const groupWorkItemQuerySuccess = jest
+    .fn()
+    .mockResolvedValue(groupWorkItemByIidResponseFactory({ labels: null }));
   const successSearchQueryHandler = jest.fn().mockResolvedValue(projectLabelsResponse);
   const successUpdateWorkItemMutationHandler = jest
     .fn()
@@ -40,6 +45,7 @@ describe('WorkItemLabels component', () => {
 
   const createComponent = ({
     canUpdate = true,
+    isGroup = false,
     workItemQueryHandler = workItemQuerySuccess,
     searchQueryHandler = successSearchQueryHandler,
     updateWorkItemMutationHandler = successUpdateWorkItemMutationHandler,
@@ -48,11 +54,13 @@ describe('WorkItemLabels component', () => {
     wrapper = mountExtended(WorkItemLabels, {
       apolloProvider: createMockApollo([
         [workItemByIidQuery, workItemQueryHandler],
+        [groupWorkItemByIidQuery, groupWorkItemQuerySuccess],
         [labelSearchQuery, searchQueryHandler],
         [updateWorkItemMutation, updateWorkItemMutationHandler],
       ]),
       provide: {
         fullPath: 'test-project-path',
+        isGroup,
       },
       propsData: {
         workItemId,
@@ -244,17 +252,49 @@ describe('WorkItemLabels component', () => {
     });
   });
 
-  it('calls the work item query', async () => {
-    createComponent();
-    await waitForPromises();
+  describe('when project context', () => {
+    it('calls the project work item query', async () => {
+      createComponent();
+      await waitForPromises();
 
-    expect(workItemQuerySuccess).toHaveBeenCalled();
+      expect(workItemQuerySuccess).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', async () => {
+      createComponent();
+      await waitForPromises();
+
+      expect(groupWorkItemQuerySuccess).not.toHaveBeenCalled();
+    });
+
+    it('skips calling the project work item query when missing workItemIid', async () => {
+      createComponent({ workItemIid: '' });
+      await waitForPromises();
+
+      expect(workItemQuerySuccess).not.toHaveBeenCalled();
+    });
   });
 
-  it('skips calling the work item query when missing workItemIid', async () => {
-    createComponent({ workItemIid: '' });
-    await waitForPromises();
+  describe('when group context', () => {
+    it('skips calling the project work item query', async () => {
+      createComponent({ isGroup: true });
+      await waitForPromises();
 
-    expect(workItemQuerySuccess).not.toHaveBeenCalled();
+      expect(workItemQuerySuccess).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', async () => {
+      createComponent({ isGroup: true });
+      await waitForPromises();
+
+      expect(groupWorkItemQuerySuccess).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query when missing workItemIid', async () => {
+      createComponent({ isGroup: true, workItemIid: '' });
+      await waitForPromises();
+
+      expect(groupWorkItemQuerySuccess).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_children_wrapper_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_children_wrapper_spec.js
index cd077fbf705..be44ff7b7d9 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_children_wrapper_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_children_wrapper_spec.js
@@ -54,6 +54,7 @@ describe('WorkItemChildrenWrapper', () => {
       apolloProvider: mockApollo,
       provide: {
         fullPath: 'test/project',
+        isGroup: false,
       },
       propsData: {
         workItemType,
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
index aaab22fd18d..fd068d3dd40 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
@@ -64,6 +64,7 @@ describe('WorkItemLinksForm', () => {
       provide: {
         fullPath: 'project/path',
         hasIterationsFeature,
+        isGroup: false,
       },
     });
 
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
index e24cfe27616..111fb5d8458 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
@@ -13,9 +13,11 @@ import WorkItemChildrenWrapper from '~/work_items/components/work_item_links/wor
 import WorkItemDetailModal from '~/work_items/components/work_item_detail_modal.vue';
 import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
 import { FORM_TYPES } from '~/work_items/constants';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import {
   getIssueDetailsResponse,
+  groupWorkItemByIidResponseFactory,
   workItemHierarchyResponse,
   workItemHierarchyEmptyResponse,
   workItemHierarchyNoUpdatePermissionResponse,
@@ -32,6 +34,9 @@ describe('WorkItemLinks', () => {
   let mockApollo;
 
   const responseWithAddChildPermission = jest.fn().mockResolvedValue(workItemHierarchyResponse);
+  const groupResponseWithAddChildPermission = jest
+    .fn()
+    .mockResolvedValue(groupWorkItemByIidResponseFactory());
   const responseWithoutAddChildPermission = jest
     .fn()
     .mockResolvedValue(workItemByIidResponseFactory({ adminParentLink: false }));
@@ -40,10 +45,12 @@ describe('WorkItemLinks', () => {
     fetchHandler = responseWithAddChildPermission,
     issueDetailsQueryHandler = jest.fn().mockResolvedValue(getIssueDetailsResponse()),
     hasIterationsFeature = false,
+    isGroup = false,
   } = {}) => {
     mockApollo = createMockApollo(
       [
         [workItemByIidQuery, fetchHandler],
+        [groupWorkItemByIidQuery, groupResponseWithAddChildPermission],
         [issueDetailsQuery, issueDetailsQueryHandler],
       ],
       resolvers,
@@ -54,6 +61,7 @@ describe('WorkItemLinks', () => {
       provide: {
         fullPath: 'project/path',
         hasIterationsFeature,
+        isGroup,
         reportAbusePath: '/report/abuse/path',
       },
       propsData: {
@@ -243,4 +251,32 @@ describe('WorkItemLinks', () => {
       expect(findAbuseCategorySelector().exists()).toBe(false);
     });
   });
+
+  describe('when project context', () => {
+    it('calls the project work item query', () => {
+      createComponent();
+
+      expect(responseWithAddChildPermission).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', () => {
+      createComponent();
+
+      expect(groupResponseWithAddChildPermission).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when group context', () => {
+    it('skips calling the project work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(responseWithAddChildPermission).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(groupResponseWithAddChildPermission).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/spec/frontend/work_items/components/work_item_relationships/work_item_relationships_spec.js b/spec/frontend/work_items/components/work_item_relationships/work_item_relationships_spec.js
index 04b6e3d8df6..83f4cf5081e 100644
--- a/spec/frontend/work_items/components/work_item_relationships/work_item_relationships_spec.js
+++ b/spec/frontend/work_items/components/work_item_relationships/work_item_relationships_spec.js
@@ -10,9 +10,11 @@ import WidgetWrapper from '~/work_items/components/widget_wrapper.vue';
 import WorkItemRelationships from '~/work_items/components/work_item_relationships/work_item_relationships.vue';
 import WorkItemRelationshipList from '~/work_items/components/work_item_relationships/work_item_relationship_list.vue';
 import WorkItemAddRelationshipForm from '~/work_items/components/work_item_relationships/work_item_add_relationship_form.vue';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
 import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 
 import {
+  groupWorkItemByIidResponseFactory,
   workItemByIidResponseFactory,
   mockLinkedItems,
   mockBlockingLinkedItem,
@@ -25,21 +27,29 @@ describe('WorkItemRelationships', () => {
   const emptyLinkedWorkItemsQueryHandler = jest
     .fn()
     .mockResolvedValue(workItemByIidResponseFactory());
+  const groupWorkItemsQueryHandler = jest
+    .fn()
+    .mockResolvedValue(groupWorkItemByIidResponseFactory());
 
   const createComponent = async ({
     workItemQueryHandler = emptyLinkedWorkItemsQueryHandler,
     workItemType = 'Task',
+    isGroup = false,
   } = {}) => {
-    const mockApollo = createMockApollo([[workItemByIidQuery, workItemQueryHandler]]);
-
     wrapper = shallowMountExtended(WorkItemRelationships, {
-      apolloProvider: mockApollo,
+      apolloProvider: createMockApollo([
+        [workItemByIidQuery, workItemQueryHandler],
+        [groupWorkItemByIidQuery, groupWorkItemsQueryHandler],
+      ]),
       propsData: {
         workItemId: 'gid://gitlab/WorkItem/1',
         workItemIid: '1',
         workItemFullPath: 'test-project-path',
         workItemType,
       },
+      provide: {
+        isGroup,
+      },
     });
 
     await waitForPromises();
@@ -120,4 +130,32 @@ describe('WorkItemRelationships', () => {
     await findWorkItemRelationshipForm().vm.$emit('cancel');
     expect(findWorkItemRelationshipForm().exists()).toBe(false);
   });
+
+  describe('when project context', () => {
+    it('calls the project work item query', () => {
+      createComponent();
+
+      expect(emptyLinkedWorkItemsQueryHandler).toHaveBeenCalled();
+    });
+
+    it('skips calling the group work item query', () => {
+      createComponent();
+
+      expect(groupWorkItemsQueryHandler).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when group context', () => {
+    it('skips calling the project work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(emptyLinkedWorkItemsQueryHandler).not.toHaveBeenCalled();
+    });
+
+    it('calls the group work item query', () => {
+      createComponent({ isGroup: true });
+
+      expect(groupWorkItemsQueryHandler).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/spec/frontend/work_items/components/work_item_todos_spec.js b/spec/frontend/work_items/components/work_item_todos_spec.js
index 454bd97bbee..c76cdbcee53 100644
--- a/spec/frontend/work_items/components/work_item_todos_spec.js
+++ b/spec/frontend/work_items/components/work_item_todos_spec.js
@@ -86,6 +86,9 @@ describe('WorkItemTodo component', () => {
         workItemFullpath: mockWorkItemFullpath,
         currentUserTodos,
       },
+      provide: {
+        isGroup: false,
+      },
     });
   };
 
diff --git a/spec/frontend/work_items/graphql/cache_utils_spec.js b/spec/frontend/work_items/graphql/cache_utils_spec.js
index 6d0083790d1..64ef1bdbb88 100644
--- a/spec/frontend/work_items/graphql/cache_utils_spec.js
+++ b/spec/frontend/work_items/graphql/cache_utils_spec.js
@@ -43,7 +43,7 @@ describe('work items graphql cache utils', () => {
         title: 'New child',
       };
 
-      addHierarchyChild(mockCache, fullPath, iid, child);
+      addHierarchyChild({ cache: mockCache, fullPath, iid, workItem: child });
 
       expect(mockCache.writeQuery).toHaveBeenCalledWith({
         query: workItemByIidQuery,
@@ -88,7 +88,7 @@ describe('work items graphql cache utils', () => {
         title: 'New child',
       };
 
-      addHierarchyChild(mockCache, fullPath, iid, child);
+      addHierarchyChild({ cache: mockCache, fullPath, iid, workItem: child });
 
       expect(mockCache.writeQuery).not.toHaveBeenCalled();
     });
@@ -106,7 +106,7 @@ describe('work items graphql cache utils', () => {
         title: 'Child',
       };
 
-      removeHierarchyChild(mockCache, fullPath, iid, childToRemove);
+      removeHierarchyChild({ cache: mockCache, fullPath, iid, workItem: childToRemove });
 
       expect(mockCache.writeQuery).toHaveBeenCalledWith({
         query: workItemByIidQuery,
@@ -145,7 +145,7 @@ describe('work items graphql cache utils', () => {
         title: 'Child',
       };
 
-      removeHierarchyChild(mockCache, fullPath, iid, childToRemove);
+      removeHierarchyChild({ cache: mockCache, fullPath, iid, workItem: childToRemove });
 
       expect(mockCache.writeQuery).not.toHaveBeenCalled();
     });
diff --git a/spec/frontend/work_items/mock_data.js b/spec/frontend/work_items/mock_data.js
index 0250834fa85..9cd76c0651e 100644
--- a/spec/frontend/work_items/mock_data.js
+++ b/spec/frontend/work_items/mock_data.js
@@ -833,6 +833,21 @@ export const workItemByIidResponseFactory = (options) => {
   };
 };
 
+export const groupWorkItemByIidResponseFactory = (options) => {
+  const response = workItemResponseFactory(options);
+  return {
+    data: {
+      workspace: {
+        __typename: 'Group',
+        id: 'gid://gitlab/Group/1',
+        workItems: {
+          nodes: [response.data.workItem],
+        },
+      },
+    },
+  };
+};
+
 export const updateWorkItemMutationResponseFactory = (options) => {
   const response = workItemResponseFactory(options);
   return {
diff --git a/spec/frontend/work_items/pages/create_work_item_spec.js b/spec/frontend/work_items/pages/create_work_item_spec.js
index 87dbb18dcc4..527f5890338 100644
--- a/spec/frontend/work_items/pages/create_work_item_spec.js
+++ b/spec/frontend/work_items/pages/create_work_item_spec.js
@@ -65,6 +65,7 @@ describe('Create work item component', () => {
       },
       provide: {
         fullPath: 'full-path',
+        isGroup: false,
       },
     });
   };
diff --git a/spec/frontend/work_items/router_spec.js b/spec/frontend/work_items/router_spec.js
index 79ba31e7012..d4efcf78189 100644
--- a/spec/frontend/work_items/router_spec.js
+++ b/spec/frontend/work_items/router_spec.js
@@ -41,6 +41,7 @@ describe('Work items router', () => {
       router,
       provide: {
         fullPath: 'full-path',
+        isGroup: false,
         issuesListPath: 'full-path/-/issues',
         hasIssueWeightsFeature: false,
         hasIterationsFeature: false,
diff --git a/spec/helpers/wiki_helper_spec.rb b/spec/helpers/wiki_helper_spec.rb
index 497cd5d1e7f..6eaa603a43d 100644
--- a/spec/helpers/wiki_helper_spec.rb
+++ b/spec/helpers/wiki_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe WikiHelper do
+RSpec.describe WikiHelper, feature_category: :wiki do
   describe '#wiki_page_title' do
     let_it_be(:page) { create(:wiki_page) }
 
@@ -75,38 +75,42 @@ RSpec.describe WikiHelper do
 
   describe '#wiki_sort_controls' do
     let(:wiki) { create(:project_wiki) }
-    let(:wiki_link) { helper.wiki_sort_controls(wiki, direction) }
-    let(:classes) { "gl-button btn btn-default btn-icon has-tooltip reverse-sort-btn rspec-reverse-sort" }
 
-    def expected_link(direction, icon_class)
+    before do
+      allow(Pajamas::ButtonComponent).to receive(:new).and_call_original
+    end
+
+    def expected_link_args(direction, icon_class)
       path = "/#{wiki.project.full_path}/-/wikis/pages?direction=#{direction}"
       title = direction == 'desc' ? _('Sort direction: Ascending') : _('Sort direction: Descending')
-      helper.link_to(path, type: 'button', class: classes, title: title) do
-        helper.sprite_icon("sort-#{icon_class}")
+      {
+        href: path,
+        icon: "sort-#{icon_class}",
+        button_options: hash_including(title: title)
+      }
+    end
+
+    context 'when initially rendering' do
+      it 'uses default values' do
+        helper.wiki_sort_controls(wiki, nil)
+
+        expect(Pajamas::ButtonComponent).to have_received(:new).with(expected_link_args('desc', 'lowest'))
       end
     end
 
-    context 'initial call' do
-      let(:direction) { nil }
-
-      it 'renders with default values' do
-        expect(wiki_link).to eq(expected_link('desc', 'lowest'))
-      end
-    end
-
-    context 'sort by asc order' do
-      let(:direction) { 'asc' }
-
+    context 'when the current sort order is ascending' do
       it 'renders a link with opposite direction' do
-        expect(wiki_link).to eq(expected_link('desc', 'lowest'))
+        helper.wiki_sort_controls(wiki, 'asc')
+
+        expect(Pajamas::ButtonComponent).to have_received(:new).with(expected_link_args('desc', 'lowest'))
       end
     end
 
-    context 'sort by desc order' do
-      let(:direction) { 'desc' }
-
+    context 'when the current sort order is descending' do
       it 'renders a link with opposite direction' do
-        expect(wiki_link).to eq(expected_link('asc', 'highest'))
+        helper.wiki_sort_controls(wiki, 'desc')
+
+        expect(Pajamas::ButtonComponent).to have_received(:new).with(expected_link_args('asc', 'highest'))
       end
     end
   end
diff --git a/spec/lib/bulk_imports/common/transformers/user_reference_transformer_spec.rb b/spec/lib/bulk_imports/common/transformers/user_reference_transformer_spec.rb
deleted file mode 100644
index ba74c173794..00000000000
--- a/spec/lib/bulk_imports/common/transformers/user_reference_transformer_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe BulkImports::Common::Transformers::UserReferenceTransformer do
-  describe '#transform' do
-    let_it_be(:user) { create(:user) }
-    let_it_be(:group) { create(:group) }
-    let_it_be(:bulk_import) { create(:bulk_import) }
-    let_it_be(:entity) { create(:bulk_import_entity, bulk_import: bulk_import, group: group) }
-    let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
-    let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
-
-    let(:hash) do
-      {
-        'user' => {
-          'public_email' => email
-        }
-      }
-    end
-
-    before do
-      group.add_developer(user)
-    end
-
-    shared_examples 'sets user_id and removes user key' do
-      it 'sets found user_id and removes user key' do
-        transformed_hash = subject.transform(context, hash)
-
-        expect(transformed_hash['user']).to be_nil
-        expect(transformed_hash['user_id']).to eq(user.id)
-      end
-    end
-
-    context 'when user can be found by email' do
-      let(:email) { user.email }
-
-      include_examples 'sets user_id and removes user key'
-    end
-
-    context 'when user cannot be found by email' do
-      let(:user) { bulk_import.user }
-      let(:email) { nil }
-
-      include_examples 'sets user_id and removes user key'
-    end
-
-    context 'when there is no data to transform' do
-      it 'returns' do
-        expect(subject.transform(nil, nil)).to be_nil
-      end
-    end
-
-    context 'when custom reference is provided' do
-      shared_examples 'updates provided reference' do |reference|
-        let(:hash) do
-          {
-            'author' => {
-              'public_email' => user.email
-            }
-          }
-        end
-
-        it 'updates provided reference' do
-          transformer = described_class.new(reference: reference)
-          result = transformer.transform(context, hash)
-
-          expect(result['author']).to be_nil
-          expect(result['author_id']).to eq(user.id)
-        end
-      end
-
-      include_examples 'updates provided reference', 'author'
-      include_examples 'updates provided reference', :author
-    end
-  end
-end
diff --git a/spec/lib/gitlab/prometheus/query_variables_spec.rb b/spec/lib/gitlab/prometheus/query_variables_spec.rb
deleted file mode 100644
index d0947eef2d9..00000000000
--- a/spec/lib/gitlab/prometheus/query_variables_spec.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::Prometheus::QueryVariables do
-  describe '.call' do
-    let_it_be_with_refind(:environment) { create(:environment) }
-
-    let(:project) { environment.project }
-    let(:slug) { environment.slug }
-    let(:params) { {} }
-
-    subject { described_class.call(environment, **params) }
-
-    it { is_expected.to include(ci_environment_slug: slug) }
-    it { is_expected.to include(ci_project_name: project.name) }
-    it { is_expected.to include(ci_project_namespace: project.namespace.name) }
-    it { is_expected.to include(ci_project_path: project.full_path) }
-    it { is_expected.to include(ci_environment_name: environment.name) }
-
-    it do
-      is_expected.to include(environment_filter:
-                             %[container_name!="POD",environment="#{slug}"])
-    end
-
-    context 'without deployment platform' do
-      it { is_expected.to include(kube_namespace: '') }
-    end
-
-    context 'with deployment platform' do
-      context 'with project cluster' do
-        let(:kube_namespace) { environment.deployment_namespace }
-
-        before do
-          create(:cluster, :project, :provided_by_user, projects: [project])
-        end
-
-        it { is_expected.to include(kube_namespace: kube_namespace) }
-      end
-
-      context 'with group cluster' do
-        let(:cluster) { create(:cluster, :group, :provided_by_user, groups: [group]) }
-        let(:group) { create(:group) }
-        let(:project2) { create(:project) }
-        let(:kube_namespace) { k8s_ns.namespace }
-
-        let!(:k8s_ns) { create(:cluster_kubernetes_namespace, cluster: cluster, project: project, environment: environment) }
-        let!(:k8s_ns2) { create(:cluster_kubernetes_namespace, cluster: cluster, project: project2, environment: environment) }
-
-        before do
-          group.projects << project
-          group.projects << project2
-        end
-
-        it { is_expected.to include(kube_namespace: kube_namespace) }
-      end
-    end
-
-    context '__range' do
-      context 'when start_time and end_time are present' do
-        let(:params) do
-          {
-            start_time: Time.rfc3339('2020-05-29T07:23:05.008Z'),
-            end_time: Time.rfc3339('2020-05-29T15:23:05.008Z')
-          }
-        end
-
-        it { is_expected.to include(__range: "#{8.hours.to_i}s") }
-      end
-
-      context 'when start_time and end_time are not present' do
-        it { is_expected.to include(__range: nil) }
-      end
-
-      context 'when end_time is not present' do
-        let(:params) do
-          {
-            start_time: Time.rfc3339('2020-05-29T07:23:05.008Z')
-          }
-        end
-
-        it { is_expected.to include(__range: nil) }
-      end
-
-      context 'when start_time is not present' do
-        let(:params) do
-          {
-            end_time: Time.rfc3339('2020-05-29T07:23:05.008Z')
-          }
-        end
-
-        it { is_expected.to include(__range: nil) }
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb
index 49d6c0f9f26..7f40e762307 100644
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
@@ -125,16 +125,6 @@ RSpec.describe Gitlab::Shell do
 
     let(:storage) { Gitlab.config.repositories.storages.each_key.first }
 
-    describe '#add_namespace' do
-      it 'creates a namespace' do
-        Gitlab::GitalyClient::NamespaceService.allow do
-          subject.add_namespace(storage, "mepmep")
-
-          expect(Gitlab::GitalyClient::NamespaceService.new(storage).exists?("mepmep")).to be(true)
-        end
-      end
-    end
-
     describe '#repository_exists?' do
       context 'when the repository does not exist' do
         it 'returns false' do
@@ -150,17 +140,5 @@ RSpec.describe Gitlab::Shell do
         end
       end
     end
-
-    describe '#mv_namespace' do
-      it 'renames the namespace' do
-        Gitlab::GitalyClient::NamespaceService.allow do
-          subject.add_namespace(storage, "mepmep")
-          subject.mv_namespace(storage, "mepmep", "2mep")
-
-          expect(Gitlab::GitalyClient::NamespaceService.new(storage).exists?("mepmep")).to be(false)
-          expect(Gitlab::GitalyClient::NamespaceService.new(storage).exists?("2mep")).to be(true)
-        end
-      end
-    end
   end
 end
diff --git a/spec/models/integrations/telegram_spec.rb b/spec/models/integrations/telegram_spec.rb
index c3a66c84f09..4c814dedd66 100644
--- a/spec/models/integrations/telegram_spec.rb
+++ b/spec/models/integrations/telegram_spec.rb
@@ -50,4 +50,12 @@ RSpec.describe Integrations::Telegram, feature_category: :integrations do
       end
     end
   end
+
+  describe '#avatar_url' do
+    it 'returns the avatar image path' do
+      expect(subject.avatar_url).to eq(
+        ActionController::Base.helpers.image_path('illustrations/third-party-logos/integrations-logos/telegram.svg')
+      )
+    end
+  end
 end
diff --git a/spec/requests/api/ci/pipeline_schedules_spec.rb b/spec/requests/api/ci/pipeline_schedules_spec.rb
index d760e4ddf28..fb67d7cb4fb 100644
--- a/spec/requests/api/ci/pipeline_schedules_spec.rb
+++ b/spec/requests/api/ci/pipeline_schedules_spec.rb
@@ -176,7 +176,7 @@ RSpec.describe API::Ci::PipelineSchedules, feature_category: :continuous_integra
     end
 
     context 'with public project' do
-      let_it_be(:project) { create(:project, :repository, :public, public_builds: false) }
+      let_it_be(:project) { create(:project, :repository, :public, public_builds: true) }
 
       it_behaves_like 'request with schedule ownership'
       it_behaves_like 'request with project permissions'
@@ -204,6 +204,30 @@ RSpec.describe API::Ci::PipelineSchedules, feature_category: :continuous_integra
           expect(json_response).not_to have_key('variables')
         end
       end
+
+      context 'when public pipelines are disabled' do
+        let_it_be(:project) { create(:project, :repository, :public, public_builds: false) }
+
+        context 'authenticated user with no project permissions' do
+          it 'does not return pipeline_schedule' do
+            get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", user)
+
+            expect(response).to have_gitlab_http_status(:not_found)
+          end
+        end
+
+        context 'authenticated user with insufficient project permissions' do
+          before do
+            project.add_guest(user)
+          end
+
+          it 'returns pipeline_schedule with no variables' do
+            get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", user)
+
+            expect(response).to have_gitlab_http_status(:not_found)
+          end
+        end
+      end
     end
   end
 
@@ -294,7 +318,7 @@ RSpec.describe API::Ci::PipelineSchedules, feature_category: :continuous_integra
     end
 
     context 'with public project' do
-      let_it_be(:project) { create(:project, :repository, :public, public_builds: false) }
+      let_it_be(:project) { create(:project, :repository, :public, public_builds: true) }
 
       it_behaves_like 'request with schedule ownership'
       it_behaves_like 'request with project permissions'
@@ -308,6 +332,18 @@ RSpec.describe API::Ci::PipelineSchedules, feature_category: :continuous_integra
           expect(response).to return_pipeline_schedule_pipelines_successfully
         end
       end
+
+      context 'when public pipelines are disabled' do
+        let_it_be(:project) { create(:project, :repository, :public, public_builds: false) }
+
+        context 'authenticated user with no project permissions' do
+          it 'does not return the details of pipelines triggered from the pipeline schedule' do
+            get api(url, user)
+
+            expect(response).to have_gitlab_http_status(:not_found)
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb b/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb
index 76adce6ff1b..8219cdcd673 100644
--- a/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb
+++ b/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb
@@ -115,6 +115,31 @@ RSpec.describe 'Query.project.pipelineSchedules', feature_category: :continuous_
 
       expect(edit_path).to be nil
     end
+
+    it 'returns the pipeline schedules data' do
+      expect(pipeline_schedule_graphql_data['id']).to eq(pipeline_schedule.to_global_id.to_s)
+    end
+
+    context 'when public pipelines are disabled' do
+      before do
+        project.update!(public_builds: false)
+        post_graphql(query, current_user: another_user)
+      end
+
+      it 'does not return any data' do
+        expect(pipeline_schedule_graphql_data).to be_nil
+      end
+
+      context 'when the user is authorized' do
+        before_all do
+          project.add_developer(another_user)
+        end
+
+        it 'returns the pipeline schedules data' do
+          expect(pipeline_schedule_graphql_data['id']).to eq(pipeline_schedule.to_global_id.to_s)
+        end
+      end
+    end
   end
 
   it 'avoids N+1 queries' do
diff --git a/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb b/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb
index 9fce5f8497f..497ae1cc13f 100644
--- a/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb
+++ b/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb
@@ -61,6 +61,17 @@ RSpec.describe 'Setting issues crm contacts', feature_category: :service_desk do
         expect(graphql_data_at(:issue_set_crm_contacts, :issue, :customer_relations_contacts, :nodes))
           .to match_array(expected_contacts(mutation_contacts))
       end
+
+      context 'with an empty list of contacts' do
+        let(:mutation_contacts) { [] }
+
+        it 'removes all contacts' do
+          post_graphql_mutation(mutation, current_user: user)
+
+          expect(graphql_data_at(:issue_set_crm_contacts, :issue, :customer_relations_contacts, :nodes))
+            .to be_empty
+        end
+      end
     end
 
     context 'append' do
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 5973649a9d7..d2af9286a92 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -4619,6 +4619,160 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_profile
     end
   end
 
+  describe 'POST /user/personal_access_tokens' do
+    using RSpec::Parameterized::TableSyntax
+
+    let(:name) { 'new pat' }
+    let(:scopes) { %w[k8s_proxy] }
+    let(:path) { "/user/personal_access_tokens" }
+    let(:params) { { name: name, scopes: scopes } }
+
+    let(:all_scopes) do
+      ::Gitlab::Auth::API_SCOPES + ::Gitlab::Auth::AI_FEATURES_SCOPES + ::Gitlab::Auth::OPENID_SCOPES +
+        ::Gitlab::Auth::PROFILE_SCOPES + ::Gitlab::Auth::REPOSITORY_SCOPES + ::Gitlab::Auth::REGISTRY_SCOPES +
+        ::Gitlab::Auth::OBSERVABILITY_SCOPES + ::Gitlab::Auth::ADMIN_SCOPES
+    end
+
+    context 'when user_pat_rest_api feature flag is disabled' do
+      before do
+        stub_feature_flags(user_pat_rest_api: false)
+      end
+
+      it 'does not create a personal access token' do
+        post api(path, user), params: params
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response['message']).to eq('400 Bad request - Endpoint is disabled via user_pat_rest_api feature flag. Please contact your administrator to enable it.')
+      end
+    end
+
+    context 'when user_pat_rest_api feature flag is enabled' do
+      before do
+        stub_feature_flags(user_pat_rest_api: true)
+      end
+
+      it 'returns error if required attributes are missing' do
+        post api(path, user)
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response['error']).to eq('name is missing, scopes is missing')
+      end
+
+      where(:disallowed_scopes) do
+        all_scopes - [::Gitlab::Auth::K8S_PROXY_SCOPE]
+      end
+
+      with_them do
+        it 'returns error if scopes has disallowed value' do
+          post api(path, user), params: params.merge({ scopes: [disallowed_scopes] })
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(json_response['error']).to eq('scopes does not have a valid value')
+        end
+      end
+
+      it 'returns error if one of the scopes is not allowed' do
+        post api(path, user), params: params.merge({ scopes: [::Gitlab::Auth::K8S_PROXY_SCOPE, ::Gitlab::Auth::API_SCOPE] })
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response['error']).to eq('scopes does not have a valid value')
+      end
+
+      it 'returns a 401 error when not authenticated' do
+        post api(path), params: params
+
+        expect(response).to have_gitlab_http_status(:unauthorized)
+        expect(json_response['message']).to eq('401 Unauthorized')
+      end
+
+      it 'returns a 403 error when called with a read_api-scoped PAT' do
+        read_only_pat = create(:personal_access_token, scopes: ['read_api'], user: user)
+        post api(path, personal_access_token: read_only_pat), params: params
+
+        expect(response).to have_gitlab_http_status(:forbidden)
+      end
+
+      context 'when scopes are empty' do
+        let(:scopes) { [] }
+
+        it 'returns an error when no scopes are given' do
+          post api(path, user), params: params
+
+          expect(response).to have_gitlab_http_status(:unprocessable_entity)
+          expect(json_response['message']).to eq("Scopes can't be blank")
+        end
+      end
+
+      it 'creates a personal access token' do
+        post api(path, user), params: params
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['name']).to eq(name)
+        expect(json_response['scopes']).to eq(scopes)
+        expect(json_response['expires_at']).to eq(1.day.from_now.to_date.to_s)
+        expect(json_response['id']).to be_present
+        expect(json_response['created_at']).to be_present
+        expect(json_response['active']).to be_truthy
+        expect(json_response['revoked']).to be_falsey
+        expect(json_response['token']).to be_present
+      end
+
+      context 'when expires_at at is given' do
+        let(:params) { { name: name, scopes: scopes, expires_at: expires_at } }
+
+        context 'when expires_at is in the past' do
+          let(:expires_at) { 1.day.ago }
+
+          it 'creates an inactive personal access token' do
+            post api(path, user), params: params
+
+            expect(response).to have_gitlab_http_status(:created)
+            expect(json_response['active']).to be_falsey
+          end
+        end
+
+        context 'when expires_at is in the future' do
+          let(:expires_at) { 1.month.from_now.to_date }
+
+          it 'creates a personal access token' do
+            post api(path, user), params: params
+
+            expect(response).to have_gitlab_http_status(:created)
+            expect(json_response['name']).to eq(name)
+            expect(json_response['scopes']).to eq(scopes)
+            expect(json_response['expires_at']).to eq(1.month.from_now.to_date.to_s)
+            expect(json_response['id']).to be_present
+            expect(json_response['created_at']).to be_present
+            expect(json_response['active']).to be_truthy
+            expect(json_response['revoked']).to be_falsey
+            expect(json_response['token']).to be_present
+          end
+        end
+      end
+    end
+
+    context 'when an error is thrown by the model' do
+      let!(:admin_personal_access_token) { create(:personal_access_token, :admin_mode, user: admin) }
+      let(:error_message) { 'error message' }
+
+      before do
+        allow_next_instance_of(PersonalAccessToken) do |personal_access_token|
+          allow(personal_access_token).to receive_message_chain(:errors, :full_messages)
+                                            .and_return([error_message])
+
+          allow(personal_access_token).to receive(:save).and_return(false)
+        end
+      end
+
+      it 'returns the error' do
+        post api(path, personal_access_token: admin_personal_access_token), params: params
+
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+        expect(json_response['message']).to eq(error_message)
+      end
+    end
+  end
+
   describe 'GET /users/:user_id/impersonation_tokens' do
     let_it_be(:active_personal_access_token) { create(:personal_access_token, user: user) }
     let_it_be(:revoked_personal_access_token) { create(:personal_access_token, :revoked, user: user) }
@@ -4675,7 +4829,7 @@ RSpec.describe API::Users, :aggregate_failures, feature_category: :user_profile
   describe 'POST /users/:user_id/impersonation_tokens' do
     let(:name) { 'my new pat' }
     let(:expires_at) { '2016-12-28' }
-    let(:scopes) { %w(api read_user) }
+    let(:scopes) { %w[api read_user] }
     let(:impersonation) { true }
     let(:path) { "/users/#{user.id}/impersonation_tokens" }
     let(:params) { { name: name, expires_at: expires_at, scopes: scopes, impersonation: impersonation } }
diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb
index b07296a0df2..bc1ba3357a4 100644
--- a/spec/requests/lfs_http_spec.rb
+++ b/spec/requests/lfs_http_spec.rb
@@ -355,19 +355,6 @@ RSpec.describe 'Git LFS API and storage', feature_category: :source_code_managem
                   expect(json_response['objects'].first['actions']['download']['href']).to start_with("https://lfs-objects.s3.amazonaws.com/")
                   expect(json_response['objects'].first['actions']['download']['href']).to include("X-Amz-Expires=3600&")
                 end
-
-                context 'when feature flag "lfs_batch_direct_downloads" is "false"' do
-                  before do
-                    stub_feature_flags(lfs_batch_direct_downloads: false)
-                  end
-
-                  it_behaves_like 'LFS http 200 response'
-
-                  it 'does return proxied address URL' do
-                    expect(json_response['objects'].first).to include(sample_object)
-                    expect(json_response['objects'].first['actions']['download']['href']).to eq(objects_url(project, sample_oid))
-                  end
-                end
               end
             end
 
diff --git a/spec/rubocop/check_graceful_task_spec.rb b/spec/rubocop/check_graceful_task_spec.rb
index 38c2d68a593..1ab977266dc 100644
--- a/spec/rubocop/check_graceful_task_spec.rb
+++ b/spec/rubocop/check_graceful_task_spec.rb
@@ -119,9 +119,9 @@ RSpec.describe RuboCop::CheckGracefulTask do
     end
 
     context 'with args' do
-      let(:args) { %w[a.rb Lint/EmptyFile b.rb Lint/Syntax] }
+      let(:args) { %w[Lint/EmptyFile Lint/Syntax] }
 
-      it_behaves_like 'rubocop scan', rubocop_args: %w[--only Lint/EmptyFile,Lint/Syntax a.rb b.rb]
+      it_behaves_like 'rubocop scan', rubocop_args: %w[--only Lint/EmptyFile,Lint/Syntax]
 
       it 'does not notify slack' do
         expect(Gitlab::Popen).not_to receive(:popen)
diff --git a/spec/services/issues/set_crm_contacts_service_spec.rb b/spec/services/issues/set_crm_contacts_service_spec.rb
index aa5dec20a13..7d709bbd9c8 100644
--- a/spec/services/issues/set_crm_contacts_service_spec.rb
+++ b/spec/services/issues/set_crm_contacts_service_spec.rb
@@ -106,6 +106,14 @@ RSpec.describe Issues::SetCrmContactsService, feature_category: :team_planning d
 
         it_behaves_like 'setting contacts'
         it_behaves_like 'adds system note', 1, 1
+
+        context 'with empty list' do
+          let(:params) { { replace_ids: [] } }
+          let(:expected_contacts) { [] }
+
+          it_behaves_like 'setting contacts'
+          it_behaves_like 'adds system note', 0, 2
+        end
       end
 
       context 'add' do