diff --git a/app/assets/javascripts/analytics/usage_trends/components/projects_and_groups_chart.vue b/app/assets/javascripts/analytics/usage_trends/components/projects_and_groups_chart.vue
index 85a883565e6..66aa939938e 100644
--- a/app/assets/javascripts/analytics/usage_trends/components/projects_and_groups_chart.vue
+++ b/app/assets/javascripts/analytics/usage_trends/components/projects_and_groups_chart.vue
@@ -1,11 +1,11 @@
 <script>
 import { GlAlert } from '@gitlab/ui';
 import { GlLineChart } from '@gitlab/ui/dist/charts';
+import * as Sentry from '@sentry/browser';
 import produce from 'immer';
 import { sortBy } from 'lodash';
 import { formatDateAsMonth } from '~/lib/utils/datetime_utility';
 import { s__, __ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue';
 import latestGroupsQuery from '../graphql/queries/groups.query.graphql';
 import latestProjectsQuery from '../graphql/queries/projects.query.graphql';
diff --git a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue
index cde3476cfbf..9a0a4f61a74 100644
--- a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue
+++ b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue
@@ -1,9 +1,9 @@
 <script>
+import * as Sentry from '@sentry/browser';
 import MetricCard from '~/analytics/shared/components/metric_card.vue';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format';
 import { s__ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import usageTrendsCountQuery from '../graphql/queries/usage_trends_count.query.graphql';
 
 const defaultPrecision = 0;
diff --git a/app/assets/javascripts/analytics/usage_trends/components/usage_trends_count_chart.vue b/app/assets/javascripts/analytics/usage_trends/components/usage_trends_count_chart.vue
index bd565f2e4a6..8d7761694d1 100644
--- a/app/assets/javascripts/analytics/usage_trends/components/usage_trends_count_chart.vue
+++ b/app/assets/javascripts/analytics/usage_trends/components/usage_trends_count_chart.vue
@@ -1,13 +1,13 @@
 <script>
 import { GlAlert } from '@gitlab/ui';
 import { GlLineChart } from '@gitlab/ui/dist/charts';
+import * as Sentry from '@sentry/browser';
 import { some, every } from 'lodash';
 import {
   differenceInMonths,
   formatDateAsMonth,
   getDayDifference,
 } from '~/lib/utils/datetime_utility';
-import * as Sentry from '~/sentry/wrapper';
 import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue';
 import { TODAY, START_DATE } from '../constants';
 import { getAverageByMonth, getEarliestDate, generateDataKeys } from '../utils';
diff --git a/app/assets/javascripts/analytics/usage_trends/components/users_chart.vue b/app/assets/javascripts/analytics/usage_trends/components/users_chart.vue
index 73940f028a1..09dfcddcb73 100644
--- a/app/assets/javascripts/analytics/usage_trends/components/users_chart.vue
+++ b/app/assets/javascripts/analytics/usage_trends/components/users_chart.vue
@@ -1,11 +1,11 @@
 <script>
 import { GlAlert } from '@gitlab/ui';
 import { GlAreaChart } from '@gitlab/ui/dist/charts';
+import * as Sentry from '@sentry/browser';
 import produce from 'immer';
 import { sortBy } from 'lodash';
 import { formatDateAsMonth } from '~/lib/utils/datetime_utility';
 import { __ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue';
 import usersQuery from '../graphql/queries/users.query.graphql';
 import { getAverageByMonth } from '../utils';
diff --git a/app/assets/javascripts/clusters_list/store/actions.js b/app/assets/javascripts/clusters_list/store/actions.js
index 45d3e0cbc23..40a86a1e58c 100644
--- a/app/assets/javascripts/clusters_list/store/actions.js
+++ b/app/assets/javascripts/clusters_list/store/actions.js
@@ -1,9 +1,9 @@
+import * as Sentry from '@sentry/browser';
 import { deprecatedCreateFlash as flash } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 import Poll from '~/lib/utils/poll';
 import { __ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import { MAX_REQUESTS } from '../constants';
 import * as types from './mutation_types';
 
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js
index 87b4f33c216..b37a75eb2a3 100644
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -283,7 +283,7 @@ export function addContextLines(options) {
  * Trims the first char of the `richText` property when it's either a space or a diff symbol.
  * @param {Object} line
  * @returns {Object}
- * @deprecated
+ * @deprecated Use `line.rich_text = line.rich_text ? line.rich_text.replace(/^[+ -]/, '') : undefined;` instead!. For more information, see https://gitlab.com/gitlab-org/gitlab/-/issues/299329
  */
 export function trimFirstCharOfLineContent(line = {}) {
   // eslint-disable-next-line no-param-reassign
diff --git a/app/assets/javascripts/editor/constants.js b/app/assets/javascripts/editor/constants.js
index d9e6a6c13e2..c991316dda2 100644
--- a/app/assets/javascripts/editor/constants.js
+++ b/app/assets/javascripts/editor/constants.js
@@ -16,6 +16,9 @@ export const EDITOR_READY_EVENT = 'editor-ready';
 export const EDITOR_TYPE_CODE = 'vs.editor.ICodeEditor';
 export const EDITOR_TYPE_DIFF = 'vs.editor.IDiffEditor';
 
+export const EDITOR_CODE_INSTANCE_FN = 'createInstance';
+export const EDITOR_DIFF_INSTANCE_FN = 'createDiffInstance';
+
 //
 // EXTENSIONS' CONSTANTS
 //
diff --git a/app/assets/javascripts/editor/extensions/editor_lite_webide_ext.js b/app/assets/javascripts/editor/extensions/editor_lite_webide_ext.js
new file mode 100644
index 00000000000..83b0386d470
--- /dev/null
+++ b/app/assets/javascripts/editor/extensions/editor_lite_webide_ext.js
@@ -0,0 +1,164 @@
+import { debounce } from 'lodash';
+import { KeyCode, KeyMod, Range } from 'monaco-editor';
+import { EDITOR_TYPE_DIFF } from '~/editor/constants';
+import { EditorLiteExtension } from '~/editor/extensions/editor_lite_extension_base';
+import Disposable from '~/ide/lib/common/disposable';
+import { editorOptions } from '~/ide/lib/editor_options';
+import keymap from '~/ide/lib/keymap.json';
+
+const isDiffEditorType = (instance) => {
+  return instance.getEditorType() === EDITOR_TYPE_DIFF;
+};
+
+export const UPDATE_DIMENSIONS_DELAY = 200;
+
+export class EditorWebIdeExtension extends EditorLiteExtension {
+  constructor({ instance, modelManager, ...options } = {}) {
+    super({
+      instance,
+      ...options,
+      modelManager,
+      disposable: new Disposable(),
+      debouncedUpdate: debounce(() => {
+        instance.updateDimensions();
+      }, UPDATE_DIMENSIONS_DELAY),
+    });
+
+    window.addEventListener('resize', instance.debouncedUpdate, false);
+
+    instance.onDidDispose(() => {
+      window.removeEventListener('resize', instance.debouncedUpdate);
+
+      // catch any potential errors with disposing the error
+      // this is mainly for tests caused by elements not existing
+      try {
+        instance.disposable.dispose();
+      } catch (e) {
+        if (process.env.NODE_ENV !== 'test') {
+          // eslint-disable-next-line no-console
+          console.error(e);
+        }
+      }
+    });
+
+    EditorWebIdeExtension.addActions(instance);
+  }
+
+  static addActions(instance) {
+    const { store } = instance;
+    const getKeyCode = (key) => {
+      const monacoKeyMod = key.indexOf('KEY_') === 0;
+
+      return monacoKeyMod ? KeyCode[key] : KeyMod[key];
+    };
+
+    keymap.forEach((command) => {
+      const { bindings, id, label, action } = command;
+
+      const keybindings = bindings.map((binding) => {
+        const keys = binding.split('+');
+
+        // eslint-disable-next-line no-bitwise
+        return keys.length > 1 ? getKeyCode(keys[0]) | getKeyCode(keys[1]) : getKeyCode(keys[0]);
+      });
+
+      instance.addAction({
+        id,
+        label,
+        keybindings,
+        run() {
+          store.dispatch(action.name, action.params);
+          return null;
+        },
+      });
+    });
+  }
+
+  createModel(file, head = null) {
+    return this.modelManager.addModel(file, head);
+  }
+
+  attachModel(model) {
+    if (isDiffEditorType(this)) {
+      this.setModel({
+        original: model.getOriginalModel(),
+        modified: model.getModel(),
+      });
+
+      return;
+    }
+
+    this.setModel(model.getModel());
+
+    this.updateOptions(
+      editorOptions.reduce((acc, obj) => {
+        Object.keys(obj).forEach((key) => {
+          Object.assign(acc, {
+            [key]: obj[key](model),
+          });
+        });
+        return acc;
+      }, {}),
+    );
+  }
+
+  attachMergeRequestModel(model) {
+    this.setModel({
+      original: model.getBaseModel(),
+      modified: model.getModel(),
+    });
+  }
+
+  updateDimensions() {
+    this.layout();
+    this.updateDiffView();
+  }
+
+  setPos({ lineNumber, column }) {
+    this.revealPositionInCenter({
+      lineNumber,
+      column,
+    });
+    this.setPosition({
+      lineNumber,
+      column,
+    });
+  }
+
+  onPositionChange(cb) {
+    if (!this.onDidChangeCursorPosition) {
+      return;
+    }
+
+    this.disposable.add(this.onDidChangeCursorPosition((e) => cb(this, e)));
+  }
+
+  updateDiffView() {
+    if (!isDiffEditorType(this)) {
+      return;
+    }
+
+    this.updateOptions({
+      renderSideBySide: EditorWebIdeExtension.renderSideBySide(this.getDomNode()),
+    });
+  }
+
+  replaceSelectedText(text) {
+    let selection = this.getSelection();
+    const range = new Range(
+      selection.startLineNumber,
+      selection.startColumn,
+      selection.endLineNumber,
+      selection.endColumn,
+    );
+
+    this.executeEdits('', [{ range, text }]);
+
+    selection = this.getSelection();
+    this.setPosition({ lineNumber: selection.endLineNumber, column: selection.endColumn });
+  }
+
+  static renderSideBySide(domElement) {
+    return domElement.offsetWidth >= 700;
+  }
+}
diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js
index d14af53746e..d26a6bc5f6b 100644
--- a/app/assets/javascripts/flash.js
+++ b/app/assets/javascripts/flash.js
@@ -1,5 +1,5 @@
+import * as Sentry from '@sentry/browser';
 import { escape } from 'lodash';
-import * as Sentry from '~/sentry/wrapper';
 import { spriteIcon } from './lib/utils/common_utils';
 
 const FLASH_TYPES = {
diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue
index bd4c4f18141..0803925104d 100644
--- a/app/assets/javascripts/ide/components/file_templates/bar.vue
+++ b/app/assets/javascripts/ide/components/file_templates/bar.vue
@@ -49,7 +49,9 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex align-items-center ide-file-templates qa-file-templates-bar">
+  <div
+    class="d-flex align-items-center ide-file-templates qa-file-templates-bar gl-relative gl-z-index-1"
+  >
     <strong class="gl-mr-3"> {{ __('File templates') }} </strong>
     <dropdown
       :data="templateTypes"
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index 690060f5cb0..b57dcd4276c 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -1,6 +1,15 @@
 <script>
 import { mapState, mapGetters, mapActions } from 'vuex';
+import {
+  EDITOR_TYPE_DIFF,
+  EDITOR_CODE_INSTANCE_FN,
+  EDITOR_DIFF_INSTANCE_FN,
+} from '~/editor/constants';
+import EditorLite from '~/editor/editor_lite';
+import { EditorWebIdeExtension } from '~/editor/extensions/editor_lite_webide_ext';
 import { deprecatedCreateFlash as flash } from '~/flash';
+import ModelManager from '~/ide/lib/common/model_manager';
+import { defaultDiffEditorOptions, defaultEditorOptions } from '~/ide/lib/editor_options';
 import { __ } from '~/locale';
 import {
   WEBIDE_MARK_FILE_CLICKED,
@@ -20,7 +29,6 @@ import {
   FILE_VIEW_MODE_PREVIEW,
 } from '../constants';
 import eventHub from '../eventhub';
-import Editor from '../lib/editor';
 import { getRulesWithTraversal } from '../lib/editorconfig/parser';
 import mapRulesToMonaco from '../lib/editorconfig/rules_mapper';
 import { getFileEditorOrDefault } from '../stores/modules/editor/utils';
@@ -46,6 +54,9 @@ export default {
       content: '',
       images: {},
       rules: {},
+      globalEditor: null,
+      modelManager: new ModelManager(),
+      isEditorLoading: true,
     };
   },
   computed: {
@@ -132,6 +143,7 @@ export default {
 
       // Compare key to allow for files opened in review mode to be cached differently
       if (oldVal.key !== this.file.key) {
+        this.isEditorLoading = true;
         this.initEditor();
 
         if (this.currentActivityView !== leftSidebarViews.edit.name) {
@@ -149,6 +161,7 @@ export default {
       }
     },
     viewer() {
+      this.isEditorLoading = false;
       if (!this.file.pending) {
         this.createEditorInstance();
       }
@@ -181,11 +194,11 @@ export default {
     },
   },
   beforeDestroy() {
-    this.editor.dispose();
+    this.globalEditor.dispose();
   },
   mounted() {
-    if (!this.editor) {
-      this.editor = Editor.create(this.$store, this.editorOptions);
+    if (!this.globalEditor) {
+      this.globalEditor = new EditorLite();
     }
     this.initEditor();
 
@@ -211,8 +224,6 @@ export default {
         return;
       }
 
-      this.editor.clearEditor();
-
       this.registerSchemaForFile();
 
       Promise.all([this.fetchFileData(), this.fetchEditorconfigRules()])
@@ -251,20 +262,45 @@ export default {
         return;
       }
 
-      this.editor.dispose();
-
-      this.$nextTick(() => {
-        if (this.viewer === viewerTypes.edit) {
-          this.editor.createInstance(this.$refs.editor);
-        } else {
-          this.editor.createDiffInstance(this.$refs.editor);
-        }
+      const isDiff = this.viewer !== viewerTypes.edit;
+      const shouldDisposeEditor = isDiff !== (this.editor?.getEditorType() === EDITOR_TYPE_DIFF);
 
+      if (this.editor && !shouldDisposeEditor) {
         this.setupEditor();
-      });
+      } else {
+        if (this.editor && shouldDisposeEditor) {
+          this.editor.dispose();
+        }
+        const instanceOptions = isDiff ? defaultDiffEditorOptions : defaultEditorOptions;
+        const method = isDiff ? EDITOR_DIFF_INSTANCE_FN : EDITOR_CODE_INSTANCE_FN;
+
+        this.editor = this.globalEditor[method]({
+          el: this.$refs.editor,
+          blobPath: this.file.path,
+          blobGlobalId: this.file.key,
+          blobContent: this.content || this.file.content,
+          ...instanceOptions,
+          ...this.editorOptions,
+        });
+
+        this.editor.use(
+          new EditorWebIdeExtension({
+            instance: this.editor,
+            modelManager: this.modelManager,
+            store: this.$store,
+            file: this.file,
+            options: this.editorOptions,
+          }),
+        );
+
+        this.$nextTick(() => {
+          this.setupEditor();
+        });
+      }
     },
+
     setupEditor() {
-      if (!this.file || !this.editor.instance || this.file.loading) return;
+      if (!this.file || !this.editor || this.file.loading) return;
 
       const head = this.getStagedFile(this.file.path);
 
@@ -279,6 +315,8 @@ export default {
         this.editor.attachModel(this.model);
       }
 
+      this.isEditorLoading = false;
+
       this.model.updateOptions(this.rules);
 
       this.model.onChange((model) => {
@@ -298,7 +336,7 @@ export default {
         });
       });
 
-      this.editor.setPosition({
+      this.editor.setPos({
         lineNumber: this.fileEditor.editorRow,
         column: this.fileEditor.editorColumn,
       });
@@ -308,6 +346,10 @@ export default {
         fileLanguage: this.model.language,
       });
 
+      this.$nextTick(() => {
+        this.editor.updateDimensions();
+      });
+
       this.$emit('editorSetup');
       if (performance.getEntriesByName(WEBIDE_MARK_FILE_CLICKED).length) {
         eventHub.$emit(WEBIDE_MEASURE_FILE_AFTER_INTERACTION);
@@ -344,7 +386,7 @@ export default {
       });
     },
     onPaste(event) {
-      const editor = this.editor.instance;
+      const { editor } = this;
       const reImage = /^image\/(png|jpg|jpeg|gif)$/;
       const file = event.clipboardData.files[0];
 
@@ -395,6 +437,7 @@ export default {
           <a
             href="javascript:void(0);"
             role="button"
+            data-testid="edit-tab"
             @click.prevent="updateEditor({ viewMode: $options.FILE_VIEW_MODE_EDITOR })"
           >
             {{ __('Edit') }}
@@ -404,6 +447,7 @@ export default {
           <a
             href="javascript:void(0);"
             role="button"
+            data-testid="preview-tab"
             @click.prevent="updateEditor({ viewMode: $options.FILE_VIEW_MODE_PREVIEW })"
             >{{ previewMode.previewTitle }}</a
           >
@@ -414,6 +458,7 @@ export default {
     <div
       v-show="showEditor"
       ref="editor"
+      :key="`content-editor`"
       :class="{
         'is-readonly': isCommitModeActive,
         'is-deleted': file.deleted,
@@ -421,6 +466,8 @@ export default {
       }"
       class="multi-file-editor-holder"
       data-qa-selector="editor_container"
+      data-testid="editor-container"
+      :data-editor-loading="isEditorLoading"
       @focusout="triggerFilesChange"
     ></div>
     <content-viewer
diff --git a/app/assets/javascripts/ide/components/repo_tab.vue b/app/assets/javascripts/ide/components/repo_tab.vue
index d28751c9571..64ec2cc67c7 100644
--- a/app/assets/javascripts/ide/components/repo_tab.vue
+++ b/app/assets/javascripts/ide/components/repo_tab.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlTab } from '@gitlab/ui';
 import { mapActions, mapGetters } from 'vuex';
 import { __, sprintf } from '~/locale';
 
@@ -13,6 +13,7 @@ export default {
     FileIcon,
     GlIcon,
     ChangedFileIcon,
+    GlTab,
   },
   props: {
     tab: {
@@ -71,29 +72,30 @@ export default {
 </script>
 
 <template>
-  <li
-    :class="{
-      active: tab.active,
-      disabled: tab.pending,
-    }"
+  <gl-tab
+    :active="tab.active"
+    :disabled="tab.pending"
+    :title="tab.name"
     @click="clickFile(tab)"
     @mouseover="mouseOverTab"
     @mouseout="mouseOutTab"
   >
-    <div :title="getUrlForPath(tab.path)" class="multi-file-tab">
-      <file-icon :file-name="tab.name" :size="16" />
-      {{ tab.name }}
-      <file-status-icon :file="tab" />
-    </div>
-    <button
-      :aria-label="closeLabel"
-      :disabled="tab.pending"
-      type="button"
-      class="multi-file-tab-close"
-      @click.stop.prevent="closeFile(tab)"
-    >
-      <gl-icon v-if="!showChangedIcon" :size="12" name="close" />
-      <changed-file-icon v-else :file="tab" />
-    </button>
-  </li>
+    <template #title>
+      <div :title="getUrlForPath(tab.path)" class="multi-file-tab">
+        <file-icon :file-name="tab.name" :size="16" />
+        {{ tab.name }}
+        <file-status-icon :file="tab" />
+      </div>
+      <button
+        :aria-label="closeLabel"
+        :disabled="tab.pending"
+        type="button"
+        class="multi-file-tab-close"
+        @click.stop.prevent="closeFile(tab)"
+      >
+        <gl-icon v-if="!showChangedIcon" :size="12" name="close" />
+        <changed-file-icon v-else :file="tab" />
+      </button>
+    </template>
+  </gl-tab>
 </template>
diff --git a/app/assets/javascripts/ide/components/repo_tabs.vue b/app/assets/javascripts/ide/components/repo_tabs.vue
index c03694e3619..932040c7fa5 100644
--- a/app/assets/javascripts/ide/components/repo_tabs.vue
+++ b/app/assets/javascripts/ide/components/repo_tabs.vue
@@ -1,10 +1,12 @@
 <script>
+import { GlTabs } from '@gitlab/ui';
 import { mapActions, mapGetters } from 'vuex';
 import RepoTab from './repo_tab.vue';
 
 export default {
   components: {
     RepoTab,
+    GlTabs,
   },
   props: {
     activeFile: {
@@ -42,8 +44,8 @@ export default {
 
 <template>
   <div class="multi-file-tabs">
-    <ul ref="tabsScroller" class="list-unstyled gl-mb-0">
+    <gl-tabs>
       <repo-tab v-for="tab in files" :key="tab.key" :tab="tab" />
-    </ul>
+    </gl-tabs>
   </div>
 </template>
diff --git a/app/assets/javascripts/issue_show/utils/parse_data.js b/app/assets/javascripts/issue_show/utils/parse_data.js
index 19d1e0eebcb..f1e6bd2419a 100644
--- a/app/assets/javascripts/issue_show/utils/parse_data.js
+++ b/app/assets/javascripts/issue_show/utils/parse_data.js
@@ -1,5 +1,5 @@
+import * as Sentry from '@sentry/browser';
 import { sanitize } from '~/lib/dompurify';
-import * as Sentry from '~/sentry/wrapper';
 
 // We currently load + parse the data from the issue app and related merge request
 let cachedParsedData;
diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js
index 8522ac6a57d..a0b4fd0b608 100644
--- a/app/assets/javascripts/monitoring/stores/actions.js
+++ b/app/assets/javascripts/monitoring/stores/actions.js
@@ -1,7 +1,7 @@
+import * as Sentry from '@sentry/browser';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { convertToFixedRange } from '~/lib/utils/datetime_range';
-import * as Sentry from '~/sentry/wrapper';
 import { convertObjectPropsToCamelCase } from '../../lib/utils/common_utils';
 import { s__, sprintf } from '../../locale';
 import { ENVIRONMENT_AVAILABLE_STATE, OVERVIEW_DASHBOARD_PATH, VARIABLE_TYPES } from '../constants';
diff --git a/app/assets/javascripts/notes/stores/utils.js b/app/assets/javascripts/notes/stores/utils.js
index 627e405c75c..592e634e034 100644
--- a/app/assets/javascripts/notes/stores/utils.js
+++ b/app/assets/javascripts/notes/stores/utils.js
@@ -1,4 +1,4 @@
-import { trimFirstCharOfLineContent } from '~/diffs/store/utils';
+import { trimFirstCharOfLineContent } from '~/diffs/store/utils'; // eslint-disable-line import/no-deprecated
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import AjaxCache from '~/lib/utils/ajax_cache';
 import { sprintf, __ } from '~/locale';
@@ -34,7 +34,7 @@ export const hasQuickActions = (note) => createQuickActionsRegex().test(note);
 export const stripQuickActions = (note) => note.replace(createQuickActionsRegex(), '').trim();
 
 export const prepareDiffLines = (diffLines) =>
-  diffLines.map((line) => ({ ...trimFirstCharOfLineContent(line) }));
+  diffLines.map((line) => ({ ...trimFirstCharOfLineContent(line) })); // eslint-disable-line import/no-deprecated
 
 export const gqClient = createGqClient(
   {},
diff --git a/app/assets/javascripts/performance/constants.js b/app/assets/javascripts/performance/constants.js
index 069f3c265f3..4ac758550e0 100644
--- a/app/assets/javascripts/performance/constants.js
+++ b/app/assets/javascripts/performance/constants.js
@@ -54,3 +54,24 @@ export const MR_DIFFS_MARK_DIFF_FILES_END = 'mr-diffs-mark-diff-files-end';
 // Measures
 export const MR_DIFFS_MEASURE_FILE_TREE_DONE = 'mr-diffs-measure-file-tree-done';
 export const MR_DIFFS_MEASURE_DIFF_FILES_DONE = 'mr-diffs-measure-diff-files-done';
+
+//
+// Pipelines Detail namespace
+//
+
+// Marks
+export const PIPELINES_DETAIL_LINKS_MARK_CALCULATE_START =
+  'pipelines-detail-links-mark-calculate-start';
+export const PIPELINES_DETAIL_LINKS_MARK_CALCULATE_END =
+  'pipelines-detail-links-mark-calculate-end';
+
+// Measures
+export const PIPELINES_DETAIL_LINKS_MEASURE_CALCULATION =
+  'Pipelines Detail Graph: Links Calculation';
+
+// Metrics
+// Note: These strings must match the backend
+// (defined in: app/services/ci/prometheus_metrics/observe_histograms_service.rb)
+export const PIPELINES_DETAIL_LINK_DURATION = 'pipeline_graph_link_calculation_duration_seconds';
+export const PIPELINES_DETAIL_LINKS_TOTAL = 'pipeline_graph_links_total';
+export const PIPELINES_DETAIL_LINKS_JOB_RATIO = 'pipeline_graph_link_per_job_ratio';
diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
index 5070971c563..bd112697b49 100644
--- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
+++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
@@ -17,6 +17,7 @@ import {
   GlLoadingIcon,
   GlSafeHtmlDirective as SafeHtml,
 } from '@gitlab/ui';
+import * as Sentry from '@sentry/browser';
 import { uniqueId } from 'lodash';
 import Vue from 'vue';
 import axios from '~/lib/utils/axios_utils';
@@ -24,7 +25,6 @@ import { backOff } from '~/lib/utils/common_utils';
 import httpStatusCodes from '~/lib/utils/http_status';
 import { redirectTo } from '~/lib/utils/url_utility';
 import { s__, __, n__ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import { VARIABLE_TYPE, FILE_TYPE, CONFIG_VARIABLES_TIMEOUT } from '../constants';
 
 export default {
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index 93156d5d05b..0d81a383009 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -15,14 +15,19 @@ export default {
     StageColumnComponent,
   },
   props: {
+    pipeline: {
+      type: Object,
+      required: true,
+    },
     isLinkedPipeline: {
       type: Boolean,
       required: false,
       default: false,
     },
-    pipeline: {
-      type: Object,
-      required: true,
+    metricsPath: {
+      type: String,
+      required: false,
+      default: '',
     },
     type: {
       type: String,
@@ -66,6 +71,12 @@ export default {
     hasUpstreamPipelines() {
       return Boolean(this.pipeline?.upstream?.length > 0);
     },
+    metricsConfig() {
+      return {
+        path: this.metricsPath,
+        collectMetrics: true,
+      };
+    },
     // The show downstream check prevents showing redundant linked columns
     showDownstreamPipelines() {
       return (
@@ -145,6 +156,7 @@ export default {
               :container-id="containerId"
               :container-measurements="measurements"
               :highlighted-job="hoveredJobName"
+              :metrics-config="metricsConfig"
               default-link-color="gl-stroke-transparent"
               @error="onError"
               @highlightedJobsChange="updateHighlightedJobs"
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
index afe4dfb9c8d..9879c98e3b8 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
@@ -14,6 +14,9 @@ export default {
     PipelineGraph,
   },
   inject: {
+    metricsPath: {
+      default: '',
+    },
     pipelineIid: {
       default: '',
     },
@@ -108,6 +111,7 @@ export default {
     <gl-loading-icon v-if="showLoadingIcon" class="gl-mx-auto gl-my-4" size="lg" />
     <pipeline-graph
       v-if="pipeline"
+      :metrics-path="metricsPath"
       :pipeline="pipeline"
       @error="reportFailure"
       @refreshPipelineGraph="refreshPipelineGraph"
diff --git a/app/assets/javascripts/pipelines/components/graph/utils.js b/app/assets/javascripts/pipelines/components/graph/utils.js
index 1a935599bfa..94807ea41b1 100644
--- a/app/assets/javascripts/pipelines/components/graph/utils.js
+++ b/app/assets/javascripts/pipelines/components/graph/utils.js
@@ -1,6 +1,6 @@
+import * as Sentry from '@sentry/browser';
 import Visibility from 'visibilityjs';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import * as Sentry from '~/sentry/wrapper';
 import { unwrapStagesWithNeeds } from '../unwrapping_utils';
 
 const addMulti = (mainPipelineProjectPath, linkedPipeline) => {
diff --git a/app/assets/javascripts/pipelines/components/graph_shared/api.js b/app/assets/javascripts/pipelines/components/graph_shared/api.js
new file mode 100644
index 00000000000..04ac15ae24c
--- /dev/null
+++ b/app/assets/javascripts/pipelines/components/graph_shared/api.js
@@ -0,0 +1,8 @@
+import axios from '~/lib/utils/axios_utils';
+import { reportToSentry } from '../graph/utils';
+
+export const reportPerformance = (path, stats) => {
+  axios.post(path, stats).catch((err) => {
+    reportToSentry('links_inner_perf', `error: ${err}`);
+  });
+};
diff --git a/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue b/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
index a7fad1c57b0..84ca0bf1443 100644
--- a/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
+++ b/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
@@ -1,9 +1,19 @@
 <script>
 import { isEmpty } from 'lodash';
+import {
+  PIPELINES_DETAIL_LINKS_MARK_CALCULATE_START,
+  PIPELINES_DETAIL_LINKS_MARK_CALCULATE_END,
+  PIPELINES_DETAIL_LINKS_MEASURE_CALCULATION,
+  PIPELINES_DETAIL_LINK_DURATION,
+  PIPELINES_DETAIL_LINKS_TOTAL,
+  PIPELINES_DETAIL_LINKS_JOB_RATIO,
+} from '~/performance/constants';
+import { performanceMarkAndMeasure } from '~/performance/utils';
 import { DRAW_FAILURE } from '../../constants';
 import { createJobsHash, generateJobNeedsDict } from '../../utils';
 import { reportToSentry } from '../graph/utils';
 import { parseData } from '../parsing_utils';
+import { reportPerformance } from './api';
 import { generateLinksData } from './drawing_utils';
 
 export default {
@@ -26,6 +36,15 @@ export default {
       type: Array,
       required: true,
     },
+    totalGroups: {
+      type: Number,
+      required: true,
+    },
+    metricsConfig: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
     defaultLinkColor: {
       type: String,
       required: false,
@@ -44,6 +63,9 @@ export default {
     };
   },
   computed: {
+    shouldCollectMetrics() {
+      return this.metricsConfig.collectMetrics && this.metricsConfig.path;
+    },
     hasHighlightedJob() {
       return Boolean(this.highlightedJob);
     },
@@ -97,10 +119,52 @@ export default {
     }
   },
   methods: {
+    beginPerfMeasure() {
+      if (this.shouldCollectMetrics) {
+        performanceMarkAndMeasure({ mark: PIPELINES_DETAIL_LINKS_MARK_CALCULATE_START });
+      }
+    },
+    finishPerfMeasureAndSend() {
+      if (this.shouldCollectMetrics) {
+        performanceMarkAndMeasure({
+          mark: PIPELINES_DETAIL_LINKS_MARK_CALCULATE_END,
+          measures: [
+            {
+              name: PIPELINES_DETAIL_LINKS_MEASURE_CALCULATION,
+              start: PIPELINES_DETAIL_LINKS_MARK_CALCULATE_START,
+            },
+          ],
+        });
+      }
+
+      window.requestAnimationFrame(() => {
+        const duration = window.performance.getEntriesByName(
+          PIPELINES_DETAIL_LINKS_MEASURE_CALCULATION,
+        )[0]?.duration;
+
+        if (!duration) {
+          return;
+        }
+
+        const data = {
+          histograms: [
+            { name: PIPELINES_DETAIL_LINK_DURATION, value: duration },
+            { name: PIPELINES_DETAIL_LINKS_TOTAL, value: this.links.length },
+            {
+              name: PIPELINES_DETAIL_LINKS_JOB_RATIO,
+              value: this.links.length / this.totalGroups,
+            },
+          ],
+        };
+
+        reportPerformance(this.metricsConfig.path, data);
+      });
+    },
     isLinkHighlighted(linkRef) {
       return this.highlightedLinks.includes(linkRef);
     },
     prepareLinkData() {
+      this.beginPerfMeasure();
       try {
         const arrayOfJobs = this.pipelineData.flatMap(({ groups }) => groups);
         const parsedData = parseData(arrayOfJobs);
@@ -109,6 +173,7 @@ export default {
         this.$emit('error', DRAW_FAILURE);
         reportToSentry(this.$options.name, err);
       }
+      this.finishPerfMeasureAndSend();
     },
     getLinkClasses(link) {
       return [
diff --git a/app/assets/javascripts/pipelines/components/graph_shared/links_layer.vue b/app/assets/javascripts/pipelines/components/graph_shared/links_layer.vue
index af3a3f0adff..baf0a4d50de 100644
--- a/app/assets/javascripts/pipelines/components/graph_shared/links_layer.vue
+++ b/app/assets/javascripts/pipelines/components/graph_shared/links_layer.vue
@@ -70,6 +70,7 @@ export default {
     v-if="showLinkedLayers"
     :container-measurements="containerMeasurements"
     :pipeline-data="pipelineData"
+    :total-groups="numGroups"
     v-bind="$attrs"
     v-on="$listeners"
   >
diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
index f837851e5c1..e287f188523 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -93,8 +93,13 @@ export default async function initPipelineDetailsBundle() {
         /* webpackChunkName: 'createPipelinesDetailApp' */ './pipeline_details_graph'
       );
 
-      const { pipelineProjectPath, pipelineIid } = dataset;
-      createPipelinesDetailApp(SELECTORS.PIPELINE_GRAPH, pipelineProjectPath, pipelineIid);
+      const { metricsPath, pipelineProjectPath, pipelineIid } = dataset;
+      createPipelinesDetailApp(
+        SELECTORS.PIPELINE_GRAPH,
+        pipelineProjectPath,
+        pipelineIid,
+        metricsPath,
+      );
     } catch {
       Flash(__('An error occurred while loading the pipeline.'));
     }
diff --git a/app/assets/javascripts/pipelines/pipeline_details_graph.js b/app/assets/javascripts/pipelines/pipeline_details_graph.js
index 55f3731a3ca..a5e2c792ffd 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_graph.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_graph.js
@@ -16,7 +16,7 @@ const apolloProvider = new VueApollo({
   ),
 });
 
-const createPipelinesDetailApp = (selector, pipelineProjectPath, pipelineIid) => {
+const createPipelinesDetailApp = (selector, pipelineProjectPath, pipelineIid, metricsPath) => {
   // eslint-disable-next-line no-new
   new Vue({
     el: selector,
@@ -25,6 +25,7 @@ const createPipelinesDetailApp = (selector, pipelineProjectPath, pipelineIid) =>
     },
     apolloProvider,
     provide: {
+      metricsPath,
       pipelineProjectPath,
       pipelineIid,
       dataMethod: GRAPHQL,
diff --git a/app/assets/javascripts/projects/commits/store/actions.js b/app/assets/javascripts/projects/commits/store/actions.js
index 72d4f0c31e5..741dc20b1f1 100644
--- a/app/assets/javascripts/projects/commits/store/actions.js
+++ b/app/assets/javascripts/projects/commits/store/actions.js
@@ -1,8 +1,8 @@
+import * as Sentry from '@sentry/browser';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { joinPaths } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import * as types from './mutation_types';
 
 export default {
diff --git a/app/assets/javascripts/sentry/sentry_config.js b/app/assets/javascripts/sentry/sentry_config.js
index 4277ffec545..bc3b2f16a6a 100644
--- a/app/assets/javascripts/sentry/sentry_config.js
+++ b/app/assets/javascripts/sentry/sentry_config.js
@@ -1,6 +1,6 @@
+import * as Sentry from '@sentry/browser';
 import $ from 'jquery';
 import { __ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 
 const IGNORE_ERRORS = [
   // Random plugins/extensions
diff --git a/app/assets/javascripts/sentry/wrapper.js b/app/assets/javascripts/sentry/wrapper.js
deleted file mode 100644
index 24039e6141c..00000000000
--- a/app/assets/javascripts/sentry/wrapper.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Temporarily commented out to investigate performance: https://gitlab.com/gitlab-org/gitlab/-/issues/251179
-// export * from '@sentry/browser';
-
-export function init(...args) {
-  return args;
-}
-
-export function setUser(...args) {
-  return args;
-}
-
-export function captureException(...args) {
-  return args;
-}
-
-export function captureMessage(...args) {
-  return args;
-}
-
-export function withScope(fn) {
-  fn({
-    setTag(...args) {
-      return args;
-    },
-  });
-}
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
index 9b06c20a6f3..c0424dc2873 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
@@ -122,6 +122,8 @@ export default {
       :value="subscribed"
       class="hide-collapsed"
       data-testid="subscription-toggle"
+      :label="__('Notifications')"
+      label-position="hidden"
       @change="toggleSubscription"
     />
   </div>
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
index bcea7ca654e..6f14cc78270 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
@@ -11,12 +11,12 @@ import {
   GlButton,
   GlSafeHtmlDirective,
 } from '@gitlab/ui';
+import * as Sentry from '@sentry/browser';
 import highlightCurrentUser from '~/behaviors/markdown/highlight_current_user';
 import { fetchPolicies } from '~/lib/graphql';
 import { toggleContainerClasses } from '~/lib/utils/dom_utils';
 import { visitUrl, joinPaths } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
-import * as Sentry from '~/sentry/wrapper';
 import Tracking from '~/tracking';
 import initUserPopovers from '~/user_popovers';
 import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue';
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_metrics.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_metrics.vue
index dd4faa03c00..9d5006564ef 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/alert_metrics.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_metrics.vue
@@ -1,7 +1,7 @@
 <script>
+import * as Sentry from '@sentry/browser';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import * as Sentry from '~/sentry/wrapper';
 
 Vue.use(Vuex);
 
diff --git a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue
index 5a08e992084..afb1ea702fa 100644
--- a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue
+++ b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue
@@ -36,6 +36,11 @@ export default {
       required: false,
       default: () => [VALID_IMAGE_FILE_MIMETYPE.mimetype],
     },
+    singleFileSelection: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -79,7 +84,7 @@ export default {
         return;
       }
 
-      this.$emit('change', files);
+      this.$emit('change', this.singleFileSelection ? files[0] : files);
     },
     ondragenter(e) {
       this.dragCounter += 1;
@@ -92,7 +97,7 @@ export default {
       this.$refs.fileUpload.click();
     },
     onFileInputChange(e) {
-      this.$emit('change', e.target.files);
+      this.$emit('change', this.singleFileSelection ? e.target.files[0] : e.target.files);
     },
   },
 };
@@ -119,9 +124,15 @@ export default {
           data-testid="dropzone-area"
         >
           <gl-icon name="upload" :size="iconStyles.size" :class="iconStyles.class" />
-          <p class="gl-mb-0">
+          <p class="gl-mb-0" data-testid="upload-text">
             <slot name="upload-text" :openFileUpload="openFileUpload">
-              <gl-sprintf :message="__('Drop or %{linkStart}upload%{linkEnd} files to attach')">
+              <gl-sprintf
+                :message="
+                  singleFileSelection
+                    ? __('Drop or %{linkStart}upload%{linkEnd} file to attach')
+                    : __('Drop or %{linkStart}upload%{linkEnd} files to attach')
+                "
+              >
                 <template #link="{ content }">
                   <gl-link @click.stop="openFileUpload">
                     {{ content }}
@@ -139,7 +150,7 @@ export default {
         name="upload_file"
         :accept="validFileMimetypes"
         class="hide"
-        multiple
+        :multiple="!singleFileSelection"
         @change="onFileInputChange"
       />
     </slot>
diff --git a/app/assets/stylesheets/framework/editor-lite.scss b/app/assets/stylesheets/framework/editor-lite.scss
index c3b287a6c3d..eda3e33a6aa 100644
--- a/app/assets/stylesheets/framework/editor-lite.scss
+++ b/app/assets/stylesheets/framework/editor-lite.scss
@@ -3,6 +3,11 @@
   @include gl-display-flex;
   @include gl-justify-content-center;
   @include gl-align-items-center;
+  @include gl-z-index-0;
+
+  > * {
+    filter: blur(5px);
+  }
 
   &::before {
     content: '';
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 9c9ce745630..b1bd15e0bd7 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -313,8 +313,9 @@ table {
     resize: none;
     padding: $gl-padding-8 $gl-padding-12;
     line-height: 1;
-    border-color: $border-color;
+    border: 1px solid $border-color;
     background-color: $white;
+    overflow: hidden;
 
     @include media-breakpoint-down(xs) {
       margin-bottom: $gl-padding-8;
diff --git a/app/controllers/concerns/security_and_compliance_permissions.rb b/app/controllers/concerns/security_and_compliance_permissions.rb
new file mode 100644
index 00000000000..104f3638bb7
--- /dev/null
+++ b/app/controllers/concerns/security_and_compliance_permissions.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SecurityAndCompliancePermissions
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :ensure_security_and_compliance_enabled!
+  end
+
+  private
+
+  def ensure_security_and_compliance_enabled!
+    render_404 unless can?(current_user, :access_security_and_compliance, project)
+  end
+end
diff --git a/app/controllers/projects/security/configuration_controller.rb b/app/controllers/projects/security/configuration_controller.rb
index 9366ca7b0ed..cafc392134b 100644
--- a/app/controllers/projects/security/configuration_controller.rb
+++ b/app/controllers/projects/security/configuration_controller.rb
@@ -3,6 +3,8 @@
 module Projects
   module Security
     class ConfigurationController < Projects::ApplicationController
+      include SecurityAndCompliancePermissions
+
       feature_category :static_application_security_testing
 
       def show
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d6ba14f4f7f..73439c10b75 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -395,6 +395,7 @@ class ProjectsController < Projects::ApplicationController
       metrics_dashboard_access_level
       analytics_access_level
       operations_access_level
+      security_and_compliance_access_level
     ]
   end
 
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 191134472c2..67cb2b9558d 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -69,7 +69,7 @@ class RootController < Dashboard::ProjectsController
   end
 
   def customize_homepage
-    @customize_homepage = experiment_enabled?(:customize_homepage)
+    @customize_homepage = Feature.enabled?(:customize_homepage, default_enabled: :yaml)
   end
 end
 
diff --git a/app/graphql/types/board_type.rb b/app/graphql/types/board_type.rb
index f8bd31d5fa0..d125ce352c4 100644
--- a/app/graphql/types/board_type.rb
+++ b/app/graphql/types/board_type.rb
@@ -3,7 +3,7 @@
 module Types
   class BoardType < BaseObject
     graphql_name 'Board'
-    description 'Represents a project or group board'
+    description 'Represents a project or group issue board'
     accepts ::Board
     authorize :read_board
 
diff --git a/app/graphql/types/ci_configuration/sast/ui_component_size_enum.rb b/app/graphql/types/ci_configuration/sast/ui_component_size_enum.rb
index 3a208f9d3e4..76d2a314c13 100644
--- a/app/graphql/types/ci_configuration/sast/ui_component_size_enum.rb
+++ b/app/graphql/types/ci_configuration/sast/ui_component_size_enum.rb
@@ -7,9 +7,9 @@ module Types
         graphql_name 'SastUiComponentSize'
         description 'Size of UI component in SAST configuration page'
 
-        value 'SMALL'
-        value 'MEDIUM'
-        value 'LARGE'
+        value 'SMALL', description: "The size of UI component in SAST configuration page is small."
+        value 'MEDIUM', description: "The size of UI component in SAST configuration page is medium."
+        value 'LARGE', description: "The size of UI component in SAST configuration page is large."
       end
     end
   end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index f5cd89d96b4..b5c4e0b5550 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -379,10 +379,15 @@ module ProjectsHelper
   private
 
   def can_read_security_configuration?(project, current_user)
-    ::Feature.enabled?(:secure_security_and_compliance_configuration_page_on_ce, @subject, default_enabled: :yaml) &&
+    show_security_and_compliance_config? &&
+      can?(current_user, :access_security_and_compliance, project) &&
       can?(current_user, :read_security_configuration, project)
   end
 
+  def show_security_and_compliance_config?
+    ::Feature.enabled?(:secure_security_and_compliance_configuration_page_on_ce, @subject, default_enabled: :yaml)
+  end
+
   def get_project_security_nav_tabs(project, current_user)
     if can_read_security_configuration?(project, current_user)
       [:security_and_compliance, :security_configuration]
@@ -646,7 +651,8 @@ module ProjectsHelper
       metricsDashboardAccessLevel: feature.metrics_dashboard_access_level,
       operationsAccessLevel: feature.operations_access_level,
       showDefaultAwardEmojis: project.show_default_award_emojis?,
-      allowEditingCommitMessages: project.allow_editing_commit_messages?
+      allowEditingCommitMessages: project.allow_editing_commit_messages?,
+      securityAndComplianceAccessLevel: project.security_and_compliance_access_level
     }
   end
 
@@ -668,10 +674,13 @@ module ProjectsHelper
       pagesAvailable: Gitlab.config.pages.enabled,
       pagesAccessControlEnabled: Gitlab.config.pages.access_control,
       pagesAccessControlForced: ::Gitlab::Pages.access_control_is_forced?,
-      pagesHelpPath: help_page_path('user/project/pages/introduction', anchor: 'gitlab-pages-access-control')
+      pagesHelpPath: help_page_path('user/project/pages/introduction', anchor: 'gitlab-pages-access-control'),
+      securityAndComplianceAvailable: show_security_and_compliance_toggle?
     }
   end
 
+  alias_method :show_security_and_compliance_toggle?, :show_security_and_compliance_config?
+
   def project_permissions_panel_data_json(project)
     project_permissions_panel_data(project).to_json.html_safe
   end
diff --git a/app/models/concerns/project_features_compatibility.rb b/app/models/concerns/project_features_compatibility.rb
index 07bec07e556..a06bfdf5825 100644
--- a/app/models/concerns/project_features_compatibility.rb
+++ b/app/models/concerns/project_features_compatibility.rb
@@ -34,6 +34,10 @@ module ProjectFeaturesCompatibility
     write_feature_attribute_boolean(:snippets_access_level, value)
   end
 
+  def security_and_compliance_enabled=(value)
+    write_feature_attribute_boolean(:security_and_compliance_access_level, value)
+  end
+
   def repository_access_level=(value)
     write_feature_attribute_string(:repository_access_level, value)
   end
@@ -78,6 +82,10 @@ module ProjectFeaturesCompatibility
     write_feature_attribute_string(:operations_access_level, value)
   end
 
+  def security_and_compliance_access_level=(value)
+    write_feature_attribute_string(:security_and_compliance_access_level, value)
+  end
+
   private
 
   def write_feature_attribute_boolean(field, value)
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 810ad2fdc99..21e8a6fec74 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -164,6 +164,10 @@ class Namespace < ApplicationRecord
       name = host.delete_suffix(gitlab_host)
       Namespace.where(parent_id: nil).by_path(name)
     end
+
+    def top_most
+      where(parent_id: nil)
+    end
   end
 
   def package_settings
diff --git a/app/models/packages/nuget.rb b/app/models/packages/nuget.rb
index 42c167e9b7f..f152eedb8fc 100644
--- a/app/models/packages/nuget.rb
+++ b/app/models/packages/nuget.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Packages
   module Nuget
+    TEMPORARY_PACKAGE_NAME = 'NuGet.Temporary.Package'
+
     def self.table_name_prefix
       'packages_nuget_'
     end
diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index 0673edfd831..b0e7ff09982 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -98,12 +98,12 @@ class Packages::Package < ApplicationRecord
   end
   scope :preload_composer, -> { preload(:composer_metadatum) }
 
-  scope :without_nuget_temporary_name, -> { where.not(name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+  scope :without_nuget_temporary_name, -> { where.not(name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
 
   scope :has_version, -> { where.not(version: nil) }
   scope :processed, -> do
     where.not(package_type: :nuget).or(
-      where.not(name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME)
+      where.not(name: Packages::Nuget::TEMPORARY_PACKAGE_NAME)
     )
   end
   scope :preload_files, -> { preload(:package_files) }
diff --git a/app/models/packages/rubygems.rb b/app/models/packages/rubygems.rb
new file mode 100644
index 00000000000..1aa6b16f47e
--- /dev/null
+++ b/app/models/packages/rubygems.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Packages
+  module Rubygems
+    TEMPORARY_PACKAGE_NAME = 'Gem.Temporary.Package'
+
+    def self.table_name_prefix
+      'packages_rubygems_'
+    end
+  end
+end
diff --git a/app/models/packages/rubygems/metadatum.rb b/app/models/packages/rubygems/metadatum.rb
index 42db1f3defc..d4e5feb7c98 100644
--- a/app/models/packages/rubygems/metadatum.rb
+++ b/app/models/packages/rubygems/metadatum.rb
@@ -3,7 +3,6 @@
 module Packages
   module Rubygems
     class Metadatum < ApplicationRecord
-      self.table_name = 'packages_rubygems_metadata'
       self.primary_key = :package_id
 
       belongs_to :package, -> { where(package_type: :rubygems) }, inverse_of: :rubygems_metadatum
diff --git a/app/models/project.rb b/app/models/project.rb
index 3d96fe5628f..08e3203a81e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -392,7 +392,8 @@ class Project < ApplicationRecord
     :merge_requests_access_level, :forking_access_level, :issues_access_level,
     :wiki_access_level, :snippets_access_level, :builds_access_level,
     :repository_access_level, :pages_access_level, :metrics_dashboard_access_level, :analytics_access_level,
-    :operations_enabled?, :operations_access_level, to: :project_feature, allow_nil: true
+    :operations_enabled?, :operations_access_level, :security_and_compliance_access_level,
+    to: :project_feature, allow_nil: true
   delegate :show_default_award_emojis, :show_default_award_emojis=,
     :show_default_award_emojis?,
     to: :project_setting, allow_nil: true
diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb
index 7b204cfb1c0..3f86a1ce979 100644
--- a/app/models/project_feature.rb
+++ b/app/models/project_feature.rb
@@ -3,7 +3,8 @@
 class ProjectFeature < ApplicationRecord
   include Featurable
 
-  FEATURES = %i(issues forking merge_requests wiki snippets builds repository pages metrics_dashboard analytics operations).freeze
+  FEATURES = %i(issues forking merge_requests wiki snippets builds repository pages metrics_dashboard analytics operations security_and_compliance).freeze
+  EXPORTABLE_FEATURES = (FEATURES - [:security_and_compliance]).freeze
 
   set_available_features(FEATURES)
 
@@ -37,16 +38,17 @@ class ProjectFeature < ApplicationRecord
   validate :repository_children_level
   validate :allowed_access_levels
 
-  default_value_for :builds_access_level,            value: ENABLED, allows_nil: false
-  default_value_for :issues_access_level,            value: ENABLED, allows_nil: false
-  default_value_for :forking_access_level,           value: ENABLED, allows_nil: false
-  default_value_for :merge_requests_access_level,    value: ENABLED, allows_nil: false
-  default_value_for :snippets_access_level,          value: ENABLED, allows_nil: false
-  default_value_for :wiki_access_level,              value: ENABLED, allows_nil: false
-  default_value_for :repository_access_level,        value: ENABLED, allows_nil: false
-  default_value_for :analytics_access_level,         value: ENABLED, allows_nil: false
+  default_value_for :builds_access_level, value: ENABLED, allows_nil: false
+  default_value_for :issues_access_level, value: ENABLED, allows_nil: false
+  default_value_for :forking_access_level, value: ENABLED, allows_nil: false
+  default_value_for :merge_requests_access_level, value: ENABLED, allows_nil: false
+  default_value_for :snippets_access_level, value: ENABLED, allows_nil: false
+  default_value_for :wiki_access_level, value: ENABLED, allows_nil: false
+  default_value_for :repository_access_level, value: ENABLED, allows_nil: false
+  default_value_for :analytics_access_level, value: ENABLED, allows_nil: false
   default_value_for :metrics_dashboard_access_level, value: PRIVATE, allows_nil: false
-  default_value_for :operations_access_level,        value: ENABLED, allows_nil: false
+  default_value_for :operations_access_level, value: ENABLED, allows_nil: false
+  default_value_for :security_and_compliance_access_level, value: PRIVATE, allows_nil: false
 
   default_value_for(:pages_access_level, allows_nil: false) do |feature|
     if ::Gitlab::Pages.access_control_is_forced?
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index aaf985d6c63..c15c4682654 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -156,6 +156,7 @@ class ProjectPolicy < BasePolicy
     metrics_dashboard
     analytics
     operations
+    security_and_compliance
   ]
 
   features.each do |f|
@@ -640,6 +641,10 @@ class ProjectPolicy < BasePolicy
     enable :set_pipeline_variables
   end
 
+  rule { ~security_and_compliance_disabled & can?(:developer_access) }.policy do
+    enable :access_security_and_compliance
+  end
+
   private
 
   def user_is_user?
diff --git a/app/services/packages/create_temporary_package_service.rb b/app/services/packages/create_temporary_package_service.rb
new file mode 100644
index 00000000000..ee609fd787d
--- /dev/null
+++ b/app/services/packages/create_temporary_package_service.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Packages
+  class CreateTemporaryPackageService < ::Packages::CreatePackageService
+    PACKAGE_VERSION = '0.0.0'
+
+    def execute(package_type, name: 'Temporary.Package')
+      create_package!(package_type,
+        name: name,
+        version: "#{PACKAGE_VERSION}-#{uuid}",
+        status: 'processing'
+      )
+    end
+
+    private
+
+    def uuid
+      SecureRandom.uuid
+    end
+  end
+end
diff --git a/app/services/packages/nuget/create_package_service.rb b/app/services/packages/nuget/create_package_service.rb
deleted file mode 100644
index 3999ccd3347..00000000000
--- a/app/services/packages/nuget/create_package_service.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Packages
-  module Nuget
-    class CreatePackageService < ::Packages::CreatePackageService
-      TEMPORARY_PACKAGE_NAME = 'NuGet.Temporary.Package'
-      PACKAGE_VERSION = '0.0.0'
-
-      def execute
-        create_package!(:nuget,
-          name: TEMPORARY_PACKAGE_NAME,
-          version: "#{PACKAGE_VERSION}-#{uuid}"
-        )
-      end
-
-      private
-
-      def uuid
-        SecureRandom.uuid
-      end
-    end
-  end
-end
diff --git a/app/services/packages/nuget/update_package_from_metadata_service.rb b/app/services/packages/nuget/update_package_from_metadata_service.rb
index 0109ee23c49..1bcab00bd92 100644
--- a/app/services/packages/nuget/update_package_from_metadata_service.rb
+++ b/app/services/packages/nuget/update_package_from_metadata_service.rb
@@ -68,7 +68,8 @@ module Packages
       def update_linked_package
         @package_file.package.update!(
           name: package_name,
-          version: package_version
+          version: package_version,
+          status: :default
         )
 
         ::Packages::Nuget::CreateDependencyService.new(@package_file.package, package_dependencies)
diff --git a/app/validators/json_schemas/vulnerability_finding_details.json b/app/validators/json_schemas/vulnerability_finding_details.json
index f2940866f4b..2ba1fc9e9db 100644
--- a/app/validators/json_schemas/vulnerability_finding_details.json
+++ b/app/validators/json_schemas/vulnerability_finding_details.json
@@ -6,60 +6,67 @@
     "^.*$": {
       "allOf": [
         { "$ref": "#/definitions/named_field" },
-        { "$ref": "#/definitions/type_list" }
+        { "$ref": "#/definitions/detail_type" }
       ]
     }
   },
   "definitions": {
-    "type_list": {
+    "detail_type": {
       "oneOf": [
         { "$ref": "#/definitions/named_list" },
         { "$ref": "#/definitions/list" },
         { "$ref": "#/definitions/table" },
-
         { "$ref": "#/definitions/text" },
         { "$ref": "#/definitions/url" },
         { "$ref": "#/definitions/code" },
-        { "$ref": "#/definitions/int" },
-
+        { "$ref": "#/definitions/value" },
+        { "$ref": "#/definitions/diff" },
+        { "$ref": "#/definitions/markdown" },
         { "$ref": "#/definitions/commit" },
         { "$ref": "#/definitions/file_location" },
         { "$ref": "#/definitions/module_location" }
       ]
     },
-    "lang_text": {
-      "type": "object",
-      "required": [ "value", "lang" ],
-      "properties": {
-        "lang": { "type": "string" },
-        "value": { "type": "string" }
-      }
-    },
-    "lang_text_list": {
-      "type": "array",
-      "items": { "$ref": "#/definitions/lang_text" }
+    "text_value": {
+      "type": "string"
     },
     "named_field": {
       "type": "object",
-      "required": [ "name" ],
+      "required": [
+        "name"
+      ],
       "properties": {
-        "name": { "$ref": "#/definitions/lang_text_list" },
-        "description": { "$ref": "#/definitions/lang_text_list" }
+        "name": {
+          "$ref": "#/definitions/text_value",
+          "minLength": 1
+        },
+        "description": {
+          "$ref": "#/definitions/text_value"
+        }
       }
     },
     "named_list": {
       "type": "object",
       "description": "An object with named and typed fields",
-      "required": [ "type", "items" ],
+      "required": [
+        "type",
+        "items"
+      ],
       "properties": {
-        "type": { "const": "named-list" },
+        "type": {
+          "const": "named-list"
+        },
         "items": {
           "type": "object",
           "patternProperties": {
             "^.*$": {
               "allOf": [
-                { "$ref": "#/definitions/named_field" },
-                { "$ref": "#/definitions/type_list" }
+                {
+                  "$ref": "#/definitions/named_field"
+                },
+                {
+                  "$ref": "#/definitions/detail_type"
+                }
               ]
             }
           }
@@ -69,38 +76,45 @@
     "list": {
       "type": "object",
       "description": "A list of typed fields",
-      "required": [ "type", "items" ],
+      "required": [
+        "type",
+        "items"
+      ],
       "properties": {
-        "type": { "const": "list" },
+        "type": {
+          "const": "list"
+        },
         "items": {
           "type": "array",
-          "items": { "$ref": "#/definitions/type_list" }
+          "items": {
+            "$ref": "#/definitions/detail_type"
+          }
         }
       }
     },
     "table": {
       "type": "object",
       "description": "A table of typed fields",
-      "required": [],
+      "required": [
+        "type",
+        "rows"
+      ],
       "properties": {
-        "type": { "const": "table" },
-        "items": {
-          "type": "object",
-          "properties": {
-            "header": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/type_list"
-              }
-            },
-            "rows": {
-              "type": "array",
-              "items": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/type_list"
-                }
-              }
+        "type": {
+          "const": "table"
+        },
+        "header": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/detail_type"
+          }
+        },
+        "rows": {
+          "type": "array",
+          "items": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/detail_type"
             }
           }
         }
@@ -109,73 +123,171 @@
     "text": {
       "type": "object",
       "description": "Raw text",
-      "required": [ "type", "value" ],
+      "required": [
+        "type",
+        "value"
+      ],
       "properties": {
-        "type": { "const": "text" },
-        "value": { "$ref": "#/definitions/lang_text_list" }
+        "type": {
+          "const": "text"
+        },
+        "value": {
+          "$ref": "#/definitions/text_value"
+        }
       }
     },
     "url": {
       "type": "object",
       "description": "A single URL",
-      "required": [ "type", "href" ],
+      "required": [
+        "type",
+        "href"
+      ],
       "properties": {
-        "type": { "const": "url" },
-        "text": { "$ref": "#/definitions/lang_text_list" },
-        "href": { "type": "string" }
+        "type": {
+          "const": "url"
+        },
+        "text": {
+          "$ref": "#/definitions/text_value"
+        },
+        "href": {
+          "type": "string",
+          "minLength": 1,
+          "examples": ["http://mysite.com"]
+        }
       }
     },
     "code": {
       "type": "object",
       "description": "A codeblock",
-      "required": [ "type", "value" ],
+      "required": [
+        "type",
+        "value"
+      ],
       "properties": {
-        "type": { "const": "code" },
-        "value": { "type": "string" },
-        "lang": { "type": "string" }
+        "type": {
+          "const": "code"
+        },
+        "value": {
+          "type": "string"
+        },
+        "lang": {
+          "type": "string",
+          "description": "A programming language"
+        }
       }
     },
-    "int": {
+    "value": {
       "type": "object",
-      "description": "An integer",
-      "required": [ "type", "value" ],
+      "description": "A field that can store a range of types of value",
+      "required": ["type", "value"],
       "properties": {
-        "type": { "const": "int" },
-        "value": { "type": "integer" },
-        "format": {
-          "type": "string",
-          "enum": [ "default", "hex" ]
+        "type": { "const": "value" },
+        "value": {
+          "type": ["number", "string", "boolean"]
+        }
+      }
+    },
+    "diff": {
+      "type": "object",
+      "description": "A diff",
+      "required": [
+        "type",
+        "before",
+        "after"
+      ],
+      "properties": {
+        "type": {
+          "const": "diff"
+        },
+        "before": {
+          "type": "string"
+        },
+        "after": {
+          "type": "string"
+        }
+      }
+    },
+    "markdown": {
+      "type": "object",
+      "description": "GitLab flavoured markdown, see https://docs.gitlab.com/ee/user/markdown.html",
+      "required": [
+        "type",
+        "value"
+      ],
+      "properties": {
+        "type": {
+          "const": "markdown"
+        },
+        "value": {
+          "$ref": "#/definitions/text_value",
+          "examples": ["Here is markdown `inline code` #1 [test](gitlab.com)\n\n![GitLab Logo](https://about.gitlab.com/images/press/logo/preview/gitlab-logo-white-preview.png)"]
         }
       }
     },
     "commit": {
       "type": "object",
-      "description": "A specific commit within the project",
-      "required": [ "type", "value" ],
+      "description": "A commit/tag/branch within the GitLab project",
+      "required": [
+        "type",
+        "value"
+      ],
       "properties": {
-        "type": { "const": "commit" },
-        "value": { "type": "string", "description": "The commit SHA" }
+        "type": {
+          "const": "commit"
+        },
+        "value": {
+          "type": "string",
+          "description": "The commit SHA",
+          "minLength": 1
+        }
       }
     },
     "file_location": {
       "type": "object",
       "description": "A location within a file in the project",
-      "required": [ "type", "file_name", "line_start" ],
+      "required": [
+        "type",
+        "file_name",
+        "line_start"
+      ],
       "properties": {
-        "type": { "const": "file-location" },
-        "file_name": { "type": "string" },
-        "line_start": { "type": "integer" },
-        "line_end": { "type": "integer" }
+        "type": {
+          "const": "file-location"
+        },
+        "file_name": {
+          "type": "string",
+          "minLength": 1
+        },
+        "line_start": {
+          "type": "integer"
+        },
+        "line_end": {
+          "type": "integer"
+        }
       }
     },
     "module_location": {
       "type": "object",
       "description": "A location within a binary module of the form module+relative_offset",
-      "required": [ "type", "module_name", "offset" ],
+      "required": [
+        "type",
+        "module_name",
+        "offset"
+      ],
       "properties": {
-        "type": { "const": "module-location" },
-        "module_name": { "type": "string" },
-        "offset": { "type": "integer" }
+        "type": {
+          "const": "module-location"
+        },
+        "module_name": {
+          "type": "string",
+          "minLength": 1,
+          "examples": ["compiled_binary"]
+        },
+        "offset": {
+          "type": "integer",
+          "examples": [100]
+        }
       }
     }
   }
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 8b430f579e9..83a0eddbb39 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -54,8 +54,7 @@
   = Gon::Base.render_data(nonce: content_security_policy_nonce)
 
   = javascript_include_tag locale_path unless I18n.locale == :en
-  -# Temporarily commented out to investigate performance: https://gitlab.com/gitlab-org/gitlab/-/issues/251179
-  -# = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled
+  = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled
   = webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
 
   = yield :page_specific_javascripts
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
index b431ef202b3..751268ec920 100644
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@@ -26,4 +26,4 @@
 
   = render "projects/pipelines/with_tabs", pipeline: @pipeline, pipeline_has_errors: pipeline_has_errors
 
-.js-pipeline-details-vue{ data: { endpoint: project_pipeline_path(@project, @pipeline, format: :json), pipeline_project_path: @project.full_path, pipeline_iid: @pipeline.iid } }
+.js-pipeline-details-vue{ data: { endpoint: project_pipeline_path(@project, @pipeline, format: :json), metrics_path: namespace_project_ci_prometheus_metrics_histograms_path(namespace_id: @project.namespace, project_id: @project, format: :json), pipeline_project_path: @project.full_path, pipeline_iid: @pipeline.iid } }
diff --git a/changelogs/unreleased/292498-webid-extension.yml b/changelogs/unreleased/292498-webid-extension.yml
new file mode 100644
index 00000000000..f2e89b78e72
--- /dev/null
+++ b/changelogs/unreleased/292498-webid-extension.yml
@@ -0,0 +1,5 @@
+---
+title: Introduce WebIDE as an extension for Editor Lite
+merge_request: 51527
+author:
+type: changed
diff --git a/changelogs/unreleased/299895-experiment-cleanup-customize_homepage-banner.yml b/changelogs/unreleased/299895-experiment-cleanup-customize_homepage-banner.yml
new file mode 100644
index 00000000000..07752ef9f78
--- /dev/null
+++ b/changelogs/unreleased/299895-experiment-cleanup-customize_homepage-banner.yml
@@ -0,0 +1,5 @@
+---
+title: Enable customize homepage banner by default
+merge_request: 54357
+author:
+type: added
diff --git a/changelogs/unreleased/300435-add-label.yml b/changelogs/unreleased/300435-add-label.yml
new file mode 100644
index 00000000000..544ae90a238
--- /dev/null
+++ b/changelogs/unreleased/300435-add-label.yml
@@ -0,0 +1,5 @@
+---
+title: Add GlToggle label in sidebar subscription toggle
+merge_request: 54548
+author: Yogi (@yo)
+type: changed
diff --git a/changelogs/unreleased/321958-fix-npm-instance-level-api-with-scoped-packages.yml b/changelogs/unreleased/321958-fix-npm-instance-level-api-with-scoped-packages.yml
new file mode 100644
index 00000000000..2a1ca8c7845
--- /dev/null
+++ b/changelogs/unreleased/321958-fix-npm-instance-level-api-with-scoped-packages.yml
@@ -0,0 +1,5 @@
+---
+title: Fix the npm instance level API to exclude subgroups
+merge_request: 54554
+author:
+type: fixed
diff --git a/changelogs/unreleased/feature-230726-repo-tabs.yml b/changelogs/unreleased/feature-230726-repo-tabs.yml
new file mode 100644
index 00000000000..7de7085fd04
--- /dev/null
+++ b/changelogs/unreleased/feature-230726-repo-tabs.yml
@@ -0,0 +1,5 @@
+---
+title: convert to GlTabs in app/assets/javascripts/ide/components/repo_tabs.vue
+merge_request: 42162
+author: Brandon Everett
+type: added
diff --git a/changelogs/unreleased/mg-fix-firefox-textarea-styling.yml b/changelogs/unreleased/mg-fix-firefox-textarea-styling.yml
new file mode 100644
index 00000000000..6830be548f5
--- /dev/null
+++ b/changelogs/unreleased/mg-fix-firefox-textarea-styling.yml
@@ -0,0 +1,5 @@
+---
+title: Fix style issue with "reply" placeholder textarea in firefox
+merge_request: 54592
+author:
+type: fixed
diff --git a/changelogs/unreleased/reenable-sentry-pipeline-graph-only.yml b/changelogs/unreleased/reenable-sentry-pipeline-graph-only.yml
new file mode 100644
index 00000000000..47711e6da82
--- /dev/null
+++ b/changelogs/unreleased/reenable-sentry-pipeline-graph-only.yml
@@ -0,0 +1,5 @@
+---
+title: Restore Sentry functionaly to the frontend
+merge_request: 54441
+author:
+type: changed
diff --git a/config/feature_flags/development/customize_homepage.yml b/config/feature_flags/development/customize_homepage.yml
new file mode 100644
index 00000000000..2be1d5ff8e3
--- /dev/null
+++ b/config/feature_flags/development/customize_homepage.yml
@@ -0,0 +1,8 @@
+---
+name: customize_homepage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54357
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299895
+milestone: '13.10'
+type: development
+group: group::expansion
+default_enabled: true
diff --git a/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml b/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
deleted file mode 100644
index eff0d2785eb..00000000000
--- a/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: customize_homepage_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39348
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/187
-milestone: '13.4'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 19059c35c46..e43fc3ed21c 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -101,7 +101,7 @@ function generateEntries() {
 
   const manualEntries = {
     default: defaultEntries,
-    // sentry: './sentry/index.js', Temporarily commented out to investigate performance: https://gitlab.com/gitlab-org/gitlab/-/issues/251179
+    sentry: './sentry/index.js',
     performance_bar: './performance_bar/index.js',
     chrome_84_icon_fix: './lib/chrome_84_icon_fix.js',
     jira_connect_app: './jira_connect/index.js',
diff --git a/db/fixtures/development/26_packages.rb b/db/fixtures/development/26_packages.rb
index 2a7f80c18a3..c09d3f1fef9 100644
--- a/db/fixtures/development/26_packages.rb
+++ b/db/fixtures/development/26_packages.rb
@@ -103,8 +103,10 @@ class Gitlab::Seeder::Packages
       name = "MyNugetApp.Package#{i}"
       version = "4.2.#{i}"
 
-      pkg = ::Packages::Nuget::CreatePackageService.new(project, project.creator, {}).execute
-      # when using ::Packages::Nuget::CreatePackageService, packages have a fixed name and a fixed version.
+      pkg = ::Packages::CreateTemporaryPackageService.new(
+        project, project.creator, {}
+      ).execute(:nuget, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME)
+      # when using ::Packages::CreateTemporaryPackageService, packages have a fixed name and a fixed version.
       pkg.update!(name: name, version: version)
 
       filename = 'package.nupkg'
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index dbbe17cccc8..834f4047fdd 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -5,160 +5,21 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# PlantUML & GitLab **(FREE)**
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8537) in GitLab 8.16.
+# PlantUML and GitLab **(FREE)**
 
 When [PlantUML](https://plantuml.com) integration is enabled and configured in
-GitLab you can create diagrams in AsciiDoc and Markdown documents
-created in snippets, wikis, and repositories.
+GitLab, you can create diagrams in snippets, wikis, and repositories. To set up
+the integration, you must:
 
-## PlantUML Server
+1. [Configure your PlantUML server](#configure-your-plantuml-server).
+1. [Configure local PlantUML access](#configure-local-plantuml-access).
+1. [Configure PlantUML security](#configure-plantuml-security).
+1. [Enable the integration](#enable-plantuml-integration).
 
-Before you can enable PlantUML in GitLab; set up your own PlantUML
-server to generate the diagrams.
-
-### Docker
-
-With Docker, you can just run a container like this:
-
-```shell
-docker run -d --name plantuml -p 8080:8080 plantuml/plantuml-server:tomcat
-```
-
-The **PlantUML URL** is the hostname of the server running the container.
-
-When running GitLab in Docker, it must have access to the PlantUML container.
-You can achieve that by using [Docker Compose](https://docs.docker.com/compose/).
-A basic `docker-compose.yml` file could contain:
-
-```yaml
-version: "3"
-services:
-  gitlab:
-    image: 'gitlab/gitlab-ee:12.2.5-ee.0'
-    environment:
-      GITLAB_OMNIBUS_CONFIG: |
-        nginx['custom_gitlab_server_config'] = "location /-/plantuml/ { \n    proxy_cache off; \n    proxy_pass  http://plantuml:8080/; \n}\n"
-
-  plantuml:
-    image: 'plantuml/plantuml-server:tomcat'
-    container_name: plantuml
-```
-
-In this scenario, PlantUML is accessible to GitLab at the URL
-`http://plantuml:8080/`.
-
-### Debian/Ubuntu
-
-You can also install and configure a PlantUML server in Debian/Ubuntu distributions using Tomcat.
-
-First you need to create a `plantuml.war` file from the source code:
-
-```shell
-sudo apt-get install graphviz openjdk-8-jdk git-core maven
-git clone https://github.com/plantuml/plantuml-server.git
-cd plantuml-server
-mvn package
-```
-
-The above sequence of commands generates a `.war` file you can deploy with Tomcat:
-
-```shell
-sudo apt-get install tomcat8
-sudo cp target/plantuml.war /var/lib/tomcat8/webapps/plantuml.war
-sudo chown tomcat8:tomcat8 /var/lib/tomcat8/webapps/plantuml.war
-sudo service tomcat8 restart
-```
-
-After the Tomcat service restarts, the PlantUML service is ready and
-listening for requests on port 8080:
-
-```plaintext
-http://localhost:8080/plantuml
-```
-
-To change these defaults, edit the `/etc/tomcat8/server.xml` file.
-
-NOTE:
-The default URL is different when using this approach. The Docker-based image
-makes the service available at the root URL, with no relative path. Adjust
-the configuration below accordingly.
-
-### Making local PlantUML accessible using custom GitLab setup
-
-The PlantUML server runs locally on your server, so it is not accessible
-externally by default. As such, it is necessary to catch external PlantUML
-calls and redirect them to the local server.
-
-The idea is to redirect each call to `https://gitlab.example.com/-/plantuml/`
-to the local PlantUML server `http://plantuml:8080/` or `http://localhost:8080/plantuml/`, depending on your setup.
-
-To enable the redirection, add the following line in `/etc/gitlab/gitlab.rb`:
-
-```ruby
-# Docker deployment
-nginx['custom_gitlab_server_config'] = "location /-/plantuml/ { \n    proxy_cache off; \n    proxy_pass  http://plantuml:8080/; \n}\n"
-
-# Built from source
-nginx['custom_gitlab_server_config'] = "location /-/plantuml { \n rewrite ^/-/(plantuml.*) /$1 break;\n proxy_cache off; \n proxy_pass http://localhost:8080/plantuml; \n}\n"
-```
-
-To activate the changes, run the following command:
-
-```shell
-sudo gitlab-ctl reconfigure
-```
-
-Note that the redirection through GitLab must be configured
-when running [GitLab with TLS](https://docs.gitlab.com/omnibus/settings/ssl.html)
-due to PlantUML's use of the insecure HTTP protocol. Newer browsers such
-as [Google Chrome 86+](https://www.chromestatus.com/feature/4926989725073408)
-do not load insecure HTTP resources on a page served over HTTPS.
-
-### Security
-
-PlantUML has features that allow fetching network resources.
-
-```plaintext
-@startuml
-start
-    ' ...
-    !include http://localhost/
-stop;
-@enduml
-```
-
-**If you self-host the PlantUML server, network controls should be put in place to isolate it.**
-
-## GitLab
-
-You need to enable PlantUML integration from Settings under Admin Area. To do
-that, sign in with an Administrator account, and then do following:
-
-1. In GitLab, go to **Admin Area > Settings > General**.
-1. Expand the **PlantUML** section.
-1. Select the **Enable PlantUML** check box.
-1. Set the PlantUML instance as `https://gitlab.example.com/-/plantuml/`.
-
-NOTE:
-If you are using a PlantUML server running v1.2020.9 and
-above (for example, [plantuml.com](https://plantuml.com)), set the `PLANTUML_ENCODING`
-environment variable to enable the `deflate` compression. On Omnibus GitLab,
-this can be set in `/etc/gitlab.rb`:
-
-```ruby
-gitlab_rails['env'] = { 'PLANTUML_ENCODING' => 'deflate' }
-```
-
-From GitLab 13.1 and later, PlantUML integration now
-[requires a header prefix in the URL](https://github.com/plantuml/plantuml/issues/117#issuecomment-6235450160)
-to distinguish different encoding types.
-
-## Creating Diagrams
-
-With PlantUML integration enabled and configured, we can start adding diagrams to
-our AsciiDoc snippets, wikis, and repositories using delimited blocks:
+After completing the integration, PlantUML converts `plantuml`
+blocks to an HTML image tag, with the source pointing to the PlantUML instance. The PlantUML
+diagram delimiters `@startuml`/`@enduml` aren't required, as these are replaced
+by the `plantuml` block:
 
 - **Markdown**
 
@@ -189,13 +50,12 @@ our AsciiDoc snippets, wikis, and repositories using delimited blocks:
      Alice -> Bob: hi
   ```
 
-   You can also use the `uml::` directive for compatibility with
+   Although you can use the `uml::` directive for compatibility with
    [`sphinxcontrib-plantuml`](https://pypi.org/project/sphinxcontrib-plantuml/),
-   but GitLab only supports the `caption` option.
+   GitLab supports only the `caption` option.
 
-The above blocks are converted to an HTML image tag with source pointing to the
-PlantUML instance. If the PlantUML server is correctly configured, this should
-render a nice diagram instead of the block:
+If the PlantUML server is correctly configured, these examples should render a
+diagram instead of the code block:
 
 ```plantuml
 Bob -> Alice : hello
@@ -204,23 +64,166 @@ Alice -> Bob : hi
 
 Inside the block you can add any of the diagrams PlantUML supports, such as:
 
-- [Sequence](https://plantuml.com/sequence-diagram)
-- [Use Case](https://plantuml.com/use-case-diagram)
-- [Class](https://plantuml.com/class-diagram)
 - [Activity](https://plantuml.com/activity-diagram-legacy)
+- [Class](https://plantuml.com/class-diagram)
 - [Component](https://plantuml.com/component-diagram)
-- [State](https://plantuml.com/state-diagram),
 - [Object](https://plantuml.com/object-diagram)
+- [Sequence](https://plantuml.com/sequence-diagram)
+- [State](https://plantuml.com/state-diagram)
+- [Use Case](https://plantuml.com/use-case-diagram)
 
-You do not need to use the PlantUML
-diagram delimiters `@startuml`/`@enduml`, as these are replaced by the AsciiDoc `plantuml` block.
+You can add parameters to block definitions:
 
-Some parameters can be added to the AsciiDoc block definition:
-
-- `format`: Can be either `png` or `svg`. Note that `svg` is not supported by
-  all browsers so use with care. The default is `png`.
+- `format`: Can be either `png` (default) or `svg`. Use `svg` with care, as it's
+  not supported by all browsers, and isn't supported by Markdown.
 - `id`: A CSS ID added to the diagram HTML tag.
 - `width`: Width attribute added to the image tag.
 - `height`: Height attribute added to the image tag.
 
-Markdown does not support any parameters and always uses PNG format.
+Markdown does not support any parameters, and always uses PNG format.
+
+## Configure your PlantUML server
+
+Before you can enable PlantUML in GitLab, set up your own PlantUML
+server to generate the diagrams:
+
+- [In Docker](#docker).
+- [In Debian/Ubuntu](#debianubuntu).
+
+### Docker
+
+To run a PlantUML container in Docker, run this command:
+
+```shell
+docker run -d --name plantuml -p 8080:8080 plantuml/plantuml-server:tomcat
+```
+
+The **PlantUML URL** is the hostname of the server running the container.
+
+When running GitLab in Docker, it must have access to the PlantUML container.
+To achieve that, use [Docker Compose](https://docs.docker.com/compose/).
+In this basic `docker-compose.yml` file, PlantUML is accessible to GitLab at the URL
+`http://plantuml:8080/`:
+
+```yaml
+version: "3"
+services:
+  gitlab:
+    image: 'gitlab/gitlab-ee:12.2.5-ee.0'
+    environment:
+      GITLAB_OMNIBUS_CONFIG: |
+        nginx['custom_gitlab_server_config'] = "location /-/plantuml/ { \n    proxy_cache off; \n    proxy_pass  http://plantuml:8080/; \n}\n"
+
+  plantuml:
+    image: 'plantuml/plantuml-server:tomcat'
+    container_name: plantuml
+```
+
+### Debian/Ubuntu
+
+You can install and configure a PlantUML server in Debian/Ubuntu distributions
+using Tomcat:
+
+1. Run these commands to create a `plantuml.war` file from the source code:
+
+   ```shell
+   sudo apt-get install graphviz openjdk-8-jdk git-core maven
+   git clone https://github.com/plantuml/plantuml-server.git
+   cd plantuml-server
+   mvn package
+   ```
+
+1. Deploy the `.war` file from the previous step with these commands:
+
+   ```shell
+   sudo apt-get install tomcat8
+   sudo cp target/plantuml.war /var/lib/tomcat8/webapps/plantuml.war
+   sudo chown tomcat8:tomcat8 /var/lib/tomcat8/webapps/plantuml.war
+   sudo service tomcat8 restart
+   ```
+
+The Tomcat service should restart. After the restart is complete, the
+PlantUML service is ready and listening for requests on port 8080:
+`http://localhost:8080/plantuml`
+
+To change these defaults, edit the `/etc/tomcat8/server.xml` file.
+
+NOTE:
+The default URL is different when using this approach. The Docker-based image
+makes the service available at the root URL, with no relative path. Adjust
+the configuration below accordingly.
+
+## Configure local PlantUML access
+
+The PlantUML server runs locally on your server, so it can't be accessed
+externally by default. Your server must catch external PlantUML
+calls to `https://gitlab.example.com/-/plantuml/` and redirect them to the
+local PlantUML server. Depending on your setup, the URL is either of the
+following:
+
+- `http://plantuml:8080/`
+- `http://localhost:8080/plantuml/`
+
+If you're running [GitLab with TLS](https://docs.gitlab.com/omnibus/settings/ssl.html)
+you must configure this redirection, because PlantUML uses the insecure HTTP protocol.
+Newer browsers such as [Google Chrome 86+](https://www.chromestatus.com/feature/4926989725073408)
+don't load insecure HTTP resources on pages served over HTTPS.
+
+To enable this redirection:
+
+1. Add the following line in `/etc/gitlab/gitlab.rb`, depending on your setup method:
+
+   ```ruby
+   # Docker deployment
+   nginx['custom_gitlab_server_config'] = "location /-/plantuml/ { \n    proxy_cache off; \n    proxy_pass  http://plantuml:8080/; \n}\n"
+
+   # Built from source
+   nginx['custom_gitlab_server_config'] = "location /-/plantuml { \n rewrite ^/-/(plantuml.*) /$1 break;\n proxy_cache off; \n proxy_pass http://localhost:8080/plantuml; \n}\n"
+   ```
+
+1. To activate the changes, run the following command:
+
+   ```shell
+   sudo gitlab-ctl reconfigure
+   ```
+
+### Configure PlantUML security
+
+PlantUML has features that allow fetching network resources. If you self-host the
+PlantUML server, put network controls in place to isolate it.
+
+```plaintext
+@startuml
+start
+    ' ...
+    !include http://localhost/
+stop;
+@enduml
+```
+
+## Enable PlantUML integration
+
+After configuring your local PlantUML server, you're ready to enable the PlantUML integration:
+
+1. Sign in to GitLab as an [Administrator](../../user/permissions.md) user.
+1. In the top menu, click **{admin}** **Admin Area**.
+1. In the left sidebar, go to **Settings > General** and expand the **PlantUML** section.
+1. Select the **Enable PlantUML** check box.
+1. Set the PlantUML instance as `https://gitlab.example.com/-/plantuml/`,
+   and click **Save changes**.
+
+Depending on your PlantUML and GitLab version numbers, you may also need to take
+these steps:
+
+- For PlantUML servers running v1.2020.9 and above, such as [plantuml.com](https://plantuml.com),
+  you must set the `PLANTUML_ENCODING` environment variable to enable the `deflate`
+  compression. In Omnibus GitLab, you can set this value in `/etc/gitlab.rb` with
+  this command:
+
+  ```ruby
+   gitlab_rails['env'] = { 'PLANTUML_ENCODING' => 'deflate' }
+   ```
+
+- For GitLab versions 13.1 and later, PlantUML integration now
+  [requires a header prefix in the URL](https://github.com/plantuml/plantuml/issues/117#issuecomment-6235450160)
+  to distinguish different encoding types.
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 725a19458f8..0c827d6bf49 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -1603,7 +1603,7 @@ enum BlobViewersType {
 }
 
 """
-Represents a project or group board
+Represents a project or group issue board
 """
 type Board {
   """
@@ -9490,7 +9490,7 @@ type EpicBoard {
   hideClosedList: Boolean
 
   """
-  Global ID of the board.
+  Global ID of the epic board.
   """
   id: BoardsEpicBoardID!
 
@@ -9525,9 +9525,19 @@ type EpicBoard {
   ): EpicListConnection
 
   """
-  Name of the board.
+  Name of the epic board.
   """
   name: String
+
+  """
+  Web path of the epic board.
+  """
+  webPath: String!
+
+  """
+  Web URL of the epic board.
+  """
+  webUrl: String!
 }
 
 """
@@ -23855,8 +23865,19 @@ type SastCiConfigurationOptionsEntityEdge {
 Size of UI component in SAST configuration page
 """
 enum SastUiComponentSize {
+  """
+  The size of UI component in SAST configuration page is large.
+  """
   LARGE
+
+  """
+  The size of UI component in SAST configuration page is medium.
+  """
   MEDIUM
+
+  """
+  The size of UI component in SAST configuration page is small.
+  """
   SMALL
 }
 
@@ -28452,7 +28473,7 @@ type VulnerabilityDetailBase {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28462,7 +28483,7 @@ type VulnerabilityDetailBase {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 }
 
 """
@@ -28472,7 +28493,7 @@ type VulnerabilityDetailBoolean {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28482,7 +28503,7 @@ type VulnerabilityDetailBoolean {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Value of the field.
@@ -28497,7 +28518,7 @@ type VulnerabilityDetailCode {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28512,7 +28533,7 @@ type VulnerabilityDetailCode {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Source code.
@@ -28527,7 +28548,7 @@ type VulnerabilityDetailCommit {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28537,7 +28558,7 @@ type VulnerabilityDetailCommit {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   The commit SHA value.
@@ -28562,7 +28583,7 @@ type VulnerabilityDetailDiff {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28572,7 +28593,7 @@ type VulnerabilityDetailDiff {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 }
 
 """
@@ -28582,7 +28603,7 @@ type VulnerabilityDetailFileLocation {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28607,7 +28628,7 @@ type VulnerabilityDetailFileLocation {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 }
 
 """
@@ -28617,7 +28638,7 @@ type VulnerabilityDetailInt {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28627,7 +28648,7 @@ type VulnerabilityDetailInt {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Value of the field.
@@ -28642,7 +28663,7 @@ type VulnerabilityDetailList {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28657,7 +28678,7 @@ type VulnerabilityDetailList {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 }
 
 """
@@ -28667,7 +28688,7 @@ type VulnerabilityDetailMarkdown {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28677,7 +28698,7 @@ type VulnerabilityDetailMarkdown {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Value of the Markdown field.
@@ -28692,7 +28713,7 @@ type VulnerabilityDetailModuleLocation {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28707,7 +28728,7 @@ type VulnerabilityDetailModuleLocation {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Offset of the module location.
@@ -28722,7 +28743,7 @@ type VulnerabilityDetailTable {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28737,7 +28758,7 @@ type VulnerabilityDetailTable {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Table rows.
@@ -28752,7 +28773,7 @@ type VulnerabilityDetailText {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28762,7 +28783,7 @@ type VulnerabilityDetailText {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Value of the text field.
@@ -28777,7 +28798,7 @@ type VulnerabilityDetailUrl {
   """
   Description of the field.
   """
-  description: String!
+  description: String
 
   """
   Name of the field.
@@ -28792,7 +28813,7 @@ type VulnerabilityDetailUrl {
   """
   Name of the field.
   """
-  name: String!
+  name: String
 
   """
   Text of the URL.
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index f6fe77ebf60..08444a94ef5 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -4260,7 +4260,7 @@
         {
           "kind": "OBJECT",
           "name": "Board",
-          "description": "Represents a project or group board",
+          "description": "Represents a project or group issue board",
           "fields": [
             {
               "name": "assignee",
@@ -26126,7 +26126,7 @@
             },
             {
               "name": "id",
-              "description": "Global ID of the board.",
+              "description": "Global ID of the epic board.",
               "args": [
 
               ],
@@ -26207,7 +26207,7 @@
             },
             {
               "name": "name",
-              "description": "Name of the board.",
+              "description": "Name of the epic board.",
               "args": [
 
               ],
@@ -26218,6 +26218,42 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "webPath",
+              "description": "Web path of the epic board.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "webUrl",
+              "description": "Web URL of the epic board.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -68666,19 +68702,19 @@
           "enumValues": [
             {
               "name": "SMALL",
-              "description": null,
+              "description": "The size of UI component in SAST configuration page is small.",
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
               "name": "MEDIUM",
-              "description": null,
+              "description": "The size of UI component in SAST configuration page is medium.",
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
               "name": "LARGE",
-              "description": null,
+              "description": "The size of UI component in SAST configuration page is large.",
               "isDeprecated": false,
               "deprecationReason": null
             }
@@ -81695,13 +81731,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81727,13 +81759,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81758,13 +81786,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81790,13 +81814,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81839,13 +81859,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81885,13 +81901,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81903,13 +81915,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81934,13 +81942,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81966,13 +81970,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -81984,13 +81984,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82015,13 +82011,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82033,13 +82025,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82051,13 +82039,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82083,13 +82067,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82114,13 +82094,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82146,13 +82122,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82200,13 +82172,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82231,13 +82199,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82263,13 +82227,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82312,13 +82272,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82370,13 +82326,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82401,13 +82353,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82433,13 +82381,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82451,13 +82395,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82482,13 +82422,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -82514,13 +82450,9 @@
 
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 297923bfe54..974958502e9 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -438,7 +438,7 @@ Autogenerated return type of AwardEmojiToggle.
 
 ### Board
 
-Represents a project or group board.
+Represents a project or group issue board.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
@@ -1699,9 +1699,11 @@ Represents an epic board.
 | ----- | ---- | ----------- |
 | `hideBacklogList` | Boolean | Whether or not backlog list is hidden. |
 | `hideClosedList` | Boolean | Whether or not closed list is hidden. |
-| `id` | BoardsEpicBoardID! | Global ID of the board. |
+| `id` | BoardsEpicBoardID! | Global ID of the epic board. |
 | `lists` | EpicListConnection | Epic board lists. |
-| `name` | String | Name of the board. |
+| `name` | String | Name of the epic board. |
+| `webPath` | String! | Web path of the epic board. |
+| `webUrl` | String! | Web URL of the epic board. |
 
 ### EpicBoardCreatePayload
 
@@ -4333,9 +4335,9 @@ Represents the vulnerability details base.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 
 ### VulnerabilityDetailBoolean
 
@@ -4343,9 +4345,9 @@ Represents the vulnerability details boolean value.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `value` | Boolean! | Value of the field. |
 
 ### VulnerabilityDetailCode
@@ -4354,10 +4356,10 @@ Represents the vulnerability details code field.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
 | `lang` | String | Language of the code. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `value` | String! | Source code. |
 
 ### VulnerabilityDetailCommit
@@ -4366,9 +4368,9 @@ Represents the vulnerability details commit field.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `value` | String! | The commit SHA value. |
 
 ### VulnerabilityDetailDiff
@@ -4379,9 +4381,9 @@ Represents the vulnerability details diff field.
 | ----- | ---- | ----------- |
 | `after` | String! | Value of the field after the change. |
 | `before` | String! | Value of the field before the change. |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 
 ### VulnerabilityDetailFileLocation
 
@@ -4389,12 +4391,12 @@ Represents the vulnerability details location within a file in the project.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
 | `fileName` | String! | File name. |
 | `lineEnd` | Int! | End line number of the file location. |
 | `lineStart` | Int! | Start line number of the file location. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 
 ### VulnerabilityDetailInt
 
@@ -4402,9 +4404,9 @@ Represents the vulnerability details integer value.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `value` | Int! | Value of the field. |
 
 ### VulnerabilityDetailList
@@ -4413,10 +4415,10 @@ Represents the vulnerability details list value.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
 | `items` | VulnerabilityDetail! => Array | List of details. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 
 ### VulnerabilityDetailMarkdown
 
@@ -4424,9 +4426,9 @@ Represents the vulnerability details Markdown field.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `value` | String! | Value of the Markdown field. |
 
 ### VulnerabilityDetailModuleLocation
@@ -4435,10 +4437,10 @@ Represents the vulnerability details location within a file in the project.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
 | `moduleName` | String! | Module name. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `offset` | Int! | Offset of the module location. |
 
 ### VulnerabilityDetailTable
@@ -4447,10 +4449,10 @@ Represents the vulnerability details table value.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
 | `headers` | VulnerabilityDetail! => Array | Table headers. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `rows` | VulnerabilityDetail! => Array | Table rows. |
 
 ### VulnerabilityDetailText
@@ -4459,9 +4461,9 @@ Represents the vulnerability details text field.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `value` | String! | Value of the text field. |
 
 ### VulnerabilityDetailUrl
@@ -4470,10 +4472,10 @@ Represents the vulnerability details URL field.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `description` | String! | Description of the field. |
+| `description` | String | Description of the field. |
 | `fieldName` | String | Name of the field. |
 | `href` | String! | Href of the URL. |
-| `name` | String! | Name of the field. |
+| `name` | String | Name of the field. |
 | `text` | String | Text of the URL. |
 
 ### VulnerabilityDismissPayload
@@ -5470,9 +5472,9 @@ Size of UI component in SAST configuration page.
 
 | Value | Description |
 | ----- | ----------- |
-| `LARGE` |  |
-| `MEDIUM` |  |
-| `SMALL` |  |
+| `LARGE` | The size of UI component in SAST configuration page is large. |
+| `MEDIUM` | The size of UI component in SAST configuration page is medium. |
+| `SMALL` | The size of UI component in SAST configuration page is small. |
 
 ### SecurityReportTypeEnum
 
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 321a95af8b5..b8687314697 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -1061,7 +1061,7 @@ POST /projects
 | `avatar`                                                    | mixed   | **{dotted-circle}** No | Image file for avatar of the project.                |
 | `build_coverage_regex`                                      | string  | **{dotted-circle}** No | Test coverage parsing. |
 | `build_git_strategy`                                        | string  | **{dotted-circle}** No | The Git strategy. Defaults to `fetch`. |
-| `build_timeout`                                             | integer | **{dotted-circle}** No | The maximum amount of time in minutes that a job is able run (in seconds). |
+| `build_timeout`                                             | integer | **{dotted-circle}** No | The maximum amount of time, in seconds, that a job can run. |
 | `builds_access_level`                                       | string  | **{dotted-circle}** No | One of `disabled`, `private`, or `enabled`. |
 | `ci_config_path`                                            | string  | **{dotted-circle}** No | The path to CI configuration file. |
 | `container_expiration_policy_attributes`                    | hash    | **{dotted-circle}** No | Update the image cleanup policy for this project. Accepts: `cadence` (string), `keep_n` (integer), `older_than` (string), `name_regex` (string), `name_regex_delete` (string), `name_regex_keep` (string), `enabled` (boolean). |
diff --git a/doc/development/elasticsearch.md b/doc/development/elasticsearch.md
index 3392bd1fbf6..e1239c0d70e 100644
--- a/doc/development/elasticsearch.md
+++ b/doc/development/elasticsearch.md
@@ -242,6 +242,27 @@ class BatchedMigrationName < Elastic::Migration
 end
 ```
 
+### Multi-version compatibility
+
+These Elasticsearch migrations, like any other GitLab changes, need to support the case where
+[multiple versions of the application are running at the same time](multi_version_compatibility.md).
+
+Depending on the order of deployment, it's possible that the migration
+has started or finished and there's still a server running the application code from before the
+migration. We need to take this into consideration until we can [ensure all Elasticsearch migrations
+start after the deployment has finished](https://gitlab.com/gitlab-org/gitlab/-/issues/321619).
+
+### Reverting a migration
+
+Because Elasticsearch does not support transactions, we always need to design our
+migrations to accommodate a situation where the application
+code is reverted after the migration has started or after it is finished.
+
+For this reason we generally defer destructive actions (for example, deletions after
+some data is moved) to a later merge request after the migrations have
+completed successfully. To be safe, for self-managed customers we should also
+defer it to another release if there is risk of important data loss.
+
 ## Performance Monitoring
 
 ### Prometheus
diff --git a/doc/development/fe_guide/tooling.md b/doc/development/fe_guide/tooling.md
index 7b3ff3edcba..c493ab9a206 100644
--- a/doc/development/fe_guide/tooling.md
+++ b/doc/development/fe_guide/tooling.md
@@ -98,6 +98,57 @@ When declaring multiple globals, always use one `/* global [name] */` line per v
 /* global jQuery */
 ```
 
+### Deprecating functions with `import/no-deprecated`
+
+Our `@gitlab/eslint-plugin` Node module contains the [`eslint-plugin-import`](https://gitlab.com/gitlab-org/frontend/eslint-plugin) package.
+
+We can use the [`import/no-deprecated`](https://github.com/benmosher/eslint-plugin-import/blob/HEAD/docs/rules/no-deprecated.md) rule to deprecate functions using a JSDoc block with a `@deprecated` tag:
+
+```javascript
+/**
+ * Convert search query into an object
+ *
+ * @param {String} query from "document.location.search"
+ * @param {Object} options
+ * @param {Boolean} options.gatherArrays - gather array values into an Array
+ * @returns {Object}
+ *
+ * ex: "?one=1&two=2" into {one: 1, two: 2}
+ * @deprecated Please use `queryToObject` instead. See https://gitlab.com/gitlab-org/gitlab/-/issues/283982 for more information
+ */
+export function queryToObject(query, options = {}) {
+  ...
+}
+```
+
+It is strongly encouraged that you:
+
+- Put in an **alternative path for developers** looking to use this function.
+- **Provide a link to the issue** that tracks the migration process.
+
+NOTE:
+Uses are detected if you import the deprecated function into another file. They are not detected when the function is used in the same file.
+
+Running `$ yarn eslint` after this will give us the list of deprecated usages:
+
+```shell
+$ yarn eslint
+
+./app/assets/javascripts/issuable_form.js
+   9:10  error  Deprecated: Please use `queryToObject` instead. See https://gitlab.com/gitlab-org/gitlab/-/issues/283982 for more information  import/no-deprecated
+  33:23  error  Deprecated: Please use `queryToObject` instead. See https://gitlab.com/gitlab-org/gitlab/-/issues/283982 for more information  import/no-deprecated
+...
+```
+
+Grep for disabled cases of this rule to generate a working list to create issues from, so you can track the effort of removing deprecated uses:
+
+```shell
+$ grep "eslint-disable.*import/no-deprecated" -r .
+
+./app/assets/javascripts/issuable_form.js:import { queryToObject, objectToQuery } from './lib/utils/url_utility'; // eslint-disable-line import/no-deprecate
+./app/assets/javascripts/issuable_form.js:  // eslint-disable-next-line import/no-deprecated
+```
+
 ## Formatting with Prettier
 
 > Support for `.graphql` [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227280) in GitLab 13.2.
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
index 3377b1674db..cbdc617d7d9 100644
--- a/doc/user/admin_area/settings/index.md
+++ b/doc/user/admin_area/settings/index.md
@@ -35,7 +35,7 @@ Access the default page for admin area settings by navigating to **Admin Area >
 | ------ | ----------- |
 | [Elasticsearch](../../../integration/elasticsearch.md#enabling-advanced-search) | Elasticsearch integration. Elasticsearch AWS IAM. |
 | [Kroki](../../../administration/integration/kroki.md#enable-kroki-in-gitlab) | Allow rendering of diagrams in AsciiDoc and Markdown documents using [kroki.io](https://kroki.io). |
-| [PlantUML](../../../administration/integration/plantuml.md#gitlab) | Allow rendering of PlantUML diagrams in AsciiDoc and Markdown documents. |
+| [PlantUML](../../../administration/integration/plantuml.md) | Allow rendering of PlantUML diagrams in documents. |
 | [Slack application](../../../user/project/integrations/gitlab_slack_application.md#configuration) **(FREE SAAS)** | Slack integration allows you to interact with GitLab via slash commands in a chat window. This option is only available on GitLab.com, though it may be [available for self-managed instances in the future](https://gitlab.com/gitlab-org/gitlab/-/issues/28164). |
 | [Third party offers](third_party_offers.md) | Control the display of third party offers. |
 | [Snowplow](../../../development/snowplow.md) | Configure the Snowplow integration. |
diff --git a/lib/api/helpers/packages/npm.rb b/lib/api/helpers/packages/npm.rb
index b6edec3f143..2d556f889bf 100644
--- a/lib/api/helpers/packages/npm.rb
+++ b/lib/api/helpers/packages/npm.rb
@@ -52,7 +52,8 @@ module API
               namespace_path = namespace_path_from_package_name
               next unless namespace_path
 
-              namespace = namespace_from_path(namespace_path)
+              namespace = Namespace.top_most
+                                   .by_path(namespace_path)
               next unless namespace
 
               finder = ::Packages::Npm::PackageFinder.new(params[:package_name], namespace: namespace)
@@ -70,13 +71,6 @@ module API
 
           package_name.match(Gitlab::Regex.npm_package_name_regex)&.captures&.first
         end
-
-        def namespace_from_path(path)
-          group = Group.by_path(path)
-          return group if group
-
-          Namespace.for_user.by_path(path)
-        end
       end
     end
   end
diff --git a/lib/api/nuget_project_packages.rb b/lib/api/nuget_project_packages.rb
index e071b6bd68f..73ecc140959 100644
--- a/lib/api/nuget_project_packages.rb
+++ b/lib/api/nuget_project_packages.rb
@@ -62,8 +62,9 @@ module API
             file_name: PACKAGE_FILENAME
           )
 
-          package = ::Packages::Nuget::CreatePackageService.new(project_or_group, current_user, declared_params.merge(build: current_authenticated_job))
-                                                           .execute
+          package = ::Packages::CreateTemporaryPackageService.new(
+            project_or_group, current_user, declared_params.merge(build: current_authenticated_job)
+          ).execute(:nuget, name: ::Packages::Nuget::TEMPORARY_PACKAGE_NAME)
 
           package_file = ::Packages::CreatePackageFileService.new(package, file_params.merge(build: current_authenticated_job))
                                                              .execute
diff --git a/lib/api/rubygem_packages.rb b/lib/api/rubygem_packages.rb
index 7819aab879c..5bacf9b122d 100644
--- a/lib/api/rubygem_packages.rb
+++ b/lib/api/rubygem_packages.rb
@@ -12,7 +12,7 @@ module API
     # The Marshal version can be found by "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
     # Updating the version should require a GitLab API version change.
     MARSHAL_VERSION = '4.8'
-
+    PACKAGE_FILENAME = 'package.gem'
     FILE_NAME_REQUIREMENTS = {
       file_name: API::NO_SLASH_URL_PART_REGEX
     }.freeze
@@ -73,16 +73,45 @@ module API
             detail 'This feature was introduced in GitLab 13.9'
           end
           post 'gems/authorize' do
-            # To be implemented in https://gitlab.com/gitlab-org/gitlab/-/issues/299263
-            not_found!
+            authorize_workhorse!(
+              subject: user_project,
+              has_length: false,
+              maximum_size: user_project.actual_limits.rubygems_max_file_size
+            )
           end
 
           desc 'Upload a gem' do
             detail 'This feature was introduced in GitLab 13.9'
           end
+          params do
+            requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: 'The package file to be published (generated by Multipart middleware)'
+          end
           post 'gems' do
-            # To be implemented in https://gitlab.com/gitlab-org/gitlab/-/issues/299263
-            not_found!
+            authorize_upload!(user_project)
+            bad_request!('File is too large') if user_project.actual_limits.exceeded?(:rubygems_max_file_size, params[:file].size)
+
+            track_package_event('push_package', :rubygems)
+
+            ActiveRecord::Base.transaction do
+              package = ::Packages::CreateTemporaryPackageService.new(
+                user_project, current_user, declared_params.merge(build: current_authenticated_job)
+              ).execute(:rubygems, name: ::Packages::Rubygems::TEMPORARY_PACKAGE_NAME)
+
+              file_params = {
+                file:      params[:file],
+                file_name: PACKAGE_FILENAME
+              }
+
+              ::Packages::CreatePackageFileService.new(
+                package, file_params.merge(build: current_authenticated_job)
+              ).execute
+            end
+
+            created!
+          rescue ObjectStorage::RemoteStoreError => e
+            Gitlab::ErrorTracking.track_exception(e, extra: { file_name: params[:file_name], project_id: user_project.id })
+
+            forbidden!
           end
 
           desc 'Fetch a list of dependencies' do
diff --git a/lib/gitlab/ci/templates/Security/API-Fuzzing.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/API-Fuzzing.gitlab-ci.yml
index 135f0df99fe..460cb84460a 100644
--- a/lib/gitlab/ci/templates/Security/API-Fuzzing.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/API-Fuzzing.gitlab-ci.yml
@@ -172,6 +172,7 @@ apifuzzer_fuzz_dnd:
                     -e FUZZAPI_HAR \
                     -e FUZZAPI_OPENAPI \
                     -e FUZZAPI_POSTMAN_COLLECTION \
+                    -e FUZZAPI_POSTMAN_COLLECTION_VARIABLES \
                     -e FUZZAPI_TARGET_URL \
                     -e FUZZAPI_OVERRIDES_FILE \
                     -e FUZZAPI_OVERRIDES_ENV \
@@ -214,6 +215,7 @@ apifuzzer_fuzz_dnd:
                     -e FUZZAPI_HAR \
                     -e FUZZAPI_OPENAPI \
                     -e FUZZAPI_POSTMAN_COLLECTION \
+                    -e FUZZAPI_POSTMAN_COLLECTION_VARIABLES \
                     -e FUZZAPI_TARGET_URL \
                     -e FUZZAPI_OVERRIDES_FILE \
                     -e FUZZAPI_OVERRIDES_ENV \
diff --git a/lib/gitlab/experimentation.rb b/lib/gitlab/experimentation.rb
index d5438a1a0ab..337c28f3179 100644
--- a/lib/gitlab/experimentation.rb
+++ b/lib/gitlab/experimentation.rb
@@ -58,10 +58,6 @@ module Gitlab
         tracking_category: 'Growth::Conversion::Experiment::ContactSalesInApp',
         use_backwards_compatible_subject_index: true
       },
-      customize_homepage: {
-        tracking_category: 'Growth::Expansion::Experiment::CustomizeHomepage',
-        use_backwards_compatible_subject_index: true
-      },
       group_only_trials: {
         tracking_category: 'Growth::Conversion::Experiment::GroupOnlyTrials',
         use_backwards_compatible_subject_index: true
diff --git a/lib/gitlab/usage_data_counters/counter_events/package_events.yml b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
index f6bddabdd44..e1648245f3f 100644
--- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
@@ -41,6 +41,9 @@
 - i_package_pypi_delete_package
 - i_package_pypi_pull_package
 - i_package_pypi_push_package
+- i_package_rubygems_delete_package
+- i_package_rubygems_pull_package
+- i_package_rubygems_push_package
 - i_package_tag_delete_package
 - i_package_tag_pull_package
 - i_package_tag_push_package
diff --git a/lib/gitlab/usage_data_counters/known_events/package_events.yml b/lib/gitlab/usage_data_counters/known_events/package_events.yml
index 78a2a587b34..6cf31ba4db7 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -99,6 +99,16 @@
   aggregation: weekly
   redis_slot: package
   feature_flag: collect_package_events_redis
+- name: i_package_rubygems_deploy_token
+  category: deploy_token_packages
+  aggregation: weekly
+  redis_slot: package
+  feature_flag: collect_package_events_redis
+- name: i_package_rubygems_user
+  category: user_packages
+  aggregation: weekly
+  redis_slot: package
+  feature_flag: collect_package_events_redis
 - name: i_package_tag_deploy_token
   category: deploy_token_packages
   aggregation: weekly
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e39ad10f1b6..6ab74878eee 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10772,6 +10772,9 @@ msgstr ""
 msgid "Drop or %{linkStart}upload%{linkEnd} designs to attach"
 msgstr ""
 
+msgid "Drop or %{linkStart}upload%{linkEnd} file to attach"
+msgstr ""
+
 msgid "Drop or %{linkStart}upload%{linkEnd} files to attach"
 msgstr ""
 
diff --git a/package.json b/package.json
index 7bd41c3e1f8..9f751c2bcea 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-4",
     "@rails/ujs": "^6.0.3-4",
+    "@sentry/browser": "^5.22.3",
     "@sourcegraph/code-host-integration": "0.0.52",
     "@toast-ui/editor": "^2.5.1",
     "@toast-ui/vue-editor": "^2.5.1",
@@ -164,7 +165,7 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-    "@gitlab/eslint-plugin": "8.0.0",
+    "@gitlab/eslint-plugin": "8.1.0",
     "@gitlab/stylelint-config": "^2.2.0",
     "@testing-library/dom": "^7.16.2",
     "@vue/test-utils": "1.1.2",
@@ -177,17 +178,17 @@
     "commander": "^2.18.0",
     "custom-jquery-matchers": "^2.1.0",
     "docdash": "^1.0.2",
-    "eslint": "7.19.0",
+    "eslint": "7.20.0",
     "eslint-import-resolver-jest": "3.0.0",
     "eslint-import-resolver-webpack": "0.13.0",
     "eslint-plugin-jasmine": "4.1.2",
     "eslint-plugin-no-jquery": "2.5.0",
     "gettext-extractor": "^3.5.3",
     "gettext-extractor-vue": "^5.0.0",
+    "glob": "^7.1.6",
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.0",
-    "glob": "^7.1.6",
     "jasmine-core": "^2.9.0",
     "jasmine-diff": "^0.1.3",
     "jasmine-jquery": "^2.1.1",
diff --git a/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb
index 8c3f0930207..0072b6dbf01 100644
--- a/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb
@@ -54,7 +54,7 @@ module QA
                 {
                     file_path: '.gitlab-ci.yml',
                     content: <<~YAML
-                      image: mcr.microsoft.com/dotnet/core/sdk:3.1
+                      image: mcr.microsoft.com/dotnet/sdk:5.0
 
                       stages:
                         - deploy
@@ -102,7 +102,7 @@ module QA
 
                           <PropertyGroup>
                             <OutputType>Exe</OutputType>
-                            <TargetFramework>netcoreapp3.1</TargetFramework>
+                            <TargetFramework>net5.0</TargetFramework>
                           </PropertyGroup>
 
                         </Project>
@@ -115,7 +115,7 @@ module QA
                 {
                     file_path: '.gitlab-ci.yml',
                     content: <<~YAML
-                        image: mcr.microsoft.com/dotnet/core/sdk:3.1
+                        image: mcr.microsoft.com/dotnet/sdk:5.0
 
                         stages:
                           - install
diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb
index 85f9ea66c5f..7622f82afa7 100644
--- a/spec/controllers/root_controller_spec.rb
+++ b/spec/controllers/root_controller_spec.rb
@@ -123,11 +123,7 @@ RSpec.describe RootController do
           expect(response).to render_template 'dashboard/projects/index'
         end
 
-        context 'when experiment is enabled' do
-          before do
-            stub_experiment_for_subject(customize_homepage: true)
-          end
-
+        context 'when customize_homepage is enabled' do
           it 'renders the default dashboard' do
             get :index
 
@@ -135,9 +131,9 @@ RSpec.describe RootController do
           end
         end
 
-        context 'when experiment not enabled' do
+        context 'when customize_homepage is not enabled' do
           before do
-            stub_experiment(customize_homepage: false)
+            stub_feature_flags(customize_homepage: false)
           end
 
           it 'renders the default dashboard' do
diff --git a/spec/features/sentry_js_spec.rb b/spec/features/sentry_js_spec.rb
index aa0ad17340a..1d277ba7b3c 100644
--- a/spec/features/sentry_js_spec.rb
+++ b/spec/features/sentry_js_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'Sentry' do
     expect(has_requested_sentry).to eq(false)
   end
 
-  xit 'loads sentry if sentry is enabled' do
+  it 'loads sentry if sentry is enabled' do
     stub_sentry_settings
 
     visit new_user_session_path
diff --git a/spec/finders/packages/group_packages_finder_spec.rb b/spec/finders/packages/group_packages_finder_spec.rb
index 445482a5a96..d6daf73aba2 100644
--- a/spec/finders/packages/group_packages_finder_spec.rb
+++ b/spec/finders/packages/group_packages_finder_spec.rb
@@ -122,7 +122,7 @@ RSpec.describe Packages::GroupPackagesFinder do
       end
 
       context 'when there are processing packages' do
-        let_it_be(:package4) { create(:nuget_package, project: project, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+        let_it_be(:package4) { create(:nuget_package, project: project, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
 
         it { is_expected.to match_array([package1, package2]) }
       end
diff --git a/spec/finders/packages/package_finder_spec.rb b/spec/finders/packages/package_finder_spec.rb
index ef07e7575d1..e8c7404a612 100644
--- a/spec/finders/packages/package_finder_spec.rb
+++ b/spec/finders/packages/package_finder_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe ::Packages::PackageFinder do
     it { is_expected.to eq(maven_package) }
 
     context 'processing packages' do
-      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
       let(:package_id) { nuget_package.id }
 
       it 'are not returned' do
diff --git a/spec/finders/packages/packages_finder_spec.rb b/spec/finders/packages/packages_finder_spec.rb
index 6e92616bafa..0add77a8478 100644
--- a/spec/finders/packages/packages_finder_spec.rb
+++ b/spec/finders/packages/packages_finder_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe ::Packages::PackagesFinder do
     end
 
     context 'with processing packages' do
-      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
 
       it { is_expected.to match_array([conan_package, maven_package]) }
     end
diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js
index f398d7a0965..941a3adb625 100644
--- a/spec/frontend/clusters_list/components/clusters_spec.js
+++ b/spec/frontend/clusters_list/components/clusters_spec.js
@@ -4,12 +4,12 @@ import {
   GlDeprecatedSkeletonLoading as GlSkeletonLoading,
   GlTable,
 } from '@gitlab/ui';
+import * as Sentry from '@sentry/browser';
 import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import Clusters from '~/clusters_list/components/clusters.vue';
 import ClusterStore from '~/clusters_list/store';
 import axios from '~/lib/utils/axios_utils';
-import * as Sentry from '~/sentry/wrapper';
 import { apiData } from '../mock_data';
 
 describe('Clusters', () => {
diff --git a/spec/frontend/clusters_list/store/actions_spec.js b/spec/frontend/clusters_list/store/actions_spec.js
index 00b998166aa..b2ef3c2138a 100644
--- a/spec/frontend/clusters_list/store/actions_spec.js
+++ b/spec/frontend/clusters_list/store/actions_spec.js
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/browser';
 import MockAdapter from 'axios-mock-adapter';
 import testAction from 'helpers/vuex_action_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -7,7 +8,6 @@ import * as types from '~/clusters_list/store/mutation_types';
 import { deprecatedCreateFlash as flashError } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import Poll from '~/lib/utils/poll';
-import * as Sentry from '~/sentry/wrapper';
 import { apiData } from '../mock_data';
 
 jest.mock('~/flash.js');
diff --git a/spec/frontend/diffs/store/utils_spec.js b/spec/frontend/diffs/store/utils_spec.js
index dcb58f7a380..6af38590610 100644
--- a/spec/frontend/diffs/store/utils_spec.js
+++ b/spec/frontend/diffs/store/utils_spec.js
@@ -275,24 +275,28 @@ describe('DiffsStoreUtils', () => {
 
   describe('trimFirstCharOfLineContent', () => {
     it('trims the line when it starts with a space', () => {
+      // eslint-disable-next-line import/no-deprecated
       expect(utils.trimFirstCharOfLineContent({ rich_text: ' diff' })).toEqual({
         rich_text: 'diff',
       });
     });
 
     it('trims the line when it starts with a +', () => {
+      // eslint-disable-next-line import/no-deprecated
       expect(utils.trimFirstCharOfLineContent({ rich_text: '+diff' })).toEqual({
         rich_text: 'diff',
       });
     });
 
     it('trims the line when it starts with a -', () => {
+      // eslint-disable-next-line import/no-deprecated
       expect(utils.trimFirstCharOfLineContent({ rich_text: '-diff' })).toEqual({
         rich_text: 'diff',
       });
     });
 
     it('does not trims the line when it starts with a letter', () => {
+      // eslint-disable-next-line import/no-deprecated
       expect(utils.trimFirstCharOfLineContent({ rich_text: 'diff' })).toEqual({
         rich_text: 'diff',
       });
@@ -303,12 +307,14 @@ describe('DiffsStoreUtils', () => {
         rich_text: ' diff',
       };
 
+      // eslint-disable-next-line import/no-deprecated
       utils.trimFirstCharOfLineContent(lineObj);
 
       expect(lineObj).toEqual({ rich_text: ' diff' });
     });
 
     it('handles a undefined or null parameter', () => {
+      // eslint-disable-next-line import/no-deprecated
       expect(utils.trimFirstCharOfLineContent()).toEqual({});
     });
   });
diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js
index 1985feb1615..a3b327343e5 100644
--- a/spec/frontend/ide/components/repo_editor_spec.js
+++ b/spec/frontend/ide/components/repo_editor_spec.js
@@ -1,11 +1,15 @@
+import { shallowMount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
-import { Range } from 'monaco-editor';
+import { editor as monacoEditor, Range } from 'monaco-editor';
 import Vue from 'vue';
 import Vuex from 'vuex';
 import '~/behaviors/markdown/render_gfm';
-import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import waitUsingRealTimer from 'helpers/wait_using_real_timer';
+import { exampleConfigs, exampleFiles } from 'jest/ide/lib/editorconfig/mock_data';
+import { EDITOR_CODE_INSTANCE_FN, EDITOR_DIFF_INSTANCE_FN } from '~/editor/constants';
+import EditorLite from '~/editor/editor_lite';
+import { EditorWebIdeExtension } from '~/editor/extensions/editor_lite_webide_ext';
 import RepoEditor from '~/ide/components/repo_editor.vue';
 import {
   leftSidebarViews,
@@ -13,59 +17,50 @@ import {
   FILE_VIEW_MODE_PREVIEW,
   viewerTypes,
 } from '~/ide/constants';
-import Editor from '~/ide/lib/editor';
+import ModelManager from '~/ide/lib/common/model_manager';
 import service from '~/ide/services';
 import { createStoreOptions } from '~/ide/stores';
 import axios from '~/lib/utils/axios_utils';
+import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue';
 import { file } from '../helpers';
-import { exampleConfigs, exampleFiles } from '../lib/editorconfig/mock_data';
 
-describe('RepoEditor', () => {
-  let vm;
-  let store;
-
-  const waitForEditorSetup = () =>
-    new Promise((resolve) => {
-      vm.$once('editorSetup', resolve);
-    });
-
-  const createComponent = () => {
-    if (vm) {
-      throw new Error('vm already exists');
-    }
-    vm = createComponentWithStore(Vue.extend(RepoEditor), store, {
-      file: store.state.openFiles[0],
-    });
-
-    jest.spyOn(vm, 'getFileData').mockResolvedValue();
-    jest.spyOn(vm, 'getRawFileData').mockResolvedValue();
-
-    vm.$mount();
+const defaultFileProps = {
+  ...file('file.txt'),
+  content: 'hello world',
+  active: true,
+  tempFile: true,
+};
+const createActiveFile = (props) => {
+  return {
+    ...defaultFileProps,
+    ...props,
   };
+};
 
-  const createOpenFile = (path) => {
-    const origFile = store.state.openFiles[0];
-    const newFile = { ...origFile, path, key: path, name: 'myfile.txt', content: 'hello world' };
+const dummyFile = {
+  markdown: (() =>
+    createActiveFile({
+      projectId: 'namespace/project',
+      path: 'sample.md',
+      name: 'sample.md',
+    }))(),
+  binary: (() =>
+    createActiveFile({
+      name: 'file.dat',
+      content: '🐱', // non-ascii binary content,
+    }))(),
+  empty: (() =>
+    createActiveFile({
+      tempFile: false,
+      content: '',
+      raw: '',
+    }))(),
+};
 
-    store.state.entries[path] = newFile;
-
-    store.state.openFiles = [newFile];
-  };
-
-  beforeEach(() => {
-    const f = {
-      ...file('file.txt'),
-      content: 'hello world',
-    };
-
-    const storeOptions = createStoreOptions();
-    store = new Vuex.Store(storeOptions);
-
-    f.active = true;
-    f.tempFile = true;
-
-    store.state.openFiles.push(f);
-    store.state.projects = {
+const prepareStore = (state, activeFile) => {
+  const localState = {
+    openFiles: [activeFile],
+    projects: {
       'gitlab-org/gitlab': {
         branches: {
           master: {
@@ -76,670 +71,669 @@ describe('RepoEditor', () => {
           },
         },
       },
-    };
-    store.state.currentProjectId = 'gitlab-org/gitlab';
-    store.state.currentBranchId = 'master';
+    },
+    currentProjectId: 'gitlab-org/gitlab',
+    currentBranchId: 'master',
+    entries: {
+      [activeFile.path]: activeFile,
+    },
+  };
+  const storeOptions = createStoreOptions();
+  return new Vuex.Store({
+    ...createStoreOptions(),
+    state: {
+      ...storeOptions.state,
+      ...localState,
+      ...state,
+    },
+  });
+};
 
-    Vue.set(store.state.entries, f.path, f);
+describe('RepoEditor', () => {
+  let wrapper;
+  let vm;
+  let createInstanceSpy;
+  let createDiffInstanceSpy;
+  let createModelSpy;
+
+  const waitForEditorSetup = () =>
+    new Promise((resolve) => {
+      vm.$once('editorSetup', resolve);
+    });
+
+  const createComponent = async ({ state = {}, activeFile = defaultFileProps } = {}) => {
+    const store = prepareStore(state, activeFile);
+    wrapper = shallowMount(RepoEditor, {
+      store,
+      propsData: {
+        file: store.state.openFiles[0],
+      },
+      mocks: {
+        ContentViewer,
+      },
+    });
+    await waitForPromises();
+    vm = wrapper.vm;
+    jest.spyOn(vm, 'getFileData').mockResolvedValue();
+    jest.spyOn(vm, 'getRawFileData').mockResolvedValue();
+  };
+
+  const findEditor = () => wrapper.find('[data-testid="editor-container"]');
+  const findTabs = () => wrapper.findAll('.ide-mode-tabs .nav-links li');
+  const findPreviewTab = () => wrapper.find('[data-testid="preview-tab"]');
+
+  beforeEach(() => {
+    createInstanceSpy = jest.spyOn(EditorLite.prototype, EDITOR_CODE_INSTANCE_FN);
+    createDiffInstanceSpy = jest.spyOn(EditorLite.prototype, EDITOR_DIFF_INSTANCE_FN);
+    createModelSpy = jest.spyOn(monacoEditor, 'createModel');
+    jest.spyOn(service, 'getFileData').mockResolvedValue();
+    jest.spyOn(service, 'getRawFileData').mockResolvedValue();
   });
 
   afterEach(() => {
-    vm.$destroy();
-    vm = null;
-
-    Editor.editorInstance.dispose();
+    jest.clearAllMocks();
+    // create a new model each time, otherwise tests conflict with each other
+    // because of same model being used in multiple tests
+    // eslint-disable-next-line no-undef
+    monaco.editor.getModels().forEach((model) => model.dispose());
+    wrapper.destroy();
+    wrapper = null;
   });
 
-  const findEditor = () => vm.$el.querySelector('.multi-file-editor-holder');
-  const changeViewMode = (viewMode) =>
-    store.dispatch('editor/updateFileEditor', { path: vm.file.path, data: { viewMode } });
-
   describe('default', () => {
+    it.each`
+      boolVal  | textVal
+      ${true}  | ${'all'}
+      ${false} | ${'none'}
+    `('sets renderWhitespace to "$textVal"', async ({ boolVal, textVal } = {}) => {
+      await createComponent({
+        state: {
+          renderWhitespaceInCode: boolVal,
+        },
+      });
+      expect(vm.editorOptions.renderWhitespace).toEqual(textVal);
+    });
+
+    it('renders an ide container', async () => {
+      await createComponent();
+      expect(findEditor().isVisible()).toBe(true);
+    });
+
+    it('renders only an edit tab', async () => {
+      await createComponent();
+      const tabs = findTabs();
+
+      expect(tabs).toHaveLength(1);
+      expect(tabs.at(0).text()).toBe('Edit');
+    });
+  });
+
+  describe('when file is markdown', () => {
+    let mock;
+    let activeFile;
+
     beforeEach(() => {
-      createComponent();
+      activeFile = dummyFile.markdown;
 
-      return waitForEditorSetup();
-    });
+      mock = new MockAdapter(axios);
 
-    it('sets renderWhitespace to `all`', () => {
-      vm.$store.state.renderWhitespaceInCode = true;
-
-      expect(vm.editorOptions.renderWhitespace).toEqual('all');
-    });
-
-    it('sets renderWhitespace to `none`', () => {
-      vm.$store.state.renderWhitespaceInCode = false;
-
-      expect(vm.editorOptions.renderWhitespace).toEqual('none');
-    });
-
-    it('renders an ide container', () => {
-      expect(vm.shouldHideEditor).toBeFalsy();
-      expect(vm.showEditor).toBe(true);
-      expect(findEditor()).not.toHaveCss({ display: 'none' });
-    });
-
-    it('renders only an edit tab', (done) => {
-      Vue.nextTick(() => {
-        const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
-
-        expect(tabs.length).toBe(1);
-        expect(tabs[0].textContent.trim()).toBe('Edit');
-
-        done();
+      mock.onPost(/(.*)\/preview_markdown/).reply(200, {
+        body: `<p>${defaultFileProps.content}</p>`,
       });
     });
 
-    describe('when file is markdown', () => {
-      let mock;
-
-      beforeEach(() => {
-        mock = new MockAdapter(axios);
-
-        mock.onPost(/(.*)\/preview_markdown/).reply(200, {
-          body: '<p>testing 123</p>',
-        });
-
-        Vue.set(vm, 'file', {
-          ...vm.file,
-          projectId: 'namespace/project',
-          path: 'sample.md',
-          name: 'sample.md',
-          content: 'testing 123',
-        });
-
-        vm.$store.state.entries[vm.file.path] = vm.file;
-
-        return vm.$nextTick();
-      });
-
-      afterEach(() => {
-        mock.restore();
-      });
-
-      it('renders an Edit and a Preview Tab', (done) => {
-        Vue.nextTick(() => {
-          const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
-
-          expect(tabs.length).toBe(2);
-          expect(tabs[0].textContent.trim()).toBe('Edit');
-          expect(tabs[1].textContent.trim()).toBe('Preview Markdown');
-
-          done();
-        });
-      });
-
-      it('renders markdown for tempFile', (done) => {
-        vm.file.tempFile = true;
-
-        vm.$nextTick()
-          .then(() => {
-            vm.$el.querySelectorAll('.ide-mode-tabs .nav-links a')[1].click();
-          })
-          .then(waitForPromises)
-          .then(() => {
-            expect(vm.$el.querySelector('.preview-container').innerHTML).toContain(
-              '<p>testing 123</p>',
-            );
-          })
-          .then(done)
-          .catch(done.fail);
-      });
-
-      describe('when not in edit mode', () => {
-        beforeEach(async () => {
-          await vm.$nextTick();
-
-          vm.$store.state.currentActivityView = leftSidebarViews.review.name;
-
-          return vm.$nextTick();
-        });
-
-        it('shows no tabs', () => {
-          expect(vm.$el.querySelectorAll('.ide-mode-tabs .nav-links a')).toHaveLength(0);
-        });
-      });
+    afterEach(() => {
+      mock.restore();
     });
 
-    describe('when open file is binary and not raw', () => {
-      beforeEach((done) => {
-        vm.file.name = 'file.dat';
-        vm.file.content = '🐱'; // non-ascii binary content
-        jest.spyOn(vm.editor, 'createInstance').mockImplementation();
-        jest.spyOn(vm.editor, 'createDiffInstance').mockImplementation();
+    it('renders an Edit and a Preview Tab', async () => {
+      await createComponent({ activeFile });
+      const tabs = findTabs();
 
-        vm.$nextTick(done);
-      });
-
-      it('does not render the IDE', () => {
-        expect(vm.shouldHideEditor).toBeTruthy();
-      });
-
-      it('does not call createInstance', async () => {
-        // Mirror the act's in the `createEditorInstance`
-        vm.createEditorInstance();
-
-        await vm.$nextTick();
-
-        expect(vm.editor.createInstance).not.toHaveBeenCalled();
-        expect(vm.editor.createDiffInstance).not.toHaveBeenCalled();
-      });
+      expect(tabs).toHaveLength(2);
+      expect(tabs.at(0).text()).toBe('Edit');
+      expect(tabs.at(1).text()).toBe('Preview Markdown');
     });
 
-    describe('createEditorInstance', () => {
-      it('calls createInstance when viewer is editor', (done) => {
-        jest.spyOn(vm.editor, 'createInstance').mockImplementation();
+    it('renders markdown for tempFile', async () => {
+      // by default files created in the spec are temp: no need for explicitly sending the param
+      await createComponent({ activeFile });
 
-        vm.createEditorInstance();
-
-        vm.$nextTick(() => {
-          expect(vm.editor.createInstance).toHaveBeenCalled();
-
-          done();
-        });
-      });
-
-      it('calls createDiffInstance when viewer is diff', (done) => {
-        vm.$store.state.viewer = 'diff';
-
-        jest.spyOn(vm.editor, 'createDiffInstance').mockImplementation();
-
-        vm.createEditorInstance();
-
-        vm.$nextTick(() => {
-          expect(vm.editor.createDiffInstance).toHaveBeenCalled();
-
-          done();
-        });
-      });
-
-      it('calls createDiffInstance when viewer is a merge request diff', (done) => {
-        vm.$store.state.viewer = 'mrdiff';
-
-        jest.spyOn(vm.editor, 'createDiffInstance').mockImplementation();
-
-        vm.createEditorInstance();
-
-        vm.$nextTick(() => {
-          expect(vm.editor.createDiffInstance).toHaveBeenCalled();
-
-          done();
-        });
-      });
+      findPreviewTab().trigger('click');
+      await waitForPromises();
+      expect(wrapper.find(ContentViewer).html()).toContain(defaultFileProps.content);
     });
 
-    describe('setupEditor', () => {
-      it('creates new model', () => {
-        jest.spyOn(vm.editor, 'createModel');
-
-        Editor.editorInstance.modelManager.dispose();
-
-        vm.setupEditor();
-
-        expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, null);
-        expect(vm.model).not.toBeNull();
+    it('shows no tabs when not in Edit mode', async () => {
+      await createComponent({
+        state: {
+          currentActivityView: leftSidebarViews.review.name,
+        },
+        activeFile,
       });
+      expect(findTabs()).toHaveLength(0);
+    });
+  });
 
-      it('attaches model to editor', () => {
-        jest.spyOn(vm.editor, 'attachModel');
-
-        Editor.editorInstance.modelManager.dispose();
-
-        vm.setupEditor();
-
-        expect(vm.editor.attachModel).toHaveBeenCalledWith(vm.model);
-      });
-
-      it('attaches model to merge request editor', () => {
-        vm.$store.state.viewer = 'mrdiff';
-        vm.file.mrChange = true;
-        jest.spyOn(vm.editor, 'attachMergeRequestModel').mockImplementation();
-
-        Editor.editorInstance.modelManager.dispose();
-
-        vm.setupEditor();
-
-        expect(vm.editor.attachMergeRequestModel).toHaveBeenCalledWith(vm.model);
-      });
-
-      it('does not attach model to merge request editor when not a MR change', () => {
-        vm.$store.state.viewer = 'mrdiff';
-        vm.file.mrChange = false;
-        jest.spyOn(vm.editor, 'attachMergeRequestModel').mockImplementation();
-
-        Editor.editorInstance.modelManager.dispose();
-
-        vm.setupEditor();
-
-        expect(vm.editor.attachMergeRequestModel).not.toHaveBeenCalledWith(vm.model);
-      });
-
-      it('adds callback methods', () => {
-        jest.spyOn(vm.editor, 'onPositionChange');
-
-        Editor.editorInstance.modelManager.dispose();
-
-        vm.setupEditor();
-
-        expect(vm.editor.onPositionChange).toHaveBeenCalled();
-        expect(vm.model.events.size).toBe(2);
-      });
-
-      it('updates state with the value of the model', () => {
-        vm.model.setValue('testing 1234\n');
-
-        vm.setupEditor();
-
-        expect(vm.file.content).toBe('testing 1234\n');
-      });
-
-      it('sets head model as staged file', () => {
-        jest.spyOn(vm.editor, 'createModel');
-
-        Editor.editorInstance.modelManager.dispose();
-
-        vm.$store.state.stagedFiles.push({ ...vm.file, key: 'staged' });
-        vm.file.staged = true;
-        vm.file.key = `unstaged-${vm.file.key}`;
-
-        vm.setupEditor();
-
-        expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, vm.$store.state.stagedFiles[0]);
-      });
+  describe('when file is binary and not raw', () => {
+    beforeEach(async () => {
+      const activeFile = dummyFile.binary;
+      await createComponent({ activeFile });
     });
 
-    describe('editor updateDimensions', () => {
-      beforeEach(() => {
-        jest.spyOn(vm.editor, 'updateDimensions');
-        jest.spyOn(vm.editor, 'updateDiffView').mockImplementation();
-      });
-
-      it('calls updateDimensions when panelResizing is false', (done) => {
-        vm.$store.state.panelResizing = true;
-
-        vm.$nextTick()
-          .then(() => {
-            vm.$store.state.panelResizing = false;
-          })
-          .then(vm.$nextTick)
-          .then(() => {
-            expect(vm.editor.updateDimensions).toHaveBeenCalled();
-            expect(vm.editor.updateDiffView).toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
-      });
-
-      it('does not call updateDimensions when panelResizing is true', (done) => {
-        vm.$store.state.panelResizing = true;
-
-        vm.$nextTick(() => {
-          expect(vm.editor.updateDimensions).not.toHaveBeenCalled();
-          expect(vm.editor.updateDiffView).not.toHaveBeenCalled();
-
-          done();
-        });
-      });
-
-      it('calls updateDimensions when rightPane is opened', (done) => {
-        vm.$store.state.rightPane.isOpen = true;
-
-        vm.$nextTick(() => {
-          expect(vm.editor.updateDimensions).toHaveBeenCalled();
-          expect(vm.editor.updateDiffView).toHaveBeenCalled();
-
-          done();
-        });
-      });
+    it('does not render the IDE', () => {
+      expect(findEditor().isVisible()).toBe(false);
     });
 
-    describe('show tabs', () => {
-      it('shows tabs in edit mode', () => {
-        expect(vm.$el.querySelector('.nav-links')).not.toBe(null);
-      });
+    it('does not create an instance', () => {
+      expect(createInstanceSpy).not.toHaveBeenCalled();
+      expect(createDiffInstanceSpy).not.toHaveBeenCalled();
+    });
+  });
 
-      it('hides tabs in review mode', (done) => {
-        vm.$store.state.currentActivityView = leftSidebarViews.review.name;
-
-        vm.$nextTick(() => {
-          expect(vm.$el.querySelector('.nav-links')).toBe(null);
-
-          done();
+  describe('createEditorInstance', () => {
+    it.each`
+      viewer              | diffInstance
+      ${viewerTypes.edit} | ${undefined}
+      ${viewerTypes.diff} | ${true}
+      ${viewerTypes.mr}   | ${true}
+    `(
+      'creates instance of correct type when viewer is $viewer',
+      async ({ viewer, diffInstance }) => {
+        await createComponent({
+          state: { viewer },
         });
-      });
+        const isDiff = () => {
+          return diffInstance ? { isDiff: true } : {};
+        };
+        expect(createInstanceSpy).toHaveBeenCalledWith(expect.objectContaining(isDiff()));
+        expect(createDiffInstanceSpy).toHaveBeenCalledTimes((diffInstance && 1) || 0);
+      },
+    );
 
-      it('hides tabs in commit mode', (done) => {
-        vm.$store.state.currentActivityView = leftSidebarViews.commit.name;
-
-        vm.$nextTick(() => {
-          expect(vm.$el.querySelector('.nav-links')).toBe(null);
-
-          done();
+    it('installs the WebIDE extension', async () => {
+      const extensionSpy = jest.spyOn(EditorLite, 'instanceApplyExtension');
+      await createComponent();
+      expect(extensionSpy).toHaveBeenCalled();
+      Reflect.ownKeys(EditorWebIdeExtension.prototype)
+        .filter((fn) => fn !== 'constructor')
+        .forEach((fn) => {
+          expect(vm.editor[fn]).toBe(EditorWebIdeExtension.prototype[fn]);
         });
-      });
+    });
+  });
+
+  describe('setupEditor', () => {
+    beforeEach(async () => {
+      await createComponent();
     });
 
-    describe('when files view mode is preview', () => {
-      beforeEach((done) => {
-        jest.spyOn(vm.editor, 'updateDimensions').mockImplementation();
-        changeViewMode(FILE_VIEW_MODE_PREVIEW);
-        vm.file.name = 'myfile.md';
-        vm.file.content = 'hello world';
-
-        vm.$nextTick(done);
-      });
-
-      it('should hide editor', () => {
-        expect(vm.showEditor).toBe(false);
-        expect(findEditor()).toHaveCss({ display: 'none' });
-      });
-
-      describe('when file view mode changes to editor', () => {
-        it('should update dimensions', () => {
-          changeViewMode(FILE_VIEW_MODE_EDITOR);
-
-          return vm.$nextTick().then(() => {
-            expect(vm.editor.updateDimensions).toHaveBeenCalled();
-          });
-        });
-      });
+    it('creates new model on load', () => {
+      // We always create two models per file to be able to build a diff of changes
+      expect(createModelSpy).toHaveBeenCalledTimes(2);
+      // The model with the most recent changes is the last one
+      const [content] = createModelSpy.mock.calls[1];
+      expect(content).toBe(defaultFileProps.content);
     });
 
-    describe('initEditor', () => {
-      beforeEach(() => {
-        vm.file.tempFile = false;
-        jest.spyOn(vm.editor, 'createInstance').mockImplementation();
-        jest.spyOn(vm, 'shouldHideEditor', 'get').mockReturnValue(true);
-      });
+    it('does not create a new model on subsequent calls to setupEditor and re-uses the already-existing model', () => {
+      const existingModel = vm.model;
+      createModelSpy.mockClear();
 
-      it('does not fetch file information for temp entries', (done) => {
-        vm.file.tempFile = true;
+      vm.setupEditor();
 
-        vm.initEditor();
-        vm.$nextTick()
-          .then(() => {
-            expect(vm.getFileData).not.toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
-      });
-
-      it('is being initialised for files without content even if shouldHideEditor is `true`', (done) => {
-        vm.file.content = '';
-        vm.file.raw = '';
-
-        vm.initEditor();
-
-        vm.$nextTick()
-          .then(() => {
-            expect(vm.getFileData).toHaveBeenCalled();
-            expect(vm.getRawFileData).toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
-      });
-
-      it('does not initialize editor for files already with content', (done) => {
-        vm.file.content = 'foo';
-
-        vm.initEditor();
-        vm.$nextTick()
-          .then(() => {
-            expect(vm.getFileData).not.toHaveBeenCalled();
-            expect(vm.getRawFileData).not.toHaveBeenCalled();
-            expect(vm.editor.createInstance).not.toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
-      });
+      expect(createModelSpy).not.toHaveBeenCalled();
+      expect(vm.model).toBe(existingModel);
     });
 
-    describe('updates on file changes', () => {
-      beforeEach(() => {
-        jest.spyOn(vm, 'initEditor').mockImplementation();
+    it('adds callback methods', () => {
+      jest.spyOn(vm.editor, 'onPositionChange');
+      jest.spyOn(vm.model, 'onChange');
+      jest.spyOn(vm.model, 'updateOptions');
+
+      vm.setupEditor();
+
+      expect(vm.editor.onPositionChange).toHaveBeenCalledTimes(1);
+      expect(vm.model.onChange).toHaveBeenCalledTimes(1);
+      expect(vm.model.updateOptions).toHaveBeenCalledWith(vm.rules);
+    });
+
+    it('updates state with the value of the model', () => {
+      const newContent = 'As Gregor Samsa\n awoke one morning\n';
+      vm.model.setValue(newContent);
+
+      vm.setupEditor();
+
+      expect(vm.file.content).toBe(newContent);
+    });
+
+    it('sets head model as staged file', () => {
+      vm.modelManager.dispose();
+      const addModelSpy = jest.spyOn(ModelManager.prototype, 'addModel');
+
+      vm.$store.state.stagedFiles.push({ ...vm.file, key: 'staged' });
+      vm.file.staged = true;
+      vm.file.key = `unstaged-${vm.file.key}`;
+
+      vm.setupEditor();
+
+      expect(addModelSpy).toHaveBeenCalledWith(vm.file, vm.$store.state.stagedFiles[0]);
+    });
+  });
+
+  describe('editor updateDimensions', () => {
+    let updateDimensionsSpy;
+    let updateDiffViewSpy;
+    beforeEach(async () => {
+      await createComponent();
+      updateDimensionsSpy = jest.spyOn(vm.editor, 'updateDimensions');
+      updateDiffViewSpy = jest.spyOn(vm.editor, 'updateDiffView').mockImplementation();
+    });
+
+    it('calls updateDimensions only when panelResizing is false', async () => {
+      expect(updateDimensionsSpy).not.toHaveBeenCalled();
+      expect(updateDiffViewSpy).not.toHaveBeenCalled();
+      expect(vm.$store.state.panelResizing).toBe(false); // default value
+
+      vm.$store.state.panelResizing = true;
+      await vm.$nextTick();
+
+      expect(updateDimensionsSpy).not.toHaveBeenCalled();
+      expect(updateDiffViewSpy).not.toHaveBeenCalled();
+
+      vm.$store.state.panelResizing = false;
+      await vm.$nextTick();
+
+      expect(updateDimensionsSpy).toHaveBeenCalledTimes(1);
+      expect(updateDiffViewSpy).toHaveBeenCalledTimes(1);
+
+      vm.$store.state.panelResizing = true;
+      await vm.$nextTick();
+
+      expect(updateDimensionsSpy).toHaveBeenCalledTimes(1);
+      expect(updateDiffViewSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it('calls updateDimensions when rightPane is toggled', async () => {
+      expect(updateDimensionsSpy).not.toHaveBeenCalled();
+      expect(updateDiffViewSpy).not.toHaveBeenCalled();
+      expect(vm.$store.state.rightPane.isOpen).toBe(false); // default value
+
+      vm.$store.state.rightPane.isOpen = true;
+      await vm.$nextTick();
+
+      expect(updateDimensionsSpy).toHaveBeenCalledTimes(1);
+      expect(updateDiffViewSpy).toHaveBeenCalledTimes(1);
+
+      vm.$store.state.rightPane.isOpen = false;
+      await vm.$nextTick();
+
+      expect(updateDimensionsSpy).toHaveBeenCalledTimes(2);
+      expect(updateDiffViewSpy).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('editor tabs', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
+
+    it.each`
+      mode        | isVisible
+      ${'edit'}   | ${true}
+      ${'review'} | ${false}
+      ${'commit'} | ${false}
+    `('tabs in $mode are $isVisible', async ({ mode, isVisible } = {}) => {
+      vm.$store.state.currentActivityView = leftSidebarViews[mode].name;
+
+      await vm.$nextTick();
+      expect(wrapper.find('.nav-links').exists()).toBe(isVisible);
+    });
+  });
+
+  describe('files in preview mode', () => {
+    let updateDimensionsSpy;
+    const changeViewMode = (viewMode) =>
+      vm.$store.dispatch('editor/updateFileEditor', {
+        path: vm.file.path,
+        data: { viewMode },
       });
 
-      it('calls removePendingTab when old file is pending', (done) => {
-        jest.spyOn(vm, 'shouldHideEditor', 'get').mockReturnValue(true);
-        jest.spyOn(vm, 'removePendingTab').mockImplementation();
-
-        vm.file.pending = true;
-
-        vm.$nextTick()
-          .then(() => {
-            vm.file = file('testing');
-            vm.file.content = 'foo'; // need to prevent full cycle of initEditor
-
-            return vm.$nextTick();
-          })
-          .then(() => {
-            expect(vm.removePendingTab).toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
+    beforeEach(async () => {
+      await createComponent({
+        activeFile: dummyFile.markdown,
       });
 
-      it('does not call initEditor if the file did not change', (done) => {
-        Vue.set(vm, 'file', vm.file);
+      updateDimensionsSpy = jest.spyOn(vm.editor, 'updateDimensions');
 
-        vm.$nextTick()
-          .then(() => {
-            expect(vm.initEditor).not.toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
+      changeViewMode(FILE_VIEW_MODE_PREVIEW);
+      await vm.$nextTick();
+    });
+
+    it('do not show the editor', () => {
+      expect(vm.showEditor).toBe(false);
+      expect(findEditor().isVisible()).toBe(false);
+    });
+
+    it('updates dimensions when switching view back to edit', async () => {
+      expect(updateDimensionsSpy).not.toHaveBeenCalled();
+
+      changeViewMode(FILE_VIEW_MODE_EDITOR);
+      await vm.$nextTick();
+
+      expect(updateDimensionsSpy).toHaveBeenCalled();
+    });
+  });
+
+  describe('initEditor', () => {
+    const hideEditorAndRunFn = async () => {
+      jest.clearAllMocks();
+      jest.spyOn(vm, 'shouldHideEditor', 'get').mockReturnValue(true);
+
+      vm.initEditor();
+      await vm.$nextTick();
+    };
+
+    it('does not fetch file information for temp entries', async () => {
+      await createComponent({
+        activeFile: createActiveFile(),
       });
 
-      it('calls initEditor when file key is changed', (done) => {
-        expect(vm.initEditor).not.toHaveBeenCalled();
+      expect(vm.getFileData).not.toHaveBeenCalled();
+    });
 
-        Vue.set(vm, 'file', {
+    it('is being initialised for files without content even if shouldHideEditor is `true`', async () => {
+      await createComponent({
+        activeFile: dummyFile.empty,
+      });
+
+      await hideEditorAndRunFn();
+
+      expect(vm.getFileData).toHaveBeenCalled();
+      expect(vm.getRawFileData).toHaveBeenCalled();
+    });
+
+    it('does not initialize editor for files already with content when shouldHideEditor is `true`', async () => {
+      await createComponent({
+        activeFile: createActiveFile(),
+      });
+
+      await hideEditorAndRunFn();
+
+      expect(vm.getFileData).not.toHaveBeenCalled();
+      expect(vm.getRawFileData).not.toHaveBeenCalled();
+      expect(createInstanceSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('updates on file changes', () => {
+    beforeEach(async () => {
+      await createComponent({
+        activeFile: createActiveFile({
+          content: 'foo', // need to prevent full cycle of initEditor
+        }),
+      });
+      jest.spyOn(vm, 'initEditor').mockImplementation();
+    });
+
+    it('calls removePendingTab when old file is pending', async () => {
+      jest.spyOn(vm, 'shouldHideEditor', 'get').mockReturnValue(true);
+      jest.spyOn(vm, 'removePendingTab').mockImplementation();
+
+      const origFile = vm.file;
+      vm.file.pending = true;
+      await vm.$nextTick();
+
+      wrapper.setProps({
+        file: file('testing'),
+      });
+      vm.file.content = 'foo'; // need to prevent full cycle of initEditor
+      await vm.$nextTick();
+
+      expect(vm.removePendingTab).toHaveBeenCalledWith(origFile);
+    });
+
+    it('does not call initEditor if the file did not change', async () => {
+      Vue.set(vm, 'file', vm.file);
+      await vm.$nextTick();
+
+      expect(vm.initEditor).not.toHaveBeenCalled();
+    });
+
+    it('calls initEditor when file key is changed', async () => {
+      expect(vm.initEditor).not.toHaveBeenCalled();
+
+      wrapper.setProps({
+        file: {
           ...vm.file,
           key: 'new',
-        });
-
-        vm.$nextTick()
-          .then(() => {
-            expect(vm.initEditor).toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
+        },
       });
+      await vm.$nextTick();
+
+      expect(vm.initEditor).toHaveBeenCalled();
+    });
+  });
+
+  describe('populates editor with the fetched content', () => {
+    const createRemoteFile = (name) => ({
+      ...file(name),
+      tmpFile: false,
     });
 
-    describe('populates editor with the fetched content', () => {
-      beforeEach(() => {
-        vm.getRawFileData.mockRestore();
+    beforeEach(async () => {
+      await createComponent();
+      vm.getRawFileData.mockRestore();
+    });
+
+    it('after switching viewer from edit to diff', async () => {
+      const f = createRemoteFile('newFile');
+      Vue.set(vm.$store.state.entries, f.path, f);
+
+      jest.spyOn(service, 'getRawFileData').mockImplementation(async () => {
+        expect(vm.file.loading).toBe(true);
+
+        // switching from edit to diff mode usually triggers editor initialization
+        vm.$store.state.viewer = viewerTypes.diff;
+
+        // we delay returning the file to make sure editor doesn't initialize before we fetch file content
+        await waitUsingRealTimer(30);
+        return 'rawFileData123\n';
       });
 
-      const createRemoteFile = (name) => ({
-        ...file(name),
-        tmpFile: false,
+      wrapper.setProps({
+        file: f,
       });
 
-      it('after switching viewer from edit to diff', async () => {
-        jest.spyOn(service, 'getRawFileData').mockImplementation(async () => {
-          expect(vm.file.loading).toBe(true);
+      await waitForEditorSetup();
+      expect(vm.model.getModel().getValue()).toBe('rawFileData123\n');
+    });
 
-          // switching from edit to diff mode usually triggers editor initialization
-          store.state.viewer = viewerTypes.diff;
+    it('after opening multiple files at the same time', async () => {
+      const fileA = createRemoteFile('fileA');
+      const aContent = 'fileA-rawContent\n';
+      const bContent = 'fileB-rawContent\n';
+      const fileB = createRemoteFile('fileB');
+      Vue.set(vm.$store.state.entries, fileA.path, fileA);
+      Vue.set(vm.$store.state.entries, fileB.path, fileB);
 
-          // we delay returning the file to make sure editor doesn't initialize before we fetch file content
+      jest
+        .spyOn(service, 'getRawFileData')
+        .mockImplementation(async () => {
+          // opening fileB while the content of fileA is still being fetched
+          wrapper.setProps({
+            file: fileB,
+          });
+          return aContent;
+        })
+        .mockImplementationOnce(async () => {
+          // we delay returning fileB content to make sure the editor doesn't initialize prematurely
           await waitUsingRealTimer(30);
-          return 'rawFileData123\n';
+          return bContent;
         });
 
-        const f = createRemoteFile('newFile');
-        Vue.set(store.state.entries, f.path, f);
-
-        vm.file = f;
-
-        await waitForEditorSetup();
-        expect(vm.model.getModel().getValue()).toBe('rawFileData123\n');
+      wrapper.setProps({
+        file: fileA,
       });
 
-      it('after opening multiple files at the same time', async () => {
-        const fileA = createRemoteFile('fileA');
-        const fileB = createRemoteFile('fileB');
-        Vue.set(store.state.entries, fileA.path, fileA);
-        Vue.set(store.state.entries, fileB.path, fileB);
+      await waitForEditorSetup();
+      expect(vm.model.getModel().getValue()).toBe(bContent);
+    });
+  });
 
-        jest
-          .spyOn(service, 'getRawFileData')
-          .mockImplementationOnce(async () => {
-            // opening fileB while the content of fileA is still being fetched
-            vm.file = fileB;
-            return 'fileA-rawContent\n';
-          })
-          .mockImplementationOnce(async () => {
-            // we delay returning fileB content to make sure the editor doesn't initialize prematurely
-            await waitUsingRealTimer(30);
-            return 'fileB-rawContent\n';
-          });
+  describe('onPaste', () => {
+    const setFileName = (name) =>
+      createActiveFile({
+        content: 'hello world\n',
+        name,
+        path: `foo/${name}`,
+        key: 'new',
+      });
 
-        vm.file = fileA;
+    const pasteImage = () => {
+      window.dispatchEvent(
+        Object.assign(new Event('paste'), {
+          clipboardData: {
+            files: [new File(['foo'], 'foo.png', { type: 'image/png' })],
+          },
+        }),
+      );
+    };
 
-        await waitForEditorSetup();
-        expect(vm.model.getModel().getValue()).toBe('fileB-rawContent\n');
+    const watchState = (watched) =>
+      new Promise((resolve) => {
+        const unwatch = vm.$store.watch(watched, () => {
+          unwatch();
+          resolve();
+        });
+      });
+
+    // Pasting an image does a lot of things like using the FileReader API,
+    // so, waitForPromises isn't very reliable (and causes a flaky spec)
+    // Read more about state.watch: https://vuex.vuejs.org/api/#watch
+    const waitForFileContentChange = () => watchState((s) => s.entries['foo/bar.md'].content);
+
+    beforeEach(async () => {
+      await createComponent({
+        state: {
+          trees: {
+            'gitlab-org/gitlab': { tree: [] },
+          },
+          currentProjectId: 'gitlab-org',
+          currentBranchId: 'gitlab',
+        },
+        activeFile: setFileName('bar.md'),
+      });
+
+      vm.setupEditor();
+
+      await waitForPromises();
+      // set cursor to line 2, column 1
+      vm.editor.setSelection(new Range(2, 1, 2, 1));
+      vm.editor.focus();
+
+      jest.spyOn(vm.editor, 'hasTextFocus').mockReturnValue(true);
+    });
+
+    it('adds an image entry to the same folder for a pasted image in a markdown file', async () => {
+      pasteImage();
+
+      await waitForFileContentChange();
+      expect(vm.$store.state.entries['foo/foo.png']).toMatchObject({
+        path: 'foo/foo.png',
+        type: 'blob',
+        content: 'Zm9v',
+        rawPath: 'data:image/png;base64,Zm9v',
       });
     });
 
-    describe('onPaste', () => {
-      const setFileName = (name) => {
-        Vue.set(vm, 'file', {
-          ...vm.file,
-          content: 'hello world\n',
-          name,
-          path: `foo/${name}`,
-          key: 'new',
-        });
+    it("adds a markdown image tag to the file's contents", async () => {
+      pasteImage();
 
-        vm.$store.state.entries[vm.file.path] = vm.file;
-      };
+      await waitForFileContentChange();
+      expect(vm.file.content).toBe('hello world\n![foo.png](./foo.png)');
+    });
 
-      const pasteImage = () => {
-        window.dispatchEvent(
-          Object.assign(new Event('paste'), {
-            clipboardData: {
-              files: [new File(['foo'], 'foo.png', { type: 'image/png' })],
-            },
-          }),
-        );
-      };
-
-      const watchState = (watched) =>
-        new Promise((resolve) => {
-          const unwatch = vm.$store.watch(watched, () => {
-            unwatch();
-            resolve();
-          });
-        });
-
-      // Pasting an image does a lot of things like using the FileReader API,
-      // so, waitForPromises isn't very reliable (and causes a flaky spec)
-      // Read more about state.watch: https://vuex.vuejs.org/api/#watch
-      const waitForFileContentChange = () => watchState((s) => s.entries['foo/bar.md'].content);
-
-      beforeEach(() => {
-        setFileName('bar.md');
-
-        vm.$store.state.trees['gitlab-org/gitlab'] = { tree: [] };
-        vm.$store.state.currentProjectId = 'gitlab-org';
-        vm.$store.state.currentBranchId = 'gitlab';
-
-        // create a new model each time, otherwise tests conflict with each other
-        // because of same model being used in multiple tests
-        Editor.editorInstance.modelManager.dispose();
-        vm.setupEditor();
-
-        return waitForPromises().then(() => {
-          // set cursor to line 2, column 1
-          vm.editor.instance.setSelection(new Range(2, 1, 2, 1));
-          vm.editor.instance.focus();
-
-          jest.spyOn(vm.editor.instance, 'hasTextFocus').mockReturnValue(true);
-        });
+    it("does not add file to state or set markdown image syntax if the file isn't markdown", async () => {
+      wrapper.setProps({
+        file: setFileName('myfile.txt'),
       });
+      pasteImage();
 
-      it('adds an image entry to the same folder for a pasted image in a markdown file', () => {
-        pasteImage();
-
-        return waitForFileContentChange().then(() => {
-          expect(vm.$store.state.entries['foo/foo.png']).toMatchObject({
-            path: 'foo/foo.png',
-            type: 'blob',
-            content: 'Zm9v',
-            rawPath: 'data:image/png;base64,Zm9v',
-          });
-        });
-      });
-
-      it("adds a markdown image tag to the file's contents", () => {
-        pasteImage();
-
-        return waitForFileContentChange().then(() => {
-          expect(vm.file.content).toBe('hello world\n![foo.png](./foo.png)');
-        });
-      });
-
-      it("does not add file to state or set markdown image syntax if the file isn't markdown", () => {
-        setFileName('myfile.txt');
-        pasteImage();
-
-        return waitForPromises().then(() => {
-          expect(vm.$store.state.entries['foo/foo.png']).toBeUndefined();
-          expect(vm.file.content).toBe('hello world\n');
-        });
-      });
+      await waitForPromises();
+      expect(vm.$store.state.entries['foo/foo.png']).toBeUndefined();
+      expect(vm.file.content).toBe('hello world\n');
     });
   });
 
   describe('fetchEditorconfigRules', () => {
-    beforeEach(() => {
-      exampleConfigs.forEach(({ path, content }) => {
-        store.state.entries[path] = { ...file(), path, content };
-      });
-    });
-
     it.each(exampleFiles)(
       'does not fetch content from remote for .editorconfig files present locally (case %#)',
-      ({ path, monacoRules }) => {
-        createOpenFile(path);
-        createComponent();
-
-        return waitForEditorSetup().then(() => {
-          expect(vm.rules).toEqual(monacoRules);
-          expect(vm.model.options).toMatchObject(monacoRules);
-          expect(vm.getFileData).not.toHaveBeenCalled();
-          expect(vm.getRawFileData).not.toHaveBeenCalled();
+      async ({ path, monacoRules }) => {
+        await createComponent({
+          state: {
+            entries: (() => {
+              const res = {};
+              exampleConfigs.forEach(({ path: configPath, content }) => {
+                res[configPath] = { ...file(), path: configPath, content };
+              });
+              return res;
+            })(),
+          },
+          activeFile: createActiveFile({
+            path,
+            key: path,
+            name: 'myfile.txt',
+            content: 'hello world',
+          }),
         });
+
+        expect(vm.rules).toEqual(monacoRules);
+        expect(vm.model.options).toMatchObject(monacoRules);
+        expect(vm.getFileData).not.toHaveBeenCalled();
+        expect(vm.getRawFileData).not.toHaveBeenCalled();
       },
     );
 
-    it('fetches content from remote for .editorconfig files not available locally', () => {
-      exampleConfigs.forEach(({ path }) => {
-        delete store.state.entries[path].content;
-        delete store.state.entries[path].raw;
+    it('fetches content from remote for .editorconfig files not available locally', async () => {
+      const activeFile = createActiveFile({
+        path: 'foo/bar/baz/test/my_spec.js',
+        key: 'foo/bar/baz/test/my_spec.js',
+        name: 'myfile.txt',
+        content: 'hello world',
       });
 
-      // Include a "test" directory which does not exist in store. This one should be skipped.
-      createOpenFile('foo/bar/baz/test/my_spec.js');
-      createComponent();
+      const expectations = [
+        'foo/bar/baz/.editorconfig',
+        'foo/bar/.editorconfig',
+        'foo/.editorconfig',
+        '.editorconfig',
+      ];
 
-      return waitForEditorSetup().then(() => {
-        expect(vm.getFileData.mock.calls.map(([args]) => args)).toEqual([
-          { makeFileActive: false, path: 'foo/bar/baz/.editorconfig' },
-          { makeFileActive: false, path: 'foo/bar/.editorconfig' },
-          { makeFileActive: false, path: 'foo/.editorconfig' },
-          { makeFileActive: false, path: '.editorconfig' },
-        ]);
-        expect(vm.getRawFileData.mock.calls.map(([args]) => args)).toEqual([
-          { path: 'foo/bar/baz/.editorconfig' },
-          { path: 'foo/bar/.editorconfig' },
-          { path: 'foo/.editorconfig' },
-          { path: '.editorconfig' },
-        ]);
+      await createComponent({
+        state: {
+          entries: (() => {
+            const res = {
+              [activeFile.path]: activeFile,
+            };
+            exampleConfigs.forEach(({ path: configPath }) => {
+              const f = { ...file(), path: configPath };
+              delete f.content;
+              delete f.raw;
+              res[configPath] = f;
+            });
+            return res;
+          })(),
+        },
+        activeFile,
       });
+
+      expect(service.getFileData.mock.calls.map(([args]) => args)).toEqual(
+        expectations.map((expectation) => expect.stringContaining(expectation)),
+      );
+      expect(service.getRawFileData.mock.calls.map(([args]) => args)).toEqual(
+        expectations.map((expectation) => expect.objectContaining({ path: expectation })),
+      );
     });
   });
 });
diff --git a/spec/frontend/ide/components/repo_tab_spec.js b/spec/frontend/ide/components/repo_tab_spec.js
index b39a488b034..95d52e8f7a9 100644
--- a/spec/frontend/ide/components/repo_tab_spec.js
+++ b/spec/frontend/ide/components/repo_tab_spec.js
@@ -1,5 +1,7 @@
+import { GlTab } from '@gitlab/ui';
 import { mount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
+import { stubComponent } from 'helpers/stub_component';
 import RepoTab from '~/ide/components/repo_tab.vue';
 import { createRouter } from '~/ide/ide_router';
 import { createStore } from '~/ide/stores';
@@ -8,16 +10,25 @@ import { file } from '../helpers';
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
+const GlTabStub = stubComponent(GlTab, {
+  template: '<li><slot name="title" /></li>',
+});
+
 describe('RepoTab', () => {
   let wrapper;
   let store;
   let router;
 
+  const findTab = () => wrapper.find(GlTabStub);
+
   function createComponent(propsData) {
     wrapper = mount(RepoTab, {
       localVue,
       store,
       propsData,
+      stubs: {
+        GlTab: GlTabStub,
+      },
     });
   }
 
@@ -55,7 +66,7 @@ describe('RepoTab', () => {
 
     jest.spyOn(wrapper.vm, 'openPendingTab').mockImplementation(() => {});
 
-    await wrapper.trigger('click');
+    await findTab().vm.$emit('click');
 
     expect(wrapper.vm.openPendingTab).not.toHaveBeenCalled();
   });
@@ -67,7 +78,7 @@ describe('RepoTab', () => {
 
     jest.spyOn(wrapper.vm, 'clickFile').mockImplementation(() => {});
 
-    wrapper.trigger('click');
+    findTab().vm.$emit('click');
 
     expect(wrapper.vm.clickFile).toHaveBeenCalledWith(wrapper.vm.tab);
   });
@@ -91,11 +102,11 @@ describe('RepoTab', () => {
       tab,
     });
 
-    await wrapper.trigger('mouseover');
+    await findTab().vm.$emit('mouseover');
 
     expect(wrapper.find('.file-modified').exists()).toBe(false);
 
-    await wrapper.trigger('mouseout');
+    await findTab().vm.$emit('mouseout');
 
     expect(wrapper.find('.file-modified').exists()).toBe(true);
   });
diff --git a/spec/frontend/pipelines/graph_shared/links_inner_spec.js b/spec/frontend/pipelines/graph_shared/links_inner_spec.js
index 6cabe2bc8a7..15a5fbfeffe 100644
--- a/spec/frontend/pipelines/graph_shared/links_inner_spec.js
+++ b/spec/frontend/pipelines/graph_shared/links_inner_spec.js
@@ -1,5 +1,15 @@
 import { shallowMount } from '@vue/test-utils';
+import MockAdapter from 'axios-mock-adapter';
 import { setHTMLFixture } from 'helpers/fixtures';
+import axios from '~/lib/utils/axios_utils';
+import {
+  PIPELINES_DETAIL_LINK_DURATION,
+  PIPELINES_DETAIL_LINKS_TOTAL,
+  PIPELINES_DETAIL_LINKS_JOB_RATIO,
+} from '~/performance/constants';
+import * as perfUtils from '~/performance/utils';
+import * as sentryUtils from '~/pipelines/components/graph/utils';
+import * as Api from '~/pipelines/components/graph_shared/api';
 import LinksInner from '~/pipelines/components/graph_shared/links_inner.vue';
 import { createJobsHash } from '~/pipelines/utils';
 import {
@@ -18,7 +28,9 @@ describe('Links Inner component', () => {
     containerMeasurements: { width: 1019, height: 445 },
     pipelineId: 1,
     pipelineData: [],
+    totalGroups: 10,
   };
+
   let wrapper;
 
   const createComponent = (props) => {
@@ -194,4 +206,141 @@ describe('Links Inner component', () => {
       expect(firstLink.classes(hoverColorClass)).toBe(true);
     });
   });
+
+  describe('performance metrics', () => {
+    let markAndMeasure;
+    let reportToSentry;
+    let reportPerformance;
+    let mock;
+
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+      jest.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => cb());
+      markAndMeasure = jest.spyOn(perfUtils, 'performanceMarkAndMeasure');
+      reportToSentry = jest.spyOn(sentryUtils, 'reportToSentry');
+      reportPerformance = jest.spyOn(Api, 'reportPerformance');
+    });
+
+    afterEach(() => {
+      mock.restore();
+    });
+
+    describe('with no metrics config object', () => {
+      beforeEach(() => {
+        setFixtures(pipelineData);
+        createComponent({
+          pipelineData: pipelineData.stages,
+        });
+      });
+
+      it('is not called', () => {
+        expect(markAndMeasure).not.toHaveBeenCalled();
+        expect(reportToSentry).not.toHaveBeenCalled();
+        expect(reportPerformance).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('with metrics config set to false', () => {
+      beforeEach(() => {
+        setFixtures(pipelineData);
+        createComponent({
+          pipelineData: pipelineData.stages,
+          metricsConfig: {
+            collectMetrics: false,
+            metricsPath: '/path/to/metrics',
+          },
+        });
+      });
+
+      it('is not called', () => {
+        expect(markAndMeasure).not.toHaveBeenCalled();
+        expect(reportToSentry).not.toHaveBeenCalled();
+        expect(reportPerformance).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('with no metrics path', () => {
+      beforeEach(() => {
+        setFixtures(pipelineData);
+        createComponent({
+          pipelineData: pipelineData.stages,
+          metricsConfig: {
+            collectMetrics: true,
+            metricsPath: '',
+          },
+        });
+      });
+
+      it('is not called', () => {
+        expect(markAndMeasure).not.toHaveBeenCalled();
+        expect(reportToSentry).not.toHaveBeenCalled();
+        expect(reportPerformance).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('with metrics path and collect set to true', () => {
+      const metricsPath = '/root/project/-/ci/prometheus_metrics/histograms.json';
+      const duration = 0.0478;
+      const numLinks = 1;
+      const metricsData = {
+        histograms: [
+          { name: PIPELINES_DETAIL_LINK_DURATION, value: duration },
+          { name: PIPELINES_DETAIL_LINKS_TOTAL, value: numLinks },
+          {
+            name: PIPELINES_DETAIL_LINKS_JOB_RATIO,
+            value: numLinks / defaultProps.totalGroups,
+          },
+        ],
+      };
+
+      describe('when no duration is obtained', () => {
+        beforeEach(() => {
+          jest.spyOn(window.performance, 'getEntriesByName').mockImplementation(() => {
+            return [];
+          });
+
+          setFixtures(pipelineData);
+
+          createComponent({
+            pipelineData: pipelineData.stages,
+            metricsConfig: {
+              collectMetrics: true,
+              path: metricsPath,
+            },
+          });
+        });
+
+        it('attempts to collect metrics', () => {
+          expect(markAndMeasure).toHaveBeenCalled();
+          expect(reportPerformance).not.toHaveBeenCalled();
+          expect(reportToSentry).not.toHaveBeenCalled();
+        });
+      });
+
+      describe('with duration and no error', () => {
+        beforeEach(() => {
+          jest.spyOn(window.performance, 'getEntriesByName').mockImplementation(() => {
+            return [{ duration }];
+          });
+
+          setFixtures(pipelineData);
+
+          createComponent({
+            pipelineData: pipelineData.stages,
+            metricsConfig: {
+              collectMetrics: true,
+              path: metricsPath,
+            },
+          });
+        });
+
+        it('it calls reportPerformance with expected arguments', () => {
+          expect(markAndMeasure).toHaveBeenCalled();
+          expect(reportPerformance).toHaveBeenCalled();
+          expect(reportPerformance).toHaveBeenCalledWith(metricsPath, metricsData);
+          expect(reportToSentry).not.toHaveBeenCalled();
+        });
+      });
+    });
+  });
 });
diff --git a/spec/frontend/sentry/sentry_config_spec.js b/spec/frontend/sentry/sentry_config_spec.js
index f7102f9b2f9..1f5097ef2a8 100644
--- a/spec/frontend/sentry/sentry_config_spec.js
+++ b/spec/frontend/sentry/sentry_config_spec.js
@@ -1,5 +1,5 @@
+import * as Sentry from '@sentry/browser';
 import SentryConfig from '~/sentry/sentry_config';
-import * as Sentry from '~/sentry/wrapper';
 
 describe('SentryConfig', () => {
   describe('IGNORE_ERRORS', () => {
diff --git a/spec/frontend/sidebar/subscriptions_spec.js b/spec/frontend/sidebar/subscriptions_spec.js
index e7ae59e26cf..6ab8e1e0ebc 100644
--- a/spec/frontend/sidebar/subscriptions_spec.js
+++ b/spec/frontend/sidebar/subscriptions_spec.js
@@ -84,6 +84,15 @@ describe('Subscriptions', () => {
     spy.mockRestore();
   });
 
+  it('has visually hidden label', () => {
+    wrapper = mountComponent();
+
+    expect(findToggleButton().props()).toMatchObject({
+      label: 'Notifications',
+      labelPosition: 'hidden',
+    });
+  });
+
   describe('given project emails are disabled', () => {
     const subscribeDisabledDescription = 'Notifications have been disabled';
 
diff --git a/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap b/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
index d2fe3cd76cb..af4fa462cbf 100644
--- a/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
+++ b/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
@@ -19,6 +19,7 @@ exports[`Upload dropzone component correctly overrides description and drop mess
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
         <span>
           Test %{linkStart}description%{linkEnd} message.
@@ -98,10 +99,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -178,10 +184,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -258,10 +269,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -337,10 +353,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -416,10 +437,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -495,10 +521,15 @@ exports[`Upload dropzone component when no slot provided renders default dropzon
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
diff --git a/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js b/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js
index ace486b1f32..b3cdbccb271 100644
--- a/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js
+++ b/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js
@@ -1,4 +1,4 @@
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
 
@@ -14,6 +14,7 @@ describe('Upload dropzone component', () => {
   const findDropzoneCard = () => wrapper.find('.upload-dropzone-card');
   const findDropzoneArea = () => wrapper.find('[data-testid="dropzone-area"]');
   const findIcon = () => wrapper.find(GlIcon);
+  const findUploadText = () => wrapper.find('[data-testid="upload-text"]').text();
 
   function createComponent({ slots = {}, data = {}, props = {} } = {}) {
     wrapper = shallowMount(UploadDropzone, {
@@ -22,6 +23,9 @@ describe('Upload dropzone component', () => {
         displayAsCard: true,
         ...props,
       },
+      stubs: {
+        GlSprintf,
+      },
       data() {
         return data;
       },
@@ -30,6 +34,7 @@ describe('Upload dropzone component', () => {
 
   afterEach(() => {
     wrapper.destroy();
+    wrapper = null;
   });
 
   describe('when slot provided', () => {
@@ -60,6 +65,18 @@ describe('Upload dropzone component', () => {
     });
   });
 
+  describe('upload text', () => {
+    it.each`
+      collection    | description                   | props                            | expected
+      ${'multiple'} | ${'by default'}               | ${null}                          | ${'files to attach'}
+      ${'singular'} | ${'when singleFileSelection'} | ${{ singleFileSelection: true }} | ${'file to attach'}
+    `('displays $collection version $description', ({ props, expected }) => {
+      createComponent({ props });
+
+      expect(findUploadText()).toContain(expected);
+    });
+  });
+
   describe('when dragging', () => {
     it.each`
       description                  | eventPayload
@@ -141,6 +158,21 @@ describe('Upload dropzone component', () => {
         wrapper.vm.ondrop(mockEvent);
         expect(wrapper.emitted()).not.toHaveProperty('error');
       });
+
+      describe('singleFileSelection = true', () => {
+        it('emits a single file on drop', () => {
+          createComponent({
+            data: mockData,
+            props: { singleFileSelection: true },
+          });
+
+          const mockFile = { type: 'image/jpg' };
+          const mockEvent = mockDragEvent({ files: [mockFile] });
+
+          wrapper.vm.ondrop(mockEvent);
+          expect(wrapper.emitted().change[0]).toEqual([mockFile]);
+        });
+      });
     });
   });
 
diff --git a/spec/frontend_integration/ide/helpers/ide_helper.js b/spec/frontend_integration/ide/helpers/ide_helper.js
index 9e6bafc1297..6c09b44d891 100644
--- a/spec/frontend_integration/ide/helpers/ide_helper.js
+++ b/spec/frontend_integration/ide/helpers/ide_helper.js
@@ -25,6 +25,9 @@ export const getStatusBar = () => document.querySelector('.ide-status-bar');
 export const waitForMonacoEditor = () =>
   new Promise((resolve) => window.monaco.editor.onDidCreateEditor(resolve));
 
+export const waitForEditorModelChange = (instance) =>
+  new Promise((resolve) => instance.onDidChangeModel(resolve));
+
 export const findMonacoEditor = () =>
   screen.findAllByLabelText(/Editor content;/).then(([x]) => x.closest('.monaco-editor'));
 
diff --git a/spec/frontend_integration/ide/helpers/start.js b/spec/frontend_integration/ide/helpers/start.js
index 173a9610c84..cc6abd9e01f 100644
--- a/spec/frontend_integration/ide/helpers/start.js
+++ b/spec/frontend_integration/ide/helpers/start.js
@@ -1,6 +1,7 @@
+/* global monaco */
+
 import { TEST_HOST } from 'helpers/test_constants';
 import { initIde } from '~/ide';
-import Editor from '~/ide/lib/editor';
 import extendStore from '~/ide/stores/extend';
 import { IDE_DATASET } from './mock_data';
 
@@ -18,13 +19,7 @@ export default (container, { isRepoEmpty = false, path = '', mrId = '' } = {}) =
   const vm = initIde(el, { extendStore });
 
   // We need to dispose of editor Singleton things or tests will bump into eachother
-  vm.$on('destroy', () => {
-    if (Editor.editorInstance) {
-      Editor.editorInstance.modelManager.dispose();
-      Editor.editorInstance.dispose();
-      Editor.editorInstance = null;
-    }
-  });
+  vm.$on('destroy', () => monaco.editor.getModels().forEach((model) => model.dispose()));
 
   return vm;
 };
diff --git a/spec/frontend_integration/ide/ide_integration_spec.js b/spec/frontend_integration/ide/ide_integration_spec.js
index 3ce88de11fe..5f1a5b0d048 100644
--- a/spec/frontend_integration/ide/ide_integration_spec.js
+++ b/spec/frontend_integration/ide/ide_integration_spec.js
@@ -96,16 +96,6 @@ describe('WebIDE', () => {
     let statusBar;
     let editor;
 
-    const waitForEditor = async () => {
-      editor = await ideHelper.waitForMonacoEditor();
-    };
-
-    const changeEditorPosition = async (lineNumber, column) => {
-      editor.setPosition({ lineNumber, column });
-
-      await vm.$nextTick();
-    };
-
     beforeEach(async () => {
       vm = startWebIDE(container);
 
@@ -134,16 +124,17 @@ describe('WebIDE', () => {
 
       // Need to wait for monaco editor to load so it doesn't through errors on dispose
       await ideHelper.openFile('.gitignore');
-      await ideHelper.waitForMonacoEditor();
+      await ideHelper.waitForEditorModelChange(editor);
       await ideHelper.openFile('README.md');
-      await ideHelper.waitForMonacoEditor();
+      await ideHelper.waitForEditorModelChange(editor);
 
       expect(el).toHaveText(markdownPreview);
     });
 
     describe('when editor position changes', () => {
       beforeEach(async () => {
-        await changeEditorPosition(4, 10);
+        editor.setPosition({ lineNumber: 4, column: 10 });
+        await vm.$nextTick();
       });
 
       it('shows new line position', () => {
@@ -153,7 +144,8 @@ describe('WebIDE', () => {
 
       it('updates after rename', async () => {
         await ideHelper.renameFile('README.md', 'READMEZ.txt');
-        await waitForEditor();
+        await ideHelper.waitForEditorModelChange(editor);
+        await vm.$nextTick();
 
         expect(statusBar).toHaveText('1:1');
         expect(statusBar).toHaveText('plaintext');
@@ -161,10 +153,10 @@ describe('WebIDE', () => {
 
       it('persists position after opening then rename', async () => {
         await ideHelper.openFile('files/js/application.js');
-        await waitForEditor();
+        await ideHelper.waitForEditorModelChange(editor);
         await ideHelper.renameFile('README.md', 'READING_RAINBOW.md');
         await ideHelper.openFile('READING_RAINBOW.md');
-        await waitForEditor();
+        await ideHelper.waitForEditorModelChange(editor);
 
         expect(statusBar).toHaveText('4:10');
         expect(statusBar).toHaveText('markdown');
@@ -173,7 +165,8 @@ describe('WebIDE', () => {
       it('persists position after closing', async () => {
         await ideHelper.closeFile('README.md');
         await ideHelper.openFile('README.md');
-        await waitForEditor();
+        await ideHelper.waitForMonacoEditor();
+        await vm.$nextTick();
 
         expect(statusBar).toHaveText('4:10');
         expect(statusBar).toHaveText('markdown');
diff --git a/spec/frontend_integration/ide/user_opens_mr_spec.js b/spec/frontend_integration/ide/user_opens_mr_spec.js
index 9cf0ff5da56..3ffc5169351 100644
--- a/spec/frontend_integration/ide/user_opens_mr_spec.js
+++ b/spec/frontend_integration/ide/user_opens_mr_spec.js
@@ -24,11 +24,11 @@ describe('IDE: User opens Merge Request', () => {
 
     vm = startWebIDE(container, { mrId });
 
-    await ideHelper.waitForTabToOpen(basename(changes[0].new_path));
-    await ideHelper.waitForMonacoEditor();
+    const editor = await ideHelper.waitForMonacoEditor();
+    await ideHelper.waitForEditorModelChange(editor);
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     vm.$destroy();
     vm = null;
   });
diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index 7eeae3f3f33..a4b046a9ed5 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -13,7 +13,6 @@ RSpec.describe Gitlab::Experimentation::EXPERIMENTS do
       :invite_members_version_b,
       :invite_members_empty_group_version_a,
       :contact_sales_btn_in_app,
-      :customize_homepage,
       :group_only_trials
     ]
 
diff --git a/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
index 7b5efb11034..1be2a83f98f 100644
--- a/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
   end
 
   it 'includes the right events' do
-    expect(described_class::KNOWN_EVENTS.size).to eq 45
+    expect(described_class::KNOWN_EVENTS.size).to eq 48
   end
 
   described_class::KNOWN_EVENTS.each do |event|
diff --git a/spec/models/concerns/project_features_compatibility_spec.rb b/spec/models/concerns/project_features_compatibility_spec.rb
index 2059e170446..7c2caafcdb7 100644
--- a/spec/models/concerns/project_features_compatibility_spec.rb
+++ b/spec/models/concerns/project_features_compatibility_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe ProjectFeaturesCompatibility do
   let(:project) { create(:project) }
-  let(:features_enabled) { %w(issues wiki builds merge_requests snippets) }
+  let(:features_enabled) { %w(issues wiki builds merge_requests snippets security_and_compliance) }
   let(:features) { features_enabled + %w(repository pages operations) }
 
   # We had issues_enabled, snippets_enabled, builds_enabled, merge_requests_enabled and issues_enabled fields on projects table
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 0dcf4b51a33..ed0b9063e32 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -285,6 +285,17 @@ RSpec.describe Namespace do
     end
   end
 
+  describe '.top_most' do
+    let_it_be(:namespace) { create(:namespace) }
+    let_it_be(:sub_namespace) { create(:namespace, parent: namespace) }
+
+    subject { described_class.top_most.ids }
+
+    it 'only contains root namespace' do
+      is_expected.to eq([namespace.id])
+    end
+  end
+
   describe '#ancestors_upto' do
     let(:parent) { create(:group) }
     let(:child) { create(:group, parent: parent) }
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index 483edb6b742..fc0bd34a331 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -513,7 +513,7 @@ RSpec.describe Packages::Package, type: :model do
 
   describe '.without_nuget_temporary_name' do
     let!(:package1) { create(:nuget_package) }
-    let!(:package2) { create(:nuget_package, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+    let!(:package2) { create(:nuget_package, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
 
     subject { described_class.without_nuget_temporary_name }
 
@@ -532,7 +532,7 @@ RSpec.describe Packages::Package, type: :model do
     it { is_expected.to match_array([package1, package2, package3]) }
 
     context 'with temporary packages' do
-      let!(:package1) { create(:nuget_package, name: Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME) }
+      let!(:package1) { create(:nuget_package, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
 
       it { is_expected.to match_array([package2, package3]) }
     end
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index 6ba3ab6aace..cf5a606bd8e 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -1263,4 +1263,90 @@ RSpec.describe ProjectPolicy do
       end
     end
   end
+
+  describe 'access_security_and_compliance' do
+    context 'when the "Security & Compliance" is enabled' do
+      before do
+        project.project_feature.update!(security_and_compliance_access_level: Featurable::PRIVATE)
+      end
+
+      %w[owner maintainer developer].each do |role|
+        context "when the role is #{role}" do
+          let(:current_user) { public_send(role) }
+
+          it { is_expected.to be_allowed(:access_security_and_compliance) }
+        end
+      end
+
+      context 'with admin' do
+        let(:current_user) { admin }
+
+        context 'when admin mode enabled', :enable_admin_mode do
+          it { is_expected.to be_allowed(:access_security_and_compliance) }
+        end
+
+        context 'when admin mode disabled' do
+          it { is_expected.to be_disallowed(:access_security_and_compliance) }
+        end
+      end
+
+      %w[reporter guest].each do |role|
+        context "when the role is #{role}" do
+          let(:current_user) { public_send(role) }
+
+          it { is_expected.to be_disallowed(:access_security_and_compliance) }
+        end
+      end
+
+      context 'with non member' do
+        let(:current_user) { non_member }
+
+        it { is_expected.to be_disallowed(:access_security_and_compliance) }
+      end
+
+      context 'with anonymous' do
+        let(:current_user) { anonymous }
+
+        it { is_expected.to be_disallowed(:access_security_and_compliance) }
+      end
+    end
+
+    context 'when the "Security & Compliance" is not enabled' do
+      before do
+        project.project_feature.update!(security_and_compliance_access_level: Featurable::DISABLED)
+      end
+
+      %w[owner maintainer developer reporter guest].each do |role|
+        context "when the role is #{role}" do
+          let(:current_user) { public_send(role) }
+
+          it { is_expected.to be_disallowed(:access_security_and_compliance) }
+        end
+      end
+
+      context 'with admin' do
+        let(:current_user) { admin }
+
+        context 'when admin mode enabled', :enable_admin_mode do
+          it { is_expected.to be_disallowed(:access_security_and_compliance) }
+        end
+
+        context 'when admin mode disabled' do
+          it { is_expected.to be_disallowed(:access_security_and_compliance) }
+        end
+      end
+
+      context 'with non member' do
+        let(:current_user) { non_member }
+
+        it { is_expected.to be_disallowed(:access_security_and_compliance) }
+      end
+
+      context 'with anonymous' do
+        let(:current_user) { anonymous }
+
+        it { is_expected.to be_disallowed(:access_security_and_compliance) }
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/npm_instance_packages_spec.rb b/spec/requests/api/npm_instance_packages_spec.rb
index 70c76067a6e..698885ddcf4 100644
--- a/spec/requests/api/npm_instance_packages_spec.rb
+++ b/spec/requests/api/npm_instance_packages_spec.rb
@@ -3,6 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe API::NpmInstancePackages do
+  # We need to create a subgroup with the same name as the hosting group.
+  # It has to be created first to exhibit this bug: https://gitlab.com/gitlab-org/gitlab/-/issues/321958
+  let_it_be(:another_namespace) { create(:group, :public) }
+  let_it_be(:similarly_named_group) { create(:group, :public, parent: another_namespace, name: 'test-group') }
+
   include_context 'npm api setup'
 
   describe 'GET /api/v4/packages/npm/*package_name' do
diff --git a/spec/requests/api/rubygem_packages_spec.rb b/spec/requests/api/rubygem_packages_spec.rb
index 5dd68bf9b10..c97072ee9cd 100644
--- a/spec/requests/api/rubygem_packages_spec.rb
+++ b/spec/requests/api/rubygem_packages_spec.rb
@@ -3,9 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe API::RubygemPackages do
+  include PackagesManagerApiSpecHelpers
+  include WorkhorseHelpers
   using RSpec::Parameterized::TableSyntax
 
-  let_it_be(:project) { create(:project) }
+  let_it_be_with_reload(:project) { create(:project) }
   let_it_be(:personal_access_token) { create(:personal_access_token) }
   let_it_be(:user) { personal_access_token.user }
   let_it_be(:job) { create(:ci_build, :running, user: user) }
@@ -13,6 +15,14 @@ RSpec.describe API::RubygemPackages do
   let_it_be(:project_deploy_token) { create(:project_deploy_token, deploy_token: deploy_token, project: project) }
   let_it_be(:headers) { {} }
 
+  let(:tokens) do
+    {
+      personal_access_token: personal_access_token.token,
+      deploy_token: deploy_token.token,
+      job_token: job.token
+    }
+  end
+
   shared_examples 'when feature flag is disabled' do
     let(:headers) do
       { 'HTTP_AUTHORIZATION' => personal_access_token.token }
@@ -42,14 +52,6 @@ RSpec.describe API::RubygemPackages do
       { 'HTTP_AUTHORIZATION' => token }
     end
 
-    let(:tokens) do
-      {
-        personal_access_token: personal_access_token.token,
-        deploy_token: deploy_token.token,
-        job_token: job.token
-      }
-    end
-
     where(:user_role, :token_type, :valid_token, :status) do
       :guest     | :personal_access_token   | true  | :not_found
       :guest     | :personal_access_token   | false | :unauthorized
@@ -114,19 +116,163 @@ RSpec.describe API::RubygemPackages do
   end
 
   describe 'POST /api/v4/projects/:project_id/packages/rubygems/api/v1/gems/authorize' do
+    include_context 'workhorse headers'
+
     let(:url) { api("/projects/#{project.id}/packages/rubygems/api/v1/gems/authorize") }
+    let(:headers) { {} }
 
     subject { post(url, headers: headers) }
 
-    it_behaves_like 'an unimplemented route'
+    context 'with valid project' do
+      where(:visibility, :user_role, :member, :token_type, :valid_token, :shared_examples_name, :expected_status) do
+        :public  | :developer  | true  | :personal_access_token | true  | 'process rubygems workhorse authorization' | :success
+        :public  | :guest      | true  | :personal_access_token | true  | 'rejects rubygems packages access'         | :forbidden
+        :public  | :developer  | true  | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :guest      | true  | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :developer  | false | :personal_access_token | true  | 'rejects rubygems packages access'         | :forbidden
+        :public  | :guest      | false | :personal_access_token | true  | 'rejects rubygems packages access'         | :forbidden
+        :public  | :developer  | false | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :guest      | false | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :anonymous  | false | :personal_access_token | true  | 'rejects rubygems packages access'         | :unauthorized
+        :private | :developer  | true  | :personal_access_token | true  | 'process rubygems workhorse authorization' | :success
+        :private | :guest      | true  | :personal_access_token | true  | 'rejects rubygems packages access'         | :forbidden
+        :private | :developer  | true  | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :guest      | true  | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :developer  | false | :personal_access_token | true  | 'rejects rubygems packages access'         | :not_found
+        :private | :guest      | false | :personal_access_token | true  | 'rejects rubygems packages access'         | :not_found
+        :private | :developer  | false | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :guest      | false | :personal_access_token | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :anonymous  | false | :personal_access_token | true  | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :developer  | true  | :job_token             | true  | 'process rubygems workhorse authorization' | :success
+        :public  | :guest      | true  | :job_token             | true  | 'rejects rubygems packages access'         | :forbidden
+        :public  | :developer  | true  | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :guest      | true  | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :developer  | false | :job_token             | true  | 'rejects rubygems packages access'         | :forbidden
+        :public  | :guest      | false | :job_token             | true  | 'rejects rubygems packages access'         | :forbidden
+        :public  | :developer  | false | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :guest      | false | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :developer  | true  | :job_token             | true  | 'process rubygems workhorse authorization' | :success
+        :private | :guest      | true  | :job_token             | true  | 'rejects rubygems packages access'         | :forbidden
+        :private | :developer  | true  | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :guest      | true  | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :developer  | false | :job_token             | true  | 'rejects rubygems packages access'         | :not_found
+        :private | :guest      | false | :job_token             | true  | 'rejects rubygems packages access'         | :not_found
+        :private | :developer  | false | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :guest      | false | :job_token             | false | 'rejects rubygems packages access'         | :unauthorized
+        :public  | :developer  | true  | :deploy_token          | true  | 'process rubygems workhorse authorization' | :success
+        :public  | :developer  | true  | :deploy_token          | false | 'rejects rubygems packages access'         | :unauthorized
+        :private | :developer  | true  | :deploy_token          | true  | 'process rubygems workhorse authorization' | :success
+        :private | :developer  | true  | :deploy_token          | false | 'rejects rubygems packages access'         | :unauthorized
+      end
+
+      with_them do
+        let(:token) { valid_token ? tokens[token_type] : 'invalid-token123' }
+        let(:user_headers) { user_role == :anonymous ? {} : { 'HTTP_AUTHORIZATION' => token } }
+        let(:headers) { user_headers.merge(workhorse_headers) }
+
+        before do
+          project.update!(visibility: visibility.to_s)
+        end
+
+        it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
+      end
+    end
   end
 
   describe 'POST /api/v4/projects/:project_id/packages/rubygems/api/v1/gems' do
-    let(:url) { api("/projects/#{project.id}/packages/rubygems/api/v1/gems") }
+    include_context 'workhorse headers'
 
-    subject { post(url, headers: headers) }
+    let(:url) { "/projects/#{project.id}/packages/rubygems/api/v1/gems" }
 
-    it_behaves_like 'an unimplemented route'
+    let_it_be(:file_name) { 'package.gem' }
+    let(:headers) { {} }
+    let(:params) { { file: temp_file(file_name) } }
+    let(:file_key) { :file }
+    let(:send_rewritten_field) { true }
+
+    subject do
+      workhorse_finalize(
+        api(url),
+        method: :post,
+        file_key: file_key,
+        params: params,
+        headers: headers,
+        send_rewritten_field: send_rewritten_field
+      )
+    end
+
+    context 'with valid project' do
+      where(:visibility, :user_role, :member, :token_type, :valid_token, :shared_examples_name, :expected_status) do
+        :public  | :developer  | true  | :personal_access_token | true  | 'process rubygems upload'          | :created
+        :public  | :guest      | true  | :personal_access_token | true  | 'rejects rubygems packages access' | :forbidden
+        :public  | :developer  | true  | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :guest      | true  | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :developer  | false | :personal_access_token | true  | 'rejects rubygems packages access' | :forbidden
+        :public  | :guest      | false | :personal_access_token | true  | 'rejects rubygems packages access' | :forbidden
+        :public  | :developer  | false | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :guest      | false | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :anonymous  | false | :personal_access_token | true  | 'rejects rubygems packages access' | :unauthorized
+        :private | :developer  | true  | :personal_access_token | true  | 'process rubygems upload'          | :created
+        :private | :guest      | true  | :personal_access_token | true  | 'rejects rubygems packages access' | :forbidden
+        :private | :developer  | true  | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :guest      | true  | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :developer  | false | :personal_access_token | true  | 'rejects rubygems packages access' | :not_found
+        :private | :guest      | false | :personal_access_token | true  | 'rejects rubygems packages access' | :not_found
+        :private | :developer  | false | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :guest      | false | :personal_access_token | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :anonymous  | false | :personal_access_token | true  | 'rejects rubygems packages access' | :unauthorized
+        :public  | :developer  | true  | :job_token             | true  | 'process rubygems upload'          | :created
+        :public  | :guest      | true  | :job_token             | true  | 'rejects rubygems packages access' | :forbidden
+        :public  | :developer  | true  | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :guest      | true  | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :developer  | false | :job_token             | true  | 'rejects rubygems packages access' | :forbidden
+        :public  | :guest      | false | :job_token             | true  | 'rejects rubygems packages access' | :forbidden
+        :public  | :developer  | false | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :guest      | false | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :developer  | true  | :job_token             | true  | 'process rubygems upload'          | :created
+        :private | :guest      | true  | :job_token             | true  | 'rejects rubygems packages access' | :forbidden
+        :private | :developer  | true  | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :guest      | true  | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :developer  | false | :job_token             | true  | 'rejects rubygems packages access' | :not_found
+        :private | :guest      | false | :job_token             | true  | 'rejects rubygems packages access' | :not_found
+        :private | :developer  | false | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :guest      | false | :job_token             | false | 'rejects rubygems packages access' | :unauthorized
+        :public  | :developer  | true  | :deploy_token          | true  | 'process rubygems upload'          | :created
+        :public  | :developer  | true  | :deploy_token          | false | 'rejects rubygems packages access' | :unauthorized
+        :private | :developer  | true  | :deploy_token          | true  | 'process rubygems upload'          | :created
+        :private | :developer  | true  | :deploy_token          | false | 'rejects rubygems packages access' | :unauthorized
+      end
+
+      with_them do
+        let(:token) { valid_token ? tokens[token_type] : 'invalid-token123' }
+        let(:user_headers) { user_role == :anonymous ? {} : { 'HTTP_AUTHORIZATION' => token } }
+        let(:headers) { user_headers.merge(workhorse_headers) }
+
+        before do
+          project.update!(visibility: visibility.to_s)
+        end
+
+        it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
+      end
+
+      context 'failed package file save' do
+        let(:user_headers) { { 'HTTP_AUTHORIZATION' => personal_access_token.token } }
+        let(:headers) { user_headers.merge(workhorse_headers) }
+
+        before do
+          project.add_developer(user)
+        end
+
+        it 'does not create package record', :aggregate_failures do
+          allow(Packages::CreatePackageFileService).to receive(:new).and_raise(StandardError)
+
+          expect { subject }
+              .to change { project.packages.count }.by(0)
+              .and change { Packages::PackageFile.count }.by(0)
+          expect(response).to have_gitlab_http_status(:error)
+        end
+      end
+    end
   end
 
   describe 'GET /api/v4/projects/:project_id/packages/rubygems/api/v1/dependencies' do
diff --git a/spec/services/packages/create_temporary_package_service_spec.rb b/spec/services/packages/create_temporary_package_service_spec.rb
new file mode 100644
index 00000000000..4b8d37401d8
--- /dev/null
+++ b/spec/services/packages/create_temporary_package_service_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::CreateTemporaryPackageService do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:params) { {} }
+  let_it_be(:package_name) { 'my-package' }
+  let_it_be(:package_type) { 'rubygems' }
+
+  describe '#execute' do
+    subject { described_class.new(project, user, params).execute(package_type, name: package_name) }
+
+    let(:package) { Packages::Package.last }
+
+    it 'creates the package', :aggregate_failures do
+      expect { subject }.to change { Packages::Package.count }.by(1)
+
+      expect(package).to be_valid
+      expect(package).to be_processing
+      expect(package.name).to eq(package_name)
+      expect(package.version).to start_with(described_class::PACKAGE_VERSION)
+      expect(package.package_type).to eq(package_type)
+    end
+
+    it 'can create two packages in a row', :aggregate_failures do
+      expect { subject }.to change { Packages::Package.count }.by(1)
+
+      expect do
+        described_class.new(project, user, params).execute(package_type, name: package_name)
+      end.to change { Packages::Package.count }.by(1)
+
+      expect(package).to be_valid
+      expect(package).to be_processing
+      expect(package.name).to eq(package_name)
+      expect(package.version).to start_with(described_class::PACKAGE_VERSION)
+      expect(package.package_type).to eq(package_type)
+    end
+
+    it_behaves_like 'assigns the package creator'
+    it_behaves_like 'assigns build to package'
+  end
+end
diff --git a/spec/services/packages/nuget/create_package_service_spec.rb b/spec/services/packages/nuget/create_package_service_spec.rb
deleted file mode 100644
index e338ac36fc3..00000000000
--- a/spec/services/packages/nuget/create_package_service_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-RSpec.describe Packages::Nuget::CreatePackageService do
-  let_it_be(:project) { create(:project) }
-  let_it_be(:user) { create(:user) }
-  let_it_be(:params) { {} }
-
-  describe '#execute' do
-    subject { described_class.new(project, user, params).execute }
-
-    let(:package) { Packages::Package.last }
-
-    it 'creates the package' do
-      expect { subject }.to change { Packages::Package.count }.by(1)
-
-      expect(package).to be_valid
-      expect(package.name).to eq(Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME)
-      expect(package.version).to start_with(Packages::Nuget::CreatePackageService::PACKAGE_VERSION)
-      expect(package.package_type).to eq('nuget')
-    end
-
-    it 'can create two packages in a row' do
-      expect { subject }.to change { Packages::Package.count }.by(1)
-      expect { described_class.new(project, user, params).execute }.to change { Packages::Package.count }.by(1)
-
-      expect(package).to be_valid
-      expect(package.name).to eq(Packages::Nuget::CreatePackageService::TEMPORARY_PACKAGE_NAME)
-      expect(package.version).to start_with(Packages::Nuget::CreatePackageService::PACKAGE_VERSION)
-      expect(package.package_type).to eq('nuget')
-    end
-
-    it_behaves_like 'assigns the package creator'
-    it_behaves_like 'assigns build to package'
-    it_behaves_like 'assigns status to package'
-  end
-end
diff --git a/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb b/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb
index 92b493ed376..c1cce46a54c 100644
--- a/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb
+++ b/spec/services/packages/nuget/update_package_from_metadata_service_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Packages::Nuget::UpdatePackageFromMetadataService, :clean_gitlab_redis_shared_state do
   include ExclusiveLeaseHelpers
 
-  let(:package) { create(:nuget_package) }
+  let(:package) { create(:nuget_package, :processing) }
   let(:package_file) { package.package_files.first }
   let(:service) { described_class.new(package_file) }
   let(:package_name) { 'DummyProject.DummyPackage' }
@@ -60,6 +60,7 @@ RSpec.describe Packages::Nuget::UpdatePackageFromMetadataService, :clean_gitlab_
             .to change { ::Packages::Package.count }.by(0)
             .and change { Packages::DependencyLink.count }.by(0)
           expect(package_file.reload.file_name).not_to eq(package_file_name)
+          expect(package_file.package).to be_processing
           expect(package_file.package.reload.name).not_to eq(package_name)
           expect(package_file.package.version).not_to eq(package_version)
         end
@@ -78,6 +79,7 @@ RSpec.describe Packages::Nuget::UpdatePackageFromMetadataService, :clean_gitlab_
 
         expect(package.reload.name).to eq(package_name)
         expect(package.version).to eq(package_version)
+        expect(package).to be_default
         expect(package_file.reload.file_name).to eq(package_file_name)
         # hard reset needed to properly reload package_file.file
         expect(Packages::PackageFile.find(package_file.id).file.size).not_to eq 0
@@ -184,6 +186,7 @@ RSpec.describe Packages::Nuget::UpdatePackageFromMetadataService, :clean_gitlab_
 
         expect(package.reload.name).to eq(package_name)
         expect(package.version).to eq(package_version)
+        expect(package).to be_default
         expect(package_file.reload.file_name).to eq(package_file_name)
         # hard reset needed to properly reload package_file.file
         expect(Packages::PackageFile.find(package_file.id).file.size).not_to eq 0
diff --git a/spec/support/shared_contexts/requests/api/npm_packages_shared_context.rb b/spec/support/shared_contexts/requests/api/npm_packages_shared_context.rb
index b0f57b1969f..815108be447 100644
--- a/spec/support/shared_contexts/requests/api/npm_packages_shared_context.rb
+++ b/spec/support/shared_contexts/requests/api/npm_packages_shared_context.rb
@@ -5,8 +5,9 @@ RSpec.shared_context 'npm api setup' do
   include HttpBasicAuthHelpers
 
   let_it_be(:user, reload: true) { create(:user) }
-  let_it_be(:group) { create(:group) }
-  let_it_be(:project, reload: true) { create(:project, :public, namespace: group) }
+  let_it_be(:group) { create(:group, name: 'test-group') }
+  let_it_be(:namespace) { group }
+  let_it_be(:project, reload: true) { create(:project, :public, namespace: namespace) }
   let_it_be(:package, reload: true) { create(:npm_package, project: project, name: "@#{group.path}/scoped_package") }
   let_it_be(:token) { create(:oauth_access_token, scopes: 'api', resource_owner: user) }
   let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
diff --git a/spec/support/shared_contexts/security_and_compliance_permissions_shared_context.rb b/spec/support/shared_contexts/security_and_compliance_permissions_shared_context.rb
new file mode 100644
index 00000000000..dc5195e4b01
--- /dev/null
+++ b/spec/support/shared_contexts/security_and_compliance_permissions_shared_context.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec.shared_context '"Security & Compliance" permissions' do
+  let(:project_instance) { an_instance_of(Project) }
+  let(:user_instance) { an_instance_of(User) }
+  let(:before_request_defined) { false }
+  let(:valid_request) {}
+
+  def self.before_request(&block)
+    return unless block
+
+    let(:before_request_call) { instance_exec(&block) }
+    let(:before_request_defined) { true }
+  end
+
+  before do
+    allow(Ability).to receive(:allowed?).and_call_original
+    allow(Ability).to receive(:allowed?).with(user_instance, :access_security_and_compliance, project_instance).and_return(true)
+  end
+
+  context 'when the "Security & Compliance" feature is disabled' do
+    subject { response }
+
+    before do
+      before_request_call if before_request_defined
+
+      allow(Ability).to receive(:allowed?).with(user_instance, :access_security_and_compliance, project_instance).and_return(false)
+      valid_request
+    end
+
+    it { is_expected.to have_gitlab_http_status(:not_found) }
+  end
+end
diff --git a/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
index eb7f6c7a723..c15c59e1a1d 100644
--- a/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb
@@ -45,220 +45,234 @@ RSpec.shared_examples 'handling get metadata requests' do |scope: :project|
     end
   end
 
-  where(:auth, :package_name_type, :request_forward, :visibility, :user_role, :expected_result, :expected_status) do
-    nil                    | :scoped_naming_convention    | true  | :public   | nil       | :accept   | :ok
-    nil                    | :scoped_naming_convention    | false | :public   | nil       | :accept   | :ok
-    nil                    | :scoped_no_naming_convention | true  | :public   | nil       | :accept   | :ok
-    nil                    | :scoped_no_naming_convention | false | :public   | nil       | :accept   | :ok
-    nil                    | :unscoped                    | true  | :public   | nil       | :accept   | :ok
-    nil                    | :unscoped                    | false | :public   | nil       | :accept   | :ok
-    nil                    | :non_existing                | true  | :public   | nil       | :redirect | :redirected
-    nil                    | :non_existing                | false | :public   | nil       | :reject   | :not_found
-    nil                    | :scoped_naming_convention    | true  | :private  | nil       | :reject   | :not_found
-    nil                    | :scoped_naming_convention    | false | :private  | nil       | :reject   | :not_found
-    nil                    | :scoped_no_naming_convention | true  | :private  | nil       | :reject   | :not_found
-    nil                    | :scoped_no_naming_convention | false | :private  | nil       | :reject   | :not_found
-    nil                    | :unscoped                    | true  | :private  | nil       | :reject   | :not_found
-    nil                    | :unscoped                    | false | :private  | nil       | :reject   | :not_found
-    nil                    | :non_existing                | true  | :private  | nil       | :redirect | :redirected
-    nil                    | :non_existing                | false | :private  | nil       | :reject   | :not_found
-    nil                    | :scoped_naming_convention    | true  | :internal | nil       | :reject   | :not_found
-    nil                    | :scoped_naming_convention    | false | :internal | nil       | :reject   | :not_found
-    nil                    | :scoped_no_naming_convention | true  | :internal | nil       | :reject   | :not_found
-    nil                    | :scoped_no_naming_convention | false | :internal | nil       | :reject   | :not_found
-    nil                    | :unscoped                    | true  | :internal | nil       | :reject   | :not_found
-    nil                    | :unscoped                    | false | :internal | nil       | :reject   | :not_found
-    nil                    | :non_existing                | true  | :internal | nil       | :redirect | :redirected
-    nil                    | :non_existing                | false | :internal | nil       | :reject   | :not_found
+  shared_examples 'handling all conditions' do
+    where(:auth, :package_name_type, :request_forward, :visibility, :user_role, :expected_result, :expected_status) do
+      nil                    | :scoped_naming_convention    | true  | :public   | nil       | :accept   | :ok
+      nil                    | :scoped_naming_convention    | false | :public   | nil       | :accept   | :ok
+      nil                    | :scoped_no_naming_convention | true  | :public   | nil       | :accept   | :ok
+      nil                    | :scoped_no_naming_convention | false | :public   | nil       | :accept   | :ok
+      nil                    | :unscoped                    | true  | :public   | nil       | :accept   | :ok
+      nil                    | :unscoped                    | false | :public   | nil       | :accept   | :ok
+      nil                    | :non_existing                | true  | :public   | nil       | :redirect | :redirected
+      nil                    | :non_existing                | false | :public   | nil       | :reject   | :not_found
+      nil                    | :scoped_naming_convention    | true  | :private  | nil       | :reject   | :not_found
+      nil                    | :scoped_naming_convention    | false | :private  | nil       | :reject   | :not_found
+      nil                    | :scoped_no_naming_convention | true  | :private  | nil       | :reject   | :not_found
+      nil                    | :scoped_no_naming_convention | false | :private  | nil       | :reject   | :not_found
+      nil                    | :unscoped                    | true  | :private  | nil       | :reject   | :not_found
+      nil                    | :unscoped                    | false | :private  | nil       | :reject   | :not_found
+      nil                    | :non_existing                | true  | :private  | nil       | :redirect | :redirected
+      nil                    | :non_existing                | false | :private  | nil       | :reject   | :not_found
+      nil                    | :scoped_naming_convention    | true  | :internal | nil       | :reject   | :not_found
+      nil                    | :scoped_naming_convention    | false | :internal | nil       | :reject   | :not_found
+      nil                    | :scoped_no_naming_convention | true  | :internal | nil       | :reject   | :not_found
+      nil                    | :scoped_no_naming_convention | false | :internal | nil       | :reject   | :not_found
+      nil                    | :unscoped                    | true  | :internal | nil       | :reject   | :not_found
+      nil                    | :unscoped                    | false | :internal | nil       | :reject   | :not_found
+      nil                    | :non_existing                | true  | :internal | nil       | :redirect | :redirected
+      nil                    | :non_existing                | false | :internal | nil       | :reject   | :not_found
 
-    :oauth                 | :scoped_naming_convention    | true  | :public   | :guest    | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | true  | :public   | :reporter | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | false | :public   | :guest    | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | false | :public   | :reporter | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | true  | :public   | :guest    | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | true  | :public   | :reporter | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | false | :public   | :guest    | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | false | :public   | :reporter | :accept   | :ok
-    :oauth                 | :unscoped                    | true  | :public   | :guest    | :accept   | :ok
-    :oauth                 | :unscoped                    | true  | :public   | :reporter | :accept   | :ok
-    :oauth                 | :unscoped                    | false | :public   | :guest    | :accept   | :ok
-    :oauth                 | :unscoped                    | false | :public   | :reporter | :accept   | :ok
-    :oauth                 | :non_existing                | true  | :public   | :guest    | :redirect | :redirected
-    :oauth                 | :non_existing                | true  | :public   | :reporter | :redirect | :redirected
-    :oauth                 | :non_existing                | false | :public   | :guest    | :reject   | :not_found
-    :oauth                 | :non_existing                | false | :public   | :reporter | :reject   | :not_found
-    :oauth                 | :scoped_naming_convention    | true  | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :scoped_naming_convention    | true  | :private  | :reporter | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | false | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :scoped_naming_convention    | false | :private  | :reporter | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | true  | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :scoped_no_naming_convention | true  | :private  | :reporter | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | false | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :scoped_no_naming_convention | false | :private  | :reporter | :accept   | :ok
-    :oauth                 | :unscoped                    | true  | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :unscoped                    | true  | :private  | :reporter | :accept   | :ok
-    :oauth                 | :unscoped                    | false | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :unscoped                    | false | :private  | :reporter | :accept   | :ok
-    :oauth                 | :non_existing                | true  | :private  | :guest    | :redirect | :redirected
-    :oauth                 | :non_existing                | true  | :private  | :reporter | :redirect | :redirected
-    :oauth                 | :non_existing                | false | :private  | :guest    | :reject   | :forbidden
-    :oauth                 | :non_existing                | false | :private  | :reporter | :reject   | :not_found
-    :oauth                 | :scoped_naming_convention    | true  | :internal | :guest    | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | true  | :internal | :reporter | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | false | :internal | :guest    | :accept   | :ok
-    :oauth                 | :scoped_naming_convention    | false | :internal | :reporter | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | true  | :internal | :guest    | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | true  | :internal | :reporter | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | false | :internal | :guest    | :accept   | :ok
-    :oauth                 | :scoped_no_naming_convention | false | :internal | :reporter | :accept   | :ok
-    :oauth                 | :unscoped                    | true  | :internal | :guest    | :accept   | :ok
-    :oauth                 | :unscoped                    | true  | :internal | :reporter | :accept   | :ok
-    :oauth                 | :unscoped                    | false | :internal | :guest    | :accept   | :ok
-    :oauth                 | :unscoped                    | false | :internal | :reporter | :accept   | :ok
-    :oauth                 | :non_existing                | true  | :internal | :guest    | :redirect | :redirected
-    :oauth                 | :non_existing                | true  | :internal | :reporter | :redirect | :redirected
-    :oauth                 | :non_existing                | false | :internal | :guest    | :reject   | :not_found
-    :oauth                 | :non_existing                | false | :internal | :reporter | :reject   | :not_found
+      :oauth                 | :scoped_naming_convention    | true  | :public   | :guest    | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | true  | :public   | :reporter | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | false | :public   | :guest    | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | false | :public   | :reporter | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | true  | :public   | :guest    | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | true  | :public   | :reporter | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | false | :public   | :guest    | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | false | :public   | :reporter | :accept   | :ok
+      :oauth                 | :unscoped                    | true  | :public   | :guest    | :accept   | :ok
+      :oauth                 | :unscoped                    | true  | :public   | :reporter | :accept   | :ok
+      :oauth                 | :unscoped                    | false | :public   | :guest    | :accept   | :ok
+      :oauth                 | :unscoped                    | false | :public   | :reporter | :accept   | :ok
+      :oauth                 | :non_existing                | true  | :public   | :guest    | :redirect | :redirected
+      :oauth                 | :non_existing                | true  | :public   | :reporter | :redirect | :redirected
+      :oauth                 | :non_existing                | false | :public   | :guest    | :reject   | :not_found
+      :oauth                 | :non_existing                | false | :public   | :reporter | :reject   | :not_found
+      :oauth                 | :scoped_naming_convention    | true  | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :scoped_naming_convention    | true  | :private  | :reporter | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | false | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :scoped_naming_convention    | false | :private  | :reporter | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | true  | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :scoped_no_naming_convention | true  | :private  | :reporter | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | false | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :scoped_no_naming_convention | false | :private  | :reporter | :accept   | :ok
+      :oauth                 | :unscoped                    | true  | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :unscoped                    | true  | :private  | :reporter | :accept   | :ok
+      :oauth                 | :unscoped                    | false | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :unscoped                    | false | :private  | :reporter | :accept   | :ok
+      :oauth                 | :non_existing                | true  | :private  | :guest    | :redirect | :redirected
+      :oauth                 | :non_existing                | true  | :private  | :reporter | :redirect | :redirected
+      :oauth                 | :non_existing                | false | :private  | :guest    | :reject   | :forbidden
+      :oauth                 | :non_existing                | false | :private  | :reporter | :reject   | :not_found
+      :oauth                 | :scoped_naming_convention    | true  | :internal | :guest    | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | true  | :internal | :reporter | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | false | :internal | :guest    | :accept   | :ok
+      :oauth                 | :scoped_naming_convention    | false | :internal | :reporter | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | true  | :internal | :guest    | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | true  | :internal | :reporter | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | false | :internal | :guest    | :accept   | :ok
+      :oauth                 | :scoped_no_naming_convention | false | :internal | :reporter | :accept   | :ok
+      :oauth                 | :unscoped                    | true  | :internal | :guest    | :accept   | :ok
+      :oauth                 | :unscoped                    | true  | :internal | :reporter | :accept   | :ok
+      :oauth                 | :unscoped                    | false | :internal | :guest    | :accept   | :ok
+      :oauth                 | :unscoped                    | false | :internal | :reporter | :accept   | :ok
+      :oauth                 | :non_existing                | true  | :internal | :guest    | :redirect | :redirected
+      :oauth                 | :non_existing                | true  | :internal | :reporter | :redirect | :redirected
+      :oauth                 | :non_existing                | false | :internal | :guest    | :reject   | :not_found
+      :oauth                 | :non_existing                | false | :internal | :reporter | :reject   | :not_found
 
-    :personal_access_token | :scoped_naming_convention    | true  | :public   | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | true  | :public   | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | false | :public   | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | false | :public   | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | true  | :public   | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | true  | :public   | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | false | :public   | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | false | :public   | :reporter | :accept   | :ok
-    :personal_access_token | :unscoped                    | true  | :public   | :guest    | :accept   | :ok
-    :personal_access_token | :unscoped                    | true  | :public   | :reporter | :accept   | :ok
-    :personal_access_token | :unscoped                    | false | :public   | :guest    | :accept   | :ok
-    :personal_access_token | :unscoped                    | false | :public   | :reporter | :accept   | :ok
-    :personal_access_token | :non_existing                | true  | :public   | :guest    | :redirect | :redirected
-    :personal_access_token | :non_existing                | true  | :public   | :reporter | :redirect | :redirected
-    :personal_access_token | :non_existing                | false | :public   | :guest    | :reject   | :not_found
-    :personal_access_token | :non_existing                | false | :public   | :reporter | :reject   | :not_found
-    :personal_access_token | :scoped_naming_convention    | true  | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :scoped_naming_convention    | true  | :private  | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | false | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :scoped_naming_convention    | false | :private  | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | true  | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :scoped_no_naming_convention | true  | :private  | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | false | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :scoped_no_naming_convention | false | :private  | :reporter | :accept   | :ok
-    :personal_access_token | :unscoped                    | true  | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :unscoped                    | true  | :private  | :reporter | :accept   | :ok
-    :personal_access_token | :unscoped                    | false | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :unscoped                    | false | :private  | :reporter | :accept   | :ok
-    :personal_access_token | :non_existing                | true  | :private  | :guest    | :redirect | :redirected
-    :personal_access_token | :non_existing                | true  | :private  | :reporter | :redirect | :redirected
-    :personal_access_token | :non_existing                | false | :private  | :guest    | :reject   | :forbidden
-    :personal_access_token | :non_existing                | false | :private  | :reporter | :reject   | :not_found
-    :personal_access_token | :scoped_naming_convention    | true  | :internal | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | true  | :internal | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | false | :internal | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_naming_convention    | false | :internal | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | true  | :internal | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | true  | :internal | :reporter | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | false | :internal | :guest    | :accept   | :ok
-    :personal_access_token | :scoped_no_naming_convention | false | :internal | :reporter | :accept   | :ok
-    :personal_access_token | :unscoped                    | true  | :internal | :guest    | :accept   | :ok
-    :personal_access_token | :unscoped                    | true  | :internal | :reporter | :accept   | :ok
-    :personal_access_token | :unscoped                    | false | :internal | :guest    | :accept   | :ok
-    :personal_access_token | :unscoped                    | false | :internal | :reporter | :accept   | :ok
-    :personal_access_token | :non_existing                | true  | :internal | :guest    | :redirect | :redirected
-    :personal_access_token | :non_existing                | true  | :internal | :reporter | :redirect | :redirected
-    :personal_access_token | :non_existing                | false | :internal | :guest    | :reject   | :not_found
-    :personal_access_token | :non_existing                | false | :internal | :reporter | :reject   | :not_found
+      :personal_access_token | :scoped_naming_convention    | true  | :public   | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | true  | :public   | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | false | :public   | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | false | :public   | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | true  | :public   | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | true  | :public   | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | false | :public   | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | false | :public   | :reporter | :accept   | :ok
+      :personal_access_token | :unscoped                    | true  | :public   | :guest    | :accept   | :ok
+      :personal_access_token | :unscoped                    | true  | :public   | :reporter | :accept   | :ok
+      :personal_access_token | :unscoped                    | false | :public   | :guest    | :accept   | :ok
+      :personal_access_token | :unscoped                    | false | :public   | :reporter | :accept   | :ok
+      :personal_access_token | :non_existing                | true  | :public   | :guest    | :redirect | :redirected
+      :personal_access_token | :non_existing                | true  | :public   | :reporter | :redirect | :redirected
+      :personal_access_token | :non_existing                | false | :public   | :guest    | :reject   | :not_found
+      :personal_access_token | :non_existing                | false | :public   | :reporter | :reject   | :not_found
+      :personal_access_token | :scoped_naming_convention    | true  | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :scoped_naming_convention    | true  | :private  | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | false | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :scoped_naming_convention    | false | :private  | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | true  | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :scoped_no_naming_convention | true  | :private  | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | false | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :scoped_no_naming_convention | false | :private  | :reporter | :accept   | :ok
+      :personal_access_token | :unscoped                    | true  | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :unscoped                    | true  | :private  | :reporter | :accept   | :ok
+      :personal_access_token | :unscoped                    | false | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :unscoped                    | false | :private  | :reporter | :accept   | :ok
+      :personal_access_token | :non_existing                | true  | :private  | :guest    | :redirect | :redirected
+      :personal_access_token | :non_existing                | true  | :private  | :reporter | :redirect | :redirected
+      :personal_access_token | :non_existing                | false | :private  | :guest    | :reject   | :forbidden
+      :personal_access_token | :non_existing                | false | :private  | :reporter | :reject   | :not_found
+      :personal_access_token | :scoped_naming_convention    | true  | :internal | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | true  | :internal | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | false | :internal | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_naming_convention    | false | :internal | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | true  | :internal | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | true  | :internal | :reporter | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | false | :internal | :guest    | :accept   | :ok
+      :personal_access_token | :scoped_no_naming_convention | false | :internal | :reporter | :accept   | :ok
+      :personal_access_token | :unscoped                    | true  | :internal | :guest    | :accept   | :ok
+      :personal_access_token | :unscoped                    | true  | :internal | :reporter | :accept   | :ok
+      :personal_access_token | :unscoped                    | false | :internal | :guest    | :accept   | :ok
+      :personal_access_token | :unscoped                    | false | :internal | :reporter | :accept   | :ok
+      :personal_access_token | :non_existing                | true  | :internal | :guest    | :redirect | :redirected
+      :personal_access_token | :non_existing                | true  | :internal | :reporter | :redirect | :redirected
+      :personal_access_token | :non_existing                | false | :internal | :guest    | :reject   | :not_found
+      :personal_access_token | :non_existing                | false | :internal | :reporter | :reject   | :not_found
 
-    :job_token             | :scoped_naming_convention    | true  | :public   | :developer | :accept   | :ok
-    :job_token             | :scoped_naming_convention    | false | :public   | :developer | :accept   | :ok
-    :job_token             | :scoped_no_naming_convention | true  | :public   | :developer | :accept   | :ok
-    :job_token             | :scoped_no_naming_convention | false | :public   | :developer | :accept   | :ok
-    :job_token             | :unscoped                    | true  | :public   | :developer | :accept   | :ok
-    :job_token             | :unscoped                    | false | :public   | :developer | :accept   | :ok
-    :job_token             | :non_existing                | true  | :public   | :developer | :redirect | :redirected
-    :job_token             | :non_existing                | false | :public   | :developer | :reject   | :not_found
-    :job_token             | :scoped_naming_convention    | true  | :private  | :developer | :accept   | :ok
-    :job_token             | :scoped_naming_convention    | false | :private  | :developer | :accept   | :ok
-    :job_token             | :scoped_no_naming_convention | true  | :private  | :developer | :accept   | :ok
-    :job_token             | :scoped_no_naming_convention | false | :private  | :developer | :accept   | :ok
-    :job_token             | :unscoped                    | true  | :private  | :developer | :accept   | :ok
-    :job_token             | :unscoped                    | false | :private  | :developer | :accept   | :ok
-    :job_token             | :non_existing                | true  | :private  | :developer | :redirect | :redirected
-    :job_token             | :non_existing                | false | :private  | :developer | :reject   | :not_found
-    :job_token             | :scoped_naming_convention    | true  | :internal | :developer | :accept   | :ok
-    :job_token             | :scoped_naming_convention    | false | :internal | :developer | :accept   | :ok
-    :job_token             | :scoped_no_naming_convention | true  | :internal | :developer | :accept   | :ok
-    :job_token             | :scoped_no_naming_convention | false | :internal | :developer | :accept   | :ok
-    :job_token             | :unscoped                    | true  | :internal | :developer | :accept   | :ok
-    :job_token             | :unscoped                    | false | :internal | :developer | :accept   | :ok
-    :job_token             | :non_existing                | true  | :internal | :developer | :redirect | :redirected
-    :job_token             | :non_existing                | false | :internal | :developer | :reject   | :not_found
+      :job_token             | :scoped_naming_convention    | true  | :public   | :developer | :accept   | :ok
+      :job_token             | :scoped_naming_convention    | false | :public   | :developer | :accept   | :ok
+      :job_token             | :scoped_no_naming_convention | true  | :public   | :developer | :accept   | :ok
+      :job_token             | :scoped_no_naming_convention | false | :public   | :developer | :accept   | :ok
+      :job_token             | :unscoped                    | true  | :public   | :developer | :accept   | :ok
+      :job_token             | :unscoped                    | false | :public   | :developer | :accept   | :ok
+      :job_token             | :non_existing                | true  | :public   | :developer | :redirect | :redirected
+      :job_token             | :non_existing                | false | :public   | :developer | :reject   | :not_found
+      :job_token             | :scoped_naming_convention    | true  | :private  | :developer | :accept   | :ok
+      :job_token             | :scoped_naming_convention    | false | :private  | :developer | :accept   | :ok
+      :job_token             | :scoped_no_naming_convention | true  | :private  | :developer | :accept   | :ok
+      :job_token             | :scoped_no_naming_convention | false | :private  | :developer | :accept   | :ok
+      :job_token             | :unscoped                    | true  | :private  | :developer | :accept   | :ok
+      :job_token             | :unscoped                    | false | :private  | :developer | :accept   | :ok
+      :job_token             | :non_existing                | true  | :private  | :developer | :redirect | :redirected
+      :job_token             | :non_existing                | false | :private  | :developer | :reject   | :not_found
+      :job_token             | :scoped_naming_convention    | true  | :internal | :developer | :accept   | :ok
+      :job_token             | :scoped_naming_convention    | false | :internal | :developer | :accept   | :ok
+      :job_token             | :scoped_no_naming_convention | true  | :internal | :developer | :accept   | :ok
+      :job_token             | :scoped_no_naming_convention | false | :internal | :developer | :accept   | :ok
+      :job_token             | :unscoped                    | true  | :internal | :developer | :accept   | :ok
+      :job_token             | :unscoped                    | false | :internal | :developer | :accept   | :ok
+      :job_token             | :non_existing                | true  | :internal | :developer | :redirect | :redirected
+      :job_token             | :non_existing                | false | :internal | :developer | :reject   | :not_found
 
-    :deploy_token          | :scoped_naming_convention    | true  | :public   | nil        | :accept   | :ok
-    :deploy_token          | :scoped_naming_convention    | false | :public   | nil        | :accept   | :ok
-    :deploy_token          | :scoped_no_naming_convention | true  | :public   | nil        | :accept   | :ok
-    :deploy_token          | :scoped_no_naming_convention | false | :public   | nil        | :accept   | :ok
-    :deploy_token          | :unscoped                    | true  | :public   | nil        | :accept   | :ok
-    :deploy_token          | :unscoped                    | false | :public   | nil        | :accept   | :ok
-    :deploy_token          | :non_existing                | true  | :public   | nil        | :redirect | :redirected
-    :deploy_token          | :non_existing                | false | :public   | nil        | :reject   | :not_found
-    :deploy_token          | :scoped_naming_convention    | true  | :private  | nil        | :accept   | :ok
-    :deploy_token          | :scoped_naming_convention    | false | :private  | nil        | :accept   | :ok
-    :deploy_token          | :scoped_no_naming_convention | true  | :private  | nil        | :accept   | :ok
-    :deploy_token          | :scoped_no_naming_convention | false | :private  | nil        | :accept   | :ok
-    :deploy_token          | :unscoped                    | true  | :private  | nil        | :accept   | :ok
-    :deploy_token          | :unscoped                    | false | :private  | nil        | :accept   | :ok
-    :deploy_token          | :non_existing                | true  | :private  | nil        | :redirect | :redirected
-    :deploy_token          | :non_existing                | false | :private  | nil        | :reject   | :not_found
-    :deploy_token          | :scoped_naming_convention    | true  | :internal | nil        | :accept   | :ok
-    :deploy_token          | :scoped_naming_convention    | false | :internal | nil        | :accept   | :ok
-    :deploy_token          | :scoped_no_naming_convention | true  | :internal | nil        | :accept   | :ok
-    :deploy_token          | :scoped_no_naming_convention | false | :internal | nil        | :accept   | :ok
-    :deploy_token          | :unscoped                    | true  | :internal | nil        | :accept   | :ok
-    :deploy_token          | :unscoped                    | false | :internal | nil        | :accept   | :ok
-    :deploy_token          | :non_existing                | true  | :internal | nil        | :redirect | :redirected
-    :deploy_token          | :non_existing                | false | :internal | nil        | :reject   | :not_found
+      :deploy_token          | :scoped_naming_convention    | true  | :public   | nil        | :accept   | :ok
+      :deploy_token          | :scoped_naming_convention    | false | :public   | nil        | :accept   | :ok
+      :deploy_token          | :scoped_no_naming_convention | true  | :public   | nil        | :accept   | :ok
+      :deploy_token          | :scoped_no_naming_convention | false | :public   | nil        | :accept   | :ok
+      :deploy_token          | :unscoped                    | true  | :public   | nil        | :accept   | :ok
+      :deploy_token          | :unscoped                    | false | :public   | nil        | :accept   | :ok
+      :deploy_token          | :non_existing                | true  | :public   | nil        | :redirect | :redirected
+      :deploy_token          | :non_existing                | false | :public   | nil        | :reject   | :not_found
+      :deploy_token          | :scoped_naming_convention    | true  | :private  | nil        | :accept   | :ok
+      :deploy_token          | :scoped_naming_convention    | false | :private  | nil        | :accept   | :ok
+      :deploy_token          | :scoped_no_naming_convention | true  | :private  | nil        | :accept   | :ok
+      :deploy_token          | :scoped_no_naming_convention | false | :private  | nil        | :accept   | :ok
+      :deploy_token          | :unscoped                    | true  | :private  | nil        | :accept   | :ok
+      :deploy_token          | :unscoped                    | false | :private  | nil        | :accept   | :ok
+      :deploy_token          | :non_existing                | true  | :private  | nil        | :redirect | :redirected
+      :deploy_token          | :non_existing                | false | :private  | nil        | :reject   | :not_found
+      :deploy_token          | :scoped_naming_convention    | true  | :internal | nil        | :accept   | :ok
+      :deploy_token          | :scoped_naming_convention    | false | :internal | nil        | :accept   | :ok
+      :deploy_token          | :scoped_no_naming_convention | true  | :internal | nil        | :accept   | :ok
+      :deploy_token          | :scoped_no_naming_convention | false | :internal | nil        | :accept   | :ok
+      :deploy_token          | :unscoped                    | true  | :internal | nil        | :accept   | :ok
+      :deploy_token          | :unscoped                    | false | :internal | nil        | :accept   | :ok
+      :deploy_token          | :non_existing                | true  | :internal | nil        | :redirect | :redirected
+      :deploy_token          | :non_existing                | false | :internal | nil        | :reject   | :not_found
+    end
+
+    with_them do
+      include_context 'set package name from package name type'
+
+      let(:headers) do
+        case auth
+        when :oauth
+          build_token_auth_header(token.token)
+        when :personal_access_token
+          build_token_auth_header(personal_access_token.token)
+        when :job_token
+          build_token_auth_header(job.token)
+        when :deploy_token
+          build_token_auth_header(deploy_token.token)
+        else
+          {}
+        end
+      end
+
+      before do
+        project.send("add_#{user_role}", user) if user_role
+        project.update!(visibility: visibility.to_s)
+        package.update!(name: package_name) unless package_name == 'non-existing-package'
+        stub_application_setting(npm_package_requests_forwarding: request_forward)
+      end
+
+      example_name = "#{params[:expected_result]} metadata request"
+      status = params[:expected_status]
+
+      if scope == :instance && params[:package_name_type] != :scoped_naming_convention
+        if params[:request_forward]
+          example_name = 'redirect metadata request'
+          status = :redirected
+        else
+          example_name = 'reject metadata request'
+          status = :not_found
+        end
+      end
+
+      it_behaves_like example_name, status: status
+    end
   end
 
-  with_them do
-    include_context 'set package name from package name type'
+  context 'with a group namespace' do
+    it_behaves_like 'handling all conditions'
+  end
 
-    let(:headers) do
-      case auth
-      when :oauth
-        build_token_auth_header(token.token)
-      when :personal_access_token
-        build_token_auth_header(personal_access_token.token)
-      when :job_token
-        build_token_auth_header(job.token)
-      when :deploy_token
-        build_token_auth_header(deploy_token.token)
-      else
-        {}
-      end
+  if scope != :project
+    context 'with a user namespace' do
+      let_it_be(:namespace) { user.namespace }
+
+      it_behaves_like 'handling all conditions'
     end
-
-    before do
-      project.send("add_#{user_role}", user) if user_role
-      project.update!(visibility: visibility.to_s)
-      package.update!(name: package_name) unless package_name == 'non-existing-package'
-      stub_application_setting(npm_package_requests_forwarding: request_forward)
-    end
-
-    example_name = "#{params[:expected_result]} metadata request"
-    status = params[:expected_status]
-
-    if scope == :instance && params[:package_name_type] != :scoped_naming_convention
-      if params[:request_forward]
-        example_name = 'redirect metadata request'
-        status = :redirected
-      else
-        example_name = 'reject metadata request'
-        status = :not_found
-      end
-    end
-
-    it_behaves_like example_name, status: status
   end
 
   context 'with a developer' do
@@ -371,16 +385,30 @@ RSpec.shared_examples 'handling get dist tags requests' do |scope: :project|
     end
   end
 
-  context 'with oauth token' do
-    let(:headers) { build_token_auth_header(token.token) }
+  shared_examples 'handling all conditions' do
+    context 'with oauth token' do
+      let(:headers) { build_token_auth_header(token.token) }
 
-    it_behaves_like 'handling different package names, visibilities and user roles'
+      it_behaves_like 'handling different package names, visibilities and user roles'
+    end
+
+    context 'with personal access token' do
+      let(:headers) { build_token_auth_header(personal_access_token.token) }
+
+      it_behaves_like 'handling different package names, visibilities and user roles'
+    end
   end
 
-  context 'with personal access token' do
-    let(:headers) { build_token_auth_header(personal_access_token.token) }
+  context 'with a group namespace' do
+    it_behaves_like 'handling all conditions'
+  end
 
-    it_behaves_like 'handling different package names, visibilities and user roles'
+  if scope != :project
+    context 'with a user namespace' do
+      let_it_be(:namespace) { user.namespace }
+
+      it_behaves_like 'handling all conditions'
+    end
   end
 end
 
@@ -467,16 +495,30 @@ RSpec.shared_examples 'handling create dist tag requests' do |scope: :project|
     end
   end
 
-  context 'with oauth token' do
-    let(:headers) { build_token_auth_header(token.token) }
+  shared_examples 'handling all conditions' do
+    context 'with oauth token' do
+      let(:headers) { build_token_auth_header(token.token) }
 
-    it_behaves_like 'handling different package names, visibilities and user roles'
+      it_behaves_like 'handling different package names, visibilities and user roles'
+    end
+
+    context 'with personal access token' do
+      let(:headers) { build_token_auth_header(personal_access_token.token) }
+
+      it_behaves_like 'handling different package names, visibilities and user roles'
+    end
   end
 
-  context 'with personal access token' do
-    let(:headers) { build_token_auth_header(personal_access_token.token) }
+  context 'with a group namespace' do
+    it_behaves_like 'handling all conditions'
+  end
 
-    it_behaves_like 'handling different package names, visibilities and user roles'
+  if scope != :project
+    context 'with a user namespace' do
+      let_it_be(:namespace) { user.namespace }
+
+      it_behaves_like 'handling all conditions'
+    end
   end
 end
 
@@ -561,15 +603,29 @@ RSpec.shared_examples 'handling delete dist tag requests' do |scope: :project|
     end
   end
 
-  context 'with oauth token' do
-    let(:headers) { build_token_auth_header(token.token) }
+  shared_examples 'handling all conditions' do
+    context 'with oauth token' do
+      let(:headers) { build_token_auth_header(token.token) }
 
-    it_behaves_like 'handling different package names, visibilities and user roles'
+      it_behaves_like 'handling different package names, visibilities and user roles'
+    end
+
+    context 'with personal access token' do
+      let(:headers) { build_token_auth_header(personal_access_token.token) }
+
+      it_behaves_like 'handling different package names, visibilities and user roles'
+    end
   end
 
-  context 'with personal access token' do
-    let(:headers) { build_token_auth_header(personal_access_token.token) }
+  context 'with a group namespace' do
+    it_behaves_like 'handling all conditions'
+  end
 
-    it_behaves_like 'handling different package names, visibilities and user roles'
+  if scope != :project
+    context 'with a user namespace' do
+      let_it_be(:namespace) { user.namespace }
+
+      it_behaves_like 'handling all conditions'
+    end
   end
 end
diff --git a/spec/support/shared_examples/requests/api/rubygems_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/rubygems_packages_shared_examples.rb
new file mode 100644
index 00000000000..2e8e970a019
--- /dev/null
+++ b/spec/support/shared_examples/requests/api/rubygems_packages_shared_examples.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'rejects rubygems packages access' do |user_type, status, add_member = true|
+  context "for user type #{user_type}" do
+    before do
+      project.send("add_#{user_type}", user) if add_member && user_type != :anonymous
+    end
+
+    it_behaves_like 'returning response status', status
+  end
+end
+
+RSpec.shared_examples 'process rubygems workhorse authorization' do |user_type, status, add_member = true|
+  context "for user type #{user_type}" do
+    before do
+      project.send("add_#{user_type}", user) if add_member && user_type != :anonymous
+    end
+
+    it_behaves_like 'returning response status', status
+
+    it 'has the proper content type' do
+      subject
+
+      expect(response.media_type).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
+    end
+
+    context 'with a request that bypassed gitlab-workhorse' do
+      let(:headers) do
+        { 'HTTP_AUTHORIZATION' => personal_access_token.token }
+          .merge(workhorse_headers)
+          .tap { |h| h.delete(Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER) }
+      end
+
+      before do
+        project.add_maintainer(user)
+      end
+
+      it_behaves_like 'returning response status', :forbidden
+    end
+  end
+end
+
+RSpec.shared_examples 'process rubygems upload' do |user_type, status, add_member = true|
+  RSpec.shared_examples 'creates rubygems package files' do
+    it 'creates package files', :aggregate_failures do
+      expect { subject }
+          .to change { project.packages.count }.by(1)
+          .and change { Packages::PackageFile.count }.by(1)
+      expect(response).to have_gitlab_http_status(status)
+
+      package_file = project.packages.last.package_files.reload.last
+      expect(package_file.file_name).to eq('package.gem')
+    end
+  end
+
+  context "for user type #{user_type}" do
+    before do
+      project.send("add_#{user_type}", user) if add_member && user_type != :anonymous
+    end
+
+    context 'with object storage disabled' do
+      before do
+        stub_package_file_object_storage(enabled: false)
+      end
+
+      context 'without a file from workhorse' do
+        let(:send_rewritten_field) { false }
+
+        it_behaves_like 'returning response status', :bad_request
+      end
+
+      context 'with correct params' do
+        it_behaves_like 'package workhorse uploads'
+        it_behaves_like 'creates rubygems package files'
+        it_behaves_like 'a package tracking event', 'API::RubygemPackages', 'push_package'
+      end
+    end
+
+    context 'with object storage enabled' do
+      let(:tmp_object) do
+        fog_connection.directories.new(key: 'packages').files.create( # rubocop:disable Rails/SaveBang
+          key: "tmp/uploads/#{file_name}",
+          body: 'content'
+        )
+      end
+
+      let(:fog_file) { fog_to_uploaded_file(tmp_object) }
+      let(:params) { { file: fog_file, 'file.remote_id' => file_name } }
+
+      context 'and direct upload enabled' do
+        let(:fog_connection) do
+          stub_package_file_object_storage(direct_upload: true)
+        end
+
+        it_behaves_like 'creates rubygems package files'
+
+        ['123123', '../../123123'].each do |remote_id|
+          context "with invalid remote_id: #{remote_id}" do
+            let(:params) do
+              {
+                file: fog_file,
+                'file.remote_id' => remote_id
+              }
+            end
+
+            it_behaves_like 'returning response status', :forbidden
+          end
+        end
+      end
+
+      context 'and direct upload disabled' do
+        context 'and background upload disabled' do
+          let(:fog_connection) do
+            stub_package_file_object_storage(direct_upload: false, background_upload: false)
+          end
+
+          it_behaves_like 'creates rubygems package files'
+        end
+
+        context 'and background upload enabled' do
+          let(:fog_connection) do
+            stub_package_file_object_storage(direct_upload: false, background_upload: true)
+          end
+
+          it_behaves_like 'creates rubygems package files'
+        end
+      end
+    end
+  end
+end
diff --git a/yarn.lock b/yarn.lock
index c85bc1311a2..9009799ec07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
@@ -242,7 +249,7 @@
     "@babel/traverse" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/highlight@^7.12.13":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
   integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
@@ -861,10 +868,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e"
   integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg==
 
-"@gitlab/eslint-plugin@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.0.0.tgz#e8d30fd98e2102f417617d0c60ef1810520a8ac6"
-  integrity sha512-hTTdcyxN3Ead2FaNwaiPg9sv2YbCDrlyAgKAPV7dit2uPqR0nkIlng9JPNMIixTXBrJ/Y+VvjIRrKKNYBubocw==
+"@gitlab/eslint-plugin@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.1.0.tgz#a98ac4219da3316d30ee717ef0603c8fa0c4d5d8"
+  integrity sha512-PU2ldrF59dhunMcEMzSqwG9RfTZRPmW8/pXwcXhJNi61g9lkdHQn8CiQGazepDlBwjEHl5habv/cs52gUc06+w==
   dependencies:
     babel-eslint "^10.0.3"
     eslint-config-airbnb-base "^14.2.1"
@@ -1179,6 +1186,58 @@
   resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz#9a48df6511cb2b472c9f596c1f37dc0af022e751"
   integrity sha512-kQNKyM4ePAc4u9eR1c4OqrbAHH+3SJXt++8izIjeaZeg+P7yBtgoF/dogMD/JPPowNC74ACFpM/4op0Ggp/fPw==
 
+"@sentry/browser@^5.22.3":
+  version "5.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3"
+  integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw==
+  dependencies:
+    "@sentry/core" "5.30.0"
+    "@sentry/types" "5.30.0"
+    "@sentry/utils" "5.30.0"
+    tslib "^1.9.3"
+
+"@sentry/core@5.30.0":
+  version "5.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3"
+  integrity sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==
+  dependencies:
+    "@sentry/hub" "5.30.0"
+    "@sentry/minimal" "5.30.0"
+    "@sentry/types" "5.30.0"
+    "@sentry/utils" "5.30.0"
+    tslib "^1.9.3"
+
+"@sentry/hub@5.30.0":
+  version "5.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz#2453be9b9cb903404366e198bd30c7ca74cdc100"
+  integrity sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==
+  dependencies:
+    "@sentry/types" "5.30.0"
+    "@sentry/utils" "5.30.0"
+    tslib "^1.9.3"
+
+"@sentry/minimal@5.30.0":
+  version "5.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz#ce3d3a6a273428e0084adcb800bc12e72d34637b"
+  integrity sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==
+  dependencies:
+    "@sentry/hub" "5.30.0"
+    "@sentry/types" "5.30.0"
+    tslib "^1.9.3"
+
+"@sentry/types@5.30.0":
+  version "5.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz#19709bbe12a1a0115bc790b8942917da5636f402"
+  integrity sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==
+
+"@sentry/utils@5.30.0":
+  version "5.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz#9a5bd7ccff85ccfe7856d493bffa64cabc41e980"
+  integrity sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==
+  dependencies:
+    "@sentry/types" "5.30.0"
+    tslib "^1.9.3"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -4732,12 +4791,12 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@7.19.0:
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41"
-  integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==
+eslint@7.20.0:
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7"
+  integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
+    "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.3.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
@@ -4749,7 +4808,7 @@ eslint@7.19.0:
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^2.0.0"
     espree "^7.3.1"
-    esquery "^1.2.0"
+    esquery "^1.4.0"
     esutils "^2.0.2"
     file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
@@ -4798,10 +4857,10 @@ esprima@^4.0.0, esprima@^4.0.1:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1, esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+esquery@^1.0.1, esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"