diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 815d5ca06d530cd0884a6b81fdabdcf82bfc9b5a..398935591556811c66955d155a2cd654a9af3123 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.19.0
+1.20.0
diff --git a/Gemfile b/Gemfile
index 18519fb17203b49585f25e9ac07de4e1d69c6394..c33975966cbebe0734aca55732efaae058bd7f63 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,7 +149,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.19.0'
+gem 'rouge', '~> 3.20.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe872402b041efbabc9b362960f6a78f8a048665..be2d98cb0632ba635cfeb1093f73abc2f45be86f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -891,7 +891,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.19.0)
+    rouge (3.20.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -1004,11 +1004,11 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
-    sidekiq (5.2.7)
+    sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
+      rack (~> 2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+      redis (>= 3.3.5, < 4.2)
     sidekiq-cron (1.0.4)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
@@ -1356,7 +1356,7 @@ DEPENDENCIES
   request_store (~> 1.5)
   responders (~> 3.0)
   retriable (~> 3.1.2)
-  rouge (~> 3.19.0)
+  rouge (~> 3.20.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 4.0.0)
diff --git a/app/assets/javascripts/alert_management/components/alert_management_list.vue b/app/assets/javascripts/alert_management/components/alert_management_list.vue
index 3b5af5b406b26f0cc93d2097597252de6540b801..b7cd28de8073c77f3b2812cf4916c02f5f85546a 100644
--- a/app/assets/javascripts/alert_management/components/alert_management_list.vue
+++ b/app/assets/javascripts/alert_management/components/alert_management_list.vue
@@ -32,7 +32,8 @@ import {
 } from '../constants';
 import AlertStatus from './alert_status.vue';
 
-const tdClass = 'table-col gl-display-flex d-md-table-cell gl-align-items-center';
+const tdClass =
+  'table-col gl-display-flex d-md-table-cell gl-align-items-center gl-white-space-nowrap';
 const thClass = 'gl-hover-bg-blue-50';
 const bodyTrClass =
   'gl-border-1 gl-border-t-solid gl-border-gray-100 gl-hover-bg-blue-50 gl-hover-cursor-pointer gl-hover-border-b-solid gl-hover-border-blue-200';
@@ -60,40 +61,34 @@ export default {
       key: 'severity',
       label: s__('AlertManagement|Severity'),
       tdClass: `${tdClass} rounded-top text-capitalize`,
-      thClass,
+      thClass: `${thClass} gl-w-eighth`,
       sortable: true,
     },
     {
       key: 'startedAt',
       label: s__('AlertManagement|Start time'),
-      thClass: `${thClass} js-started-at`,
-      tdClass,
-      sortable: true,
-    },
-    {
-      key: 'endedAt',
-      label: s__('AlertManagement|End time'),
-      thClass,
+      thClass: `${thClass} js-started-at w-15p`,
       tdClass,
       sortable: true,
     },
     {
       key: 'title',
       label: s__('AlertManagement|Alert'),
-      thClass: `${thClass} w-30p gl-pointer-events-none`,
+      thClass: `${thClass} gl-pointer-events-none`,
       tdClass,
       sortable: false,
     },
     {
       key: 'eventCount',
       label: s__('AlertManagement|Events'),
-      thClass: `${thClass} text-right gl-pr-9 w-3rem`,
+      thClass: `${thClass} text-right gl-w-12`,
       tdClass: `${tdClass} text-md-right`,
       sortable: true,
     },
     {
       key: 'assignees',
       label: s__('AlertManagement|Assignees'),
+      thClass: 'gl-w-eighth',
       tdClass,
     },
     {
@@ -377,6 +372,7 @@ export default {
         :sort-desc.sync="sortDesc"
         :sort-by.sync="sortBy"
         sort-icon-left
+        fixed
         @row-clicked="navigateToAlertDetails"
         @sort-changed="fetchSortedData"
       >
@@ -399,16 +395,12 @@ export default {
           <time-ago v-if="item.startedAt" :time="item.startedAt" />
         </template>
 
-        <template #cell(endedAt)="{ item }">
-          <time-ago v-if="item.endedAt" :time="item.endedAt" />
-        </template>
-
         <template #cell(eventCount)="{ item }">
           {{ item.eventCount }}
         </template>
 
         <template #cell(title)="{ item }">
-          <div class="gl-max-w-full text-truncate">{{ item.title }}</div>
+          <div class="gl-max-w-full text-truncate" :title="item.title">{{ item.title }}</div>
         </template>
 
         <template #cell(assignees)="{ item }">
diff --git a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
index cbe7e169be3a586f7ce8651ee96551747e149380..83ce79c986bc2138dd728017038ab1a1ae17acab 100644
--- a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
+++ b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
@@ -8,6 +8,7 @@ fragment AlertDetailItem on AlertManagementAlert {
   service
   description
   updatedAt
+  endedAt
   details
   notes {
     nodes {
diff --git a/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql
index 746c4435f384bc5697ab9d7da737ef140088de5d..c37f29c74fce05173b1cfffd121481dfe38d375e 100644
--- a/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql
+++ b/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql
@@ -4,7 +4,6 @@ fragment AlertListItem on AlertManagementAlert {
   severity
   status
   startedAt
-  endedAt
   eventCount
   issueIid
   assignees {
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue b/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue
index a53b1b06be94175f718c7a02442898be775eb206..8418c0f66ac942368bb802da8b711dd40e248e00 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue
@@ -1,11 +1,10 @@
 <script>
-import { GlToggle, GlSprintf } from '@gitlab/ui';
+import { GlToggle } from '@gitlab/ui';
 import AccessorUtilities from '~/lib/utils/accessor';
 import { disableShortcuts, enableShortcuts, shouldDisableShortcuts } from './shortcuts_toggle';
 
 export default {
   components: {
-    GlSprintf,
     GlToggle,
   },
   data() {
@@ -32,29 +31,10 @@ export default {
     <gl-toggle
       v-model="shortcutsEnabled"
       aria-describedby="shortcutsToggle"
-      class="prepend-left-10 mb-0"
-      label-position="right"
+      label="Keyboard shortcuts"
+      label-position="left"
       @change="onChange"
-    >
-      <template #labelOn>
-        <gl-sprintf
-          :message="__('%{screenreaderOnlyStart}Keyboard shorcuts%{screenreaderOnlyEnd} Enabled')"
-        >
-          <template #screenreaderOnly="{ content }">
-            <span class="sr-only">{{ content }}</span>
-          </template>
-        </gl-sprintf>
-      </template>
-      <template #labelOff>
-        <gl-sprintf
-          :message="__('%{screenreaderOnlyStart}Keyboard shorcuts%{screenreaderOnlyEnd} Disabled')"
-        >
-          <template #screenreaderOnly="{ content }">
-            <span class="sr-only">{{ content }}</span>
-          </template>
-        </gl-sprintf>
-      </template>
-    </gl-toggle>
+    />
     <div id="shortcutsToggle" class="sr-only">{{ __('Enable or disable keyboard shortcuts') }}</div>
   </div>
 </template>
diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
index 54f5468bdd0ce89a8585e1b2e5750d71100ac907..87c3225085f351ae76b5570ef7cf56d37da47c97 100644
--- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
+++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
@@ -198,13 +198,7 @@ export default {
             </strong>
           </p>
           <div class="form-check form-check-inline mt-3">
-            <gl-toggle
-              v-model="modSecurityEnabled"
-              :label-on="__('Enabled')"
-              :label-off="__('Disabled')"
-              :disabled="saveButtonDisabled"
-              label-position="right"
-            />
+            <gl-toggle v-model="modSecurityEnabled" :disabled="saveButtonDisabled" />
           </div>
           <div
             v-if="ingress.modsecurity_enabled"
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index 380e16c7b71f735826c145b05c97701628480834..ab1818e61fa077f74fdc064e28d1cea0e04c61c3 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -188,7 +188,7 @@ export default {
 
       <template v-if="shouldRenderFolderContent(model)">
         <div v-if="model.isLoadingFolderContent" :key="`loading-item-${i}`">
-          <gl-loading-icon size="md" class="prepend-top-16" />
+          <gl-loading-icon size="md" class="gl-mt-5" />
         </div>
 
         <template v-else>
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index f3ce30c942f82bb8ad98e64789112025870f0df7..fcd535cad73ae3e6b06c1eac42c69e61544d6bb6 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -88,7 +88,6 @@ class GfmAutoComplete {
     if (this.enableMap.labels) this.setupLabels($input);
     if (this.enableMap.snippets) this.setupSnippets($input);
 
-    // We don't instantiate the quick actions autocomplete for note and issue/MR edit forms
     $input.filter('[data-supports-quick-actions="true"]').atwho({
       at: '/',
       alias: 'commands',
diff --git a/app/assets/javascripts/helpers/monitor_helper.js b/app/assets/javascripts/helpers/monitor_helper.js
index 94a0d38f05f148dcf48f93a9d574797181e14297..5f85ee587794c6307c3ebc11254af2f1448f7894 100644
--- a/app/assets/javascripts/helpers/monitor_helper.js
+++ b/app/assets/javascripts/helpers/monitor_helper.js
@@ -65,18 +65,10 @@ const getSeriesLabel = (queryLabel, metricAttributes) => {
  */
 // eslint-disable-next-line import/prefer-default-export
 export const makeDataSeries = (queryResults, defaultConfig) =>
-  queryResults
-    .map(result => {
-      // NaN values may disrupt avg., max. & min. calculations in the legend, filter them out
-      const data = result.values.filter(([, value]) => !Number.isNaN(value));
-      if (!data.length) {
-        return null;
-      }
-      const series = { data };
-      return {
-        ...defaultConfig,
-        ...series,
-        name: getSeriesLabel(defaultConfig.name, result.metric),
-      };
-    })
-    .filter(series => series !== null);
+  queryResults.map(result => {
+    return {
+      ...defaultConfig,
+      data: result.values,
+      name: getSeriesLabel(defaultConfig.name, result.metric),
+    };
+  });
diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue
index 35165c9b481215310b3ef37305a15e9812908285..0de0060615bed70c9262b3f003d2aa4cccf0e301 100644
--- a/app/assets/javascripts/issue_show/components/fields/description.vue
+++ b/app/assets/javascripts/issue_show/components/fields/description.vue
@@ -55,7 +55,7 @@ export default {
           class="note-textarea js-gfm-input js-autosize markdown-area
           qa-description-textarea"
           dir="auto"
-          data-supports-quick-actions="false"
+          data-supports-quick-actions="true"
           :aria-label="__('Description')"
           :placeholder="__('Write a comment or drag your files here…')"
           @keydown.meta.enter="updateIssuable"
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 18a3b0a98a718b18a71bc2e6568d7015d2d225c3..679b81ce583c9fe4ee9ca955b700351e38946589 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -389,7 +389,7 @@ export default {
             </markdown-field>
             <gl-alert
               v-if="isToggleBlockedIssueWarning"
-              class="prepend-top-16"
+              class="gl-mt-5"
               :title="__('Are you sure you want to close this blocked issue?')"
               :primary-button-text="__('Yes, close issue')"
               :secondary-button-text="__('Cancel')"
diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/pipelines/components/dag/dag.vue
index 2ab3f6bdf3da3e1b78ef283c5fe96868dba212d2..85163a666e2c044f9e7146fcb3554245a329b32e 100644
--- a/app/assets/javascripts/pipelines/components/dag/dag.vue
+++ b/app/assets/javascripts/pipelines/components/dag/dag.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlAlert, GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
 import { isEmpty } from 'lodash';
 import axios from '~/lib/utils/axios_utils';
 import { __ } from '~/locale';
@@ -25,6 +25,8 @@ export default {
     GlAlert,
     GlLink,
     GlSprintf,
+    GlEmptyState,
+    GlButton,
   },
   props: {
     graphUrl: {
@@ -32,6 +34,16 @@ export default {
       required: false,
       default: '',
     },
+    emptySvgPath: {
+      type: String,
+      required: true,
+      default: '',
+    },
+    dagDocPath: {
+      type: String,
+      required: true,
+      default: '',
+    },
   },
   data() {
     return {
@@ -40,6 +52,7 @@ export default {
       graphData: null,
       showFailureAlert: false,
       showBetaInfo: true,
+      hasNoDependentJobs: false,
     };
   },
   errorTexts: {
@@ -48,6 +61,16 @@ export default {
     [UNSUPPORTED_DATA]: __('DAG visualization requires at least 3 dependent jobs.'),
     [DEFAULT]: __('An unknown error occurred while loading this graph.'),
   },
+  emptyStateTexts: {
+    title: __('Start using Directed Acyclic Graphs (DAG)'),
+    firstDescription: __(
+      "This pipeline does not use the %{codeStart}needs%{codeEnd} keyword and can't be represented as a directed acyclic graph.",
+    ),
+    secondDescription: __(
+      'Using %{codeStart}needs%{codeEnd} allows jobs to run before their stage is reached, as soon as their individual dependencies are met, which speeds up your pipelines.',
+    ),
+    button: __('Learn more about job dependencies'),
+  },
   computed: {
     betaMessage() {
       return __(
@@ -114,11 +137,18 @@ export default {
         return;
       }
 
-      if (parsed.links.length < 2) {
+      if (parsed.links.length === 1) {
         this.reportFailure(UNSUPPORTED_DATA);
         return;
       }
 
+      // If there are no links, we don't report failure
+      // as it simply means the user does not use job dependencies
+      if (parsed.links.length === 0) {
+        this.hasNoDependentJobs = true;
+        return;
+      }
+
       this.graphData = parsed;
     },
     hideAlert() {
@@ -172,9 +202,38 @@ export default {
       <dag-graph
         v-if="shouldDisplayGraph"
         :graph-data="graphData"
-        @on-failure="reportFailure"
+        @onFailure="reportFailure"
         @update-annotation="updateAnnotation"
       />
+      <gl-empty-state
+        v-else-if="hasNoDependentJobs"
+        :svg-path="emptySvgPath"
+        :title="$options.emptyStateTexts.title"
+      >
+        <template #description>
+          <div class="gl-text-left">
+            <p>
+              <gl-sprintf :message="$options.emptyStateTexts.firstDescription">
+                <template #code="{ content }">
+                  <code>{{ content }}</code>
+                </template>
+              </gl-sprintf>
+            </p>
+            <p>
+              <gl-sprintf :message="$options.emptyStateTexts.secondDescription">
+                <template #code="{ content }">
+                  <code>{{ content }}</code>
+                </template>
+              </gl-sprintf>
+            </p>
+          </div>
+        </template>
+        <template #actions>
+          <gl-button :href="dagDocPath" target="__blank" variant="success">
+            {{ $options.emptyStateTexts.button }}
+          </gl-button>
+        </template>
+      </gl-empty-state>
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
index b323d4990a2f873a90cf79cc2a8bb3bf11063694..2f5577e80a85b0c5ff115720fbb7e5705b465c11 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
@@ -1,6 +1,6 @@
 <script>
 import { isEqual } from 'lodash';
-import { __, sprintf, s__ } from '~/locale';
+import { __, s__ } from '~/locale';
 import createFlash from '~/flash';
 import PipelinesService from '../../services/pipelines_service';
 import pipelinesMixin from '../../mixins/pipelines';
@@ -117,8 +117,6 @@ export default {
   },
   scopes: {
     all: 'all',
-    pending: 'pending',
-    running: 'running',
     finished: 'finished',
     branches: 'branches',
     tags: 'tags',
@@ -171,13 +169,8 @@ export default {
     },
 
     emptyTabMessage() {
-      const { scopes } = this.$options;
-      const possibleScopes = [scopes.pending, scopes.running, scopes.finished];
-
-      if (possibleScopes.includes(this.scope)) {
-        return sprintf(s__('Pipelines|There are currently no %{scope} pipelines.'), {
-          scope: this.scope,
-        });
+      if (this.scope === this.$options.scopes.finished) {
+        return s__('Pipelines|There are currently no finished pipelines.');
       }
 
       return s__('Pipelines|There are currently no pipelines.');
@@ -194,22 +187,9 @@ export default {
           count: count.all,
           isActive: this.scope === 'all',
         },
-        {
-          name: __('Pending'),
-          scope: scopes.pending,
-          count: count.pending,
-          isActive: this.scope === 'pending',
-        },
-        {
-          name: __('Running'),
-          scope: scopes.running,
-          count: count.running,
-          isActive: this.scope === 'running',
-        },
         {
           name: __('Finished'),
           scope: scopes.finished,
-          count: count.finished,
           isActive: this.scope === 'finished',
         },
         {
diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
index 9010959854263cae10ebb7aec7b7b6a3e227829d..7ac04b1893204a1cdb4e6bb3895460684c91fa84 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -151,7 +151,8 @@ const createDagApp = () => {
   }
 
   const el = document.querySelector('#js-pipeline-dag-vue');
-  const graphUrl = el?.dataset?.pipelineDataPath;
+  const { pipelineDataPath, emptySvgPath, dagDocPath } = el?.dataset;
+
   // eslint-disable-next-line no-new
   new Vue({
     el,
@@ -161,7 +162,9 @@ const createDagApp = () => {
     render(createElement) {
       return createElement('dag', {
         props: {
-          graphUrl,
+          graphUrl: pipelineDataPath,
+          emptySvgPath,
+          dagDocPath,
         },
       });
     },
diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
index a670cad5f9f16f704f3b287912b2ae1a1068bde8..b28a847e75198214d9b75ab02348121ed6be470d 100644
--- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
+++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
@@ -6,7 +6,9 @@ import ReportSection from './report_section.vue';
 import SummaryRow from './summary_row.vue';
 import IssuesList from './issues_list.vue';
 import Modal from './modal.vue';
+import { GlButton } from '@gitlab/ui';
 import createStore from '../store';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { summaryTextBuilder, reportTextBuilder, statusIcon } from '../store/utils';
 
 export default {
@@ -17,12 +19,19 @@ export default {
     SummaryRow,
     IssuesList,
     Modal,
+    GlButton,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     endpoint: {
       type: String,
       required: true,
     },
+    pipelinePath: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   componentNames,
   computed: {
@@ -43,6 +52,12 @@ export default {
 
       return summaryTextBuilder(s__('Reports|Test summary'), this.summary);
     },
+    testTabURL() {
+      return `${this.pipelinePath}/test_report`;
+    },
+    showViewFullReport() {
+      return Boolean(this.glFeatures.junitPipelineView) && this.pipelinePath.length;
+    },
   },
   created() {
     this.setEndpoint(this.endpoint);
@@ -98,6 +113,11 @@ export default {
     :has-issues="reports.length > 0"
     class="mr-widget-section grouped-security-reports mr-report"
   >
+    <template v-if="showViewFullReport" #actionButtons>
+      <gl-button :href="testTabURL" icon="external-link" data-testid="group-test-reports-full-link">
+        {{ s__('ciReport|View full report') }}
+      </gl-button>
+    </template>
     <template #body>
       <div class="mr-widget-grouped-section report-block">
         <template v-for="(report, i) in reports">
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 669f31cfd04321ec4bf6a4c5285cd5fb5f5cf21d..a28936456ff937dcb9cdc0eeb0918822d7c9f372 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -384,6 +384,7 @@ export default {
         v-if="mr.testResultsPath"
         class="js-reports-container"
         :endpoint="mr.testResultsPath"
+        :pipeline-path="mr.mergeRequestAddCiConfigPath"
       />
 
       <terraform-plan v-if="mr.terraformReportsPath" :endpoint="mr.terraformReportsPath" />
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js
index 872d2dac6a14c899d0022496d48c3e2ed7119077..10b06f48b09f9eed29df45b6543ec89e2e0e71a5 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js
@@ -1,13 +1,14 @@
 import renderKramdownList from './renderers/render_kramdown_list';
 import renderKramdownText from './renderers/render_kramdown_text';
+import renderIdentifierText from './renderers/render_identifier_text';
 
 const listRenderers = [renderKramdownList];
-const textRenderers = [renderKramdownText];
+const textRenderers = [renderKramdownText, renderIdentifierText];
 
 const executeRenderer = (renderers, node, context) => {
   const availableRenderer = renderers.find(renderer => renderer.canRender(node, context));
 
-  return availableRenderer ? availableRenderer.render(context) : context.origin();
+  return availableRenderer ? availableRenderer.render(node, context) : context.origin();
 };
 
 const buildCustomRendererFunctions = (customRenderers, defaults) => {
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token.js
index fe418ee407b272b5a86c5194b7ef3b8edf7cc523..0261c18dfcdcb4e6968e187fd0f5125adc70024f 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token.js
@@ -16,6 +16,10 @@ export const buildUneditableOpenTokens = token => {
 
 export const buildUneditableCloseToken = () => buildToken('closeTag', 'div');
 
+export const buildUneditableCloseTokens = token => {
+  return [token, buildToken('closeTag', 'div')];
+};
+
 export const buildUneditableTokens = token => {
   return [...buildUneditableOpenTokens(token), buildUneditableCloseToken()];
 };
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text.js
new file mode 100644
index 0000000000000000000000000000000000000000..0cd7635c80751b2a0ceb679dbd69604d4a183844
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text.js
@@ -0,0 +1,81 @@
+import {
+  buildUneditableOpenTokens,
+  buildUneditableCloseTokens,
+  buildUneditableTokens,
+} from './build_uneditable_token';
+
+const identifierRegex = /(^\[.+\]: .+)/;
+
+const isBasicIdentifier = ({ literal }) => {
+  return identifierRegex.test(literal);
+};
+
+const isInlineCodeNode = ({ type, tickCount }) => type === 'code' && tickCount === 1;
+
+const hasAdjacentInlineCode = (isForward, node) => {
+  const direction = isForward ? 'next' : 'prev';
+
+  let currentNode = node;
+  while (currentNode[direction] && currentNode.literal !== null) {
+    if (isInlineCodeNode(currentNode)) {
+      return true;
+    }
+
+    currentNode = currentNode[direction];
+  }
+
+  return false;
+};
+
+const hasEnteringPotential = literal => literal.includes('[');
+const hasExitingPotential = literal => literal.includes(']: ');
+
+const hasAdjacentExit = node => {
+  let currentNode = node;
+
+  while (currentNode.next && currentNode.literal !== null) {
+    if (hasExitingPotential(currentNode.literal)) {
+      return true;
+    }
+
+    currentNode = currentNode.next;
+  }
+
+  return false;
+};
+
+const isEnteringWithAdjacentInlineCode = ({ literal, next }) => {
+  if (next && hasEnteringPotential(literal) && !hasExitingPotential(literal)) {
+    return hasAdjacentInlineCode(true, next) && hasAdjacentExit(next);
+  }
+
+  return false;
+};
+
+const isExitingWithAdjacentInlineCode = ({ literal, prev }) => {
+  if (prev && !hasEnteringPotential(literal) && hasExitingPotential(literal)) {
+    return hasAdjacentInlineCode(false, prev);
+  }
+
+  return false;
+};
+
+const isAdjacentInlineCodeIdentifier = node => {
+  return isEnteringWithAdjacentInlineCode(node) || isExitingWithAdjacentInlineCode(node);
+};
+
+const canRender = (node, context) => {
+  return isBasicIdentifier(node) || isAdjacentInlineCodeIdentifier(node, context);
+};
+
+const render = (node, { origin }) => {
+  if (isEnteringWithAdjacentInlineCode(node)) {
+    return buildUneditableOpenTokens(origin());
+  } else if (isExitingWithAdjacentInlineCode(node)) {
+    return buildUneditableCloseTokens(origin());
+  }
+
+  return buildUneditableTokens(origin());
+};
+
+export default { canRender, render };
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list.js
index f1289e2c5ee0d52fff74fe04a8b05acf87d86fc8..491a26c81d037f1805ada5bfdc1f56d1388f34bf 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list.js
@@ -21,7 +21,7 @@ const canRender = node => {
   return false;
 };
 
-const render = ({ entering, origin }) =>
+const render = (_, { entering, origin }) =>
   entering ? buildUneditableOpenTokens(origin()) : buildUneditableCloseToken();
 
 export default { canRender, render };
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text.js
index a938e86c0ec97f3fee43ded9d5e78f34048135bb..01384699e4f8b01f5a5bbcc9c165e2fc43941cab 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text.js
@@ -1,11 +1,12 @@
 import { buildUneditableTokens } from './build_uneditable_token';
 
+const kramdownRegex = /(^{:.+}$)/;
+
 const canRender = ({ literal }) => {
-  const kramdownRegex = /(^{:.+}$)/gm;
   return kramdownRegex.test(literal);
 };
 
-const render = ({ origin }) => {
+const render = (_, { origin }) => {
   return buildUneditableTokens(origin());
 };
 
diff --git a/app/assets/stylesheets/components/related_items_list.scss b/app/assets/stylesheets/components/related_items_list.scss
index 956f34f7a8b25dfbc40868c835a645f1244e879f..6facfc0756aa592f64719f6353fc7c0025ffa6bc 100644
--- a/app/assets/stylesheets/components/related_items_list.scss
+++ b/app/assets/stylesheets/components/related_items_list.scss
@@ -59,10 +59,6 @@ $item-remove-button-space: 42px;
     flex-basis: 100%;
     font-size: $gl-font-size-small;
 
-    &.mr-title {
-      font-weight: $gl-font-weight-bold;
-    }
-
     .sortable-link {
       color: $gray-900;
     }
@@ -77,10 +73,6 @@ $item-remove-button-space: 42px;
     overflow: hidden;
     white-space: nowrap;
   }
-
-  .health-label-short {
-    display: none;
-  }
 }
 
 .item-body,
@@ -89,10 +81,6 @@ $item-remove-button-space: 42px;
     max-width: 0;
   }
 
-  .health-label-long {
-    display: none;
-  }
-
   .status {
     &-at-risk {
       color: $red-500;
@@ -158,19 +146,16 @@ $item-remove-button-space: 42px;
     max-width: $item-milestone-max-width;
 
     .ic-clock {
-      color: $gl-text-color-secondary;
       margin-right: $gl-padding-4;
     }
   }
 
   .item-weight {
     max-width: $item-weight-max-width;
-
-    .ic-weight {
-      color: $gl-text-color-secondary;
-    }
   }
 
+  .item-milestone .ic-clock,
+  .item-weight .ic-weight,
   .item-due-date .ic-calendar {
     color: $gl-text-color-secondary;
   }
@@ -314,10 +299,6 @@ $item-remove-button-space: 42px;
       max-width: 100px;
     }
   }
-
-  .health-label-long {
-    display: none;
-  }
 }
 
 /* Large devices (large desktops, 1200px and up) */
@@ -331,10 +312,6 @@ $item-remove-button-space: 42px;
     }
   }
 
-  .health-label-long {
-    display: none;
-  }
-
   .item-contents {
     overflow: hidden;
   }
@@ -371,12 +348,8 @@ $item-remove-button-space: 42px;
 
 @media only screen and (min-width: 1500px) {
   .card-header {
-    .health-label-short {
-      display: none;
-    }
-
     .health-label-long {
-      display: initial;
+      display: block;
     }
   }
 }
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 5154c204dd61a823b114a1e8db0d9607d6bc9446..cfeb4e71c56f870d59d51ce812d89e98b8794c04 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -399,7 +399,6 @@ img.emoji {
 .prepend-top-5 { margin-top: 5px; }
 .prepend-top-10 { margin-top: 10px; }
 .prepend-top-15 { margin-top: 15px; }
-.prepend-top-16 { margin-top: 16px; }
 .prepend-top-20 { margin-top: 20px; }
 .prepend-left-5 { margin-left: 5px; }
 .prepend-left-10 { margin-left: 10px; }
@@ -407,7 +406,6 @@ img.emoji {
 .prepend-left-default { margin-left: $gl-padding; }
 .prepend-left-20 { margin-left: 20px; }
 .prepend-left-64 { margin-left: 64px; }
-.append-right-2 { margin-right: 2px; }
 .append-right-5 { margin-right: 5px; }
 .append-right-10 { margin-right: 10px; }
 .append-right-15 { margin-right: 15px; }
diff --git a/app/assets/stylesheets/pages/alert_management/list.scss b/app/assets/stylesheets/pages/alert_management/list.scss
index ea5e7a1bdea4f7a48c884f60e2814a7179b07b2b..27c7b088fe09f3a268474c677c57384280580387 100644
--- a/app/assets/stylesheets/pages/alert_management/list.scss
+++ b/app/assets/stylesheets/pages/alert_management/list.scss
@@ -1,4 +1,9 @@
 .alert-management-list {
+  // Migrate this to gitlab-ui
+  .gl-w-12 {
+    width: $gl-spacing-scale-12;
+  }
+
   // these styles need to be deleted once GlTable component looks in GitLab same as in @gitlab/ui
   table {
     color: $gray-700;
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 79c01098aa949e19c32d3e4451077b9cb389442d..80c5fb470dd777b596928a25fc9b443e6fcd6c85 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -30,7 +30,7 @@ class Projects::BlobController < Projects::ApplicationController
   before_action :set_last_commit_sha, only: [:edit, :update]
 
   before_action only: :show do
-    push_frontend_feature_flag(:code_navigation, @project)
+    push_frontend_feature_flag(:code_navigation, @project, default_enabled: true)
     push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline)
   end
 
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index cebbc28716c37fea8e7157828147cfb99cbf53be..803a779a1b39b9ff169422f997ac52350d7bc4d6 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -47,6 +47,7 @@ def set_issuables_index_only_actions
   before_action do
     push_frontend_feature_flag(:vue_issuable_sidebar, project.group)
     push_frontend_feature_flag(:tribute_autocomplete, @project)
+    push_frontend_feature_flag(:vue_issuables_list, project)
   end
 
   before_action only: :show do
@@ -55,6 +56,10 @@ def set_issuables_index_only_actions
     push_frontend_feature_flag(:confidential_apollo_sidebar, @project)
   end
 
+  before_action only: :index do
+    push_frontend_feature_flag(:scoped_labels, @project)
+  end
+
   around_action :allow_gitaly_ref_name_caching, only: [:discussions]
 
   respond_to :html
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 55556ea7d3173639d5caf0e16267047286505f09..2937c83cd2756c516314ee870953354e182c6f24 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -29,7 +29,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:deploy_from_footer, @project, default_enabled: true)
     push_frontend_feature_flag(:single_mr_diff_view, @project, default_enabled: true)
     push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline)
-    push_frontend_feature_flag(:code_navigation, @project)
+    push_frontend_feature_flag(:code_navigation, @project, default_enabled: true)
     push_frontend_feature_flag(:widget_visibility_polling, @project, default_enabled: true)
     push_frontend_feature_flag(:merge_ref_head_comments, @project)
     push_frontend_feature_flag(:mr_commit_neighbor_nav, @project, default_enabled: true)
@@ -40,6 +40,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
   before_action do
     push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
+    push_frontend_feature_flag(:junit_pipeline_view, @project.group)
   end
 
   around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
@@ -178,7 +179,7 @@ def edit
   end
 
   def update
-    @merge_request = ::MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
+    @merge_request = ::MergeRequests::UpdateService.new(project, current_user, merge_request_update_params).execute(@merge_request)
 
     respond_to do |format|
       format.html do
@@ -312,6 +313,10 @@ def auto_merge_requested?
 
   private
 
+  def merge_request_update_params
+    merge_request_params.merge!(params.permit(:merge_request_diff_head_sha))
+  end
+
   def head_pipeline
     strong_memoize(:head_pipeline) do
       pipeline = @merge_request.head_pipeline
diff --git a/app/finders/issuable_finder/params.rb b/app/finders/issuable_finder/params.rb
index 5b48d0817e36c25bbc063c8d95f4e6dcb5f3c272..8a194f34f74d3a72973a40b7f30407f82d3da111 100644
--- a/app/finders/issuable_finder/params.rb
+++ b/app/finders/issuable_finder/params.rb
@@ -110,7 +110,9 @@ def project?
 
     def group
       strong_memoize(:group) do
-        if params[:group_id].present?
+        if params[:group_id].is_a?(Group)
+          params[:group_id]
+        elsif params[:group_id].present?
           Group.find(params[:group_id])
         else
           nil
diff --git a/app/finders/issues_finder/params.rb b/app/finders/issues_finder/params.rb
index cd92b79265dfcfcac6efe563258900e0acd74bc4..668d969f7c081e0ff92f7872886b2406ce01c86d 100644
--- a/app/finders/issues_finder/params.rb
+++ b/app/finders/issues_finder/params.rb
@@ -27,19 +27,14 @@ def filter_by_due_next_month_and_previous_two_weeks?
     end
 
     def user_can_see_all_confidential_issues?
-      return @user_can_see_all_confidential_issues if defined?(@user_can_see_all_confidential_issues)
-
-      return @user_can_see_all_confidential_issues = false if current_user.blank?
-      return @user_can_see_all_confidential_issues = true if current_user.can_read_all_resources?
-
-      @user_can_see_all_confidential_issues =
-        if project? && project
-          project.team.max_member_access(current_user.id) >= CONFIDENTIAL_ACCESS_LEVEL
-        elsif group
-          group.max_member_access_for_user(current_user) >= CONFIDENTIAL_ACCESS_LEVEL
+      strong_memoize(:user_can_see_all_confidential_issues) do
+        parent = project? ? project : group
+        if parent
+          Ability.allowed?(current_user, :read_confidential_issues, parent)
         else
-          false
+          Ability.allowed?(current_user, :read_all_resources)
         end
+      end
     end
 
     def user_cannot_see_confidential_issues?
diff --git a/app/graphql/mutations/concerns/mutations/resolves_issuable.rb b/app/graphql/mutations/concerns/mutations/resolves_issuable.rb
index 13a56f2e7098f27655c7e0ea127380a9e6afbeee..0fe2d09de6def6fa314ef97bd807dc2de809090b 100644
--- a/app/graphql/mutations/concerns/mutations/resolves_issuable.rb
+++ b/app/graphql/mutations/concerns/mutations/resolves_issuable.rb
@@ -9,30 +9,31 @@ module ResolvesIssuable
     end
 
     def resolve_issuable(type:, parent_path:, iid:)
-      parent = resolve_issuable_parent(type, parent_path)
-      key = type == :merge_request ? :iids : :iid
-      args = { key => iid.to_s }
+      parent = ::Gitlab::Graphql::Lazy.force(resolve_issuable_parent(type, parent_path))
+      return unless parent.present?
 
-      resolver = issuable_resolver(type, parent, context)
-      ready, early_return = resolver.ready?(**args)
-
-      return early_return unless ready
-
-      resolver.resolve(**args)
+      finder = issuable_finder(type, iids: [iid])
+      Gitlab::Graphql::Loaders::IssuableLoader.new(parent, finder).find_all.first
     end
 
     private
 
-    def issuable_resolver(type, parent, context)
-      resolver_class = "Resolvers::#{type.to_s.classify.pluralize}Resolver".constantize
-
-      resolver_class.single.new(object: parent, context: context, field: nil)
+    def issuable_finder(type, args)
+      case type
+      when :merge_request
+        MergeRequestsFinder.new(current_user, args)
+      when :issue
+        IssuesFinder.new(current_user, args)
+      else
+        raise "Unsupported type: #{type}"
+      end
     end
 
     def resolve_issuable_parent(type, parent_path)
+      return unless parent_path.present?
       return unless type == :issue || type == :merge_request
 
-      resolve_project(full_path: parent_path) if parent_path.present?
+      resolve_project(full_path: parent_path)
     end
   end
 end
diff --git a/app/graphql/resolvers/base_resolver.rb b/app/graphql/resolvers/base_resolver.rb
index 7daff68c069a107f88b1a94f82730e22f63b28cd..791c6eab42f877c8f8685d319c9c8bb0ee2e4b87 100644
--- a/app/graphql/resolvers/base_resolver.rb
+++ b/app/graphql/resolvers/base_resolver.rb
@@ -83,5 +83,10 @@ def single?
     def current_user
       context[:current_user]
     end
+
+    # Overridden in sub-classes (see .single, .last)
+    def select_result(results)
+      results
+    end
   end
 end
diff --git a/app/graphql/resolvers/concerns/resolves_merge_requests.rb b/app/graphql/resolvers/concerns/resolves_merge_requests.rb
index a2140728a2740e3c986d0daf4462e06b6a746e84..7ed88be52b9063c3131e75b4dfb1f0c2dee958d2 100644
--- a/app/graphql/resolvers/concerns/resolves_merge_requests.rb
+++ b/app/graphql/resolvers/concerns/resolves_merge_requests.rb
@@ -11,16 +11,10 @@ module ResolvesMergeRequests
   end
 
   def resolve_with_lookahead(**args)
-    args[:iids] = Array.wrap(args[:iids]) if args[:iids]
-    args.compact!
+    mr_finder = MergeRequestsFinder.new(current_user, args.compact)
+    finder = Gitlab::Graphql::Loaders::IssuableLoader.new(project, mr_finder)
 
-    if project && args.keys == [:iids]
-      batch_load_merge_requests(args[:iids])
-    else
-      args[:project_id] ||= project
-
-      apply_lookahead(MergeRequestsFinder.new(current_user, args).execute)
-    end.then(&(single? ? :first : :itself))
+    select_result(finder.batching_find_all { |query| apply_lookahead(query) })
   end
 
   def ready?(**args)
@@ -35,22 +29,6 @@ def early_return
 
   private
 
-  def batch_load_merge_requests(iids)
-    iids.map { |iid| batch_load(iid) }.select(&:itself) # .compact doesn't work on BatchLoader
-  end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def batch_load(iid)
-    BatchLoader::GraphQL.for(iid.to_s).batch(key: project) do |iids, loader, args|
-      query = args[:key].merge_requests.where(iid: iids)
-
-      apply_lookahead(query).each do |mr|
-        loader.call(mr.iid.to_s, mr)
-      end
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
   def unconditional_includes
     [:target_project]
   end
diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb
index 01538763da5d31ead95fb90f023caa43b719eaaa..65e11bd1e84ec32d241289aba57b715c4c6f29d9 100644
--- a/app/graphql/resolvers/issues_resolver.rb
+++ b/app/graphql/resolvers/issues_resolver.rb
@@ -63,18 +63,13 @@ def resolve(**args)
       parent = object.respond_to?(:sync) ? object.sync : object
       return Issue.none if parent.nil?
 
-      if parent.is_a?(Group)
-        args[:group_id] = parent.id
-      else
-        args[:project_id] = parent.id
-      end
-
       # Will need to be be made group & namespace aware with
       # https://gitlab.com/gitlab-org/gitlab-foss/issues/54520
-      args[:iids] ||= [args[:iid]].compact
-      args[:attempt_project_search_optimizations] = args[:search].present?
+      args[:iids] ||= [args.delete(:iid)].compact if args[:iid]
+      args[:attempt_project_search_optimizations] = true if args[:search].present?
 
-      issues = IssuesFinder.new(context[:current_user], args).execute
+      finder = IssuesFinder.new(current_user, args)
+      issues = Gitlab::Graphql::Loaders::IssuableLoader.new(parent, finder).batching_find_all
 
       if non_stable_cursor_sort?(args[:sort])
         # Certain complex sorts are not supported by the stable cursor pagination yet.
diff --git a/app/graphql/types/project_statistics_type.rb b/app/graphql/types/project_statistics_type.rb
index e1546d31e89830f5198b3b7489db00f674ffce7c..b3916e42e92e7d49c580267a29aa4379381ffb84 100644
--- a/app/graphql/types/project_statistics_type.rb
+++ b/app/graphql/types/project_statistics_type.rb
@@ -21,5 +21,7 @@ class ProjectStatisticsType < BaseObject
           description: 'Packages size of the project'
     field :wiki_size, GraphQL::FLOAT_TYPE, null: true,
           description: 'Wiki size of the project'
+    field :snippets_size, GraphQL::FLOAT_TYPE, null: true,
+          description: 'Snippets size of the project'
   end
 end
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb
index 766d0a1f277206279aa8060262ba297fdbd3b8d2..df3adcc48e57232462b30de59aafbbb3ca5256a5 100644
--- a/app/helpers/projects/alert_management_helper.rb
+++ b/app/helpers/projects/alert_management_helper.rb
@@ -7,7 +7,7 @@ def alert_management_data(current_user, project)
       'enable-alert-management-path' => edit_project_service_path(project, AlertsService),
       'populating-alerts-help-url' => help_page_url('user/project/operations/alert_management.html', anchor: 'enable-alert-management'),
       'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'),
-      'user-can-enable-alert-management' => can?(current_user, :admin_project, project).to_s,
+      'user-can-enable-alert-management' => can?(current_user, :admin_operations, project).to_s,
       'alert-management-enabled' => alert_management_enabled?(project).to_s
     }
   end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index e2411e3828b24ac93339b35211155d3b021c3fce..f50e27afe9c58e43c175e4e831f08120f6c638f3 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -51,6 +51,8 @@ class Pipeline < ApplicationRecord
     has_many :latest_builds, -> { latest }, foreign_key: :commit_id, inverse_of: :pipeline, class_name: 'Ci::Build'
     has_many :downloadable_artifacts, -> { not_expired.downloadable }, through: :latest_builds, source: :job_artifacts
 
+    has_many :messages, class_name: 'Ci::PipelineMessage', inverse_of: :pipeline
+
     # Merge requests for which the current pipeline is running against
     # the merge request's latest commit.
     has_many :merge_requests_as_head_pipeline, foreign_key: "head_pipeline_id", class_name: 'MergeRequest'
@@ -634,6 +636,12 @@ def has_yaml_errors?
       yaml_errors.present?
     end
 
+    def add_error_message(content)
+      return unless Gitlab::Ci::Features.store_pipeline_messages?(project)
+
+      messages.error.build(content: content)
+    end
+
     # Manually set the notes for a Ci::Pipeline
     # There is no ActiveRecord relation between Ci::Pipeline and notes
     # as they are related to a commit sha. This method helps importing
@@ -957,7 +965,7 @@ def find_stage_by_name!(name)
       stages.find_by!(name: name)
     end
 
-    def error_messages
+    def full_error_messages
       errors ? errors.full_messages.to_sentence : ""
     end
 
diff --git a/app/models/ci/pipeline_message.rb b/app/models/ci/pipeline_message.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a47ec554462496031edccda02289a6bc7427bdf0
--- /dev/null
+++ b/app/models/ci/pipeline_message.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Ci
+  class PipelineMessage < ApplicationRecord
+    extend Gitlab::Ci::Model
+
+    MAX_CONTENT_LENGTH = 10_000
+
+    belongs_to :pipeline
+
+    validates :content, presence: true
+
+    before_save :truncate_long_content
+
+    enum severity: { error: 0, warning: 1 }
+
+    private
+
+    def truncate_long_content
+      return if content.length <= MAX_CONTENT_LENGTH
+
+      self.content = content.truncate(MAX_CONTENT_LENGTH)
+    end
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 3410c5c9a25372eb0bed2273450a6613dbe72495..d464c39a43ece5c27ade1df43e060db3295f13c8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1798,6 +1798,7 @@ def after_import
     after_create_default_branch
     join_pool_repository
     refresh_markdown_cache!
+    write_repository_config
   end
 
   def update_project_counter_caches
diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb
index f41d69c7a41f35c395e26c156675aabffca593be..13d732e4eddd5e51d3fda461ee5db2432f1eba69 100644
--- a/app/policies/base_policy.rb
+++ b/app/policies/base_policy.rb
@@ -58,6 +58,8 @@ class BasePolicy < DeclarativePolicy::Base
   rule { admin }.enable :read_all_resources
 
   rule { default }.enable :read_cross_project
+
+  condition(:is_gitlab_com) { ::Gitlab.dev_env_or_com? }
 end
 
 BasePolicy.prepend_if_ee('EE::BasePolicy')
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index bfd598525f6981901e00a9384ca72b0b7d2e52e0..5e69d1ece36dbcb2414083869b90ba4a1b21f502 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -67,6 +67,10 @@ class GroupPolicy < BasePolicy
     enable :update_max_artifacts_size
   end
 
+  rule { can?(:read_all_resources) }.policy do
+    enable :read_confidential_issues
+  end
+
   rule { has_projects }.policy do
     enable :read_group
   end
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 90f1f70d0dea07dff293967acd9a87967d0cc131..56745324e199f4b8e81b85cae9fefd7027b4da61 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -176,6 +176,7 @@ class ProjectPolicy < BasePolicy
   rule { guest | admin }.enable :read_project_for_iids
 
   rule { admin }.enable :update_max_artifacts_size
+  rule { can?(:read_all_resources) }.enable :read_confidential_issues
 
   rule { guest }.enable :guest_access
   rule { reporter }.enable :reporter_access
@@ -257,6 +258,7 @@ class ProjectPolicy < BasePolicy
     enable :read_prometheus
     enable :read_metrics_dashboard_annotation
     enable :metrics_dashboard
+    enable :read_confidential_issues
   end
 
   # We define `:public_user_access` separately because there are cases in gitlab-ee
diff --git a/app/services/alert_management/process_prometheus_alert_service.rb b/app/services/alert_management/process_prometheus_alert_service.rb
index 90fcbd95e4bec0ab02d14cc8f77032288a4063fe..24c091b481596020e9e6942488e4da42e791f541 100644
--- a/app/services/alert_management/process_prometheus_alert_service.rb
+++ b/app/services/alert_management/process_prometheus_alert_service.rb
@@ -66,7 +66,11 @@ def am_alert_params
 
     def process_resolved_alert_management_alert
       return if am_alert.blank?
-      return if am_alert.resolve(ends_at)
+
+      if am_alert.resolve(ends_at)
+        close_issue(am_alert.issue)
+        return
+      end
 
       logger.warn(
         message: 'Unable to update AlertManagement::Alert status to resolved',
@@ -75,6 +79,16 @@ def process_resolved_alert_management_alert
       )
     end
 
+    def close_issue(issue)
+      return if issue.blank? || issue.closed?
+
+      Issues::CloseService
+        .new(project, User.alert_bot)
+        .execute(issue, system_note: false)
+
+      SystemNoteService.auto_resolve_prometheus_alert(issue, project, User.alert_bot) if issue.reset.closed?
+    end
+
     def logger
       @logger ||= Gitlab::AppLogger
     end
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 3717237d71ff4ada5e634ef9a9a70b72b0fcacfc..2d7f5014aa926a5199f2361727b39d8f6ff2fb80 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -95,7 +95,7 @@ def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request
     def execute!(*args, &block)
       execute(*args, &block).tap do |pipeline|
         unless pipeline.persisted?
-          raise CreateError, pipeline.error_messages
+          raise CreateError, pipeline.full_error_messages
         end
       end
     end
diff --git a/app/services/concerns/exclusive_lease_guard.rb b/app/services/concerns/exclusive_lease_guard.rb
index 4678d051d29d30dcdf26d785344cd84b0959de19..a58e9aefcec11337723ef8003783fa768b066231 100644
--- a/app/services/concerns/exclusive_lease_guard.rb
+++ b/app/services/concerns/exclusive_lease_guard.rb
@@ -21,7 +21,7 @@ def try_obtain_lease
     lease = exclusive_lease.try_obtain
 
     unless lease
-      log_error('Cannot obtain an exclusive lease. There must be another instance already in execution.')
+      log_error("Cannot obtain an exclusive lease for #{self.class.name}. There must be another instance already in execution.")
       return
     end
 
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 168d776215a6da6011e44b8721eba72a7b48915c..65a73dadc2e7c511dc3ec0b063bff267332645f6 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -115,7 +115,7 @@ def process_label_ids(attributes, existing_label_ids: nil, extra_label_ids: [])
     new_label_ids.uniq
   end
 
-  def handle_quick_actions_on_create(issuable)
+  def handle_quick_actions(issuable)
     merge_quick_actions_into_params!(issuable)
   end
 
@@ -123,17 +123,21 @@ def merge_quick_actions_into_params!(issuable, only: nil)
     original_description = params.fetch(:description, issuable.description)
 
     description, command_params =
-      QuickActions::InterpretService.new(project, current_user)
+      QuickActions::InterpretService.new(project, current_user, quick_action_options)
         .execute(original_description, issuable, only: only)
 
     # Avoid a description already set on an issuable to be overwritten by a nil
-    params[:description] = description if description
+    params[:description] = description if description && description != original_description
 
     params.merge!(command_params)
   end
 
+  def quick_action_options
+    {}
+  end
+
   def create(issuable)
-    handle_quick_actions_on_create(issuable)
+    handle_quick_actions(issuable)
     filter_params(issuable)
 
     params.delete(:state_event)
@@ -177,11 +181,13 @@ def after_update(issuable)
   end
 
   def update(issuable)
+    handle_quick_actions(issuable)
+    filter_params(issuable)
+
     change_state(issuable)
     change_subscription(issuable)
     change_todo(issuable)
     toggle_award(issuable)
-    filter_params(issuable)
     old_associations = associations_before_update(issuable)
 
     label_ids = process_label_ids(params, existing_label_ids: issuable.label_ids)
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index dc08ec1b31705ae12ad7044a9908dd4b08791251..3940e3b7f1aeebe726c27b24a74dec1f79c8acd3 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -2,6 +2,7 @@
 
 module MergeRequests
   class BaseService < ::IssuableBaseService
+    extend ::Gitlab::Utils::Override
     include MergeRequests::AssignsMergeParams
 
     def create_note(merge_request, state = merge_request.state)
@@ -63,6 +64,12 @@ def update(merge_request)
       super
     end
 
+    override :handle_quick_actions
+    def handle_quick_actions(merge_request)
+      super
+      handle_wip_event(merge_request)
+    end
+
     def handle_wip_event(merge_request)
       if wip_event = params.delete(:wip_event)
         # We update the title that is provided in the params or we use the mr title
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index 1cdfba414327f2ac67b121f2760154dcf7b2b5ab..ac84a13f43753022a90398aed14acd36cfd68b1c 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -33,12 +33,6 @@ def create(merge_request)
       super
     end
 
-    # Override from IssuableBaseService
-    def handle_quick_actions_on_create(merge_request)
-      super
-      handle_wip_event(merge_request)
-    end
-
     private
 
     def set_projects!
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 561695baeab9a57cf4c28b417f16dc1d8a9f91fd..29e0c22b15592e44607e775d93f84de4c5d21658 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -2,6 +2,8 @@
 
 module MergeRequests
   class UpdateService < MergeRequests::BaseService
+    extend ::Gitlab::Utils::Override
+
     def execute(merge_request)
       # We don't allow change of source/target projects and source branch
       # after merge request was created
@@ -9,14 +11,11 @@ def execute(merge_request)
       params.delete(:target_project_id)
       params.delete(:source_branch)
 
-      merge_from_quick_action(merge_request) if params[:merge]
-
       if merge_request.closed_without_fork?
         params.delete(:target_branch)
         params.delete(:force_remove_source_branch)
       end
 
-      handle_wip_event(merge_request)
       update_task_event(merge_request) || update(merge_request)
     end
 
@@ -77,26 +76,6 @@ def handle_task_changes(merge_request)
       todo_service.update_merge_request(merge_request, current_user)
     end
 
-    def merge_from_quick_action(merge_request)
-      last_diff_sha = params.delete(:merge)
-
-      if Feature.enabled?(:merge_orchestration_service, merge_request.project, default_enabled: true)
-        MergeRequests::MergeOrchestrationService
-          .new(project, current_user, { sha: last_diff_sha })
-          .execute(merge_request)
-      else
-        return unless merge_request.mergeable_with_quick_action?(current_user, last_diff_sha: last_diff_sha)
-
-        merge_request.update(merge_error: nil)
-
-        if merge_request.head_pipeline_active?
-          AutoMergeService.new(project, current_user, { sha: last_diff_sha }).execute(merge_request, AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
-        else
-          merge_request.merge_async(current_user.id, { sha: last_diff_sha })
-        end
-      end
-    end
-
     def reopen_service
       MergeRequests::ReopenService
     end
@@ -134,6 +113,37 @@ def create_branch_change_note(issuable, branch_type, old_branch, new_branch)
         issuable, issuable.project, current_user, branch_type,
         old_branch, new_branch)
     end
+
+    override :handle_quick_actions
+    def handle_quick_actions(merge_request)
+      super
+      merge_from_quick_action(merge_request) if params[:merge]
+    end
+
+    def merge_from_quick_action(merge_request)
+      last_diff_sha = params.delete(:merge)
+
+      if Feature.enabled?(:merge_orchestration_service, merge_request.project, default_enabled: true)
+        MergeRequests::MergeOrchestrationService
+          .new(project, current_user, { sha: last_diff_sha })
+          .execute(merge_request)
+      else
+        return unless merge_request.mergeable_with_quick_action?(current_user, last_diff_sha: last_diff_sha)
+
+        merge_request.update(merge_error: nil)
+
+        if merge_request.head_pipeline_active?
+          AutoMergeService.new(project, current_user, { sha: last_diff_sha }).execute(merge_request, AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
+        else
+          merge_request.merge_async(current_user.id, { sha: last_diff_sha })
+        end
+      end
+    end
+
+    override :quick_action_options
+    def quick_action_options
+      { merge_request_diff_head_sha: params.delete(:merge_request_diff_head_sha) }
+    end
   end
 end
 
diff --git a/app/services/metrics/dashboard/base_service.rb b/app/services/metrics/dashboard/base_service.rb
index 503ef208cb310b0f509719a1e699a294d0ba2d84..a83ab1e00463aca8c4652752b7ecf4f9889c935d 100644
--- a/app/services/metrics/dashboard/base_service.rb
+++ b/app/services/metrics/dashboard/base_service.rb
@@ -84,6 +84,17 @@ def dashboard_path
         params[:dashboard_path]
       end
 
+      def load_yaml(data)
+        ::Gitlab::Config::Loader::Yaml.new(data).load_raw!
+      rescue Gitlab::Config::Loader::Yaml::NotHashError
+        # Raise more informative error in app/models/performance_monitoring/prometheus_dashboard.rb.
+        {}
+      rescue Gitlab::Config::Loader::Yaml::DataTooLargeError => exception
+        raise Gitlab::Metrics::Dashboard::Errors::LayoutError, exception.message
+      rescue Gitlab::Config::Loader::FormatError
+        raise Gitlab::Metrics::Dashboard::Errors::LayoutError, _('Invalid yaml')
+      end
+
       # @return [Hash] an unmodified dashboard
       def get_raw_dashboard
         raise NotImplementedError
diff --git a/app/services/metrics/dashboard/custom_dashboard_service.rb b/app/services/metrics/dashboard/custom_dashboard_service.rb
index 77173813a4f8ac60ca48f40a3e3ab53b3b735421..a14e05a77923aa3f3d5ea09c6231f86fbcdc9121 100644
--- a/app/services/metrics/dashboard/custom_dashboard_service.rb
+++ b/app/services/metrics/dashboard/custom_dashboard_service.rb
@@ -42,7 +42,7 @@ def name_for_path(filepath)
       def get_raw_dashboard
         yml = self.class.file_finder(project).read(dashboard_path)
 
-        YAML.safe_load(yml)
+        load_yaml(yml)
       end
 
       def cache_key
diff --git a/app/services/metrics/dashboard/predefined_dashboard_service.rb b/app/services/metrics/dashboard/predefined_dashboard_service.rb
index ee7a529dbc0a98a01294aad0872f1b641f521c3e..295745dfa65601683d72d91f18678a8b12b691f4 100644
--- a/app/services/metrics/dashboard/predefined_dashboard_service.rb
+++ b/app/services/metrics/dashboard/predefined_dashboard_service.rb
@@ -40,7 +40,7 @@ def dashboard_path
       def get_raw_dashboard
         yml = File.read(Rails.root.join(dashboard_path))
 
-        YAML.safe_load(yml)
+        load_yaml(yml)
       end
 
       def sequence
diff --git a/app/services/projects/alerting/notify_service.rb b/app/services/projects/alerting/notify_service.rb
index ca520a43af59e1406fc59163ecb7d478f55cd154..4af3eba5df0b5560936d841c8bba0451799a44c8 100644
--- a/app/services/projects/alerting/notify_service.rb
+++ b/app/services/projects/alerting/notify_service.rb
@@ -65,8 +65,7 @@ def send_email?
       def process_incident_issues(alert)
         return if alert.issue
 
-        IncidentManagement::ProcessAlertWorker
-          .perform_async(project.id, parsed_payload, alert.id)
+        IncidentManagement::ProcessAlertWorker.perform_async(nil, nil, alert.id)
       end
 
       def send_alert_email
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index bffd443c49ffbed29ba0def61b91370417de1fe5..7ef94c9af2c2cc6e9d737f01e7dbf506666d8a7c 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -84,8 +84,12 @@ def allowed_namespace?(user, namespace_id)
     def after_create_actions
       log_info("#{@project.owner.name} created a new project \"#{@project.full_name}\"")
 
+      # Skip writing the config for project imports/forks because it
+      # will always fail since the Git directory doesn't exist until
+      # a background job creates it (see Project#add_import_job).
+      @project.write_repository_config unless @project.import?
+
       unless @project.gitlab_project_import?
-        @project.write_repository_config
         @project.create_wiki unless skip_wiki?
       end
 
diff --git a/app/services/repositories/destroy_service.rb b/app/services/repositories/destroy_service.rb
index b12d07443875a5466b00293d39aa1a1ee281c1bf..1e34dfbe39814cf2ab9a23a6e41827e6733b8290 100644
--- a/app/services/repositories/destroy_service.rb
+++ b/app/services/repositories/destroy_service.rb
@@ -14,8 +14,17 @@ def execute
       log_info(%Q{Repository "#{disk_path}" moved to "#{removal_path}" for repository "#{full_path}"})
 
       current_repository = repository
-      container.run_after_commit do
+
+      # Because GitlabShellWorker is inside a run_after_commit callback it will
+      # never be triggered on a read-only instance.
+      #
+      # Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/223272
+      if Gitlab::Database.read_only?
         Repositories::ShellDestroyService.new(current_repository).execute
+      else
+        container.run_after_commit do
+          Repositories::ShellDestroyService.new(current_repository).execute
+        end
       end
 
       log_info("Repository \"#{full_path}\" was removed")
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index ceec89019516af82b03fbc45772de5fe5503f53c..56350cbd44555354772a683026e6d06672b9baa9 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -57,7 +57,7 @@
       = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control prepend-top-5'
       .help-block
         = _('Specify an e-mail address regex pattern to identify default internal users.')
-        = link_to _('More information'), help_page_path('user/permissions', anchor: 'external-users-permissions'),
+        = link_to _('More information'), help_page_path('user/permissions', anchor: 'setting-new-users-to-external'),
           target: '_blank'
     .form-group
       = f.label :user_show_add_ssh_key_message, _('Prompt users to upload SSH keys'), class: 'label-bold'
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml
index c7918881bdfea563d32a84635e8748faad179914..410820dfb8578c36a7ee2ae8b5eab81f047bb039 100644
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -40,7 +40,7 @@
       = f.text_field :default_artifacts_expire_in, class: 'form-control'
       .form-text.text-muted
         = _("Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: <code>4 mins 2 sec</code>, <code>2h42min</code>.").html_safe
-        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration')
+        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration-core-only')
     .form-group
       = f.label :archive_builds_in_human_readable, _('Archive jobs'), class: 'label-bold'
       = f.text_field :archive_builds_in_human_readable, class: 'form-control', placeholder: 'never'
diff --git a/app/views/admin/application_settings/ci/_header.html.haml b/app/views/admin/application_settings/ci/_header.html.haml
index 9f03936f64af24208ac400778c4e45049cf98d6b..fe86284ba2f7b1de7cb3782485be27592eb92045 100644
--- a/app/views/admin/application_settings/ci/_header.html.haml
+++ b/app/views/admin/application_settings/ci/_header.html.haml
@@ -2,7 +2,7 @@
 
 %h4
   = _('Variables')
-  = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer'
+  = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'custom-environment-variables'), target: '_blank', rel: 'noopener noreferrer'
 
 %button.btn.btn-default.js-settings-toggle{ type: 'button' }
   = expanded ? _('Collapse') : _('Expand')
diff --git a/app/views/ci/variables/_content.html.haml b/app/views/ci/variables/_content.html.haml
index 0b5c1a806b2bddc2a52486878490b2b1e56c6e74..144d13565b287bc0f8878f69d69b04ae2f852ef7 100644
--- a/app/views/ci/variables/_content.html.haml
+++ b/app/views/ci/variables/_content.html.haml
@@ -1,3 +1,3 @@
 = _('Environment variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. Additionally, they can be masked so they are hidden in job logs, though they must match certain regexp requirements to do so. You can use environment variables for passwords, secret keys, or whatever you want.')
 = _('You may also add variables that are made available to the running application by prepending the variable key with <code>K8S_SECRET_</code>.').html_safe
-= link_to _('More information'), help_page_path('ci/variables/README', anchor: 'variables')
+= link_to _('More information'), help_page_path('ci/variables/README', anchor: 'custom-environment-variables')
diff --git a/app/views/ci/variables/_header.html.haml b/app/views/ci/variables/_header.html.haml
index ce4dd5a4877e8c7e54002793f08f343dad444eed..d0148e455de3c8481b895b58e91b80fc73d36c32 100644
--- a/app/views/ci/variables/_header.html.haml
+++ b/app/views/ci/variables/_header.html.haml
@@ -2,7 +2,7 @@
 
 %h4
   = _('Variables')
-  = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer'
+  = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'custom-environment-variables'), target: '_blank', rel: 'noopener noreferrer'
 
 %button.btn.btn-default.js-settings-toggle{ type: 'button' }
   = expanded ? _('Collapse') : _('Expand')
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml
index 4244556a24a6b0f35594308cd6f9c3c026a32756..33210d6b14166d9cbc5cd81afd273c12246cbeb0 100644
--- a/app/views/ci/variables/_variable_row.html.haml
+++ b/app/views/ci/variables/_variable_row.html.haml
@@ -39,7 +39,7 @@
         = value
       %p.masking-validation-error.gl-field-error.hide
         = s_("CiVariables|Cannot use Masked Variable with current value")
-        = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'masked-variables'), target: '_blank', rel: 'noopener noreferrer'
+        = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'mask-a-custom-variable'), target: '_blank', rel: 'noopener noreferrer'
     - unless only_key_value
       .ci-variable-body-item.ci-variable-protected-item.table-section.section-20.mr-0.border-top-0
         .append-right-default
diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml
index e83bf61ab9b26c06026825cfe9ed486ba86d9b4b..2a32b6f14a774e54ed24837ec0d69672920fa3b3 100644
--- a/app/views/clusters/clusters/gcp/_form.html.haml
+++ b/app/views/clusters/clusters/gcp/_form.html.haml
@@ -70,7 +70,7 @@
           label_class: 'label-bold' }
         .form-text.text-muted
           = s_('ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.')
-          = link_to _('More information'), help_page_path('user/project/clusters/add_remove_clusters.md', anchor: 'cloud-run-for-anthos'), target: '_blank'
+          = link_to _('More information'), help_page_path('user/project/clusters/add_gke_clusters.md', anchor: 'cloud-run-for-anthos'), target: '_blank'
 
   .form-group
     = field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'),
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index bd5424c30c67909f2e1c2cc8ce3839cff5457a19..3e9a77d01b45131f563b364a02bb31818b35fd33 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -2,10 +2,6 @@
   .modal-dialog.modal-lg.modal-1040
     .modal-content
       .modal-header
-        %h4.modal-title
-          = _('Keyboard Shortcuts')
-          %small
-            = link_to _('(Show all)'), '#', class: 'js-more-help-button'
         .js-toggle-shortcuts
         %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
           %span{ "aria-hidden": true } &times;
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index 7d539c9d7494fed0b7814ef836dabdfda8f1236e..c0383c57e63746c96319c7a675c6413f8c3525b5 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -1,9 +1,14 @@
-- empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues')
+- if Feature.enabled?(:vue_issuables_list, @project)
+  .js-issuables-list{ data: { endpoint: expose_url(api_v4_projects_issues_path(id: @project.id)),
+    'can-bulk-edit': @can_bulk_update.to_json,
+    'empty-svg-path': image_path('illustrations/issues.svg'),
+    'sort-key': @sort } }
+- else
+  - empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues')
+  %ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position') }
+    = render partial: "projects/issues/issue", collection: @issues
+    - if @issues.blank?
+      = render empty_state_path
 
-%ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position') }
-  = render partial: "projects/issues/issue", collection: @issues
-  - if @issues.blank?
-    = render empty_state_path
-
-- if @issues.present?
-  = paginate @issues, theme: "gitlab", total_pages: @total_pages
+  - if @issues.present?
+    = paginate @issues, theme: "gitlab", total_pages: @total_pages
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index 73904354a12191754e859d9bc75fd25c21c1f139..9bbab925f6af4c4bc04a4552bb88283069a13af9 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -41,7 +41,7 @@
               = _('Create branch')
           %li.divider.droplab-item-ignore
 
-          %li.droplab-item-ignore.gl-ml-3.gl-mr-3.prepend-top-16
+          %li.droplab-item-ignore.gl-ml-3.gl-mr-3.gl-mt-5
             - if can_create_confidential_merge_request?
               #js-forked-project{ data: { namespace_path: @project.namespace.full_path, project_path: @project.full_path, new_fork_path: new_project_fork_path(@project), help_page_path: help_page_path('user/project/merge_requests') } }
             .form-group
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml
index 92edde034a6dcfe7ebb2cace6d1647e8f2afc8cd..07b3adfcb29111f680c5f49566ad1131472c5150 100644
--- a/app/views/projects/pipelines/_with_tabs.html.haml
+++ b/app/views/projects/pipelines/_with_tabs.html.haml
@@ -83,7 +83,7 @@
 
   - if dag_pipeline_tab_enabled
     #js-tab-dag.tab-pane
-      #js-pipeline-dag-vue{ data: { pipeline_data_path: dag_project_pipeline_path(@project, @pipeline) } }
+      #js-pipeline-dag-vue{ data: { pipeline_data_path: dag_project_pipeline_path(@project, @pipeline), empty_svg_path: image_path('illustrations/empty-state/empty-dag-md.svg'), dag_doc_path: help_page_path('ci/yaml/README.md', anchor: 'needs')} }
 
   #js-tab-tests.tab-pane
     #js-pipeline-tests-detail
diff --git a/app/views/projects/services/prometheus/_metrics.html.haml b/app/views/projects/services/prometheus/_metrics.html.haml
index 3bd5f69f67e79fe4fd6516bfd9f9dc68ce228018..8bf150e641528be0cf470c609632e0ba8d2fa7ec 100644
--- a/app/views/projects/services/prometheus/_metrics.html.haml
+++ b/app/views/projects/services/prometheus/_metrics.html.haml
@@ -33,5 +33,5 @@
         .flash-notice
           .flash-text
             = s_("PrometheusService|To set up automatic monitoring, add the environment variable %{variable} to exporter's queries." % { variable: "<code>$CI_ENVIRONMENT_SLUG</code>" }).html_safe
-            = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels')
+            = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'query-variables')
       %ul.list-unstyled.metrics-list.js-missing-var-metrics-list
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index 8b84acb67c169104b721896bac80b068aff25dfb..7284b4bb55de10b32a0450a773de38c1bf5bfe32 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -40,18 +40,18 @@
                   = form.radio_button :deploy_strategy, 'continuous', class: 'form-check-input'
                   = form.label :deploy_strategy_continuous, class: 'form-check-label' do
                     = s_('CICD|Continuous deployment to production')
-                    = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-deploy'), target: '_blank'
+                    = link_to icon('question-circle'), help_page_path('topics/autodevops/stages.md', anchor: 'auto-deploy'), target: '_blank'
 
                 .form-check
                   = form.radio_button :deploy_strategy, 'timed_incremental', class: 'form-check-input'
                   = form.label :deploy_strategy_timed_incremental, class: 'form-check-label' do
                     = s_('CICD|Continuous deployment to production using timed incremental rollout')
-                    = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'timed-incremental-rollout-to-production-premium'), target: '_blank'
+                    = link_to icon('question-circle'), help_page_path('topics/autodevops/customize.md', anchor: 'timed-incremental-rollout-to-production-premium'), target: '_blank'
 
                 .form-check
                   = form.radio_button :deploy_strategy, 'manual', class: 'form-check-input'
                   = form.label :deploy_strategy_manual, class: 'form-check-label' do
                     = s_('CICD|Automatic deployment to staging, manual deployment to production')
-                    = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'incremental-rollout-to-production-premium'), target: '_blank'
+                    = link_to icon('question-circle'), help_page_path('topics/autodevops/customize.md', anchor: 'incremental-rollout-to-production-premium'), target: '_blank'
 
           = f.submit _('Save changes'), class: "btn btn-success prepend-top-15", data: { qa_selector: 'save_changes_button' }
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml
index 77af4f09408098df90ac210e9b4570ed6fcddcd4..413df29da772a3be97f8d1f28108fd4e868d0ab1 100644
--- a/app/views/shared/form_elements/_description.html.haml
+++ b/app/views/shared/form_elements/_description.html.haml
@@ -1,20 +1,16 @@
 - project = local_assigns.fetch(:project)
 - model = local_assigns.fetch(:model)
-
-
-
 - form = local_assigns.fetch(:form)
 - placeholder = model.is_a?(MergeRequest) ? _('Describe the goal of the changes and what reviewers should be aware of.') : _('Write a comment or drag your files here…')
-- supports_quick_actions = model.new_record?
 
-- if supports_quick_actions
-  - preview_url = preview_markdown_path(project, target_type: model.class.name)
-- else
-  - preview_url = preview_markdown_path(project)
+- supports_quick_actions = true
+- preview_url = preview_markdown_path(project, target_type: model.class.name)
 
 .form-group.row.detail-page-description
   = form.label :description, 'Description', class: 'col-form-label col-sm-2'
   .col-sm-10
+    - if model.is_a?(MergeRequest)
+      = hidden_field_tag :merge_request_diff_head_sha, model.diff_head_sha
 
     - if model.is_a?(Issuable)
       = render 'shared/issuable/form/template_selector', issuable: model
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml
index c766f77fe6a18bbbeba3b3f6c9ed0b37f3a447d4..5b6d1169b4b43375630b31247d9072e25a149ebe 100644
--- a/app/views/users/_overview.html.haml
+++ b/app/views/users/_overview.html.haml
@@ -9,7 +9,7 @@
   .col-md-12.col-lg-6
     - if can?(current_user, :read_cross_project)
       .activities-block
-        .prepend-top-16
+        .gl-mt-5
           .d-flex.align-items-center.border-bottom
             %h4.flex-grow
               = s_('UserProfile|Activity')
@@ -20,7 +20,7 @@
 
   .col-md-12.col-lg-6
     .projects-block
-      .prepend-top-16
+      .gl-mt-5
         .d-flex.align-items-center.border-bottom
           %h4.flex-grow
             = s_('UserProfile|Personal projects')
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index d9f6139beb6c00216077edf5b9bb3ab865b8ef68..64d27affd2c66ccb50bd1ffa0804227b00296f41 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -339,14 +339,6 @@
   :weight: 1
   :idempotent: 
   :tags: []
-- :name: cronjob:stuck_import_jobs
-  :feature_category: :importers
-  :has_external_dependencies: 
-  :urgency: :low
-  :resource_boundary: :cpu
-  :weight: 1
-  :idempotent: 
-  :tags: []
 - :name: cronjob:stuck_merge_jobs
   :feature_category: :source_code_management
   :has_external_dependencies: 
diff --git a/app/workers/incident_management/process_alert_worker.rb b/app/workers/incident_management/process_alert_worker.rb
index 0af34fa35d589b7275fbda468a70c343c9581435..bc23dbda69371dc592110c2c9c0f6ab68722c93f 100644
--- a/app/workers/incident_management/process_alert_worker.rb
+++ b/app/workers/incident_management/process_alert_worker.rb
@@ -7,39 +7,45 @@ class ProcessAlertWorker # rubocop:disable Scalability/IdempotentWorker
     queue_namespace :incident_management
     feature_category :incident_management
 
-    def perform(project_id, alert_payload, am_alert_id = nil)
-      project = find_project(project_id)
-      return unless project
+    # `project_id` and `alert_payload` are deprecated and can be removed
+    # starting from 14.0 release
+    # https://gitlab.com/gitlab-org/gitlab/-/issues/224500
+    def perform(_project_id = nil, _alert_payload = nil, alert_id = nil)
+      return unless alert_id
 
-      new_issue = create_issue(project, alert_payload)
-      return unless am_alert_id && new_issue&.persisted?
+      alert = find_alert(alert_id)
+      return unless alert
+
+      new_issue = create_issue_for(alert)
+      return unless new_issue&.persisted?
 
-      link_issue_with_alert(am_alert_id, new_issue.id)
+      link_issue_with_alert(alert, new_issue.id)
     end
 
     private
 
-    def find_project(project_id)
-      Project.find_by_id(project_id)
+    def find_alert(alert_id)
+      AlertManagement::Alert.find_by_id(alert_id)
+    end
+
+    def parsed_payload(alert)
+      Gitlab::Alerting::NotificationPayloadParser.call(alert.payload.to_h, alert.project)
     end
 
-    def create_issue(project, alert_payload)
+    def create_issue_for(alert)
       IncidentManagement::CreateIssueService
-        .new(project, alert_payload)
+        .new(alert.project, parsed_payload(alert))
         .execute
         .dig(:issue)
     end
 
-    def link_issue_with_alert(alert_id, issue_id)
-      alert = AlertManagement::Alert.find_by_id(alert_id)
-      return unless alert
-
+    def link_issue_with_alert(alert, issue_id)
       return if alert.update(issue_id: issue_id)
 
       Gitlab::AppLogger.warn(
         message: 'Cannot link an Issue with Alert',
         issue_id: issue_id,
-        alert_id: alert_id,
+        alert_id: alert.id,
         alert_errors: alert.errors.messages
       )
     end
diff --git a/app/workers/stuck_import_jobs_worker.rb b/app/workers/stuck_import_jobs_worker.rb
deleted file mode 100644
index ce8d5bf0219cf30f3e57690d987b47b340c9ac92..0000000000000000000000000000000000000000
--- a/app/workers/stuck_import_jobs_worker.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class StuckImportJobsWorker # rubocop:disable Scalability/IdempotentWorker
-  include Gitlab::Import::StuckImportJob
-
-  private
-
-  def track_metrics(with_jid_count, without_jid_count)
-    Gitlab::Metrics.add_event(
-      :stuck_import_jobs,
-      projects_without_jid_count: without_jid_count,
-      projects_with_jid_count: with_jid_count
-    )
-  end
-
-  def enqueued_import_states
-    ProjectImportState.with_status([:scheduled, :started])
-  end
-end
diff --git a/changelogs/unreleased/16877-quick-actions-on-description-edit.yml b/changelogs/unreleased/16877-quick-actions-on-description-edit.yml
new file mode 100644
index 0000000000000000000000000000000000000000..997576127f429b488c4c6da6171facc1cd5b68ea
--- /dev/null
+++ b/changelogs/unreleased/16877-quick-actions-on-description-edit.yml
@@ -0,0 +1,5 @@
+---
+title: Support quick actions when editing issue, merge request, and epic descriptions
+merge_request: 31186
+author:
+type: added
diff --git a/changelogs/unreleased/199250-release-generation-from-within-gitlab-ci-yml.yml b/changelogs/unreleased/199250-release-generation-from-within-gitlab-ci-yml.yml
new file mode 100644
index 0000000000000000000000000000000000000000..86ef117a0e2a3890cbcac866ccdc6a93fd1f6b8d
--- /dev/null
+++ b/changelogs/unreleased/199250-release-generation-from-within-gitlab-ci-yml.yml
@@ -0,0 +1,5 @@
+---
+title: Release generation via gitlab-ci.yml documentation
+merge_request: 19237
+author:
+type: added
diff --git a/changelogs/unreleased/201840-link-testwidget.yml b/changelogs/unreleased/201840-link-testwidget.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d489755b20c295ef44ae5b39fff4735d31c870e9
--- /dev/null
+++ b/changelogs/unreleased/201840-link-testwidget.yml
@@ -0,0 +1,5 @@
+---
+title: Link to test reports from MR Widget
+merge_request: 29729
+author:
+type: added
diff --git a/changelogs/unreleased/217648-add-no-graph-empty-state-for-dag.yml b/changelogs/unreleased/217648-add-no-graph-empty-state-for-dag.yml
new file mode 100644
index 0000000000000000000000000000000000000000..67032fb5be8bdb388733411bdebb46c768d51680
--- /dev/null
+++ b/changelogs/unreleased/217648-add-no-graph-empty-state-for-dag.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve Add no graph empty state for DAG
+merge_request: 35053
+author:
+type: changed
diff --git a/changelogs/unreleased/222253-close-issue-on-resolved-alert.yml b/changelogs/unreleased/222253-close-issue-on-resolved-alert.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d50c696f6d8ac1ff15f5e9f7ba27f9fb8c9051f7
--- /dev/null
+++ b/changelogs/unreleased/222253-close-issue-on-resolved-alert.yml
@@ -0,0 +1,6 @@
+---
+title: Automatically close related issue when resolving Alert Management Prometheus
+  Alert
+merge_request: 35208
+author:
+type: added
diff --git a/changelogs/unreleased/223790-nan-or-null-values-should-not-be-removed.yml b/changelogs/unreleased/223790-nan-or-null-values-should-not-be-removed.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ed858bc32bba9aea077403922d120e93261329af
--- /dev/null
+++ b/changelogs/unreleased/223790-nan-or-null-values-should-not-be-removed.yml
@@ -0,0 +1,5 @@
+---
+title: Stop removing NaN values from monitoring data series
+merge_request: 35086
+author:
+type: changed
diff --git a/changelogs/unreleased/35077-custom-renderer-identifiers.yml b/changelogs/unreleased/35077-custom-renderer-identifiers.yml
new file mode 100644
index 0000000000000000000000000000000000000000..909e0edc126623ee9aef6824ddb3880a2ef7c7df
--- /dev/null
+++ b/changelogs/unreleased/35077-custom-renderer-identifiers.yml
@@ -0,0 +1,5 @@
+---
+title: Add a custom HTML renderer to the Static Site Editor for markdown identifier syntax
+merge_request: 35077
+author:
+type: added
diff --git a/changelogs/unreleased/502-add-toggles-help-text-int-test-gitlab-ui-integration-test.yml b/changelogs/unreleased/502-add-toggles-help-text-int-test-gitlab-ui-integration-test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..24990c85d472b502d9da368ad58def315bcd12d8
--- /dev/null
+++ b/changelogs/unreleased/502-add-toggles-help-text-int-test-gitlab-ui-integration-test.yml
@@ -0,0 +1,5 @@
+---
+title: Update gl-toggles with deprecated attributes
+merge_request: 34660
+author:
+type: changed
diff --git a/changelogs/unreleased/ab-revert-schema-create.yml b/changelogs/unreleased/ab-revert-schema-create.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7deb28f42cea541286a94fbcf8bdacb09d34802b
--- /dev/null
+++ b/changelogs/unreleased/ab-revert-schema-create.yml
@@ -0,0 +1,5 @@
+---
+title: Drop partitions_dynamic schema if it exists
+merge_request: 35426
+author:
+type: other
diff --git a/changelogs/unreleased/docs-links-from-ui.yml b/changelogs/unreleased/docs-links-from-ui.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c845768a223d6a919e9058d579487a91f154fecd
--- /dev/null
+++ b/changelogs/unreleased/docs-links-from-ui.yml
@@ -0,0 +1,5 @@
+---
+title: Update UI links to docs in core features
+merge_request: 35488
+author:
+type: other
diff --git a/changelogs/unreleased/fix-open-sse-on-subgroups.yml b/changelogs/unreleased/fix-open-sse-on-subgroups.yml
new file mode 100644
index 0000000000000000000000000000000000000000..41ef3a5054c3922e4454f6813bf559ca0ef4132f
--- /dev/null
+++ b/changelogs/unreleased/fix-open-sse-on-subgroups.yml
@@ -0,0 +1,5 @@
+---
+title: 'Static Site Editor can’t be opened in projects belonging to a subgroup'
+merge_request: 35378
+author:
+type: fixed
diff --git a/changelogs/unreleased/fj-223705-add-snippets-size-to-project-statistics-entity.yml b/changelogs/unreleased/fj-223705-add-snippets-size-to-project-statistics-entity.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f2c4953f4a384e8a9ac6b670fc5ccd6e83a777ac
--- /dev/null
+++ b/changelogs/unreleased/fj-223705-add-snippets-size-to-project-statistics-entity.yml
@@ -0,0 +1,5 @@
+---
+title: Expose snippets_size in ProjectStatistics Entity
+merge_request: 35316
+author:
+type: changed
diff --git a/changelogs/unreleased/fj-223706-add-snippets-size-to-project-statistics-type.yml b/changelogs/unreleased/fj-223706-add-snippets-size-to-project-statistics-type.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dc7ac3b0abb6c440a43d8239146ac38813dd0289
--- /dev/null
+++ b/changelogs/unreleased/fj-223706-add-snippets-size-to-project-statistics-type.yml
@@ -0,0 +1,5 @@
+---
+title: Add snippets_size to ProjectStatistics GraphQL type
+merge_request: 35319
+author:
+type: changed
diff --git a/changelogs/unreleased/hpaluch-master.yml b/changelogs/unreleased/hpaluch-master.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b71b7b89f6be6e5feed9cbbc5d0ce173af726cd6
--- /dev/null
+++ b/changelogs/unreleased/hpaluch-master.yml
@@ -0,0 +1,5 @@
+---
+title: Log name of class that failed to obtain exclusive lease
+merge_request: 35228
+author:
+type: added
diff --git a/changelogs/unreleased/osw-update-gitlab-pages-to-1-20.yml b/changelogs/unreleased/osw-update-gitlab-pages-to-1-20.yml
new file mode 100644
index 0000000000000000000000000000000000000000..36f83fa9c9a29ec2f87bf4724687751e34a70b72
--- /dev/null
+++ b/changelogs/unreleased/osw-update-gitlab-pages-to-1-20.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Pages to 1.20.0
+merge_request: 35177
+author:
+type: added
diff --git a/changelogs/unreleased/remove-some-tabs-from-pipelines-list.yml b/changelogs/unreleased/remove-some-tabs-from-pipelines-list.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cab2a15dd3c96323d0990d0b9f5ccae967fe3bf5
--- /dev/null
+++ b/changelogs/unreleased/remove-some-tabs-from-pipelines-list.yml
@@ -0,0 +1,5 @@
+---
+title: Remove pending and running tabs from pipelines list and remove count from finished tab
+merge_request: 35062
+author:
+type: changed
diff --git a/changelogs/unreleased/rp-use-gitlab-yaml-loader-dashboard-stages.yml b/changelogs/unreleased/rp-use-gitlab-yaml-loader-dashboard-stages.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c6e93dc21e03a13d6f859a82b278ccd0c2641469
--- /dev/null
+++ b/changelogs/unreleased/rp-use-gitlab-yaml-loader-dashboard-stages.yml
@@ -0,0 +1,5 @@
+---
+title: Display error if metrics dashboard YAML is too large
+merge_request: 34834
+author:
+type: changed
diff --git a/changelogs/unreleased/sh-disable-gitconfig-write-on-imports-and-forks.yml b/changelogs/unreleased/sh-disable-gitconfig-write-on-imports-and-forks.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f376b42a12adf03f56c0e1120dd3416c21c41c81
--- /dev/null
+++ b/changelogs/unreleased/sh-disable-gitconfig-write-on-imports-and-forks.yml
@@ -0,0 +1,5 @@
+---
+title: Defer updating .git/config for imported projects
+merge_request: 35308
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-update-git-config-for-forks.yml b/changelogs/unreleased/sh-update-git-config-for-forks.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4827f01feec8a7248b173267982a058310e24785
--- /dev/null
+++ b/changelogs/unreleased/sh-update-git-config-for-forks.yml
@@ -0,0 +1,5 @@
+---
+title: Ensure .git/config is updated for forks
+merge_request: 35305
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-update-sidekiq-5-2-9.yml b/changelogs/unreleased/sh-update-sidekiq-5-2-9.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b9ed75100286bcaad6d1b0b004cb50b6c0f08d37
--- /dev/null
+++ b/changelogs/unreleased/sh-update-sidekiq-5-2-9.yml
@@ -0,0 +1,5 @@
+---
+title: Update Sidekiq to v5.2.9
+merge_request: 35495
+author:
+type: other
diff --git a/changelogs/unreleased/support-warnings-in-pipeline-creation.yml b/changelogs/unreleased/support-warnings-in-pipeline-creation.yml
new file mode 100644
index 0000000000000000000000000000000000000000..88202c9a5167fef1c36da639e8818016275fe460
--- /dev/null
+++ b/changelogs/unreleased/support-warnings-in-pipeline-creation.yml
@@ -0,0 +1,5 @@
+---
+title: Store pipeline creation errors and warnings into Ci::PipelineMessage
+merge_request: 33762
+author:
+type: other
diff --git a/changelogs/unreleased/tr-alert-column-spacing.yml b/changelogs/unreleased/tr-alert-column-spacing.yml
new file mode 100644
index 0000000000000000000000000000000000000000..95f107935f8f61021b0ef66aee5aec6711a8a8cb
--- /dev/null
+++ b/changelogs/unreleased/tr-alert-column-spacing.yml
@@ -0,0 +1,5 @@
+---
+title: Improve alert list spacing
+merge_request: 35400
+author:
+type: fixed
diff --git a/db/migrate/20200622104923_create_ci_pipeline_messages_table.rb b/db/migrate/20200622104923_create_ci_pipeline_messages_table.rb
new file mode 100644
index 0000000000000000000000000000000000000000..40d63b1189e161dfce293c99f267509b8202fe55
--- /dev/null
+++ b/db/migrate/20200622104923_create_ci_pipeline_messages_table.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class CreateCiPipelineMessagesTable < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  ERROR_SEVERITY = 0
+  MAX_CONTENT_LENGTH = 10_000
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      create_table :ci_pipeline_messages do |t|
+        t.integer :severity, null: false, default: ERROR_SEVERITY, limit: 2
+        t.references :pipeline, index: true, null: false, foreign_key: { to_table: :ci_pipelines, on_delete: :cascade }, type: :integer
+        t.text :content, null: false
+      end
+    end
+
+    add_text_limit :ci_pipeline_messages, :content, MAX_CONTENT_LENGTH
+  end
+
+  def down
+    drop_table :ci_pipeline_messages
+  end
+end
diff --git a/db/migrate/20200626130220_drop_partitions_dynamic_schema_if_exists.rb b/db/migrate/20200626130220_drop_partitions_dynamic_schema_if_exists.rb
new file mode 100644
index 0000000000000000000000000000000000000000..fa31bc8ff0e5ad1df350e92dcc4f353f7019ab3b
--- /dev/null
+++ b/db/migrate/20200626130220_drop_partitions_dynamic_schema_if_exists.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class DropPartitionsDynamicSchemaIfExists < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    # This targets GitLab.com only - we deployed a migration to create this schema, but reverted the change
+    execute 'DROP SCHEMA IF EXISTS partitions_dynamic'
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 480fb3323e7991ac18500d1f2c74bb2fdea245e5..4ffd1e379ac55e6101eec33057d3318d33355e5a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -9936,6 +9936,23 @@ CREATE SEQUENCE public.ci_pipeline_chat_data_id_seq
 
 ALTER SEQUENCE public.ci_pipeline_chat_data_id_seq OWNED BY public.ci_pipeline_chat_data.id;
 
+CREATE TABLE public.ci_pipeline_messages (
+    id bigint NOT NULL,
+    severity smallint DEFAULT 0 NOT NULL,
+    pipeline_id integer NOT NULL,
+    content text NOT NULL,
+    CONSTRAINT check_58ca2981b2 CHECK ((char_length(content) <= 10000))
+);
+
+CREATE SEQUENCE public.ci_pipeline_messages_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE public.ci_pipeline_messages_id_seq OWNED BY public.ci_pipeline_messages.id;
+
 CREATE TABLE public.ci_pipeline_schedule_variables (
     id integer NOT NULL,
     key character varying NOT NULL,
@@ -16293,6 +16310,8 @@ ALTER TABLE ONLY public.ci_job_variables ALTER COLUMN id SET DEFAULT nextval('pu
 
 ALTER TABLE ONLY public.ci_pipeline_chat_data ALTER COLUMN id SET DEFAULT nextval('public.ci_pipeline_chat_data_id_seq'::regclass);
 
+ALTER TABLE ONLY public.ci_pipeline_messages ALTER COLUMN id SET DEFAULT nextval('public.ci_pipeline_messages_id_seq'::regclass);
+
 ALTER TABLE ONLY public.ci_pipeline_schedule_variables ALTER COLUMN id SET DEFAULT nextval('public.ci_pipeline_schedule_variables_id_seq'::regclass);
 
 ALTER TABLE ONLY public.ci_pipeline_schedules ALTER COLUMN id SET DEFAULT nextval('public.ci_pipeline_schedules_id_seq'::regclass);
@@ -17203,6 +17222,9 @@ ALTER TABLE ONLY public.ci_job_variables
 ALTER TABLE ONLY public.ci_pipeline_chat_data
     ADD CONSTRAINT ci_pipeline_chat_data_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY public.ci_pipeline_messages
+    ADD CONSTRAINT ci_pipeline_messages_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY public.ci_pipeline_schedule_variables
     ADD CONSTRAINT ci_pipeline_schedule_variables_pkey PRIMARY KEY (id);
 
@@ -18605,6 +18627,8 @@ CREATE INDEX index_ci_pipeline_chat_data_on_chat_name_id ON public.ci_pipeline_c
 
 CREATE UNIQUE INDEX index_ci_pipeline_chat_data_on_pipeline_id ON public.ci_pipeline_chat_data USING btree (pipeline_id);
 
+CREATE INDEX index_ci_pipeline_messages_on_pipeline_id ON public.ci_pipeline_messages USING btree (pipeline_id);
+
 CREATE UNIQUE INDEX index_ci_pipeline_schedule_variables_on_schedule_id_and_key ON public.ci_pipeline_schedule_variables USING btree (pipeline_schedule_id, key);
 
 CREATE INDEX index_ci_pipeline_schedules_on_next_run_at_and_active ON public.ci_pipeline_schedules USING btree (next_run_at, active);
@@ -21844,6 +21868,9 @@ ALTER TABLE ONLY public.packages_conan_metadata
 ALTER TABLE ONLY public.vulnerability_feedback
     ADD CONSTRAINT fk_rails_8c77e5891a FOREIGN KEY (issue_id) REFERENCES public.issues(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY public.ci_pipeline_messages
+    ADD CONSTRAINT fk_rails_8d3b04e3e1 FOREIGN KEY (pipeline_id) REFERENCES public.ci_pipelines(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY public.approval_merge_request_rules_approved_approvers
     ADD CONSTRAINT fk_rails_8dc94cff4d FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
 
@@ -23417,6 +23444,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200622070620
 20200622095419
 20200622103836
+20200622104923
 20200622235737
 20200623000148
 20200623000320
@@ -23425,5 +23453,6 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200623185440
 20200624075411
 20200625045442
+20200626130220
 \.
 
diff --git a/doc/administration/auth/ldap/index.md b/doc/administration/auth/ldap/index.md
index 4a7a972596f42aa76b08c67a24d2a4918086275f..80d0ef4d6583b20bc1dce3bc92bb4fd2bd4f0b50 100644
--- a/doc/administration/auth/ldap/index.md
+++ b/doc/administration/auth/ldap/index.md
@@ -605,6 +605,12 @@ When enabled, the following applies:
 - Users are not allowed to share project with other groups or invite members to
   a project created in a group.
 
+To enable it you need to:
+
+1. [Enable LDAP](#configuration-core-only)
+1. Navigate to **(admin)** **Admin Area > Settings -> Visibility and access controls**.
+1. Make sure the "Lock memberships to LDAP synchronization" checkbox is enabled.
+
 ### Adjusting LDAP group sync schedule **(STARTER ONLY)**
 
 NOTE: **Note:**
diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md
index 8f48e0df4d411e98529c286ba46bd0242f66f8cf..de8263166ad2abc28e8100c1363a487a962bbc4a 100644
--- a/doc/administration/geo/replication/datatypes.md
+++ b/doc/administration/geo/replication/datatypes.md
@@ -159,7 +159,7 @@ successfully, you must replicate their data using some other means.
 | [Composer Repository](../../../user/packages/composer_repository/index.md) | **Yes** (13.2)                                             | No                                                      |                                                                                                            |
 | [External merge request diffs](../../merge_request_diffs.md)         | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/33817)  | No                                                      |                                           |
 | [Terraform State](../../terraform_state.md)                                                                  | [No](https://gitlab.com/groups/gitlab-org/-/epics/3112)(*3*) | No                                                        |                                                                                                            |
-| [Vulnerability Export](../../../user/application_security/security_dashboard/#export-vulnerabilities-1)      | [No](https://gitlab.com/groups/gitlab-org/-/epics/3111)(*3*) | No                                                        |                                                                                                            |                                                                                                            |
+| [Vulnerability Export](../../../user/application_security/security_dashboard/#export-vulnerabilities)      | [No](https://gitlab.com/groups/gitlab-org/-/epics/3111)(*3*) | No                                                        |                                                                                                            |                                                                                                            |
 | Content in object storage                                            | **Yes** (12.4)                                                 | No                                                      |                                                                                                            |
 
 - (*1*): The integrity can be verified manually using
diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md
index 5dfa2c72ebf423aa263e333bfe3af7b8a4c99a99..3ab9d7f16e48034215b22f915ced427cc2e03157 100644
--- a/doc/administration/incoming_email.md
+++ b/doc/administration/incoming_email.md
@@ -21,6 +21,11 @@ GitLab has several features based on receiving incoming emails:
 
 ## Requirements
 
+NOTE: **Note:**
+It is **not** recommended to use an email address that receives or will receive any
+messages not intended for the GitLab instance. Any incoming emails not intended
+for GitLab will receive a reject notice.
+
 Handling incoming emails requires an [IMAP](https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol)-enabled
 email account. GitLab requires one of the following three strategies:
 
@@ -106,6 +111,16 @@ Alternatively, use a dedicated domain for GitLab email communications such as
 See GitLab issue [#30366](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30366)
 for a real-world example of this exploit.
 
+CAUTION:**Caution:**
+Be sure to use a mail server that has been configured to reduce
+spam.
+A Postfix mail server that is running on a default configuration, for example,
+can result in abuse. All messages received on the configured mailbox will be processed
+and messages that are not intended for the GitLab instance will receive a reject notice.
+If the sender's address is spoofed, the reject notice will be delivered to the spoofed
+`FROM` address, which can cause the mail server's IP or domain to appear on a block
+list.
+
 ### Omnibus package installations
 
 1. Find the `incoming_email` section in `/etc/gitlab/gitlab.rb`, enable the feature
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 0cbe2bac11c39f538748a4afcdbdd684dbd1e3ba..d0a03534c6b69575df72da40d0222a802501aafa 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -10134,6 +10134,11 @@ type ProjectStatistics {
   """
   repositorySize: Float!
 
+  """
+  Snippets size of the project
+  """
+  snippetsSize: Float
+
   """
   Storage size of the project
   """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index b45b36ed3048656fc0c988202efbf8552abba70c..7e53d48594e1142246c3829795bde890ad5669d7 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -29952,6 +29952,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "snippetsSize",
+              "description": "Snippets size of the project",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "storageSize",
               "description": "Storage size of the project",
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 3e55ca9fbdfb4f72d2bee8538786fb158f78066b..43191025c44629e5bd0d9753e8504477da9031e5 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1478,6 +1478,7 @@ Represents a Project Member
 | `lfsObjectsSize` | Float! | Large File Storage (LFS) object size of the project |
 | `packagesSize` | Float! | Packages size of the project |
 | `repositorySize` | Float! | Repository size of the project |
+| `snippetsSize` | Float | Snippets size of the project |
 | `storageSize` | Float! | Storage size of the project |
 | `wikiSize` | Float | Wiki size of the project |
 
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 0cdeecc87a7e17a41116f2309d2034cc55635c7b..6d56ab9befe978bac1d11903c1fd6d91bd0f1617 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -175,7 +175,8 @@ When the user is authenticated and `simple` is not set this returns something li
       "wiki_size" : 0,
       "lfs_objects_size": 0,
       "job_artifacts_size": 0,
-      "packages_size": 0
+      "packages_size": 0,
+      "snippets_size": 0
     },
     "_links": {
       "self": "http://example.com/api/v4/projects",
@@ -277,7 +278,8 @@ When the user is authenticated and `simple` is not set this returns something li
       "wiki_size" : 0,
       "lfs_objects_size": 0,
       "job_artifacts_size": 0,
-      "packages_size": 0
+      "packages_size": 0,
+      "snippets_size": 0
     },
     "_links": {
       "self": "http://example.com/api/v4/projects",
@@ -426,7 +428,8 @@ This endpoint supports [keyset pagination](README.md#keyset-based-pagination) fo
       "wiki_size" : 0,
       "lfs_objects_size": 0,
       "job_artifacts_size": 0,
-      "packages_size": 0
+      "packages_size": 0,
+      "snippets_size": 0
     },
     "_links": {
       "self": "http://example.com/api/v4/projects",
@@ -528,7 +531,8 @@ This endpoint supports [keyset pagination](README.md#keyset-based-pagination) fo
       "wiki_size" : 0,
       "lfs_objects_size": 0,
       "job_artifacts_size": 0,
-      "packages_size": 0
+      "packages_size": 0,
+      "snippets_size": 0
     },
     "_links": {
       "self": "http://example.com/api/v4/projects",
@@ -899,7 +903,8 @@ GET /projects/:id
     "wiki_size" : 0,
     "lfs_objects_size": 0,
     "job_artifacts_size": 0,
-    "packages_size": 0
+    "packages_size": 0,
+    "snippets_size": 0
   },
   "_links": {
     "self": "http://example.com/api/v4/projects",
diff --git a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
index 3b8be54ae59507fd93555b0255d387aebaa1a6a8..41546be78f65df9518af2ffe75bf417200d6bffb 100644
--- a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
+++ b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
@@ -50,7 +50,7 @@ The JWT's payload looks like this:
 }
 ```
 
-The JWT is encoded by using RS256 and signed with your GitLab instance's OpenID Connect private key. The expire time for the token will be set to job's timeout, if specifed, or 5 minutes if it is not. The key used to sign this token may change without any notice. In such case retrying the job will generate new JWT using the current signing key.
+The JWT is encoded by using RS256 and signed with your GitLab instance's OpenID Connect private key. The expire time for the token will be set to job's timeout, if specified, or 5 minutes if it is not. The key used to sign this token may change without any notice. In such case retrying the job will generate new JWT using the current signing key.
 
 You can use this JWT and your instance's JWKS endpoint (`https://gitlab.example.com/-/jwks`) to authenticate with a Vault server that is configured to allow the JWT Authentication method for authentication.
 
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index 9466e394a0ee1ff6167c6b6b092fce97fd3cafc3..a68483f215c020e01abb653cc1a70565e4017865 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -43,9 +43,8 @@ each group](../../user/admin_area/settings/continuous_integration.md#shared-runn
 
 If you are using GitLab.com, you can select from a list of
 [shared Runners that GitLab maintains](../../user/gitlab_com/index.md#shared-runners).
-You can use Shared Runners for a limited number of
-[minutes](../../subscriptions/index.md#ci-pipeline-minutes) each month, based on
-your [GitLab.com tier](https://about.gitlab.com/pricing/).
+When you use the GitLab.com shared Runners, they consume the
+[pipelines minutes](../../subscriptions/index.md#ci-pipeline-minutes) included with your account.
 
 #### How shared Runners pick jobs
 
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 6221d0204843e9a9492a47cd52ff89034c3e22e6..42a238148e9e84bad744c4e8269403dd2144d4a3 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -896,7 +896,7 @@ if [[ -d "/builds/gitlab-examples/ci-debug-trace/.git" ]]; then
 ++ CI_SERVER_VERSION_PATCH=0
 ++ export CI_SERVER_REVISION=f4cc00ae823
 ++ CI_SERVER_REVISION=f4cc00ae823
-++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
+++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
 ++ GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
 ++ export CI_PROJECT_ID=17893
 ++ CI_PROJECT_ID=17893
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 858639598c8bab233288fad3ec65cc1085370470..1d25ccbedc079f1e8af49973bf1f390e79b4273e 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -130,6 +130,7 @@ The following table lists available parameters for jobs:
 | [`variables`](#variables)                          | Define job variables on a job level.                                                                                                                                                |
 | [`interruptible`](#interruptible)                  | Defines if a job can be canceled when made redundant by a newer run.                                                                                                                |
 | [`resource_group`](#resource_group)                | Limit job concurrency.                                                                                                                                                              |
+| [`release`](#release) | Instructs the Runner to generate a [Release](../../user/project/releases/index.md) object. |
 
 NOTE: **Note:**
 Parameters `types` and `type` are [deprecated](#deprecated-parameters).
@@ -256,8 +257,8 @@ karma:
 
 ### `stages`
 
-`stages` is used to define stages that can be used by jobs and is defined
-globally.
+`stages` is used to define stages that contain jobs and is defined
+globally for the pipeline.
 
 The specification of `stages` allows for having flexible multi stage pipelines.
 The ordering of elements in `stages` defines the ordering of jobs' execution:
@@ -3594,6 +3595,164 @@ It can't start or end with `/`.
 
 For more information, see [Deployments Safety](../environments/deployment_safety.md).
 
+### `release`
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/19298) in GitLab 13.2.
+
+`release` indicates that the job will create a [Release](../../user/project/releases/index.md),
+and optionally include URLs for Release assets.
+
+These methods are supported:
+
+- [`name`](#releasename)
+- [`description`](#releasedescription)
+- [`tag_name`](#releasetag_name)
+- [`ref`](#releaseref)
+- [`milestones`](#releasemilestones)
+- [`released_at`](#releasereleased_at)
+
+The Release is created only if the job processes without error. If the Rails API
+returns an error during Release creation, the `release` job fails.
+
+#### Tags
+
+A `release` job should not be run against a tag commit, or it will continually re-trigger itself. This can be specified by including:
+
+```yaml
+only:
+  - tags
+```
+
+#### `release-cli` Docker image
+
+The Docker image to use for the `release-cli` must be specified, using the following directive:
+
+```yaml
+image: registry.gitlab.com/gitlab-org/release-cli:latest
+```
+
+#### Script
+
+All jobs require a `script` tag at a minimum. A `:release` job can use the output of a
+`:script` tag, but if this is not necessary, a placeholder script can be used, for example:
+
+```yaml
+script:
+  - echo 'release job'
+```
+
+An [issue](https://gitlab.com/gitlab-org/gitlab/-/issues/223856) exists to remove this requirement in an upcoming version of GitLab.
+
+A pipeline can have multiple `release` jobs, for example:
+
+```yaml
+ios-release:
+  script: release > changelog.md
+  release:
+     tag_name: v1.0.0-ios
+     description: changelog.md
+
+android-release:
+  script: release > changelog.md
+  release:
+     tag_name: v1.0.0-android
+     description: changelog.md
+```
+
+#### `release:tag_name`
+
+The `tag_name` must be specified. It can refer to an existing Git tag or can be specified by the user.
+
+When the specified tag doesn't exist in repository, a new tag is created from the associated SHA of the pipeline.
+
+For example, when creating a Release from a Git tag:
+
+```yaml
+job:
+  release:
+    tag_name: $CI_COMMIT_TAG
+    description: changelog.txt
+  only:
+    - tags
+```
+
+It is also possible to create any unique tag, in which case `only: tags` is not mandatory.
+A semantic versioning example:
+
+```yaml
+job:
+  release:
+    tag_name: ${MAJOR}_${MINOR}_${REVISION}
+    description: changelog.txt
+```
+
+- The Release is created only if the job's main script succeeds.
+- If the Release already exists, it is not updated and the job with the `release` keyword fails.
+- The `release` section executes after the `script` tag and before the `after_script`.
+
+#### `release:name`
+
+The Release name. This is an optional field. If omitted, it is populated with
+`release:tag_name`.
+
+#### `release:description`
+
+Specifies a file containing the longer description of the Release. This is a mandatory
+field and can point to a changelog.
+
+#### `release:ref`
+
+When the `tag_name` does not exist, `release:ref` specifies the commit to be used instead of the pipeline `ref`. If `tag_name` doesn’t exist, the release will be created from `ref`. `ref` can be a commit SHA, another tag name, or a branch name.
+
+#### `release:milestones`
+
+The title of each milestone the release is associated with.
+
+#### `release:released_at`
+
+The date when the release will be or was ready. Defaults to the current time. Expected in ISO 8601 format (2019-03-15T08:00:00Z).
+
+#### Complete example for `release`
+
+Combining the individual examples given above for `release`, we'd have the following code snippet:
+
+```yaml
+stages:
+- build
+- test
+- release-stg
+
+release_job:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  only:
+    - tags
+  script:
+    - echo 'running release_job'
+  release:
+     name: 'Release $CI_COMMIT_SHA'
+     description: 'Created using the release-cli $EXTRA_DESCRIPTION'
+     tag_name: 'release-$CI_COMMIT_SHA'
+     ref: '$CI_COMMIT_SHA'
+     milestones:
+       - 'm1'
+       - 'm2'
+       - 'm3'
+     released_at: '2020-07-15T08:00:00Z'
+```
+
+#### `releaser-cli` command line
+
+The entries under the `:release` node are transformed into a `bash` command line and sent
+to the Docker container, which contains the [release-cli](https://gitlab.com/gitlab-org/release-cli).
+You can also call the `release-cli` directly from a `script` entry.
+
+The YAML described above would be transferred into a command line like this:
+
+```shell
+release-cli create --name "Release $CI_COMMIT_SHA" --description "Created using the release-cli $EXTRA_DESCRIPTION" --tag-name "release-$CI_COMMIT_SHA" --ref "$CI_COMMIT_SHA" --released-at "2020-07-15T08:00:00Z" --milestone "m1" --milestone "m2" --milestone "m3"
+```
+
 ### `pages`
 
 `pages` is a special job that is used to upload static content to GitLab that
diff --git a/doc/development/documentation/index.md b/doc/development/documentation/index.md
index 096e36ebf668a69592de297d1ccce62e41fa2b1c..f08f32afaf72fdfb6ff1096d2aee278efde98610 100644
--- a/doc/development/documentation/index.md
+++ b/doc/development/documentation/index.md
@@ -26,7 +26,7 @@ The source of the documentation exists within the codebase of each GitLab applic
 | --- | --- |
 | [GitLab](https://gitlab.com/gitlab-org/gitlab/) | [`/doc`](https://gitlab.com/gitlab-org/gitlab/tree/master/doc) |
 | [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner/) | [`/docs`](https://gitlab.com/gitlab-org/gitlab-runner/tree/master/docs) |
-| [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/) | [`/doc`](https://gitlab.com/gitlab-org/gitlab/tree/master/doc) |
+| [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/) | [`/doc`](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master/doc) |
 | [Charts](https://gitlab.com/gitlab-org/charts/gitlab) | [`/doc`](https://gitlab.com/gitlab-org/charts/gitlab/tree/master/doc) |
 
 Documentation issues and merge requests are part of their respective repositories and all have the label `Documentation`.
diff --git a/doc/development/elasticsearch.md b/doc/development/elasticsearch.md
index 9f941ad215cb897e3e29dbfb8be8d57cc6591790..c63e0164e4367c0167a22ca2722619b9b53961c4 100644
--- a/doc/development/elasticsearch.md
+++ b/doc/development/elasticsearch.md
@@ -218,6 +218,16 @@ be used both locally in development and on any deployed GitLab instance to
 diagnose poor search performance. This will show the exact queries being made,
 which is useful to diagnose why a search might be slow.
 
+### Correlation ID and X-Opaque-Id
+
+Our [correlation
+ID](./distributed_tracing.md#developer-guidelines-for-working-with-correlation-ids)
+is forwarded by all requests from Rails to Elasticsearch as the
+[`X-Opaque-Id`](https://www.elastic.co/guide/en/elasticsearch/reference/current/tasks.html#_identifying_running_tasks)
+header which allows us to track any
+[tasks](https://www.elastic.co/guide/en/elasticsearch/reference/current/tasks.html)
+in the cluster back the request in GitLab.
+
 ## Troubleshooting
 
 ### Getting `flood stage disk watermark [95%] exceeded`
diff --git a/doc/development/geo/framework.md b/doc/development/geo/framework.md
index 614c0f8c0d8b8623152ba3ef50f91377db254aba..27901803cd9d0cbee1364bf145045f4f80d12776 100644
--- a/doc/development/geo/framework.md
+++ b/doc/development/geo/framework.md
@@ -259,7 +259,7 @@ For example, to add support for files referenced by a `Widget` model with a
    # frozen_string_literal: true
 
    class Geo::WidgetRegistry < Geo::BaseRegistry
-     include Geo::StateMachineRegistry
+     include Geo::ReplicableRegistry
 
      MODEL_CLASS = ::Widget
      MODEL_FOREIGN_KEY = :widget_id
diff --git a/doc/development/telemetry/usage_ping.md b/doc/development/telemetry/usage_ping.md
index cd6d003155f74a4c543152dc9e68845c537862ca..1c900c2af2f595a1ffb6eb933107711d6814bd86 100644
--- a/doc/development/telemetry/usage_ping.md
+++ b/doc/development/telemetry/usage_ping.md
@@ -326,6 +326,8 @@ When adding, changing, or updating metrics, please update the [Usage Statistics
 
 Check if new metrics need to be added to the Versions Application. See `usage_data` [schema](https://gitlab.com/gitlab-services/version-gitlab-com/-/blob/master/db/schema.rb#L147) and usage data [parameters accepted](https://gitlab.com/gitlab-services/version-gitlab-com/-/blob/master/app/services/usage_ping.rb). Any metrics added under the `counts` key are saved in the `counts` column.
 
+For further details, see the [Process to add additional instrumentation to the Usage Ping](https://about.gitlab.com/handbook/product/feature-instrumentation/#process-to-add-additional-instrumentation-to-the-usage-ping).
+
 ### 6. Add the feature label
 
 Add the `feature` label to the Merge Request for new Usage Ping metrics. These are user-facing changes and are part of expanding the Usage Ping feature.
diff --git a/doc/user/admin_area/activating_deactivating_users.md b/doc/user/admin_area/activating_deactivating_users.md
index 06a26737495f3515cb4b5452dc2cfbf2beb2d0c1..448c65038c294d317ff751c29b53cb8ee0ecfd71 100644
--- a/doc/user/admin_area/activating_deactivating_users.md
+++ b/doc/user/admin_area/activating_deactivating_users.md
@@ -39,7 +39,7 @@ A user can be deactivated from the Admin Area. To do this:
 Please note that for the deactivation option to be visible to an admin, the user:
 
 - Must be currently active.
-- Must not have any signins or activity in the last 180 days.
+- Must not have signed in, or have any activity, in the last 180 days.
 
 Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
 
diff --git a/doc/user/application_security/security_dashboard/img/group_security_dashboard_v13_1.png b/doc/user/application_security/security_dashboard/img/group_security_dashboard_v13_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6cfc2de98089841e55fe5443b97a62e4fc4d016
Binary files /dev/null and b/doc/user/application_security/security_dashboard/img/group_security_dashboard_v13_1.png differ
diff --git a/doc/user/application_security/security_dashboard/img/instance_security_dashboard_with_projects_v13_1.png b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_with_projects_v13_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..75b5ad1d8850a7834b22988862b7df31e35ffb8b
Binary files /dev/null and b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_with_projects_v13_1.png differ
diff --git a/doc/user/application_security/security_dashboard/img/project_security_dashboard_v13_1.png b/doc/user/application_security/security_dashboard/img/project_security_dashboard_v13_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e6c05fcec821481dea804c076bdd657daf73f3
Binary files /dev/null and b/doc/user/application_security/security_dashboard/img/project_security_dashboard_v13_1.png differ
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md
index 75839158b77eda05aa29ca32b0c799345a80a31d..af9fd45603edd7dc8f4aea77a35f406b60cf6753 100644
--- a/doc/user/application_security/security_dashboard/index.md
+++ b/doc/user/application_security/security_dashboard/index.md
@@ -12,7 +12,7 @@ vulnerabilities in your groups, projects and pipelines.
 
 You can also drill down into a vulnerability and get extra information, see which
 project it comes from, the file it's in, and various metadata to help you analyze
-the risk. You can also action these vulnerabilities by creating an issue for them,
+the risk. You can also take actions on vulnerabilities by creating an issue for them,
 or by dismissing them.
 
 To benefit from the Security Dashboard you must first configure one of the
@@ -54,56 +54,57 @@ A pipeline consists of multiple jobs, including SAST and DAST scanning. If any j
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6165) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.1.
 
-At the project level, the Security Dashboard displays the latest security reports for your project.
-Use it to find and fix vulnerabilities.
+At the project level, the Security Dashboard displays the vulnerabilities merged into the [default branch](../../project/repository/branches/index.md#default-branch) of your project.
 
-![Project Security Dashboard](img/project_security_dashboard_v13_0.png)
+First, navigate to the Security Dashboard found under your project's Security & Compliance tab.
 
-### Export vulnerabilities
+Once you're on the dashboard, you will first see the total number of detected vulnerabilties broken down by the vulnerability's severity.
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/197494) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.10.
+Directly below that, there is a series of filters for:
 
-You can export all your project's vulnerabilities as CSV by clicking on the export button located at top right of the Project Security Dashboard. This will initiate the process, and once complete, the CSV report will be downloaded. The report will contain all vulnerabilities in the project as filters won't apply.
+- Status
+- Severity
+- Report type
 
-NOTE: **Note:**
-It may take several minutes for the download to start if your project consists
-of thousands of vulnerabilities. Do not close the page until the download finishes.
+Selecting one or more filter will refine the results in this page.
+
+Next to each vulnerability a checkbox allows you to dismiss one or multiple vulnerabilities at time.
+Clicking on a checkbox exposes a menu to choose the reason for dismissing the vulnerability(s).
+
+The main section of the page is a list of all the vulnerabilities in the project, sorted by severity.
+In that list, you can see the vulnerability's status, severity, and description.
 
-![CSV Export Button](img/project_security_dashboard_export_csv_v12_10.png)
+Clicking on the vulnerabilty's identifier will take you to the [Vulnerabily Details](../vulnerabilities) page to view more information about the selected vulnerabilty.
+
+![Project Security Dashboard](img/project_security_dashboard_v13_1.png)
 
 ## Group Security Dashboard
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6709) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.5.
 
-The group Security Dashboard gives an overview of the vulnerabilities of all the
+The group Security Dashboard gives an overview of the vulnerabilities found in the default branches of the
 projects in a group and its subgroups.
 
 First, navigate to the Security Dashboard found under your group's
 **Security** tab.
 
-Once you're on the dashboard, at the top you should see a series of filters for:
-
-- Status
-- Severity
-- Report type
-
 NOTE: **Note:**
 The dashboard only shows projects with [security reports](#supported-reports) enabled in a group.
 
-![Dashboard with action buttons and metrics](img/group_security_dashboard_v13_0.png)
+![Dashboard with action buttons and metrics](img/group_security_dashboard_v13_1.png)
 
-Selecting one or more filters will filter the results in this page.
+Once you're on the dashboard, at the top you should see a series of filters for:
 
-The main section is a list of all the vulnerabilities in the group, sorted by severity.
-In that list, you can see the severity of the vulnerability, its name, its
-confidence (likelihood of the vulnerability to be a positive one), and the project
-it's from.
+- Status
+- Severity
+- Report type
+- Project
 
-If you hover over a row, the following actions appear:
+Selecting one or more filters will refine the results in this page.
 
-- More info
-- Create issue
-- Dismiss vulnerability
+The left section of the page is a list of all the vulnerabilities in the project, sorted by severity.
+In that list, you can see the vulnerability's status, severity, and description.
+Clicking on the vulnerabilty's title will take you to the [Vulnerabily Details](../vulnerabilities) page to view more information about the vulnerabilty selected.
 
 Next to the list is a timeline chart that shows how many open
 vulnerabilities your projects had at various points in time. You can filter among 30, 60, and
@@ -123,28 +124,13 @@ vulnerabilities are not included either.
 
 Read more on how to [interact with the vulnerabilities](../index.md#interacting-with-the-vulnerabilities).
 
-### Export vulnerabilities
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213013) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.1.
-
-You can export all your vulnerabilities as CSV by clicking the **{upload}** **Export** button
-located at the top right of the **Group Security Dashboard**. After the report builds, the CSV
-report downloads to your local machine. The report contains all vulnerabilities for the projects
-defined in the **Group Security Dashboard**, as filters don't apply to the export function.
-
-NOTE: **Note:**
-It may take several minutes for the download to start if your project contains thousands of
-vulnerabilities. Don't close the page until the download finishes.
-
-![CSV Export Button](img/group_security_dashboard_export_csv_v13_1.png)
-
 ## Instance Security Dashboard
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6953) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.8.
 
 At the instance level, the Security Dashboard displays the vulnerabilities
-present in all of the projects that you have added to it. It includes all
-of the features of the [group security dashboard](#group-security-dashboard).
+present in the default branches of all of the projects that you have configured to display on the dashboard.
+It includes all of the features of the [group security dashboard](#group-security-dashboard).
 
 You can access the Instance Security Dashboard from the menu
 bar at the top of the page. Under **More**, select **Security**.
@@ -159,27 +145,24 @@ To add projects to the dashboard:
 1. Search for and add one or more projects using the **Search your projects** field.
 1. Click the **Add projects** button.
 
-Once added, the dashboard will display the vulnerabilities found in your chosen
-projects.
+Once added, the dashboard will display the vulnerabilities found the default branch of your chosen projects.
 
-![Instance Security Dashboard with projects](img/instance_security_dashboard_with_projects_v13_0.png)
+![Instance Security Dashboard with projects](img/instance_security_dashboard_with_projects_v13_1.png)
 
-### Export vulnerabilities
+## Export vulnerabilities
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213014) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213014) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.10.
 
-You can export all your vulnerabilities as CSV by clicking the **{upload}** **Export**
-button located at top right of the **Instance Security Dashboard**. After the report
+You can export all your vulnerabilities in CSV format by clicking the **{upload}** **Export**
+button located at top right of the **Security Dashboard**. After the report
 is built, the CSV report downloads to your local machine. The report contains all
-vulnerabilities for the projects defined in the **Instance Security Dashboard**,
+vulnerabilities for the projects defined in the **Security Dashboard**,
 as filters don't apply to the export function.
 
 NOTE: **Note:**
 It may take several minutes for the download to start if your project contains
 thousands of vulnerabilities. Do not close the page until the download finishes.
 
-![CSV Export Button](img/instance_security_dashboard_export_csv_v13_0.png)
-
 ## Keeping the dashboards up to date
 
 The Security Dashboard displays information from the results of the most recent
@@ -205,7 +188,7 @@ to configure daily security scans.
 
 ## Vulnerability list
 
-Each dashboard's vulnerability list contains new vulnerabilities discovered in the latest scans.
+Each dashboard's vulnerability list contains vulnerabilities discovered in the latest scans which are merged into the default branch.
 Click any vulnerability in the table to see more information on that vulnerability. To create an
 issue associated with the vulnerability, click the **Create Issue** button.
 
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 77314f7fe424b041ceb8d348d6665d06369b8050..a1c7d58417182663e78c8c701fe2ed4ded08f28b 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -1155,7 +1155,7 @@ below are examples and should be replaced with settings specific to your environ
 ui:
   enabled: true
 server:
-  # Disable the built in data storage volume as it's not safe for Hight Availablity mode
+  # Disable the built in data storage volume as it's not safe for Hight Availability mode
   dataStorage:
     enabled: false
   # Enable High Availability Mode
diff --git a/doc/user/group/epics/manage_epics.md b/doc/user/group/epics/manage_epics.md
index 26d5cb51e01483c744c8e153e8ea8212f41fdd09..15121d83478c4bb4781e38ba2352f26c39f5e4d1 100644
--- a/doc/user/group/epics/manage_epics.md
+++ b/doc/user/group/epics/manage_epics.md
@@ -118,21 +118,17 @@ The sort option and order is saved and used wherever you browse epics, including
 
 ## Make an epic confidential
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213068) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
-> - It's deployed behind a feature flag, disabled by default.
-> - It's disabled on GitLab.com.
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-confidential-epics-premium-only). **(PREMIUM ONLY)**
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213068) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.0 behind a feature flag, disabled by default.
 
 When you're creating an epic, you can make it confidential by selecting the **Make this epic
 confidential** checkbox.
 
-### Enable Confidential Epics **(PREMIUM ONLY)**
+### Enable confidential epics **(PREMIUM ONLY)**
 
-The Confidential Epics feature is under development and not ready for production use.
-It's deployed behind a feature flag that is **disabled by default**.
+The confidential epics feature is under development and not ready for production use. It's deployed
+behind a feature flag that is **disabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
-can enable it for your instance.
+can enable it for your self-managed instance.
 
 To enable it:
 
diff --git a/doc/user/infrastructure/index.md b/doc/user/infrastructure/index.md
index a6dbd13260e8052b9fe6fc62760ce45aa507c664..19664615d68588b1b399e2b4b07c82502dde44e0 100644
--- a/doc/user/infrastructure/index.md
+++ b/doc/user/infrastructure/index.md
@@ -241,7 +241,7 @@ can configure this manually as follows:
    For a full example using the pre-built image, see [Example `.gitlab-ci.yaml`
    file](#example-gitlab-ciyaml-file).
 
-   For an example displaying multiple reports, see [`.gitlab-ci.yaml` multiple reports file](#mulitple-terraform-plan-reports).
+   For an example displaying multiple reports, see [`.gitlab-ci.yaml` multiple reports file](#multiple-terraform-plan-reports).
 
 1. Running the pipeline displays the widget in the merge request, like this:
 
@@ -311,7 +311,7 @@ apply:
     - master
 ```
 
-### Mulitple Terraform Plan reports
+### Multiple Terraform Plan reports
 
 Starting with 13.2, you can display mutiple reports on the Merge Request page. The reports will also display the `artifact: name:`. See example below for a suggested setup.
 
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index c9abc30998c21900bcbb3d40d59539e19016bc6c..99ad8c7ae451c652d17a65d1cfe1fb137d4139ef 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -289,8 +289,43 @@ Once the Code Quality job has completed:
   [downloadable artifact](../../../ci/pipelines/job_artifacts.md#downloading-artifacts)
   for the `code_quality` job.
 
+## Extending functionality
+
+### Using Analysis Plugins
+
+Should there be a need to extend the default functionality provided by Code Quality, as stated in [Code Quality](#code-quality-starter), [Analysis Plugins](https://docs.codeclimate.com/docs/list-of-engines) are available.
+
+For example, to use the [SonarJava analyzer](https://docs.codeclimate.com/docs/sonar-java),
+add a file named `.codeclimate.yml` containing the [enablement code](https://docs.codeclimate.com/docs/sonar-java#enable-the-plugin)
+for the plugin to the root of your repository:
+
+```yaml
+version: "2"
+plugins:
+  sonar-java:
+    enabled: true
+```
+
+This adds SonarJava to the `plugins:` section of the [default `.codeclimate.yml`](https://gitlab.com/gitlab-org/ci-cd/codequality/-/blob/master/codeclimate_defaults/.codeclimate.yml)
+included in your project.
+
+Changes to the `plugins:` section do not affect the `exclude_patterns` section of the
+defeault `.codeclimate.yml`. See the Code Climate documentation for
+[excluding files and folders](https://docs.codeclimate.com/docs/excluding-files-and-folders)
+for more details.
+
+Here's [an example project](https://gitlab.com/jheimbuck_gl/jh_java_example_project) that uses Code Quality with a `.codeclimate.yml` file.
+
 ## Troubleshooting
 
+### Changing the default configuration has no effect
+
+A common issue is that the terms `Code Quality` (GitLab specific) and `Code Climate`
+(Engine used by GitLab) are very similar. You must add a **`.codeclimate.yml`** file
+to change the default configuration, **not** a `.codequality.yml` file. If you use
+the wrong filename, the [default `.codeclimate.yml`](https://gitlab.com/gitlab-org/ci-cd/codequality/-/blob/master/codeclimate_defaults/.codeclimate.yml)
+is still used.
+
 ### No Code Quality report is displayed in a Merge Request
 
 This can be due to multiple reasons:
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index a3df173bd9d3e49ad52058b3279785efbb872bbf..7c2aa031fea010a861729de00c95bd62c1776ff7 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -7,14 +7,15 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # GitLab Quick Actions
 
+> - Introduced in [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/26672):
+>   once an action is executed, an alert appears when a quick action is successfully applied.
+> - In [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/16877) and later, you can use
+>   quick actions when updating the description of issues, epics, and merge requests.
+
 Quick actions are textual shortcuts for common actions on issues, epics, merge requests,
 and commits that are usually done by clicking buttons or dropdowns in GitLab's UI.
-You can enter these commands while creating a new issue or merge request, or
-in comments of issues, epics, merge requests, and commits. Each command should be
-on a separate line in order to be properly detected and executed.
-
-> From [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/26672), once an
-> action is executed, an alert appears when a quick action is successfully applied.
+You can enter these commands in the description or in comments of issues, epics, merge requests, and commits.
+Each command should be on a separate line in order to be properly detected and executed.
 
 ## Quick Actions for issues, merge requests and epics
 
diff --git a/doc/user/project/status_page/index.md b/doc/user/project/status_page/index.md
index ec0a79583d5d85e587ba3500dfdf709f16881674..1c885ae043f86228c1f725fd488e21c787eea9dd 100644
--- a/doc/user/project/status_page/index.md
+++ b/doc/user/project/status_page/index.md
@@ -34,10 +34,12 @@ Setting up a Status Page is pretty painless but there are a few things you need
 
 To use GitLab Status Page you first need to set up your account details for your cloud provider in the operations settings page. Today, only AWS is supported.
 
-1. Within your AWS account, create an AWS access key.
-1. Add the following permissions policies:
+#### AWS Setup
+
+1. Within your AWS acccout, create two new IAM policies.
     - [Create bucket](https://gitlab.com/gitlab-org/status-page/-/blob/master/deploy/etc/s3_create_policy.json).
     - [Update bucket contents](https://gitlab.com/gitlab-org/status-page/-/blob/master/deploy/etc/s3_update_bucket_policy.json) (Remember replace `S3_BUCKET_NAME` with your bucket name).
+1. Create a new AWS access key with the permissions policies created in the first step.
 
 ### Status Page project
 
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
index b45d34ad286c599441a5ef1932432edeb7a3dc48..0056c551e45e63304cfd44e815b44e6c81b22818 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
@@ -72,7 +72,6 @@ export default {
       'selectedLabels',
       'selectedAssignees',
       'stages',
-      'summary',
       'currentStageEvents',
       'errorCode',
       'startDate',
@@ -248,7 +247,7 @@ export default {
           </div>
           <filter-bar
             v-if="shouldDisplayFilterBar"
-            class="js-filter-bar filtered-search-box gl-display-flex gl-mt-3 mt-md-0 gl-mr-3"
+            class="js-filter-bar filtered-search-box gl-display-flex gl-mt-3 mt-md-0 gl-mr-3 gl-border-none"
             :disabled="!hasProject"
           />
           <div v-if="shouldDisplayFilters" class="gl-justify-content-end gl-white-space-nowrap">
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/components/labels_selector.vue b/ee/app/assets/javascripts/analytics/cycle_analytics/components/labels_selector.vue
index 1c007fbbf021c9404d553c15154bfcb278bc526f..02cb2d703023a85f722ea6c6acc154622f9494e1 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/labels_selector.vue
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/components/labels_selector.vue
@@ -77,7 +77,7 @@ export default {
   },
   watch: {
     searchTerm() {
-      debounce(this.fetchData(), DATA_REFETCH_DELAY);
+      this.search();
     },
   },
   mounted() {
@@ -102,6 +102,9 @@ export default {
           this.loading = false;
         });
     },
+    search: debounce(function debouncedSearch() {
+      this.fetchData();
+    }, DATA_REFETCH_DELAY),
     labelTitle(label) {
       // there are 2 possible endpoints for group labels
       // one returns label.name the other label.title
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
index 389aabbf15c1f47a4c7f04b0dd1d28859c05cb72..5583f640c900c04ede8340ecead250f2848c6153 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
@@ -72,22 +72,16 @@ const fetchStageMedian = (currentGroupPath, stageId, params) =>
   }));
 
 export const fetchStageMedianValues = ({ state, dispatch, getters }) => {
-  const {
-    currentGroupPath,
-    cycleAnalyticsRequestParams: { created_after, created_before, project_ids },
-  } = getters;
-
+  const { currentGroupPath, cycleAnalyticsRequestParams } = getters;
   const { stages } = state;
-  const params = {
-    created_after,
-    created_before,
-    project_ids,
-  };
-
-  dispatch('requestStageMedianValues');
   const stageIds = stages.map(s => s.slug);
 
-  return Promise.all(stageIds.map(stageId => fetchStageMedian(currentGroupPath, stageId, params)))
+  dispatch('requestStageMedianValues');
+  return Promise.all(
+    stageIds.map(stageId =>
+      fetchStageMedian(currentGroupPath, stageId, cycleAnalyticsRequestParams),
+    ),
+  )
     .then(data => dispatch('receiveStageMedianValuesSuccess', data))
     .catch(error =>
       handleErrorOrRethrow({
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
index 451f8bd518e6b552c7b8ded595faaa90c4b1d6c2..769901c5142927d2673329b828080e7a8efdce4d 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
@@ -12,10 +12,24 @@ export const currentGroupPath = ({ selectedGroup }) =>
 export const selectedProjectIds = ({ selectedProjects }) =>
   selectedProjects.length ? selectedProjects.map(({ id }) => id) : [];
 
-export const cycleAnalyticsRequestParams = ({ startDate = null, endDate = null }, getters) => ({
+export const cycleAnalyticsRequestParams = (
+  {
+    startDate = null,
+    endDate = null,
+    selectedAuthor = null,
+    selectedMilestone = null,
+    selectedAssignees = [],
+    selectedLabels = [],
+  },
+  getters,
+) => ({
   project_ids: getters.selectedProjectIds,
   created_after: startDate ? dateFormat(startDate, dateFormats.isoDate) : null,
   created_before: endDate ? dateFormat(endDate, dateFormats.isoDate) : null,
+  author_username: selectedAuthor,
+  milestone_title: selectedMilestone,
+  assignee_username: selectedAssignees,
+  label_name: selectedLabels,
 });
 
 const filterStagesByHiddenStatus = (stages = [], isHidden = true) =>
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js
index 987c9db60c4e831df20c11a6b7765ab15bc2259a..d36267297c3eda5a5bfe8ff41574457d58420e31 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/duration_chart/actions.js
@@ -28,23 +28,19 @@ export const fetchDurationData = ({ dispatch, rootGetters, rootState }) => {
     selectedGroup: { fullPath },
   } = rootState;
 
-  const {
-    cycleAnalyticsRequestParams: { created_after, created_before, project_ids },
-  } = rootGetters;
+  const { cycleAnalyticsRequestParams } = rootGetters;
 
   return Promise.all(
     stages.map(stage => {
       const { slug } = stage;
 
-      return Api.cycleAnalyticsDurationChart(fullPath, slug, {
-        created_after,
-        created_before,
-        project_ids,
-      }).then(({ data }) => ({
-        slug,
-        selected: true,
-        data,
-      }));
+      return Api.cycleAnalyticsDurationChart(fullPath, slug, cycleAnalyticsRequestParams).then(
+        ({ data }) => ({
+          slug,
+          selected: true,
+          data,
+        }),
+      );
     }),
   )
     .then(data => dispatch('receiveDurationDataSuccess', data))
@@ -66,9 +62,7 @@ export const fetchDurationMedianData = ({ dispatch, rootState, rootGetters }) =>
     startDate,
     endDate,
   } = rootState;
-  const {
-    cycleAnalyticsRequestParams: { project_ids },
-  } = rootGetters;
+  const { cycleAnalyticsRequestParams } = rootGetters;
 
   const offsetValue = getDayDifference(new Date(startDate), new Date(endDate));
   const offsetCreatedAfter = getDateInPast(new Date(startDate), offsetValue);
@@ -79,9 +73,9 @@ export const fetchDurationMedianData = ({ dispatch, rootState, rootGetters }) =>
       const { slug } = stage;
 
       return Api.cycleAnalyticsDurationChart(fullPath, slug, {
+        ...cycleAnalyticsRequestParams,
         created_after: dateFormat(offsetCreatedAfter, dateFormats.isoDate),
         created_before: dateFormat(offsetCreatedBefore, dateFormats.isoDate),
-        project_ids,
       }).then(({ data }) => ({
         slug,
         selected: true,
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
index 383494a943bca546babcb8d776b8255ad04f9313..3b7e7febb4049e49aceacc0be97adbc20f9786a2 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/actions.js
@@ -18,14 +18,25 @@ export const fetchTopRankedGroupLabels = ({ dispatch, commit, state, rootGetters
   commit(types.REQUEST_TOP_RANKED_GROUP_LABELS);
   const {
     currentGroupPath,
-    cycleAnalyticsRequestParams: { created_after, created_before },
+    cycleAnalyticsRequestParams: {
+      project_ids,
+      created_after,
+      created_before,
+      author_username,
+      milestone_title,
+      assignee_username,
+    },
   } = rootGetters;
   const { subject } = state;
 
   return Api.cycleAnalyticsTopLabels(currentGroupPath, {
     subject,
+    project_ids,
     created_after,
     created_before,
+    author_username,
+    milestone_title,
+    assignee_username,
   })
     .then(({ data }) => dispatch('receiveTopRankedGroupLabelsSuccess', data))
     .catch(error =>
@@ -42,27 +53,35 @@ export const receiveTasksByTypeDataError = ({ commit }, error) => {
 };
 
 export const fetchTasksByTypeData = ({ dispatch, commit, state, rootGetters }) => {
-  const {
-    currentGroupPath,
-    cycleAnalyticsRequestParams: { created_after, created_before, project_ids },
-  } = rootGetters;
-
+  const { currentGroupPath, cycleAnalyticsRequestParams } = rootGetters;
   const { subject, selectedLabelIds } = state;
 
+  const {
+    project_ids,
+    created_after,
+    created_before,
+    author_username,
+    milestone_title,
+    assignee_username,
+  } = cycleAnalyticsRequestParams;
+
   // ensure we clear any chart data currently in state
   commit(types.REQUEST_TASKS_BY_TYPE_DATA);
 
   // dont request if we have no labels selected...for now
   if (selectedLabelIds.length) {
-    const params = {
+    return Api.cycleAnalyticsTasksByType(currentGroupPath, {
+      project_ids,
       created_after,
       created_before,
-      project_ids,
+      author_username,
+      milestone_title,
+      assignee_username,
       subject,
+      // NOTE: the type of work module will continute to manage its labels, ignoring the filter bar labels
+      // until we resolve: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34524
       label_ids: selectedLabelIds,
-    };
-
-    return Api.cycleAnalyticsTasksByType(currentGroupPath, params)
+    })
       .then(({ data }) => commit(types.RECEIVE_TASKS_BY_TYPE_DATA_SUCCESS, data))
       .catch(error => dispatch('receiveTasksByTypeDataError', error));
   }
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/mutation_types.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/mutation_types.js
index 7951c99008cd9b4062f33f0d27b65f0f72d881ae..fa93dda545ef2284c227684ae89fde7b5db3f4c1 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/mutation_types.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/mutation_types.js
@@ -6,6 +6,4 @@ export const REQUEST_TASKS_BY_TYPE_DATA = 'REQUEST_TASKS_BY_TYPE_DATA';
 export const RECEIVE_TASKS_BY_TYPE_DATA_SUCCESS = 'RECEIVE_TASKS_BY_TYPE_DATA_SUCCESS';
 export const RECEIVE_TASKS_BY_TYPE_DATA_ERROR = 'RECEIVE_TASKS_BY_TYPE_DATA_ERROR';
 
-export const SET_TASKS_BY_TYPE_SUBJECT = 'SET_TASKS_BY_TYPE_SUBJECT';
-export const SET_TASKS_BY_TYPE_LABELS = 'SET_TASKS_BY_TYPE_LABELS';
 export const SET_TASKS_BY_TYPE_FILTERS = 'SET_TASKS_BY_TYPE_FILTERS';
diff --git a/ee/app/assets/javascripts/api.js b/ee/app/assets/javascripts/api.js
index 67bbb698d3806500c818fbfd6ce4684dc1dc9eb6..be55bed618b94ea34d47bbdf36cd654a7bd9c8f6 100644
--- a/ee/app/assets/javascripts/api.js
+++ b/ee/app/assets/javascripts/api.js
@@ -39,6 +39,7 @@ export default {
   vulnerabilityActionPath: '/api/:version/vulnerabilities/:id/:action',
   featureFlagUserLists: '/api/:version/projects/:id/feature_flags_user_lists',
   featureFlagUserList: '/api/:version/projects/:id/feature_flags_user_lists/:list_iid',
+  applicationSettingsPath: '/api/:version/application/settings',
 
   userSubscription(namespaceId) {
     const url = Api.buildUrl(this.subscriptionPath).replace(':id', encodeURIComponent(namespaceId));
@@ -349,4 +350,9 @@ export default {
 
     return axios.delete(url);
   },
+
+  getApplicationSettings() {
+    const url = Api.buildUrl(this.applicationSettingsPath);
+    return axios.get(url);
+  },
 };
diff --git a/ee/app/assets/javascripts/boards/toggle_labels.js b/ee/app/assets/javascripts/boards/toggle_labels.js
index 67369df82fe543ab4c22638730624947c4c12693..4a5f92c08a89d5526624c09935fd5167bf6e1c2d 100644
--- a/ee/app/assets/javascripts/boards/toggle_labels.js
+++ b/ee/app/assets/javascripts/boards/toggle_labels.js
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import { mapState, mapGetters, mapActions } from 'vuex';
 import { GlToggle } from '@gitlab/ui';
-import { __ } from '~/locale';
 import Tracking from '~/tracking';
 import store from '~/boards/stores';
 
@@ -15,13 +14,6 @@ export default () =>
     computed: {
       ...mapState(['isShowingLabels']),
       ...mapGetters(['getLabelToggleState']),
-
-      toggleOnLabel() {
-        return __('Showing all labels');
-      },
-      toggleOffLabel() {
-        return __('Hiding all labels');
-      },
     },
     methods: {
       ...mapActions(['toggleShowLabels']),
@@ -37,14 +29,10 @@ export default () =>
     },
     template: `
       <div class="board-labels-toggle-wrapper d-flex align-items-center prepend-left-10">
-        <span id="board-labels-toggle-text" class="text-nowrap">
-          {{ __('Show labels') }}
-        </span>
         <gl-toggle
           :value="isShowingLabels"
-          class="prepend-left-10 mb-0"
-          :label-on="toggleOnLabel"
-          :label-off="toggleOffLabel"
+          label="Show labels"
+          label-position="left"
           aria-describedby="board-labels-toggle-text"
           data-qa-selector="show_labels_toggle"
           @change="onToggle"
diff --git a/ee/app/assets/javascripts/dependencies/components/dependencies_table.vue b/ee/app/assets/javascripts/dependencies/components/dependencies_table.vue
index 5319c3fce1b237f4af32c31143bb2f4a9c303125..738c5393a22453f291416ce81ea70f285318b753 100644
--- a/ee/app/assets/javascripts/dependencies/components/dependencies_table.vue
+++ b/ee/app/assets/javascripts/dependencies/components/dependencies_table.vue
@@ -63,8 +63,13 @@ export default {
     // passed to it in order to track the visibilty of each row's `row-details`
     // slot. So, create a deep clone of them here to avoid mutating the
     // `dependencies` prop.
+    // We also make sure that `vulnerabilities` is always defined to prevent rendering
+    // errors when the user is allowe to see dependencies but not their vulnerabilities.
     transformDependenciesForUI(dependencies) {
-      return cloneDeep(dependencies);
+      return dependencies.map(({ vulnerabilities, ...dep }) => ({
+        ...cloneDeep(dep),
+        vulnerabilities: vulnerabilities ? cloneDeep(vulnerabilities) : [],
+      }));
     },
   },
   fields: [
diff --git a/ee/app/assets/javascripts/geo_node_form/components/app.vue b/ee/app/assets/javascripts/geo_node_form/components/app.vue
index 7f2baec7e098542472533f0c0a42263a62fd1d08..cc81104991a4e78719c0b5981fc495b3e5fdef46 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/app.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/app.vue
@@ -29,7 +29,7 @@ export default {
       return this.node && this.node.primary;
     },
     pageTitle() {
-      return this.node ? __('Edit Geo Node') : __('New Geo Node');
+      return this.node ? __('Edit Geo Node') : __('Add New Node');
     },
     pillDetails() {
       return {
@@ -44,7 +44,7 @@ export default {
 <template>
   <article class="geo-node-form-container">
     <div class="gl-display-flex gl-align-items-center">
-      <h3 class="page-title">{{ pageTitle }}</h3>
+      <h2 class="gl-font-size-h2 gl-my-5">{{ pageTitle }}</h2>
       <gl-badge
         class="rounded-pill gl-font-sm gl-px-3 gl-py-2 gl-ml-3"
         :variant="pillDetails.variant"
diff --git a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form.vue b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form.vue
index 85175cfe617e2b26b1a6b4583c9411caef39d123..76abd3ce1ae24595110a4e24a6063be4499d5e21 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form.vue
@@ -1,7 +1,6 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import { GlFormGroup, GlFormInput, GlFormCheckbox, GlButton } from '@gitlab/ui';
-import { __ } from '~/locale';
+import { GlButton } from '@gitlab/ui';
 import { visitUrl } from '~/lib/utils/url_utility';
 import GeoNodeFormCore from './geo_node_form_core.vue';
 import GeoNodeFormSelectiveSync from './geo_node_form_selective_sync.vue';
@@ -10,9 +9,6 @@ import GeoNodeFormCapacities from './geo_node_form_capacities.vue';
 export default {
   name: 'GeoNodeForm',
   components: {
-    GlFormGroup,
-    GlFormInput,
-    GlFormCheckbox,
     GlButton,
     GeoNodeFormCore,
     GeoNodeFormSelectiveSync,
@@ -54,9 +50,6 @@ export default {
   },
   computed: {
     ...mapGetters(['formHasError']),
-    saveButtonTitle() {
-      return this.node ? __('Update') : __('Save');
-    },
   },
   created() {
     if (this.node) {
@@ -80,52 +73,30 @@ export default {
 
 <template>
   <form>
-    <geo-node-form-core :node-data="nodeData" />
-    <section class="mt-3 pl-0 col-sm-6">
-      <gl-form-group
-        v-if="nodeData.primary"
-        :label="__('Internal URL (optional)')"
-        label-for="node-internal-url-field"
-        :description="
-          __(
-            'The URL defined on the primary node that secondary nodes should use to contact it. Defaults to URL',
-          )
-        "
-      >
-        <gl-form-input id="node-internal-url-field" v-model="nodeData.internalUrl" type="text" />
-      </gl-form-group>
-      <geo-node-form-selective-sync
-        v-if="!nodeData.primary"
-        :node-data="nodeData"
-        :selective-sync-types="selectiveSyncTypes"
-        :sync-shards-options="syncShardsOptions"
-        @addSyncOption="addSyncOption"
-        @removeSyncOption="removeSyncOption"
-      />
-      <geo-node-form-capacities :node-data="nodeData" />
-      <gl-form-group
-        v-if="!nodeData.primary"
-        :label="__('Object Storage replication')"
-        label-for="node-object-storage-field"
-        :description="
-          __(
-            'If enabled, and if object storage is enabled, GitLab will handle Object Storage replication using Geo',
-          )
-        "
-      >
-        <gl-form-checkbox id="node-object-storage-field" v-model="nodeData.syncObjectStorage">{{
-          __('Allow this secondary node to replicate content on Object Storage')
-        }}</gl-form-checkbox>
-      </gl-form-group>
-    </section>
-    <section class="d-flex align-items-center mt-4">
+    <geo-node-form-core
+      :node-data="nodeData"
+      class="gl-pb-4 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid"
+    />
+    <geo-node-form-selective-sync
+      v-if="!nodeData.primary"
+      class="gl-pb-4 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid"
+      :node-data="nodeData"
+      :selective-sync-types="selectiveSyncTypes"
+      :sync-shards-options="syncShardsOptions"
+      @addSyncOption="addSyncOption"
+      @removeSyncOption="removeSyncOption"
+    />
+    <geo-node-form-capacities :node-data="nodeData" />
+    <section
+      class="gl-display-flex gl-align-items-center gl-p-5 gl-mt-6 gl-bg-gray-10 gl-border-t-solid gl-border-b-solid gl-border-t-1 gl-border-b-1 gl-border-gray-200"
+    >
       <gl-button
         id="node-save-button"
         data-qa-selector="add_node_button"
         variant="success"
         :disabled="formHasError"
         @click="saveGeoNode(nodeData)"
-        >{{ saveButtonTitle }}</gl-button
+        >{{ __('Save changes') }}</gl-button
       >
       <gl-button id="node-cancel-button" class="gl-ml-auto" @click="redirect">{{
         __('Cancel')
diff --git a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue
index 191a2f91ff5b4b8263a3bfa62822ae468aeb859e..9111b0c9dbb7147f22b9b051f6fdf9d352b41a2e 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue
@@ -1,15 +1,16 @@
 <script>
-import { GlFormGroup, GlFormInput } from '@gitlab/ui';
+import { GlFormGroup, GlFormInput, GlLink } from '@gitlab/ui';
 import { mapActions, mapState } from 'vuex';
 import { __ } from '~/locale';
 import { validateCapacity } from '../validations';
-import { VALIDATION_FIELD_KEYS } from '../constants';
+import { VALIDATION_FIELD_KEYS, REVERIFICATION_MORE_INFO, BACKFILL_MORE_INFO } from '../constants';
 
 export default {
   name: 'GeoNodeFormCapacities',
   components: {
     GlFormGroup,
     GlFormInput,
+    GlLink,
   },
   props: {
     nodeData: {
@@ -23,44 +24,30 @@ export default {
         {
           id: 'node-repository-capacity-field',
           label: __('Repository sync capacity'),
-          description: __(
-            'Control the maximum concurrency of repository backfill for this secondary node',
-          ),
           key: VALIDATION_FIELD_KEYS.REPOS_MAX_CAPACITY,
           conditional: 'secondary',
         },
         {
           id: 'node-file-capacity-field',
           label: __('File sync capacity'),
-          description: __(
-            'Control the maximum concurrency of LFS/attachment backfill for this secondary node',
-          ),
           key: VALIDATION_FIELD_KEYS.FILES_MAX_CAPACITY,
           conditional: 'secondary',
         },
         {
           id: 'node-container-repository-capacity-field',
           label: __('Container repositories sync capacity'),
-          description: __(
-            'Control the maximum concurrency of container repository operations for this Geo node',
-          ),
           key: VALIDATION_FIELD_KEYS.CONTAINER_REPOSITORIES_MAX_CAPACITY,
           conditional: 'secondary',
         },
         {
           id: 'node-verification-capacity-field',
           label: __('Verification capacity'),
-          description: __(
-            'Control the maximum concurrency of verification operations for this Geo node',
-          ),
           key: VALIDATION_FIELD_KEYS.VERIFICATION_MAX_CAPACITY,
         },
         {
           id: 'node-reverification-interval-field',
           label: __('Re-verification interval'),
-          description: __(
-            'Control the minimum interval in days that a repository should be reverified for this primary node',
-          ),
+          description: __('Minimum interval in days'),
           key: VALIDATION_FIELD_KEYS.MINIMUM_REVERIFICATION_INTERVAL,
           conditional: 'primary',
         },
@@ -79,6 +66,16 @@ export default {
         return true;
       });
     },
+    sectionDescription() {
+      return this.nodeData.primary
+        ? __('Set the synchronization and verification capacity for the secondary node.')
+        : __(
+            'Set the number of concurrent requests this secondary node will make to the primary node while backfilling.',
+          );
+    },
+    sectionLink() {
+      return this.nodeData.primary ? REVERIFICATION_MORE_INFO : BACKFILL_MORE_INFO;
+    },
   },
   methods: {
     ...mapActions(['setError']),
@@ -94,6 +91,11 @@ export default {
 
 <template>
   <div>
+    <h2 class="gl-font-size-h2 gl-my-5">{{ __('Performance and resource management') }}</h2>
+    <p class="gl-mb-5">
+      {{ sectionDescription }}
+      <gl-link :href="sectionLink" target="_blank">{{ __('More information') }}</gl-link>
+    </p>
     <gl-form-group
       v-for="formGroup in visibleFormGroups"
       :key="formGroup.id"
diff --git a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue
index 6df26b4cc0fe7b2ef6927a2dc9389a1e0e188f8f..1aed3fd860f640c13411329774ca3ca67d8e15c5 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue
@@ -1,8 +1,8 @@
 <script>
-import { GlFormGroup, GlFormInput, GlSprintf } from '@gitlab/ui';
+import { GlFormGroup, GlFormInput, GlSprintf, GlLink } from '@gitlab/ui';
 import { mapActions, mapState } from 'vuex';
 import { validateName, validateUrl } from '../validations';
-import { VALIDATION_FIELD_KEYS } from '../constants';
+import { VALIDATION_FIELD_KEYS, NODE_NAME_MORE_INFO } from '../constants';
 
 export default {
   name: 'GeoNodeFormCore',
@@ -10,6 +10,7 @@ export default {
     GlFormGroup,
     GlFormInput,
     GlSprintf,
+    GlLink,
   },
   props: {
     nodeData: {
@@ -29,13 +30,13 @@ export default {
       this.setError({ key: VALIDATION_FIELD_KEYS.URL, error: validateUrl(this.nodeData.url) });
     },
   },
+  NODE_NAME_MORE_INFO,
 };
 </script>
 
 <template>
-  <section class="form-row">
+  <section>
     <gl-form-group
-      class="col-sm-6"
       :label="__('Name')"
       label-for="node-name-field"
       :state="Boolean(formErrors.name)"
@@ -45,43 +46,92 @@ export default {
         <gl-sprintf
           :message="
             __(
-              'The unique identifier for the Geo node. Must match %{geoNodeName} if it is set in gitlab.rb, otherwise it must match %{externalUrl} with a trailing slash',
+              'Must match with the %{codeStart}geo_node_name%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}. %{linkStart}More information%{linkEnd}',
             )
           "
         >
-          <template #geoNodeName>
-            <code>{{ __('geo_node_name') }}</code>
+          <template #code="{ content }">
+            <code>{{ content }}</code>
           </template>
-          <template #externalUrl>
-            <code>{{ __('external_url') }}</code>
+          <template #link="{ content }">
+            <gl-link :href="$options.NODE_NAME_MORE_INFO" target="_blank">{{ content }}</gl-link>
           </template>
         </gl-sprintf>
       </template>
-      <gl-form-input
-        id="node-name-field"
-        v-model="nodeData.name"
+      <div
         :class="{ 'is-invalid': Boolean(formErrors.name) }"
-        data-qa-selector="node_name_field"
-        type="text"
-        @input="checkName"
-      />
-    </gl-form-group>
-    <gl-form-group
-      class="col-sm-6"
-      :label="__('URL')"
-      label-for="node-url-field"
-      :description="__('The user-facing URL of the Geo node')"
-      :state="Boolean(formErrors.url)"
-      :invalid-feedback="formErrors.url"
-    >
-      <gl-form-input
-        id="node-url-field"
-        v-model="nodeData.url"
-        :class="{ 'is-invalid': Boolean(formErrors.url) }"
-        data-qa-selector="node_url_field"
-        type="text"
-        @input="checkUrl"
-      />
+        class="gl-display-flex gl-align-items-center"
+      >
+        <gl-form-input
+          id="node-name-field"
+          v-model="nodeData.name"
+          class="col-sm-6 gl-pr-8!"
+          :class="{ 'is-invalid': Boolean(formErrors.name) }"
+          data-qa-selector="node_name_field"
+          type="text"
+          @input="checkName"
+        />
+        <span class="gl-text-gray-700 m-n5 gl-z-index-2">{{ 255 - nodeData.name.length }}</span>
+      </div>
     </gl-form-group>
+    <section class="form-row">
+      <gl-form-group
+        class="col-12 col-sm-6"
+        :label="__('URL')"
+        label-for="node-url-field"
+        :state="Boolean(formErrors.url)"
+        :invalid-feedback="formErrors.url"
+      >
+        <template #description>
+          <gl-sprintf
+            :message="
+              __(
+                'Must match with the %{codeStart}external_url%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}.',
+              )
+            "
+          >
+            <template #code="{ content }">
+              <code>{{ content }}</code>
+            </template>
+          </gl-sprintf>
+        </template>
+        <div
+          :class="{ 'is-invalid': Boolean(formErrors.url) }"
+          class="gl-display-flex gl-align-items-center"
+        >
+          <gl-form-input
+            id="node-url-field"
+            v-model="nodeData.url"
+            class="gl-pr-8!"
+            :class="{ 'is-invalid': Boolean(formErrors.url) }"
+            data-qa-selector="node_url_field"
+            type="text"
+            @input="checkUrl"
+          />
+          <span class="gl-text-gray-700 m-n5 gl-z-index-2">{{ 255 - nodeData.url.length }}</span>
+        </div>
+      </gl-form-group>
+      <gl-form-group
+        v-if="nodeData.primary"
+        class="col-12 col-sm-6"
+        :label="__('Internal URL (optional)')"
+        label-for="node-internal-url-field"
+        :description="
+          __('The URL defined on the primary node that secondary nodes should use to contact it.')
+        "
+      >
+        <div class="gl-display-flex gl-align-items-center">
+          <gl-form-input
+            id="node-internal-url-field"
+            v-model="nodeData.internalUrl"
+            class="gl-pr-8!"
+            type="text"
+          />
+          <span class="gl-text-gray-700 m-n5 gl-z-index-2">{{
+            255 - nodeData.internalUrl.length
+          }}</span>
+        </div>
+      </gl-form-group>
+    </section>
   </section>
 </template>
diff --git a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_selective_sync.vue b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_selective_sync.vue
index 212b34820acf12a93e5183a19c22f43ae5c688ff..b97b876935e83e417e0dc22a4be29dd401709fe4 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_selective_sync.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_selective_sync.vue
@@ -1,7 +1,8 @@
 <script>
-import { GlFormGroup, GlFormSelect } from '@gitlab/ui';
+import { GlFormGroup, GlFormSelect, GlFormCheckbox, GlSprintf, GlLink } from '@gitlab/ui';
 import GeoNodeFormNamespaces from './geo_node_form_namespaces.vue';
 import GeoNodeFormShards from './geo_node_form_shards.vue';
+import { SELECTIVE_SYNC_MORE_INFO, OBJECT_STORAGE_MORE_INFO } from '../constants';
 
 export default {
   name: 'GeoNodeFormSelectiveSync',
@@ -10,6 +11,9 @@ export default {
     GlFormSelect,
     GeoNodeFormNamespaces,
     GeoNodeFormShards,
+    GlFormCheckbox,
+    GlSprintf,
+    GlLink,
   },
   props: {
     nodeData: {
@@ -41,11 +45,27 @@ export default {
       this.$emit('removeSyncOption', { key, index });
     },
   },
+  SELECTIVE_SYNC_MORE_INFO,
+  OBJECT_STORAGE_MORE_INFO,
 };
 </script>
 
 <template>
   <div ref="geoNodeFormSelectiveSyncContainer">
+    <h2 class="gl-font-size-h2 gl-my-5">{{ __('Selective synchronization') }}</h2>
+    <p class="gl-mb-5">
+      {{
+        __(
+          'Set what should be replicated by choosing specific projects or groups by the secondary node.',
+        )
+      }}
+      <gl-link
+        :href="$options.SELECTIVE_SYNC_MORE_INFO"
+        target="_blank"
+        data-testid="selectiveSyncMoreInfo"
+        >{{ __('More information') }}</gl-link
+      >
+    </p>
     <gl-form-group
       :label="__('Selective synchronization')"
       label-for="node-selective-synchronization-field"
@@ -56,14 +76,13 @@ export default {
         :options="selectiveSyncTypes"
         value-field="value"
         text-field="label"
-        class="col-sm-6"
+        class="col-sm-3"
       />
     </gl-form-group>
     <gl-form-group
       v-if="selectiveSyncNamespaces"
       :label="__('Groups to synchronize')"
       label-for="node-synchronization-namespaces-field"
-      :description="__('Choose which groups you wish to synchronize to this secondary node')"
     >
       <geo-node-form-namespaces
         id="node-synchronization-namespaces-field"
@@ -76,7 +95,6 @@ export default {
       v-if="selectiveSyncShards"
       :label="__('Shards to synchronize')"
       label-for="node-synchronization-shards-field"
-      :description="__('Choose which shards you wish to synchronize to this secondary node')"
     >
       <geo-node-form-shards
         id="node-synchronization-shards-field"
@@ -86,5 +104,28 @@ export default {
         @removeSyncOption="removeSyncOption"
       />
     </gl-form-group>
+    <gl-form-group :label="__('Object Storage replication')" label-for="node-object-storage-field">
+      <template #description>
+        <gl-sprintf
+          :message="
+            __(
+              'If enabled, GitLab will handle Object Storage replication using Geo. %{linkStart}More information%{linkEnd}',
+            )
+          "
+        >
+          <template #link="{ content }">
+            <gl-link
+              :href="$options.OBJECT_STORAGE_MORE_INFO"
+              data-testid="objectStorageMoreInfo"
+              target="_blank"
+              >{{ content }}</gl-link
+            >
+          </template>
+        </gl-sprintf>
+      </template>
+      <gl-form-checkbox id="node-object-storage-field" v-model="nodeData.syncObjectStorage">{{
+        __('Allow this secondary node to replicate content on Object Storage')
+      }}</gl-form-checkbox>
+    </gl-form-group>
   </div>
 </template>
diff --git a/ee/app/assets/javascripts/geo_node_form/constants.js b/ee/app/assets/javascripts/geo_node_form/constants.js
index 659f42a9266ea6a0ec945a56aaa9c5784eb8af02..4716841cb52672e2412c37438afa513135ba13a4 100644
--- a/ee/app/assets/javascripts/geo_node_form/constants.js
+++ b/ee/app/assets/javascripts/geo_node_form/constants.js
@@ -9,3 +9,18 @@ export const VALIDATION_FIELD_KEYS = {
   VERIFICATION_MAX_CAPACITY: 'verificationMaxCapacity',
   MINIMUM_REVERIFICATION_INTERVAL: 'minimumReverificationInterval',
 };
+
+export const NODE_NAME_MORE_INFO =
+  'https://docs.gitlab.com/ee/administration/geo/replication/configuration.html#step-3-add-the-secondary-node';
+
+export const SELECTIVE_SYNC_MORE_INFO =
+  'https://docs.gitlab.com/ee/administration/geo/replication/configuration.html#selective-synchronization';
+
+export const OBJECT_STORAGE_MORE_INFO =
+  'https://docs.gitlab.com/ee/administration/geo/replication/object_storage.html';
+
+export const REVERIFICATION_MORE_INFO =
+  'https://docs.gitlab.com/ee/administration/geo/disaster_recovery/background_verification.html#repository-re-verification';
+
+export const BACKFILL_MORE_INFO =
+  'https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#geo-backfill';
diff --git a/ee/app/assets/javascripts/geo_nodes/components/geo_node_actions.vue b/ee/app/assets/javascripts/geo_nodes/components/geo_node_actions.vue
index 1acb8d50ce926d91a20c3816a27d4d8fbfbc63b8..eaddfea37baffa8d0ac062fca2ecea44db2739cd 100644
--- a/ee/app/assets/javascripts/geo_nodes/components/geo_node_actions.vue
+++ b/ee/app/assets/javascripts/geo_nodes/components/geo_node_actions.vue
@@ -36,15 +36,6 @@ export default {
     },
   },
   computed: {
-    isToggleAllowed() {
-      return !this.node.primary && this.nodeEditAllowed;
-    },
-    nodeToggleLabel() {
-      return this.node.enabled ? __('Pause replication') : __('Resume replication');
-    },
-    nodeToggleIcon() {
-      return this.node.enabled ? 'pause' : 'play';
-    },
     isSecondaryNode() {
       return !this.node.primary;
     },
@@ -113,18 +104,6 @@ export default {
       >
         {{ s__('Repair authentication') }}
       </gl-deprecated-button>
-      <gl-deprecated-button
-        v-if="isToggleAllowed"
-        :class="{
-          'btn-warning': node.enabled,
-          'btn-success': !node.enabled,
-        }"
-        class="btn btn-sm mx-1 sm-column-spacing"
-        @click="onToggleNode"
-      >
-        <icon :name="nodeToggleIcon" />
-        {{ nodeToggleLabel }}
-      </gl-deprecated-button>
       <a v-if="nodeEditAllowed" :href="node.editPath" class="btn btn-sm mx-1 sm-column-spacing">
         {{ __('Edit') }}
       </a>
diff --git a/ee/app/assets/javascripts/geo_nodes/components/geo_node_replication_status.vue b/ee/app/assets/javascripts/geo_nodes/components/geo_node_replication_status.vue
new file mode 100644
index 0000000000000000000000000000000000000000..fd79d8aa6a0daf4a9ee33ba99203909b01220c70
--- /dev/null
+++ b/ee/app/assets/javascripts/geo_nodes/components/geo_node_replication_status.vue
@@ -0,0 +1,71 @@
+<script>
+import { GlPopover, GlLink, GlIcon } from '@gitlab/ui';
+import { __ } from '~/locale';
+import {
+  REPLICATION_STATUS_CLASS,
+  REPLICATION_STATUS_ICON,
+  REPLICATION_PAUSE_URL,
+} from '../constants';
+
+export default {
+  components: {
+    GlIcon,
+    GlPopover,
+    GlLink,
+  },
+  props: {
+    node: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    replicationStatusCssClass() {
+      return this.node.enabled
+        ? REPLICATION_STATUS_CLASS.enabled
+        : REPLICATION_STATUS_CLASS.disabled;
+    },
+    nodeReplicationStatusIcon() {
+      return this.node.enabled ? REPLICATION_STATUS_ICON.enabled : REPLICATION_STATUS_ICON.disabled;
+    },
+    nodeReplicationStatusText() {
+      return this.node.enabled ? __('Replication enabled') : __('Replication paused');
+    },
+  },
+  REPLICATION_PAUSE_URL,
+};
+</script>
+
+<template>
+  <div class="mt-2 detail-section-item">
+    <div class="gl-text-gray-700 node-detail-title">{{ s__('GeoNodes|Replication status') }}</div>
+    <div class="gl-display-flex gl-align-items-center">
+      <div
+        :class="replicationStatusCssClass"
+        class="rounded-pill gl-display-inline-flex gl-align-items-center px-2 gl-py-2 gl-my-2"
+      >
+        <gl-icon :name="nodeReplicationStatusIcon" />
+        <strong class="status-text gl-ml-2"> {{ nodeReplicationStatusText }} </strong>
+      </div>
+      <gl-icon
+        ref="replicationStatusHelp"
+        tabindex="0"
+        name="question"
+        class="gl-text-blue-600 gl-ml-2 gl-cursor-pointer"
+      />
+      <gl-popover
+        :target="() => $refs.replicationStatusHelp.$el"
+        placement="top"
+        triggers="hover focus"
+      >
+        <p>{{ __('Geo nodes are paused using a command run on the node') }}</p>
+        <gl-link
+          class="gl-mt-5 gl-font-sm"
+          :href="$options.REPLICATION_PAUSE_URL"
+          target="_blank"
+          >{{ __('More Information') }}</gl-link
+        >
+      </gl-popover>
+    </div>
+  </div>
+</template>
diff --git a/ee/app/assets/javascripts/geo_nodes/components/node_detail_sections/node_details_section_main.vue b/ee/app/assets/javascripts/geo_nodes/components/node_detail_sections/node_details_section_main.vue
index 6ea304e000544c174cb72eefcbd5fa19e1b5f1f7..f0e23ed5e432195ebbce5da1d1b7fe387d0af719 100644
--- a/ee/app/assets/javascripts/geo_nodes/components/node_detail_sections/node_details_section_main.vue
+++ b/ee/app/assets/javascripts/geo_nodes/components/node_detail_sections/node_details_section_main.vue
@@ -3,6 +3,7 @@ import { GlLink, GlIcon } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 
 import GeoNodeHealthStatus from '../geo_node_health_status.vue';
+import GeoNodeReplicationStatus from '../geo_node_replication_status.vue';
 import GeoNodeActions from '../geo_node_actions.vue';
 
 export default {
@@ -11,6 +12,7 @@ export default {
     GlIcon,
     GeoNodeHealthStatus,
     GeoNodeActions,
+    GeoNodeReplicationStatus,
   },
   props: {
     node: {
@@ -107,6 +109,9 @@ export default {
         :status="nodeHealthStatus"
         :status-check-timestamp="nodeDetails.statusCheckTimestamp"
       />
+      <div v-if="!node.primary">
+        <geo-node-replication-status :node="node" />
+      </div>
     </div>
   </div>
 </template>
diff --git a/ee/app/assets/javascripts/geo_nodes/constants.js b/ee/app/assets/javascripts/geo_nodes/constants.js
index 73c474e923abf2da4e4fadf4e98302817e6bece3..0a0ac019f3474250be2a15bef30d55af0b81b9fb 100644
--- a/ee/app/assets/javascripts/geo_nodes/constants.js
+++ b/ee/app/assets/javascripts/geo_nodes/constants.js
@@ -31,6 +31,16 @@ export const HEALTH_STATUS_CLASS = {
   offline: 'text-secondary-800 bg-secondary-100',
 };
 
+export const REPLICATION_STATUS_CLASS = {
+  enabled: 'gl-text-green-600 gl-bg-green-100',
+  disabled: 'gl-text-orange-600 gl-bg-orange-100',
+};
+
+export const REPLICATION_STATUS_ICON = {
+  enabled: 'play',
+  disabled: 'pause',
+};
+
 export const TIME_DIFF = {
   FIVE_MINS: 300,
   HOUR: 3600,
@@ -44,6 +54,9 @@ export const HELP_INFO_URL =
 export const REPLICATION_HELP_URL =
   'https://docs.gitlab.com/ee/administration/geo/replication/datatypes.html#limitations-on-replicationverification';
 
+export const REPLICATION_PAUSE_URL =
+  'https://docs.gitlab.com/ee/administration/geo/replication/#pausing-and-resuming-replication';
+
 export const HELP_NODE_HEALTH_URL =
   'https://docs.gitlab.com/ee/administration/geo/replication/troubleshooting.html#check-the-health-of-the-secondary-node';
 
diff --git a/ee/app/assets/javascripts/geo_settings/components/app.vue b/ee/app/assets/javascripts/geo_settings/components/app.vue
index d5757285a7ac8bfc5ab7a60b328c32735a6e82c9..0c9558f4ca19d7a624373e0938a33020cc5345f4 100644
--- a/ee/app/assets/javascripts/geo_settings/components/app.vue
+++ b/ee/app/assets/javascripts/geo_settings/components/app.vue
@@ -1,11 +1,23 @@
 <script>
+import { mapActions, mapState } from 'vuex';
+import { GlLoadingIcon } from '@gitlab/ui';
 import GeoSettingsForm from './geo_settings_form.vue';
 
 export default {
   name: 'GeoSettingsApp',
   components: {
+    GlLoadingIcon,
     GeoSettingsForm,
   },
+  computed: {
+    ...mapState(['isLoading']),
+  },
+  created() {
+    this.fetchGeoSettings();
+  },
+  methods: {
+    ...mapActions(['fetchGeoSettings']),
+  },
 };
 </script>
 
@@ -19,6 +31,7 @@ export default {
         )
       }}
     </p>
-    <geo-settings-form />
+    <gl-loading-icon v-if="isLoading" size="xl" />
+    <geo-settings-form v-else />
   </article>
 </template>
diff --git a/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue b/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue
index 0a2c2d7970c72477eddcf3777bcc239c07a35f73..c0b94f6842774b6d83d9b87f9f984517b76bd867 100644
--- a/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue
+++ b/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue
@@ -1,7 +1,7 @@
 <script>
+import { mapState } from 'vuex';
 import { GlFormGroup, GlFormInput, GlButton } from '@gitlab/ui';
 import { visitUrl } from '~/lib/utils/url_utility';
-import { DEFAULT_TIMEOUT, DEFAULT_ALLOWED_IP } from '../constants';
 
 export default {
   name: 'GeoSettingsForm',
@@ -10,11 +10,10 @@ export default {
     GlFormInput,
     GlButton,
   },
-  data() {
-    return {
-      timeout: DEFAULT_TIMEOUT,
-      allowedIp: DEFAULT_ALLOWED_IP,
-    };
+  computed: {
+    // The real connection between vuex and the component will be implemented in
+    // a later MR, this feature is anyhow behind feature flag
+    ...mapState(['timeout', 'allowedIp']),
   },
   methods: {
     redirect() {
diff --git a/ee/app/assets/javascripts/geo_settings/index.js b/ee/app/assets/javascripts/geo_settings/index.js
index 9c466e883e29e02496246c6d7b16857e8b92a46b..4d49084eb45678672ba276e305432d5bfafebd60 100644
--- a/ee/app/assets/javascripts/geo_settings/index.js
+++ b/ee/app/assets/javascripts/geo_settings/index.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import Translate from '~/vue_shared/translate';
+import createStore from './store';
 import GeoSettingsApp from './components/app.vue';
 
 Vue.use(Translate);
@@ -9,6 +10,7 @@ export default () => {
 
   return new Vue({
     el,
+    store: createStore(),
     components: {
       GeoSettingsApp,
     },
diff --git a/ee/app/assets/javascripts/geo_settings/store/actions.js b/ee/app/assets/javascripts/geo_settings/store/actions.js
new file mode 100644
index 0000000000000000000000000000000000000000..f385320072a991df9f25748fd7b655a070274708
--- /dev/null
+++ b/ee/app/assets/javascripts/geo_settings/store/actions.js
@@ -0,0 +1,20 @@
+import Api from 'ee/api';
+import createFlash from '~/flash';
+import { __ } from '~/locale';
+import * as types from './mutation_types';
+
+// eslint-disable-next-line import/prefer-default-export
+export const fetchGeoSettings = ({ commit }) => {
+  commit(types.REQUEST_GEO_SETTINGS);
+  Api.getApplicationSettings()
+    .then(({ data }) => {
+      commit(types.RECEIVE_GEO_SETTINGS_SUCCESS, {
+        timeout: data.geo_status_timeout,
+        allowedIp: data.geo_node_allowed_ips,
+      });
+    })
+    .catch(() => {
+      createFlash(__('There was an error fetching the Geo Settings'));
+      commit(types.RECEIVE_GEO_SETTINGS_ERROR);
+    });
+};
diff --git a/ee/app/assets/javascripts/geo_settings/store/index.js b/ee/app/assets/javascripts/geo_settings/store/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b66386dacfbf8e13ea83fc0ba3427de6f2e8e7b
--- /dev/null
+++ b/ee/app/assets/javascripts/geo_settings/store/index.js
@@ -0,0 +1,14 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import * as actions from './actions';
+import mutations from './mutations';
+import createState from './state';
+
+Vue.use(Vuex);
+
+export default () =>
+  new Vuex.Store({
+    actions,
+    mutations,
+    state: createState(),
+  });
diff --git a/ee/app/assets/javascripts/geo_settings/store/mutation_types.js b/ee/app/assets/javascripts/geo_settings/store/mutation_types.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fa6d2549feff18710b58d6499cd4eabae2ca3a6
--- /dev/null
+++ b/ee/app/assets/javascripts/geo_settings/store/mutation_types.js
@@ -0,0 +1,3 @@
+export const REQUEST_GEO_SETTINGS = 'REQUEST_GEO_SETTINGS';
+export const RECEIVE_GEO_SETTINGS_SUCCESS = 'RECEIVE_GEO_SETTINGS_SUCCESS';
+export const RECEIVE_GEO_SETTINGS_ERROR = 'RECEIVE_GEO_SETTINGS_ERROR';
diff --git a/ee/app/assets/javascripts/geo_settings/store/mutations.js b/ee/app/assets/javascripts/geo_settings/store/mutations.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a7ada9881a2f1cc2ab84e57f5a73a03d6f3bb9b
--- /dev/null
+++ b/ee/app/assets/javascripts/geo_settings/store/mutations.js
@@ -0,0 +1,18 @@
+import * as types from './mutation_types';
+import { DEFAULT_TIMEOUT, DEFAULT_ALLOWED_IP } from '../constants';
+
+export default {
+  [types.REQUEST_GEO_SETTINGS](state) {
+    state.isLoading = true;
+  },
+  [types.RECEIVE_GEO_SETTINGS_SUCCESS](state, { timeout, allowedIp }) {
+    state.isLoading = false;
+    state.timeout = timeout;
+    state.allowedIp = allowedIp;
+  },
+  [types.RECEIVE_GEO_SETTINGS_ERROR](state) {
+    state.isLoading = false;
+    state.timeout = DEFAULT_TIMEOUT;
+    state.allowedIp = DEFAULT_ALLOWED_IP;
+  },
+};
diff --git a/ee/app/assets/javascripts/geo_settings/store/state.js b/ee/app/assets/javascripts/geo_settings/store/state.js
new file mode 100644
index 0000000000000000000000000000000000000000..be79c796d14ae4c6fd01bf2fcd6e47774426079b
--- /dev/null
+++ b/ee/app/assets/javascripts/geo_settings/store/state.js
@@ -0,0 +1,7 @@
+import { DEFAULT_TIMEOUT, DEFAULT_ALLOWED_IP } from '../constants';
+
+export default () => ({
+  isLoading: false,
+  timeout: DEFAULT_TIMEOUT,
+  allowedIp: DEFAULT_ALLOWED_IP,
+});
diff --git a/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue b/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
index 26b171be26a9ae85e3a21a1cd2e443ccde754e0c..df8c71375c259e39e82ffb8b00556ebee5294df1 100644
--- a/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
+++ b/ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
@@ -129,7 +129,7 @@ export default {
         {{ __("Ok let's go") }}
       </gl-link>
       <p class="small mt-8">
-        <gl-link class="qa-skip-tour-btn" @click="skipTour">
+        <gl-link class="qa-skip-tour-btn" data-qa-selector="skip_for_now_link" @click="skipTour">
           {{ skipText }}
         </gl-link>
       </p>
diff --git a/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 9e6a4eb1c8f4222bb13cfbc37cef3a76fd0de808..43c20fea43e6dcb9347f052e773a2d5fd06edc2b 100644
--- a/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -91,8 +91,8 @@ export default {
       id="service-desk-checkbox"
       :value="isEnabled"
       class="d-inline-block align-middle mr-1"
-      :label-on="__('Service Desk is on')"
-      :label-off="__('Service Desk is off')"
+      label="Service desk"
+      label-position="left"
       @change="onCheckboxToggle"
     />
     <label class="align-middle" for="service-desk-checkbox">
diff --git a/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue b/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue
index 31ce90632dca6f753e0d53a2b422e94533778c1a..9243e7d252e4756bda9740588d9ba5e2882771d6 100644
--- a/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue
+++ b/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue
@@ -45,34 +45,42 @@ export default {
       >
     </gl-tooltip>
 
-    <span class="gl-label gl-label-text-dark gl-label-sm status-on-track mr-1"
-      ><span class="gl-label-text">
+    <span class="gl-label gl-label-text-dark gl-label-sm status-on-track gl-mr-2">
+      <span class="gl-label-text">
         {{ healthStatus.issuesOnTrack }}
-      </span></span
+      </span>
+    </span>
+    <span class="gl-mr-2 mr-md-2 gl-text-gray-700 health-label-long gl-display-none">
+      {{ __('issues on track') }}
+    </span>
+    <span
+      class="gl-mr-2 mr-md-2 gl-text-gray-700 gl-str-truncated health-label-short gl-display-none"
+      >{{ __('on track') }}</span
     >
-    <span class="mr-1 mr-md-2 text-secondary health-label-long">{{ __('issues on track') }}</span>
-    <span class="mr-1 mr-md-2 text-secondary text-truncate health-label-short">{{
-      __('on track')
-    }}</span>
 
-    <span class="gl-label gl-label-text-dark gl-label-sm status-needs-attention mr-1"
-      ><span class="gl-label-text">
+    <span class="gl-label gl-label-text-dark gl-label-sm status-needs-attention gl-mr-2">
+      <span class="gl-label-text">
         {{ healthStatus.issuesNeedingAttention }}
-      </span></span
+      </span>
+    </span>
+    <span class="gl-mr-2 mr-md-2 gl-text-gray-700 health-label-long gl-display-none">
+      {{ __('issues need attention') }}
+    </span>
+    <span
+      class="gl-mr-2 mr-md-2 gl-text-gray-700 gl-str-truncated health-label-short gl-display-none"
+      >{{ __('need attention') }}</span
     >
-    <span class="mr-1 mr-md-2 text-secondary health-label-long">{{
-      __('issues need attention')
-    }}</span>
-    <span class="mr-1 mr-md-2 text-secondary text-truncate health-label-short">{{
-      __('need attention')
-    }}</span>
 
-    <span class="gl-label gl-label-text-dark gl-label-sm status-at-risk mr-1"
-      ><span class="gl-label-text">
+    <span class="gl-label gl-label-text-dark gl-label-sm status-at-risk gl-mr-2">
+      <span class="gl-label-text">
         {{ healthStatus.issuesAtRisk }}
-      </span></span
-    >
-    <span class="text-secondary health-label-long">{{ __('issues at risk') }}</span>
-    <span class="text-secondary text-truncate health-label-short">{{ __('at risk') }}</span>
+      </span>
+    </span>
+    <span class="gl-text-gray-700 health-label-long gl-display-none">
+      {{ __('issues at risk') }}
+    </span>
+    <span class="gl-text-gray-700 gl-str-truncated health-label-short gl-display-none">
+      {{ __('at risk') }}
+    </span>
   </div>
 </template>
diff --git a/ee/app/assets/javascripts/roadmap/components/epic_item_timeline.vue b/ee/app/assets/javascripts/roadmap/components/epic_item_timeline.vue
index 574935f23dd8650b5da15f2d3ff31d60912c04eb..29f4d338d53aedc66d03208f13e9a313cd3f569d 100644
--- a/ee/app/assets/javascripts/roadmap/components/epic_item_timeline.vue
+++ b/ee/app/assets/javascripts/roadmap/components/epic_item_timeline.vue
@@ -185,7 +185,7 @@ export default {
               aria-hidden="true"
             />
             <div class="gl-font-sm d-flex align-items-center text-nowrap">
-              <icon class="append-right-2" :size="12" name="weight" />
+              <icon class="gl-mr-1" :size="12" name="weight" />
               <p class="m-0" :aria-label="epicWeightPercentageText">{{ epicWeightPercentage }}%</p>
             </div>
           </div>
diff --git a/ee/app/assets/javascripts/threat_monitoring/components/network_policy_list.vue b/ee/app/assets/javascripts/threat_monitoring/components/network_policy_list.vue
index 8c132e29dead80f7c49b5f87708ecf256e5458ca..ebbe97cb9d7647acf670384ea8b28f68408420ba 100644
--- a/ee/app/assets/javascripts/threat_monitoring/components/network_policy_list.vue
+++ b/ee/app/assets/javascripts/threat_monitoring/components/network_policy_list.vue
@@ -215,13 +215,7 @@ export default {
 
           <h5 class="mt-4">{{ s__('NetworkPolicies|Enforcement status') }}</h5>
           <p>{{ s__('NetworkPolicies|Choose whether to enforce this policy.') }}</p>
-          <gl-toggle
-            v-model="selectedPolicy.isEnabled"
-            :label-on="__('Enabled')"
-            :label-off="__('Disabled')"
-            label-position="right"
-            data-testid="policyToggle"
-          />
+          <gl-toggle v-model="selectedPolicy.isEnabled" data-testid="policyToggle" />
         </div>
       </template>
     </gl-drawer>
diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 48d87b00653b5ddf85b7c1356f9dce602dbf5d3a..94bad9d88b8b7e064f578ea2a370d2ede7eb0de4 100644
--- a/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -367,6 +367,7 @@ export default {
         v-if="mr.testResultsPath"
         class="js-reports-container"
         :endpoint="mr.testResultsPath"
+        :pipeline-path="mr.mergeRequestAddCiConfigPath"
       />
 
       <terraform-plan v-if="mr.terraformReportsPath" :endpoint="mr.terraformReportsPath" />
diff --git a/ee/app/controllers/admin/geo/nodes_controller.rb b/ee/app/controllers/admin/geo/nodes_controller.rb
index fc0a6a1537a66d46a74ec65a57cbfdfc7c86518b..468e805654013d72571b82a0919f9623996f2b3b 100644
--- a/ee/app/controllers/admin/geo/nodes_controller.rb
+++ b/ee/app/controllers/admin/geo/nodes_controller.rb
@@ -29,7 +29,7 @@ def create
   end
 
   def new
-    @form_title = _('New Geo Node')
+    @form_title = _('Add New Node')
     render :form
   end
 
diff --git a/ee/app/controllers/ee/clusters/clusters_controller.rb b/ee/app/controllers/ee/clusters/clusters_controller.rb
index 2160671e61a7aedf639c9e1730c457bb3a1198be..81442ced1f3002773156ebf332aede944f4f03df 100644
--- a/ee/app/controllers/ee/clusters/clusters_controller.rb
+++ b/ee/app/controllers/ee/clusters/clusters_controller.rb
@@ -9,7 +9,6 @@ module ClustersController
       prepended do
         before_action :expire_etag_cache, only: [:show]
         before_action :authorize_read_prometheus!, only: :prometheus_proxy
-        before_action :authorize_read_cluster_health!, only: [:metrics_dashboard]
       end
 
       def metrics
@@ -71,10 +70,6 @@ def environments
 
       private
 
-      def authorize_read_cluster_health!
-        access_denied! unless can?(current_user, :read_cluster_health, cluster)
-      end
-
       def expire_etag_cache
         return if request.format.json? || !clusterable.environments_cluster_path(cluster)
 
diff --git a/ee/app/finders/epics_finder.rb b/ee/app/finders/epics_finder.rb
index e5b437c364311100b9f8a347034716cd6e154305..9689676ef4d9e5f03bfb0df54018d7212f5fd936 100644
--- a/ee/app/finders/epics_finder.rb
+++ b/ee/app/finders/epics_finder.rb
@@ -22,6 +22,7 @@
 
 class EpicsFinder < IssuableFinder
   include TimeFrameFilter
+  include Gitlab::Utils::StrongMemoize
 
   IID_STARTS_WITH_PATTERN = %r{\A(\d)+\z}.freeze
 
@@ -128,10 +129,15 @@ def filter_negated_items(items)
   end
 
   def group
-    return unless params[:group_id]
-    return @group if defined?(@group)
-
-    @group = Group.find(params[:group_id])
+    strong_memoize(:group) do
+      next unless params[:group_id]
+
+      if params[:group_id].is_a?(Group)
+        params[:group_id]
+      else
+        Group.find(params[:group_id])
+      end
+    end
   end
 
   def starts_with_iid(items)
@@ -181,7 +187,6 @@ def by_parent(items)
   # rubocop: enable CodeReuse/ActiveRecord
 
   def with_confidentiality_access_check(epics, groups)
-    return epics unless Feature.enabled?(:confidential_epics_query, group)
     return epics if can_read_all_epics_in_related_groups?(groups)
 
     epics.not_confidential_or_in_groups(groups_with_confidential_access(groups))
diff --git a/ee/app/graphql/ee/mutations/resolves_issuable.rb b/ee/app/graphql/ee/mutations/resolves_issuable.rb
index e8076ae555bf62c0233a3aaeedcced54b321ed46..571965e43e9dfd5091ed87e07d5922a81e69db0c 100644
--- a/ee/app/graphql/ee/mutations/resolves_issuable.rb
+++ b/ee/app/graphql/ee/mutations/resolves_issuable.rb
@@ -8,6 +8,12 @@ module ResolvesIssuable
 
       private
 
+      def issuable_finder(type, args)
+        return EpicsFinder.new(current_user, args) if type == :epic
+
+        super
+      end
+
       override :resolve_issuable_parent
       def resolve_issuable_parent(type, parent_path)
         return super unless type == :epic
diff --git a/ee/app/helpers/ee/clusters_helper.rb b/ee/app/helpers/ee/clusters_helper.rb
index 06477d373a3afc05ef5ac5b108a7b0e8213b1b8f..b781b6ef68d62e786ec5e040e2ce12320f5d5b34 100644
--- a/ee/app/helpers/ee/clusters_helper.rb
+++ b/ee/app/helpers/ee/clusters_helper.rb
@@ -8,9 +8,5 @@ module ClustersHelper
     def has_multiple_clusters?
       clusterable.feature_available?(:multiple_clusters)
     end
-
-    def show_cluster_health_graphs?
-      clusterable.feature_available?(:cluster_health)
-    end
   end
 end
diff --git a/ee/app/models/concerns/geo/replicable_registry.rb b/ee/app/models/concerns/geo/replicable_registry.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5b45438f7006eed24598307f9378cd7cd8c489bb
--- /dev/null
+++ b/ee/app/models/concerns/geo/replicable_registry.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Geo::ReplicableRegistry
+  extend ActiveSupport::Concern
+
+  STATE_VALUES = {
+    pending: 0,
+    started: 1,
+    synced: 2,
+    failed: 3
+  }.freeze
+
+  class_methods do
+    def state_value(state_string)
+      STATE_VALUES[state_string]
+    end
+
+    def for_model_record_id(id)
+      find_or_initialize_by(self::MODEL_FOREIGN_KEY => id)
+    end
+
+    def declarative_policy_class
+      'Geo::RegistryPolicy'
+    end
+  end
+
+  included do
+    include ::Delay
+
+    scope :never, -> { where(last_synced_at: nil) }
+    scope :failed, -> { with_state(:failed) }
+    scope :synced, -> { with_state(:synced) }
+    scope :pending, -> { with_state(:pending) }
+    scope :retry_due, -> { where(arel_table[:retry_at].eq(nil).or(arel_table[:retry_at].lt(Time.current))) }
+    scope :ordered, -> { order(:id) }
+
+    state_machine :state, initial: :pending do
+      state :pending, value: STATE_VALUES[:pending]
+      state :started, value: STATE_VALUES[:started]
+      state :synced, value: STATE_VALUES[:synced]
+      state :failed, value: STATE_VALUES[:failed]
+
+      before_transition any => :started do |registry, _|
+        registry.last_synced_at = Time.current
+      end
+
+      before_transition any => :pending do |registry, _|
+        registry.retry_at = 0
+        registry.retry_count = 0
+      end
+
+      before_transition any => :failed do |registry, _|
+        registry.retry_count += 1
+        registry.retry_at = registry.next_retry_time(registry.retry_count)
+      end
+
+      before_transition any => :synced do |registry, _|
+        registry.retry_count = 0
+        registry.last_sync_failure = nil
+        registry.retry_at = nil
+      end
+
+      event :start do
+        transition [:pending, :synced, :failed] => :started
+      end
+
+      event :synced do
+        transition [:started] => :synced
+      end
+
+      event :failed do
+        transition [:started] => :failed
+      end
+
+      event :resync do
+        transition [:synced, :failed] => :pending
+      end
+    end
+
+    # Override state machine failed! event method to record a failure message at
+    # the same time.
+    #
+    # @param [String] message error information
+    # @param [StandardError] error exception
+    def failed!(message, error = nil)
+      self.last_sync_failure = message
+      self.last_sync_failure += ": #{error.message}" if error.respond_to?(:message)
+
+      super()
+    end
+  end
+end
diff --git a/ee/app/models/ee/namespace.rb b/ee/app/models/ee/namespace.rb
index eb8218fe626b5eb9b6f897fa6adce375646da08a..00e07c12f5cebfa0959a6139fdae0ecd36769adc 100644
--- a/ee/app/models/ee/namespace.rb
+++ b/ee/app/models/ee/namespace.rb
@@ -26,10 +26,12 @@ module Namespace
       attr_writer :root_ancestor
 
       has_one :namespace_statistics
+      has_one :namespace_limit, inverse_of: :namespace
       has_one :gitlab_subscription, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
       has_one :elasticsearch_indexed_namespace
 
       accepts_nested_attributes_for :gitlab_subscription
+      accepts_nested_attributes_for :namespace_limit
 
       scope :include_gitlab_subscription, -> { includes(:gitlab_subscription) }
       scope :join_gitlab_subscription, -> { joins("LEFT OUTER JOIN gitlab_subscriptions ON gitlab_subscriptions.namespace_id=namespaces.id") }
@@ -53,6 +55,10 @@ module Namespace
       delegate :shared_runners_minutes, :shared_runners_seconds, :shared_runners_seconds_last_reset,
         :extra_shared_runners_minutes, to: :namespace_statistics, allow_nil: true
 
+      delegate :additional_purchased_storage_size, :additional_purchased_storage_size=,
+        :additional_purchased_storage_ends_on, :additional_purchased_storage_ends_on=,
+        to: :namespace_limit, allow_nil: true
+
       delegate :email, to: :owner, allow_nil: true, prefix: true
 
       # Opportunistically clear the +file_template_project_id+ if invalid
@@ -72,6 +78,10 @@ module Namespace
       before_save :clear_feature_available_cache
     end
 
+    def namespace_limit
+      super.presence || build_namespace_limit
+    end
+
     class_methods do
       extend ::Gitlab::Utils::Override
 
diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb
index 8c33ed8159c99cad75172a424aca6c4f62500b13..5a72f7e564b7236a28f5d35c22876b2e8895e47c 100644
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -312,6 +312,7 @@ def push_audit_events_enabled?
       ::Feature.enabled?(:repository_push_audit_event, self)
     end
 
+    override :feature_available?
     def feature_available?(feature, user = nil)
       if ::ProjectFeature::FEATURES.include?(feature)
         super
diff --git a/ee/app/models/ee/user_callout_enums.rb b/ee/app/models/ee/user_callout_enums.rb
index a729e1ef694bfd8205b71b75d3f31bfec1155a12..f45fb93ef0229633e1b491095811267c0bf28fc5 100644
--- a/ee/app/models/ee/user_callout_enums.rb
+++ b/ee/app/models/ee/user_callout_enums.rb
@@ -7,6 +7,8 @@ module UserCalloutEnums
     class_methods do
       extend ::Gitlab::Utils::Override
 
+      # If you are going to add new items to this hash, check that you're not going
+      # to conflict with FOSS-only values: https://gitlab.com/gitlab-org/gitlab/blob/master/app/models/user_callout_enums.rb
       override :feature_names
       def feature_names
         super.merge(
diff --git a/ee/app/models/geo/package_file_registry.rb b/ee/app/models/geo/package_file_registry.rb
index c9f129bdcdca71aedde8b58101733f46b22462ab..78b43ef11d247b1ee1958e50410835d53acb38bf 100644
--- a/ee/app/models/geo/package_file_registry.rb
+++ b/ee/app/models/geo/package_file_registry.rb
@@ -1,103 +1,21 @@
 # frozen_string_literal: true
 
 class Geo::PackageFileRegistry < Geo::BaseRegistry
-  include ::Delay
+  include ::Geo::ReplicableRegistry
   include ShaAttribute
 
   MODEL_CLASS = ::Packages::PackageFile
   MODEL_FOREIGN_KEY = :package_file_id
 
-  def self.declarative_policy_class
-    'Geo::RegistryPolicy'
-  end
-
-  STATE_VALUES = {
-    pending: 0,
-    started: 1,
-    synced: 2,
-    failed: 3
-  }.freeze
-
   belongs_to :package_file, class_name: 'Packages::PackageFile'
 
-  scope :never, -> { where(last_synced_at: nil) }
-  scope :failed, -> { with_state(:failed) }
-  scope :synced, -> { with_state(:synced) }
-  scope :pending, -> { with_state(:pending) }
-  scope :retry_due, -> { where(arel_table[:retry_at].eq(nil).or(arel_table[:retry_at].lt(Time.current))) }
-  scope :ordered, -> { order(:id) }
-
-  state_machine :state, initial: :pending do
-    state :pending, value: STATE_VALUES[:pending]
-    state :started, value: STATE_VALUES[:started]
-    state :synced, value: STATE_VALUES[:synced]
-    state :failed, value: STATE_VALUES[:failed]
-
-    before_transition any => :started do |registry, _|
-      registry.last_synced_at = Time.current
-    end
-
-    before_transition any => :pending do |registry, _|
-      registry.retry_at = 0
-      registry.retry_count = 0
-    end
-
-    before_transition any => :failed do |registry, _|
-      registry.retry_count += 1
-      registry.retry_at = registry.next_retry_time(registry.retry_count)
-    end
-
-    before_transition any => :synced do |registry, _|
-      registry.retry_count = 0
-      registry.last_sync_failure = nil
-      registry.retry_at = nil
-    end
-
-    event :start do
-      transition [:pending, :synced, :failed] => :started
-    end
-
-    event :synced do
-      transition [:started] => :synced
-    end
-
-    event :failed do
-      transition [:started] => :failed
-    end
-
-    event :resync do
-      transition [:synced, :failed] => :pending
-    end
-  end
-
   sha_attribute :verification_checksum
   sha_attribute :verification_checksum_mismatched
 
-  # @return [Geo::PackageFileRegistry] an instance of this class
-  def self.for_model_record_id(id)
-    find_or_initialize_by(package_file_id: id)
-  end
-
-  def self.state_value(state_string)
-    STATE_VALUES[state_string]
-  end
-
   def self.has_create_events?
     true
   end
 
-  # Override state machine failed! event method to record a failure message at
-  # the same time.
-  #
-  # @param [String] message error information
-  # @param [StandardError] error exception
-  def failed!(message, error = nil)
-    self.last_sync_failure = message
-    self.last_sync_failure += ": #{error.message}" if error.respond_to?(:message)
-
-    super()
-  end
-
   def self.delete_for_model_ids(package_file_ids)
     # TODO: https://gitlab.com/gitlab-org/gitlab/-/issues/222635
     []
diff --git a/ee/app/models/license.rb b/ee/app/models/license.rb
index 25d0826ca2c7e6f0ac6989be4520d2b81682bba8..39a425d5ec4e64bcd7de5c36bbf6defefc8a86a5 100644
--- a/ee/app/models/license.rb
+++ b/ee/app/models/license.rb
@@ -109,7 +109,6 @@ class License < ApplicationRecord
   EEP_FEATURES.freeze
 
   EEU_FEATURES = EEP_FEATURES + %i[
-    cluster_health
     compliance_framework
     container_scanning
     credentials_inventory
diff --git a/ee/app/models/namespace_limit.rb b/ee/app/models/namespace_limit.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dfffbf44a1fc6d8ab07716840d59476d4210c858
--- /dev/null
+++ b/ee/app/models/namespace_limit.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class NamespaceLimit < ApplicationRecord
+  self.primary_key = :namespace_id
+
+  belongs_to :namespace, inverse_of: :namespace_limit
+end
diff --git a/ee/app/models/operations/feature_flags/user_list.rb b/ee/app/models/operations/feature_flags/user_list.rb
index 0a7ec37ea89481540a9f3b6da71586f0d11b16c7..b9bdcb59d5fe8307fcd687b6363cbc4993bdf370 100644
--- a/ee/app/models/operations/feature_flags/user_list.rb
+++ b/ee/app/models/operations/feature_flags/user_list.rb
@@ -9,6 +9,8 @@ class UserList < ApplicationRecord
       self.table_name = 'operations_user_lists'
 
       belongs_to :project
+      has_many :strategy_user_lists
+      has_many :strategies, through: :strategy_user_lists
 
       has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.operations_feature_flags_user_lists&.maximum(:iid) }, presence: true
 
@@ -18,6 +20,17 @@ class UserList < ApplicationRecord
         uniqueness: { scope: :project_id },
         length: 1..255
       validates :user_xids, feature_flag_user_xids: true
+
+      before_destroy :ensure_no_associated_strategies
+
+      private
+
+      def ensure_no_associated_strategies
+        if strategies.present?
+          errors.add(:base, 'User list is associated with a strategy')
+          throw :abort # rubocop: disable Cop/BanCatchThrow
+        end
+      end
     end
   end
 end
diff --git a/ee/app/models/vulnerabilities/scanner.rb b/ee/app/models/vulnerabilities/scanner.rb
index 8307a09946f0f3eb9c9790f77024b54db723e328..673408e793627bd22a06bc618c109dd3350bd4ec 100644
--- a/ee/app/models/vulnerabilities/scanner.rb
+++ b/ee/app/models/vulnerabilities/scanner.rb
@@ -11,7 +11,7 @@ class Scanner < ApplicationRecord
     validates :project, presence: true
     validates :external_id, presence: true, uniqueness: { scope: :project_id }
     validates :name, presence: true
-    validates :vendor, presence: true, length: { maximum: 255 }
+    validates :vendor, length: { maximum: 255, allow_nil: false }
 
     scope :with_external_id, -> (external_ids) { where(external_id: external_ids) }
   end
diff --git a/ee/app/policies/ee/clusters/instance_policy.rb b/ee/app/policies/ee/clusters/instance_policy.rb
index af96110b1cd3581866d452faa3c9fdc864df9f61..877ff85dc63c69424b38f16f550d5d1f53643a9a 100644
--- a/ee/app/policies/ee/clusters/instance_policy.rb
+++ b/ee/app/policies/ee/clusters/instance_policy.rb
@@ -11,15 +11,8 @@ module InstancePolicy
           License.feature_available?(:cluster_deployments)
         end
 
-        with_scope :global
-        condition(:cluster_health_available) do
-          License.feature_available?(:cluster_health)
-        end
-
         rule { can?(:read_cluster) & cluster_deployments_available }
           .enable :read_cluster_environments
-
-        rule { can?(:read_cluster) & cluster_health_available }.enable :read_cluster_health
       end
     end
   end
diff --git a/ee/app/policies/ee/group_policy.rb b/ee/app/policies/ee/group_policy.rb
index 3c205f0dc1015f2779c2e14c672dfc32f323a1a1..a8a67a616e6ef80eaf710cdfa7138084538de715 100644
--- a/ee/app/policies/ee/group_policy.rb
+++ b/ee/app/policies/ee/group_policy.rb
@@ -65,11 +65,6 @@ module GroupPolicy
         @subject.feature_available?(:group_timelogs)
       end
 
-      with_scope :global
-      condition(:cluster_health_available) do
-        License.feature_available?(:cluster_health)
-      end
-
       with_scope :global
       condition(:commit_committer_check_disabled_globally) do
         !PushRule.global&.commit_committer_check
@@ -223,8 +218,6 @@ module GroupPolicy
 
       rule { ~group_timelogs_available }.prevent :read_group_timelogs
 
-      rule { can?(:read_cluster) & cluster_health_available }.enable :read_cluster_health
-
       rule { ~(admin | allow_to_manage_default_branch_protection) }.policy do
         prevent :update_default_branch_protection
       end
@@ -256,6 +249,8 @@ module GroupPolicy
       rule { ~reject_unsigned_commits_available }.prevent :change_reject_unsigned_commits
 
       rule { can?(:maintainer_access) & push_rules_available }.enable :change_push_rules
+
+      rule { admin & is_gitlab_com }.enable :update_subscription_limit
     end
 
     override :lookup_access_level!
diff --git a/ee/app/policies/ee/namespace_policy.rb b/ee/app/policies/ee/namespace_policy.rb
index c5dddc0649444f429c0e47eb35c27856582683a7..1743407fef62dc2d2420d253860a8084d061e844 100644
--- a/ee/app/policies/ee/namespace_policy.rb
+++ b/ee/app/policies/ee/namespace_policy.rb
@@ -8,6 +8,8 @@ module NamespacePolicy
       rule { owner | admin }.policy do
         enable :create_jira_connect_subscription
       end
+
+      rule { admin & is_gitlab_com }.enable :update_subscription_limit
     end
   end
 end
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 359f702a4f95c119b85108495a693e5d432306af..955847e418d5a6659dd3f53aa2963494867f6620 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -102,11 +102,6 @@ module ProjectPolicy
         end
       end
 
-      with_scope :global
-      condition(:cluster_health_available) do
-        License.feature_available?(:cluster_health)
-      end
-
       with_scope :subject
       condition(:group_push_rules_enabled) do
         @subject.group && ::Feature.enabled?(:group_push_rules, @subject.group.root_ancestor)
@@ -407,8 +402,6 @@ module ProjectPolicy
         prevent :modify_merge_request_committer_setting
       end
 
-      rule { can?(:read_cluster) & cluster_health_available }.enable :read_cluster_health
-
       rule { can?(:read_merge_request) & code_review_analytics_enabled }.enable :read_code_review_analytics
 
       rule { can?(:read_project) & requirements_available }.enable :read_requirement
diff --git a/ee/app/services/feature_flag_issues/create_service.rb b/ee/app/services/feature_flag_issues/create_service.rb
index da1cad98fe5c5a12e36916acd0c35c2cc2416744..d5ef7cd710dbce2380cfbb17d4b5ca094d3bcf11 100644
--- a/ee/app/services/feature_flag_issues/create_service.rb
+++ b/ee/app/services/feature_flag_issues/create_service.rb
@@ -7,7 +7,7 @@ def previous_related_issuables
     end
 
     def linkable_issuables(issues)
-      issues
+      issues.select { |issue| can?(current_user, :read_issue, issue) }
     end
 
     def relate_issuables(referenced_issue)
diff --git a/ee/app/services/merge_trains/create_pipeline_service.rb b/ee/app/services/merge_trains/create_pipeline_service.rb
index 3e59e9e20f600b5a52d13225b0029a67d318ef79..d3b3a05ff789b652e427d38b176948447a08992f 100644
--- a/ee/app/services/merge_trains/create_pipeline_service.rb
+++ b/ee/app/services/merge_trains/create_pipeline_service.rb
@@ -46,7 +46,7 @@ def create_pipeline(merge_request, merge_status)
         source_sha: merge_status[:source_id])
         .execute(:merge_request_event, merge_request: merge_request)
 
-      return error(pipeline.error_messages) unless pipeline.persisted?
+      return error(pipeline.full_error_messages) unless pipeline.persisted?
 
       success(pipeline: pipeline)
     end
diff --git a/ee/app/views/projects/feature_flags/edit.html.haml b/ee/app/views/projects/feature_flags/edit.html.haml
index 5ace9fa4e0f2f844facd1ab299ca03c5e828f443..b32db6b62286cec55fd6aa6b4fca2d2d2ac1bdaa 100644
--- a/ee/app/views/projects/feature_flags/edit.html.haml
+++ b/ee/app/views/projects/feature_flags/edit.html.haml
@@ -8,4 +8,4 @@
                       project_id: @project.id,
                       feature_flags_path: project_feature_flags_path(@project),
                       environments_endpoint: search_project_environments_path(@project, format: :json),
-                      feature_flag_issues_endpoint: Feature.enabled?(:feature_flags_issue_links, @project) ? project_feature_flag_issues_path(@project, @feature_flag) : ''} }
+                      feature_flag_issues_endpoint: Feature.enabled?(:feature_flags_issue_links, @project) && can?(current_user, :read_issue_link, @project) ? project_feature_flag_issues_path(@project, @feature_flag) : ''} }
diff --git a/ee/app/views/projects/issues/_alert_blocked.html.haml b/ee/app/views/projects/issues/_alert_blocked.html.haml
index feba93499d47d79a8dd6a8a292e9c33c8609fff9..927d7e78092823ec0df0633b08e4c574f1c9ce03 100644
--- a/ee/app/views/projects/issues/_alert_blocked.html.haml
+++ b/ee/app/views/projects/issues/_alert_blocked.html.haml
@@ -2,7 +2,7 @@
 - blocked_by_issues_links = blocked_by_issues.map { |blocking_issue| link_to "\##{blocking_issue.iid}", project_issue_path(blocking_issue.project, blocking_issue), class: 'gl-link' }.join(', ').html_safe
 
 - if @issue.blocked? && @issue.blocked_by_issues(current_user).length > 0
-  .hidden.js-close-blocked-issue-warning.js-issuable-buttons.gl-alert.gl-alert-warning.prepend-top-16{ role: 'alert', data: { 'action': "close-reopen" } }
+  .hidden.js-close-blocked-issue-warning.js-issuable-buttons.gl-alert.gl-alert-warning.gl-mt-5{ role: 'alert', data: { 'action': "close-reopen" } }
     = sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon')
     %h4.gl-alert-title
       = _('Are you sure you want to close this blocked issue?')
diff --git a/ee/changelogs/unreleased-ee/alexives-35913-update_ui_remove_pause_button.yml b/ee/changelogs/unreleased-ee/alexives-35913-update_ui_remove_pause_button.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a33e937c88a8c3a16e48a0dca52859cf86901320
--- /dev/null
+++ b/ee/changelogs/unreleased-ee/alexives-35913-update_ui_remove_pause_button.yml
@@ -0,0 +1,5 @@
+---
+title: Update node ui to have status indicator instead of button for replication
+merge_request: 34571
+author:
+type: added
diff --git a/ee/changelogs/unreleased/210327-add-parsing-vendor-name.yml b/ee/changelogs/unreleased/210327-add-parsing-vendor-name.yml
new file mode 100644
index 0000000000000000000000000000000000000000..52e98a62b891bab60dec882dc8548fa6a33e58d0
--- /dev/null
+++ b/ee/changelogs/unreleased/210327-add-parsing-vendor-name.yml
@@ -0,0 +1,5 @@
+---
+title: Add parsing Vendor name from Security Reports
+merge_request: 35222
+author:
+type: added
diff --git a/ee/changelogs/unreleased/215027-redesign-geo-node-form.yml b/ee/changelogs/unreleased/215027-redesign-geo-node-form.yml
new file mode 100644
index 0000000000000000000000000000000000000000..db594a9cf887f7f3fadc44c8ee432a9b051637df
--- /dev/null
+++ b/ee/changelogs/unreleased/215027-redesign-geo-node-form.yml
@@ -0,0 +1,5 @@
+---
+title: Geo Node Form - Redesign
+merge_request: 34561
+author:
+type: changed
diff --git a/ee/changelogs/unreleased/218497-vulnerabilities-undefined.yml b/ee/changelogs/unreleased/218497-vulnerabilities-undefined.yml
new file mode 100644
index 0000000000000000000000000000000000000000..11be986f99e7d1dbf68f217f1089ea7118cc439d
--- /dev/null
+++ b/ee/changelogs/unreleased/218497-vulnerabilities-undefined.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes a bug that would prevent the dependencies list from rendering for user that aren't authorized to see the vulnerabilities
+merge_request: 35171
+author:
+type: fixed
diff --git a/ee/changelogs/unreleased/223272-geo-project-removal-leaves-orphaned-data-on-disk.yml b/ee/changelogs/unreleased/223272-geo-project-removal-leaves-orphaned-data-on-disk.yml
new file mode 100644
index 0000000000000000000000000000000000000000..66c022d2def2334976c8de3ab9af97880ac67832
--- /dev/null
+++ b/ee/changelogs/unreleased/223272-geo-project-removal-leaves-orphaned-data-on-disk.yml
@@ -0,0 +1,5 @@
+---
+title: Geo - Fix repositories deletion after project removal
+merge_request: 34963
+author:
+type: fixed
diff --git a/ee/changelogs/unreleased/disallow-delete-assoced-userlists.yml b/ee/changelogs/unreleased/disallow-delete-assoced-userlists.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0f92c6ebd7ec1c43aa4a253e8e3883062b9c353b
--- /dev/null
+++ b/ee/changelogs/unreleased/disallow-delete-assoced-userlists.yml
@@ -0,0 +1,5 @@
+---
+title: Forbid deleting a feature flag user list associated with a strategy
+merge_request: 35275
+author:
+type: fixed
diff --git a/ee/changelogs/unreleased/mwaw-208224-move-cluster-health-to-core-BE-policies.yml b/ee/changelogs/unreleased/mwaw-208224-move-cluster-health-to-core-BE-policies.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8ba07ebb4672a3c1de638a3c19c77b90e76db531
--- /dev/null
+++ b/ee/changelogs/unreleased/mwaw-208224-move-cluster-health-to-core-BE-policies.yml
@@ -0,0 +1,5 @@
+---
+title: Make cluster health dashboard available to all self-hosted paid tiers users
+merge_request: 35333
+author:
+type: changed
diff --git a/ee/changelogs/unreleased/nicolasdular-namespace-storage-purchase-api.yml b/ee/changelogs/unreleased/nicolasdular-namespace-storage-purchase-api.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ef61f9023aac6065eaf43240db1356761125990a
--- /dev/null
+++ b/ee/changelogs/unreleased/nicolasdular-namespace-storage-purchase-api.yml
@@ -0,0 +1,5 @@
+---
+title: Add Namespace API to set additionally purchased storage
+merge_request: 35257
+author:
+type: added
diff --git a/ee/lib/api/feature_flags_user_lists.rb b/ee/lib/api/feature_flags_user_lists.rb
index 0bc78bdb0469302c6330a9b8f95abc5d92d8fe68..3e7dc6075c217e630015f4997e2ad71bebae686e 100644
--- a/ee/lib/api/feature_flags_user_lists.rb
+++ b/ee/lib/api/feature_flags_user_lists.rb
@@ -84,7 +84,9 @@ class FeatureFlagsUserLists < Grape::API
         end
         delete do
           list = user_project.operations_feature_flags_user_lists.find_by_iid!(params[:iid])
-          list.destroy
+          unless list.destroy
+            render_api_error!(list.errors.full_messages, :conflict)
+          end
         end
       end
     end
diff --git a/ee/lib/ee/api/entities/namespace.rb b/ee/lib/ee/api/entities/namespace.rb
index 86981ec6b97d893488044c393c9fe5bc8b5023bb..e18237112dd04eafbe36c25008427d8e4d298ecb 100644
--- a/ee/lib/ee/api/entities/namespace.rb
+++ b/ee/lib/ee/api/entities/namespace.rb
@@ -7,10 +7,13 @@ module Namespace
         extend ActiveSupport::Concern
 
         prepended do
+          can_update_limits = ->(namespace, opts) { ::Ability.allowed?(opts[:current_user], :update_subscription_limit, namespace) }
           can_admin_namespace = ->(namespace, opts) { ::Ability.allowed?(opts[:current_user], :admin_namespace, namespace) }
 
-          expose :shared_runners_minutes_limit, if: ->(_, options) { options[:current_user]&.admin? }
-          expose :extra_shared_runners_minutes_limit, if: ->(_, options) { options[:current_user]&.admin? }
+          expose :shared_runners_minutes_limit, if: can_update_limits
+          expose :extra_shared_runners_minutes_limit, if: can_update_limits
+          expose :additional_purchased_storage_size, if: can_update_limits
+          expose :additional_purchased_storage_ends_on, if: can_update_limits
           expose :billable_members_count do |namespace, options|
             namespace.billable_members_count(options[:requested_hosted_plan])
           end
diff --git a/ee/lib/ee/api/namespaces.rb b/ee/lib/ee/api/namespaces.rb
index 3ed9b6104b77272e35804233ffa088ee5765527e..11576a60e315d2415173271e692e5ec0ca52b397 100644
--- a/ee/lib/ee/api/namespaces.rb
+++ b/ee/lib/ee/api/namespaces.rb
@@ -53,6 +53,8 @@ def update_namespace(namespace)
           params do
             optional :shared_runners_minutes_limit, type: Integer, desc: "Pipeline minutes quota for this namespace"
             optional :extra_shared_runners_minutes_limit, type: Integer, desc: "Extra pipeline minutes for this namespace"
+            optional :additional_purchased_storage_size, type: Integer, desc: "Additional storage size for this namespace"
+            optional :additional_purchased_storage_ends_on, type: Date, desc: "End of subscription of the additional purchased storage"
           end
           put ':id' do
             authenticated_as_admin!
diff --git a/ee/lib/ee/banzai/filter/inline_metrics_redactor_filter.rb b/ee/lib/ee/banzai/filter/inline_metrics_redactor_filter.rb
index 020d72a1bbb3ab667656cb393d0f24c991650970..32c04c03bb1b63ae4097e18b2942bf3a3ef95211 100644
--- a/ee/lib/ee/banzai/filter/inline_metrics_redactor_filter.rb
+++ b/ee/lib/ee/banzai/filter/inline_metrics_redactor_filter.rb
@@ -12,7 +12,7 @@ module InlineMetricsRedactorFilter
         def permissions_by_route
           super.concat([
             ROUTE.new(::Gitlab::Metrics::Dashboard::Url.alert_regex, :read_prometheus_alerts),
-            ROUTE.new(::Gitlab::Metrics::Dashboard::Url.clusters_regex, :read_cluster_health)
+            ROUTE.new(::Gitlab::Metrics::Dashboard::Url.clusters_regex, :read_cluster)
           ])
         end
       end
diff --git a/ee/lib/gitlab/analytics/cycle_analytics/stage_events/label_based_stage_event.rb b/ee/lib/gitlab/analytics/cycle_analytics/stage_events/label_based_stage_event.rb
index 189985ba639427863ac7859182541ea11b633d16..eed37e29f7acbef01cefede711c426b6a670c0ff 100644
--- a/ee/lib/gitlab/analytics/cycle_analytics/stage_events/label_based_stage_event.rb
+++ b/ee/lib/gitlab/analytics/cycle_analytics/stage_events/label_based_stage_event.rb
@@ -24,6 +24,7 @@ def timestamp_projection
             Arel.sql("#{join_expression_name}.created_at")
           end
 
+          override :column_list
           def column_list
             [timestamp_projection]
           end
diff --git a/ee/lib/gitlab/ci/parsers/security/common.rb b/ee/lib/gitlab/ci/parsers/security/common.rb
index 0d73b013d980a8660c77122ae0d2ae2de1a64bad..93689dea4352b95c2919dde2614ffa6d6152b6c0 100644
--- a/ee/lib/gitlab/ci/parsers/security/common.rb
+++ b/ee/lib/gitlab/ci/parsers/security/common.rb
@@ -72,7 +72,8 @@ def create_scanner(report, scanner)
             report.add_scanner(
               ::Gitlab::Ci::Reports::Security::Scanner.new(
                 external_id: scanner['id'],
-                name: scanner['name']))
+                name: scanner['name'],
+                vendor: scanner.dig('vendor', 'name')))
           end
 
           def create_identifiers(report, identifiers)
diff --git a/ee/lib/gitlab/ci/parsers/security/formatters/dast.rb b/ee/lib/gitlab/ci/parsers/security/formatters/dast.rb
index 28f42afc0702725d590279ca9abed372b2e3c1bc..6342b73eb3c6c7fb122a6ce90a8ad73d9affea1d 100644
--- a/ee/lib/gitlab/ci/parsers/security/formatters/dast.rb
+++ b/ee/lib/gitlab/ci/parsers/security/formatters/dast.rb
@@ -61,7 +61,7 @@ def format_vulnerability(vulnerability, instance, hostname)
                 'severity' => severity(vulnerability['riskcode']),
                 'solution' => sanitize(vulnerability['solution']),
                 'confidence' => confidence(vulnerability['confidence']),
-                'scanner' => { 'id' => 'zaproxy', 'name' => 'ZAProxy' },
+                'scanner' => { 'id' => 'zaproxy', 'name' => 'ZAProxy', 'vendor' => { 'name' => 'GitLab' } },
                 'identifiers' => [
                   {
                     'type' => 'ZAProxy_PluginId',
diff --git a/ee/lib/gitlab/ci/reports/security/scanner.rb b/ee/lib/gitlab/ci/reports/security/scanner.rb
index ae424af791d13800aafe2920ac4711a184ee42c3..859defe6e50113c1dd039f8db92cb01ccd29f573 100644
--- a/ee/lib/gitlab/ci/reports/security/scanner.rb
+++ b/ee/lib/gitlab/ci/reports/security/scanner.rb
@@ -5,11 +5,12 @@ module Ci
     module Reports
       module Security
         class Scanner
-          attr_accessor :external_id, :name
+          attr_accessor :external_id, :name, :vendor
 
-          def initialize(external_id:, name:)
+          def initialize(external_id:, name:, vendor:)
             @external_id = external_id
             @name = name
+            @vendor = vendor
           end
 
           def key
@@ -20,8 +21,9 @@ def to_hash
             %i[
               external_id
               name
+              vendor
             ].each_with_object({}) do |key, hash|
-              hash[key] = public_send(key) # rubocop:disable GitlabSecurity/PublicSend
+              hash[key] = public_send(key).to_s # rubocop:disable GitlabSecurity/PublicSend
             end
           end
 
diff --git a/ee/spec/controllers/admin/clusters_controller_spec.rb b/ee/spec/controllers/admin/clusters_controller_spec.rb
index f48712e3057367e3d4268566a066c1888ec28408..0aebd231e7a2c73774e6d351ad3c9fdf237ede06 100644
--- a/ee/spec/controllers/admin/clusters_controller_spec.rb
+++ b/ee/spec/controllers/admin/clusters_controller_spec.rb
@@ -57,25 +57,7 @@
     end
 
     describe 'GET #metrics_dashboard' do
-      context 'with license' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it_behaves_like 'the default dashboard'
-      end
-
-      context 'without license' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it 'has status not found' do
-          get :metrics_dashboard, params: metrics_params, format: :json
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
+      it_behaves_like 'the default dashboard'
     end
   end
 
diff --git a/ee/spec/controllers/groups/clusters_controller_spec.rb b/ee/spec/controllers/groups/clusters_controller_spec.rb
index 9553e9bbadfb475d85a6659d77fd57d05d8bd93d..aa3b5c61c2efe1adc2591a1a8fc85c75dece23f8 100644
--- a/ee/spec/controllers/groups/clusters_controller_spec.rb
+++ b/ee/spec/controllers/groups/clusters_controller_spec.rb
@@ -87,25 +87,7 @@
         sign_in(user)
       end
 
-      context 'with license' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it_behaves_like 'the default dashboard'
-      end
-
-      context 'without license' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it 'has status not found' do
-          get :metrics_dashboard, params: metrics_params, format: :json
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
+      it_behaves_like 'the default dashboard'
     end
   end
 
diff --git a/ee/spec/controllers/projects/clusters_controller_spec.rb b/ee/spec/controllers/projects/clusters_controller_spec.rb
index c38c0fedd545ce58465d208b13fd36779e5ac49d..3b2659a6af59305a1e2253e61304225edd67f269 100644
--- a/ee/spec/controllers/projects/clusters_controller_spec.rb
+++ b/ee/spec/controllers/projects/clusters_controller_spec.rb
@@ -84,25 +84,7 @@
         sign_in(user)
       end
 
-      context 'with license' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it_behaves_like 'the default dashboard'
-      end
-
-      context 'without license' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it 'has status not found' do
-          get :metrics_dashboard, params: metrics_params, format: :json
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
+      it_behaves_like 'the default dashboard'
     end
   end
 
diff --git a/ee/spec/controllers/projects/feature_flag_issues_controller_spec.rb b/ee/spec/controllers/projects/feature_flag_issues_controller_spec.rb
index ec7dbc1f237123099a7532f7c93df5b2efd89c17..748673fa3b4a0b674ee88e11ef4a48241127612f 100644
--- a/ee/spec/controllers/projects/feature_flag_issues_controller_spec.rb
+++ b/ee/spec/controllers/projects/feature_flag_issues_controller_spec.rb
@@ -172,6 +172,16 @@ def get_request(project, feature_flag)
       expect(response).to have_gitlab_http_status(:not_found)
     end
 
+    it 'returns not found when related issues feature is unavailable' do
+      stub_licensed_features(related_issues: false)
+      feature_flag, _issue = setup
+      sign_in(developer)
+
+      get_request(project, feature_flag)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+
     context 'when feature flags are unlicensed' do
       before do
         stub_licensed_features(feature_flags: false)
@@ -201,7 +211,7 @@ def post_request(project, feature_flag, issue)
         namespace_id: project.namespace,
         project_id: project,
         feature_flag_iid: feature_flag,
-        issuable_references: [issue.to_reference],
+        issuable_references: [issue.to_reference(full: true)],
         link_type: 'relates_to'
       }
 
@@ -241,6 +251,40 @@ def post_request(project, feature_flag, issue)
       }))
     end
 
+    it 'creates a cross project link for a project in the same namespace' do
+      other_project = create(:project, namespace: project.namespace)
+      other_project.add_developer(developer)
+      feature_flag = create(:operations_feature_flag, project: project)
+      issue = create(:issue, project: other_project)
+      sign_in(developer)
+
+      post_request(project, feature_flag, issue)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response).to match(a_hash_including({
+        'issuables' => [a_hash_including({
+          'id' => issue.id
+        })]
+      }))
+    end
+
+    it 'creates a cross project link for a project in another namespace' do
+      other_project = create(:project)
+      other_project.add_developer(developer)
+      feature_flag = create(:operations_feature_flag, project: project)
+      issue = create(:issue, project: other_project)
+      sign_in(developer)
+
+      post_request(project, feature_flag, issue)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response).to match(a_hash_including({
+        'issuables' => [a_hash_including({
+          'id' => issue.id
+        })]
+      }))
+    end
+
     it 'does not create a link for a reporter' do
       feature_flag, issue = setup
       sign_in(reporter)
@@ -248,18 +292,55 @@ def post_request(project, feature_flag, issue)
       post_request(project, feature_flag, issue)
 
       expect(response).to have_gitlab_http_status(:not_found)
+      expect(::FeatureFlagIssue.count).to eq(0)
     end
 
-    it 'does not create a cross project link' do
-      other_project = create(:project)
-      other_project.add_developer(developer)
+    it "does not create a cross project link when the user is not a member of the issue's project" do
+      other_project = create(:project, namespace: project.namespace)
       feature_flag = create(:operations_feature_flag, project: project)
-      issue = create(:issue, project: other_project)
+      issue = create(:issue, project: other_project, confidential: true)
       sign_in(developer)
 
       post_request(project, feature_flag, issue)
 
       expect(response).to have_gitlab_http_status(:not_found)
+      expect(::FeatureFlagIssue.count).to eq(0)
+    end
+
+    it "does not create a cross project link when the user is a guest of the issue's project" do
+      other_project = create(:project, namespace: project.namespace)
+      other_project.add_guest(developer)
+      feature_flag = create(:operations_feature_flag, project: project)
+      issue = create(:issue, project: other_project, confidential: true)
+      sign_in(developer)
+
+      post_request(project, feature_flag, issue)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+      expect(::FeatureFlagIssue.count).to eq(0)
+    end
+
+    it 'does not create a link when the user cannot read the issue' do
+      feature_flag, issue = setup
+      sign_in(developer)
+      allow(Ability).to receive(:allowed?).and_call_original
+      allow(Ability).to receive(:allowed?).with(developer, :read_issue, issue).and_return(false)
+
+      post_request(project, feature_flag, issue)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+      expect(::FeatureFlagIssue.count).to eq(0)
+    end
+
+    it 'does not create a link when the related issues feature is unavailable' do
+      stub_licensed_features(related_issues: false)
+      feature_flag, issue = setup
+      sign_in(developer)
+
+      post_request(project, feature_flag, issue)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+      expect(::FeatureFlagIssue.count).to eq(0)
     end
 
     context 'when feature flags are unlicensed' do
@@ -274,6 +355,7 @@ def post_request(project, feature_flag, issue)
         post_request(project, feature_flag, issue)
 
         expect(response).to have_gitlab_http_status(:not_found)
+        expect(::FeatureFlagIssue.count).to eq(0)
       end
     end
   end
@@ -317,5 +399,16 @@ def delete_request(project, feature_flag, feature_flag_issue)
       expect(response).to have_gitlab_http_status(:not_found)
       expect(feature_flag.reload.issues).to eq([issue])
     end
+
+    it 'does not unlink the issue when the related issues feature is unavailable' do
+      stub_licensed_features(related_issues: false)
+      feature_flag, issue, link = setup
+      sign_in(developer)
+
+      delete_request(project, feature_flag, link)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+      expect(feature_flag.reload.issues).to eq([issue])
+    end
   end
 end
diff --git a/ee/spec/factories/ci/reports/security/scanners.rb b/ee/spec/factories/ci/reports/security/scanners.rb
index 0227bc12bf27c70a036bffc8cee324f6ad8cb508..5f7b76bb530d40976ed35daa8804f04a7162655d 100644
--- a/ee/spec/factories/ci/reports/security/scanners.rb
+++ b/ee/spec/factories/ci/reports/security/scanners.rb
@@ -4,6 +4,7 @@
   factory :ci_reports_security_scanner, class: '::Gitlab::Ci::Reports::Security::Scanner' do
     external_id { 'find_sec_bugs' }
     name { 'Find Security Bugs' }
+    vendor { 'Security Scanner Vendor' }
 
     skip_create
 
diff --git a/ee/spec/features/admin/geo/admin_geo_nodes_spec.rb b/ee/spec/features/admin/geo/admin_geo_nodes_spec.rb
index 5839c323d8ebe0a6ace3b283514554af2376d9db..d0e60898d6e5f1758690ced5e102c0239f293ab1 100644
--- a/ee/spec/features/admin/geo/admin_geo_nodes_spec.rb
+++ b/ee/spec/features/admin/geo/admin_geo_nodes_spec.rb
@@ -132,7 +132,7 @@ def expect_no_fields(node_fields)
 
       fill_in 'node-url-field', with: 'http://newsite.com'
       fill_in 'node-internal-url-field', with: 'http://internal-url.com'
-      click_button 'Update'
+      click_button 'Save changes'
 
       wait_for_requests
       expect(current_path).to eq admin_geo_nodes_path
diff --git a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
index 10ff99e9b95ac7e2e07397abe4f3a59da0a95c5b..e9e3b48e9c0a29a3d3aafeb1ce1d52b0e5ea98d4 100644
--- a/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
+++ b/ee/spec/features/clusters/cluster_health_dashboard_spec.rb
@@ -12,8 +12,6 @@
   let_it_be(:cluster_path) { project_cluster_path(clusterable, cluster) }
 
   before do
-    stub_licensed_features(cluster_health: true)
-
     clusterable.add_maintainer(current_user)
 
     sign_in(current_user)
diff --git a/ee/spec/features/epics/gfm_autocomplete_spec.rb b/ee/spec/features/epics/gfm_autocomplete_spec.rb
index a6c2b2b149a6938c2c57a3ea67613c8522fafb56..a8edcf1eaf2644582f406ee0eafbb80c886aa33b 100644
--- a/ee/spec/features/epics/gfm_autocomplete_spec.rb
+++ b/ee/spec/features/epics/gfm_autocomplete_spec.rb
@@ -17,6 +17,14 @@
     wait_for_requests
   end
 
+  it 'opens quick action autocomplete when updating description' do
+    find('.js-issuable-edit').click
+
+    find('#issue-description').native.send_keys('/')
+
+    expect(page).to have_selector('.atwho-container')
+  end
+
   context 'issuables' do
     let(:project) { create(:project, :repository, namespace: group) }
 
diff --git a/ee/spec/features/issues/issue_weight_spec.rb b/ee/spec/features/issues/issue_weight_spec.rb
index a42bb5c5e08acb195806e09e63ad064810f9de32..58efc0c47f6a399595e0bd7c0d60b252758a0f11 100644
--- a/ee/spec/features/issues/issue_weight_spec.rb
+++ b/ee/spec/features/issues/issue_weight_spec.rb
@@ -5,6 +5,10 @@
 RSpec.describe 'Issue weight', :js do
   let(:project) { create(:project, :public) }
 
+  before do
+    stub_feature_flags(vue_issuables_list: false)
+  end
+
   it 'shows weight on issue list row' do
     create(:issue, project: project, weight: 2)
 
diff --git a/ee/spec/features/issues/service_desk_spec.rb b/ee/spec/features/issues/service_desk_spec.rb
index 008309ae4d877626b353e6f2dd40b966f8a17eb3..ed00e6d1bfe4cc528a5db9e8d3066085f03ab132 100644
--- a/ee/spec/features/issues/service_desk_spec.rb
+++ b/ee/spec/features/issues/service_desk_spec.rb
@@ -7,6 +7,8 @@
   let(:user) { create(:user) }
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+
     allow(License).to receive(:feature_available?).and_call_original
     allow(License).to receive(:feature_available?).with(:service_desk).and_return(true)
     allow(Gitlab::IncomingEmail).to receive(:enabled?).and_return(true)
diff --git a/ee/spec/features/markdown/metrics_spec.rb b/ee/spec/features/markdown/metrics_spec.rb
index 69442dc04198291e31186efcd2e5483859797fbc..bfcc2636db429e92fff689f3fdeafd4137c8a9f3 100644
--- a/ee/spec/features/markdown/metrics_spec.rb
+++ b/ee/spec/features/markdown/metrics_spec.rb
@@ -19,7 +19,7 @@
       .to receive(:url)
       .and_return(urls.root_url.chomp('/'))
 
-    stub_licensed_features(prometheus_alerts: true, cluster_health: true)
+    stub_licensed_features(prometheus_alerts: true)
 
     project.add_maintainer(user)
     sign_in(user)
@@ -106,20 +106,6 @@
         .with(cluster, 'GET', 'query_range', hash_including('start', 'end', 'step'))
         .at_least(:once)
     end
-
-    # Delete when moving to CE
-    context 'unlicensed' do
-      before do
-        stub_licensed_features(cluster_health: false)
-      end
-
-      it 'shows no embedded metrics' do
-        visit project_issue_path(project, issue)
-
-        expect(page).to have_no_css('div.metrics-embed')
-        expect(page).to have_no_css('div.js-render-metrics')
-      end
-    end
   end
 
   def import_common_metrics
diff --git a/ee/spec/features/projects/feature_flags/feature_flag_issues_spec.rb b/ee/spec/features/projects/feature_flags/feature_flag_issues_spec.rb
index 0df579443dd144b3fd2c2bcfd7d13353f43aa984..1d8cc448a726be48c160e4953816f2740c68366b 100644
--- a/ee/spec/features/projects/feature_flags/feature_flag_issues_spec.rb
+++ b/ee/spec/features/projects/feature_flags/feature_flag_issues_spec.rb
@@ -72,6 +72,19 @@
         expect(page).not_to have_selector '#related-issues'
       end
     end
+
+    context 'when the related issues feature is unavailable' do
+      before do
+        stub_licensed_features(related_issues: false, feature_flags: true)
+      end
+
+      it 'does not show the related issues widget' do
+        visit(edit_project_feature_flag_path(project, feature_flag))
+
+        expect(page).to have_text 'Strategies'
+        expect(page).not_to have_selector '#related-issues'
+      end
+    end
   end
 
   describe 'unlinking a feature flag from an issue' do
diff --git a/ee/spec/finders/epics_finder_spec.rb b/ee/spec/finders/epics_finder_spec.rb
index 20bfd7a035279ef1303a29fa7c6e8b7677b51313..cdb9af894abd04e692a07b3a15e56b8a8b7ea35b 100644
--- a/ee/spec/finders/epics_finder_spec.rb
+++ b/ee/spec/finders/epics_finder_spec.rb
@@ -389,16 +389,6 @@ def epics(params = {})
               expect(subject).to match_array([base_epic2, public_epic1, public_epic2])
             end
           end
-
-          context 'when confidential_epics_query is disabled' do
-            before do
-              stub_feature_flags(confidential_epics_query: false)
-            end
-
-            it 'returns also confidential epics' do
-              expect(subject).to match_array([base_epic1, base_epic2, public_epic1, public_epic2])
-            end
-          end
         end
 
         context 'with negated labels' do
diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js b/ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js
index f7725177e5fad2be3fc7b2499a7a295b69a21809..0dce82239c77492ac8b39203962ae506f5a733ed 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/type_of_work_charts_spec.js
@@ -26,6 +26,7 @@ const fakeStore = ({ initialGetters, initialState }) =>
         getters: {
           tasksByTypeChartData: () => tasksByTypeData,
           selectedTasksByTypeFilters: () => taskByTypeFilters,
+          currentGroupPath: () => 'fake/group/path',
           ...initialGetters,
         },
         state: {
diff --git a/ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js b/ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js
index d89fb612acc9399cc92d7019680a889f59f4aa5d..430e8afd59284c848a74da8ab6d4b72cd62900d5 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js
@@ -71,6 +71,11 @@ describe('Cycle analytics getters', () => {
   });
 
   describe('cycleAnalyticsRequestParams', () => {
+    const selectedAuthor = 'Gohan';
+    const selectedMilestone = 'SSJ4';
+    const selectedAssignees = ['krillin', 'gotenks'];
+    const selectedLabels = ['cell saga', 'buu saga'];
+
     beforeEach(() => {
       const fullPath = 'cool-beans';
       state = {
@@ -80,14 +85,22 @@ describe('Cycle analytics getters', () => {
         startDate,
         endDate,
         selectedProjects,
+        selectedAuthor,
+        selectedMilestone,
+        selectedAssignees,
+        selectedLabels,
       };
     });
 
     it.each`
-      param               | value
-      ${'created_after'}  | ${'2018-12-15'}
-      ${'created_before'} | ${'2019-01-14'}
-      ${'project_ids'}    | ${[1, 2]}
+      param                  | value
+      ${'created_after'}     | ${'2018-12-15'}
+      ${'created_before'}    | ${'2019-01-14'}
+      ${'project_ids'}       | ${[1, 2]}
+      ${'author_username'}   | ${selectedAuthor}
+      ${'milestone_title'}   | ${selectedMilestone}
+      ${'assignee_username'} | ${selectedAssignees}
+      ${'label_name'}        | ${selectedLabels}
     `('should return the $param with value $value', ({ param, value }) => {
       expect(
         getters.cycleAnalyticsRequestParams(state, { selectedProjectIds: [1, 2] }),
@@ -95,6 +108,19 @@ describe('Cycle analytics getters', () => {
         [param]: value,
       });
     });
+
+    it.each`
+      param                  | stateKey               | value
+      ${'assignee_username'} | ${'selectedAssignees'} | ${[]}
+      ${'label_name'}        | ${'selectedLabels'}    | ${[]}
+    `('should not return the $param when $stateKey=$value', ({ param, stateKey, value }) => {
+      expect(
+        getters.cycleAnalyticsRequestParams(
+          { ...state, [stateKey]: value },
+          { selectedProjectIds: [1, 2] },
+        ),
+      ).not.toContain(param);
+    });
   });
 
   const hiddenStage = { ...allowedStages[2], hidden: true };
diff --git a/ee/spec/frontend/api_spec.js b/ee/spec/frontend/api_spec.js
index 84af0f2f61e64951bdfb54f400332951a420184c..e3fd9a026f9929336d597970d52646ffe9d82ce3 100644
--- a/ee/spec/frontend/api_spec.js
+++ b/ee/spec/frontend/api_spec.js
@@ -841,4 +841,20 @@ describe('Api', () => {
       });
     });
   });
+
+  describe('getApplicationSettings', () => {
+    const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/application/settings`;
+    const apiResponse = { mock_setting: 1, mock_setting2: 2 };
+
+    it('fetches applications settings', () => {
+      jest.spyOn(Api, 'buildUrl').mockReturnValue(expectedUrl);
+      jest.spyOn(axios, 'get');
+      mock.onGet(expectedUrl).replyOnce(200, apiResponse);
+
+      return Api.getApplicationSettings().then(({ data }) => {
+        expect(data).toEqual(apiResponse);
+        expect(axios.get).toHaveBeenCalledWith(expectedUrl);
+      });
+    });
+  });
 });
diff --git a/ee/spec/frontend/dependencies/components/dependencies_table_spec.js b/ee/spec/frontend/dependencies/components/dependencies_table_spec.js
index 2c01fec983f7fcfb14d0e71cc3dfaf44d5e42243..db654f79233e134b88671024584d98a5655ea3c0 100644
--- a/ee/spec/frontend/dependencies/components/dependencies_table_spec.js
+++ b/ee/spec/frontend/dependencies/components/dependencies_table_spec.js
@@ -54,7 +54,7 @@ describe('DependenciesTable component', () => {
     });
 
     const isVulnerableCellText = normalizeWhitespace(isVulnerableCell.text());
-    if (dependency.vulnerabilities.length) {
+    if (dependency?.vulnerabilities?.length) {
       expect(isVulnerableCellText).toContain(`${dependency.vulnerabilities.length} vuln`);
     } else {
       expect(isVulnerableCellText).toBe('');
@@ -105,13 +105,17 @@ describe('DependenciesTable component', () => {
     });
   });
 
-  describe('given dependencies with no vulnerabilities', () => {
+  describe.each`
+    description                                                             | vulnerabilitiesPayload
+    ${'given dependencies with no vulnerabilities'}                         | ${{ vulnerabilities: [] }}
+    ${'given dependencies when user is not allowed to see vulnerabilities'} | ${{}}
+  `('$description', ({ vulnerabilitiesPayload }) => {
     let dependencies;
 
     beforeEach(() => {
       dependencies = [
-        makeDependency({ vulnerabilities: [] }),
-        makeDependency({ name: 'foo', vulnerabilities: [] }),
+        makeDependency({ ...vulnerabilitiesPayload }),
+        makeDependency({ name: 'foo', ...vulnerabilitiesPayload }),
       ];
 
       createComponent({
diff --git a/ee/spec/frontend/geo_node_form/components/app_spec.js b/ee/spec/frontend/geo_node_form/components/app_spec.js
index 4bbd20f4d50c71ce48937a819324710a422fd62a..3609236345bc360d68f799af93fb9220a3266b9d 100644
--- a/ee/spec/frontend/geo_node_form/components/app_spec.js
+++ b/ee/spec/frontend/geo_node_form/components/app_spec.js
@@ -23,7 +23,7 @@ describe('GeoNodeFormApp', () => {
     wrapper.destroy();
   });
 
-  const findGeoNodeFormTitle = () => wrapper.find('.page-title');
+  const findGeoNodeFormTitle = () => wrapper.find('h2');
   const findGeoNodeFormBadge = () => wrapper.find(GlBadge);
   const findGeoForm = () => wrapper.find(GeoNodeForm);
 
@@ -34,7 +34,7 @@ describe('GeoNodeFormApp', () => {
 
     describe.each`
       formType                     | node                  | title              | pillTitle      | variant
-      ${'create a secondary node'} | ${null}               | ${'New Geo Node'}  | ${'Secondary'} | ${'light'}
+      ${'create a secondary node'} | ${null}               | ${'Add New Node'}  | ${'Secondary'} | ${'light'}
       ${'update a secondary node'} | ${{ primary: false }} | ${'Edit Geo Node'} | ${'Secondary'} | ${'light'}
       ${'update a primary node'}   | ${{ primary: true }}  | ${'Edit Geo Node'} | ${'Primary'}   | ${'primary'}
     `(`form header`, ({ formType, node, title, pillTitle, variant }) => {
diff --git a/ee/spec/frontend/geo_node_form/components/geo_node_form_capacities_spec.js b/ee/spec/frontend/geo_node_form/components/geo_node_form_capacities_spec.js
index 50d2b482045f2fe103651442bffbb55b3cd83e1f..fc97ba33d7aa4109a3e3381b154c31f8fd971a90 100644
--- a/ee/spec/frontend/geo_node_form/components/geo_node_form_capacities_spec.js
+++ b/ee/spec/frontend/geo_node_form/components/geo_node_form_capacities_spec.js
@@ -1,7 +1,12 @@
 import Vuex from 'vuex';
 import { createLocalVue, mount } from '@vue/test-utils';
+import { GlLink } from '@gitlab/ui';
 import GeoNodeFormCapacities from 'ee/geo_node_form/components/geo_node_form_capacities.vue';
-import { VALIDATION_FIELD_KEYS } from 'ee/geo_node_form/constants';
+import {
+  VALIDATION_FIELD_KEYS,
+  REVERIFICATION_MORE_INFO,
+  BACKFILL_MORE_INFO,
+} from 'ee/geo_node_form/constants';
 import { MOCK_NODE } from '../mock_data';
 
 const localVue = createLocalVue();
@@ -44,6 +49,8 @@ describe('GeoNodeFormCapacities', () => {
     wrapper.destroy();
   });
 
+  const findGeoNodeFormCapcitiesSectionDescription = () => wrapper.find('p');
+  const findGeoNodeFormCapacitiesMoreInfoLink = () => wrapper.find(GlLink);
   const findGeoNodeFormRepositoryCapacityField = () =>
     wrapper.find('#node-repository-capacity-field');
   const findGeoNodeFormFileCapacityField = () => wrapper.find('#node-file-capacity-field');
@@ -56,6 +63,28 @@ describe('GeoNodeFormCapacities', () => {
   const findErrorMessage = () => wrapper.find('.invalid-feedback');
 
   describe('template', () => {
+    describe.each`
+      primaryNode | description                                                                                                     | link
+      ${true}     | ${'Set the synchronization and verification capacity for the secondary node.'}                                  | ${REVERIFICATION_MORE_INFO}
+      ${false}    | ${'Set the number of concurrent requests this secondary node will make to the primary node while backfilling.'} | ${BACKFILL_MORE_INFO}
+    `(`section description`, ({ primaryNode, description, link }) => {
+      describe(`when node is ${primaryNode ? 'primary' : 'secondary'}`, () => {
+        beforeEach(() => {
+          createComponent({
+            nodeData: { ...defaultProps.nodeData, primary: primaryNode },
+          });
+        });
+
+        it(`sets section description correctly`, () => {
+          expect(findGeoNodeFormCapcitiesSectionDescription().text()).toContain(description);
+        });
+
+        it(`sets section More Information link correctly`, () => {
+          expect(findGeoNodeFormCapacitiesMoreInfoLink().attributes('href')).toBe(link);
+        });
+      });
+    });
+
     describe.each`
       primaryNode | showRepoCapacity | showFileCapacity | showVerificationCapacity | showContainerCapacity | showReverificationInterval
       ${true}     | ${false}         | ${false}         | ${true}                  | ${false}              | ${true}
@@ -70,42 +99,44 @@ describe('GeoNodeFormCapacities', () => {
         showVerificationCapacity,
         showReverificationInterval,
       }) => {
-        beforeEach(() => {
-          createComponent({
-            nodeData: { ...defaultProps.nodeData, primary: primaryNode },
+        describe(`when node is ${primaryNode ? 'primary' : 'secondary'}`, () => {
+          beforeEach(() => {
+            createComponent({
+              nodeData: { ...defaultProps.nodeData, primary: primaryNode },
+            });
           });
-        });
 
-        it(`it ${showRepoCapacity ? 'shows' : 'hides'} the Repository Capacity Field`, () => {
-          expect(findGeoNodeFormRepositoryCapacityField().exists()).toBe(showRepoCapacity);
-        });
+          it(`it ${showRepoCapacity ? 'shows' : 'hides'} the Repository Capacity Field`, () => {
+            expect(findGeoNodeFormRepositoryCapacityField().exists()).toBe(showRepoCapacity);
+          });
 
-        it(`it ${showFileCapacity ? 'shows' : 'hides'} the File Capacity Field`, () => {
-          expect(findGeoNodeFormFileCapacityField().exists()).toBe(showFileCapacity);
-        });
+          it(`it ${showFileCapacity ? 'shows' : 'hides'} the File Capacity Field`, () => {
+            expect(findGeoNodeFormFileCapacityField().exists()).toBe(showFileCapacity);
+          });
 
-        it(`it ${
-          showContainerCapacity ? 'shows' : 'hides'
-        } the Container Repository Capacity Field`, () => {
-          expect(findGeoNodeFormContainerRepositoryCapacityField().exists()).toBe(
-            showContainerCapacity,
-          );
-        });
+          it(`it ${
+            showContainerCapacity ? 'shows' : 'hides'
+          } the Container Repository Capacity Field`, () => {
+            expect(findGeoNodeFormContainerRepositoryCapacityField().exists()).toBe(
+              showContainerCapacity,
+            );
+          });
 
-        it(`it ${
-          showVerificationCapacity ? 'shows' : 'hides'
-        } the Verification Capacity Field`, () => {
-          expect(findGeoNodeFormVerificationCapacityField().exists()).toBe(
-            showVerificationCapacity,
-          );
-        });
+          it(`it ${
+            showVerificationCapacity ? 'shows' : 'hides'
+          } the Verification Capacity Field`, () => {
+            expect(findGeoNodeFormVerificationCapacityField().exists()).toBe(
+              showVerificationCapacity,
+            );
+          });
 
-        it(`it ${
-          showReverificationInterval ? 'shows' : 'hides'
-        } the Reverification Interval Field`, () => {
-          expect(findGeoNodeFormReverificationIntervalField().exists()).toBe(
-            showReverificationInterval,
-          );
+          it(`it ${
+            showReverificationInterval ? 'shows' : 'hides'
+          } the Reverification Interval Field`, () => {
+            expect(findGeoNodeFormReverificationIntervalField().exists()).toBe(
+              showReverificationInterval,
+            );
+          });
         });
       },
     );
@@ -120,7 +151,7 @@ describe('GeoNodeFormCapacities', () => {
       ${999}  | ${false}  | ${null}
       ${1000} | ${true}   | ${'should be between 1-999'}
     `(`errors`, ({ data, showError, errorMessage }) => {
-      describe('on primary node', () => {
+      describe('when node is primary', () => {
         beforeEach(() => {
           createComponent({
             nodeData: { ...defaultProps.nodeData, primary: true },
@@ -158,7 +189,7 @@ describe('GeoNodeFormCapacities', () => {
         });
       });
 
-      describe('on secondary node', () => {
+      describe('when node is secondary', () => {
         beforeEach(() => {
           createComponent();
         });
@@ -226,7 +257,7 @@ describe('GeoNodeFormCapacities', () => {
 
   describe('computed', () => {
     describe('visibleFormGroups', () => {
-      describe('when nodeData.primary is true', () => {
+      describe('when node is primary', () => {
         beforeEach(() => {
           createComponent({
             nodeData: { ...defaultProps.nodeData, primary: true },
@@ -242,7 +273,7 @@ describe('GeoNodeFormCapacities', () => {
         });
       });
 
-      describe('when nodeData.primary is false', () => {
+      describe('when node is secondary', () => {
         beforeEach(() => {
           createComponent();
         });
diff --git a/ee/spec/frontend/geo_node_form/components/geo_node_form_core_spec.js b/ee/spec/frontend/geo_node_form/components/geo_node_form_core_spec.js
index f3f361c78c039988b429b6dac685ac10d87eafb7..aab633275b704ba9b2ea2356980b140141834c2e 100644
--- a/ee/spec/frontend/geo_node_form/components/geo_node_form_core_spec.js
+++ b/ee/spec/frontend/geo_node_form/components/geo_node_form_core_spec.js
@@ -1,7 +1,8 @@
 import Vuex from 'vuex';
 import { createLocalVue, mount } from '@vue/test-utils';
+import { GlLink } from '@gitlab/ui';
 import GeoNodeFormCore from 'ee/geo_node_form/components/geo_node_form_core.vue';
-import { VALIDATION_FIELD_KEYS } from 'ee/geo_node_form/constants';
+import { VALIDATION_FIELD_KEYS, NODE_NAME_MORE_INFO } from 'ee/geo_node_form/constants';
 import { MOCK_NODE, STRING_OVER_255 } from '../mock_data';
 
 const localVue = createLocalVue();
@@ -45,7 +46,9 @@ describe('GeoNodeFormCore', () => {
   });
 
   const findGeoNodeFormNameField = () => wrapper.find('#node-name-field');
+  const findGeoNodeFormNameMoreInformation = () => wrapper.find(GlLink);
   const findGeoNodeFormUrlField = () => wrapper.find('#node-url-field');
+  const findGeoNodeInternalUrlField = () => wrapper.find('#node-internal-url-field');
   const findErrorMessage = () => wrapper.find('.invalid-feedback');
 
   describe('template', () => {
@@ -61,6 +64,28 @@ describe('GeoNodeFormCore', () => {
       expect(findGeoNodeFormUrlField().exists()).toBe(true);
     });
 
+    it('renders Geo Node Form Name More Information link correctly', () => {
+      expect(findGeoNodeFormNameMoreInformation().attributes('href')).toBe(NODE_NAME_MORE_INFO);
+    });
+
+    describe.each`
+      primaryNode | showInternalUrl
+      ${true}     | ${true}
+      ${false}    | ${false}
+    `(`conditional fields`, ({ primaryNode, showInternalUrl }) => {
+      describe(`when node is ${primaryNode ? 'primary' : 'secondary'}`, () => {
+        beforeEach(() => {
+          createComponent({
+            nodeData: { ...defaultProps.nodeData, primary: primaryNode },
+          });
+        });
+
+        it(`it ${showInternalUrl ? 'shows' : 'hides'} the Internal URL Field`, () => {
+          expect(findGeoNodeInternalUrlField().exists()).toBe(showInternalUrl);
+        });
+      });
+    });
+
     describe('errors', () => {
       describe.each`
         data               | showError | errorMessage
@@ -89,7 +114,7 @@ describe('GeoNodeFormCore', () => {
       ${''}                   | ${true}   | ${"URL can't be blank"}
       ${'abcd'}               | ${true}   | ${'URL must be a valid url (ex: https://gitlab.com)'}
       ${'https://gitlab.com'} | ${false}  | ${null}
-    `(`Name Field`, ({ data, showError, errorMessage }) => {
+    `(`URL Field`, ({ data, showError, errorMessage }) => {
       beforeEach(() => {
         createComponent();
         findGeoNodeFormUrlField().setValue(data);
diff --git a/ee/spec/frontend/geo_node_form/components/geo_node_form_selective_sync_spec.js b/ee/spec/frontend/geo_node_form/components/geo_node_form_selective_sync_spec.js
index 6123921956775146dc36485caf1a458ed76cb1b3..a1a8a36a45b18812fb1f476bce32f6b5bc6557c4 100644
--- a/ee/spec/frontend/geo_node_form/components/geo_node_form_selective_sync_spec.js
+++ b/ee/spec/frontend/geo_node_form/components/geo_node_form_selective_sync_spec.js
@@ -1,7 +1,9 @@
 import { shallowMount } from '@vue/test-utils';
+import { GlFormGroup, GlSprintf } from '@gitlab/ui';
 import GeoNodeFormSelectiveSync from 'ee/geo_node_form/components/geo_node_form_selective_sync.vue';
 import GeoNodeFormNamespaces from 'ee/geo_node_form/components/geo_node_form_namespaces.vue';
 import GeoNodeFormShards from 'ee/geo_node_form/components/geo_node_form_shards.vue';
+import { SELECTIVE_SYNC_MORE_INFO, OBJECT_STORAGE_MORE_INFO } from 'ee/geo_node_form/constants';
 import { MOCK_NODE, MOCK_SELECTIVE_SYNC_TYPES, MOCK_SYNC_SHARDS } from '../mock_data';
 
 describe('GeoNodeFormSelectiveSync', () => {
@@ -15,6 +17,7 @@ describe('GeoNodeFormSelectiveSync', () => {
 
   const createComponent = (props = {}) => {
     wrapper = shallowMount(GeoNodeFormSelectiveSync, {
+      stubs: { GlFormGroup, GlSprintf },
       propsData: {
         ...defaultProps,
         ...props,
@@ -28,15 +31,26 @@ describe('GeoNodeFormSelectiveSync', () => {
 
   const findGeoNodeFormSyncContainer = () =>
     wrapper.find({ ref: 'geoNodeFormSelectiveSyncContainer' });
+  const findGeoNodeFormSelectiveSyncMoreInfoLink = () =>
+    wrapper.find('[data-testid="selectiveSyncMoreInfo"]');
   const findGeoNodeFormSyncTypeField = () => wrapper.find('#node-selective-synchronization-field');
   const findGeoNodeFormNamespacesField = () => wrapper.find(GeoNodeFormNamespaces);
   const findGeoNodeFormShardsField = () => wrapper.find(GeoNodeFormShards);
+  const findGeoNodeObjectStorageField = () => wrapper.find('#node-object-storage-field');
+  const findGeoNodeFormObjectStorageMoreInformation = () =>
+    wrapper.find('[data-testid="objectStorageMoreInfo"]');
 
   describe('template', () => {
     beforeEach(() => {
       createComponent();
     });
 
+    it('renders section More Information link correctly', () => {
+      expect(findGeoNodeFormSelectiveSyncMoreInfoLink().attributes('href')).toBe(
+        SELECTIVE_SYNC_MORE_INFO,
+      );
+    });
+
     it('renders Geo Node Form Sync Container', () => {
       expect(findGeoNodeFormSyncContainer().exists()).toBe(true);
     });
@@ -45,6 +59,16 @@ describe('GeoNodeFormSelectiveSync', () => {
       expect(findGeoNodeFormSyncTypeField().exists()).toBe(true);
     });
 
+    it('renders Geo Node Object Storage Field', () => {
+      expect(findGeoNodeObjectStorageField().exists()).toBe(true);
+    });
+
+    it('renders Geo Node Form Object Storage More Information link correctly', () => {
+      expect(findGeoNodeFormObjectStorageMoreInformation().attributes('href')).toBe(
+        OBJECT_STORAGE_MORE_INFO,
+      );
+    });
+
     describe.each`
       syncType                                | showNamespaces | showShards
       ${MOCK_SELECTIVE_SYNC_TYPES.ALL}        | ${false}       | ${false}
diff --git a/ee/spec/frontend/geo_node_form/components/geo_node_form_spec.js b/ee/spec/frontend/geo_node_form/components/geo_node_form_spec.js
index ad028ffc93f237c7fbbc9e809372d1d8f061b32d..31411f3a1685523b601e5a4f25f88c0bd9380100 100644
--- a/ee/spec/frontend/geo_node_form/components/geo_node_form_spec.js
+++ b/ee/spec/frontend/geo_node_form/components/geo_node_form_spec.js
@@ -3,6 +3,7 @@ import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import GeoNodeForm from 'ee/geo_node_form/components/geo_node_form.vue';
 import GeoNodeFormCore from 'ee/geo_node_form/components/geo_node_form_core.vue';
+import GeoNodeFormSelectiveSync from 'ee/geo_node_form/components/geo_node_form_selective_sync.vue';
 import GeoNodeFormCapacities from 'ee/geo_node_form/components/geo_node_form_capacities.vue';
 import store from 'ee/geo_node_form/store';
 import { MOCK_NODE, MOCK_SELECTIVE_SYNC_TYPES, MOCK_SYNC_SHARDS } from '../mock_data';
@@ -35,9 +36,8 @@ describe('GeoNodeForm', () => {
   });
 
   const findGeoNodeFormCoreField = () => wrapper.find(GeoNodeFormCore);
-  const findGeoNodeInternalUrlField = () => wrapper.find('#node-internal-url-field');
+  const findGeoNodeFormSelectiveSyncField = () => wrapper.find(GeoNodeFormSelectiveSync);
   const findGeoNodeFormCapacitiesField = () => wrapper.find(GeoNodeFormCapacities);
-  const findGeoNodeObjectStorageField = () => wrapper.find('#node-object-storage-field');
   const findGeoNodeSaveButton = () => wrapper.find('#node-save-button');
   const findGeoNodeCancelButton = () => wrapper.find('#node-cancel-button');
 
@@ -47,35 +47,28 @@ describe('GeoNodeForm', () => {
     });
 
     describe.each`
-      primaryNode | showCore | showInternalUrl | showCapacities | showObjectStorage
-      ${true}     | ${true}  | ${true}         | ${true}        | ${false}
-      ${false}    | ${true}  | ${false}        | ${true}        | ${true}
-    `(
-      `conditional fields`,
-      ({ primaryNode, showCore, showInternalUrl, showCapacities, showObjectStorage }) => {
-        beforeEach(() => {
-          wrapper.setData({
-            nodeData: { ...wrapper.vm.nodeData, primary: primaryNode },
-          });
-        });
-
-        it(`it ${showCore ? 'shows' : 'hides'} the Core Field`, () => {
-          expect(findGeoNodeFormCoreField().exists()).toBe(showCore);
+      primaryNode | showCore | showSelectiveSync | showCapacities
+      ${true}     | ${true}  | ${false}          | ${true}
+      ${false}    | ${true}  | ${true}           | ${true}
+    `(`conditional fields`, ({ primaryNode, showCore, showSelectiveSync, showCapacities }) => {
+      beforeEach(() => {
+        wrapper.setData({
+          nodeData: { ...wrapper.vm.nodeData, primary: primaryNode },
         });
+      });
 
-        it(`it ${showInternalUrl ? 'shows' : 'hides'} the Internal URL Field`, () => {
-          expect(findGeoNodeInternalUrlField().exists()).toBe(showInternalUrl);
-        });
+      it(`it ${showCore ? 'shows' : 'hides'} the Core Field`, () => {
+        expect(findGeoNodeFormCoreField().exists()).toBe(showCore);
+      });
 
-        it(`it ${showCapacities ? 'shows' : 'hides'} the Capacities Field`, () => {
-          expect(findGeoNodeFormCapacitiesField().exists()).toBe(showCapacities);
-        });
+      it(`it ${showSelectiveSync ? 'shows' : 'hides'} the Selective Sync Field`, () => {
+        expect(findGeoNodeFormSelectiveSyncField().exists()).toBe(showSelectiveSync);
+      });
 
-        it(`it ${showObjectStorage ? 'shows' : 'hides'} the Object Storage Field`, () => {
-          expect(findGeoNodeObjectStorageField().exists()).toBe(showObjectStorage);
-        });
-      },
-    );
+      it(`it ${showCapacities ? 'shows' : 'hides'} the Capacities Field`, () => {
+        expect(findGeoNodeFormCapacitiesField().exists()).toBe(showCapacities);
+      });
+    });
 
     describe('Save Button', () => {
       describe('with errors on form', () => {
diff --git a/ee/spec/frontend/geo_nodes/components/__snapshots__/geo_node_replication_status_spec.js.snap b/ee/spec/frontend/geo_nodes/components/__snapshots__/geo_node_replication_status_spec.js.snap
new file mode 100644
index 0000000000000000000000000000000000000000..b1f010f98a2f92fb603545cfb7d1572c44b0785e
--- /dev/null
+++ b/ee/spec/frontend/geo_nodes/components/__snapshots__/geo_node_replication_status_spec.js.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GeoNodeReplicationStatusComponent computed properties renders Icon correctly 1`] = `"<gl-icon-stub name=\\"play\\" size=\\"16\\"></gl-icon-stub>"`;
+
+exports[`GeoNodeReplicationStatusComponent computed properties renders Icon correctly 2`] = `"<gl-icon-stub name=\\"pause\\" size=\\"16\\"></gl-icon-stub>"`;
+
+exports[`GeoNodeReplicationStatusComponent computed properties renders StatusPill correctly 1`] = `
+"<div class=\\"rounded-pill gl-display-inline-flex gl-align-items-center px-2 gl-py-2 gl-my-2 gl-text-green-600 gl-bg-green-100\\">
+  <gl-icon-stub name=\\"play\\" size=\\"16\\"></gl-icon-stub> <strong class=\\"status-text gl-ml-2\\"> Replication enabled </strong>
+</div>"
+`;
+
+exports[`GeoNodeReplicationStatusComponent computed properties renders StatusPill correctly 2`] = `
+"<div class=\\"rounded-pill gl-display-inline-flex gl-align-items-center px-2 gl-py-2 gl-my-2 gl-text-orange-600 gl-bg-orange-100\\">
+  <gl-icon-stub name=\\"pause\\" size=\\"16\\"></gl-icon-stub> <strong class=\\"status-text gl-ml-2\\"> Replication paused </strong>
+</div>"
+`;
diff --git a/ee/spec/frontend/geo_nodes/components/geo_node_actions_spec.js b/ee/spec/frontend/geo_nodes/components/geo_node_actions_spec.js
index 26da98e46b06555b1c9b29d47a128fc2ab575903..2a8cf9525f56effb3fc0cd6561dd267352e98acf 100644
--- a/ee/spec/frontend/geo_nodes/components/geo_node_actions_spec.js
+++ b/ee/spec/frontend/geo_nodes/components/geo_node_actions_spec.js
@@ -38,36 +38,6 @@ describe('GeoNodeActionsComponent', () => {
   });
 
   describe('computed', () => {
-    describe('isToggleAllowed', () => {
-      it('returns boolean value representing if toggle on node can be allowed', () => {
-        let vmX = createComponent(mockNodes[0], true, false);
-
-        expect(vmX.isToggleAllowed).toBeFalsy();
-        vmX.$destroy();
-
-        vmX = createComponent(mockNodes[1]);
-
-        expect(vmX.isToggleAllowed).toBeTruthy();
-        vmX.$destroy();
-      });
-    });
-
-    describe('nodeToggleLabel', () => {
-      it('returns label for toggle button for a node', () => {
-        let mockNode = { ...mockNodes[1] };
-        let vmX = createComponent(mockNode);
-
-        expect(vmX.nodeToggleLabel).toBe('Pause replication');
-        vmX.$destroy();
-
-        mockNode = { ...mockNodes[1], enabled: false };
-        vmX = createComponent(mockNode);
-
-        expect(vmX.nodeToggleLabel).toBe('Resume replication');
-        vmX.$destroy();
-      });
-    });
-
     describe('disabledRemovalTooltip', () => {
       describe.each`
         nodeRemovalAllowed | tooltip
@@ -87,20 +57,6 @@ describe('GeoNodeActionsComponent', () => {
   });
 
   describe('methods', () => {
-    describe('onToggleNode', () => {
-      it('emits showNodeActionModal with actionType `toggle`, node reference, modalMessage, modalActionLabel, and modalTitle', () => {
-        vm.onToggleNode();
-
-        expect(eventHub.$emit).toHaveBeenCalledWith('showNodeActionModal', {
-          actionType: NODE_ACTIONS.TOGGLE,
-          node: vm.node,
-          modalMessage: 'Pausing replication stops the sync process. Are you sure?',
-          modalActionLabel: vm.nodeToggleLabel,
-          modalTitle: 'Pause replication',
-        });
-      });
-    });
-
     describe('onRemovePrimaryNode', () => {
       it('emits showNodeActionModal with actionType `remove`, node reference, modalKind, modalMessage, modalActionLabel, and modalTitle', () => {
         vm.onRemovePrimaryNode();
diff --git a/ee/spec/frontend/geo_nodes/components/geo_node_replication_status_spec.js b/ee/spec/frontend/geo_nodes/components/geo_node_replication_status_spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..e40ecee7e08bc46ed46bc388312300fce04b2d5a
--- /dev/null
+++ b/ee/spec/frontend/geo_nodes/components/geo_node_replication_status_spec.js
@@ -0,0 +1,117 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon, GlPopover, GlLink } from '@gitlab/ui';
+import geoNodeReplicationStatusComponent from 'ee/geo_nodes/components/geo_node_replication_status.vue';
+import {
+  REPLICATION_STATUS_CLASS,
+  REPLICATION_STATUS_ICON,
+  REPLICATION_PAUSE_URL,
+} from 'ee/geo_nodes/constants';
+import { mockNode } from '../mock_data';
+
+describe('GeoNodeReplicationStatusComponent', () => {
+  let wrapper;
+
+  const defaultProps = {
+    node: mockNode,
+  };
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(geoNodeReplicationStatusComponent, {
+      propsData: {
+        ...defaultProps,
+        ...props,
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  const findStatusPill = () => wrapper.find('.rounded-pill');
+  const findStatusIcon = () => findStatusPill().find(GlIcon);
+  const findStatusText = () => findStatusPill().find('.status-text');
+  const findHelpIcon = () => wrapper.find({ ref: 'replicationStatusHelp' });
+  const findGlPopover = () => wrapper.find(GlPopover);
+  const findPopoverText = () => findGlPopover().find('p');
+  const findPopoverLink = () => findGlPopover().find(GlLink);
+
+  describe.each`
+    enabled  | replicationStatusCssClass            | nodeReplicationStatusIcon           | nodeReplicationStatusText
+    ${true}  | ${REPLICATION_STATUS_CLASS.enabled}  | ${REPLICATION_STATUS_ICON.enabled}  | ${'Replication enabled'}
+    ${false} | ${REPLICATION_STATUS_CLASS.disabled} | ${REPLICATION_STATUS_ICON.disabled} | ${'Replication paused'}
+  `(
+    `computed properties`,
+    ({
+      enabled,
+      replicationStatusCssClass,
+      nodeReplicationStatusIcon,
+      nodeReplicationStatusText,
+    }) => {
+      beforeEach(() => {
+        createComponent({
+          node: { ...defaultProps.node, enabled },
+        });
+      });
+
+      it(`sets background of StatusPill to ${replicationStatusCssClass} when enabled is ${enabled}`, () => {
+        expect(
+          findStatusPill()
+            .classes()
+            .join(' '),
+        ).toContain(replicationStatusCssClass);
+      });
+
+      it('renders StatusPill correctly', () => {
+        expect(findStatusPill().html()).toMatchSnapshot();
+      });
+
+      it(`sets StatusIcon to ${nodeReplicationStatusIcon} when enabled is ${enabled}`, () => {
+        expect(findStatusIcon().attributes('name')).toBe(nodeReplicationStatusIcon);
+      });
+
+      it('renders Icon correctly', () => {
+        expect(findStatusIcon().html()).toMatchSnapshot();
+      });
+
+      it(`sets replication status text to ${nodeReplicationStatusText} when enabled is ${enabled}`, () => {
+        expect(findStatusText().text()).toBe(nodeReplicationStatusText);
+      });
+    },
+  );
+
+  describe('Helper Popover', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('always renders the help icon', () => {
+      expect(findHelpIcon().exists()).toBeTruthy();
+    });
+
+    it('sets to question icon', () => {
+      expect(findHelpIcon().attributes('name')).toBe('question');
+    });
+
+    it('renders popover always', () => {
+      expect(findGlPopover().exists()).toBeTruthy();
+    });
+
+    it('always renders popover text', () => {
+      expect(findPopoverText().exists()).toBeTruthy();
+    });
+
+    it('should display hint about pausing replication', () => {
+      expect(findPopoverText().text()).toBe('Geo nodes are paused using a command run on the node');
+    });
+
+    it('renders popover link always', () => {
+      expect(findPopoverLink().exists()).toBeTruthy();
+    });
+
+    it('link should be to HELP_NODE_HEALTH_URL', () => {
+      expect(findPopoverLink().attributes('href')).toBe(REPLICATION_PAUSE_URL);
+    });
+  });
+});
diff --git a/ee/spec/frontend/geo_settings/components/app_spec.js b/ee/spec/frontend/geo_settings/components/app_spec.js
index 26026be4090f55326c898c29e09d8afee5cecb14..854208bc6b4c4ef35665bf04f421966f826146f1 100644
--- a/ee/spec/frontend/geo_settings/components/app_spec.js
+++ b/ee/spec/frontend/geo_settings/components/app_spec.js
@@ -1,12 +1,29 @@
-import { shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { GlLoadingIcon } from '@gitlab/ui';
+
+import initStore from 'ee/geo_settings/store';
+import * as types from 'ee/geo_settings/store/mutation_types';
+
 import GeoSettingsApp from 'ee/geo_settings/components/app.vue';
 import GeoSettingsForm from 'ee/geo_settings/components/geo_settings_form.vue';
 
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
 describe('GeoSettingsApp', () => {
   let wrapper;
+  let store;
+
+  const createStore = () => {
+    store = initStore();
+    jest.spyOn(store, 'dispatch').mockImplementation();
+  };
 
   const createComponent = () => {
-    wrapper = shallowMount(GeoSettingsApp);
+    wrapper = shallowMount(GeoSettingsApp, {
+      store,
+    });
   };
 
   afterEach(() => {
@@ -14,10 +31,12 @@ describe('GeoSettingsApp', () => {
   });
 
   const findGeoSettingsContainer = () => wrapper.find('[data-testid="geoSettingsContainer"]');
-  const findGeoSettingsForm = () => wrapper.find(GeoSettingsForm);
+  const containsGeoSettingsForm = () => wrapper.contains(GeoSettingsForm);
+  const containsGlLoadingIcon = () => wrapper.contains(GlLoadingIcon);
 
   describe('renders', () => {
     beforeEach(() => {
+      createStore();
       createComponent();
     });
 
@@ -29,8 +48,39 @@ describe('GeoSettingsApp', () => {
       expect(findGeoSettingsContainer().text()).toContain('Geo Settings');
     });
 
-    it('Geo Settings Form', () => {
-      expect(findGeoSettingsForm().exists()).toBe(true);
+    describe('when not loading', () => {
+      it('Geo Settings Form', () => {
+        expect(containsGeoSettingsForm()).toBe(true);
+      });
+
+      it('not GlLoadingIcon', () => {
+        expect(containsGlLoadingIcon()).toBe(false);
+      });
+    });
+
+    describe('when loading', () => {
+      beforeEach(() => {
+        store.commit(types.REQUEST_GEO_SETTINGS);
+      });
+
+      it('not Geo Settings Form', () => {
+        expect(containsGeoSettingsForm()).toBe(false);
+      });
+
+      it('GlLoadingIcon', () => {
+        expect(containsGlLoadingIcon()).toBe(true);
+      });
+    });
+  });
+
+  describe('onCreate', () => {
+    beforeEach(() => {
+      createStore();
+      createComponent();
+    });
+
+    it('calls fetchGeoSettings', () => {
+      expect(store.dispatch).toHaveBeenCalledWith('fetchGeoSettings');
     });
   });
 });
diff --git a/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js b/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js
index 5eca6ff04fefd2682a570bda47dc055699200e2c..cd660c3e1265c1bcf68396b626a2043294fe97d5 100644
--- a/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js
+++ b/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js
@@ -1,7 +1,12 @@
-import { shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { visitUrl } from '~/lib/utils/url_utility';
+import store from 'ee/geo_settings/store';
 import GeoSettingsForm from 'ee/geo_settings/components/geo_settings_form.vue';
 
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
 jest.mock('~/lib/utils/url_utility', () => ({
   visitUrl: jest.fn().mockName('visitUrlMock'),
 }));
@@ -10,7 +15,9 @@ describe('GeoSettingsForm', () => {
   let wrapper;
 
   const createComponent = () => {
-    wrapper = shallowMount(GeoSettingsForm);
+    wrapper = shallowMount(GeoSettingsForm, {
+      store,
+    });
   };
 
   afterEach(() => {
diff --git a/ee/spec/frontend/geo_settings/mock_data.js b/ee/spec/frontend/geo_settings/mock_data.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc652ccefacbdd715436ee541c2fd69efd5371fe
--- /dev/null
+++ b/ee/spec/frontend/geo_settings/mock_data.js
@@ -0,0 +1,9 @@
+export const MOCK_APPLICATION_SETTINGS_FETCH_RESPONSE = {
+  geo_status_timeout: 10,
+  geo_node_allowed_ips: '0.0.0.0/0, ::/0',
+};
+
+export const MOCK_BASIC_SETTINGS_DATA = {
+  timeout: MOCK_APPLICATION_SETTINGS_FETCH_RESPONSE.geo_status_timeout,
+  allowedIp: MOCK_APPLICATION_SETTINGS_FETCH_RESPONSE.geo_node_allowed_ips,
+};
diff --git a/ee/spec/frontend/geo_settings/store/actions_spec.js b/ee/spec/frontend/geo_settings/store/actions_spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..517c0767bfad8398864de6ac08aeab530a1269c2
--- /dev/null
+++ b/ee/spec/frontend/geo_settings/store/actions_spec.js
@@ -0,0 +1,54 @@
+import testAction from 'helpers/vuex_action_helper';
+import flash from '~/flash';
+import Api from 'ee/api';
+import * as actions from 'ee/geo_settings/store/actions';
+import * as types from 'ee/geo_settings/store/mutation_types';
+import state from 'ee/geo_settings/store/state';
+import { MOCK_BASIC_SETTINGS_DATA, MOCK_APPLICATION_SETTINGS_FETCH_RESPONSE } from '../mock_data';
+
+jest.mock('~/flash');
+
+describe('GeoSettings Store Actions', () => {
+  describe('fetchGeoSettings', () => {
+    describe('on success', () => {
+      beforeEach(() => {
+        jest
+          .spyOn(Api, 'getApplicationSettings')
+          .mockResolvedValue({ data: MOCK_APPLICATION_SETTINGS_FETCH_RESPONSE });
+      });
+
+      it('should commit the request and success actions', done => {
+        testAction(
+          actions.fetchGeoSettings,
+          {},
+          state,
+          [
+            { type: types.REQUEST_GEO_SETTINGS },
+            { type: types.RECEIVE_GEO_SETTINGS_SUCCESS, payload: MOCK_BASIC_SETTINGS_DATA },
+          ],
+          [],
+          done,
+        );
+      });
+    });
+
+    describe('on error', () => {
+      beforeEach(() => {
+        jest.spyOn(Api, 'getApplicationSettings').mockRejectedValue(new Error(500));
+      });
+
+      it('should commit the request and error actions', () => {
+        testAction(
+          actions.fetchGeoSettings,
+          {},
+          state,
+          [{ type: types.REQUEST_GEO_SETTINGS }, { type: types.RECEIVE_GEO_SETTINGS_ERROR }],
+          [],
+          () => {
+            expect(flash).toHaveBeenCalledTimes(1);
+          },
+        );
+      });
+    });
+  });
+});
diff --git a/ee/spec/frontend/geo_settings/store/mutations_spec.js b/ee/spec/frontend/geo_settings/store/mutations_spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..a404690b35add3edb0b9dd0665fc4c301638556a
--- /dev/null
+++ b/ee/spec/frontend/geo_settings/store/mutations_spec.js
@@ -0,0 +1,65 @@
+import mutations from 'ee/geo_settings/store/mutations';
+import createState from 'ee/geo_settings/store/state';
+import * as types from 'ee/geo_settings/store/mutation_types';
+import { DEFAULT_TIMEOUT, DEFAULT_ALLOWED_IP } from 'ee/geo_settings/constants';
+import { MOCK_BASIC_SETTINGS_DATA } from '../mock_data';
+
+describe('GeoSettings Store Mutations', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState();
+  });
+
+  describe('REQUEST_GEO_SETTINGS', () => {
+    it('sets isLoading to true', () => {
+      mutations[types.REQUEST_GEO_SETTINGS](state);
+
+      expect(state.isLoading).toEqual(true);
+    });
+  });
+
+  describe('RECEIVE_GEO_SETTINGS_SUCCESS', () => {
+    const mockData = MOCK_BASIC_SETTINGS_DATA;
+
+    beforeEach(() => {
+      state.isLoading = true;
+    });
+
+    it('sets isLoading to false', () => {
+      mutations[types.RECEIVE_GEO_SETTINGS_SUCCESS](state, mockData);
+
+      expect(state.isLoading).toEqual(false);
+    });
+
+    it('sets timeout and allowedIp array with data', () => {
+      mutations[types.RECEIVE_GEO_SETTINGS_SUCCESS](state, mockData);
+
+      expect(state.timeout).toBe(mockData.timeout);
+      expect(state.allowedIp).toBe(mockData.allowedIp);
+    });
+  });
+
+  describe('RECEIVE_GEO_SETTINGS_ERROR', () => {
+    const mockData = MOCK_BASIC_SETTINGS_DATA;
+
+    beforeEach(() => {
+      state.isLoading = true;
+      state.timeout = mockData.timeout;
+      state.allowedIp = mockData.allowedIp;
+    });
+
+    it('sets isLoading to false', () => {
+      mutations[types.RECEIVE_GEO_SETTINGS_ERROR](state);
+
+      expect(state.isLoading).toEqual(false);
+    });
+
+    it('resets timeout and allowedIp array', () => {
+      mutations[types.RECEIVE_GEO_SETTINGS_ERROR](state);
+
+      expect(state.timeout).toBe(DEFAULT_TIMEOUT);
+      expect(state.allowedIp).toBe(DEFAULT_ALLOWED_IP);
+    });
+  });
+});
diff --git a/ee/spec/graphql/ee/mutations/concerns/mutations/resolves_issuable_spec.rb b/ee/spec/graphql/ee/mutations/concerns/mutations/resolves_issuable_spec.rb
index 8be85db0fa0586112616617b4c2da5e53b1ed477..0e817934018c6e15c73d0236af9aa9d82e19c7eb 100644
--- a/ee/spec/graphql/ee/mutations/concerns/mutations/resolves_issuable_spec.rb
+++ b/ee/spec/graphql/ee/mutations/concerns/mutations/resolves_issuable_spec.rb
@@ -12,11 +12,12 @@
   let_it_be(:group)    { create(:group) }
   let_it_be(:user)     { create(:user) }
   let_it_be(:context)  { { current_user: user } }
-  let_it_be(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
+  let_it_be(:epic) { create(:epic, group: group) }
+  let(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
 
   context 'with epics' do
-    let_it_be(:issuable) { create(:epic, group: group) }
-    let_it_be(:parent)   { issuable.group }
+    let(:parent)   { issuable.group }
+    let(:issuable) { epic }
 
     before do
       stub_licensed_features(epics: true)
diff --git a/ee/spec/helpers/ee/clusters_helper_spec.rb b/ee/spec/helpers/ee/clusters_helper_spec.rb
index 13eaf2cc5ab51a88da038ebbb556fddcd3a57f02..e582b98ff0b37fed165c47738422ff10a5aa376f 100644
--- a/ee/spec/helpers/ee/clusters_helper_spec.rb
+++ b/ee/spec/helpers/ee/clusters_helper_spec.rb
@@ -42,20 +42,4 @@
       it_behaves_like 'feature availablilty', :multiple_clusters
     end
   end
-
-  describe '#show_cluster_health_graphs?' do
-    subject { helper.show_cluster_health_graphs? }
-
-    context 'project level' do
-      let(:clusterable) { instance_double(Project) }
-
-      it_behaves_like 'feature availablilty', :cluster_health
-    end
-
-    context 'group level' do
-      let(:clusterable) { instance_double(Group) }
-
-      it_behaves_like 'feature availablilty', :cluster_health
-    end
-  end
 end
diff --git a/ee/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb b/ee/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
index 15b3fda895dce619eb15528bdecbb15dc0061b01..47b0e213b2e4c8d1f5f78edcf9b4a06bb73d1293 100644
--- a/ee/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
+++ b/ee/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
@@ -34,21 +34,13 @@
     let(:query_params) { { group: 'Cluster Health', title: 'CPU Usage', y_label: 'CPU (cores)' } }
     let(:url) { urls.metrics_namespace_project_cluster_url(*params, **query_params) }
 
-    context 'with cluster health license' do
-      before do
-        stub_licensed_features(cluster_health: true)
-      end
-
+    context 'with user who can read cluster' do
       it_behaves_like 'redacts the embed placeholder'
       it_behaves_like 'retains the embed placeholder when applicable'
     end
 
-    context 'without cluster health license' do
-      let(:doc) { filter(input, current_user: project.owner) }
-
-      before do
-        stub_licensed_features(cluster_health: false)
-      end
+    context 'without user who can read cluster' do
+      let(:doc) { filter(input, current_user: create(:user)) }
 
       it 'redacts the embed placeholder' do
         expect(doc.to_s).to be_empty
diff --git a/ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb b/ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb
index c63e9e49a508d4681ccd2fa1d4cc709ded8d8e07..cec41906511d2c0b9cf5ec567255922df92be04a 100644
--- a/ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb
+++ b/ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb
@@ -19,7 +19,8 @@ def round_to_days(seconds)
   # `create_data_for_end_event`. For each stage we create 3 records with a fixed
   # durations (10, 5, 15 days) in order to easily generalize the test cases.
   shared_examples 'custom cycle analytics stage' do
-    let(:data_collector) { described_class.new(stage: stage, params: { from: Time.new(2019), to: Time.new(2020), current_user: user }) }
+    let(:params) { { from: Time.new(2019), to: Time.new(2020), current_user: user } }
+    let(:data_collector) { described_class.new(stage: stage, params: params) }
 
     before do
       # takes 10 days
@@ -87,7 +88,7 @@ def create_data_for_end_event(issue, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between issue creation time and closing time' do
+      context 'between issue creation time and closing time' do
         let(:start_event_identifier) { :issue_created }
         let(:end_event_identifier) { :issue_closed }
 
@@ -102,7 +103,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between issue first mentioned in commit and first associated with milestone time' do
+      context 'between issue first mentioned in commit and first associated with milestone time' do
         let(:start_event_identifier) { :issue_first_mentioned_in_commit }
         let(:end_event_identifier) { :issue_first_associated_with_milestone }
 
@@ -119,7 +120,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between issue creation time and first added to board time' do
+      context 'between issue creation time and first added to board time' do
         let(:start_event_identifier) { :issue_created }
         let(:end_event_identifier) { :issue_first_added_to_board }
 
@@ -134,7 +135,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between issue creation time and last edit time' do
+      context 'between issue creation time and last edit time' do
         let(:start_event_identifier) { :issue_created }
         let(:end_event_identifier) { :issue_last_edited }
 
@@ -149,7 +150,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between issue label added time and label removed time' do
+      context 'between issue label added time and label removed time' do
         let(:start_event_identifier) { :issue_label_added }
         let(:end_event_identifier) { :issue_label_removed }
 
@@ -181,7 +182,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between issue label added time and another issue label added time' do
+      context 'between issue label added time and another issue label added time' do
         let(:start_event_identifier) { :issue_label_added }
         let(:end_event_identifier) { :issue_label_added }
 
@@ -230,7 +231,7 @@ def create_data_for_end_event(issue, example_class)
         end
       end
 
-      describe 'between issue creation time and issue label added time' do
+      context 'between issue creation time and issue label added time' do
         let(:start_event_identifier) { :issue_created }
         let(:end_event_identifier) { :issue_label_added }
 
@@ -304,7 +305,7 @@ def create_data_for_end_event(mr, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between merge request creation time and close time' do
+      context 'between merge request creation time and close time' do
         let(:start_event_identifier) { :merge_request_created }
         let(:end_event_identifier) { :merge_request_closed }
 
@@ -319,7 +320,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between merge request creation time and last edit time' do
+      context 'between merge request creation time and last edit time' do
         let(:start_event_identifier) { :merge_request_created }
         let(:end_event_identifier) { :merge_request_last_edited }
 
@@ -334,7 +335,7 @@ def create_data_for_end_event(resource, example_class)
         it_behaves_like 'custom cycle analytics stage'
       end
 
-      describe 'between merge request label added time and label removed time' do
+      context 'between merge request label added time and label removed time' do
         let(:start_event_identifier) { :merge_request_label_added }
         let(:end_event_identifier) { :merge_request_label_removed }
 
@@ -365,6 +366,41 @@ def create_data_for_end_event(mr, example_class)
 
         it_behaves_like 'custom cycle analytics stage'
       end
+
+      context 'between code stage start time and merge request created time with label filter' do
+        let(:start_event_identifier) { :code_stage_start }
+        let(:end_event_identifier) { :merge_request_created }
+
+        before do
+          params[:label_name] = [label.name, other_label.name]
+        end
+
+        def create_data_for_start_event(example_class)
+          issue = create(:issue, project: example_class.project)
+          issue.metrics.update!(first_mentioned_in_commit_at: Time.zone.now)
+
+          mr = create(:merge_request, {
+            source_project: example_class.project,
+            target_branch: example_class.project.default_branch,
+            description: "Description\n\nclosing #{issue.to_reference}",
+            allow_broken: true
+          })
+
+          MergeRequests::UpdateService.new(
+            example_class.project,
+            user,
+            label_ids: [label.id, other_label.id]
+          ).execute(mr)
+
+          mr
+        end
+
+        def create_data_for_end_event(mr, example_class)
+          mr.update!(created_at: Time.zone.now)
+        end
+
+        it_behaves_like 'custom cycle analytics stage'
+      end
     end
   end
 
diff --git a/ee/spec/lib/gitlab/ci/parsers/security/common_spec.rb b/ee/spec/lib/gitlab/ci/parsers/security/common_spec.rb
index 947b0785ec6b517ddc54ebe7e8fa44c73bfe731e..57b84939100625d8eae6afbcc2b15a2249248905 100644
--- a/ee/spec/lib/gitlab/ci/parsers/security/common_spec.rb
+++ b/ee/spec/lib/gitlab/ci/parsers/security/common_spec.rb
@@ -36,7 +36,7 @@
             "cve": "CVE-1020",
             "severity": "High",
             "solution": "Upgrade to latest version.",
-            "scanner": { "id": "gemnasium", "name": "Gemnasium" },
+            "scanner": { "id": "gemnasium", "name": "Gemnasium", "vendor": { "name": "GitLab" } },
             "location": {},
             "identifiers": [],
             "links": [{ "url": "" }]
@@ -52,7 +52,8 @@
             "solution": "Upgrade to latest versions.",
             "scanner": {
               "id": "gemnasium",
-              "name": "Gemnasium"
+              "name": "Gemnasium",
+              "vendor": { "name": "GitLab" }
             },
             "location": {},
             "identifiers": [],
@@ -68,7 +69,8 @@
             "solution": "Upgrade to fixed version.\r\n",
             "scanner": {
               "id": "gemnasium",
-              "name": "Gemnasium"
+              "name": "Gemnasium",
+              "vendor": { "name": "GitLab" }
             },
             "location": {},
             "identifiers": [],
@@ -177,5 +179,51 @@
         end
       end
     end
+
+    context 'parsing scanners' do
+      let(:raw_json) do
+        {
+          "vulnerabilities": [
+            {
+              "category": "dependency_scanning",
+              "name": "Vulnerabilities in libxml2",
+              "message": "Vulnerabilities in libxml2 in nokogiri",
+              "description": "",
+              "cve": "CVE-1020",
+              "severity": "High",
+              "solution": "Upgrade to latest version.",
+              "scanner": raw_scanner,
+              "location": {},
+              "identifiers": [],
+              "links": [{ "url": "" }]
+            }
+          ],
+          "remediations": [],
+          "dependency_files": []
+        }
+      end
+
+      subject(:scanner) { report.occurrences.first.scanner }
+
+      before do
+        parser.parse!(raw_json.to_json, report)
+      end
+
+      context 'when vendor is missing in scanner' do
+        let(:raw_scanner) { { 'id': 'gemnasium', 'name': 'Gemnasium' } }
+
+        it 'returns scanner with empty vendor field' do
+          expect(scanner.vendor).to be_nil
+        end
+      end
+
+      context 'when vendor is not missing in scanner' do
+        let(:raw_scanner) { { 'id': 'gemnasium', 'name': 'Gemnasium', 'vendor': { 'name': 'GitLab' } } }
+
+        it 'returns scanner with parsed vendor value' do
+          expect(scanner.vendor).to eq('GitLab')
+        end
+      end
+    end
   end
 end
diff --git a/ee/spec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb b/ee/spec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb
index 20bb368a39082f1b815a27f8daf8b03718e79d53..1d76609418f99152a3e0387728ae44d0d05a2533 100644
--- a/ee/spec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb
+++ b/ee/spec/lib/gitlab/ci/parsers/security/formatters/dast_spec.rb
@@ -33,7 +33,7 @@
       expect(vulnerability['severity']).to eq('high')
       expect(vulnerability['confidence']).to eq('medium')
       expect(vulnerability['solution']).to eq(sanitized_solution)
-      expect(vulnerability['scanner']).to eq({ 'id' => 'zaproxy', 'name' => 'ZAProxy' })
+      expect(vulnerability['scanner']).to eq({ 'id' => 'zaproxy', 'name' => 'ZAProxy', 'vendor' => { 'name' => 'GitLab' } })
       expect(vulnerability['links']).to eq([{ 'url' => 'http://projects.webappsec.org/Cross-Site-Request-Forgery' },
                                             { 'url' => 'http://cwe.mitre.org/data/definitions/352.html' }])
       expect(vulnerability['identifiers'][0]).to eq({
diff --git a/ee/spec/lib/gitlab/ci/reports/security/scanner_spec.rb b/ee/spec/lib/gitlab/ci/reports/security/scanner_spec.rb
index d381444ea411c3ea171d1381e48ddcc35b9d1bad..175a245b3e67781f03eacf52a75f4ca04885cc13 100644
--- a/ee/spec/lib/gitlab/ci/reports/security/scanner_spec.rb
+++ b/ee/spec/lib/gitlab/ci/reports/security/scanner_spec.rb
@@ -9,7 +9,8 @@
     let(:params) do
       {
         external_id: 'brakeman',
-        name: 'Brakeman'
+        name: 'Brakeman',
+        vendor: 'GitLab'
       }
     end
 
@@ -19,7 +20,8 @@
 
         expect(subject).to have_attributes(
           external_id: 'brakeman',
-          name: 'Brakeman'
+          name: 'Brakeman',
+          vendor: 'GitLab'
         )
       end
     end
@@ -55,7 +57,8 @@
     it 'returns expected hash' do
       is_expected.to eq({
         external_id: scanner.external_id,
-        name: scanner.name
+        name: scanner.name,
+        vendor: scanner.vendor
       })
     end
   end
diff --git a/ee/spec/lib/gitlab/elastic/client_spec.rb b/ee/spec/lib/gitlab/elastic/client_spec.rb
index e3f29617d317a3ff638aacf75978c42d578a6de2..129c32db2de45c615222f683cb2ed183ba2dbde8 100644
--- a/ee/spec/lib/gitlab/elastic/client_spec.rb
+++ b/ee/spec/lib/gitlab/elastic/client_spec.rb
@@ -57,12 +57,15 @@ def stub_instance_credentials(creds_response)
       end
 
       it 'signs_requests' do
+        # Mock the correlation ID (passed as header) to have deterministic signature
+        allow(Labkit::Correlation::CorrelationId).to receive(:current_or_new_id).and_return('new-correlation-id')
+
         stub_instance_credentials(creds_fail_response)
         travel_to(Time.parse('20170303T133952Z')) do
           stub_request(:get, 'http://example-elastic:9200/foo/_all/1')
             .with(
               headers: {
-                'Authorization'        => 'AWS4-HMAC-SHA256 Credential=0/20170303/us-east-1/es/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=4ba2aae19a476152dacf5a2191da67b0cf81b9d7152dab5c42b1bba701da19f1',
+                'Authorization'        => 'AWS4-HMAC-SHA256 Credential=0/20170303/us-east-1/es/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date;x-opaque-id, Signature=c3180885fb19ca2cf4673a361aa47615dddd3ed52159fffcfeda9e732d7c91b8',
                 'Content-Type'         => 'application/json',
                 'X-Amz-Content-Sha256' => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
                 'X-Amz-Date'           => '20170303T133952Z'
diff --git a/ee/spec/lib/gitlab/instrumentation/elasticsearch_transport_spec.rb b/ee/spec/lib/gitlab/instrumentation/elasticsearch_transport_spec.rb
index eab615045a43d7ccf45a67095f6747781e104749..6403d30cf11dd93351f4e0fde2cba09a3a2b0d86 100644
--- a/ee/spec/lib/gitlab/instrumentation/elasticsearch_transport_spec.rb
+++ b/ee/spec/lib/gitlab/instrumentation/elasticsearch_transport_spec.rb
@@ -57,4 +57,30 @@
     expect(::Gitlab::Instrumentation::ElasticsearchTransport.query_time).to be > 0
     expect(::Gitlab::Instrumentation::ElasticsearchTransport.detail_store).not_to be_empty
   end
+
+  it 'adds the labkit correlation id as X-Opaque-Id to all requests' do
+    allow(Labkit::Correlation::CorrelationId).to receive(:current_or_new_id).and_return('new-correlation-id')
+
+    elasticsearch_url = Gitlab::CurrentSettings.elasticsearch_url[0]
+    stub_request(:any, elasticsearch_url)
+
+    Project.__elasticsearch__.client
+      .perform_request(:get, '/')
+
+    expect(a_request(:get, /#{elasticsearch_url}/)
+      .with(headers: { 'X-Opaque-Id' => 'new-correlation-id' })).to have_been_made
+  end
+
+  it 'does not override the X-Opaque-Id if it is already present' do
+    allow(Labkit::Correlation::CorrelationId).to receive(:current_or_new_id).and_return('new-correlation-id')
+
+    elasticsearch_url = Gitlab::CurrentSettings.elasticsearch_url[0]
+    stub_request(:any, elasticsearch_url)
+
+    Project.__elasticsearch__.client
+      .perform_request(:get, '/', {}, nil, { 'X-Opaque-Id': 'original-opaque-id' })
+
+    expect(a_request(:get, /#{elasticsearch_url}/)
+      .with(headers: { 'X-Opaque-Id' => 'original-opaque-id' })).to have_been_made
+  end
 end
diff --git a/ee/spec/models/ee/namespace_limit_spec.rb b/ee/spec/models/ee/namespace_limit_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4e97883f1930b799decf170633cdc14de511d797
--- /dev/null
+++ b/ee/spec/models/ee/namespace_limit_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe NamespaceLimit do
+  it { is_expected.to belong_to(:namespace) }
+end
diff --git a/ee/spec/models/ee/namespace_spec.rb b/ee/spec/models/ee/namespace_spec.rb
index 97e762cc3243fa9fc030bfd7492ad4186845199c..6819a6d4632e9ba17f9b12f8c5d36385612d50b1 100644
--- a/ee/spec/models/ee/namespace_spec.rb
+++ b/ee/spec/models/ee/namespace_spec.rb
@@ -13,6 +13,7 @@
   let!(:gold_plan) { create(:gold_plan) }
 
   it { is_expected.to have_one(:namespace_statistics) }
+  it { is_expected.to have_one(:namespace_limit) }
   it { is_expected.to have_one(:gitlab_subscription).dependent(:destroy) }
   it { is_expected.to have_one(:elasticsearch_indexed_namespace) }
 
@@ -24,6 +25,10 @@
   it { is_expected.to delegate_method(:trial_ends_on).to(:gitlab_subscription) }
   it { is_expected.to delegate_method(:upgradable?).to(:gitlab_subscription) }
   it { is_expected.to delegate_method(:email).to(:owner).with_prefix.allow_nil }
+  it { is_expected.to delegate_method(:additional_purchased_storage_size).to(:namespace_limit) }
+  it { is_expected.to delegate_method(:additional_purchased_storage_size=).to(:namespace_limit).with_arguments(:args) }
+  it { is_expected.to delegate_method(:additional_purchased_storage_ends_on).to(:namespace_limit) }
+  it { is_expected.to delegate_method(:additional_purchased_storage_ends_on=).to(:namespace_limit).with_arguments(:args) }
 
   shared_examples 'plan helper' do |namespace_plan|
     let(:namespace) { create(:namespace_with_plan, plan: "#{plan_name}_plan") }
@@ -1462,4 +1467,13 @@ def stub_minutes_used_and_limit(minutes_used, limit)
       end
     end
   end
+
+  describe 'ensure namespace limit' do
+    it 'has namespace limit upon namespace initialization' do
+      namespace = build(:namespace)
+
+      expect(namespace.namespace_limit).to be_present
+      expect(namespace.namespace_limit).not_to be_persisted
+    end
+  end
 end
diff --git a/ee/spec/models/operations/feature_flags/user_list_spec.rb b/ee/spec/models/operations/feature_flags/user_list_spec.rb
index b42f1cf8df51013ed9bd6b83e32be3d736af35ec..020416aa7bca8ce4cd0b37b947a73d8b48390033 100644
--- a/ee/spec/models/operations/feature_flags/user_list_spec.rb
+++ b/ee/spec/models/operations/feature_flags/user_list_spec.rb
@@ -67,6 +67,31 @@
     end
   end
 
+  describe '#destroy' do
+    it 'deletes the model if it is not associated with any feature flag strategies' do
+      project = create(:project)
+      user_list = described_class.create(project: project, name: 'My User List', user_xids: 'user1,user2')
+
+      user_list.destroy
+
+      expect(described_class.count).to eq(0)
+    end
+
+    it 'does not delete the model if it is associated with a feature flag strategy' do
+      project = create(:project)
+      user_list = described_class.create(project: project, name: 'My User List', user_xids: 'user1,user2')
+      feature_flag = create(:operations_feature_flag, :new_version_flag, project: project)
+      strategy = create(:operations_strategy, feature_flag: feature_flag, name: 'gitlabUserList', user_list: user_list)
+
+      user_list.destroy
+
+      expect(described_class.count).to eq(1)
+      expect(::Operations::FeatureFlags::StrategyUserList.count).to eq(1)
+      expect(strategy.reload.user_list).to eq(user_list)
+      expect(strategy.valid?).to eq(true)
+    end
+  end
+
   it_behaves_like 'AtomicInternalId' do
     let(:internal_id_attribute) { :iid }
     let(:instance) { build(:operations_feature_flag_user_list) }
diff --git a/ee/spec/models/vulnerabilities/scanner_spec.rb b/ee/spec/models/vulnerabilities/scanner_spec.rb
index dfd3dc33ca9ae134b9e7bb410592d245924b2a12..bf0a7b63f40517eaacc1f186b0c62912d3368e50 100644
--- a/ee/spec/models/vulnerabilities/scanner_spec.rb
+++ b/ee/spec/models/vulnerabilities/scanner_spec.rb
@@ -15,7 +15,6 @@
     it { is_expected.to validate_presence_of(:project) }
     it { is_expected.to validate_presence_of(:external_id) }
     it { is_expected.to validate_uniqueness_of(:external_id).scoped_to(:project_id) }
-    it { is_expected.to validate_presence_of(:vendor) }
     it { is_expected.to validate_length_of(:vendor).is_at_most(255) }
   end
 
diff --git a/ee/spec/policies/clusters/instance_policy_spec.rb b/ee/spec/policies/clusters/instance_policy_spec.rb
index 6af8eb16373c0d7a626f1d5e7b87b6525d2e1926..5a8e830d645f0026f67d136abd07c93a6412b819 100644
--- a/ee/spec/policies/clusters/instance_policy_spec.rb
+++ b/ee/spec/policies/clusters/instance_policy_spec.rb
@@ -23,42 +23,4 @@
 
     it { is_expected.not_to be_allowed(:read_cluster_environments) }
   end
-
-  context 'when cluster is readable' do
-    context 'and cluster health is available' do
-      before do
-        stub_licensed_features(cluster_health: true)
-      end
-
-      it { is_expected.to be_allowed(:read_cluster_health) }
-    end
-
-    context 'and cluster health is unavailable' do
-      before do
-        stub_licensed_features(cluster_health: false)
-      end
-
-      it { is_expected.to be_disallowed(:read_cluster_health) }
-    end
-  end
-
-  context 'when cluster is not readable to user' do
-    let(:user) { build(:user) }
-
-    context 'when cluster health is available' do
-      before do
-        stub_licensed_features(cluster_health: true)
-      end
-
-      it { is_expected.to be_disallowed(:read_cluster_health) }
-    end
-
-    context 'when cluster health is unavailable' do
-      before do
-        stub_licensed_features(cluster_health: false)
-      end
-
-      it { is_expected.to be_disallowed(:read_cluster_health) }
-    end
-  end
 end
diff --git a/ee/spec/policies/group_policy_spec.rb b/ee/spec/policies/group_policy_spec.rb
index 1ea67a4350d5797d6ba875dfb5dc72c5a58a3f5b..8705a5efde74c6a8c6abd0017f55810ee502cab2 100644
--- a/ee/spec/policies/group_policy_spec.rb
+++ b/ee/spec/policies/group_policy_spec.rb
@@ -897,48 +897,6 @@
     end
   end
 
-  describe 'read_cluster_health' do
-    let(:current_user) { owner }
-
-    context 'when cluster is readable' do
-      context 'and cluster health is available' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it { is_expected.to be_allowed(:read_cluster_health) }
-      end
-
-      context 'and cluster health is unavailable' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it { is_expected.to be_disallowed(:read_cluster_health) }
-      end
-    end
-
-    context 'when cluster is not readable to user' do
-      let(:current_user) { build(:user) }
-
-      context 'when cluster health is available' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it { is_expected.to be_disallowed(:read_cluster_health) }
-      end
-
-      context 'when cluster health is unavailable' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it { is_expected.to be_disallowed(:read_cluster_health) }
-      end
-    end
-  end
-
   describe 'update_default_branch_protection' do
     context 'for an admin' do
       let(:current_user) { admin }
@@ -1086,4 +1044,6 @@ def set_access_level(access_level)
       end
     end
   end
+
+  it_behaves_like 'update namespace limit policy'
 end
diff --git a/ee/spec/policies/namespace_policy_spec.rb b/ee/spec/policies/namespace_policy_spec.rb
index 83a943c278ad595c7186c272cff66e4cc7336c36..00e77a4f5463e273dc1d8c590eee2d0418ef088e 100644
--- a/ee/spec/policies/namespace_policy_spec.rb
+++ b/ee/spec/policies/namespace_policy_spec.rb
@@ -48,4 +48,6 @@
       it { is_expected.to be_disallowed(:create_jira_connect_subscription) }
     end
   end
+
+  it_behaves_like 'update namespace limit policy'
 end
diff --git a/ee/spec/policies/project_policy_spec.rb b/ee/spec/policies/project_policy_spec.rb
index 6f0663bc8dd490491a2270887c2f543453486bf3..d41f4cfb1fa13fddae2d97cccc97259018f4b4c0 100644
--- a/ee/spec/policies/project_policy_spec.rb
+++ b/ee/spec/policies/project_policy_spec.rb
@@ -1252,48 +1252,6 @@
     end
   end
 
-  describe 'read_cluster_health' do
-    let(:current_user) { owner }
-
-    context 'when cluster is readable' do
-      context 'and cluster health is available' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it { is_expected.to be_allowed(:read_cluster_health) }
-      end
-
-      context 'and cluster health is unavailable' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it { is_expected.to be_disallowed(:read_cluster_health) }
-      end
-    end
-
-    context 'when cluster is not readable to user' do
-      let(:current_user) { build(:user) }
-
-      context 'when cluster health is available' do
-        before do
-          stub_licensed_features(cluster_health: true)
-        end
-
-        it { is_expected.to be_disallowed(:read_cluster_health) }
-      end
-
-      context 'when cluster health is unavailable' do
-        before do
-          stub_licensed_features(cluster_health: false)
-        end
-
-        it { is_expected.to be_disallowed(:read_cluster_health) }
-      end
-    end
-  end
-
   shared_examples 'merge request rules' do
     let(:project) { create(:project, namespace: owner.namespace) }
 
diff --git a/ee/spec/requests/api/feature_flags_user_lists_spec.rb b/ee/spec/requests/api/feature_flags_user_lists_spec.rb
index 53ae0669274ea490f91328a7289c80ca8fd68f64..146a99b2f5144228d85ce71bc7e76ab5687962f0 100644
--- a/ee/spec/requests/api/feature_flags_user_lists_spec.rb
+++ b/ee/spec/requests/api/feature_flags_user_lists_spec.rb
@@ -343,8 +343,21 @@ def create_list(name: 'mylist', user_xids: 'user1')
 
       delete api("/projects/#{project.id}/feature_flags_user_lists/#{list.iid}", developer)
 
-      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:no_content)
+      expect(response.body).to be_blank
       expect(project.operations_feature_flags_user_lists.count).to eq(0)
     end
+
+    it 'does not delete the list if it is associated with a strategy' do
+      list = create_list
+      feature_flag = create(:operations_feature_flag, :new_version_flag, project: project)
+      create(:operations_strategy, feature_flag: feature_flag, name: 'gitlabUserList', user_list: list)
+
+      delete api("/projects/#{project.id}/feature_flags_user_lists/#{list.iid}", developer)
+
+      expect(response).to have_gitlab_http_status(:conflict)
+      expect(json_response).to eq({ 'message' => ['User list is associated with a strategy'] })
+      expect(list.reload).to be_persisted
+    end
   end
 end
diff --git a/ee/spec/requests/api/namespaces_spec.rb b/ee/spec/requests/api/namespaces_spec.rb
index 4069b653c48a5db4798b3d36a763c63a549e61ba..7ecabe83d8e04ba466f0eb5dbec9fc0a1baf2ba9 100644
--- a/ee/spec/requests/api/namespaces_spec.rb
+++ b/ee/spec/requests/api/namespaces_spec.rb
@@ -11,6 +11,10 @@
 
   describe "GET /namespaces" do
     context "when authenticated as admin" do
+      before do
+        allow(Gitlab).to receive(:com?).and_return(true)
+      end
+
       it "returns correct attributes" do
         get api("/namespaces", admin)
 
@@ -23,12 +27,14 @@
                                                                  'parent_id', 'members_count_with_descendants',
                                                                  'plan', 'shared_runners_minutes_limit',
                                                                  'avatar_url', 'web_url', 'trial_ends_on', 'trial',
-                                                                 'extra_shared_runners_minutes_limit', 'billable_members_count')
+                                                                 'extra_shared_runners_minutes_limit', 'billable_members_count',
+                                                                 'additional_purchased_storage_size', 'additional_purchased_storage_ends_on')
 
         expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
                                                                 'parent_id', 'plan', 'shared_runners_minutes_limit',
                                                                 'avatar_url', 'web_url', 'trial_ends_on', 'trial',
-                                                                'extra_shared_runners_minutes_limit', 'billable_members_count')
+                                                                'extra_shared_runners_minutes_limit', 'billable_members_count',
+                                                                'additional_purchased_storage_size', 'additional_purchased_storage_ends_on')
       end
     end
 
@@ -111,27 +117,43 @@
   end
 
   describe 'PUT /namespaces/:id' do
+    let(:params) do
+      {
+        shared_runners_minutes_limit: 9001,
+        additional_purchased_storage_size: 10_000,
+        additional_purchased_storage_ends_on: Date.today.to_s
+      }
+    end
+
+    before do
+      allow(Gitlab).to receive(:com?).and_return(true)
+    end
+
     context 'when authenticated as admin' do
       it 'updates namespace using full_path when full_path contains dots' do
-        put api("/namespaces/#{group1.full_path}", admin), params: { shared_runners_minutes_limit: 9001 }
+        put api("/namespaces/#{group1.full_path}", admin), params: params
 
         aggregate_failures do
           expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response['shared_runners_minutes_limit']).to eq(9001)
+          expect(json_response['shared_runners_minutes_limit']).to eq(params[:shared_runners_minutes_limit])
+          expect(json_response['additional_purchased_storage_size']).to eq(params[:additional_purchased_storage_size])
+          expect(json_response['additional_purchased_storage_ends_on']).to eq(params[:additional_purchased_storage_ends_on])
         end
       end
 
       it 'updates namespace using id' do
-        put api("/namespaces/#{group1.id}", admin), params: { shared_runners_minutes_limit: 9001 }
+        put api("/namespaces/#{group1.id}", admin), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['shared_runners_minutes_limit']).to eq(9001)
+        expect(json_response['shared_runners_minutes_limit']).to eq(params[:shared_runners_minutes_limit])
+        expect(json_response['additional_purchased_storage_size']).to eq(params[:additional_purchased_storage_size])
+        expect(json_response['additional_purchased_storage_ends_on']).to eq(params[:additional_purchased_storage_ends_on])
       end
     end
 
     context 'when not authenticated as admin' do
       it 'retuns 403' do
-        put api("/namespaces/#{group1.id}", user), params: { shared_runners_minutes_limit: 9001 }
+        put api("/namespaces/#{group1.id}", user), params: params
 
         expect(response).to have_gitlab_http_status(:forbidden)
       end
@@ -139,7 +161,7 @@
 
     context 'when namespace not found' do
       it 'returns 404' do
-        put api("/namespaces/#{non_existing_record_id}", admin), params: { shared_runners_minutes_limit: 9001 }
+        put api("/namespaces/#{non_existing_record_id}", admin), params: params
 
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response).to eq('message' => '404 Namespace Not Found')
@@ -147,10 +169,20 @@
     end
 
     context 'when invalid params' do
-      it 'returns validation error' do
-        put api("/namespaces/#{group1.id}", admin), params: { shared_runners_minutes_limit: 'unknown' }
+      where(:attr) do
+        [
+          :shared_runners_minutes_limit,
+          :additional_purchased_storage_size,
+          :additional_purchased_storage_ends_on
+        ]
+      end
 
-        expect(response).to have_gitlab_http_status(:bad_request)
+      with_them do
+        it "returns validation error for #{attr}" do
+          put api("/namespaces/#{group1.id}", admin), params: Hash[attr, 'unknown']
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+        end
       end
     end
 
diff --git a/ee/spec/services/epics/update_service_spec.rb b/ee/spec/services/epics/update_service_spec.rb
index 4816bfff41b7eb650d384b82e29b0c6e0420cc59..1919039fc03fbca5234a13a1184c941736bf0222 100644
--- a/ee/spec/services/epics/update_service_spec.rb
+++ b/ee/spec/services/epics/update_service_spec.rb
@@ -312,5 +312,15 @@ def update_issuable(opts)
       let(:issuable) { epic }
       let(:parent) { group }
     end
+
+    context 'with quick actions in the description' do
+      let(:label) { create(:group_label, group: group) }
+
+      it 'adds labels to the epic' do
+        update_epic(description: "/label ~#{label.name}")
+
+        expect(epic.label_ids).to contain_exactly(label.id)
+      end
+    end
   end
 end
diff --git a/ee/spec/services/geo/repository_destroy_service_spec.rb b/ee/spec/services/geo/repository_destroy_service_spec.rb
index c61b13e0a31e6c71feeb63de03a531e432dda45f..08fea3dc3c1631298de25d8fbaaaed7da2a03a6b 100644
--- a/ee/spec/services/geo/repository_destroy_service_spec.rb
+++ b/ee/spec/services/geo/repository_destroy_service_spec.rb
@@ -24,34 +24,41 @@
 
   describe '#execute' do
     context 'with a project on a legacy storage' do
-      let(:project) { create(:project_empty_repo, :legacy_storage) }
+      let(:project) { create(:project_empty_repo, :legacy_storage, :wiki_repo) }
+      let(:repository_disk_path) { "#{project.disk_path}.git" }
+      let(:repository_deleted_disk_path) { "#{project.disk_path}+#{project.id}#{Repositories::ShellDestroyService::DELETED_FLAG}.git" }
+      let(:wiki_disk_path) { "#{project.disk_path}.wiki.git" }
+      let(:wiki_deleted_disk_path) { "#{project.disk_path}.wiki+#{project.id}#{Repositories::ShellDestroyService::DELETED_FLAG}.git" }
 
       subject(:service) { described_class.new(project.id, project.name, project.disk_path, project.repository_storage) }
 
-      it 'delegates project removal to Projects::DestroyService' do
-        expect_any_instance_of(EE::Projects::DestroyService).to receive(:geo_replicate)
+      it 'delegates project removal to Projects::DestroyService#geo_replicate' do
+        expect_next_instance_of(Projects::DestroyService) do |destroy_service|
+          expect(destroy_service).to receive(:geo_replicate).once
+        end
 
         service.execute
       end
 
-      it 'removes the repository from disk' do
-        project.delete
-
-        expect(project.gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_truthy
+      it 'moves the repository/wiki to a +deleted folder' do
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_disk_path)).to be_truthy
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_deleted_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_disk_path)).to be_truthy
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_deleted_disk_path)).to be_falsey
 
         service.execute
 
-        expect(project.gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_deleted_disk_path)).to be_truthy
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_deleted_disk_path)).to be_truthy
       end
 
-      it 'cleans up deleted repositories' do
-        project.delete
+      it 'cleans up the repository/wiki +deleted folders', :sidekiq_inline do
+        subject.execute
 
-        expect(::GitlabShellWorker).to receive(:perform_in)
-          .with(5.minutes, :remove_repository, project.repository_storage, "#{project.disk_path}+#{project.id}+deleted")
-          .and_return(true)
-
-        service.execute
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_deleted_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_deleted_disk_path)).to be_falsey
       end
 
       it 'removes the tracking entries' do
@@ -66,34 +73,41 @@
     end
 
     context 'with a project on a hashed storage' do
-      let(:project) { create(:project_empty_repo) }
+      let(:project) { create(:project_empty_repo, :wiki_repo) }
+      let(:repository_disk_path) { "#{project.disk_path}.git" }
+      let(:repository_deleted_disk_path) { "#{project.disk_path}+#{project.id}#{Repositories::ShellDestroyService::DELETED_FLAG}.git" }
+      let(:wiki_disk_path) { "#{project.disk_path}.wiki.git" }
+      let(:wiki_deleted_disk_path) { "#{project.disk_path}.wiki+#{project.id}#{Repositories::ShellDestroyService::DELETED_FLAG}.git" }
 
       subject(:service) { described_class.new(project.id, project.name, project.disk_path, project.repository_storage) }
 
       it 'delegates project removal to Projects::DestroyService' do
-        expect_any_instance_of(EE::Projects::DestroyService).to receive(:geo_replicate)
+        expect_next_instance_of(Projects::DestroyService) do |destroy_service|
+          expect(destroy_service).to receive(:geo_replicate).once
+        end
 
         service.execute
       end
 
-      it 'removes the repository from disk' do
-        project.delete
-
-        expect(project.gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_truthy
+      it 'moves the repository/wiki to a +deleted folder' do
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_disk_path)).to be_truthy
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_deleted_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_disk_path)).to be_truthy
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_deleted_disk_path)).to be_falsey
 
         service.execute
 
-        expect(project.gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_deleted_disk_path)).to be_truthy
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_deleted_disk_path)).to be_truthy
       end
 
-      it 'cleans up deleted repositories' do
-        project.delete
-
-        expect(::GitlabShellWorker).to receive(:perform_in)
-          .with(5.minutes, :remove_repository, project.repository_storage, "#{project.disk_path}+#{project.id}+deleted")
-          .and_return(true)
+      it 'cleans up the repository/wiki +deleted folders', :sidekiq_inline do
+        subject.execute
 
-        service.execute
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, repository_deleted_disk_path)).to be_falsey
+        expect(project.gitlab_shell.repository_exists?(project.repository_storage, wiki_deleted_disk_path)).to be_falsey
       end
 
       it 'removes the tracking entries' do
@@ -113,7 +127,9 @@
       subject(:service) { described_class.new(project.id, project.name, project.disk_path, project.repository_storage) }
 
       it 'delegates project removal to Projects::DestroyService' do
-        expect_any_instance_of(EE::Projects::DestroyService).to receive(:geo_replicate)
+        expect_next_instance_of(Projects::DestroyService) do |destroy_service|
+          expect(destroy_service).to receive(:geo_replicate).once
+        end
 
         service.execute
       end
@@ -159,7 +175,9 @@
         subject(:service) { described_class.new(project.id) }
 
         it 'delegates project removal to Projects::DestroyService' do
-          expect_any_instance_of(EE::Projects::DestroyService).to receive(:geo_replicate)
+          expect_next_instance_of(Projects::DestroyService) do |destroy_service|
+            expect(destroy_service).to receive(:geo_replicate).once
+          end
 
           service.execute
         end
diff --git a/ee/spec/views/clusters/clusters/show.html.haml_spec.rb b/ee/spec/views/clusters/clusters/show.html.haml_spec.rb
index 11748577f055b4992d3fcf5baef6c3f2f0f74c32..13ab4eaecf4657a6f0ab130c289c22665ac97d93 100644
--- a/ee/spec/views/clusters/clusters/show.html.haml_spec.rb
+++ b/ee/spec/views/clusters/clusters/show.html.haml_spec.rb
@@ -17,30 +17,11 @@
       allow(view).to receive(:clusterable).and_return(clusterable_presenter)
     end
 
-    context 'with feature cluster_health available' do
-      before do
-        stub_licensed_features(cluster_health: true)
-      end
+    it 'displays the Cluster health section' do
+      render
 
-      it 'displays the Cluster health section' do
-        render
-
-        expect(rendered).to have_selector('#cluster-health-tab')
-        expect(rendered).to have_content('Health')
-      end
-    end
-
-    context 'without feature cluster_health available' do
-      before do
-        stub_licensed_features(cluster_health: false)
-      end
-
-      it 'does not show the Cluster health section' do
-        render
-
-        expect(rendered).not_to have_selector('#cluster-health')
-        expect(rendered).not_to have_content('Cluster health')
-      end
+      expect(rendered).to have_selector('#cluster-health-tab')
+      expect(rendered).to have_content('Health')
     end
   end
 
diff --git a/lib/api/entities/project_statistics.rb b/lib/api/entities/project_statistics.rb
index e5f6165da310438d8dbccda5ef0bc565aef9919c..32201e88eafb00d6e3f4d2990398f83ff12fd526 100644
--- a/lib/api/entities/project_statistics.rb
+++ b/lib/api/entities/project_statistics.rb
@@ -9,6 +9,7 @@ class ProjectStatistics < Grape::Entity
       expose :wiki_size
       expose :lfs_objects_size
       expose :build_artifacts_size, as: :job_artifacts_size
+      expose :snippets_size
     end
   end
 end
diff --git a/lib/gitlab/alert_management/alert_params.rb b/lib/gitlab/alert_management/alert_params.rb
index ce5ba6f0b49aad2dd0c99fd2e6ed776cf32b2dca..84a75e62ecf0b4a0c026b330d480b8c9009cc03e 100644
--- a/lib/gitlab/alert_management/alert_params.rb
+++ b/lib/gitlab/alert_management/alert_params.rb
@@ -34,7 +34,9 @@ def self.from_prometheus_alert(project:, parsed_alert:)
           payload: parsed_alert.payload,
           started_at: parsed_alert.starts_at,
           ended_at: parsed_alert.ends_at,
-          fingerprint: parsed_alert.gitlab_fingerprint
+          fingerprint: parsed_alert.gitlab_fingerprint,
+          environment: parsed_alert.environment,
+          prometheus_alert: parsed_alert.gitlab_alert
         }
       end
     end
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb
index 9f0ca80ba5013cc92a4bee59a922b2f1e752d33d..c5f843d5f1a16e20d16ea7be78ca8744b3333ecf 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb
@@ -21,6 +21,11 @@ def timestamp_projection
             issue_metrics_table[:first_mentioned_in_commit_at]
           end
 
+          override :column_list
+          def column_list
+            [timestamp_projection]
+          end
+
           # rubocop: disable CodeReuse/ActiveRecord
           def apply_query_customization(query)
             issue_metrics_join = mr_closing_issues_table
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/issue_stage_end.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/issue_stage_end.rb
index ed87d86f7e83cb2c4b244d31f257219ba36ec6fb..7c1f4436c93eebace69447edd19237d03cb3a3a3 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/issue_stage_end.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/issue_stage_end.rb
@@ -21,6 +21,7 @@ def timestamp_projection
             Arel::Nodes::NamedFunction.new('COALESCE', column_list)
           end
 
+          override :column_list
           def column_list
             [
               issue_metrics_table[:first_associated_with_milestone_at],
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb
index 6f46b2a4180c9e0cae5bd161f7aaee930048e189..fe477490648c41a161bc782d88b2a74ca6256b8e 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb
@@ -11,6 +11,7 @@ def apply_query_customization(query)
           end
           # rubocop: enable CodeReuse/ActiveRecord
 
+          override :column_list
           def column_list
             [timestamp_projection]
           end
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb
index ab7fe0a6070bed46141ed678ed67260b227881ab..bddc326de7133cb726e459674aabe159c1c0a0f9 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb
@@ -21,6 +21,7 @@ def timestamp_projection
             Arel::Nodes::NamedFunction.new('COALESCE', column_list)
           end
 
+          override :column_list
           def column_list
             [
               issue_metrics_table[:first_associated_with_milestone_at],
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb
index 154fe9d3c38008850cec35212301743d3741b37b..cf05ebeb7064e7a6686a2214c3c278c73c474e03 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb
@@ -21,6 +21,7 @@ def timestamp_projection
             mr_metrics_table[:first_deployed_to_production_at]
           end
 
+          override :column_list
           def column_list
             [timestamp_projection]
           end
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb
index 8a8e8838ed844417b7d84c583fe7b6eef308ab16..79738747e7140d963295ed62fd26b329205d96a1 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb
@@ -7,6 +7,7 @@ module StageEvents
         # Base class for expressing an event that can be used for a stage.
         class StageEvent
           include Gitlab::CycleAnalytics::MetricsTables
+          extend Gitlab::Utils::Override
 
           delegate :label_based?, to: :class
 
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 1d4efc3cc9f1ec6593004cdd0b5c0c4aabc408af..a240ec4aa3087df235065a9a8c9c19af7da46c5e 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -45,6 +45,11 @@ def self.pipeline_latest?
       def self.release_generation_enabled?
         ::Feature.enabled?(:ci_release_generation)
       end
+
+      # Remove in https://gitlab.com/gitlab-org/gitlab/-/issues/224199
+      def self.store_pipeline_messages?(project)
+        ::Feature.enabled?(:ci_store_pipeline_messages, project, default_enabled: true)
+      end
     end
   end
 end
diff --git a/lib/gitlab/ci/pipeline/chain/helpers.rb b/lib/gitlab/ci/pipeline/chain/helpers.rb
index 982ecc0ff51cea95a00122d92aff5e44de24f38d..34a4e25528d638db9a242080be8ad90857ab11f2 100644
--- a/lib/gitlab/ci/pipeline/chain/helpers.rb
+++ b/lib/gitlab/ci/pipeline/chain/helpers.rb
@@ -11,7 +11,12 @@ def error(message, config_error: false, drop_reason: nil)
               pipeline.yaml_errors = message
             end
 
+            pipeline.add_error_message(message)
             pipeline.drop!(drop_reason) if drop_reason
+
+            # TODO: consider not to rely on AR errors directly as they can be
+            # polluted with other unrelated errors (e.g. state machine)
+            # https://gitlab.com/gitlab-org/gitlab/-/issues/220823
             pipeline.errors.add(:base, message)
           end
         end
diff --git a/lib/gitlab/config/loader/yaml.rb b/lib/gitlab/config/loader/yaml.rb
index e001742a7f8f6830094b98c72a7f099831f65865..cb3fc49944c4be8950ed9d5966ec284030ce3c1e 100644
--- a/lib/gitlab/config/loader/yaml.rb
+++ b/lib/gitlab/config/loader/yaml.rb
@@ -5,6 +5,7 @@ module Config
     module Loader
       class Yaml
         DataTooLargeError = Class.new(Loader::FormatError)
+        NotHashError = Class.new(Loader::FormatError)
 
         include Gitlab::Utils::StrongMemoize
 
@@ -23,7 +24,7 @@ def valid?
 
         def load_raw!
           raise DataTooLargeError, 'The parsed YAML is too big' if too_big?
-          raise Loader::FormatError, 'Invalid configuration format' unless hash?
+          raise NotHashError, 'Invalid configuration format' unless hash?
 
           @config
         end
diff --git a/lib/gitlab/graphql/authorize/authorize_resource.rb b/lib/gitlab/graphql/authorize/authorize_resource.rb
index 94871498cf89ba47eb16eedd298ab1d272e58ac3..27673e5c27a7c433aa77624500552be278b6df93 100644
--- a/lib/gitlab/graphql/authorize/authorize_resource.rb
+++ b/lib/gitlab/graphql/authorize/authorize_resource.rb
@@ -30,8 +30,7 @@ def find_object(*args)
         end
 
         def authorized_find!(*args)
-          object = find_object(*args)
-          object = object.sync if object.respond_to?(:sync)
+          object = Graphql::Lazy.force(find_object(*args))
 
           authorize!(object)
 
diff --git a/lib/gitlab/graphql/lazy.rb b/lib/gitlab/graphql/lazy.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a7f7610a041007640d1e715806996e432099d937
--- /dev/null
+++ b/lib/gitlab/graphql/lazy.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Graphql
+    class Lazy
+      # Force evaluation of a (possibly) lazy value
+      def self.force(value)
+        case value
+        when ::BatchLoader::GraphQL
+          value.sync
+        when ::Concurrent::Promise
+          value.execute.value
+        else
+          value
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/graphql/loaders/issuable_loader.rb b/lib/gitlab/graphql/loaders/issuable_loader.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1cc0fbe215f3d2c1efe985dac0c8783851af8253
--- /dev/null
+++ b/lib/gitlab/graphql/loaders/issuable_loader.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Graphql
+    module Loaders
+      class IssuableLoader
+        attr_reader :parent, :issuable_finder
+
+        BatchKey = Struct.new(:parent, :finder_class, :current_user)
+
+        def initialize(parent, issuable_finder)
+          @parent = parent
+          @issuable_finder = issuable_finder
+        end
+
+        def batching_find_all(&with_query)
+          if issuable_finder.params.keys == ['iids']
+            batch_load_issuables(issuable_finder.params[:iids], with_query)
+          else
+            post_process(find_all, with_query)
+          end
+        end
+
+        def find_all
+          issuable_finder.params[parent_param] = parent if parent
+
+          issuable_finder.execute
+        end
+
+        private
+
+        def parent_param
+          case parent
+          when Project
+            :project_id
+          when Group
+            :group_id
+          else
+            raise "Unexpected parent: #{parent.class}"
+          end
+        end
+
+        def post_process(query, with_query)
+          if with_query
+            with_query.call(query)
+          else
+            query
+          end
+        end
+
+        def batch_load_issuables(iids, with_query)
+          Array.wrap(iids).map { |iid| batch_load(iid, with_query) }
+        end
+
+        def batch_load(iid, with_query)
+          return if parent.nil?
+
+          BatchLoader::GraphQL
+            .for([parent_param, iid.to_s])
+            .batch(key: batch_key) do |params, loader, args|
+              batch_key = args[:key]
+              user = batch_key.current_user
+
+              params.group_by(&:first).each do |key, group|
+                iids = group.map(&:second).uniq
+                args = { key => batch_key.parent, iids: iids }
+                query = batch_key.finder_class.new(user, args).execute
+
+                post_process(query, with_query).each do |item|
+                  loader.call([key, item.iid.to_s], item)
+                end
+              end
+            end
+        end
+
+        def batch_key
+          BatchKey.new(parent, issuable_finder.class, issuable_finder.current_user)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb b/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
index 6f705239fa30e12643aee349b8163ae756c44adc..6b6bb72eb3118c24bf4d7edf39d15e172e1604e4 100644
--- a/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
+++ b/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
@@ -52,8 +52,7 @@ def process_variables(variables)
         end
 
         def duration(time_started)
-          nanoseconds = Gitlab::Metrics::System.monotonic_time - time_started
-          nanoseconds * 1000000
+          Gitlab::Metrics::System.monotonic_time - time_started
         end
 
         def default_initial_values(query)
diff --git a/lib/gitlab/instrumentation/elasticsearch_transport.rb b/lib/gitlab/instrumentation/elasticsearch_transport.rb
index deee0127c0c115071b4136d4a3574bcfe144fc91..56179eda22dd3a70e215eb543f9f3380fcbb2ff0 100644
--- a/lib/gitlab/instrumentation/elasticsearch_transport.rb
+++ b/lib/gitlab/instrumentation/elasticsearch_transport.rb
@@ -5,8 +5,10 @@
 module Gitlab
   module Instrumentation
     module ElasticsearchTransportInterceptor
-      def perform_request(*args)
+      def perform_request(method, path, params = {}, body = nil, headers = nil)
         start = Time.now
+        headers = (headers || {})
+          .reverse_merge({ 'X-Opaque-Id': Labkit::Correlation::CorrelationId.current_or_new_id })
         super
       ensure
         if ::Gitlab::SafeRequestStore.active?
@@ -14,7 +16,7 @@ def perform_request(*args)
 
           ::Gitlab::Instrumentation::ElasticsearchTransport.increment_request_count
           ::Gitlab::Instrumentation::ElasticsearchTransport.add_duration(duration)
-          ::Gitlab::Instrumentation::ElasticsearchTransport.add_call_details(duration, args)
+          ::Gitlab::Instrumentation::ElasticsearchTransport.add_call_details(duration, method, path, params, body)
         end
       end
     end
@@ -47,14 +49,14 @@ def self.add_duration(duration)
         ::Gitlab::SafeRequestStore[ELASTICSEARCH_CALL_DURATION] += duration
       end
 
-      def self.add_call_details(duration, args)
+      def self.add_call_details(duration, method, path, params, body)
         return unless Gitlab::PerformanceBar.enabled_for_request?
 
         detail_store << {
-          method: args[0],
-          path: args[1],
-          params: args[2],
-          body: args[3],
+          method: method,
+          path: path,
+          params: params,
+          body: body,
           duration: duration,
           backtrace: ::Gitlab::BacktraceCleaner.clean_backtrace(caller)
         }
diff --git a/lib/gitlab/static_site_editor/config.rb b/lib/gitlab/static_site_editor/config.rb
index ddafbb22a6d03825c6815dcfba36ce2b97f24f5f..08ed6599a6e178998fe05bdaf4262d3148b5ee40 100644
--- a/lib/gitlab/static_site_editor/config.rb
+++ b/lib/gitlab/static_site_editor/config.rb
@@ -20,7 +20,7 @@ def payload
           commit_id: commit_id,
           project_id: project.id,
           project: project.path,
-          namespace: project.namespace.path,
+          namespace: project.namespace.full_path,
           return_url: sanitize_url(return_url),
           is_supported_content: supported_content?.to_s,
           base_url: Gitlab::Routing.url_helpers.project_show_sse_path(project, full_path)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c8125fabb4a3b485e91b99cb09c6202a70b80bbb..d9e4037ff16bc36aacd5718af0ae9caf0de0c731 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -567,12 +567,6 @@ msgstr ""
 msgid "%{retryButtonStart}Try again%{retryButtonEnd} or %{newFileButtonStart}attach a new file%{newFileButtonEnd}"
 msgstr ""
 
-msgid "%{screenreaderOnlyStart}Keyboard shorcuts%{screenreaderOnlyEnd} Disabled"
-msgstr ""
-
-msgid "%{screenreaderOnlyStart}Keyboard shorcuts%{screenreaderOnlyEnd} Enabled"
-msgstr ""
-
 msgid "%{service_title} %{message}."
 msgstr ""
 
@@ -735,9 +729,6 @@ msgstr ""
 msgid "(No changes)"
 msgstr ""
 
-msgid "(Show all)"
-msgstr ""
-
 msgid "(check progress)"
 msgstr ""
 
@@ -1322,6 +1313,9 @@ msgstr ""
 msgid "Add LICENSE"
 msgstr ""
 
+msgid "Add New Node"
+msgstr ""
+
 msgid "Add README"
 msgstr ""
 
@@ -1957,9 +1951,6 @@ msgstr ""
 msgid "AlertManagement|Edit"
 msgstr ""
 
-msgid "AlertManagement|End time"
-msgstr ""
-
 msgid "AlertManagement|Events"
 msgstr ""
 
@@ -4429,15 +4420,9 @@ msgstr ""
 msgid "Choose what content you want to see on a group’s overview page"
 msgstr ""
 
-msgid "Choose which groups you wish to synchronize to this secondary node"
-msgstr ""
-
 msgid "Choose which repositories you want to connect and run CI/CD pipelines."
 msgstr ""
 
-msgid "Choose which shards you wish to synchronize to this secondary node"
-msgstr ""
-
 msgid "Choose your framework"
 msgstr ""
 
@@ -6384,21 +6369,6 @@ msgstr ""
 msgid "Control the display of third party offers."
 msgstr ""
 
-msgid "Control the maximum concurrency of LFS/attachment backfill for this secondary node"
-msgstr ""
-
-msgid "Control the maximum concurrency of container repository operations for this Geo node"
-msgstr ""
-
-msgid "Control the maximum concurrency of repository backfill for this secondary node"
-msgstr ""
-
-msgid "Control the maximum concurrency of verification operations for this Geo node"
-msgstr ""
-
-msgid "Control the minimum interval in days that a repository should be reverified for this primary node"
-msgstr ""
-
 msgid "Cookie domain"
 msgstr ""
 
@@ -10322,6 +10292,9 @@ msgstr ""
 msgid "Geo allows you to replicate your GitLab instance to other geographical locations."
 msgstr ""
 
+msgid "Geo nodes are paused using a command run on the node"
+msgstr ""
+
 msgid "GeoNodeStatusEvent|%{timeAgoStr} (%{pendingEvents} events)"
 msgstr ""
 
@@ -10427,6 +10400,9 @@ msgstr ""
 msgid "GeoNodes|Replication slots"
 msgstr ""
 
+msgid "GeoNodes|Replication status"
+msgstr ""
+
 msgid "GeoNodes|Repositories"
 msgstr ""
 
@@ -11778,9 +11754,6 @@ msgstr[1] ""
 msgid "Hide values"
 msgstr ""
 
-msgid "Hiding all labels"
-msgstr ""
-
 msgid "High or unknown vulnerabilities present"
 msgstr ""
 
@@ -11958,10 +11931,10 @@ msgstr ""
 msgid "If enabled"
 msgstr ""
 
-msgid "If enabled, access to projects will be validated on an external service using their classification label."
+msgid "If enabled, GitLab will handle Object Storage replication using Geo. %{linkStart}More information%{linkEnd}"
 msgstr ""
 
-msgid "If enabled, and if object storage is enabled, GitLab will handle Object Storage replication using Geo"
+msgid "If enabled, access to projects will be validated on an external service using their classification label."
 msgstr ""
 
 msgid "If there is no previous license or if the previous license has expired, some GitLab functionality will be blocked until a new, valid license is uploaded."
@@ -12476,6 +12449,9 @@ msgstr ""
 msgid "Invalid two-factor code."
 msgstr ""
 
+msgid "Invalid yaml"
+msgstr ""
+
 msgid "Invitation"
 msgstr ""
 
@@ -12941,9 +12917,6 @@ msgstr ""
 msgid "Key: %{key}"
 msgstr ""
 
-msgid "Keyboard Shortcuts"
-msgstr ""
-
 msgid "Keyboard shortcuts"
 msgstr ""
 
@@ -13228,6 +13201,9 @@ msgstr ""
 msgid "Learn more about group-level project templates"
 msgstr ""
 
+msgid "Learn more about job dependencies"
+msgstr ""
+
 msgid "Learn more about signing commits"
 msgstr ""
 
@@ -14607,6 +14583,9 @@ msgstr ""
 msgid "Minimum capacity to be available before we schedule more mirrors preemptively."
 msgstr ""
 
+msgid "Minimum interval in days"
+msgstr ""
+
 msgid "Minimum length is %{minimum_password_length} characters"
 msgstr ""
 
@@ -14793,6 +14772,12 @@ msgstr ""
 msgid "Multiple uploaders found: %{uploader_types}"
 msgstr ""
 
+msgid "Must match with the %{codeStart}external_url%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}."
+msgstr ""
+
+msgid "Must match with the %{codeStart}geo_node_name%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}. %{linkStart}More information%{linkEnd}"
+msgstr ""
+
 msgid "My Awesome Group"
 msgstr ""
 
@@ -14919,9 +14904,6 @@ msgstr ""
 msgid "New File"
 msgstr ""
 
-msgid "New Geo Node"
-msgstr ""
-
 msgid "New Group"
 msgstr ""
 
@@ -16270,6 +16252,9 @@ msgstr ""
 msgid "Perform common operations on GitLab project"
 msgstr ""
 
+msgid "Performance and resource management"
+msgstr ""
+
 msgid "Performance optimization"
 msgstr ""
 
@@ -16477,7 +16462,7 @@ msgstr ""
 msgid "Pipelines|Something went wrong while cleaning runners cache."
 msgstr ""
 
-msgid "Pipelines|There are currently no %{scope} pipelines."
+msgid "Pipelines|There are currently no finished pipelines."
 msgstr ""
 
 msgid "Pipelines|There are currently no pipelines."
@@ -19073,6 +19058,12 @@ msgstr ""
 msgid "Replication"
 msgstr ""
 
+msgid "Replication enabled"
+msgstr ""
+
+msgid "Replication paused"
+msgstr ""
+
 msgid "Reply by email"
 msgstr ""
 
@@ -19448,9 +19439,6 @@ msgstr ""
 msgid "Resume"
 msgstr ""
 
-msgid "Resume replication"
-msgstr ""
-
 msgid "Resync"
 msgstr ""
 
@@ -20565,12 +20553,6 @@ msgstr ""
 msgid "Service Desk is enabled but not yet active"
 msgstr ""
 
-msgid "Service Desk is off"
-msgstr ""
-
-msgid "Service Desk is on"
-msgstr ""
-
 msgid "Service Templates"
 msgstr ""
 
@@ -20658,6 +20640,12 @@ msgstr ""
 msgid "Set the milestone to %{milestone_reference}."
 msgstr ""
 
+msgid "Set the number of concurrent requests this secondary node will make to the primary node while backfilling."
+msgstr ""
+
+msgid "Set the synchronization and verification capacity for the secondary node."
+msgstr ""
+
 msgid "Set the timeout in seconds to send a secondary node status to the primary and IPs allowed for the secondary nodes."
 msgstr ""
 
@@ -20700,6 +20688,9 @@ msgstr ""
 msgid "Set weight to %{weight}."
 msgstr ""
 
+msgid "Set what should be replicated by choosing specific projects or groups by the secondary node."
+msgstr ""
+
 msgid "SetPasswordToCloneLink|set a password"
 msgstr ""
 
@@ -20893,9 +20884,6 @@ msgstr ""
 msgid "Showing all issues"
 msgstr ""
 
-msgid "Showing all labels"
-msgstr ""
-
 msgid "Showing last %{size} of log -"
 msgstr ""
 
@@ -21661,6 +21649,9 @@ msgstr ""
 msgid "Start thread & reopen %{noteable_name}"
 msgstr ""
 
+msgid "Start using Directed Acyclic Graphs (DAG)"
+msgstr ""
+
 msgid "Start your Free Gold Trial"
 msgstr ""
 
@@ -22490,7 +22481,7 @@ msgstr ""
 msgid "The Terraform report %{name} was generated in your pipelines."
 msgstr ""
 
-msgid "The URL defined on the primary node that secondary nodes should use to contact it. Defaults to URL"
+msgid "The URL defined on the primary node that secondary nodes should use to contact it."
 msgstr ""
 
 msgid "The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., \"http://localhost:9200, http://localhost:9201\")."
@@ -22801,9 +22792,6 @@ msgstr ""
 msgid "The total stage shows the time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle."
 msgstr ""
 
-msgid "The unique identifier for the Geo node. Must match %{geoNodeName} if it is set in gitlab.rb, otherwise it must match %{externalUrl} with a trailing slash"
-msgstr ""
-
 msgid "The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination."
 msgstr ""
 
@@ -22828,9 +22816,6 @@ msgstr ""
 msgid "The user you are trying to deactivate has been active in the past %{minimum_inactive_days} days and cannot be deactivated"
 msgstr ""
 
-msgid "The user-facing URL of the Geo node"
-msgstr ""
-
 msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
 msgstr ""
 
@@ -22975,6 +22960,9 @@ msgstr ""
 msgid "There was an error fetching the %{replicableType}"
 msgstr ""
 
+msgid "There was an error fetching the Geo Settings"
+msgstr ""
+
 msgid "There was an error fetching the Node's Groups"
 msgstr ""
 
@@ -23413,6 +23401,9 @@ msgstr ""
 msgid "This page will be removed in a future release."
 msgstr ""
 
+msgid "This pipeline does not use the %{codeStart}needs%{codeEnd} keyword and can't be represented as a directed acyclic graph."
+msgstr ""
+
 msgid "This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}"
 msgstr ""
 
@@ -25187,6 +25178,9 @@ msgstr ""
 msgid "UsersSelect|Unassigned"
 msgstr ""
 
+msgid "Using %{codeStart}needs%{codeEnd} allows jobs to run before their stage is reached, as soon as their individual dependencies are met, which speeds up your pipelines."
+msgstr ""
+
 msgid "Using %{code_start}::%{code_end} denotes a %{link_start}scoped label set%{link_end}"
 msgstr ""
 
@@ -27112,9 +27106,6 @@ msgstr ""
 msgid "expires on %{timebox_due_date}"
 msgstr ""
 
-msgid "external_url"
-msgstr ""
-
 msgid "failed"
 msgstr ""
 
@@ -27150,9 +27141,6 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-msgid "geo_node_name"
-msgstr ""
-
 msgid "group"
 msgstr ""
 
diff --git a/package.json b/package.json
index 1a4b3674d433e346ee96d0e7f33adce47418cddf..d6d3af784fef5a7af0f05f18cf0bcf736f429c82 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.144.0",
-    "@gitlab/ui": "17.8.0",
+    "@gitlab/ui": "17.9.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-1",
     "@sentry/browser": "^5.10.2",
diff --git a/qa/qa/ee.rb b/qa/qa/ee.rb
index 8c85dd0ca10efb0a42551757d2bb18b408a17ea2..633ad2f0a4b4eee31ef00c4b3fdd43ea420decb6 100644
--- a/qa/qa/ee.rb
+++ b/qa/qa/ee.rb
@@ -49,6 +49,8 @@ module File
 
       module Main
         autoload :Banner, 'qa/ee/page/main/banner'
+        autoload :Login, 'qa/ee/page/main/login'
+        autoload :Onboarding, 'qa/ee/page/main/onboarding'
       end
 
       module Admin
diff --git a/qa/qa/ee/page/main/login.rb b/qa/qa/ee/page/main/login.rb
new file mode 100644
index 0000000000000000000000000000000000000000..968afcb38ca44c307c7a2ddfbcf482d855557134
--- /dev/null
+++ b/qa/qa/ee/page/main/login.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module QA
+  module EE
+    module Page
+      module Main
+        module Login
+          extend QA::Page::PageConcern
+
+          def skip_onboarding
+            Page::Main::Onboarding.perform(&:skip_if_visible)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/ee/page/main/onboarding.rb b/qa/qa/ee/page/main/onboarding.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c66df2417ceb91e06b3671067ec61bc5dd7b205d
--- /dev/null
+++ b/qa/qa/ee/page/main/onboarding.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module QA
+  module EE
+    module Page
+      module Main
+        class Onboarding < QA::Page::Base
+          view 'ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue' do
+            element :skip_for_now_link, required: true
+          end
+
+          def skip_if_visible
+            click_skip_for_now_link if visible?
+          end
+
+          def click_skip_for_now_link
+            click_element :skip_for_now_link, ::QA::Page::Main::Menu
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/component/issuable/sidebar.rb b/qa/qa/page/component/issuable/sidebar.rb
index 1bb13b4cd20ad5617ff2b964005f974094dc6192..4e94049efe78c2914095644a5b36fa0d17d22a10 100644
--- a/qa/qa/page/component/issuable/sidebar.rb
+++ b/qa/qa/page/component/issuable/sidebar.rb
@@ -99,10 +99,6 @@ def select_labels_and_refresh(labels)
             refresh
           end
 
-          def text_of_labels_block
-            find_element(:labels_block)
-          end
-
           def toggle_more_assignees_link
             click_element(:more_assignees_link)
           end
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 8eb28eb53e7f893f90b50d4e7617db1a9ca3b93f..810abf424a13f649f8b537ea875a336c0d20476d 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -165,6 +165,8 @@ def sign_in_using_gitlab_credentials(user:, skip_page_validation: false)
             terms.accept_terms if terms.visible?
           end
 
+          skip_onboarding if respond_to?(:skip_onboarding)
+
           Page::Main::Menu.validate_elements_present! unless skip_page_validation
         end
 
@@ -179,3 +181,5 @@ def set_initial_password_if_present
     end
   end
 end
+
+QA::Page::Main::Login.prepend_if_ee('QA::EE::Page::Main::Login')
diff --git a/qa/qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb b/qa/qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb
index d60dc7a75794b7e376a78dbe7c1e221ee9b34a66..cb51050185325b1c583eaa032e97483e9f0c28f6 100644
--- a/qa/qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb
@@ -44,13 +44,13 @@ module QA
 
           show.select_all_activities_filter
 
-          expect(show.text_of_labels_block).to have_content(new_label_same_scope.gsub('::', ' '))
-          expect(show.text_of_labels_block).to have_content(new_label_different_scope.gsub('::', ' '))
-          expect(show.text_of_labels_block).to have_content('group::car porsche')
-          expect(show.text_of_labels_block).to have_content('group::truck mercedes-bens')
+          expect(show).to have_label(new_label_same_scope)
+          expect(show).to have_label(new_label_different_scope)
+          expect(show).to have_label('group::car::porsche')
+          expect(show).to have_label('group::truck::mercedes-bens')
 
-          expect(show.text_of_labels_block).not_to have_content(initial_label.gsub('::', ' '))
-          expect(show.text_of_labels_block).not_to have_content('group::car ferrari')
+          expect(show).not_to have_label(initial_label)
+          expect(show).not_to have_label('group::car::ferrari')
         end
       end
     end
diff --git a/spec/factories/alert_management/alerts.rb b/spec/factories/alert_management/alerts.rb
index 8724a626d772b07b7af28ae89e73af2ae7d040c9..99ee133f7e4d79143f0570180079074cae546280 100644
--- a/spec/factories/alert_management/alerts.rb
+++ b/spec/factories/alert_management/alerts.rb
@@ -16,7 +16,9 @@
     end
 
     trait :with_issue do
-      issue
+      after(:create) do |alert|
+        create(:issue, alert_management_alert: alert, project: alert.project)
+      end
     end
 
     trait :with_assignee do |alert|
diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb
index d76cf99300435520287ec954adc986bf76a6dd5f..aaa59108b955a4b5f30fc93017a04bb4bebaad32 100644
--- a/spec/features/groups/empty_states_spec.rb
+++ b/spec/features/groups/empty_states_spec.rb
@@ -7,6 +7,8 @@
   let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user }
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+
     sign_in(user)
   end
 
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index 382a7a9321c0cea6a60c4d8ad7a7b07e61e31a99..1481c4d07a29e418b848a6e873406dcbbb2c48e4 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -2,13 +2,15 @@
 
 require 'spec_helper'
 
-RSpec.describe 'issuable list' do
+RSpec.describe 'issuable list', :js do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
 
   issuable_types = [:issue, :merge_request]
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+    # something is going on
     project.add_user(user, :developer)
     sign_in(user)
     issuable_types.each { |type| create_issuables(type) }
diff --git a/spec/features/issuables/sorting_list_spec.rb b/spec/features/issuables/sorting_list_spec.rb
index 59518723740708bb7e9b8c0c3502432286971c69..ff92fe369d4cc98d7b4f16b69adea46418a2926d 100644
--- a/spec/features/issuables/sorting_list_spec.rb
+++ b/spec/features/issuables/sorting_list_spec.rb
@@ -10,6 +10,10 @@
   let(:first_updated_issuable) { issuables.order_updated_asc.first }
   let(:last_updated_issuable) { issuables.order_updated_desc.first }
 
+  before do
+    stub_feature_flags(vue_issuables_list: false)
+  end
+
   context 'for merge requests' do
     include MergeRequestHelpers
 
diff --git a/spec/features/issues/bulk_assignment_labels_spec.rb b/spec/features/issues/bulk_assignment_labels_spec.rb
index 84a786e91a7cc22364f75422d44359385e98706e..09dd1a219829677af96463ebe57d71543f72ddde 100644
--- a/spec/features/issues/bulk_assignment_labels_spec.rb
+++ b/spec/features/issues/bulk_assignment_labels_spec.rb
@@ -13,6 +13,9 @@
 
   context 'as an allowed user', :js do
     before do
+      # Make sure that issuables list FF is not turned on.
+      stub_feature_flags(vue_issuables_list: false)
+
       project.add_maintainer(user)
 
       sign_in user
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index 5b5348d4069c935ca089434fc8df3063ca4b31b9..bcc436b57b45091defd987f4849e5582ce4cdc19 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -26,6 +26,8 @@ def expect_no_issues_list
   end
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+
     project.add_maintainer(user)
 
     create(:issue, project: project, author: user2, title: "Bug report 1")
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index eca9e75fed654a8a1d59b11bd74261dd1eec4af0..0b2e801330483ac4f94bede38a7aad86d05fc394 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -3,24 +3,23 @@
 require 'spec_helper'
 
 RSpec.describe 'GFM autocomplete', :js do
-  let(:issue_xss_title) { 'This will execute alert<img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;' }
-  let(:user_xss_title) { 'eve <img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;' }
-  let(:label_xss_title) { 'alert label &lt;img src=x onerror="alert(\'Hello xss\');" a' }
-  let(:milestone_xss_title) { 'alert milestone &lt;img src=x onerror="alert(\'Hello xss\');" a' }
-
-  let(:user_xss) { create(:user, name: user_xss_title, username: 'xss.user') }
-  let(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') }
-  let(:project) { create(:project) }
-  let(:label) { create(:label, project: project, title: 'special+') }
+  let_it_be(:user_xss_title) { 'eve <img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;' }
+  let_it_be(:user_xss) { create(:user, name: user_xss_title, username: 'xss.user') }
+  let_it_be(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:label) { create(:label, project: project, title: 'special+') }
+
   let(:issue) { create(:issue, project: project) }
 
+  before_all do
+    project.add_maintainer(user)
+    project.add_maintainer(user_xss)
+  end
+
   describe 'when tribute_autocomplete feature flag is off' do
     before do
       stub_feature_flags(tribute_autocomplete: false)
 
-      project.add_maintainer(user)
-      project.add_maintainer(user_xss)
-
       sign_in(user)
       visit project_issue_path(project, issue)
 
@@ -45,6 +44,14 @@
       expect(find('.description')).to have_content(user.to_reference)
     end
 
+    it 'opens quick action autocomplete when updating description' do
+      find('.js-issuable-edit').click
+
+      find('#issue-description').native.send_keys('/')
+
+      expect(page).to have_selector('.atwho-container')
+    end
+
     it 'opens autocomplete menu when field starts with text' do
       page.within '.timeline-content-form' do
         find('#note-body').native.send_keys('@')
@@ -54,6 +61,7 @@
     end
 
     it 'opens autocomplete menu for Issues when field starts with text with item escaping HTML characters' do
+      issue_xss_title = 'This will execute alert<img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;'
       create(:issue, project: project, title: issue_xss_title)
 
       page.within '.timeline-content-form' do
@@ -84,6 +92,7 @@
     end
 
     it 'opens autocomplete menu for Milestone when field starts with text with item escaping HTML characters' do
+      milestone_xss_title = 'alert milestone &lt;img src=x onerror="alert(\'Hello xss\');" a'
       create(:milestone, project: project, title: milestone_xss_title)
 
       page.within '.timeline-content-form' do
@@ -327,6 +336,7 @@
 
     context 'labels' do
       it 'opens autocomplete menu for Labels when field starts with text with item escaping HTML characters' do
+        label_xss_title = 'alert label &lt;img src=x onerror="alert(\'Hello xss\');" a'
         create(:label, project: project, title: label_xss_title)
 
         note = find('#note-body')
@@ -462,9 +472,6 @@
     before do
       stub_feature_flags(tribute_autocomplete: true)
 
-      project.add_maintainer(user)
-      project.add_maintainer(user_xss)
-
       sign_in(user)
       visit project_issue_path(project, issue)
 
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index f8385f183d2c2383471b339aa55efc4e76906c8f..dfe3a1bf1b39a2e2404118556b08b24c9ef957ae 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -8,6 +8,7 @@
   let!(:user)      { create(:user)}
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
     project.add_maintainer(user)
     sign_in(user)
   end
diff --git a/spec/features/issues/user_filters_issues_spec.rb b/spec/features/issues/user_filters_issues_spec.rb
index 20ad47b111a2cbc9beae00d7d8a637b9e39c8c83..54a600910efd9c2cd010d6e0aa4194a680d352b3 100644
--- a/spec/features/issues/user_filters_issues_spec.rb
+++ b/spec/features/issues/user_filters_issues_spec.rb
@@ -7,6 +7,8 @@
   let_it_be(:project) { create(:project_empty_repo, :public) }
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+
     %w[foobar barbaz].each do |title|
       create(:issue,
              author: user,
diff --git a/spec/features/issues/user_sees_breadcrumb_links_spec.rb b/spec/features/issues/user_sees_breadcrumb_links_spec.rb
index 2660101c330ad5328548c3403004a447fd39a931..f5793758a9b2e32068abb5f31a61b074f5da875d 100644
--- a/spec/features/issues/user_sees_breadcrumb_links_spec.rb
+++ b/spec/features/issues/user_sees_breadcrumb_links_spec.rb
@@ -7,6 +7,8 @@
   let(:user) { project.creator }
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+
     sign_in(user)
     visit(new_project_issue_path(project))
   end
diff --git a/spec/features/issues/user_sees_empty_state_spec.rb b/spec/features/issues/user_sees_empty_state_spec.rb
index 047c5ca2189a163733799e7569999699255f57cd..e39369b01504cd345dfb617851a583610921610f 100644
--- a/spec/features/issues/user_sees_empty_state_spec.rb
+++ b/spec/features/issues/user_sees_empty_state_spec.rb
@@ -6,6 +6,10 @@
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:user) { project.creator }
 
+  before do
+    stub_feature_flags(vue_issuables_list: false)
+  end
+
   shared_examples_for 'empty state with filters' do
     it 'user sees empty state with filters' do
       create(:issue, author: user, project: project)
diff --git a/spec/features/issues/user_sorts_issues_spec.rb b/spec/features/issues/user_sorts_issues_spec.rb
index ec38bf990351be59cae7f50a4a253e67196b6cce..91c6419b464bfb7226436c2406957abb5891faba 100644
--- a/spec/features/issues/user_sorts_issues_spec.rb
+++ b/spec/features/issues/user_sorts_issues_spec.rb
@@ -16,6 +16,8 @@
   let_it_be(:later_due_milestone) { create(:milestone, project: project, due_date: '2013-12-12') }
 
   before do
+    stub_feature_flags(vue_issuables_list: false)
+
     create_list(:award_emoji, 2, :upvote, awardable: issue1)
     create_list(:award_emoji, 2, :downvote, awardable: issue2)
     create(:award_emoji, :downvote, awardable: issue1)
diff --git a/spec/features/issues/user_views_issues_spec.rb b/spec/features/issues/user_views_issues_spec.rb
index 91de813e4149f6673a24d3d4018882259578fa16..44a8aae3ba67415f3f9939bd1b4479620f8e5abe 100644
--- a/spec/features/issues/user_views_issues_spec.rb
+++ b/spec/features/issues/user_views_issues_spec.rb
@@ -9,6 +9,10 @@
 
   let_it_be(:user) { create(:user) }
 
+  before do
+    stub_feature_flags(vue_issuables_list: false)
+  end
+
   shared_examples "opens issue from list" do
     it "opens issue" do
       click_link(issue.title)
@@ -116,4 +120,24 @@
   context "when not signed in" do
     include_examples "public project"
   end
+
+  context 'when vue_issuables_list feature is enabled', :js do
+    before do
+      stub_feature_flags(vue_issuables_list: true)
+    end
+
+    context 'when signed in' do
+      before do
+        project.add_developer(user)
+        sign_in(user)
+      end
+
+      include_examples "public project"
+      include_examples "internal project"
+    end
+
+    context 'when not signed in' do
+      include_examples "public project"
+    end
+  end
 end
diff --git a/spec/features/merge_request/maintainer_edits_fork_spec.rb b/spec/features/merge_request/maintainer_edits_fork_spec.rb
index 1d5e6e5560143a5e83c8cc3962b715da09e5ae9f..c0605ad7ff8d5549d5e86482f5d9aa4ad6b5354a 100644
--- a/spec/features/merge_request/maintainer_edits_fork_spec.rb
+++ b/spec/features/merge_request/maintainer_edits_fork_spec.rb
@@ -20,7 +20,7 @@
   end
 
   before do
-    stub_feature_flags(web_ide_default: false, single_mr_diff_view: false, code_navigation: false)
+    stub_feature_flags(web_ide_default: false, single_mr_diff_view: false)
 
     target_project.add_maintainer(user)
     sign_in(user)
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 7f819cac917747063d5d3a32fb110a7692ac3392..3032d115a00f94878d0c5aef91a44a0d7ef73ca6 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -13,10 +13,6 @@ def visit_blob(path, anchor: nil, ref: 'master')
     wait_for_requests
   end
 
-  before do
-    stub_feature_flags(code_navigation: false)
-  end
-
   context 'Ruby file' do
     before do
       visit_blob('files/ruby/popen.rb')
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 5851121f635782614092257ce1a8e14d983eb3ab..ab314d952d6b54a9f7cdc30aed042891bdd60e80 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -77,8 +77,6 @@ def fill_editor(content: 'class NextFeature\\nend\\n')
 
     context 'from blob file path' do
       before do
-        stub_feature_flags(code_navigation: false)
-
         visit project_blob_path(project, tree_join(branch, file_path))
       end
 
diff --git a/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb b/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
index 8d107e52db2247ad25d771bfe6b442d261d3dca3..a271a4f43a830d6ae01d495c8c0e439266744120 100644
--- a/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
+++ b/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
@@ -8,7 +8,6 @@
 
   shared_examples 'creating a file' do
     before do
-      stub_feature_flags(code_navigation: false)
       sign_in(user)
       visit project_path(project)
     end
diff --git a/spec/features/projects/files/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb
index 9c86f2dd190e65dbaaea7b34a0311532981306f7..2ae52bb9c3ab17946aef08ab2ec25ce70a5fb2e7 100644
--- a/spec/features/projects/files/user_creates_files_spec.rb
+++ b/spec/features/projects/files/user_creates_files_spec.rb
@@ -14,7 +14,7 @@
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(web_ide_default: false, code_navigation: false)
+    stub_feature_flags(web_ide_default: false)
 
     project.add_maintainer(user)
     sign_in(user)
diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
index 70f125560e0da340c6ddbe04ec9eb7dc719f101e..4df23b852ff0a39598fc1417dcf44ecc6d3cd473 100644
--- a/spec/features/projects/files/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -14,8 +14,6 @@
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(code_navigation: false)
-
     sign_in(user)
   end
 
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index 1d4085ef21ce7cf40c4dc0acda94a1ed2e7f3fe6..b11cf732c95d62efffb8384550c190a6df882f98 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -16,8 +16,6 @@
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(code_navigation: false)
-
     sign_in(user)
   end
 
diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
index 66d61e629dfa155d4b03766eb8c682209e5a5263..e64bea8ed67b8a08054bb88a3ba6fcd058c8b4f8 100644
--- a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -13,6 +13,10 @@
   let(:label_4) { create(:label, title: 'label_4', project: project, priority: 4) }
   let(:label_5) { create(:label, title: 'label_5', project: project) } # no priority
 
+  before do
+    stub_feature_flags(vue_issuables_list: false)
+  end
+
   # According to https://gitlab.com/gitlab-org/gitlab-foss/issues/14189#note_4360653
   context 'when issues have one label' do
     it 'Are sorted properly' do
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 0e33204f851aebf98eef42e6c72fd25aa33a0bea..d08faab3e6473f85bb54d87866dc22096a148eaf 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -65,19 +65,8 @@
           expect(page.find('.js-pipelines-tab-all .badge').text).to include('1')
         end
 
-        it 'shows a tab for Pending pipelines and count' do
-          expect(page.find('.js-pipelines-tab-pending').text).to include('Pending')
-          expect(page.find('.js-pipelines-tab-pending .badge').text).to include('0')
-        end
-
-        it 'shows a tab for Running pipelines and count' do
-          expect(page.find('.js-pipelines-tab-running').text).to include('Running')
-          expect(page.find('.js-pipelines-tab-running .badge').text).to include('1')
-        end
-
         it 'shows a tab for Finished pipelines and count' do
           expect(page.find('.js-pipelines-tab-finished').text).to include('Finished')
-          expect(page.find('.js-pipelines-tab-finished .badge').text).to include('0')
         end
 
         it 'shows a tab for Branches' do
@@ -89,9 +78,9 @@
         end
 
         it 'updates content when tab is clicked' do
-          page.find('.js-pipelines-tab-pending').click
+          page.find('.js-pipelines-tab-finished').click
           wait_for_requests
-          expect(page).to have_content('There are currently no pending pipelines.')
+          expect(page).to have_content('There are currently no finished pipelines.')
         end
       end
 
diff --git a/spec/features/projects/user_sees_sidebar_spec.rb b/spec/features/projects/user_sees_sidebar_spec.rb
index cc2a9eacbadae4be8f67b8bafc88c1d29fbfdb47..1d443e0b339107772ac98faa77c345f0ee5ef520 100644
--- a/spec/features/projects/user_sees_sidebar_spec.rb
+++ b/spec/features/projects/user_sees_sidebar_spec.rb
@@ -6,6 +6,10 @@
   let(:user) { create(:user) }
   let(:project) { create(:project, :private, public_builds: false, namespace: user.namespace) }
 
+  before do
+    stub_feature_flags(vue_issuables_list: false)
+  end
+
   # NOTE: See documented behaviour https://design.gitlab.com/regions/navigation#contextual-navigation
   context 'on different viewports', :js do
     include MobileHelpers
diff --git a/spec/frontend/alert_management/components/alert_management_list_spec.js b/spec/frontend/alert_management/components/alert_management_list_spec.js
index 456e5ecb2c2770c1c9b613f9a0728308e6eb1b2e..284fd078ab320b1385950ef33d1b8b18f3b34b3d 100644
--- a/spec/frontend/alert_management/components/alert_management_list_spec.js
+++ b/spec/frontend/alert_management/components/alert_management_list_spec.js
@@ -289,7 +289,6 @@ describe('AlertManagementList', () => {
                   iid: 1,
                   status: 'acknowledged',
                   startedAt: '2020-03-17T23:18:14.996Z',
-                  endedAt: '2020-04-17T23:18:14.996Z',
                   severity: 'high',
                   assignees: { nodes: [] },
                 },
@@ -300,7 +299,7 @@ describe('AlertManagementList', () => {
           },
           loading: false,
         });
-        expect(findDateFields().length).toBe(2);
+        expect(findDateFields().length).toBe(1);
       });
 
       it('should not display time ago dates when values not provided', () => {
@@ -312,7 +311,6 @@ describe('AlertManagementList', () => {
                 iid: 1,
                 status: 'acknowledged',
                 startedAt: null,
-                endedAt: null,
                 severity: 'high',
               },
             ],
diff --git a/spec/frontend/helpers/monitor_helper_spec.js b/spec/frontend/helpers/monitor_helper_spec.js
index f7163d496d243f0043152d680105086449b882a1..083b640412505675671bf549715a3e98f1dab0bd 100644
--- a/spec/frontend/helpers/monitor_helper_spec.js
+++ b/spec/frontend/helpers/monitor_helper_spec.js
@@ -33,15 +33,6 @@ describe('monitor helper', () => {
       ]);
     });
 
-    it('excludes NaN values', () => {
-      expect(
-        monitorHelper.makeDataSeries(
-          data({ metric: {}, values: [[1, 1], [2, NaN]] }),
-          defaultConfig,
-        ),
-      ).toEqual([{ ...expectedDataSeries[0], data: [[1, 1]] }]);
-    });
-
     it('updates series name from templates', () => {
       const config = {
         ...defaultConfig,
diff --git a/spec/frontend/monitoring/store/utils_spec.js b/spec/frontend/monitoring/store/utils_spec.js
index 61b97bb80205ac1b2c84be545ce1cd7b28bcdff2..77db9bad5b1636a3b003369bc58db3fb8eb45ad4 100644
--- a/spec/frontend/monitoring/store/utils_spec.js
+++ b/spec/frontend/monitoring/store/utils_spec.js
@@ -815,6 +815,50 @@ describe('normalizeQueryResponseData', () => {
       },
     ]);
   });
+
+  it('processes a scalar result with a NaN result', () => {
+    // Queries may return "NaN" string values.
+    // e.g. when Prometheus cannot find a metric the query
+    // `scalar(does_not_exist)` will return a "NaN" value.
+
+    const mockScalar = {
+      resultType: 'scalar',
+      result: [1435781451.781, 'NaN'],
+    };
+
+    expect(normalizeQueryResponseData(mockScalar)).toEqual([
+      {
+        metric: {},
+        value: ['2015-07-01T20:10:51.781Z', NaN],
+        values: [['2015-07-01T20:10:51.781Z', NaN]],
+      },
+    ]);
+  });
+
+  it('processes a matrix result with a "NaN" value', () => {
+    // Queries may return "NaN" string values.
+    const mockMatrix = {
+      resultType: 'matrix',
+      result: [
+        {
+          metric: {
+            __name__: 'up',
+            job: 'prometheus',
+            instance: 'localhost:9090',
+          },
+          values: [[1435781430.781, '1'], [1435781460.781, 'NaN']],
+        },
+      ],
+    };
+
+    expect(normalizeQueryResponseData(mockMatrix)).toEqual([
+      {
+        metric: { __name__: 'up', instance: 'localhost:9090', job: 'prometheus' },
+        value: ['2015-07-01T20:11:00.781Z', NaN],
+        values: [['2015-07-01T20:10:30.781Z', 1], ['2015-07-01T20:11:00.781Z', NaN]],
+      },
+    ]);
+  });
 });
 
 describe('normalizeCustomDashboardPath', () => {
diff --git a/spec/frontend/pipelines/components/dag/dag_spec.js b/spec/frontend/pipelines/components/dag/dag_spec.js
index 015076c5691ca8a5463bad78743bc4c52b24be4d..7bb760be3a848e450c46f6580735659fb27066db 100644
--- a/spec/frontend/pipelines/components/dag/dag_spec.js
+++ b/spec/frontend/pipelines/components/dag/dag_spec.js
@@ -2,7 +2,7 @@ import { mount, shallowMount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import waitForPromises from 'helpers/wait_for_promises';
-import { GlAlert } from '@gitlab/ui';
+import { GlAlert, GlEmptyState } from '@gitlab/ui';
 import Dag from '~/pipelines/components/dag/dag.vue';
 import DagGraph from '~/pipelines/components/dag/dag_graph.vue';
 import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue';
@@ -16,7 +16,14 @@ import {
   LOAD_FAILURE,
   UNSUPPORTED_DATA,
 } from '~/pipelines/components/dag//constants';
-import { mockBaseData, tooSmallGraph, unparseableGraph, singleNote, multiNote } from './mock_data';
+import {
+  mockBaseData,
+  tooSmallGraph,
+  unparseableGraph,
+  graphWithoutDependencies,
+  singleNote,
+  multiNote,
+} from './mock_data';
 
 describe('Pipeline DAG graph wrapper', () => {
   let wrapper;
@@ -26,6 +33,7 @@ describe('Pipeline DAG graph wrapper', () => {
   const getGraph = () => wrapper.find(DagGraph);
   const getNotes = () => wrapper.find(DagAnnotations);
   const getErrorText = type => wrapper.vm.$options.errorTexts[type];
+  const getEmptyState = () => wrapper.find(GlEmptyState);
 
   const dataPath = '/root/test/pipelines/90/dag.json';
 
@@ -35,7 +43,11 @@ describe('Pipeline DAG graph wrapper', () => {
     }
 
     wrapper = method(Dag, {
-      propsData,
+      propsData: {
+        emptySvgPath: '/my-svg',
+        dagDocPath: '/my-doc',
+        ...propsData,
+      },
       data() {
         return {
           showFailureAlert: false,
@@ -64,6 +76,10 @@ describe('Pipeline DAG graph wrapper', () => {
       expect(getAlert().text()).toBe(getErrorText(DEFAULT));
       expect(getGraph().exists()).toBe(false);
     });
+
+    it('does not render the empty state', () => {
+      expect(getEmptyState().exists()).toBe(false);
+    });
   });
 
   describe('when there is a dataUrl', () => {
@@ -83,6 +99,10 @@ describe('Pipeline DAG graph wrapper', () => {
             expect(getGraph().exists()).toBe(false);
           });
       });
+
+      it('does not render the empty state', () => {
+        expect(getEmptyState().exists()).toBe(false);
+      });
     });
 
     describe('the data fetch succeeds but the parse fails', () => {
@@ -101,6 +121,10 @@ describe('Pipeline DAG graph wrapper', () => {
             expect(getGraph().exists()).toBe(false);
           });
       });
+
+      it('does not render the empty state', () => {
+        expect(getEmptyState().exists()).toBe(false);
+      });
     });
 
     describe('and the data fetch and parse succeeds', () => {
@@ -119,6 +143,15 @@ describe('Pipeline DAG graph wrapper', () => {
             expect(getGraph().exists()).toBe(true);
           });
       });
+
+      it('does not render the empty state', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getEmptyState().exists()).toBe(false);
+          });
+      });
     });
 
     describe('the data fetch and parse succeeds, but the resulting graph is too small', () => {
@@ -137,6 +170,42 @@ describe('Pipeline DAG graph wrapper', () => {
             expect(getGraph().exists()).toBe(false);
           });
       });
+
+      it('does not show the empty dag graph state', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getEmptyState().exists()).toBe(false);
+          });
+      });
+    });
+
+    describe('the data fetch and parse succeeds, but the resulting graph is empty', () => {
+      beforeEach(() => {
+        mock.onGet(dataPath).replyOnce(200, graphWithoutDependencies);
+        createComponent({ graphUrl: dataPath }, mount);
+      });
+
+      it('does not render an error alert or the graph', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getAllAlerts().length).toBe(1);
+            expect(getAlert().text()).toContain('This feature is currently in beta.');
+            expect(getGraph().exists()).toBe(false);
+          });
+      });
+
+      it('shows the empty dag graph state', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getEmptyState().exists()).toBe(true);
+          });
+      });
     });
   });
 
diff --git a/spec/frontend/pipelines/components/dag/mock_data.js b/spec/frontend/pipelines/components/dag/mock_data.js
index e1733736755f9fa648706d1730a3c5e09c8040cb..3b39b9cd21cfc43554d22133560fc58da1912b40 100644
--- a/spec/frontend/pipelines/components/dag/mock_data.js
+++ b/spec/frontend/pipelines/components/dag/mock_data.js
@@ -83,6 +83,46 @@ export const tooSmallGraph = {
   ],
 };
 
+export const graphWithoutDependencies = {
+  stages: [
+    {
+      name: 'test',
+      groups: [
+        {
+          name: 'jest',
+          size: 2,
+          jobs: [{ name: 'jest 1/2' }, { name: 'jest 2/2' }],
+        },
+        {
+          name: 'rspec',
+          size: 1,
+          jobs: [{ name: 'rspec' }],
+        },
+      ],
+    },
+    {
+      name: 'fixtures',
+      groups: [
+        {
+          name: 'frontend fixtures',
+          size: 1,
+          jobs: [{ name: 'frontend fixtures' }],
+        },
+      ],
+    },
+    {
+      name: 'un-needed',
+      groups: [
+        {
+          name: 'un-needed',
+          size: 1,
+          jobs: [{ name: 'un-needed' }],
+        },
+      ],
+    },
+  ],
+};
+
 export const unparseableGraph = [
   {
     name: 'test',
diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js
index 1bd630507aa6684b9ed314d8aad9acee6ebf87c2..66446b9aa1d03831f25f0ccd6222bdcfac8708e1 100644
--- a/spec/frontend/pipelines/pipelines_spec.js
+++ b/spec/frontend/pipelines/pipelines_spec.js
@@ -343,12 +343,8 @@ describe('Pipelines', () => {
       });
 
       it('should render navigation tabs', () => {
-        expect(wrapper.find('.js-pipelines-tab-pending').text()).toContain('Pending');
-
         expect(wrapper.find('.js-pipelines-tab-all').text()).toContain('All');
 
-        expect(wrapper.find('.js-pipelines-tab-running').text()).toContain('Running');
-
         expect(wrapper.find('.js-pipelines-tab-finished').text()).toContain('Finished');
 
         expect(wrapper.find('.js-pipelines-tab-branches').text()).toContain('Branches');
@@ -452,8 +448,6 @@ describe('Pipelines', () => {
       it('returns default tabs', () => {
         expect(wrapper.vm.tabs).toEqual([
           { name: 'All', scope: 'all', count: undefined, isActive: true },
-          { name: 'Pending', scope: 'pending', count: undefined, isActive: false },
-          { name: 'Running', scope: 'running', count: undefined, isActive: false },
           { name: 'Finished', scope: 'finished', count: undefined, isActive: false },
           { name: 'Branches', scope: 'branches', isActive: false },
           { name: 'Tags', scope: 'tags', isActive: false },
@@ -462,11 +456,11 @@ describe('Pipelines', () => {
     });
 
     describe('emptyTabMessage', () => {
-      it('returns message with scope', () => {
-        wrapper.vm.scope = 'pending';
+      it('returns message with finished scope', () => {
+        wrapper.vm.scope = 'finished';
 
         return wrapper.vm.$nextTick().then(() => {
-          expect(wrapper.vm.emptyTabMessage).toEqual('There are currently no pending pipelines.');
+          expect(wrapper.vm.emptyTabMessage).toEqual('There are currently no finished pipelines.');
         });
       });
 
diff --git a/spec/frontend/registry/shared/components/__snapshots__/expiration_policy_fields_spec.js.snap b/spec/frontend/registry/shared/components/__snapshots__/expiration_policy_fields_spec.js.snap
index a9034b81d2f0f12008b933811315012861a73953..2d4f920ef3a0c324ede0df12656754e8e076eeee 100644
--- a/spec/frontend/registry/shared/components/__snapshots__/expiration_policy_fields_spec.js.snap
+++ b/spec/frontend/registry/shared/components/__snapshots__/expiration_policy_fields_spec.js.snap
@@ -16,9 +16,7 @@ exports[`Expiration Policy Form renders 1`] = `
     >
       <gl-toggle-stub
         id="expiration-policy-toggle"
-        labeloff="Toggle Status: OFF"
-        labelon="Toggle Status: ON"
-        labelposition="hidden"
+        labelposition="top"
       />
        
       <span
diff --git a/spec/frontend/reports/components/grouped_test_reports_app_spec.js b/spec/frontend/reports/components/grouped_test_reports_app_spec.js
index 6a402277f52b7c6ba047d66712b3702d138684d5..f4b21493a29f7743ca30193ae58f514e3e817663 100644
--- a/spec/frontend/reports/components/grouped_test_reports_app_spec.js
+++ b/spec/frontend/reports/components/grouped_test_reports_app_spec.js
@@ -15,20 +15,29 @@ localVue.use(Vuex);
 
 describe('Grouped test reports app', () => {
   const endpoint = 'endpoint.json';
+  const pipelinePath = '/path/to/pipeline';
   const Component = localVue.extend(GroupedTestReportsApp);
   let wrapper;
   let mockStore;
 
-  const mountComponent = () => {
+  const mountComponent = ({
+    glFeatures = { junitPipelineView: false },
+    props = { pipelinePath },
+  } = {}) => {
     wrapper = mount(Component, {
       store: mockStore,
       localVue,
       propsData: {
         endpoint,
+        pipelinePath,
+        ...props,
       },
       methods: {
         fetchReports: () => {},
       },
+      provide: {
+        glFeatures,
+      },
     });
   };
 
@@ -39,6 +48,7 @@ describe('Grouped test reports app', () => {
   };
 
   const findHeader = () => wrapper.find('[data-testid="report-section-code-text"]');
+  const findFullTestReportLink = () => wrapper.find('[data-testid="group-test-reports-full-link"]');
   const findSummaryDescription = () => wrapper.find('[data-testid="test-summary-row-description"]');
   const findIssueDescription = () => wrapper.find('[data-testid="test-issue-body-description"]');
   const findAllIssueDescriptions = () =>
@@ -67,6 +77,38 @@ describe('Grouped test reports app', () => {
     });
   });
 
+  describe('`View full report` button', () => {
+    it('should not render the full test report link', () => {
+      expect(findFullTestReportLink().exists()).toBe(false);
+    });
+
+    describe('With junitPipelineView feature flag enabled', () => {
+      beforeEach(() => {
+        mountComponent({ glFeatures: { junitPipelineView: true } });
+      });
+
+      it('should render the full test report link', () => {
+        const fullTestReportLink = findFullTestReportLink();
+
+        expect(fullTestReportLink.exists()).toBe(true);
+        expect(fullTestReportLink.attributes('href')).toBe(`${pipelinePath}/test_report`);
+      });
+    });
+
+    describe('Without a pipelinePath', () => {
+      beforeEach(() => {
+        mountComponent({
+          glFeatures: { junitPipelineView: true },
+          props: { pipelinePath: '' },
+        });
+      });
+
+      it('should not render the full test report link', () => {
+        expect(findFullTestReportLink().exists()).toBe(false);
+      });
+    });
+  });
+
   describe('with new failed result', () => {
     beforeEach(() => {
       setReports(newFailedTestReports);
diff --git a/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap b/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap
index f7a9827a9ad058f50dd4da16875338f6193a415f..f4ac2f57261b4b10c9983523bb745b935895fa32 100644
--- a/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap
+++ b/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap
@@ -47,9 +47,7 @@ exports[`self monitor component When the self monitor project has not been creat
         label-for="self-monitor-toggle"
       >
         <gl-toggle-stub
-          labeloff="Toggle Status: OFF"
-          labelon="Toggle Status: ON"
-          labelposition="hidden"
+          labelposition="top"
           name="self-monitor-toggle"
         />
       </gl-form-group-stub>
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/mock_data.js b/spec/frontend/vue_shared/components/rich_content_editor/mock_data.js
index 5d7695e96640e1b132252615f34a16091fbc6dc0..f6d2717e117ef7085a3994e0c29a16a65d71267b 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/mock_data.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/mock_data.js
@@ -6,6 +6,27 @@ const buildMockTextNode = literal => {
   };
 };
 
+const buildMockTextNodeWithAdjacentInlineCode = isForward => {
+  const direction = isForward ? 'next' : 'prev';
+  const literalOpen = '[';
+  const literalClose = ' file]: https://file.com/file.md';
+  return {
+    literal: isForward ? literalOpen : literalClose,
+    type: 'text',
+    [direction]: {
+      literal: 'raw',
+      tickCount: 1,
+      type: 'code',
+      [direction]: {
+        literal: isForward ? literalClose : literalOpen,
+        [direction]: {
+          literal: null,
+        },
+      },
+    },
+  };
+};
+
 const buildMockListNode = literal => {
   return {
     firstChild: {
@@ -23,6 +44,9 @@ export const kramdownListNode = buildMockListNode('TOC');
 export const normalListNode = buildMockListNode('Just another bullet point');
 
 export const kramdownTextNode = buildMockTextNode('{:toc}');
+export const identifierTextNode = buildMockTextNode('[Some text]: https://link.com');
+export const identifierInlineCodeTextEnteringNode = buildMockTextNodeWithAdjacentInlineCode(true);
+export const identifierInlineCodeTextExitingNode = buildMockTextNodeWithAdjacentInlineCode(false);
 export const normalTextNode = buildMockTextNode('This is just normal text.');
 
 const uneditableOpenToken = {
@@ -40,4 +64,5 @@ export const originToken = {
   content: '{:.no_toc .hidden-md .hidden-lg}',
 };
 export const uneditableOpenTokens = [uneditableOpenToken, originToken];
+export const uneditableCloseTokens = [originToken, uneditableCloseToken];
 export const uneditableTokens = [...uneditableOpenTokens, uneditableCloseToken];
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js
index 2daca6500c5e31b42a8c0815e497341be0ce9f03..51a42e0ff26aaa6c56a7012d2f17a6ebaa5f09cb 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token_spec.js
@@ -1,6 +1,7 @@
 import {
   buildUneditableOpenTokens,
   buildUneditableCloseToken,
+  buildUneditableCloseTokens,
   buildUneditableTokens,
 } from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token';
 
@@ -8,6 +9,7 @@ import {
   originToken,
   uneditableOpenTokens,
   uneditableCloseToken,
+  uneditableCloseTokens,
   uneditableTokens,
 } from '../../mock_data';
 
@@ -27,6 +29,15 @@ describe('Build Uneditable Token renderer helper', () => {
     });
   });
 
+  describe('buildUneditableCloseTokens', () => {
+    it('returns a 2-item array of tokens with the originToken prepended to a close token', () => {
+      const result = buildUneditableCloseTokens(originToken);
+
+      expect(result).toHaveLength(2);
+      expect(result).toStrictEqual(uneditableCloseTokens);
+    });
+  });
+
   describe('buildUneditableTokens', () => {
     it('returns a 3-item array of tokens with the originToken wrapped in the middle', () => {
       const result = buildUneditableTokens(originToken);
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text_spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..257a37d1af80c5a1608ec2deea1b9d6ee473cea1
--- /dev/null
+++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text_spec.js
@@ -0,0 +1,61 @@
+import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text';
+import {
+  buildUneditableOpenTokens,
+  buildUneditableCloseTokens,
+  buildUneditableTokens,
+} from '~/vue_shared/components/rich_content_editor/services/renderers//build_uneditable_token';
+
+import {
+  identifierTextNode,
+  identifierInlineCodeTextEnteringNode,
+  identifierInlineCodeTextExitingNode,
+  normalTextNode,
+} from '../../mock_data';
+
+describe('Render Identifier Text renderer', () => {
+  describe('canRender', () => {
+    it('should return true when the argument `literal` has identifier syntax', () => {
+      expect(renderer.canRender(identifierTextNode)).toBe(true);
+    });
+
+    it('should return true when the argument `literal` has identifier syntax and forward adjacent inline code', () => {
+      expect(renderer.canRender(identifierInlineCodeTextEnteringNode)).toBe(true);
+    });
+
+    it('should return true when the argument `literal` has identifier syntax and backward adjacent inline code', () => {
+      expect(renderer.canRender(identifierInlineCodeTextExitingNode)).toBe(true);
+    });
+
+    it('should return false when the argument `literal` lacks identifier syntax', () => {
+      expect(renderer.canRender(normalTextNode)).toBe(false);
+    });
+  });
+
+  describe('render', () => {
+    const origin = jest.fn();
+
+    it('should return uneditable tokens for basic identifier syntax', () => {
+      const context = { origin };
+
+      expect(renderer.render(identifierTextNode, context)).toStrictEqual(
+        buildUneditableTokens(origin()),
+      );
+    });
+
+    it('should return uneditable open tokens for non-basic inline code identifier syntax when entering', () => {
+      const context = { origin };
+
+      expect(renderer.render(identifierInlineCodeTextEnteringNode, context)).toStrictEqual(
+        buildUneditableOpenTokens(origin()),
+      );
+    });
+
+    it('should return uneditable close tokens for non-basic inline code identifier syntax when exiting', () => {
+      const context = { origin };
+
+      expect(renderer.render(identifierInlineCodeTextExitingNode, context)).toStrictEqual(
+        buildUneditableCloseTokens(origin()),
+      );
+    });
+  });
+});
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js
index 8b8a8459ca2a1956fa50ea4adb63110591e569b4..8199cb9ef7b176ceb16a9423530867a725cb8880 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_list_spec.js
@@ -23,13 +23,17 @@ describe('Render Kramdown List renderer', () => {
     it('should return uneditable open tokens when entering', () => {
       const context = { entering: true, origin };
 
-      expect(renderer.render(context)).toStrictEqual(buildUneditableOpenTokens(origin()));
+      expect(renderer.render(kramdownListNode, context)).toStrictEqual(
+        buildUneditableOpenTokens(origin()),
+      );
     });
 
     it('should return an uneditable close tokens when exiting', () => {
       const context = { entering: false, origin };
 
-      expect(renderer.render(context)).toStrictEqual(buildUneditableCloseToken(origin()));
+      expect(renderer.render(kramdownListNode, context)).toStrictEqual(
+        buildUneditableCloseToken(origin()),
+      );
     });
   });
 });
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js
index d52febad43644d3c49a5dbf300bfe006f3e53a8a..65015c4e5488000cad4d2c90f8659eba6f1c72be 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_kramdown_text_spec.js
@@ -20,7 +20,9 @@ describe('Render Kramdown Text renderer', () => {
     it('should return uneditable tokens', () => {
       const context = { origin };
 
-      expect(renderer.render(context)).toStrictEqual(buildUneditableTokens(origin()));
+      expect(renderer.render(kramdownTextNode, context)).toStrictEqual(
+        buildUneditableTokens(origin()),
+      );
     });
   });
 });
diff --git a/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
index 706a54931ea7d61fadd5f950af80ef6d7975e1dd..8af3868ba9849c2b7bda295208c5ab269745199d 100644
--- a/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
+++ b/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
@@ -3,26 +3,31 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::ResolvesIssuable do
+  include GraphqlHelpers
+
   let_it_be(:mutation_class) do
     Class.new(Mutations::BaseMutation) do
       include Mutations::ResolvesIssuable
     end
   end
 
-  let_it_be(:project)  { create(:project) }
+  let_it_be(:project)  { create(:project, :empty_repo) }
   let_it_be(:user)     { create(:user) }
   let_it_be(:context)  { { current_user: user } }
-  let_it_be(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
+  let(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
   let(:parent) { issuable.project }
 
+  let_it_be(:issue) { create(:issue, project: project) }
+  let_it_be(:merge_request) { create(:merge_request, source_project: project) }
+
   context 'with issues' do
-    let(:issuable) { create(:issue, project: project) }
+    let(:issuable) { issue }
 
     it_behaves_like 'resolving an issuable in GraphQL', :issue
   end
 
   context 'with merge requests' do
-    let(:issuable) { create(:merge_request, source_project: project) }
+    let(:issuable) { merge_request }
 
     it_behaves_like 'resolving an issuable in GraphQL', :merge_request
   end
diff --git a/spec/graphql/resolvers/issues_resolver_spec.rb b/spec/graphql/resolvers/issues_resolver_spec.rb
index c01840b94d59dc7bcb155fcfc9c2f66c426122bb..eb17e94a450172f9236241e045147f92d98a9db6 100644
--- a/spec/graphql/resolvers/issues_resolver_spec.rb
+++ b/spec/graphql/resolvers/issues_resolver_spec.rb
@@ -101,12 +101,10 @@
         end
 
         it 'uses project search optimization' do
-          expected_arguments = {
+          expected_arguments = a_hash_including(
             search: 'foo',
-            attempt_project_search_optimizations: true,
-            iids: [],
-            project_id: project.id
-          }
+            attempt_project_search_optimizations: true
+          )
           expect(IssuesFinder).to receive(:new).with(anything, expected_arguments).and_call_original
 
           resolve_issues(search: 'foo')
@@ -217,16 +215,32 @@
         expect(resolve_issues).to contain_exactly(issue1, issue2)
       end
 
-      it 'finds a specific issue with iid' do
-        expect(resolve_issues(iid: issue1.iid)).to contain_exactly(issue1)
+      it 'finds a specific issue with iid', :request_store do
+        result = batch_sync(max_queries: 2) { resolve_issues(iid: issue1.iid) }
+
+        expect(result).to contain_exactly(issue1)
+      end
+
+      it 'batches queries that only include IIDs', :request_store do
+        result = batch_sync(max_queries: 2) do
+          resolve_issues(iid: issue1.iid) + resolve_issues(iids: issue2.iid)
+        end
+
+        expect(result).to contain_exactly(issue1, issue2)
       end
 
-      it 'finds a specific issue with iids' do
-        expect(resolve_issues(iids: issue1.iid)).to contain_exactly(issue1)
+      it 'finds a specific issue with iids', :request_store do
+        result = batch_sync(max_queries: 2) do
+          resolve_issues(iids: [issue1.iid])
+        end
+
+        expect(result).to contain_exactly(issue1)
       end
 
       it 'finds multiple issues with iids' do
-        expect(resolve_issues(iids: [issue1.iid, issue2.iid]))
+        create(:issue, project: project, author: current_user)
+
+        expect(batch_sync { resolve_issues(iids: [issue1.iid, issue2.iid]) })
           .to contain_exactly(issue1, issue2)
       end
 
@@ -238,7 +252,7 @@
           create(:issue, project: another_project, iid: iid)
         end
 
-        expect(resolve_issues(iids: iids)).to contain_exactly(issue1, issue2)
+        expect(batch_sync { resolve_issues(iids: iids) }).to contain_exactly(issue1, issue2)
       end
     end
   end
diff --git a/spec/graphql/resolvers/merge_requests_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
index ddf19acd8aa89d341228fbebd4d1570c3059afe9..0a8fd82613a14b15979036c067e5ee8e7aff110c 100644
--- a/spec/graphql/resolvers/merge_requests_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
@@ -22,9 +22,12 @@
 
   before do
     project.add_developer(current_user)
+    other_project.add_developer(current_user)
   end
 
   describe '#resolve' do
+    let(:queries_per_project) { 3 }
+
     context 'no arguments' do
       it 'returns all merge requests' do
         result = resolve_mr(project, {})
@@ -40,24 +43,34 @@
     end
 
     context 'by iid alone' do
-      it 'batch-resolves by target project full path and individual IID' do
-        result = batch_sync(max_queries: 2) do
+      it 'batch-resolves by target project full path and individual IID', :request_store do
+        # 1 query for project_authorizations, and 1 for merge_requests
+        result = batch_sync(max_queries: queries_per_project) do
           [iid_1, iid_2].map { |iid| resolve_mr_single(project, iid) }
         end
 
         expect(result).to contain_exactly(merge_request_1, merge_request_2)
       end
 
-      it 'batch-resolves by target project full path and IIDS' do
-        result = batch_sync(max_queries: 2) do
+      it 'batch-resolves by target project full path and IIDS', :request_store do
+        result = batch_sync(max_queries: queries_per_project) do
           resolve_mr(project, iids: [iid_1, iid_2])
         end
 
         expect(result).to contain_exactly(merge_request_1, merge_request_2)
       end
 
+      it 'batch-resolves by target project full path and IIDS, single or plural', :request_store do
+        result = batch_sync(max_queries: queries_per_project) do
+          [resolve_mr_single(project, merge_request_3.iid), *resolve_mr(project, iids: [iid_1, iid_2])]
+        end
+
+        expect(result).to contain_exactly(merge_request_1, merge_request_2, merge_request_3)
+      end
+
       it 'can batch-resolve merge requests from different projects' do
-        result = batch_sync(max_queries: 3) do
+        # 2 queries for project_authorizations, and 2 for merge_requests
+        result = batch_sync(max_queries: queries_per_project * 2) do
           resolve_mr(project, iids: iid_1) +
             resolve_mr(project, iids: iid_2) +
             resolve_mr(other_project, iids: other_iid)
diff --git a/spec/graphql/types/project_statistics_type_spec.rb b/spec/graphql/types/project_statistics_type_spec.rb
index e1c2089c088cc25526d8c7b2ea547b4a06feecee..e6cffd407de512f926f3cbe4fe96a982d986c308 100644
--- a/spec/graphql/types/project_statistics_type_spec.rb
+++ b/spec/graphql/types/project_statistics_type_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe GitlabSchema.types['ProjectStatistics'] do
-  it "has all the required fields" do
+  it 'has all the required fields' do
     expect(described_class).to have_graphql_fields(:storage_size, :repository_size, :lfs_objects_size,
                                        :build_artifacts_size, :packages_size, :commit_count,
-                                       :wiki_size)
+                                       :wiki_size, :snippets_size)
   end
 end
diff --git a/spec/helpers/projects/alert_management_helper_spec.rb b/spec/helpers/projects/alert_management_helper_spec.rb
index efd48ababa127d80cf108a19a161ba219282b9f7..8a9ace09bcab716e3463ca59eb22c71489aad1c9 100644
--- a/spec/helpers/projects/alert_management_helper_spec.rb
+++ b/spec/helpers/projects/alert_management_helper_spec.rb
@@ -19,7 +19,7 @@
     before do
       allow(helper)
         .to receive(:can?)
-        .with(current_user, :admin_project, project)
+        .with(current_user, :admin_operations, project)
         .and_return(user_can_enable_alert_management)
     end
 
diff --git a/spec/lib/gitlab/alert_management/alert_params_spec.rb b/spec/lib/gitlab/alert_management/alert_params_spec.rb
index bb42caebb28b5cd37c494e62e2d51cb4e3279280..393838ab042437c91d3fb1790c1dc9bcca4f8c1c 100644
--- a/spec/lib/gitlab/alert_management/alert_params_spec.rb
+++ b/spec/lib/gitlab/alert_management/alert_params_spec.rb
@@ -88,7 +88,9 @@
         payload: payload,
         started_at: parsed_alert.starts_at,
         ended_at: parsed_alert.ends_at,
-        fingerprint: parsed_alert.gitlab_fingerprint
+        fingerprint: parsed_alert.gitlab_fingerprint,
+        environment: parsed_alert.environment,
+        prometheus_alert: parsed_alert.gitlab_alert
       )
     end
   end
diff --git a/spec/lib/gitlab/graphql/loaders/issuable_loader_spec.rb b/spec/lib/gitlab/graphql/loaders/issuable_loader_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..180966de8958eb7cc8e094e24c9275262a3c12b4
--- /dev/null
+++ b/spec/lib/gitlab/graphql/loaders/issuable_loader_spec.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Graphql::Loaders::IssuableLoader do
+  subject { described_class.new(parent, finder) }
+
+  let(:params) { HashWithIndifferentAccess.new }
+
+  describe '#find_all' do
+    let(:finder) { double(:finder, params: params, execute: %i[x y z]) }
+
+    where(:factory, :param_name) do
+      %i[project group].map { |thing| [thing, :"#{thing}_id"] }
+    end
+
+    with_them do
+      let(:parent) { build_stubbed(factory) }
+
+      it 'assignes the parent parameter, and batching_find_alls the finder' do
+        expect(subject.find_all).to contain_exactly(:x, :y, :z)
+        expect(params).to include(param_name => parent)
+      end
+    end
+
+    context 'the parent is of an unexpected type' do
+      let(:parent) { build(:merge_request) }
+
+      it 'raises an error if we pass an unexpected parent' do
+        expect { subject.find_all }.to raise_error(/Unexpected parent/)
+      end
+    end
+  end
+
+  describe '#batching_find_all' do
+    context 'the finder params are anything other than [iids]' do
+      let(:finder) { double(:finder, params: params, execute: [:foo]) }
+      let(:parent) { build_stubbed(:project) }
+
+      it 'batching_find_alls the finder, setting the correct parent parameter' do
+        expect(subject.batching_find_all).to eq([:foo])
+        expect(params[:project_id]).to eq(parent)
+      end
+
+      it 'allows a post-process block' do
+        expect(subject.batching_find_all(&:first)).to eq(:foo)
+      end
+    end
+
+    context 'the finder params are exactly [iids]' do
+      # Dumb finder class, that only implements what we need, and has
+      # predictable query counts.
+      let(:finder_class) do
+        Class.new do
+          attr_reader :current_user, :params
+
+          def initialize(user, args)
+            @current_user = user
+            @params = HashWithIndifferentAccess.new(args.to_h)
+          end
+
+          def execute
+            params[:project_id].issues.where(iid: params[:iids])
+          end
+        end
+      end
+
+      it 'batches requests' do
+        issue_a = create(:issue)
+        issue_b = create(:issue)
+        issue_c = create(:issue, project: issue_a.project)
+        proj_1 = issue_a.project
+        proj_2 = issue_b.project
+        user = create(:user, developer_projects: [proj_1, proj_2])
+
+        finder_a = finder_class.new(user, iids: [issue_a.iid])
+        finder_b = finder_class.new(user, iids: [issue_b.iid])
+        finder_c = finder_class.new(user, iids: [issue_c.iid])
+
+        results = []
+
+        expect do
+          results.concat(described_class.new(proj_1, finder_a).batching_find_all)
+          results.concat(described_class.new(proj_2, finder_b).batching_find_all)
+          results.concat(described_class.new(proj_1, finder_c).batching_find_all)
+        end.not_to exceed_query_limit(0)
+
+        expect do
+          results = results.map(&:sync)
+        end.not_to exceed_query_limit(2)
+
+        expect(results).to contain_exactly(issue_a, issue_b, issue_c)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb b/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
index b690dfaed8f5a4411bc406006ec84450490939a7..89d2ab8bb877d3e349bde13469474cd0be954323 100644
--- a/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
+++ b/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
@@ -17,9 +17,27 @@
     end
 
     context 'feature flag enabled by default' do
+      let(:monotonic_time_before) { 42 }
+      let(:monotonic_time_after) { 500 }
+      let(:monotonic_time_duration) { monotonic_time_after - monotonic_time_before }
+
       it 'enables the analyzer' do
         expect(subject.analyze?(anything)).to be_truthy
       end
+
+      it 'returns a duration in seconds' do
+        allow(GraphQL::Analysis).to receive(:analyze_query).and_return([4, 2])
+        allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after)
+        allow(Gitlab::GraphqlLogger).to receive(:info)
+
+        expected_duration = monotonic_time_duration
+        memo = subject.initial_value(spy('query'))
+
+        subject.final_value(memo)
+
+        expect(memo).to have_key(:duration_s)
+        expect(memo[:duration_s]).to eq(expected_duration)
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 6635d27deb6f02629e20d806b6ac283277475d3d..c1ecc4afe69bf6d72125a1f42d5af348f8b03703 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -228,6 +228,7 @@ ci_pipelines:
 - latest_builds
 - daily_report_results
 - latest_builds_report_results
+- messages
 ci_refs:
 - project
 - ci_pipelines
diff --git a/spec/lib/gitlab/metrics/dashboard/finder_spec.rb b/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
index d50a08801ff11cd00113c26751a325d2376df223..678030531ed2adec3725d43d648b0d84da661e82 100644
--- a/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
@@ -118,7 +118,7 @@
   end
 
   describe '.find_raw' do
-    let(:dashboard) { YAML.load_file(Rails.root.join('config', 'prometheus', 'common_metrics.yml')) }
+    let(:dashboard) { load_dashboard_yaml(File.read(Rails.root.join('config', 'prometheus', 'common_metrics.yml'))) }
     let(:params) { {} }
 
     subject { described_class.find_raw(project, **params) }
@@ -132,7 +132,7 @@
     end
 
     context 'when an existing project dashboard is specified' do
-      let(:dashboard) { YAML.safe_load(fixture_file('lib/gitlab/metrics/dashboard/sample_dashboard.yml')) }
+      let(:dashboard) { load_sample_dashboard }
       let(:params) { { dashboard_path: '.gitlab/dashboards/test.yml' } }
       let(:project) { project_with_dashboard(params[:dashboard_path]) }
 
diff --git a/spec/lib/gitlab/metrics/dashboard/processor_spec.rb b/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
index b017eb89b5d5c80124271166d791e71206573a41..7f7070dfafb8cef5f21f39574e2351b0ee77aa82 100644
--- a/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
@@ -3,9 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Metrics::Dashboard::Processor do
+  include MetricsDashboardHelpers
+
   let(:project) { build(:project) }
   let(:environment) { create(:environment, project: project) }
-  let(:dashboard_yml) { YAML.load_file('spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml') }
+  let(:dashboard_yml) { load_sample_dashboard }
 
   describe 'process' do
     let(:sequence) do
diff --git a/spec/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter_spec.rb b/spec/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter_spec.rb
index 889712433c209f05c9d68def8bc4fbc4585d52c4..7a3a9021f8662b7daad4bd8f9801806c6ed9774f 100644
--- a/spec/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Metrics::Dashboard::Stages::PanelIdsInserter do
+  include MetricsDashboardHelpers
+
   let(:project) { build_stubbed(:project) }
 
   def fetch_panel_ids(dashboard_hash)
@@ -12,7 +14,7 @@ def fetch_panel_ids(dashboard_hash)
   describe '#transform!' do
     subject(:transform!) { described_class.new(project, dashboard, nil).transform! }
 
-    let(:dashboard) { YAML.safe_load(fixture_file('lib/gitlab/metrics/dashboard/sample_dashboard.yml')).deep_symbolize_keys }
+    let(:dashboard) { load_sample_dashboard.deep_symbolize_keys }
 
     context 'when dashboard panels are present' do
       it 'assigns unique ids to each panel using PerformanceMonitoring::PrometheusPanel', :aggregate_failures do
diff --git a/spec/lib/gitlab/static_site_editor/config_spec.rb b/spec/lib/gitlab/static_site_editor/config_spec.rb
index b4b667c25ee2e2b739572613977091092e1e5ece..b60a6a9b0063ea9d395168e01acd6bf1eba2eebe 100644
--- a/spec/lib/gitlab/static_site_editor/config_spec.rb
+++ b/spec/lib/gitlab/static_site_editor/config_spec.rb
@@ -6,7 +6,10 @@
   subject(:config) { described_class.new(repository, ref, file_path, return_url) }
 
   let_it_be(:namespace) { create(:namespace, name: 'namespace') }
+  let_it_be(:root_group) { create(:group, name: 'group') }
+  let_it_be(:subgroup) { create(:group, name: 'subgroup', parent: root_group) }
   let_it_be(:project) { create(:project, :public, :repository, name: 'project', namespace: namespace) }
+  let_it_be(:project_with_subgroup) { create(:project, :public, :repository, name: 'project', group: subgroup) }
   let_it_be(:repository) { project.repository }
 
   let(:ref) { 'master' }
@@ -30,6 +33,18 @@
       )
     end
 
+    context 'when namespace is a subgroup' do
+      let(:repository) { project_with_subgroup.repository }
+
+      it 'returns data for the frontend component' do
+        is_expected.to include(
+          namespace: 'group/subgroup',
+          project: 'project',
+          base_url: '/group/subgroup/project/-/sse/master%2FREADME.md'
+        )
+      end
+    end
+
     context 'when file has .md.erb extension' do
       let(:file_path) { 'README.md.erb' }
 
diff --git a/spec/models/ci/pipeline_message_spec.rb b/spec/models/ci/pipeline_message_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6c97a025625cfedea37eb1ff773f5c481b96eac5
--- /dev/null
+++ b/spec/models/ci/pipeline_message_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::PipelineMessage do
+  describe 'validations' do
+    subject { described_class.new(pipeline: pipeline, content: content) }
+
+    let(:pipeline) { create(:ci_pipeline) }
+
+    context 'when message content is longer than the limit' do
+      let(:content) { 'x' * (described_class::MAX_CONTENT_LENGTH + 1) }
+
+      it 'is truncated with ellipsis' do
+        subject.save!
+
+        expect(subject.content).to end_with('x...')
+        expect(subject.content.length).to eq(described_class::MAX_CONTENT_LENGTH)
+      end
+    end
+
+    context 'when message is not present' do
+      let(:content) { '' }
+
+      it 'returns an error' do
+        expect(subject.save).to be_falsey
+        expect(subject.errors[:content]).to be_present
+      end
+    end
+
+    context 'when message content is valid' do
+      let(:content) { 'valid message content' }
+
+      it 'is saved with default error severity' do
+        subject.save!
+
+        expect(subject.content).to eq(content)
+        expect(subject.severity).to eq('error')
+        expect(subject).to be_error
+      end
+
+      it 'is persist the defined severity' do
+        subject.severity = :warning
+
+        subject.save!
+
+        expect(subject.content).to eq(content)
+        expect(subject.severity).to eq('warning')
+        expect(subject).to be_warning
+      end
+    end
+  end
+end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 62b189dd7d4777dcc867b66909f45b3b96aa624c..34a50d12f4b44868c24d20385f0b8b6cdf967ff3 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -2634,6 +2634,28 @@ def create_build(name, stage_idx)
     end
   end
 
+  describe '#add_error_message' do
+    let(:pipeline) { build_stubbed(:ci_pipeline) }
+
+    it 'adds a new pipeline error message' do
+      pipeline.add_error_message('The error message')
+
+      expect(pipeline.messages.map(&:content)).to contain_exactly('The error message')
+    end
+
+    context 'when feature flag ci_store_pipeline_messages is disabled' do
+      before do
+        stub_feature_flags(ci_store_pipeline_messages: false)
+      end
+
+      it ' does not add pipeline error message' do
+        pipeline.add_error_message('The error message')
+
+        expect(pipeline.messages).to be_empty
+      end
+    end
+  end
+
   describe '#has_yaml_errors?' do
     context 'when yaml_errors is set' do
       before do
@@ -3198,8 +3220,8 @@ def create_build(name, stage_idx)
     end
   end
 
-  describe '#error_messages' do
-    subject { pipeline.error_messages }
+  describe '#full_error_messages' do
+    subject { pipeline.full_error_messages }
 
     before do
       pipeline.valid?
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 3ae9dfddaab01bcc8e7384a09041e510391f3885..94b0b55d32c082485c581126349382eaf90cbf3d 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -4663,6 +4663,7 @@ def enable_lfs
       expect(project).to receive(:refresh_markdown_cache!)
       expect(InternalId).to receive(:flush_records!).with(project: project)
       expect(DetectRepositoryLanguagesWorker).to receive(:perform_async).with(project.id)
+      expect(project).to receive(:write_repository_config)
 
       project.after_import
     end
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 44f27f55d0cc9e2807524a73dfe04a22ff6a58f5..733cc9bd9cb0a65fabd4ebbd79d2ee32fbe22151 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -154,7 +154,7 @@
   context 'admin' do
     let(:current_user) { admin }
 
-    it do
+    specify do
       expect_allowed(*read_group_permissions)
       expect_allowed(*guest_permissions)
       expect_allowed(*reporter_permissions)
@@ -162,6 +162,10 @@
       expect_allowed(*maintainer_permissions)
       expect_allowed(*owner_permissions)
     end
+
+    context 'with admin mode', :enable_admin_mode do
+      specify { expect_allowed(*admin_permissions) }
+    end
   end
 
   describe 'private nested group use the highest access level from the group and inherited permissions' do
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index ea01596a9ecb6c10aa799556cab1b345766478eb..4589fb055a16241380b3013dda887d5c8fef9951 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -30,7 +30,7 @@
       admin_issue admin_label admin_list read_commit_status read_build
       read_container_image read_pipeline read_environment read_deployment
       read_merge_request download_wiki_code read_sentry_issue read_metrics_dashboard_annotation
-      metrics_dashboard
+      metrics_dashboard read_confidential_issues
     ]
   end
 
diff --git a/spec/requests/api/graphql/project/alert_management/alerts_spec.rb b/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
index 4ec11762dc2d213669f6c57668b29bb8ad3a4e49..497041f99ce880103fdf7c8339caca759c96fe6b 100644
--- a/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
+++ b/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
@@ -78,7 +78,7 @@
 
         expect(second_alert).to include(
           'iid' => resolved_alert.iid.to_s,
-          'issueIid' => nil,
+          'issueIid' => resolved_alert.issue_iid.to_s,
           'status' => 'RESOLVED',
           'endedAt' => resolved_alert.ended_at.strftime('%Y-%m-%dT%H:%M:%SZ')
         )
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index a4224bd66d007f24777866c106a6baeee034b910..022cab63440aec115a705cf140020d103a786a31 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -254,7 +254,10 @@
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
-        expect(json_response.first).to include 'statistics'
+
+        statistics = json_response.first['statistics']
+        expect(statistics).to be_present
+        expect(statistics).to include('commit_count', 'storage_size', 'repository_size', 'wiki_size', 'lfs_objects_size', 'job_artifacts_size', 'snippets_size')
       end
 
       it "does not include license by default" do
diff --git a/spec/services/alert_management/process_prometheus_alert_service_spec.rb b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
index 5b4da5e90775035a212fdf314ee28a0f45bd4880..8e496824e4015e63a889b267bc20d5e54f694232 100644
--- a/spec/services/alert_management/process_prometheus_alert_service_spec.rb
+++ b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe AlertManagement::ProcessPrometheusAlertService do
-  let_it_be(:project) { create(:project) }
+  let_it_be(:project) { create(:project, :repository) }
 
   before do
     allow(ProjectServiceWorker).to receive(:perform_async)
@@ -35,9 +35,9 @@
         }
       end
 
-      context 'when Prometheus alert status is firing' do
-        let(:status) { 'firing' }
+      let(:status) { 'firing' }
 
+      context 'when Prometheus alert status is firing' do
         context 'when alert with the same fingerprint already exists' do
           let!(:alert) { create(:alert_management_alert, :resolved, project: project, fingerprint: parsed_alert.gitlab_fingerprint) }
 
@@ -123,6 +123,21 @@
           it 'resolves an existing alert' do
             expect { execute }.to change { alert.reload.resolved? }.to(true)
           end
+
+          context 'existing issue' do
+            let!(:alert) { create(:alert_management_alert, :with_issue, project: project, fingerprint: parsed_alert.gitlab_fingerprint) }
+
+            it 'closes the issue' do
+              issue = alert.issue
+
+              expect { execute }
+                .to change { issue.reload.state }
+                .from('opened')
+                .to('closed')
+            end
+
+            specify { expect { execute }.to change(Note, :count).by(1) }
+          end
         end
 
         context 'when status change did not succeed' do
@@ -144,6 +159,33 @@
 
         it { is_expected.to be_success }
       end
+
+      context 'environment given' do
+        let(:environment) { create(:environment, project: project) }
+
+        it 'sets the environment' do
+          payload['labels']['gitlab_environment_name'] = environment.name
+          execute
+
+          alert = project.alert_management_alerts.last
+
+          expect(alert.environment).to eq(environment)
+        end
+      end
+
+      context 'prometheus alert given' do
+        let(:prometheus_alert) { create(:prometheus_alert, project: project) }
+
+        it 'sets the prometheus alert and environment' do
+          payload['labels']['gitlab_alert_id'] = prometheus_alert.prometheus_metric_id
+          execute
+
+          alert = project.alert_management_alerts.last
+
+          expect(alert.prometheus_alert).to eq(prometheus_alert)
+          expect(alert.environment).to eq(prometheus_alert.environment)
+        end
+      end
     end
 
     context 'when alert payload is invalid' do
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 065c73e104bb011621008c309c83a0a88e295add..53ef1db6a3e06aba4368d05a915c8be3f325b44e 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -194,6 +194,7 @@ def execute_service(
 
             expect(head_pipeline).to be_persisted
             expect(head_pipeline.yaml_errors).to be_present
+            expect(head_pipeline.messages).to be_present
             expect(merge_request.reload.head_pipeline).to eq head_pipeline
           end
         end
@@ -1695,6 +1696,7 @@ def previous_commit_sha_from_ref(ref)
             expect(pipeline).to be_persisted
             expect(pipeline.builds).to be_empty
             expect(pipeline.yaml_errors).to eq("test_a: needs 'build_a'")
+            expect(pipeline.messages.pluck(:content)).to contain_exactly("test_a: needs 'build_a'")
             expect(pipeline.errors[:base]).to contain_exactly("test_a: needs 'build_a'")
           end
         end
@@ -1706,6 +1708,7 @@ def previous_commit_sha_from_ref(ref)
             expect(pipeline).not_to be_persisted
             expect(pipeline.builds).to be_empty
             expect(pipeline.yaml_errors).to be_nil
+            expect(pipeline.messages).not_to be_empty
             expect(pipeline.errors[:base]).to contain_exactly("test_a: needs 'build_a'")
           end
         end
@@ -2231,8 +2234,8 @@ def find_job(name)
           end
 
           context 'when outside freeze period' do
-            Timecop.freeze(2020, 4, 10, 22, 59) do
-              it 'creates two jobs' do
+            it 'creates two jobs' do
+              Timecop.freeze(2020, 4, 10, 22, 59) do
                 expect(pipeline).to be_persisted
                 expect(build_names).to contain_exactly('test-job', 'deploy-job')
               end
@@ -2265,8 +2268,8 @@ def find_job(name)
           end
 
           context 'when outside freeze period' do
-            Timecop.freeze(2020, 4, 10, 22, 59) do
-              it 'creates two jobs' do
+            it 'creates two jobs' do
+              Timecop.freeze(2020, 4, 10, 22, 59) do
                 expect(pipeline).to be_persisted
                 expect(build_names).to contain_exactly('deploy-job')
               end
diff --git a/spec/services/concerns/exclusive_lease_guard_spec.rb b/spec/services/concerns/exclusive_lease_guard_spec.rb
index a38facc75200d7de2a8d132b6a02e28dccf34a9b..d54ba6abaddedd35560a0d4b3007f01dd335e35f 100644
--- a/spec/services/concerns/exclusive_lease_guard_spec.rb
+++ b/spec/services/concerns/exclusive_lease_guard_spec.rb
@@ -51,7 +51,7 @@ def lease_timeout
 
       it 'does not call internal_method but logs error', :aggregate_failures do
         expect(subject).not_to receive(:internal_method)
-        expect(Gitlab::AppLogger).to receive(:error).with('Cannot obtain an exclusive lease. There must be another instance already in execution.')
+        expect(Gitlab::AppLogger).to receive(:error).with("Cannot obtain an exclusive lease for #{subject.class.name}. There must be another instance already in execution.")
 
         subject.call
       end
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index ce6ca74a3119cb32731d57ed9d780a1b6c593a4a..fdf2326b75e686e82311c4fd78b8f7f7c7c6e544 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -284,7 +284,9 @@
       end
     end
 
-    it_behaves_like 'new issuable record that supports quick actions'
+    it_behaves_like 'issuable record that supports quick actions' do
+      let(:issuable) { described_class.new(project, user, params).execute }
+    end
 
     context 'Quick actions' do
       context 'with assignee and milestone in params and command' do
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 64d52e35ef2bd3c2d7ca5b02fef7f223b5312b45..77bd540e22fc57a7ed0ad15cc0ffc25bddf21369 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -866,5 +866,10 @@ def update_issue(opts)
         end
       end
     end
+
+    it_behaves_like 'issuable record that supports quick actions' do
+      let(:existing_issue) { create(:issue, project: project) }
+      let(:issuable) { described_class.new(project, user, params).execute(existing_issue) }
+    end
   end
 end
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index 015d493583f1fda41ea0a838dec387ad97757fe6..2688c3225fc05d20daed6684c2a5e7df7f739b7f 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -339,13 +339,14 @@
       end
     end
 
-    it_behaves_like 'new issuable record that supports quick actions' do
+    it_behaves_like 'issuable record that supports quick actions' do
       let(:default_params) do
         {
           source_branch: 'feature',
           target_branch: 'master'
         }
       end
+      let(:issuable) { described_class.new(project, user, params).execute }
     end
 
     context 'Quick actions' do
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index bba275bce0b9160598e4afb8fe4f16e7a8599181..c3433c8c9d2970281b1ad74e0e79e3d3e672b07f 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -737,5 +737,10 @@ def update_merge_request(opts)
           .to change { merge_request.reload.force_remove_source_branch? }.from(nil).to(true)
       end
     end
+
+    it_behaves_like 'issuable record that supports quick actions' do
+      let(:existing_merge_request) { create(:merge_request, source_project: project) }
+      let(:issuable) { described_class.new(project, user, params).execute(existing_merge_request) }
+    end
   end
 end
diff --git a/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb b/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb
index f4559ab9e1488bfba6796dc3a5f133acbd08e399..c8aae7579277152ffae88638acd6cec33cafdb3a 100644
--- a/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/custom_dashboard_service_spec.rb
@@ -9,17 +9,24 @@
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
 
+  let(:dashboard_path) { '.gitlab/dashboards/test.yml' }
+  let(:service_params) { [project, user, { environment: environment, dashboard_path: dashboard_path }] }
+
+  subject { described_class.new(*service_params) }
+
   before do
     project.add_maintainer(user)
   end
 
+  describe '#raw_dashboard' do
+    let(:project) { project_with_dashboard(dashboard_path) }
+
+    it_behaves_like '#raw_dashboard raises error if dashboard loading fails'
+  end
+
   describe '#get_dashboard' do
-    let(:dashboard_path) { '.gitlab/dashboards/test.yml' }
-    let(:service_params) { [project, user, { environment: environment, dashboard_path: dashboard_path }] }
     let(:service_call) { subject.get_dashboard }
 
-    subject { described_class.new(*service_params) }
-
     context 'when the dashboard does not exist' do
       it_behaves_like 'misconfigured dashboard service response', :not_found
 
diff --git a/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb b/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb
index 6a764d341d620f26556856cbaf4f134413c389ba..0e5971fc50d4e9f5b98c6b3f84af03c609664c3d 100644
--- a/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/pod_dashboard_service_spec.rb
@@ -9,10 +9,19 @@
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
 
+  let(:dashboard_path) { described_class::DASHBOARD_PATH }
+  let(:service_params) { [project, user, { environment: environment, dashboard_path: dashboard_path }] }
+
   before do
     project.add_maintainer(user)
   end
 
+  subject { described_class.new(*service_params) }
+
+  describe '#raw_dashboard' do
+    it_behaves_like '#raw_dashboard raises error if dashboard loading fails'
+  end
+
   describe '.valid_params?' do
     let(:params) { { dashboard_path: described_class::DASHBOARD_PATH } }
 
@@ -34,12 +43,8 @@
   end
 
   describe '#get_dashboard' do
-    let(:dashboard_path) { described_class::DASHBOARD_PATH }
-    let(:service_params) { [project, user, { environment: environment, dashboard_path: dashboard_path }] }
     let(:service_call) { subject.get_dashboard }
 
-    subject { described_class.new(*service_params) }
-
     it_behaves_like 'valid dashboard service response'
     it_behaves_like 'caches the unprocessed dashboard for subsequent calls'
     it_behaves_like 'updates gitlab_metrics_dashboard_processing_time_ms metric'
diff --git a/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb b/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb
index 8be5aaae0e09677fce4a9987899bf5ebbfc1192b..94fe3c0f3fb9da9a9b642e67268578978348d9c0 100644
--- a/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/self_monitoring_dashboard_service_spec.rb
@@ -9,13 +9,22 @@
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
 
+  let(:service_params) { [project, user, { environment: environment }] }
+
   before do
     project.add_maintainer(user)
     stub_application_setting(self_monitoring_project_id: project.id)
   end
 
+  subject do
+    described_class.new(service_params)
+  end
+
+  describe '#raw_dashboard' do
+    it_behaves_like '#raw_dashboard raises error if dashboard loading fails'
+  end
+
   describe '#get_dashboard' do
-    let(:service_params) { [project, user, { environment: environment }] }
     let(:service_call) { subject.get_dashboard }
 
     subject { described_class.new(*service_params) }
diff --git a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
index 679f0686fe297bcad79f2fcca86499072b60c3a3..b38338a54c1533abe7dae429447ec18693e88439 100644
--- a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
@@ -9,17 +9,22 @@
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
 
+  let(:dashboard_path) { described_class::DASHBOARD_PATH }
+  let(:service_params) { [project, user, { environment: environment, dashboard_path: dashboard_path }] }
+
+  subject { described_class.new(*service_params) }
+
   before do
     project.add_maintainer(user)
   end
 
+  describe '#raw_dashboard' do
+    it_behaves_like '#raw_dashboard raises error if dashboard loading fails'
+  end
+
   describe '#get_dashboard' do
-    let(:dashboard_path) { described_class::DASHBOARD_PATH }
-    let(:service_params) { [project, user, { environment: environment, dashboard_path: dashboard_path }] }
     let(:service_call) { subject.get_dashboard }
 
-    subject { described_class.new(*service_params) }
-
     it_behaves_like 'valid dashboard service response'
     it_behaves_like 'raises error for users with insufficient permissions'
     it_behaves_like 'caches the unprocessed dashboard for subsequent calls'
diff --git a/spec/services/projects/alerting/notify_service_spec.rb b/spec/services/projects/alerting/notify_service_spec.rb
index 045075daf63da2e927e61fa3c67a457024fc1785..7afad925cddd75f9d15fa13a112d2e922ebd8ba0 100644
--- a/spec/services/projects/alerting/notify_service_spec.rb
+++ b/spec/services/projects/alerting/notify_service_spec.rb
@@ -21,7 +21,7 @@
     it 'processes issues' do
       expect(IncidentManagement::ProcessAlertWorker)
         .to receive(:perform_async)
-        .with(project.id, kind_of(Hash), kind_of(Integer))
+        .with(nil, nil, kind_of(Integer))
         .once
 
       Sidekiq::Testing.inline! do
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 4bc284ccb29e01b7ccb8b3a64f9bcd68bf733bd1..3b449a7aae40d6db9f2410f41a95fda43076fd55 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -240,13 +240,21 @@ def wiki_repo(project)
   end
 
   context 'import data' do
-    it 'stores import data and URL' do
-      import_data = { data: { 'test' => 'some data' } }
-      project = create_project(user, { name: 'test', import_url: 'http://import-url', import_data: import_data })
+    let(:import_data) { { data: { 'test' => 'some data' } } }
+    let(:imported_project) { create_project(user, { name: 'test', import_url: 'http://import-url', import_data: import_data }) }
+
+    it 'does not write repository config' do
+      expect_next_instance_of(Project) do |project|
+        expect(project).not_to receive(:write_repository_config)
+      end
 
-      expect(project.import_data).to be_persisted
-      expect(project.import_data.data).to eq(import_data[:data])
-      expect(project.import_url).to eq('http://import-url')
+      imported_project
+    end
+
+    it 'stores import data and URL' do
+      expect(imported_project.import_data).to be_persisted
+      expect(imported_project.import_data.data).to eq(import_data[:data])
+      expect(imported_project.import_url).to eq('http://import-url')
     end
   end
 
diff --git a/spec/services/projects/git_deduplication_service_spec.rb b/spec/services/projects/git_deduplication_service_spec.rb
index c6396b523c8fc67432819c75e235318a1b0fdda0..b98db5bc41b9ee5a9e9f506a5256f84ba9c96809 100644
--- a/spec/services/projects/git_deduplication_service_spec.rb
+++ b/spec/services/projects/git_deduplication_service_spec.rb
@@ -139,7 +139,7 @@
         end
 
         it 'fails when a lease is already out' do
-          expect(service).to receive(:log_error).with('Cannot obtain an exclusive lease. There must be another instance already in execution.')
+          expect(service).to receive(:log_error).with("Cannot obtain an exclusive lease for #{service.class.name}. There must be another instance already in execution.")
 
           service.execute
         end
diff --git a/spec/services/repositories/destroy_service_spec.rb b/spec/services/repositories/destroy_service_spec.rb
index 794f3136929c20a84c0b8dcde615611b073616c0..30ec84b44e75ed9c01ce7923528b4cc52803f293 100644
--- a/spec/services/repositories/destroy_service_spec.rb
+++ b/spec/services/repositories/destroy_service_spec.rb
@@ -34,6 +34,21 @@
     project.touch
   end
 
+  context 'on a read-only instance' do
+    before do
+      allow(Gitlab::Database).to receive(:read_only?).and_return(true)
+    end
+
+    it 'schedules the repository deletion' do
+      expect(Repositories::ShellDestroyService).to receive(:new).with(repository).and_call_original
+
+      expect(GitlabShellWorker).to receive(:perform_in)
+        .with(Repositories::ShellDestroyService::REPO_REMOVAL_DELAY, :remove_repository, project.repository_storage, remove_path)
+
+      subject
+    end
+  end
+
   it 'removes the repository', :sidekiq_inline do
     subject
 
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 559ae01982f60cadbfcd755e69c230eb9045c063..66fce4fddf1e0ff3e0606753c25dbf14a6066dbf 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -9,6 +9,9 @@
 # Give CI some extra time
 timeout = ENV['CI'] || ENV['CI_SERVER'] ? 60 : 30
 
+# Support running Capybara on a specific port to allow saving commonly used pages
+Capybara.server_port = ENV['CAPYBARA_PORT'] if ENV['CAPYBARA_PORT']
+
 # Define an error class for JS console messages
 JSConsoleError = Class.new(StandardError)
 
diff --git a/spec/support/helpers/metrics_dashboard_helpers.rb b/spec/support/helpers/metrics_dashboard_helpers.rb
index 6dbb0cd651f0350c341bd16adfe7a93edf99d5c3..77c433c5b727599873fca2fe8cd7ccaa5a953969 100644
--- a/spec/support/helpers/metrics_dashboard_helpers.rb
+++ b/spec/support/helpers/metrics_dashboard_helpers.rb
@@ -19,7 +19,11 @@ def delete_project_dashboard(project, user, dashboard_path)
   end
 
   def load_sample_dashboard
-    YAML.safe_load(fixture_file('lib/gitlab/metrics/dashboard/sample_dashboard.yml'))
+    load_dashboard_yaml(fixture_file('lib/gitlab/metrics/dashboard/sample_dashboard.yml'))
+  end
+
+  def load_dashboard_yaml(data)
+    ::Gitlab::Config::Loader::Yaml.new(data).load_raw!
   end
 
   def system_dashboard_path
diff --git a/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb b/spec/support/services/issuable_description_quick_actions_shared_examples.rb
similarity index 65%
rename from spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
rename to spec/support/services/issuable_description_quick_actions_shared_examples.rb
index 3d45fe0613477d5b2f16ce390cd2fe9b7015e6e6..1970301e4c9363fe48cb289f6fb41cdb3b1565c9 100644
--- a/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
+++ b/spec/support/services/issuable_description_quick_actions_shared_examples.rb
@@ -3,20 +3,25 @@
 # Specifications for behavior common to all objects with executable attributes.
 # It can take a `default_params`.
 
-RSpec.shared_examples 'new issuable record that supports quick actions' do
-  let!(:project) { create(:project, :repository) }
-  let(:user) { create(:user).tap { |u| project.add_maintainer(u) } }
-  let(:assignee) { create(:user) }
-  let!(:milestone) { create(:milestone, project: project) }
-  let!(:labels) { create_list(:label, 3, project: project) }
+RSpec.shared_examples 'issuable record that supports quick actions' do
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:assignee) { create(:user) }
+  let_it_be(:milestone) { create(:milestone, project: project) }
+  let_it_be(:labels) { create_list(:label, 3, project: project) }
+
   let(:base_params) { { title: 'My issuable title' } }
   let(:params) { base_params.merge(defined?(default_params) ? default_params : {}).merge(example_params) }
-  let(:issuable) { described_class.new(project, user, params).execute }
 
-  before do
+  before_all do
+    project.add_maintainer(user)
     project.add_maintainer(assignee)
   end
 
+  before do
+    issuable.reload
+  end
+
   context 'with labels in command only' do
     let(:example_params) do
       {
@@ -25,7 +30,6 @@
     end
 
     it 'attaches labels to issuable' do
-      expect(issuable).to be_persisted
       expect(issuable.label_ids).to match_array([labels.first.id, labels.second.id])
     end
   end
@@ -39,7 +43,6 @@
     end
 
     it 'attaches all labels to issuable' do
-      expect(issuable).to be_persisted
       expect(issuable.label_ids).to match_array([labels.first.id, labels.second.id])
     end
   end
@@ -52,22 +55,8 @@
     end
 
     it 'assigns and sets milestone to issuable' do
-      expect(issuable).to be_persisted
       expect(issuable.assignees).to eq([assignee])
       expect(issuable.milestone).to eq(milestone)
     end
   end
-
-  describe '/close' do
-    let(:example_params) do
-      {
-        description: '/close'
-      }
-    end
-
-    it 'returns an open issue' do
-      expect(issuable).to be_persisted
-      expect(issuable).to be_open
-    end
-  end
 end
diff --git a/spec/support/shared_contexts/policies/group_policy_shared_context.rb b/spec/support/shared_contexts/policies/group_policy_shared_context.rb
index a0d54666dffe4486086b2c10bab90ad231876298..854f224bb5dd032fe814c6f669a29d39f034518f 100644
--- a/spec/support/shared_contexts/policies/group_policy_shared_context.rb
+++ b/spec/support/shared_contexts/policies/group_policy_shared_context.rb
@@ -38,6 +38,7 @@
       :update_default_branch_protection
     ].compact
   end
+  let(:admin_permissions) { %i[read_confidential_issues] }
 
   before_all do
     group.add_guest(guest)
diff --git a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
index 964c80007b022e03460e2aa505d4dffe98ad43fe..487c38da7da7ce67957a36d12a303f65e8c07c28 100644
--- a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
+++ b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
@@ -53,13 +53,17 @@
     find('#merge_request_description').native.send_keys('')
     fill_in 'merge_request_description', with: user.to_reference[0..4]
 
-    wait_for_requests
-
     page.within('.atwho-view') do
       expect(page).to have_content(user2.name)
     end
   end
 
+  it 'description has quick action autocomplete', :js do
+    find('#merge_request_description').native.send_keys('/')
+
+    expect(page).to have_selector('.atwho-container')
+  end
+
   it 'has class js-quick-submit in form' do
     expect(page).to have_selector('.js-quick-submit')
   end
diff --git a/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb b/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb
index 58cd3d21f66e34dd1f016e5e5df3343d620123a2..67d1c2a8254499e12772f1e4a7176736731ff99b 100644
--- a/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb
@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'resolving an issuable in GraphQL' do |type|
-  subject { mutation.resolve_issuable(type: type, parent_path: parent.full_path, iid: issuable.iid) }
+  include GraphqlHelpers
+
+  let(:parent_path) { parent.full_path }
+  let(:iid) { issuable.iid }
+
+  subject(:result) { mutation.resolve_issuable(type: type, parent_path: parent_path, iid: iid) }
 
   context 'when user has access' do
     before do
@@ -9,37 +14,23 @@
     end
 
     it 'resolves issuable by iid' do
-      result = type == :merge_request ? subject.sync : subject
       expect(result).to eq(issuable)
     end
 
-    it 'uses the correct Resolver to resolve issuable' do
-      resolver_class = "Resolvers::#{type.to_s.classify.pluralize}Resolver".constantize
-      resolve_method = type == :epic ? :resolve_group : :resolve_project
-      resolved_parent = mutation.send(resolve_method, full_path: parent.full_path)
-
-      allow(mutation).to receive(resolve_method)
-        .with(full_path: parent.full_path)
-        .and_return(resolved_parent)
-
-      expect(resolver_class.single).to receive(:new)
-        .with(object: resolved_parent, context: context, field: nil)
-        .and_call_original
-
-      subject
-    end
-
-    it 'returns nil if issuable is not found' do
-      result = mutation.resolve_issuable(type: type, parent_path: parent.full_path, iid: "100")
-      result = result.respond_to?(:sync) ? result.sync : result
+    context 'the IID does not refer to a valid issuable' do
+      let(:iid) { '100' }
 
-      expect(result).to be_nil
+      it 'returns nil' do
+        expect(result).to be_nil
+      end
     end
 
-    it 'returns nil if parent path is not present' do
-      result = mutation.resolve_issuable(type: type, parent_path: "", iid: issuable.iid)
+    context 'the parent path is not present' do
+      let(:parent_path) { '' }
 
-      expect(result).to be_nil
+      it 'returns nil' do
+        expect(result).to be_nil
+      end
     end
   end
 end
diff --git a/spec/support/shared_examples/policies/namespace_policy_shared_examples.rb b/spec/support/shared_examples/policies/namespace_policy_shared_examples.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ddec1ba5e3d10f4b0962376f02c535c570684e1f
--- /dev/null
+++ b/spec/support/shared_examples/policies/namespace_policy_shared_examples.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'update namespace limit policy' do
+  describe 'update_subscription_limit' do
+    using RSpec::Parameterized::TableSyntax
+
+    let(:policy) { :update_subscription_limit }
+
+    where(:role, :is_com, :allowed) do
+      :user  | true | false
+      :owner | true | false
+      :admin | true  | true
+      :user  | false | false
+      :owner | false | false
+      :admin | false | false
+    end
+
+    with_them do
+      let(:current_user) { build_stubbed(role) }
+
+      before do
+        allow(Gitlab).to receive(:com?).and_return(is_com)
+      end
+
+      context 'when admin mode enabled', :enable_admin_mode do
+        it { is_expected.to(allowed ? be_allowed(policy) : be_disallowed(policy)) }
+      end
+
+      context 'when admin mode disabled' do
+        it { is_expected.to be_disallowed(policy) }
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
index e0edbc5637ac2e09518284d0606ee8a37279f3c5..258d9ab85e481171b7905d81b4da53e4ee0ce8e7 100644
--- a/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
@@ -1,68 +1,85 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'merge quick action' do
-  context 'when the current user can merge the MR' do
+  context 'when updating the description' do
     before do
       sign_in(user)
-      visit project_merge_request_path(project, merge_request)
+      visit edit_project_merge_request_path(project, merge_request)
     end
 
-    it 'merges the MR', :sidekiq_might_not_need_inline do
-      add_note("/merge")
-
-      expect(page).to have_content 'Merged this merge request.'
+    it 'merges the MR', :sidekiq_inline do
+      fill_in('Description', with: '/merge')
+      click_button('Save changes')
 
+      expect(page).to have_content('Merged')
       expect(merge_request.reload).to be_merged
     end
+  end
 
-    context 'when auto merge is avialable' do
+  context 'when creating a new note' do
+    context 'when the current user can merge the MR' do
       before do
-        create(:ci_pipeline, :detached_merge_request_pipeline,
-          project: project, merge_request: merge_request)
-        merge_request.update_head_pipeline
+        sign_in(user)
+        visit project_merge_request_path(project, merge_request)
       end
 
-      it 'schedules to merge the MR' do
+      it 'merges the MR', :sidekiq_inline do
         add_note("/merge")
 
-        expect(page).to have_content "Scheduled to merge this merge request (Merge when pipeline succeeds)."
+        expect(page).to have_content 'Merged this merge request.'
 
-        expect(merge_request.reload).to be_auto_merge_enabled
-        expect(merge_request.reload).not_to be_merged
+        expect(merge_request.reload).to be_merged
       end
-    end
-  end
 
-  context 'when the head diff changes in the meanwhile' do
-    before do
-      merge_request.source_branch = 'another_branch'
-      merge_request.save
-      sign_in(user)
-      visit project_merge_request_path(project, merge_request)
-    end
+      context 'when auto merge is available' do
+        before do
+          create(:ci_pipeline, :detached_merge_request_pipeline,
+            project: project, merge_request: merge_request)
+          merge_request.update_head_pipeline
+        end
 
-    it 'does not merge the MR' do
-      add_note("/merge")
+        it 'schedules to merge the MR' do
+          add_note("/merge")
 
-      expect(page).not_to have_content 'Your commands have been executed!'
+          expect(page).to have_content "Scheduled to merge this merge request (Merge when pipeline succeeds)."
 
-      expect(merge_request.reload).not_to be_merged
+          expect(merge_request.reload).to be_auto_merge_enabled
+          expect(merge_request.reload).not_to be_merged
+        end
+      end
     end
-  end
 
-  context 'when the current user cannot merge the MR' do
-    before do
-      project.add_guest(guest)
-      sign_in(guest)
-      visit project_merge_request_path(project, merge_request)
+    context 'when the head diff changes in the meanwhile' do
+      before do
+        merge_request.source_branch = 'another_branch'
+        merge_request.save
+        sign_in(user)
+        visit project_merge_request_path(project, merge_request)
+      end
+
+      it 'does not merge the MR' do
+        add_note("/merge")
+
+        expect(page).not_to have_content 'Your commands have been executed!'
+
+        expect(merge_request.reload).not_to be_merged
+      end
     end
 
-    it 'does not merge the MR' do
-      add_note("/merge")
+    context 'when the current user cannot merge the MR' do
+      before do
+        project.add_guest(guest)
+        sign_in(guest)
+        visit project_merge_request_path(project, merge_request)
+      end
+
+      it 'does not merge the MR' do
+        add_note("/merge")
 
-      expect(page).not_to have_content 'Your commands have been executed!'
+        expect(page).not_to have_content 'Your commands have been executed!'
 
-      expect(merge_request.reload).not_to be_merged
+        expect(merge_request.reload).not_to be_merged
+      end
     end
   end
 end
diff --git a/spec/support/shared_examples/services/metrics/dashboard_shared_examples.rb b/spec/support/shared_examples/services/metrics/dashboard_shared_examples.rb
index 5dd1badbefc50838c6d427a3b37ebdd65e8c7334..a266a730ec0851f828a45d4fd499bc33a3dbd136 100644
--- a/spec/support/shared_examples/services/metrics/dashboard_shared_examples.rb
+++ b/spec/support/shared_examples/services/metrics/dashboard_shared_examples.rb
@@ -29,8 +29,10 @@
 end
 
 RSpec.shared_examples 'caches the unprocessed dashboard for subsequent calls' do
-  it do
-    expect(YAML).to receive(:safe_load).once.and_call_original
+  specify do
+    expect_next_instance_of(::Gitlab::Config::Loader::Yaml) do |loader|
+      expect(loader).to receive(:load_raw!).once.and_call_original
+    end
 
     described_class.new(*service_params).get_dashboard
     described_class.new(*service_params).get_dashboard
@@ -128,3 +130,50 @@
     expect(metric.get(labels)).to be > 0
   end
 end
+
+RSpec.shared_examples '#raw_dashboard raises error if dashboard loading fails' do
+  context 'when yaml is too large' do
+    before do
+      allow_next_instance_of(::Gitlab::Config::Loader::Yaml) do |loader|
+        allow(loader).to receive(:load_raw!)
+          .and_raise(Gitlab::Config::Loader::Yaml::DataTooLargeError, 'The parsed YAML is too big')
+      end
+    end
+
+    it 'raises error' do
+      expect { subject.raw_dashboard }.to raise_error(
+        Gitlab::Metrics::Dashboard::Errors::LayoutError,
+        'The parsed YAML is too big'
+      )
+    end
+  end
+
+  context 'when yaml loader returns error' do
+    before do
+      allow_next_instance_of(::Gitlab::Config::Loader::Yaml) do |loader|
+        allow(loader).to receive(:load_raw!)
+          .and_raise(Gitlab::Config::Loader::FormatError, 'Invalid configuration format')
+      end
+    end
+
+    it 'raises error' do
+      expect { subject.raw_dashboard }.to raise_error(
+        Gitlab::Metrics::Dashboard::Errors::LayoutError,
+        'Invalid yaml'
+      )
+    end
+  end
+
+  context 'when yaml is not a hash' do
+    before do
+      allow_next_instance_of(::Gitlab::Config::Loader::Yaml) do |loader|
+        allow(loader).to receive(:load_raw!)
+          .and_raise(Gitlab::Config::Loader::Yaml::NotHashError, 'Invalid configuration format')
+      end
+    end
+
+    it 'returns nil' do
+      expect(subject.raw_dashboard).to eq({})
+    end
+  end
+end
diff --git a/spec/workers/incident_management/process_alert_worker_spec.rb b/spec/workers/incident_management/process_alert_worker_spec.rb
index ff138dd6885d1f1c1171e07371cbb11d16eecaf4..75696d15ab8da79b87a9fc2872a4e84f5d7991da 100644
--- a/spec/workers/incident_management/process_alert_worker_spec.rb
+++ b/spec/workers/incident_management/process_alert_worker_spec.rb
@@ -7,35 +7,31 @@
   let_it_be(:settings) { create(:project_incident_management_setting, project: project, create_issue: true) }
 
   describe '#perform' do
-    let(:alert_management_alert_id) { nil }
-    let(:alert_payload) do
-      {
-        'annotations' => { 'title' => 'title' },
-        'startsAt' => Time.now.rfc3339
-      }
-    end
-
-    let(:created_issue) { Issue.last }
+    let_it_be(:started_at) { Time.now.rfc3339 }
+    let_it_be(:payload) { { 'title' => 'title', 'start_time' => started_at } }
+    let_it_be(:parsed_payload) { Gitlab::Alerting::NotificationPayloadParser.call(payload, project) }
+    let_it_be(:alert) { create(:alert_management_alert, project: project, payload: payload, started_at: started_at) }
+    let(:created_issue) { Issue.last! }
 
-    subject { described_class.new.perform(project.id, alert_payload, alert_management_alert_id) }
+    subject { described_class.new.perform(nil, nil, alert.id) }
 
     before do
       allow(IncidentManagement::CreateIssueService)
-        .to receive(:new).with(project, alert_payload)
+        .to receive(:new).with(alert.project, parsed_payload)
         .and_call_original
     end
 
     it 'creates an issue' do
       expect(IncidentManagement::CreateIssueService)
-        .to receive(:new).with(project, alert_payload)
+        .to receive(:new).with(alert.project, parsed_payload)
 
       expect { subject }.to change { Issue.count }.by(1)
     end
 
-    context 'with invalid project' do
-      let(:invalid_project_id) { non_existing_record_id }
+    context 'with invalid alert' do
+      let(:invalid_alert_id) { non_existing_record_id }
 
-      subject { described_class.new.perform(invalid_project_id, alert_payload) }
+      subject { described_class.new.perform(nil, nil, invalid_alert_id) }
 
       it 'does not create issues' do
         expect(IncidentManagement::CreateIssueService).not_to receive(:new)
@@ -44,16 +40,8 @@
       end
     end
 
-    context 'when alert_management_alert_id is present' do
-      let!(:alert) { create(:alert_management_alert, project: project) }
-      let(:alert_management_alert_id) { alert.id }
-
+    context 'with valid alert' do
       before do
-        allow(AlertManagement::Alert)
-          .to receive(:find_by_id)
-          .with(alert_management_alert_id)
-          .and_return(alert)
-
         allow(Gitlab::AppLogger).to receive(:warn).and_call_original
       end
 
@@ -69,24 +57,24 @@
 
           expect(Gitlab::AppLogger).not_to have_received(:warn)
         end
-      end
 
-      context 'when alert cannot be updated' do
-        let(:alert) { create(:alert_management_alert, :with_validation_errors, project: project) }
+        context 'when alert cannot be updated' do
+          let_it_be(:alert) { create(:alert_management_alert, :with_validation_errors, project: project, payload: payload) }
 
-        it 'updates AlertManagement::Alert#issue_id' do
-          expect { subject }.not_to change { alert.reload.issue_id }
-        end
+          it 'updates AlertManagement::Alert#issue_id' do
+            expect { subject }.not_to change { alert.reload.issue_id }
+          end
 
-        it 'logs a warning' do
-          subject
+          it 'logs a warning' do
+            subject
 
-          expect(Gitlab::AppLogger).to have_received(:warn).with(
-            message: 'Cannot link an Issue with Alert',
-            issue_id: created_issue.id,
-            alert_id: alert_management_alert_id,
-            alert_errors: { hosts: ['hosts array is over 255 chars'] }
-          )
+            expect(Gitlab::AppLogger).to have_received(:warn).with(
+              message: 'Cannot link an Issue with Alert',
+              issue_id: created_issue.id,
+              alert_id: alert.id,
+              alert_errors: { hosts: ['hosts array is over 255 chars'] }
+            )
+          end
         end
       end
     end
diff --git a/spec/workers/repository_remove_remote_worker_spec.rb b/spec/workers/repository_remove_remote_worker_spec.rb
index f210300c82518e71237fddf067680f4c08249c1a..7d66131f34e2fe948847715098e7626e9719b1d4 100644
--- a/spec/workers/repository_remove_remote_worker_spec.rb
+++ b/spec/workers/repository_remove_remote_worker_spec.rb
@@ -32,7 +32,7 @@
 
         expect(subject)
           .to receive(:log_error)
-          .with('Cannot obtain an exclusive lease. There must be another instance already in execution.')
+          .with("Cannot obtain an exclusive lease for #{subject.class.name}. There must be another instance already in execution.")
 
         subject.perform(project.id, remote_name)
       end
diff --git a/spec/workers/stuck_import_jobs_worker_spec.rb b/spec/workers/stuck_import_jobs_worker_spec.rb
deleted file mode 100644
index 5664965edf7b9058136a516b4f1763a2d0bb7478..0000000000000000000000000000000000000000
--- a/spec/workers/stuck_import_jobs_worker_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe StuckImportJobsWorker do
-  let(:worker) { described_class.new }
-
-  describe 'with scheduled import_status' do
-    it_behaves_like 'stuck import job detection' do
-      let(:import_state) { create(:project, :import_scheduled).import_state }
-
-      before do
-        import_state.update(jid: '123')
-      end
-    end
-  end
-
-  describe 'with started import_status' do
-    it_behaves_like 'stuck import job detection' do
-      let(:import_state) { create(:project, :import_started).import_state }
-
-      before do
-        import_state.update(jid: '123')
-      end
-    end
-  end
-end
diff --git a/yarn.lock b/yarn.lock
index f5ca6a8ea29b4b07d942c52f6189b9d556229470..4dbd5b7541c797ffff649f44e171c713c2db3e59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -848,10 +848,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.144.0.tgz#ee0ec58516405391cbaef00f5a660da6edf27538"
   integrity sha512-ejcsxoyfYwXyG8naOnn7QnY0oxrRNcWRBuH9VHrGL9/FXBJWq2NLXENi+v0TjcWvSsc2fBx/nk5V8Au96g0yEg==
 
-"@gitlab/ui@17.8.0":
-  version "17.8.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-17.8.0.tgz#187b92634d3b034f036d96238a7c39a5e7f1606b"
-  integrity sha512-BwZY5D6zUilCj9Uh1nhB3VQMHsSwYxMHpz/t4qu1URIwWLeyDuEMxx6CEMT4p1Cir2eWxwxh9AauduPcmRTJPw==
+"@gitlab/ui@17.9.0":
+  version "17.9.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-17.9.0.tgz#fc5dcdb69910aa4aadd0905b718c0dd785ca9df6"
+  integrity sha512-zbgs73ioxrOLigb9CIJXOkMQ80CUPnarurv/j2Oo2sN9cY5yWK+ci0eogx3j2dKQKF0HnTBAVgliTR6T3BHBcQ==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"