diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8c43f0c1d6e..9c94cb46e74 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -687,9 +687,6 @@ Rails/SaveBang:
     - 'ee/spec/lib/gitlab/background_migration/fix_orphan_promoted_issues_spec.rb'
     - 'ee/spec/lib/gitlab/elastic/search_results_spec.rb'
     - 'ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/cron_manager_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/jwt_request_decoder_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/oauth/session_spec.rb'
     - 'ee/spec/lib/gitlab/geo_spec.rb'
     - 'ee/spec/lib/gitlab/git_access_spec.rb'
     - 'ee/spec/lib/gitlab/import_export/group/relation_factory_spec.rb'
diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue
index bafe07afb48..4eca6ed9fcc 100644
--- a/app/assets/javascripts/boards/components/board_list_header.vue
+++ b/app/assets/javascripts/boards/components/board_list_header.vue
@@ -1,4 +1,5 @@
 <script>
+import { mapActions } from 'vuex';
 import {
   GlButton,
   GlButtonGroup,
@@ -17,6 +18,7 @@ import boardsStore from '../stores/boards_store';
 import eventHub from '../eventhub';
 import { ListType } from '../constants';
 import { isScopedLabel } from '~/lib/utils/common_utils';
+import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   components: {
@@ -32,7 +34,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [isWipLimitsOn],
+  mixins: [isWipLimitsOn, glFeatureFlagMixin()],
   props: {
     list: {
       type: Object,
@@ -128,6 +130,7 @@ export default {
     },
   },
   methods: {
+    ...mapActions(['updateList']),
     showScopedLabels(label) {
       return boardsStore.scopedLabels.enabled && isScopedLabel(label);
     },
@@ -136,20 +139,28 @@ export default {
       eventHub.$emit(`toggle-issue-form-${this.list.id}`);
     },
     toggleExpanded() {
-      if (this.list.isExpandable) {
-        this.list.isExpanded = !this.list.isExpanded;
+      this.list.isExpanded = !this.list.isExpanded;
 
-        if (AccessorUtilities.isLocalStorageAccessSafe() && !this.isLoggedIn) {
-          localStorage.setItem(`${this.uniqueKey}.expanded`, this.list.isExpanded);
-        }
+      if (!this.isLoggedIn) {
+        this.addToLocalStorage();
+      } else {
+        this.updateListFunction();
+      }
 
-        if (this.isLoggedIn) {
-          this.list.update();
-        }
-
-        // When expanding/collapsing, the tooltip on the caret button sometimes stays open.
-        // Close all tooltips manually to prevent dangling tooltips.
-        this.$root.$emit('bv::hide::tooltip');
+      // When expanding/collapsing, the tooltip on the caret button sometimes stays open.
+      // Close all tooltips manually to prevent dangling tooltips.
+      this.$root.$emit('bv::hide::tooltip');
+    },
+    addToLocalStorage() {
+      if (AccessorUtilities.isLocalStorageAccessSafe()) {
+        localStorage.setItem(`${this.uniqueKey}.expanded`, this.list.isExpanded);
+      }
+    },
+    updateListFunction() {
+      if (this.glFeatures.boardsWithSwimlanes && this.isSwimlanesHeader) {
+        this.updateList({ listId: this.list.id, collapsed: !this.list.isExpanded });
+      } else {
+        this.list.update();
       }
     },
   },
diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index b8b30c958a9..2f6caffbf84 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -47,7 +47,7 @@ class List {
     this.loading = true;
     this.loadingMore = false;
     this.issues = obj.issues || [];
-    this.issuesSize = obj.issuesSize ? obj.issuesSize : 0;
+    this.issuesSize = obj.issuesSize || obj.issuesCount || 0;
     this.maxIssueCount = obj.maxIssueCount || obj.max_issue_count || 0;
 
     if (obj.label) {
diff --git a/app/assets/javascripts/boards/queries/board_list_shared.fragment.graphql b/app/assets/javascripts/boards/queries/board_list_shared.fragment.graphql
index 5b532906f6a..d85b736720b 100644
--- a/app/assets/javascripts/boards/queries/board_list_shared.fragment.graphql
+++ b/app/assets/javascripts/boards/queries/board_list_shared.fragment.graphql
@@ -4,6 +4,7 @@ fragment BoardListShared on BoardList {
   position
   listType
   collapsed
+  issuesCount
   label {
     id
     title
diff --git a/app/assets/javascripts/boards/queries/board_list_update.mutation.graphql b/app/assets/javascripts/boards/queries/board_list_update.mutation.graphql
new file mode 100644
index 00000000000..b474c9acb93
--- /dev/null
+++ b/app/assets/javascripts/boards/queries/board_list_update.mutation.graphql
@@ -0,0 +1,10 @@
+#import "./board_list.fragment.graphql"
+
+mutation UpdateBoardList($listId: ID!, $position: Int, $collapsed: Boolean) {
+  updateBoardList(input: { listId: $listId, position: $position, collapsed: $collapsed }) {
+    list {
+      ...BoardListFragment
+    }
+    errors
+  }
+}
diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js
index 8d0f3fb20af..25747788cc9 100644
--- a/app/assets/javascripts/boards/stores/actions.js
+++ b/app/assets/javascripts/boards/stores/actions.js
@@ -15,6 +15,7 @@ import projectListsIssuesQuery from '../queries/project_lists_issues.query.graph
 import projectBoardQuery from '../queries/project_board.query.graphql';
 import groupBoardQuery from '../queries/group_board.query.graphql';
 import createBoardListMutation from '../queries/board_list_create.mutation.graphql';
+import updateBoardListMutation from '../queries/board_list_update.mutation.graphql';
 
 const notImplemented = () => {
   /* eslint-disable-next-line @gitlab/require-i18n-strings */
@@ -147,8 +148,42 @@ export default {
     notImplemented();
   },
 
-  updateList: () => {
-    notImplemented();
+  moveList: ({ state, commit, dispatch }, { listId, newIndex, adjustmentValue }) => {
+    const { boardLists } = state;
+    const backupList = [...boardLists];
+    const movedList = boardLists.find(({ id }) => id === listId);
+
+    const newPosition = newIndex - 1;
+    const listAtNewIndex = boardLists[newIndex];
+
+    movedList.position = newPosition;
+    listAtNewIndex.position += adjustmentValue;
+    commit(types.MOVE_LIST, {
+      movedList,
+      listAtNewIndex,
+    });
+
+    dispatch('updateList', { listId, position: newPosition, backupList });
+  },
+
+  updateList: ({ commit }, { listId, position, collapsed, backupList }) => {
+    gqlClient
+      .mutate({
+        mutation: updateBoardListMutation,
+        variables: {
+          listId,
+          position,
+          collapsed,
+        },
+      })
+      .then(({ data }) => {
+        if (data?.updateBoardList?.errors.length) {
+          commit(types.UPDATE_LIST_FAILURE, backupList);
+        }
+      })
+      .catch(() => {
+        commit(types.UPDATE_LIST_FAILURE, backupList);
+      });
   },
 
   deleteList: () => {
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js
index 002a8bee3dc..f336d6d03c9 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js
+++ b/app/assets/javascripts/boards/stores/boards_store.js
@@ -858,21 +858,6 @@ const boardsStore = {
   },
 
   refreshIssueData(issue, obj) {
-    // issue.id = obj.id;
-    // issue.iid = obj.iid;
-    // issue.title = obj.title;
-    // issue.confidential = obj.confidential;
-    // issue.dueDate = obj.due_date || obj.dueDate;
-    // issue.sidebarInfoEndpoint = obj.issue_sidebar_endpoint;
-    // issue.referencePath = obj.reference_path || obj.referencePath;
-    // issue.path = obj.real_path || obj.webUrl;
-    // issue.toggleSubscriptionEndpoint = obj.toggle_subscription_endpoint;
-    // issue.project_id = obj.project_id;
-    // issue.timeEstimate = obj.time_estimate || obj.timeEstimate;
-    // issue.assignableLabelsEndpoint = obj.assignable_labels_endpoint;
-    // issue.blocked = obj.blocked;
-    // issue.epic = obj.epic;
-
     const convertedObj = convertObjectPropsToCamelCase(obj, {
       dropKeys: ['issue_sidebar_endpoint', 'real_path', 'webUrl'],
     });
diff --git a/app/assets/javascripts/boards/stores/mutation_types.js b/app/assets/javascripts/boards/stores/mutation_types.js
index 1c3eef8f0c3..90417a19635 100644
--- a/app/assets/javascripts/boards/stores/mutation_types.js
+++ b/app/assets/javascripts/boards/stores/mutation_types.js
@@ -7,9 +7,8 @@ export const SHOW_PROMOTION_LIST = 'SHOW_PROMOTION_LIST';
 export const REQUEST_ADD_LIST = 'REQUEST_ADD_LIST';
 export const RECEIVE_ADD_LIST_SUCCESS = 'RECEIVE_ADD_LIST_SUCCESS';
 export const RECEIVE_ADD_LIST_ERROR = 'RECEIVE_ADD_LIST_ERROR';
-export const REQUEST_UPDATE_LIST = 'REQUEST_UPDATE_LIST';
-export const RECEIVE_UPDATE_LIST_SUCCESS = 'RECEIVE_UPDATE_LIST_SUCCESS';
-export const RECEIVE_UPDATE_LIST_ERROR = 'RECEIVE_UPDATE_LIST_ERROR';
+export const MOVE_LIST = 'MOVE_LIST';
+export const UPDATE_LIST_FAILURE = 'UPDATE_LIST_FAILURE';
 export const REQUEST_REMOVE_LIST = 'REQUEST_REMOVE_LIST';
 export const RECEIVE_REMOVE_LIST_SUCCESS = 'RECEIVE_REMOVE_LIST_SUCCESS';
 export const RECEIVE_REMOVE_LIST_ERROR = 'RECEIVE_REMOVE_LIST_ERROR';
diff --git a/app/assets/javascripts/boards/stores/mutations.js b/app/assets/javascripts/boards/stores/mutations.js
index 33bb8c1ddb3..ae7abfe9e33 100644
--- a/app/assets/javascripts/boards/stores/mutations.js
+++ b/app/assets/javascripts/boards/stores/mutations.js
@@ -1,3 +1,5 @@
+import Vue from 'vue';
+import { sortBy } from 'lodash';
 import * as mutationTypes from './mutation_types';
 import { __ } from '~/locale';
 
@@ -44,16 +46,17 @@ export default {
     notImplemented();
   },
 
-  [mutationTypes.REQUEST_UPDATE_LIST]: () => {
-    notImplemented();
+  [mutationTypes.MOVE_LIST]: (state, { movedList, listAtNewIndex }) => {
+    const { boardLists } = state;
+    const movedListIndex = state.boardLists.findIndex(l => l.id === movedList.id);
+    Vue.set(boardLists, movedListIndex, movedList);
+    Vue.set(boardLists, movedListIndex.position + 1, listAtNewIndex);
+    Vue.set(state, 'boardLists', sortBy(boardLists, 'position'));
   },
 
-  [mutationTypes.RECEIVE_UPDATE_LIST_SUCCESS]: () => {
-    notImplemented();
-  },
-
-  [mutationTypes.RECEIVE_UPDATE_LIST_ERROR]: () => {
-    notImplemented();
+  [mutationTypes.UPDATE_LIST_FAILURE]: (state, backupList) => {
+    state.error = __('An error occurred while updating the list. Please try again.');
+    Vue.set(state, 'boardLists', backupList);
   },
 
   [mutationTypes.REQUEST_REMOVE_LIST]: () => {
diff --git a/app/assets/javascripts/lib/utils/forms.js b/app/assets/javascripts/lib/utils/forms.js
index ced44ab9817..1c5f6cefeda 100644
--- a/app/assets/javascripts/lib/utils/forms.js
+++ b/app/assets/javascripts/lib/utils/forms.js
@@ -14,3 +14,40 @@ export const serializeForm = form => {
 
   return serializeFormEntries(entries);
 };
+
+/**
+ * Check if the value provided is empty or not
+ *
+ * It is being used to check if a form input
+ * value has been set or not
+ *
+ * @param {String, Number, Array} - Any form value
+ * @returns {Boolean} - returns false if a value is set
+ *
+ * @example
+ * returns true for '', [], null, undefined
+ */
+export const isEmptyValue = value => value == null || value.length === 0;
+
+/**
+ * A form object serializer
+ *
+ * @param {Object} - Form Object
+ * @returns {Object} - Serialized Form Object
+ *
+ * @example
+ * Input
+ * {"project": {"value": "hello", "state": false}, "username": {"value": "john"}}
+ *
+ * Returns
+ * {"project": "hello", "username": "john"}
+ */
+export const serializeFormObject = form =>
+  Object.fromEntries(
+    Object.entries(form).reduce((acc, [name, { value }]) => {
+      if (!isEmptyValue(value)) {
+        acc.push([name, value]);
+      }
+      return acc;
+    }, []),
+  );
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 4f9a1669261..92c307ebe00 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -20,7 +20,6 @@ import { localTimeAgo } from './lib/utils/datetime_utility';
 import { getLocationHash, visitUrl } from './lib/utils/url_utility';
 
 // everything else
-import loadAwardsHandler from './awards_handler';
 import { deprecatedCreateFlash as Flash, removeFlashClickListener } from './flash';
 import initTodoToggle from './header';
 import initImporterStatus from './importer_status';
@@ -37,7 +36,7 @@ import GlFieldErrors from './gl_field_errors';
 import initUserPopovers from './user_popovers';
 import initBroadcastNotifications from './broadcast_notification';
 import initPersistentUserCallouts from './persistent_user_callouts';
-import { initUserTracking } from './tracking';
+import { initUserTracking, initDefaultTrackers } from './tracking';
 import { __ } from './locale';
 
 import 'ee_else_ce/main_ee';
@@ -111,6 +110,7 @@ function deferredInitialisation() {
   initBroadcastNotifications();
   initFrequentItemDropdowns();
   initPersistentUserCallouts();
+  initDefaultTrackers();
 
   if (document.querySelector('.search')) initSearchAutocomplete();
 
@@ -154,8 +154,6 @@ function deferredInitialisation() {
     viewport: '.layout-page',
   });
 
-  loadAwardsHandler();
-
   // Adding a helper class to activate animations only after all is rendered
   setTimeout(() => $body.addClass('page-initialised'), 1000);
 }
diff --git a/app/assets/javascripts/notes/components/discussion_resolve_button.vue b/app/assets/javascripts/notes/components/discussion_resolve_button.vue
index 77f6f1e51c5..e060a6affd4 100644
--- a/app/assets/javascripts/notes/components/discussion_resolve_button.vue
+++ b/app/assets/javascripts/notes/components/discussion_resolve_button.vue
@@ -1,10 +1,10 @@
 <script>
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
 
 export default {
   name: 'ResolveDiscussionButton',
   components: {
-    GlLoadingIcon,
+    GlButton,
   },
   props: {
     isResolving: {
@@ -21,8 +21,7 @@ export default {
 </script>
 
 <template>
-  <button ref="button" type="button" class="btn btn-default ml-sm-2" @click="$emit('onClick')">
-    <gl-loading-icon v-if="isResolving" ref="isResolvingIcon" inline />
+  <gl-button :loading="isResolving" class="ml-sm-2" @click="$emit('onClick')">
     {{ buttonTitle }}
-  </button>
+  </gl-button>
 </template>
diff --git a/app/assets/javascripts/pages/projects/commit/show/index.js b/app/assets/javascripts/pages/projects/commit/show/index.js
index e96cfa5c9b2..d5fb2a8be3c 100644
--- a/app/assets/javascripts/pages/projects/commit/show/index.js
+++ b/app/assets/javascripts/pages/projects/commit/show/index.js
@@ -14,6 +14,7 @@ import axios from '~/lib/utils/axios_utils';
 import syntaxHighlight from '~/syntax_highlight';
 import flash from '~/flash';
 import { __ } from '~/locale';
+import loadAwardsHandler from '~/awards_handler';
 
 document.addEventListener('DOMContentLoaded', () => {
   const hasPerfBar = document.querySelector('.with-performance-bar');
@@ -48,4 +49,5 @@ document.addEventListener('DOMContentLoaded', () => {
   } else {
     new Diff();
   }
+  loadAwardsHandler();
 });
diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js
index f38c860c5d0..98ae4e26257 100644
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -1,3 +1,4 @@
+import loadAwardsHandler from '~/awards_handler';
 import initIssuableSidebar from '~/init_issuable_sidebar';
 import Issue from '~/issue';
 import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
@@ -37,4 +38,6 @@ export default function() {
   } else {
     initIssuableSidebar();
   }
+
+  loadAwardsHandler();
 }
diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
index 25abb80cfae..11af50169f5 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
@@ -6,6 +6,7 @@ import howToMerge from '~/how_to_merge';
 import initPipelines from '~/commit/pipelines/pipelines_bundle';
 import initVueIssuableSidebarApp from '~/issuable_sidebar/sidebar_bundle';
 import initSourcegraph from '~/sourcegraph';
+import loadAwardsHandler from '~/awards_handler';
 
 export default function() {
   new ZenMode(); // eslint-disable-line no-new
@@ -19,4 +20,5 @@ export default function() {
   handleLocationHash();
   howToMerge();
   initSourcegraph();
+  loadAwardsHandler();
 }
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue
index d8ac8eb0544..1bdb7d18f04 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue
@@ -272,6 +272,7 @@ export default {
         <ci-badge
           :status="pipelineStatus"
           :show-text="!isChildView"
+          :icon-classes="'gl-vertical-align-middle!'"
           data-qa-selector="pipeline_commit_status"
         />
       </div>
diff --git a/app/assets/javascripts/snippet/snippet_show.js b/app/assets/javascripts/snippet/snippet_show.js
index 9a463b4762b..bbddfc579c5 100644
--- a/app/assets/javascripts/snippet/snippet_show.js
+++ b/app/assets/javascripts/snippet/snippet_show.js
@@ -4,6 +4,7 @@ import ZenMode from '~/zen_mode';
 import initNotes from '~/init_notes';
 import snippetEmbed from '~/snippet/snippet_embed';
 import { SnippetShowInit } from '~/snippets';
+import loadAwardsHandler from '~/awards_handler';
 
 document.addEventListener('DOMContentLoaded', () => {
   if (!gon.features.snippetsVue) {
@@ -16,4 +17,5 @@ document.addEventListener('DOMContentLoaded', () => {
     SnippetShowInit();
     initNotes();
   }
+  loadAwardsHandler();
 });
diff --git a/app/assets/javascripts/tracking.js b/app/assets/javascripts/tracking.js
index 10510595570..37ebe6b6c4d 100644
--- a/app/assets/javascripts/tracking.js
+++ b/app/assets/javascripts/tracking.js
@@ -126,14 +126,18 @@ export function initUserTracking() {
   const opts = { ...DEFAULT_SNOWPLOW_OPTIONS, ...window.snowplowOptions };
   window.snowplow('newTracker', opts.namespace, opts.hostname, opts);
 
+  document.dispatchEvent(new Event('SnowplowInitialized'));
+}
+
+export function initDefaultTrackers() {
+  if (!Tracking.enabled()) return;
+
   window.snowplow('enableActivityTracking', 30, 30);
   window.snowplow('trackPageView'); // must be after enableActivityTracking
 
-  if (opts.formTracking) window.snowplow('enableFormTracking');
-  if (opts.linkClickTracking) window.snowplow('enableLinkClickTracking');
+  if (window.snowplowOptions.formTracking) window.snowplow('enableFormTracking');
+  if (window.snowplowOptions.linkClickTracking) window.snowplow('enableLinkClickTracking');
 
   Tracking.bindDocument();
   Tracking.trackLoadEvents();
-
-  document.dispatchEvent(new Event('SnowplowInitialized'));
 }
diff --git a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
index 0e0bb8735b4..d7af3b3298e 100644
--- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
@@ -39,6 +39,11 @@ export default {
       required: false,
       default: true,
     },
+    iconClasses: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   computed: {
     cssClass() {
@@ -55,7 +60,7 @@ export default {
     :class="cssClass"
     :title="!showText ? status.text : ''"
   >
-    <ci-icon :status="status" />
+    <ci-icon :status="status" :css-classes="iconClasses" />
 
     <template v-if="showText">
       {{ status.text }}
diff --git a/app/assets/javascripts/whats_new/components/app.vue b/app/assets/javascripts/whats_new/components/app.vue
index 9a06383a57b..448e305da3a 100644
--- a/app/assets/javascripts/whats_new/components/app.vue
+++ b/app/assets/javascripts/whats_new/components/app.vue
@@ -1,10 +1,13 @@
 <script>
 import { mapState, mapActions } from 'vuex';
-import { GlDrawer } from '@gitlab/ui';
+import { GlDrawer, GlBadge, GlIcon, GlLink } from '@gitlab/ui';
 
 export default {
   components: {
     GlDrawer,
+    GlBadge,
+    GlIcon,
+    GlLink,
   },
   props: {
     features: {
@@ -37,16 +40,31 @@ export default {
   <div>
     <gl-drawer class="mt-6" :open="open" @close="closeDrawer">
       <template #header>
-        <h4>{{ __("What's new at GitLab") }}</h4>
-      </template>
-      <template>
-        <ul>
-          <li v-for="feature in parsedFeatures" :key="feature.title">
-            <h5>{{ feature.title }}</h5>
-            <p>{{ feature.body }}</p>
-          </li>
-        </ul>
+        <h4 class="page-title my-2">{{ __("What's new at GitLab") }}</h4>
       </template>
+      <div class="pb-6">
+        <div v-for="feature in parsedFeatures" :key="feature.title" class="mb-6">
+          <gl-link :href="feature.url" target="_blank">
+            <h5 class="gl-font-base">{{ feature.title }}</h5>
+          </gl-link>
+          <div class="mb-2">
+            <template v-for="package_name in feature.packages">
+              <gl-badge :key="package_name" size="sm" class="whats-new-item-badge mr-1">
+                <gl-icon name="license" />{{ package_name }}
+              </gl-badge>
+            </template>
+          </div>
+          <gl-link :href="feature.url" target="_blank">
+            <img
+              :alt="feature.title"
+              :src="feature.image_url"
+              class="img-thumbnail px-6 py-2 whats-new-item-image"
+            />
+          </gl-link>
+          <p class="pt-2">{{ feature.body }}</p>
+          <gl-link :href="feature.url" target="_blank">{{ __('Learn more') }}</gl-link>
+        </div>
+      </div>
     </gl-drawer>
   </div>
 </template>
diff --git a/app/assets/stylesheets/components/whats_new.scss b/app/assets/stylesheets/components/whats_new.scss
new file mode 100644
index 00000000000..4fff900f5a5
--- /dev/null
+++ b/app/assets/stylesheets/components/whats_new.scss
@@ -0,0 +1,9 @@
+.gl-badge.whats-new-item-badge {
+  background-color: $purple-light;
+  color: $purple;
+  font-weight: bold;
+}
+
+.whats-new-item-image {
+  border-color: $gray-50;
+}
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 51a65b88cd0..d8b929830e0 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -116,7 +116,6 @@
 
     .board-title {
       flex-direction: column;
-      height: 100%;
     }
 
     .board-title-caret {
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3d0465977fa..3986382a5f9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -42,9 +42,6 @@ class ProjectsController < Projects::ApplicationController
 
   before_action only: [:edit] do
     push_frontend_feature_flag(:service_desk_custom_address, @project)
-  end
-
-  before_action only: [:edit] do
     push_frontend_feature_flag(:approval_suggestions, @project)
   end
 
diff --git a/app/models/concerns/storage/legacy_namespace.rb b/app/models/concerns/storage/legacy_namespace.rb
index 57cb887d12a..71b976c6f11 100644
--- a/app/models/concerns/storage/legacy_namespace.rb
+++ b/app/models/concerns/storage/legacy_namespace.rb
@@ -24,28 +24,20 @@ module Storage
         parent_full_path = parent&.full_path
         Gitlab::UploadsTransfer.new.move_namespace(path, former_parent_full_path, parent_full_path)
 
-        if ::Feature.enabled?(:async_pages_move_namespace_transfer, self)
-          if any_project_with_pages_deployed?
-            run_after_commit do
-              Gitlab::PagesTransfer.new.async.move_namespace(path, former_parent_full_path, parent_full_path)
-            end
+        if any_project_with_pages_deployed?
+          run_after_commit do
+            Gitlab::PagesTransfer.new.async.move_namespace(path, former_parent_full_path, parent_full_path)
           end
-        else
-          Gitlab::PagesTransfer.new.move_namespace(path, former_parent_full_path, parent_full_path)
         end
       else
         Gitlab::UploadsTransfer.new.rename_namespace(full_path_before_last_save, full_path)
 
-        if ::Feature.enabled?(:async_pages_move_namespace_rename, self)
-          if any_project_with_pages_deployed?
-            full_path_was = full_path_before_last_save
+        if any_project_with_pages_deployed?
+          full_path_was = full_path_before_last_save
 
-            run_after_commit do
-              Gitlab::PagesTransfer.new.async.rename_namespace(full_path_was, full_path)
-            end
+          run_after_commit do
+            Gitlab::PagesTransfer.new.async.rename_namespace(full_path_was, full_path)
           end
-        else
-          Gitlab::PagesTransfer.new.rename_namespace(full_path_before_last_save, full_path)
         end
       end
 
diff --git a/app/services/ci/create_job_artifacts_service.rb b/app/services/ci/create_job_artifacts_service.rb
index cd3807e0495..2cfde1a8bfe 100644
--- a/app/services/ci/create_job_artifacts_service.rb
+++ b/app/services/ci/create_job_artifacts_service.rb
@@ -22,11 +22,7 @@ module Ci
       return result unless result[:status] == :success
 
       headers = JobArtifactUploader.workhorse_authorize(has_length: false, maximum_size: max_size(artifact_type))
-
-      if lsif?(artifact_type)
-        headers[:ProcessLsif] = true
-        headers[:ProcessLsifReferences] = Feature.enabled?(:code_navigation_references, project, default_enabled: true)
-      end
+      headers[:ProcessLsif] = lsif?(artifact_type)
 
       success(headers: headers)
     end
diff --git a/app/services/pages/delete_service.rb b/app/services/pages/delete_service.rb
index 1ac12af9a2a..fc5d01a93a1 100644
--- a/app/services/pages/delete_service.rb
+++ b/app/services/pages/delete_service.rb
@@ -3,11 +3,7 @@
 module Pages
   class DeleteService < BaseService
     def execute
-      if Feature.enabled?(:async_pages_removal, project)
-        PagesRemoveWorker.perform_async(project.id)
-      else
-        PagesRemoveWorker.new.perform(project.id)
-      end
+      PagesRemoveWorker.perform_async(project.id)
     end
   end
 end
diff --git a/app/services/projects/after_rename_service.rb b/app/services/projects/after_rename_service.rb
index ab406e5b3c9..a2cdb87e631 100644
--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -96,24 +96,18 @@ module Projects
           .rename_project(path_before, project_path, namespace_full_path)
       end
 
-      if ::Feature.enabled?(:async_pages_move_project_rename, project)
-        if project.pages_deployed?
-          # Block will be evaluated in the context of project so we need
-          # to bind to a local variable to capture it, as the instance
-          # variable and method aren't available on Project
-          path_before_local = @path_before
+      if project.pages_deployed?
+        # Block will be evaluated in the context of project so we need
+        # to bind to a local variable to capture it, as the instance
+        # variable and method aren't available on Project
+        path_before_local = @path_before
 
-          project.run_after_commit_or_now do
-            Gitlab::PagesTransfer
-              .new
-              .async
-              .rename_project(path_before_local, path, namespace.full_path)
-          end
+        project.run_after_commit_or_now do
+          Gitlab::PagesTransfer
+            .new
+            .async
+            .rename_project(path_before_local, path, namespace.full_path)
         end
-      else
-        Gitlab::PagesTransfer
-          .new
-          .rename_project(path_before, project_path, namespace_full_path)
       end
     end
 
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 2e91ea8e0d8..dba5177718d 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -181,15 +181,9 @@ module Projects
     end
 
     def move_pages(project)
-      transfer = Gitlab::PagesTransfer.new
-
-      if Feature.enabled?(:async_pages_move_project_transfer, project)
-        # Avoid scheduling moves for directories that don't exist.
-        return unless project.pages_deployed?
-
-        transfer = transfer.async
-      end
+      return unless project.pages_deployed?
 
+      transfer = Gitlab::PagesTransfer.new.async
       transfer.move_project(project.path, @old_namespace.full_path, @new_namespace.full_path)
     end
 
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 523c18ed3f3..325504eb728 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -13,43 +13,42 @@
 
 = render partial: 'flash_messages'
 
-%div{ class: [("limit-container-width" unless fluid_layout)] }
-  = render_if_exists 'trials/banner', namespace: @group
+= render_if_exists 'trials/banner', namespace: @group
 
-  = render 'groups/home_panel'
+= render 'groups/home_panel'
 
-  = render_if_exists 'groups/self_or_ancestor_marked_for_deletion_notice', group: @group
+= render_if_exists 'groups/self_or_ancestor_marked_for_deletion_notice', group: @group
 
-  = render_if_exists 'groups/group_activity_analytics', group: @group
+= render_if_exists 'groups/group_activity_analytics', group: @group
 
-  .groups-listing{ data: { endpoints: { default: group_children_path(@group, format: :json), shared: group_shared_projects_path(@group, format: :json) } } }
-    .top-area.group-nav-container.justify-content-between
-      .scrolling-tabs-container.inner-page-scroll-tabs
-        .fade-left= sprite_icon('chevron-lg-left', size: 12)
-        .fade-right= sprite_icon('chevron-lg-right', size: 12)
-        %ul.nav-links.scrolling-tabs.mobile-separator.nav.nav-tabs
-          %li.js-subgroups_and_projects-tab
-            = link_to group_path, data: { target: 'div#subgroups_and_projects', action: 'subgroups_and_projects', toggle: 'tab'} do
-              = _("Subgroups and projects")
-          %li.js-shared-tab
-            = link_to group_shared_path, data: { target: 'div#shared', action: 'shared', toggle: 'tab'} do
-              = _("Shared projects")
-          %li.js-archived-tab
-            = link_to group_archived_path, data: { target: 'div#archived', action: 'archived', toggle: 'tab'} do
-              = _("Archived projects")
+.groups-listing{ data: { endpoints: { default: group_children_path(@group, format: :json), shared: group_shared_projects_path(@group, format: :json) } } }
+  .top-area.group-nav-container.justify-content-between
+    .scrolling-tabs-container.inner-page-scroll-tabs
+      .fade-left= sprite_icon('chevron-lg-left', size: 12)
+      .fade-right= sprite_icon('chevron-lg-right', size: 12)
+      %ul.nav-links.scrolling-tabs.mobile-separator.nav.nav-tabs
+        %li.js-subgroups_and_projects-tab
+          = link_to group_path, data: { target: 'div#subgroups_and_projects', action: 'subgroups_and_projects', toggle: 'tab'} do
+            = _("Subgroups and projects")
+        %li.js-shared-tab
+          = link_to group_shared_path, data: { target: 'div#shared', action: 'shared', toggle: 'tab'} do
+            = _("Shared projects")
+        %li.js-archived-tab
+          = link_to group_archived_path, data: { target: 'div#archived', action: 'archived', toggle: 'tab'} do
+            = _("Archived projects")
 
-      .nav-controls.d-block.d-md-flex
-        .group-search
-          = render "shared/groups/search_form"
+    .nav-controls.d-block.d-md-flex
+      .group-search
+        = render "shared/groups/search_form"
 
-        = render "shared/groups/dropdown", options_hash: subgroups_sort_options_hash
+      = render "shared/groups/dropdown", options_hash: subgroups_sort_options_hash
 
-    .tab-content
-      #subgroups_and_projects.tab-pane
-        = render "subgroups_and_projects", group: @group
+  .tab-content
+    #subgroups_and_projects.tab-pane
+      = render "subgroups_and_projects", group: @group
 
-      #shared.tab-pane
-        = render "shared_projects", group: @group
+    #shared.tab-pane
+      = render "shared_projects", group: @group
 
-      #archived.tab-pane
-        = render "archived_projects", group: @group
+    #archived.tab-pane
+      = render "archived_projects", group: @group
diff --git a/app/views/projects/services/prometheus/_custom_metrics.html.haml b/app/views/projects/services/prometheus/_custom_metrics.html.haml
index 3642460467b..57100282c34 100644
--- a/app/views/projects/services/prometheus/_custom_metrics.html.haml
+++ b/app/views/projects/services/prometheus/_custom_metrics.html.haml
@@ -20,7 +20,7 @@
           .flash-text
       .loading-metrics.js-loading-custom-metrics
         %p.m-3
-          = icon('spinner spin', class: 'metrics-load-spinner')
+          = loading_icon(css_class: 'metrics-load-spinner')
           = s_('PrometheusService|Finding custom metrics...')
       .empty-metrics.hidden.js-empty-custom-metrics
         %p.text-tertiary.m-3.js-no-active-integration-text.hidden
diff --git a/app/views/projects/services/prometheus/_metrics.html.haml b/app/views/projects/services/prometheus/_metrics.html.haml
index 79f5e846bd7..732a084d476 100644
--- a/app/views/projects/services/prometheus/_metrics.html.haml
+++ b/app/views/projects/services/prometheus/_metrics.html.haml
@@ -16,7 +16,7 @@
     .card-body
       .loading-metrics.js-loading-metrics
         %p.m-3
-          = icon('spinner spin', class: 'metrics-load-spinner')
+          = loading_icon(css_class: 'metrics-load-spinner')
           = s_('PrometheusService|Finding and configuring metrics...')
       .empty-metrics.hidden.js-empty-metrics
         %p.text-tertiary.m-3
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 86cd2923fac..e17165e5e15 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -21,6 +21,10 @@
 #js-suggestions{ data: { project_path: @project.full_path } }
 
 = render 'shared/form_elements/apply_template_warning'
+
+- if issuable.is_a?(Issuable) && @issue
+  = render 'shared/issuable/form/type_selector', issuable: issuable, form: form, type: @issue[:issue_type]
+
 = render 'shared/form_elements/description', model: issuable, form: form, project: project
 
 - if issuable.respond_to?(:confidential)
diff --git a/app/views/shared/issuable/form/_metadata.html.haml b/app/views/shared/issuable/form/_metadata.html.haml
index 1389bc2ab4d..82e435fe0d3 100644
--- a/app/views/shared/issuable/form/_metadata.html.haml
+++ b/app/views/shared/issuable/form/_metadata.html.haml
@@ -14,11 +14,13 @@
 
     = render_if_exists "shared/issuable/form/epic", issuable: issuable, form: form, project: project
 
-    .form-group.row.issue-milestone
-      = form.label :milestone_id, "Milestone", class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
-      .col-sm-10{ class: ("col-md-8" if has_due_date) }
-        .issuable-form-select-holder
-          = render "shared/issuable/milestone_dropdown", selected: issuable.milestone, name: "#{issuable.class.model_name.param_key}[milestone_id]", show_any: false, show_upcoming: false, show_started: false, extra_class: "qa-issuable-milestone-dropdown js-issuable-form-dropdown js-dropdown-keep-input", dropdown_title: "Select milestone"
+    - if issuable.supports_milestone?
+      .form-group.row.issue-milestone
+        = form.label :milestone_id, "Milestone", class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
+        .col-sm-10{ class: ("col-md-8" if has_due_date) }
+          .issuable-form-select-holder
+            = render "shared/issuable/milestone_dropdown", selected: issuable.milestone, name: "#{issuable.class.model_name.param_key}[milestone_id]", show_any: false, show_upcoming: false, show_started: false, extra_class: "qa-issuable-milestone-dropdown js-issuable-form-dropdown js-dropdown-keep-input", dropdown_title: "Select milestone"
+
     .form-group.row
       = form.label :label_ids, "Labels", class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
       = form.hidden_field :label_ids, multiple: true, value: ''
@@ -30,7 +32,8 @@
 
   - if has_due_date || issuable.supports_weight?
     .col-lg-6
-      = render_if_exists "shared/issuable/form/weight", issuable: issuable, form: form
+      - if @issue[:issue_type] != 'incident'
+        = render_if_exists "shared/issuable/form/weight", issuable: issuable, form: form
       .form-group.row
         = form.label :due_date, "Due date", class: "col-form-label col-md-2 col-lg-4"
         .col-8
diff --git a/app/views/shared/issuable/form/_type_selector.html.haml b/app/views/shared/issuable/form/_type_selector.html.haml
new file mode 100644
index 00000000000..1c3a720ebcc
--- /dev/null
+++ b/app/views/shared/issuable/form/_type_selector.html.haml
@@ -0,0 +1,22 @@
+.form-group.row.gl-mb-0
+  = form.label :type, 'Type', class: 'col-form-label col-sm-2'
+  .col-sm-10
+    .issuable-form-select-holder.selectbox.form-group
+      .dropdown.js-issuable-type-filter-dropdown-wrap
+        %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
+          %span.dropdown-label
+            = type.capitalize || _("Select type")
+          = icon('chevron-down')
+        .dropdown-menu.dropdown-menu-selectable.dropdown-select
+          .dropdown-title
+            = _("Select type")
+          %button.dropdown-title-button.dropdown-menu-close.gl-mt-3
+            = icon('times', class: 'dropdown-menu-close-icon', 'aria-hidden' => 'true')
+          .dropdown-content
+            %ul
+              %li.js-filter-issuable-type
+                = link_to new_project_issue_path(@project), class: ("is-active" if type === 'issue') do
+                  = _("Issue")
+              %li.js-filter-issuable-type
+                = link_to new_project_issue_path(@project, { 'issue[issue_type]': 'incident', issuable_template: 'incident' }), class: ("is-active" if type === 'incident') do
+                  = _("Incident")
diff --git a/changelogs/unreleased/202607-migrate-spinner-for-app-views-projects-services-prometheus.yml b/changelogs/unreleased/202607-migrate-spinner-for-app-views-projects-services-prometheus.yml
new file mode 100644
index 00000000000..970dd19ac75
--- /dev/null
+++ b/changelogs/unreleased/202607-migrate-spinner-for-app-views-projects-services-prometheus.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate '.fa-spinner' to '.spinner' for 'app/views/projects/services/prometheus'
+merge_request: 41126
+author: Gilang Gumilar
+type: changed
diff --git a/changelogs/unreleased/223855-performance-defer-certain-parts-of-setting-up-snowplow-telemetry.yml b/changelogs/unreleased/223855-performance-defer-certain-parts-of-setting-up-snowplow-telemetry.yml
new file mode 100644
index 00000000000..6ed164ce8c0
--- /dev/null
+++ b/changelogs/unreleased/223855-performance-defer-certain-parts-of-setting-up-snowplow-telemetry.yml
@@ -0,0 +1,5 @@
+---
+title: Defer (certain) parts of setting up snowplow telemetry
+merge_request: 40299
+author:
+type: performance
diff --git a/changelogs/unreleased/230857-incident-type-selector.yml b/changelogs/unreleased/230857-incident-type-selector.yml
new file mode 100644
index 00000000000..6ccbdf4c9fc
--- /dev/null
+++ b/changelogs/unreleased/230857-incident-type-selector.yml
@@ -0,0 +1,5 @@
+---
+title: Add type selector dropdown to new issue form
+merge_request: 40981
+author:
+type: changed
diff --git a/changelogs/unreleased/bvl-remove-async-pages-ff.yml b/changelogs/unreleased/bvl-remove-async-pages-ff.yml
new file mode 100644
index 00000000000..567a0ddb90d
--- /dev/null
+++ b/changelogs/unreleased/bvl-remove-async-pages-ff.yml
@@ -0,0 +1,5 @@
+---
+title: Remove the async pages feature flags
+merge_request: 40980
+author:
+type: performance
diff --git a/changelogs/unreleased/drop-limit-container-width-classname.yml b/changelogs/unreleased/drop-limit-container-width-classname.yml
new file mode 100644
index 00000000000..35e00bd3cdc
--- /dev/null
+++ b/changelogs/unreleased/drop-limit-container-width-classname.yml
@@ -0,0 +1,5 @@
+---
+title: Drop one of duplicated limit-container-width classname
+merge_request: 41251
+author: Takuya Noguchi
+type: fixed
diff --git a/changelogs/unreleased/pipeline-icon-center.yml b/changelogs/unreleased/pipeline-icon-center.yml
new file mode 100644
index 00000000000..51234aea053
--- /dev/null
+++ b/changelogs/unreleased/pipeline-icon-center.yml
@@ -0,0 +1,5 @@
+---
+title: Update pipeline button SVG to be center aligned
+merge_request: 41066
+author:
+type: fixed
diff --git a/changelogs/unreleased/rails-save-bang-26.yml b/changelogs/unreleased/rails-save-bang-26.yml
new file mode 100644
index 00000000000..c26fe43c3fd
--- /dev/null
+++ b/changelogs/unreleased/rails-save-bang-26.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Rails/SaveBang offenses for ee/spec/lib/gitlab/geo/*
+merge_request: 41338
+author: Rajendra Kadam
+type: fixed
diff --git a/changelogs/unreleased/renovate-vue-vuex-3-x.yml b/changelogs/unreleased/renovate-vue-vuex-3-x.yml
new file mode 100644
index 00000000000..69208f7b2d7
--- /dev/null
+++ b/changelogs/unreleased/renovate-vue-vuex-3-x.yml
@@ -0,0 +1,5 @@
+---
+title: Update dependency vuex to ^3.5.1
+merge_request: 39201
+author:
+type: other
diff --git a/config/feature_flags/development/async_pages_move_namespace_rename.yml b/config/feature_flags/development/async_pages_move_namespace_rename.yml
deleted file mode 100644
index f968710508b..00000000000
--- a/config/feature_flags/development/async_pages_move_namespace_rename.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: async_pages_move_namespace_rename
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40259
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235808
-group: team::Scalability
-type: development
-default_enabled: false
diff --git a/config/feature_flags/development/async_pages_move_namespace_transfer.yml b/config/feature_flags/development/async_pages_move_namespace_transfer.yml
deleted file mode 100644
index 2bcb4aca83a..00000000000
--- a/config/feature_flags/development/async_pages_move_namespace_transfer.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: async_pages_move_namespace_transfer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40259
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235808
-group: team::Scalability
-type: development
-default_enabled: false
diff --git a/config/feature_flags/development/async_pages_move_project_rename.yml b/config/feature_flags/development/async_pages_move_project_rename.yml
deleted file mode 100644
index 6f5d30a6420..00000000000
--- a/config/feature_flags/development/async_pages_move_project_rename.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: async_pages_move_project_rename
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40087
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235802
-group: team::Scalability
-type: development
-default_enabled: false
diff --git a/config/feature_flags/development/async_pages_move_project_transfer.yml b/config/feature_flags/development/async_pages_move_project_transfer.yml
deleted file mode 100644
index 6f4c9538970..00000000000
--- a/config/feature_flags/development/async_pages_move_project_transfer.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: async_pages_move_project_transfer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40492
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235757
-group: team::Scalability
-type: development
-default_enabled: false
diff --git a/config/feature_flags/development/async_pages_removal.yml b/config/feature_flags/development/async_pages_removal.yml
deleted file mode 100644
index 2377f7764cc..00000000000
--- a/config/feature_flags/development/async_pages_removal.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: async_pages_removal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38313
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/239318
-group: team::Scalability
-type: development
-default_enabled: false
\ No newline at end of file
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile
index ca4b151faf9..2ccfdcffaea 100644
--- a/danger/database/Dangerfile
+++ b/danger/database/Dangerfile
@@ -59,7 +59,7 @@ if gitlab.mr_labels.include?('database') || db_paths_to_review.any?
   markdown(DB_MESSAGE)
   markdown(DB_FILES_MESSAGE + helper.markdown_list(db_paths_to_review)) if db_paths_to_review.any?
 
-  unless has_database_scoped_labels?(gitlab.mr_labels)
+  unless helper.has_database_scoped_labels?(gitlab.mr_labels)
     gitlab.api.update_merge_request(gitlab.mr_json['project_id'],
                                     gitlab.mr_json['iid'],
                                     add_labels: 'database::review pending')
diff --git a/data/whats_new/202008180001_12_10.yml b/data/whats_new/202008180001_12_10.yml
index 33c007de8d0..f5e63ddea0b 100644
--- a/data/whats_new/202008180001_12_10.yml
+++ b/data/whats_new/202008180001_12_10.yml
@@ -4,7 +4,7 @@
   stage: Plan
   self-managed: true
   gitlab-com: true
-  packages: ultimate, gold
+  packages: [Ultimate, Gold]
   url: https://docs.gitlab.com/ee/user/project/requirements/index.html
   image_url:
     published_at: 2020-04-22
@@ -14,7 +14,7 @@
   stage: Release
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/ci/examples/authenticating-with-hashicorp-vault/index.html
   image_url: https://about.gitlab.com/images/12_10/jwt-vault-1.png
   published_at: 2020-04-22
@@ -24,7 +24,7 @@
   stage: Plan
   self-managed: true
   gitlab-com: true
-  packages: ultimate, gold
+  packages: [Ultimate, Gold]
   url: https://docs.gitlab.com/ee/user/project/issues/index.html#health-status-ultimate
   image_url: https://about.gitlab.com/images/12_10/epic-health-status.png
   published_at: 2020-04-22
@@ -34,7 +34,7 @@
   stage: Plan
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/import/jira.html
   image_url: https://about.gitlab.com/images/12_10/jira-importer.png
   published_at: 2020-04-22
@@ -44,7 +44,7 @@
   stage: Verify
   self-managed: true
   gitlab-com: false
-  packages: core, starter, premium, ultimate
+  packages: [Core, Starter, Premium, Ultimate]
   url: https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/fargate/-/blob/master/docs/README.md
   image_url: https://about.gitlab.com/images/12_9/autoscaling_ci_fargate.png
   published_at: 2020-04-22
diff --git a/data/whats_new/202008180002_13_0.yml b/data/whats_new/202008180002_13_0.yml
index 7b43d390940..3e76baab7f5 100644
--- a/data/whats_new/202008180002_13_0.yml
+++ b/data/whats_new/202008180002_13_0.yml
@@ -4,7 +4,7 @@
   stage: Create
   self-managed: true
   gitlab-com: false
-  packages: core, starter, premium, ultimate
+  packages: [Core, Starter, Premium, Ultimate]
   url: https://docs.gitlab.com/ee/administration/gitaly/praefect.html
   image_url: https://about.gitlab.com/images/13_0/praefect-architecture.png
   published_at: 2020-05-22
@@ -14,7 +14,7 @@
   stage: Release
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/topics/autodevops/index.html#aws-ecs
   image_url:
   published_at: 2020-05-22
@@ -24,7 +24,7 @@
   stage: Plan
   self-managed: true
   gitlab-com: true
-  packages: ultimate, gold
+  packages: [Ultimate, Gold]
   url: https://docs.gitlab.com/ee/user/group/roadmap/
   image_url: https://about.gitlab.com/images/13_0/Expand-Epic-Hierarchy-Roadmap_roadmap.png
   published_at: 2020-05-22
@@ -34,7 +34,7 @@
   stage: Create
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/snippets.html#versioned-snippets
   image_url: https://about.gitlab.com/images/13_0/phikai-versioned-snippets.png
   published_at: 2020-05-22
@@ -44,7 +44,7 @@
   stage: Create
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/web_ide/#themes
   image_url: https://about.gitlab.com/images/13_0/phikai-web-ide-dark-theme.png
   published_at: 2020-05-22
diff --git a/data/whats_new/202008180003_13_01.yml b/data/whats_new/202008180003_13_01.yml
index 6bde6f6397d..304f6a29f75 100644
--- a/data/whats_new/202008180003_13_01.yml
+++ b/data/whats_new/202008180003_13_01.yml
@@ -4,7 +4,7 @@
   stage: Monitor
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/operations/alert_management.html
   image_url: https://about.gitlab.com/images/13_1/alert_management.png
   published_at: 2020-06-22
@@ -14,7 +14,7 @@
   stage: Verify
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/merge_requests/accessibility_testing.html#accessibility-merge-request-widget
   image_url: https://about.gitlab.com/images/13_1/a11y-merge-request-widget.png
   published_at: 2020-06-22
@@ -24,7 +24,7 @@
   stage: Create
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/issues/design_management.html#resolve-design-threads
   image_url: https://about.gitlab.com/images/13_1/resolve-design-comment.gif
   published_at: 2020-06-22
@@ -34,7 +34,7 @@
   stage: Create
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/discussions/index.html#merge-request-reviews
   image_url: https://about.gitlab.com/images/13_1/batch_comments.png
   published_at: 2020-06-22
diff --git a/data/whats_new/202008210001_13_02.yml b/data/whats_new/202008210001_13_02.yml
index de8289ee6c3..64ee0b0174a 100644
--- a/data/whats_new/202008210001_13_02.yml
+++ b/data/whats_new/202008210001_13_02.yml
@@ -4,7 +4,7 @@
   stage: Plan
   self-managed: true
   gitlab-com: true
-  packages: starter, premium, ultimate
+  packages: [Starter, Premium, Ultimate]
   url: https://www.youtube.com/watch?v=31pNKjenlJY&feature=emb_title
   image_url: http://i3.ytimg.com/vi/31pNKjenlJY/maxresdefault.jpg
   published_at: 2020-07-22
@@ -14,7 +14,7 @@
   stage: Defend
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://www.youtube.com/watch?v=WxBzBz76FxU&feature=youtu.be
   image_url: http://i3.ytimg.com/vi/WxBzBz76FxU/hqdefault.jpg
   published_at: 2020-07-22
@@ -24,7 +24,7 @@
   stage: Create
   self-managed: false
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/issues/design_management.html#gitlab-figma-plugin
   image_url: https://about.gitlab.com/images/13_2/figma-plugin.png
   published_at: 2020-07-22
@@ -34,7 +34,7 @@
   stage: Monitor
   self-managed: true
   gitlab-com: true
-  packages: All
+  packages: [All]
   url: https://docs.gitlab.com/ee/user/project/clusters/#visualizing-cluster-health
   image_url: https://about.gitlab.com/images/13_2/k8s_cluster_monitoring.png
   published_at: 2020-07-22
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index d8072955820..90d43aa3531 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -11352,6 +11352,16 @@ type Project {
     last: Int
   ): DastScannerProfileConnection
 
+  """
+  DAST Site Profile associated with the project
+  """
+  dastSiteProfile(
+    """
+    ID of the site profile
+    """
+    id: DastSiteProfileID!
+  ): DastSiteProfile
+
   """
   DAST Site Profiles associated with the project
   """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 10dfa4773d2..a7f15dc6a35 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -33932,6 +33932,33 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "dastSiteProfile",
+              "description": "DAST Site Profile associated with the project",
+              "args": [
+                {
+                  "name": "id",
+                  "description": "ID of the site profile",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "DastSiteProfileID",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DastSiteProfile",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "dastSiteProfiles",
               "description": "DAST Site Profiles associated with the project",
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 02357a69537..136286f355b 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1737,6 +1737,7 @@ Autogenerated return type of PipelineRetry
 | `containerExpirationPolicy` | ContainerExpirationPolicy | The container expiration policy of the project |
 | `containerRegistryEnabled` | Boolean | Indicates if the project stores Docker container images in a container registry |
 | `createdAt` | Time | Timestamp of the project creation |
+| `dastSiteProfile` | DastSiteProfile | DAST Site Profile associated with the project |
 | `description` | String | Short description of the project |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `environment` | Environment | A single environment of the project |
diff --git a/doc/api/users.md b/doc/api/users.md
index 4c762958b52..c3fbd559b74 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -776,7 +776,7 @@ POST /user/keys
 
 Parameters:
 
-- `title` (required) - new SSH Key's title
+- `title` (required) - new SSH key's title
 - `key` (required) - new SSH key
 - `expires_at` (optional) - The expiration date of the SSH key in ISO 8601 format (`YYYY-MM-DDTHH:MM:SSZ`)
 
@@ -815,7 +815,7 @@ POST /users/:id/keys
 Parameters:
 
 - `id` (required) - ID of specified user
-- `title` (required) - new SSH Key's title
+- `title` (required) - new SSH key's title
 - `key` (required) - new SSH key
 - `expires_at` (optional) - The expiration date of the SSH key in ISO 8601 format (`YYYY-MM-DDTHH:MM:SSZ`)
 
diff --git a/doc/development/fe_guide/style/index.md b/doc/development/fe_guide/style/index.md
index 8d70d4db893..4ca409664de 100644
--- a/doc/development/fe_guide/style/index.md
+++ b/doc/development/fe_guide/style/index.md
@@ -1,11 +1,11 @@
 # GitLab development style guides
 
-See below the relevant style guides, guidelines, linting, and other information for developing GitLab.
+See below for the relevant style guides, guidelines, linting, and other information for developing GitLab.
 
 ## JavaScript style guide
 
 We use `eslint` to enforce our [JavaScript style guides](javascript.md). Our guide is based on
-the excellent [AirBnB](https://github.com/airbnb/javascript) style guide with a few small
+the excellent [Airbnb](https://github.com/airbnb/javascript) style guide with a few small
 changes.
 
 ## SCSS style guide
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 22ad311ab4f..16b561f7ec1 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -711,7 +711,8 @@ If your namespace shows `N/A` as the total storage usage, you can trigger a reca
 
 #### Group push rules **(STARTER)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34370) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34370) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/224129) in GitLab 13.4.
 
 Group push rules allow group maintainers to set
 [push rules](../../push_rules/push_rules.md) for newly created projects within the specific group.
@@ -724,14 +725,6 @@ When set, new subgroups have push rules set for them based on either:
 - The closest parent group with push rules defined.
 - Push rules set at the instance level, if no parent groups have push rules defined.
 
-##### Enabling the feature
-
-This feature comes with the `:group_push_rules` feature flag disabled by default. It can be enabled for specific group using feature flag [API endpoint](../../api/features.md#set-or-create-a-feature) or by GitLab administrator with Rails console access by running:
-
-```ruby
-Feature.enable(:group_push_rules)
-```
-
 ### Maximum artifacts size **(CORE ONLY)**
 
 For information about setting a maximum artifact size for a group, see
diff --git a/doc/user/project/code_intelligence.md b/doc/user/project/code_intelligence.md
index 5a55913af29..f56673e69b7 100644
--- a/doc/user/project/code_intelligence.md
+++ b/doc/user/project/code_intelligence.md
@@ -39,38 +39,18 @@ The generated LSIF file must be less than 170MiB.
 
 After the job succeeds, code intelligence data can be viewed while browsing the code:
 
-![Code intelligence](img/code_intelligence_v13_1.png)
+![Code intelligence](img/code_intelligence_v13_4.png)
 
 ## Find references
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/217392) in GitLab 13.2.
-> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/225621) on GitLab 13.3.
-> - It's enabled on GitLab.com.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/235735) in GitLab 13.4.
 
 To find where a particular object is being used, you can see links to specific lines of code
 under the **References** tab:
 
 ![Find references](img/code_intelligence_find_references_v13_3.png)
 
-### Enable or disable find references
-
-Find references is under development but ready for production use.
-It is deployed behind a feature flag that is **enabled by default**.
-[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
-can opt to disable it for your instance.
-
-To disable it:
-
-```ruby
-Feature.disable(:code_navigation_references)
-```
-
-To enable it:
-
-```ruby
-Feature.enable(:code_navigation_references)
-```
-
 ## Language support
 
 Generating an LSIF file requires a language server indexer implementation for the
diff --git a/doc/user/project/img/code_intelligence_v13_1.png b/doc/user/project/img/code_intelligence_v13_1.png
deleted file mode 100644
index 744195caed2..00000000000
Binary files a/doc/user/project/img/code_intelligence_v13_1.png and /dev/null differ
diff --git a/doc/user/project/img/code_intelligence_v13_4.png b/doc/user/project/img/code_intelligence_v13_4.png
new file mode 100644
index 00000000000..bbb6ce67bcc
Binary files /dev/null and b/doc/user/project/img/code_intelligence_v13_4.png differ
diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb
index dbaa6951e64..d1882059dd8 100644
--- a/lib/gitlab/ci/pipeline/chain/command.rb
+++ b/lib/gitlab/ci/pipeline/chain/command.rb
@@ -12,7 +12,7 @@ module Gitlab
           :seeds_block, :variables_attributes, :push_options,
           :chat_data, :allow_mirror_update, :bridge, :content, :dry_run,
           # These attributes are set by Chains during processing:
-          :config_content, :config_processor, :stage_seeds
+          :config_content, :yaml_processor_result, :stage_seeds
         ) do
           include Gitlab::Utils::StrongMemoize
 
diff --git a/lib/gitlab/ci/pipeline/chain/config/process.rb b/lib/gitlab/ci/pipeline/chain/config/process.rb
index 5eaad1b9485..8ccb33ffd34 100644
--- a/lib/gitlab/ci/pipeline/chain/config/process.rb
+++ b/lib/gitlab/ci/pipeline/chain/config/process.rb
@@ -23,7 +23,7 @@ module Gitlab
               add_warnings_to_pipeline(result.warnings)
 
               if result.valid?
-                @command.config_processor = result
+                @command.yaml_processor_result = result
               else
                 error(result.errors.first, config_error: true)
               end
diff --git a/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb b/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb
index a793ae9cc24..3c910963a2a 100644
--- a/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb
+++ b/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules.rb
@@ -39,7 +39,7 @@ module Gitlab
           end
 
           def workflow_config
-            @command.config_processor.workflow_attributes || {}
+            @command.yaml_processor_result.workflow_attributes || {}
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb b/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb
index 9267c72efa4..71f22c52869 100644
--- a/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb
+++ b/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs.rb
@@ -6,13 +6,13 @@ module Gitlab
       module Chain
         class RemoveUnwantedChatJobs < Chain::Base
           def perform!
-            raise ArgumentError, 'missing config processor' unless @command.config_processor
+            raise ArgumentError, 'missing YAML processor result' unless @command.yaml_processor_result
 
             return unless pipeline.chat?
 
             # When scheduling a chat pipeline we only want to run the build
             # that matches the chat command.
-            @command.config_processor.jobs.select! do |name, _|
+            @command.yaml_processor_result.jobs.select! do |name, _|
               name.to_s == command.chat_data[:command].to_s
             end
           end
diff --git a/lib/gitlab/ci/pipeline/chain/seed.rb b/lib/gitlab/ci/pipeline/chain/seed.rb
index e48e79d561b..e10a0bc3718 100644
--- a/lib/gitlab/ci/pipeline/chain/seed.rb
+++ b/lib/gitlab/ci/pipeline/chain/seed.rb
@@ -9,7 +9,7 @@ module Gitlab
           include Gitlab::Utils::StrongMemoize
 
           def perform!
-            raise ArgumentError, 'missing config processor' unless @command.config_processor
+            raise ArgumentError, 'missing YAML processor result' unless @command.yaml_processor_result
 
             # Allocate next IID. This operation must be outside of transactions of pipeline creations.
             pipeline.ensure_project_iid!
@@ -56,7 +56,7 @@ module Gitlab
           end
 
           def stages_attributes
-            @command.config_processor.stages_attributes
+            @command.yaml_processor_result.stages_attributes
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/chain/validate/external.rb b/lib/gitlab/ci/pipeline/chain/validate/external.rb
index 24628338dd2..d056501a6d3 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/external.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/external.rb
@@ -51,7 +51,7 @@ module Gitlab
             def validate_service_request
               Gitlab::HTTP.post(
                 validation_service_url, timeout: VALIDATION_REQUEST_TIMEOUT,
-                body: validation_service_payload(@pipeline, @command.config_processor.stages_attributes)
+                body: validation_service_payload(@pipeline, @command.yaml_processor_result.stages_attributes)
               )
             end
 
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index 878f11eb9ce..5694ce8255a 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -192,6 +192,7 @@ module Gitlab
         # Files that don't fit into any category are marked with :none
         %r{\A(ee/)?changelogs/} => :none,
         %r{\Alocale/gitlab\.pot\z} => :none,
+        %r{\Adata/whats_new/} => :none,
 
         # Fallbacks in case the above patterns miss anything
         %r{\.rb\z} => :backend,
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 14a50c8d5ef..acd052ab99d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1162,7 +1162,7 @@ msgstr ""
 msgid "A merge request approval is required when a security report contains a new vulnerability of high, critical, or unknown severity."
 msgstr ""
 
-msgid "A merge request approval is required when the license compliance report contains a blacklisted license."
+msgid "A merge request approval is required when the license compliance report contains a denied license."
 msgstr ""
 
 msgid "A new Auto DevOps pipeline has been created, go to %{pipelines_link_start}Pipelines page%{pipelines_link_end} for details"
@@ -2873,6 +2873,9 @@ msgstr ""
 msgid "An error occurred while updating the comment"
 msgstr ""
 
+msgid "An error occurred while updating the list. Please try again."
+msgstr ""
+
 msgid "An error occurred while validating group path"
 msgstr ""
 
@@ -7704,6 +7707,9 @@ msgstr ""
 msgid "DAG visualization requires at least 3 dependent jobs."
 msgstr ""
 
+msgid "DAST Profiles"
+msgstr ""
+
 msgid "DNS"
 msgstr ""
 
@@ -7737,6 +7743,9 @@ msgstr ""
 msgid "DastProfiles|Are you sure you want to delete this profile?"
 msgstr ""
 
+msgid "DastProfiles|Could not create the scanner profile. Please try again."
+msgstr ""
+
 msgid "DastProfiles|Could not create the site profile. Please try again."
 msgstr ""
 
@@ -7761,6 +7770,9 @@ msgstr ""
 msgid "DastProfiles|Could not update the site profile. Please try again."
 msgstr ""
 
+msgid "DastProfiles|Do you want to discard this scanner profile?"
+msgstr ""
+
 msgid "DastProfiles|Do you want to discard this site profile?"
 msgstr ""
 
@@ -7782,10 +7794,13 @@ msgstr ""
 msgid "DastProfiles|Manage profiles"
 msgstr ""
 
-msgid "DastProfiles|New Profile"
+msgid "DastProfiles|Minimum = 0 (no timeout enabled), Maximum = 2880 minutes"
 msgstr ""
 
-msgid "DastProfiles|New Scanner Profile"
+msgid "DastProfiles|Minimum = 1 second, Maximum = 3600 seconds"
+msgstr ""
+
+msgid "DastProfiles|New Profile"
 msgstr ""
 
 msgid "DastProfiles|New scanner profile"
@@ -7800,6 +7815,9 @@ msgstr ""
 msgid "DastProfiles|Please enter a valid URL format, ex: http://www.example.com/home"
 msgstr ""
 
+msgid "DastProfiles|Please enter a valid timeout value"
+msgstr ""
+
 msgid "DastProfiles|Profile name"
 msgstr ""
 
@@ -7821,9 +7839,21 @@ msgstr ""
 msgid "DastProfiles|Site Profiles"
 msgstr ""
 
+msgid "DastProfiles|Spider timeout"
+msgstr ""
+
 msgid "DastProfiles|Target URL"
 msgstr ""
 
+msgid "DastProfiles|Target timeout"
+msgstr ""
+
+msgid "DastProfiles|The maximum number of seconds allowed for the site under test to respond to a request."
+msgstr ""
+
+msgid "DastProfiles|The maximum number of seconds allowed for the spider to traverse the site."
+msgstr ""
+
 msgid "Data is still calculating..."
 msgstr ""
 
@@ -13076,6 +13106,9 @@ msgstr ""
 msgid "In the next step, you'll be able to select the projects you want to import."
 msgstr ""
 
+msgid "Incident"
+msgstr ""
+
 msgid "Incident Management Limits"
 msgstr ""
 
@@ -21481,6 +21514,9 @@ msgstr ""
 msgid "Save variables"
 msgstr ""
 
+msgid "Saved scan settings and target site settings which are reusable."
+msgstr ""
+
 msgid "Saving"
 msgstr ""
 
@@ -21774,6 +21810,9 @@ msgstr ""
 msgid "Secondary"
 msgstr ""
 
+msgid "Seconds"
+msgstr ""
+
 msgid "Secret"
 msgstr ""
 
@@ -21816,6 +21855,9 @@ msgstr ""
 msgid "SecurityConfiguration|An error occurred while creating the merge request."
 msgstr ""
 
+msgid "SecurityConfiguration|Available for on-demand DAST"
+msgstr ""
+
 msgid "SecurityConfiguration|Configure"
 msgstr ""
 
@@ -22248,6 +22290,9 @@ msgstr ""
 msgid "Select timezone"
 msgstr ""
 
+msgid "Select type"
+msgstr ""
+
 msgid "Select user"
 msgstr ""
 
diff --git a/package.json b/package.json
index ffdd715fb19..2b25df68d86 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "vue-template-compiler": "^2.6.10",
     "vue-virtual-scroll-list": "^1.4.4",
     "vuedraggable": "^2.23.0",
-    "vuex": "^3.1.0",
+    "vuex": "^3.5.1",
     "webpack": "^4.42.0",
     "webpack-bundle-analyzer": "^3.6.0",
     "webpack-cli": "^3.3.11",
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index 6803b3a5785..2d1fca78589 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe 'Group navbar' do
         nav_item: _('Merge Requests'),
         nav_sub_items: []
       },
+      (push_rules_nav_item if Gitlab.ee?),
       {
         nav_item: _('Kubernetes'),
         nav_sub_items: []
@@ -47,7 +48,6 @@ RSpec.describe 'Group navbar' do
   before do
     insert_package_nav(_('Kubernetes'))
 
-    stub_feature_flags(group_push_rules: false)
     stub_feature_flags(group_iterations: false)
     stub_feature_flags(group_wiki: false)
     group.add_maintainer(user)
diff --git a/spec/features/issues/user_creates_issue_spec.rb b/spec/features/issues/user_creates_issue_spec.rb
index a2c868d0256..fe773685373 100644
--- a/spec/features/issues/user_creates_issue_spec.rb
+++ b/spec/features/issues/user_creates_issue_spec.rb
@@ -188,6 +188,46 @@ RSpec.describe "User creates issue" do
       end
     end
 
+    context 'form create handles issue creation by default' do
+      let(:project) { create(:project) }
+
+      before do
+        visit new_project_issue_path(project)
+      end
+
+      it 'pre-fills the issue type dropdown with issue type' do
+        expect(find('.js-issuable-type-filter-dropdown-wrap .dropdown-label')).to have_content('Issue')
+      end
+
+      it 'does not hide the milestone select' do
+        expect(page).to have_selector('.qa-issuable-milestone-dropdown')
+      end
+    end
+
+    context 'form create handles incident creation' do
+      let(:project) { create(:project) }
+
+      before do
+        visit new_project_issue_path(project, { 'issue[issue_type]': 'incident', issuable_template: 'incident' })
+      end
+
+      it 'pre-fills the issue type dropdown with incident type' do
+        expect(find('.js-issuable-type-filter-dropdown-wrap .dropdown-label')).to have_content('Incident')
+      end
+
+      it 'hides the epic select' do
+        expect(page).not_to have_selector('.epic-dropdown-container')
+      end
+
+      it 'hides the milestone select' do
+        expect(page).not_to have_selector('.qa-issuable-milestone-dropdown')
+      end
+
+      it 'hides the weight input' do
+        expect(page).not_to have_selector('.qa-issuable-weight-input')
+      end
+    end
+
     context 'suggestions', :js do
       it 'displays list of related issues' do
         issue = create(:issue, project: project)
diff --git a/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js b/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js
index 6904e34db5d..1a3b151afa0 100644
--- a/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js
+++ b/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js
@@ -78,7 +78,7 @@ describe('AddContextCommitsModal', () => {
       findSearch().vm.$emit('input', searchText);
       expect(searchCommits).not.toBeCalled();
       jest.advanceTimersByTime(500);
-      expect(searchCommits).toHaveBeenCalledWith(expect.anything(), searchText, undefined);
+      expect(searchCommits).toHaveBeenCalledWith(expect.anything(), searchText);
     });
 
     it('disabled ok button when no row is selected', () => {
@@ -119,18 +119,17 @@ describe('AddContextCommitsModal', () => {
       wrapper.vm.$store.state.selectedCommits = [{ ...commit, isSelected: true }];
       findModal().vm.$emit('ok');
       return wrapper.vm.$nextTick().then(() => {
-        expect(createContextCommits).toHaveBeenCalledWith(
-          expect.anything(),
-          { commits: [{ ...commit, isSelected: true }], forceReload: true },
-          undefined,
-        );
+        expect(createContextCommits).toHaveBeenCalledWith(expect.anything(), {
+          commits: [{ ...commit, isSelected: true }],
+          forceReload: true,
+        });
       });
     });
     it('"removeContextCommits" when only added commits are to be removed ', () => {
       wrapper.vm.$store.state.toRemoveCommits = [commit.short_id];
       findModal().vm.$emit('ok');
       return wrapper.vm.$nextTick().then(() => {
-        expect(removeContextCommits).toHaveBeenCalledWith(expect.anything(), true, undefined);
+        expect(removeContextCommits).toHaveBeenCalledWith(expect.anything(), true);
       });
     });
     it('"createContextCommits" and "removeContextCommits" when new commits are to be added and old commits are to be removed', () => {
@@ -138,12 +137,10 @@ describe('AddContextCommitsModal', () => {
       wrapper.vm.$store.state.toRemoveCommits = [commit.short_id];
       findModal().vm.$emit('ok');
       return wrapper.vm.$nextTick().then(() => {
-        expect(createContextCommits).toHaveBeenCalledWith(
-          expect.anything(),
-          { commits: [{ ...commit, isSelected: true }] },
-          undefined,
-        );
-        expect(removeContextCommits).toHaveBeenCalledWith(expect.anything(), undefined, undefined);
+        expect(createContextCommits).toHaveBeenCalledWith(expect.anything(), {
+          commits: [{ ...commit, isSelected: true }],
+        });
+        expect(removeContextCommits).toHaveBeenCalledWith(expect.anything(), undefined);
       });
     });
   });
@@ -156,7 +153,7 @@ describe('AddContextCommitsModal', () => {
     });
     it('"resetModalState" to reset all the modal state', () => {
       findModal().vm.$emit('cancel');
-      expect(resetModalState).toHaveBeenCalledWith(expect.anything(), undefined, undefined);
+      expect(resetModalState).toHaveBeenCalledWith(expect.anything(), undefined);
     });
   });
 
@@ -168,7 +165,7 @@ describe('AddContextCommitsModal', () => {
     });
     it('"resetModalState" to reset all the modal state', () => {
       findModal().vm.$emit('close');
-      expect(resetModalState).toHaveBeenCalledWith(expect.anything(), undefined, undefined);
+      expect(resetModalState).toHaveBeenCalledWith(expect.anything(), undefined);
     });
   });
 });
diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index fa29145b940..ab38abd15ba 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -1,4 +1,5 @@
 import testAction from 'helpers/vuex_action_helper';
+import { mockListsWithModel } from '../mock_data';
 import actions, { gqlClient } from '~/boards/stores/actions';
 import * as types from '~/boards/stores/mutation_types';
 import { inactiveId, ListType } from '~/boards/constants';
@@ -160,8 +161,63 @@ describe('createList', () => {
   });
 });
 
+describe('moveList', () => {
+  it('should commit MOVE_LIST mutation and dispatch updateList action', done => {
+    const state = {
+      endpoints: { fullPath: 'gitlab-org', boardId: '1' },
+      boardType: 'group',
+      disabled: false,
+      boardLists: mockListsWithModel,
+    };
+
+    testAction(
+      actions.moveList,
+      { listId: 'gid://gitlab/List/1', newIndex: 1, adjustmentValue: 1 },
+      state,
+      [
+        {
+          type: types.MOVE_LIST,
+          payload: { movedList: mockListsWithModel[0], listAtNewIndex: mockListsWithModel[1] },
+        },
+      ],
+      [
+        {
+          type: 'updateList',
+          payload: { listId: 'gid://gitlab/List/1', position: 0, backupList: mockListsWithModel },
+        },
+      ],
+      done,
+    );
+  });
+});
+
 describe('updateList', () => {
-  expectNotImplemented(actions.updateList);
+  it('should commit UPDATE_LIST_FAILURE mutation when API returns an error', done => {
+    jest.spyOn(gqlClient, 'mutate').mockResolvedValue({
+      data: {
+        updateBoardList: {
+          list: {},
+          errors: [{ foo: 'bar' }],
+        },
+      },
+    });
+
+    const state = {
+      endpoints: { fullPath: 'gitlab-org', boardId: '1' },
+      boardType: 'group',
+      disabled: false,
+      boardLists: [{ type: 'closed' }],
+    };
+
+    testAction(
+      actions.updateList,
+      { listId: 'gid://gitlab/List/1', position: 1 },
+      state,
+      [{ type: types.UPDATE_LIST_FAILURE }],
+      [],
+      done,
+    );
+  });
 });
 
 describe('deleteList', () => {
diff --git a/spec/frontend/boards/stores/mutations_spec.js b/spec/frontend/boards/stores/mutations_spec.js
index d1e2c49428f..5a4f703f72e 100644
--- a/spec/frontend/boards/stores/mutations_spec.js
+++ b/spec/frontend/boards/stores/mutations_spec.js
@@ -1,7 +1,7 @@
 import mutations from '~/boards/stores/mutations';
 import * as types from '~/boards/stores/mutation_types';
 import defaultState from '~/boards/stores/state';
-import { listObj, listObjDuplicate, mockIssue } from '../mock_data';
+import { listObj, listObjDuplicate, mockIssue, mockListsWithModel } from '../mock_data';
 
 const expectNotImplemented = action => {
   it('is not implemented', () => {
@@ -92,16 +92,35 @@ describe('Board Store Mutations', () => {
     expectNotImplemented(mutations.RECEIVE_ADD_LIST_ERROR);
   });
 
-  describe('REQUEST_UPDATE_LIST', () => {
-    expectNotImplemented(mutations.REQUEST_UPDATE_LIST);
+  describe('MOVE_LIST', () => {
+    it('updates boardLists state with reordered lists', () => {
+      state = {
+        ...state,
+        boardLists: mockListsWithModel,
+      };
+
+      mutations.MOVE_LIST(state, {
+        movedList: mockListsWithModel[0],
+        listAtNewIndex: mockListsWithModel[1],
+      });
+
+      expect(state.boardLists).toEqual([mockListsWithModel[1], mockListsWithModel[0]]);
+    });
   });
 
-  describe('RECEIVE_UPDATE_LIST_SUCCESS', () => {
-    expectNotImplemented(mutations.RECEIVE_UPDATE_LIST_SUCCESS);
-  });
+  describe('UPDATE_LIST_FAILURE', () => {
+    it('updates boardLists state with previous order and sets error message', () => {
+      state = {
+        ...state,
+        boardLists: [mockListsWithModel[1], mockListsWithModel[0]],
+        error: undefined,
+      };
 
-  describe('RECEIVE_UPDATE_LIST_ERROR', () => {
-    expectNotImplemented(mutations.RECEIVE_UPDATE_LIST_ERROR);
+      mutations.UPDATE_LIST_FAILURE(state, mockListsWithModel);
+
+      expect(state.boardLists).toEqual(mockListsWithModel);
+      expect(state.error).toEqual('An error occurred while updating the list. Please try again.');
+    });
   });
 
   describe('REQUEST_REMOVE_LIST', () => {
diff --git a/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js b/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js
index 6d0f8503103..d7dd7072f67 100644
--- a/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js
+++ b/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js
@@ -401,43 +401,33 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setRegion action', () => {
-      expect(actions.setRegion).toHaveBeenCalledWith(expect.anything(), { region }, undefined);
+      expect(actions.setRegion).toHaveBeenCalledWith(expect.anything(), { region });
     });
 
     it('fetches available vpcs', () => {
-      expect(vpcsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { region }, undefined);
+      expect(vpcsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { region });
     });
 
     it('fetches available key pairs', () => {
-      expect(keyPairsActions.fetchItems).toHaveBeenCalledWith(
-        expect.anything(),
-        { region },
-        undefined,
-      );
+      expect(keyPairsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { region });
     });
 
     it('cleans selected vpc', () => {
-      expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc: null }, undefined);
+      expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc: null });
     });
 
     it('cleans selected key pair', () => {
-      expect(actions.setKeyPair).toHaveBeenCalledWith(
-        expect.anything(),
-        { keyPair: null },
-        undefined,
-      );
+      expect(actions.setKeyPair).toHaveBeenCalledWith(expect.anything(), { keyPair: null });
     });
 
     it('cleans selected subnet', () => {
-      expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] }, undefined);
+      expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] });
     });
 
     it('cleans selected security group', () => {
-      expect(actions.setSecurityGroup).toHaveBeenCalledWith(
-        expect.anything(),
-        { securityGroup: null },
-        undefined,
-      );
+      expect(actions.setSecurityGroup).toHaveBeenCalledWith(expect.anything(), {
+        securityGroup: null,
+      });
     });
   });
 
@@ -446,11 +436,7 @@ describe('EksClusterConfigurationForm', () => {
 
     findClusterNameInput().vm.$emit('input', clusterName);
 
-    expect(actions.setClusterName).toHaveBeenCalledWith(
-      expect.anything(),
-      { clusterName },
-      undefined,
-    );
+    expect(actions.setClusterName).toHaveBeenCalledWith(expect.anything(), { clusterName });
   });
 
   it('dispatches setEnvironmentScope when environment scope input changes', () => {
@@ -458,11 +444,9 @@ describe('EksClusterConfigurationForm', () => {
 
     findEnvironmentScopeInput().vm.$emit('input', environmentScope);
 
-    expect(actions.setEnvironmentScope).toHaveBeenCalledWith(
-      expect.anything(),
-      { environmentScope },
-      undefined,
-    );
+    expect(actions.setEnvironmentScope).toHaveBeenCalledWith(expect.anything(), {
+      environmentScope,
+    });
   });
 
   it('dispatches setKubernetesVersion when kubernetes version dropdown changes', () => {
@@ -470,11 +454,9 @@ describe('EksClusterConfigurationForm', () => {
 
     findKubernetesVersionDropdown().vm.$emit('input', kubernetesVersion);
 
-    expect(actions.setKubernetesVersion).toHaveBeenCalledWith(
-      expect.anything(),
-      { kubernetesVersion },
-      undefined,
-    );
+    expect(actions.setKubernetesVersion).toHaveBeenCalledWith(expect.anything(), {
+      kubernetesVersion,
+    });
   });
 
   it('dispatches setGitlabManagedCluster when gitlab managed cluster input changes', () => {
@@ -482,11 +464,9 @@ describe('EksClusterConfigurationForm', () => {
 
     findGitlabManagedClusterCheckbox().vm.$emit('input', gitlabManagedCluster);
 
-    expect(actions.setGitlabManagedCluster).toHaveBeenCalledWith(
-      expect.anything(),
-      { gitlabManagedCluster },
-      undefined,
-    );
+    expect(actions.setGitlabManagedCluster).toHaveBeenCalledWith(expect.anything(), {
+      gitlabManagedCluster,
+    });
   });
 
   describe('when vpc is selected', () => {
@@ -499,35 +479,28 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setVpc action', () => {
-      expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc }, undefined);
+      expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc });
     });
 
     it('cleans selected subnet', () => {
-      expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] }, undefined);
+      expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] });
     });
 
     it('cleans selected security group', () => {
-      expect(actions.setSecurityGroup).toHaveBeenCalledWith(
-        expect.anything(),
-        { securityGroup: null },
-        undefined,
-      );
+      expect(actions.setSecurityGroup).toHaveBeenCalledWith(expect.anything(), {
+        securityGroup: null,
+      });
     });
 
     it('dispatches fetchSubnets action', () => {
-      expect(subnetsActions.fetchItems).toHaveBeenCalledWith(
-        expect.anything(),
-        { vpc, region },
-        undefined,
-      );
+      expect(subnetsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { vpc, region });
     });
 
     it('dispatches fetchSecurityGroups action', () => {
-      expect(securityGroupsActions.fetchItems).toHaveBeenCalledWith(
-        expect.anything(),
-        { vpc, region },
-        undefined,
-      );
+      expect(securityGroupsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), {
+        vpc,
+        region,
+      });
     });
   });
 
@@ -539,7 +512,7 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setSubnet action', () => {
-      expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet }, undefined);
+      expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet });
     });
   });
 
@@ -551,7 +524,7 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setRole action', () => {
-      expect(actions.setRole).toHaveBeenCalledWith(expect.anything(), { role }, undefined);
+      expect(actions.setRole).toHaveBeenCalledWith(expect.anything(), { role });
     });
   });
 
@@ -563,7 +536,7 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setKeyPair action', () => {
-      expect(actions.setKeyPair).toHaveBeenCalledWith(expect.anything(), { keyPair }, undefined);
+      expect(actions.setKeyPair).toHaveBeenCalledWith(expect.anything(), { keyPair });
     });
   });
 
@@ -575,11 +548,7 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setSecurityGroup action', () => {
-      expect(actions.setSecurityGroup).toHaveBeenCalledWith(
-        expect.anything(),
-        { securityGroup },
-        undefined,
-      );
+      expect(actions.setSecurityGroup).toHaveBeenCalledWith(expect.anything(), { securityGroup });
     });
   });
 
@@ -591,11 +560,7 @@ describe('EksClusterConfigurationForm', () => {
     });
 
     it('dispatches setInstanceType action', () => {
-      expect(actions.setInstanceType).toHaveBeenCalledWith(
-        expect.anything(),
-        { instanceType },
-        undefined,
-      );
+      expect(actions.setInstanceType).toHaveBeenCalledWith(expect.anything(), { instanceType });
     });
   });
 
@@ -604,7 +569,7 @@ describe('EksClusterConfigurationForm', () => {
 
     findNodeCountInput().vm.$emit('input', nodeCount);
 
-    expect(actions.setNodeCount).toHaveBeenCalledWith(expect.anything(), { nodeCount }, undefined);
+    expect(actions.setNodeCount).toHaveBeenCalledWith(expect.anything(), { nodeCount });
   });
 
   describe('when all cluster configuration fields are set', () => {
diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js
index 57ef74f0119..c09eaa63d4d 100644
--- a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js
+++ b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js
@@ -124,11 +124,7 @@ describe('GkeMachineTypeDropdown', () => {
       wrapper.find('.dropdown-content button').trigger('click');
 
       return wrapper.vm.$nextTick().then(() => {
-        expect(setMachineType).toHaveBeenCalledWith(
-          expect.anything(),
-          selectedMachineTypeMock,
-          undefined,
-        );
+        expect(setMachineType).toHaveBeenCalledWith(expect.anything(), selectedMachineTypeMock);
       });
     });
   });
diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js
index 1df583af711..ce24d186511 100644
--- a/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js
+++ b/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js
@@ -121,23 +121,19 @@ describe('GkeNetworkDropdown', () => {
     });
 
     it('cleans selected subnetwork', () => {
-      expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), '', undefined);
+      expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), '');
     });
 
     it('dispatches the setNetwork action', () => {
-      expect(setNetwork).toHaveBeenCalledWith(expect.anything(), selectedNetwork, undefined);
+      expect(setNetwork).toHaveBeenCalledWith(expect.anything(), selectedNetwork);
     });
 
     it('fetches subnetworks for the selected project, region, and network', () => {
-      expect(fetchSubnetworks).toHaveBeenCalledWith(
-        expect.anything(),
-        {
-          project: projectId,
-          region,
-          network: selectedNetwork.selfLink,
-        },
-        undefined,
-      );
+      expect(fetchSubnetworks).toHaveBeenCalledWith(expect.anything(), {
+        project: projectId,
+        region,
+        network: selectedNetwork.selfLink,
+      });
     });
   });
 });
diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js
index 0d429778a44..eb58108bf3c 100644
--- a/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js
+++ b/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js
@@ -130,7 +130,6 @@ describe('GkeProjectIdDropdown', () => {
         expect(setProject).toHaveBeenCalledWith(
           expect.anything(),
           gapiProjectsResponseMock.projects[0],
-          undefined,
         );
       });
     });
diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js
index a1dc3960fe9..35e43d5b033 100644
--- a/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js
+++ b/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js
@@ -107,7 +107,7 @@ describe('GkeSubnetworkDropdown', () => {
 
       wrapper.find(ClusterFormDropdown).vm.$emit('input', selectedSubnetwork);
 
-      expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), selectedSubnetwork, undefined);
+      expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), selectedSubnetwork);
     });
   });
 });
diff --git a/spec/frontend/design_management/pages/index_apollo_spec.js b/spec/frontend/design_management/pages/index_apollo_spec.js
index 3ea711c2cfa..c1a3f8643e7 100644
--- a/spec/frontend/design_management/pages/index_apollo_spec.js
+++ b/spec/frontend/design_management/pages/index_apollo_spec.js
@@ -1,15 +1,14 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import { createMockClient } from 'mock-apollo-client';
 import VueApollo from 'vue-apollo';
 import VueRouter from 'vue-router';
 import VueDraggable from 'vuedraggable';
-import { InMemoryCache } from 'apollo-cache-inmemory';
 import Design from '~/design_management/components/list/item.vue';
 import createRouter from '~/design_management/router';
 import getDesignListQuery from '~/design_management/graphql/queries/get_design_list.query.graphql';
 import permissionsQuery from '~/design_management/graphql/queries/design_permissions.query.graphql';
 import moveDesignMutation from '~/design_management/graphql/mutations/move_design.mutation.graphql';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createMockApollo from '../../helpers/mock_apollo_helper';
 import Index from '~/design_management/pages/index.vue';
 import {
   designListQueryResponse,
@@ -39,8 +38,7 @@ const designToMove = {
 
 describe('Design management index page with Apollo mock', () => {
   let wrapper;
-  let mockClient;
-  let apolloProvider;
+  let fakeApollo;
   let moveDesignHandler;
 
   async function moveDesigns(localWrapper) {
@@ -56,41 +54,23 @@ describe('Design management index page with Apollo mock', () => {
     });
   }
 
-  const fragmentMatcher = { match: () => true };
-
-  const cache = new InMemoryCache({
-    fragmentMatcher,
-    addTypename: false,
-  });
-
   const findDesigns = () => wrapper.findAll(Design);
 
   function createComponent({
     moveHandler = jest.fn().mockResolvedValue(moveDesignMutationResponse),
   }) {
-    mockClient = createMockClient({ cache });
-
-    mockClient.setRequestHandler(
-      getDesignListQuery,
-      jest.fn().mockResolvedValue(designListQueryResponse),
-    );
-
-    mockClient.setRequestHandler(
-      permissionsQuery,
-      jest.fn().mockResolvedValue(permissionsQueryResponse),
-    );
-
     moveDesignHandler = moveHandler;
 
-    mockClient.setRequestHandler(moveDesignMutation, moveDesignHandler);
-
-    apolloProvider = new VueApollo({
-      defaultClient: mockClient,
-    });
+    const requestHandlers = [
+      [getDesignListQuery, jest.fn().mockResolvedValue(designListQueryResponse)],
+      [permissionsQuery, jest.fn().mockResolvedValue(permissionsQueryResponse)],
+      [moveDesignMutation, moveDesignHandler],
+    ];
 
+    fakeApollo = createMockApollo(requestHandlers);
     wrapper = shallowMount(Index, {
       localVue,
-      apolloProvider,
+      apolloProvider: fakeApollo,
       router,
       stubs: { VueDraggable },
     });
@@ -99,8 +79,6 @@ describe('Design management index page with Apollo mock', () => {
   afterEach(() => {
     wrapper.destroy();
     wrapper = null;
-    mockClient = null;
-    apolloProvider = null;
   });
 
   it('has a design with id 1 as a first one', async () => {
@@ -152,8 +130,9 @@ describe('Design management index page with Apollo mock', () => {
 
     await moveDesigns(wrapper);
 
-    await jest.runOnlyPendingTimers();
-    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick(); // kick off the DOM update
+    await jest.runOnlyPendingTimers(); // kick off the mocked GQL stuff (promises)
+    await wrapper.vm.$nextTick(); // kick off the DOM update for flash
 
     expect(createFlash).toHaveBeenCalledWith(
       'Something went wrong when reordering designs. Please try again',
diff --git a/spec/frontend/diffs/components/diff_content_spec.js b/spec/frontend/diffs/components/diff_content_spec.js
index b78895f9e55..6d0120d888e 100644
--- a/spec/frontend/diffs/components/diff_content_spec.js
+++ b/spec/frontend/diffs/components/diff_content_spec.js
@@ -177,23 +177,19 @@ describe('DiffContent', () => {
       });
 
       wrapper.find(NoteForm).vm.$emit('handleFormUpdate', noteStub);
-      expect(saveDiffDiscussionMock).toHaveBeenCalledWith(
-        expect.any(Object),
-        {
-          note: noteStub,
-          formData: {
-            noteableData: expect.any(Object),
-            diffFile: currentDiffFile,
-            positionType: IMAGE_DIFF_POSITION_TYPE,
-            x: undefined,
-            y: undefined,
-            width: undefined,
-            height: undefined,
-            noteableType: undefined,
-          },
+      expect(saveDiffDiscussionMock).toHaveBeenCalledWith(expect.any(Object), {
+        note: noteStub,
+        formData: {
+          noteableData: expect.any(Object),
+          diffFile: currentDiffFile,
+          positionType: IMAGE_DIFF_POSITION_TYPE,
+          x: undefined,
+          y: undefined,
+          width: undefined,
+          height: undefined,
+          noteableType: undefined,
         },
-        undefined,
-      );
+      });
     });
   });
 });
diff --git a/spec/frontend/diffs/components/diff_file_header_spec.js b/spec/frontend/diffs/components/diff_file_header_spec.js
index 1d8e1740a9e..a0cad32b9fb 100644
--- a/spec/frontend/diffs/components/diff_file_header_spec.js
+++ b/spec/frontend/diffs/components/diff_file_header_spec.js
@@ -1,6 +1,7 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
 import { GlIcon } from '@gitlab/ui';
+import { cloneDeep } from 'lodash';
 import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
 import EditButton from '~/diffs/components/edit_button.vue';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
@@ -26,12 +27,16 @@ const diffFile = Object.freeze(
   }),
 );
 
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
 describe('DiffFileHeader component', () => {
   let wrapper;
+  let mockStoreConfig;
 
   const diffHasExpandedDiscussionsResultMock = jest.fn();
   const diffHasDiscussionsResultMock = jest.fn();
-  const mockStoreConfig = {
+  const defaultMockStoreConfig = {
     state: {},
     modules: {
       diffs: {
@@ -56,6 +61,8 @@ describe('DiffFileHeader component', () => {
       diffHasExpandedDiscussionsResultMock,
       ...Object.values(mockStoreConfig.modules.diffs.actions),
     ].forEach(mock => mock.mockReset());
+
+    wrapper.destroy();
   });
 
   const findHeader = () => wrapper.find({ ref: 'header' });
@@ -80,8 +87,7 @@ describe('DiffFileHeader component', () => {
   };
 
   const createComponent = props => {
-    const localVue = createLocalVue();
-    localVue.use(Vuex);
+    mockStoreConfig = cloneDeep(defaultMockStoreConfig);
     const store = new Vuex.Store(mockStoreConfig);
 
     wrapper = shallowMount(DiffFileHeader, {
@@ -286,7 +292,7 @@ describe('DiffFileHeader component', () => {
           findToggleDiscussionsButton().vm.$emit('click');
           expect(
             mockStoreConfig.modules.diffs.actions.toggleFileDiscussionWrappers,
-          ).toHaveBeenCalledWith(expect.any(Object), diffFile, undefined);
+          ).toHaveBeenCalledWith(expect.any(Object), diffFile);
         });
       });
 
diff --git a/spec/frontend/diffs/components/settings_dropdown_spec.js b/spec/frontend/diffs/components/settings_dropdown_spec.js
index 8bad3e37e99..72330d8efba 100644
--- a/spec/frontend/diffs/components/settings_dropdown_spec.js
+++ b/spec/frontend/diffs/components/settings_dropdown_spec.js
@@ -50,7 +50,7 @@ describe('Diff settings dropdown component', () => {
 
       vm.find('.js-list-view').trigger('click');
 
-      expect(actions.setRenderTreeList).toHaveBeenCalledWith(expect.anything(), false, undefined);
+      expect(actions.setRenderTreeList).toHaveBeenCalledWith(expect.anything(), false);
     });
 
     it('tree view button dispatches setRenderTreeList with true', () => {
@@ -58,7 +58,7 @@ describe('Diff settings dropdown component', () => {
 
       vm.find('.js-tree-view').trigger('click');
 
-      expect(actions.setRenderTreeList).toHaveBeenCalledWith(expect.anything(), true, undefined);
+      expect(actions.setRenderTreeList).toHaveBeenCalledWith(expect.anything(), true);
     });
 
     it('sets list button as selected when renderTreeList is false', () => {
@@ -153,14 +153,10 @@ describe('Diff settings dropdown component', () => {
       checkbox.element.checked = true;
       checkbox.trigger('change');
 
-      expect(actions.setShowWhitespace).toHaveBeenCalledWith(
-        expect.anything(),
-        {
-          showWhitespace: true,
-          pushState: true,
-        },
-        undefined,
-      );
+      expect(actions.setShowWhitespace).toHaveBeenCalledWith(expect.anything(), {
+        showWhitespace: true,
+        pushState: true,
+      });
     });
   });
 });
diff --git a/spec/frontend/error_tracking/components/error_tracking_list_spec.js b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
index 97e6d1781f4..31f355ce6f1 100644
--- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js
+++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
@@ -259,23 +259,15 @@ describe('ErrorTrackingList', () => {
         errorId: errorsList[0].id,
         status: 'ignored',
       });
-      expect(actions.updateStatus).toHaveBeenCalledWith(
-        expect.anything(),
-        {
-          endpoint: `/project/test/-/error_tracking/${errorsList[0].id}.json`,
-          status: 'ignored',
-        },
-        undefined,
-      );
+      expect(actions.updateStatus).toHaveBeenCalledWith(expect.anything(), {
+        endpoint: `/project/test/-/error_tracking/${errorsList[0].id}.json`,
+        status: 'ignored',
+      });
     });
 
     it('calls an action to remove the item from the list', () => {
       findErrorActions().vm.$emit('update-issue-status', { errorId: '1', status: undefined });
-      expect(actions.removeIgnoredResolvedErrors).toHaveBeenCalledWith(
-        expect.anything(),
-        '1',
-        undefined,
-      );
+      expect(actions.removeIgnoredResolvedErrors).toHaveBeenCalledWith(expect.anything(), '1');
     });
   });
 
@@ -298,23 +290,15 @@ describe('ErrorTrackingList', () => {
         errorId: errorsList[0].id,
         status: 'resolved',
       });
-      expect(actions.updateStatus).toHaveBeenCalledWith(
-        expect.anything(),
-        {
-          endpoint: `/project/test/-/error_tracking/${errorsList[0].id}.json`,
-          status: 'resolved',
-        },
-        undefined,
-      );
+      expect(actions.updateStatus).toHaveBeenCalledWith(expect.anything(), {
+        endpoint: `/project/test/-/error_tracking/${errorsList[0].id}.json`,
+        status: 'resolved',
+      });
     });
 
     it('calls an action to remove the item from the list', () => {
       findErrorActions().vm.$emit('update-issue-status', { errorId: '1', status: undefined });
-      expect(actions.removeIgnoredResolvedErrors).toHaveBeenCalledWith(
-        expect.anything(),
-        '1',
-        undefined,
-      );
+      expect(actions.removeIgnoredResolvedErrors).toHaveBeenCalledWith(expect.anything(), '1');
     });
   });
 
@@ -443,7 +427,6 @@ describe('ErrorTrackingList', () => {
           expect(actions.fetchPaginatedResults).toHaveBeenLastCalledWith(
             expect.anything(),
             'previousCursor',
-            undefined,
           );
         });
       });
@@ -462,7 +445,6 @@ describe('ErrorTrackingList', () => {
           expect(actions.fetchPaginatedResults).toHaveBeenLastCalledWith(
             expect.anything(),
             'nextCursor',
-            undefined,
           );
         });
       });
diff --git a/spec/frontend/helpers/mock_apollo_helper.js b/spec/frontend/helpers/mock_apollo_helper.js
new file mode 100644
index 00000000000..8a5a160231c
--- /dev/null
+++ b/spec/frontend/helpers/mock_apollo_helper.js
@@ -0,0 +1,23 @@
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { createMockClient } from 'mock-apollo-client';
+import VueApollo from 'vue-apollo';
+
+export default (handlers = []) => {
+  const fragmentMatcher = { match: () => true };
+  const cache = new InMemoryCache({
+    fragmentMatcher,
+    addTypename: false,
+  });
+
+  const mockClient = createMockClient({ cache });
+
+  if (Array.isArray(handlers)) {
+    handlers.forEach(([query, value]) => mockClient.setRequestHandler(query, value));
+  } else {
+    throw new Error('You should pass an array of handlers to mock Apollo client');
+  }
+
+  const apolloProvider = new VueApollo({ defaultClient: mockClient });
+
+  return apolloProvider;
+};
diff --git a/spec/frontend/ide/components/error_message_spec.js b/spec/frontend/ide/components/error_message_spec.js
index 3a4dcc5873d..8b7e7da3b51 100644
--- a/spec/frontend/ide/components/error_message_spec.js
+++ b/spec/frontend/ide/components/error_message_spec.js
@@ -51,7 +51,7 @@ describe('IDE error message component', () => {
     createComponent();
     findDismissButton().trigger('click');
 
-    expect(setErrorMessageMock).toHaveBeenCalledWith(expect.any(Object), null, undefined);
+    expect(setErrorMessageMock).toHaveBeenCalledWith(expect.any(Object), null);
   });
 
   describe('with action', () => {
diff --git a/spec/frontend/ide/components/jobs/list_spec.js b/spec/frontend/ide/components/jobs/list_spec.js
index d8880fa7cb7..e821a585e18 100644
--- a/spec/frontend/ide/components/jobs/list_spec.js
+++ b/spec/frontend/ide/components/jobs/list_spec.js
@@ -99,11 +99,7 @@ describe('IDE stages list', () => {
     it('calls toggleStageCollapsed when clicking stage header', () => {
       findCardHeader().trigger('click');
 
-      expect(storeActions.toggleStageCollapsed).toHaveBeenCalledWith(
-        expect.any(Object),
-        0,
-        undefined,
-      );
+      expect(storeActions.toggleStageCollapsed).toHaveBeenCalledWith(expect.any(Object), 0);
     });
 
     it('calls fetchJobs when stage is mounted', () => {
diff --git a/spec/frontend/ide/components/merge_requests/list_spec.js b/spec/frontend/ide/components/merge_requests/list_spec.js
index e2c6ac49e07..80dcd861451 100644
--- a/spec/frontend/ide/components/merge_requests/list_spec.js
+++ b/spec/frontend/ide/components/merge_requests/list_spec.js
@@ -56,14 +56,10 @@ describe('IDE merge requests list', () => {
 
   it('calls fetch on mounted', () => {
     createComponent();
-    expect(fetchMergeRequestsMock).toHaveBeenCalledWith(
-      expect.any(Object),
-      {
-        search: '',
-        type: '',
-      },
-      undefined,
-    );
+    expect(fetchMergeRequestsMock).toHaveBeenCalledWith(expect.any(Object), {
+      search: '',
+      type: '',
+    });
   });
 
   it('renders loading icon when merge request is loading', () => {
@@ -95,14 +91,10 @@ describe('IDE merge requests list', () => {
         const searchType = wrapper.vm.$options.searchTypes[0];
 
         expect(findTokenedInput().props('tokens')).toEqual([searchType]);
-        expect(fetchMergeRequestsMock).toHaveBeenCalledWith(
-          expect.any(Object),
-          {
-            type: searchType.type,
-            search: '',
-          },
-          undefined,
-        );
+        expect(fetchMergeRequestsMock).toHaveBeenCalledWith(expect.any(Object), {
+          type: searchType.type,
+          search: '',
+        });
       });
   });
 
@@ -136,14 +128,10 @@ describe('IDE merge requests list', () => {
         input.vm.$emit('input', 'something');
 
         return wrapper.vm.$nextTick().then(() => {
-          expect(fetchMergeRequestsMock).toHaveBeenCalledWith(
-            expect.any(Object),
-            {
-              search: 'something',
-              type: '',
-            },
-            undefined,
-          );
+          expect(fetchMergeRequestsMock).toHaveBeenCalledWith(expect.any(Object), {
+            search: 'something',
+            type: '',
+          });
         });
       });
     });
diff --git a/spec/frontend/ide/components/preview/clientside_spec.js b/spec/frontend/ide/components/preview/clientside_spec.js
index 7b2025f5e9f..7b22f75cee4 100644
--- a/spec/frontend/ide/components/preview/clientside_spec.js
+++ b/spec/frontend/ide/components/preview/clientside_spec.js
@@ -279,24 +279,16 @@ describe('IDE clientside preview', () => {
       });
 
       it('calls getFileData', () => {
-        expect(storeActions.getFileData).toHaveBeenCalledWith(
-          expect.any(Object),
-          {
-            path: 'package.json',
-            makeFileActive: false,
-          },
-          undefined, // vuex callback
-        );
+        expect(storeActions.getFileData).toHaveBeenCalledWith(expect.any(Object), {
+          path: 'package.json',
+          makeFileActive: false,
+        });
       });
 
       it('calls getRawFileData', () => {
-        expect(storeActions.getRawFileData).toHaveBeenCalledWith(
-          expect.any(Object),
-          {
-            path: 'package.json',
-          },
-          undefined, // vuex callback
-        );
+        expect(storeActions.getRawFileData).toHaveBeenCalledWith(expect.any(Object), {
+          path: 'package.json',
+        });
       });
     });
 
diff --git a/spec/frontend/lib/utils/forms_spec.js b/spec/frontend/lib/utils/forms_spec.js
index 07ba7c29dfc..a69be99ab98 100644
--- a/spec/frontend/lib/utils/forms_spec.js
+++ b/spec/frontend/lib/utils/forms_spec.js
@@ -1,4 +1,4 @@
-import { serializeForm } from '~/lib/utils/forms';
+import { serializeForm, serializeFormObject, isEmptyValue } from '~/lib/utils/forms';
 
 describe('lib/utils/forms', () => {
   const createDummyForm = inputs => {
@@ -93,4 +93,46 @@ describe('lib/utils/forms', () => {
       });
     });
   });
+
+  describe('isEmptyValue', () => {
+    it.each`
+      input        | returnValue
+      ${''}        | ${true}
+      ${[]}        | ${true}
+      ${null}      | ${true}
+      ${undefined} | ${true}
+      ${'hello'}   | ${false}
+      ${' '}       | ${false}
+      ${0}         | ${false}
+    `('returns $returnValue for value $input', ({ input, returnValue }) => {
+      expect(isEmptyValue(input)).toBe(returnValue);
+    });
+  });
+
+  describe('serializeFormObject', () => {
+    it('returns an serialized object', () => {
+      const form = {
+        profileName: { value: 'hello', state: null, feedback: null },
+        spiderTimeout: { value: 2, state: true, feedback: null },
+        targetTimeout: { value: 12, state: true, feedback: null },
+      };
+      expect(serializeFormObject(form)).toEqual({
+        profileName: 'hello',
+        spiderTimeout: 2,
+        targetTimeout: 12,
+      });
+    });
+
+    it('returns only the entries with value', () => {
+      const form = {
+        profileName: { value: '', state: null, feedback: null },
+        spiderTimeout: { value: 0, state: null, feedback: null },
+        targetTimeout: { value: null, state: null, feedback: null },
+        name: { value: undefined, state: null, feedback: null },
+      };
+      expect(serializeFormObject(form)).toEqual({
+        spiderTimeout: 0,
+      });
+    });
+  });
 });
diff --git a/spec/frontend/notes/components/discussion_resolve_button_spec.js b/spec/frontend/notes/components/discussion_resolve_button_spec.js
index c64e299efc3..41701e54dfa 100644
--- a/spec/frontend/notes/components/discussion_resolve_button_spec.js
+++ b/spec/frontend/notes/components/discussion_resolve_button_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import { GlButton } from '@gitlab/ui';
 import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 
 const buttonTitle = 'Resolve discussion';
@@ -26,9 +27,9 @@ describe('resolveDiscussionButton', () => {
   });
 
   it('should emit a onClick event on button click', () => {
-    const button = wrapper.find({ ref: 'button' });
+    const button = wrapper.find(GlButton);
 
-    button.trigger('click');
+    button.vm.$emit('click');
 
     return wrapper.vm.$nextTick().then(() => {
       expect(wrapper.emitted()).toEqual({
@@ -38,7 +39,7 @@ describe('resolveDiscussionButton', () => {
   });
 
   it('should contain the provided button title', () => {
-    const button = wrapper.find({ ref: 'button' });
+    const button = wrapper.find(GlButton);
 
     expect(button.text()).toContain(buttonTitle);
   });
@@ -51,9 +52,9 @@ describe('resolveDiscussionButton', () => {
       },
     });
 
-    const button = wrapper.find({ ref: 'isResolvingIcon' });
+    const button = wrapper.find(GlButton);
 
-    expect(button.exists()).toEqual(true);
+    expect(button.props('loading')).toEqual(true);
   });
 
   it('should only show a loading spinner while resolving', () => {
@@ -64,10 +65,10 @@ describe('resolveDiscussionButton', () => {
       },
     });
 
-    const button = wrapper.find({ ref: 'isResolvingIcon' });
+    const button = wrapper.find(GlButton);
 
     wrapper.vm.$nextTick(() => {
-      expect(button.exists()).toEqual(false);
+      expect(button.props('loading')).toEqual(false);
     });
   });
 });
diff --git a/spec/frontend/notes/mixins/discussion_navigation_spec.js b/spec/frontend/notes/mixins/discussion_navigation_spec.js
index 11c0bbfefc9..d203435e7bf 100644
--- a/spec/frontend/notes/mixins/discussion_navigation_spec.js
+++ b/spec/frontend/notes/mixins/discussion_navigation_spec.js
@@ -194,13 +194,9 @@ describe('Discussion navigation mixin', () => {
           });
 
           it('expands discussion', () => {
-            expect(expandDiscussion).toHaveBeenCalledWith(
-              expect.anything(),
-              {
-                discussionId: expected,
-              },
-              undefined,
-            );
+            expect(expandDiscussion).toHaveBeenCalledWith(expect.anything(), {
+              discussionId: expected,
+            });
           });
 
           it('scrolls to discussion', () => {
diff --git a/spec/frontend/projects/commits/components/author_select_spec.js b/spec/frontend/projects/commits/components/author_select_spec.js
index d6fac6f5f79..a99c644a675 100644
--- a/spec/frontend/projects/commits/components/author_select_spec.js
+++ b/spec/frontend/projects/commits/components/author_select_spec.js
@@ -133,11 +133,7 @@ describe('Author Select', () => {
       const authorName = 'lorem';
       findSearchBox().vm.$emit('input', authorName);
 
-      expect(store.actions.fetchAuthors).toHaveBeenCalledWith(
-        expect.anything(),
-        authorName,
-        undefined,
-      );
+      expect(store.actions.fetchAuthors).toHaveBeenCalledWith(expect.anything(), authorName);
     });
   });
 
diff --git a/spec/frontend/releases/components/asset_links_form_spec.js b/spec/frontend/releases/components/asset_links_form_spec.js
index 727d593d851..582c0b32716 100644
--- a/spec/frontend/releases/components/asset_links_form_spec.js
+++ b/spec/frontend/releases/components/asset_links_form_spec.js
@@ -115,14 +115,10 @@ describe('Release edit component', () => {
 
       const expectStoreMethodToBeCalled = () => {
         expect(actions.updateAssetLinkUrl).toHaveBeenCalledTimes(1);
-        expect(actions.updateAssetLinkUrl).toHaveBeenCalledWith(
-          expect.anything(),
-          {
-            linkIdToUpdate,
-            newUrl,
-          },
-          undefined,
-        );
+        expect(actions.updateAssetLinkUrl).toHaveBeenCalledWith(expect.anything(), {
+          linkIdToUpdate,
+          newUrl,
+        });
       };
 
       it('calls the "updateAssetLinkUrl" store method when text is entered into the "URL" input field', () => {
@@ -177,14 +173,10 @@ describe('Release edit component', () => {
 
       const expectStoreMethodToBeCalled = () => {
         expect(actions.updateAssetLinkName).toHaveBeenCalledTimes(1);
-        expect(actions.updateAssetLinkName).toHaveBeenCalledWith(
-          expect.anything(),
-          {
-            linkIdToUpdate,
-            newName,
-          },
-          undefined,
-        );
+        expect(actions.updateAssetLinkName).toHaveBeenCalledWith(expect.anything(), {
+          linkIdToUpdate,
+          newName,
+        });
       };
 
       it('calls the "updateAssetLinkName" store method when text is entered into the "Link title" input field', () => {
@@ -225,14 +217,10 @@ describe('Release edit component', () => {
       wrapper.find({ ref: 'typeSelect' }).vm.$emit('change', newType);
 
       expect(actions.updateAssetLinkType).toHaveBeenCalledTimes(1);
-      expect(actions.updateAssetLinkType).toHaveBeenCalledWith(
-        expect.anything(),
-        {
-          linkIdToUpdate,
-          newType,
-        },
-        undefined,
-      );
+      expect(actions.updateAssetLinkType).toHaveBeenCalledWith(expect.anything(), {
+        linkIdToUpdate,
+        newType,
+      });
     });
 
     it('selects the default asset type if no type was provided by the backend', () => {
diff --git a/spec/frontend/tracking_spec.js b/spec/frontend/tracking_spec.js
index 8acfa655c2c..e2d39ffeaf0 100644
--- a/spec/frontend/tracking_spec.js
+++ b/spec/frontend/tracking_spec.js
@@ -1,5 +1,5 @@
 import { setHTMLFixture } from './helpers/fixtures';
-import Tracking, { initUserTracking } from '~/tracking';
+import Tracking, { initUserTracking, initDefaultTrackers } from '~/tracking';
 
 describe('Tracking', () => {
   let snowplowSpy;
@@ -17,11 +17,6 @@ describe('Tracking', () => {
   });
 
   describe('initUserTracking', () => {
-    beforeEach(() => {
-      bindDocumentSpy = jest.spyOn(Tracking, 'bindDocument').mockImplementation(() => null);
-      trackLoadEventsSpy = jest.spyOn(Tracking, 'trackLoadEvents').mockImplementation(() => null);
-    });
-
     it('calls through to get a new tracker with the expected options', () => {
       initUserTracking();
       expect(snowplowSpy).toHaveBeenCalledWith('newTracker', '_namespace_', 'app.gitfoo.com', {
@@ -38,9 +33,16 @@ describe('Tracking', () => {
         linkClickTracking: false,
       });
     });
+  });
+
+  describe('initDefaultTrackers', () => {
+    beforeEach(() => {
+      bindDocumentSpy = jest.spyOn(Tracking, 'bindDocument').mockImplementation(() => null);
+      trackLoadEventsSpy = jest.spyOn(Tracking, 'trackLoadEvents').mockImplementation(() => null);
+    });
 
     it('should activate features based on what has been enabled', () => {
-      initUserTracking();
+      initDefaultTrackers();
       expect(snowplowSpy).toHaveBeenCalledWith('enableActivityTracking', 30, 30);
       expect(snowplowSpy).toHaveBeenCalledWith('trackPageView');
       expect(snowplowSpy).not.toHaveBeenCalledWith('enableFormTracking');
@@ -52,18 +54,18 @@ describe('Tracking', () => {
         linkClickTracking: true,
       };
 
-      initUserTracking();
+      initDefaultTrackers();
       expect(snowplowSpy).toHaveBeenCalledWith('enableFormTracking');
       expect(snowplowSpy).toHaveBeenCalledWith('enableLinkClickTracking');
     });
 
     it('binds the document event handling', () => {
-      initUserTracking();
+      initDefaultTrackers();
       expect(bindDocumentSpy).toHaveBeenCalled();
     });
 
     it('tracks page loaded events', () => {
-      initUserTracking();
+      initDefaultTrackers();
       expect(trackLoadEventsSpy).toHaveBeenCalled();
     });
   });
diff --git a/spec/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs_spec.rb
index 8b9de16ce5f..11e3f32c7ce 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::RemoveUnwantedChatJobs do
 
   let(:command) do
     double(:command,
-      config_processor: double(:processor,
+      yaml_processor_result: double(:processor,
         jobs: { echo: double(:job_echo), rspec: double(:job_rspec) }),
       project: project,
       chat_data: { command: 'echo' })
@@ -25,7 +25,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::RemoveUnwantedChatJobs do
 
       subject
 
-      expect(command.config_processor.jobs.keys).to eq([:echo])
+      expect(command.yaml_processor_result.jobs.keys).to eq([:echo])
     end
 
     it 'does not remove any jobs for non chat-pipelines' do
@@ -33,7 +33,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::RemoveUnwantedChatJobs do
 
       subject
 
-      expect(command.config_processor.jobs.keys).to eq([:echo, :rspec])
+      expect(command.yaml_processor_result.jobs.keys).to eq([:echo, :rspec])
     end
   end
 end
diff --git a/spec/lib/gitlab/ci/pipeline/chain/validate/external_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/validate/external_spec.rb
index 1be4c80bf4a..e55281f9705 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/validate/external_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/validate/external_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Validate::External do
   let(:save_incompleted) { true }
   let(:command) do
     Gitlab::Ci::Pipeline::Chain::Command.new(
-      project: project, current_user: user, config_processor: yaml_processor_result, save_incompleted: save_incompleted
+      project: project, current_user: user, yaml_processor_result: yaml_processor_result, save_incompleted: save_incompleted
     )
   end
 
@@ -128,7 +128,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Validate::External do
   end
 
   describe '#validation_service_payload' do
-    subject(:validation_service_payload) { step.send(:validation_service_payload, pipeline, command.config_processor.stages_attributes) }
+    subject(:validation_service_payload) { step.send(:validation_service_payload, pipeline, command.yaml_processor_result.stages_attributes) }
 
     it 'respects the defined schema' do
       expect(validation_service_payload).to match_schema('/external_validation')
diff --git a/spec/models/badges/project_badge_spec.rb b/spec/models/badges/project_badge_spec.rb
index 9b9836129a6..78bfd4e18c0 100644
--- a/spec/models/badges/project_badge_spec.rb
+++ b/spec/models/badges/project_badge_spec.rb
@@ -27,8 +27,8 @@ RSpec.describe ProjectBadge do
   end
 
   context 'methods' do
-    let(:badge) { build(:project_badge, link_url: placeholder_url, image_url: placeholder_url) }
-    let!(:project) { badge.project }
+    let(:badge) { build_stubbed(:project_badge, link_url: placeholder_url, image_url: placeholder_url) }
+    let(:project) { badge.project }
 
     describe '#rendered_link_url' do
       let(:method) { :link_url }
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb
index 8a6176bf045..f7ce44f7281 100644
--- a/spec/models/diff_note_spec.rb
+++ b/spec/models/diff_note_spec.rb
@@ -35,7 +35,9 @@ RSpec.describe DiffNote do
   subject { create(:diff_note_on_merge_request, project: project, position: position, noteable: merge_request) }
 
   describe 'validations' do
-    it_behaves_like 'a valid diff positionable note', :diff_note_on_commit
+    it_behaves_like 'a valid diff positionable note' do
+      subject { build(:diff_note_on_commit, project: project, commit_id: commit_id, position: position) }
+    end
   end
 
   describe "#position=" do
diff --git a/spec/models/draft_note_spec.rb b/spec/models/draft_note_spec.rb
index 64b06bf5c8f..580a588ae1d 100644
--- a/spec/models/draft_note_spec.rb
+++ b/spec/models/draft_note_spec.rb
@@ -5,11 +5,13 @@ require 'spec_helper'
 RSpec.describe DraftNote do
   include RepoHelpers
 
-  let(:project)       { create(:project, :repository) }
-  let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
+  let_it_be(:project)       { create(:project, :repository) }
+  let_it_be(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
 
   describe 'validations' do
-    it_behaves_like 'a valid diff positionable note', :draft_note
+    it_behaves_like 'a valid diff positionable note' do
+      subject { build(:draft_note, merge_request: merge_request, commit_id: commit_id, position: position) }
+    end
   end
 
   describe 'delegations' do
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 015a86cb28b..ff53478fea3 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -722,7 +722,14 @@ RSpec.describe Event do
         note_on_commit: true
       }
       valid_target_factories.map do |kind, needs_project|
-        extra_data = needs_project ? { project: project } : {}
+        extra_data = if kind == :merge_request
+                       { source_project: project }
+                     elsif needs_project
+                       { project: project }
+                     else
+                       {}
+                     end
+
         target = kind == :project ? nil : build(kind, **extra_data)
         [kind, build(:event, :created, project: project, target: target)]
       end.to_h
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 39ece3d1cb3..8400ae8f2d2 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -416,16 +416,6 @@ RSpec.describe Namespace do
         end
 
         context 'renaming child' do
-          context 'when async_pages_move_namespace_rename is disabled' do
-            it 'correctly moves the repository, uploads and pages' do
-              stub_feature_flags(async_pages_move_namespace_rename: false)
-
-              child.update!(path: 'renamed')
-
-              expect_project_directories_at('parent/renamed')
-            end
-          end
-
           context 'when no projects have pages deployed' do
             it 'moves the repository and uploads', :sidekiq_inline do
               project.pages_metadatum.update!(deployed: false)
@@ -436,26 +426,25 @@ RSpec.describe Namespace do
           end
 
           context 'when the project has pages deployed' do
-            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
+            before do
               project.pages_metadatum.update!(deployed: true)
+            end
+
+            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
               child.update!(path: 'renamed')
 
               expect_project_directories_at('parent/renamed')
             end
+
+            it 'performs the move async of pages async' do
+              expect(PagesTransferWorker).to receive(:perform_async).with('rename_namespace', ['parent/child', 'parent/renamed'])
+
+              child.update!(path: 'renamed')
+            end
           end
         end
 
         context 'renaming parent' do
-          context 'when async_pages_move_namespace_rename is disabled' do
-            it 'correctly moves the repository, uploads and pages' do
-              stub_feature_flags(async_pages_move_namespace_rename: false)
-
-              parent.update!(path: 'renamed')
-
-              expect_project_directories_at('renamed/child')
-            end
-          end
-
           context 'when no projects have pages deployed' do
             it 'moves the repository and uploads', :sidekiq_inline do
               project.pages_metadatum.update!(deployed: false)
@@ -466,26 +455,25 @@ RSpec.describe Namespace do
           end
 
           context 'when the project has pages deployed' do
-            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
+            before do
               project.pages_metadatum.update!(deployed: true)
+            end
+
+            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
               parent.update!(path: 'renamed')
 
               expect_project_directories_at('renamed/child')
             end
+
+            it 'performs the move async of pages async' do
+              expect(PagesTransferWorker).to receive(:perform_async).with('rename_namespace', %w(parent renamed))
+
+              parent.update!(path: 'renamed')
+            end
           end
         end
 
         context 'moving from one parent to another' do
-          context 'when async_pages_move_namespace_transfer is disabled' do
-            it 'correctly moves the repository, uploads and pages' do
-              stub_feature_flags(async_pages_move_namespace_transfer: false)
-
-              child.update!(parent: new_parent)
-
-              expect_project_directories_at('new_parent/child')
-            end
-          end
-
           context 'when no projects have pages deployed' do
             it 'moves the repository and uploads', :sidekiq_inline do
               project.pages_metadatum.update!(deployed: false)
@@ -496,26 +484,25 @@ RSpec.describe Namespace do
           end
 
           context 'when the project has pages deployed' do
-            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
+            before do
               project.pages_metadatum.update!(deployed: true)
+            end
+
+            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
               child.update!(parent: new_parent)
 
               expect_project_directories_at('new_parent/child')
             end
+
+            it 'performs the move async of pages async' do
+              expect(PagesTransferWorker).to receive(:perform_async).with('move_namespace', %w(child parent new_parent))
+
+              child.update!(parent: new_parent)
+            end
           end
         end
 
         context 'moving from having a parent to root' do
-          context 'when async_pages_move_namespace_transfer is disabled' do
-            it 'correctly moves the repository, uploads and pages' do
-              stub_feature_flags(async_pages_move_namespace_transfer: false)
-
-              child.update!(parent: nil)
-
-              expect_project_directories_at('child')
-            end
-          end
-
           context 'when no projects have pages deployed' do
             it 'moves the repository and uploads', :sidekiq_inline do
               project.pages_metadatum.update!(deployed: false)
@@ -526,26 +513,25 @@ RSpec.describe Namespace do
           end
 
           context 'when the project has pages deployed' do
-            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
+            before do
               project.pages_metadatum.update!(deployed: true)
+            end
+
+            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
               child.update!(parent: nil)
 
               expect_project_directories_at('child')
             end
+
+            it 'performs the move async of pages async' do
+              expect(PagesTransferWorker).to receive(:perform_async).with('move_namespace', ['child', 'parent', nil])
+
+              child.update!(parent: nil)
+            end
           end
         end
 
         context 'moving from root to having a parent' do
-          context 'when async_pages_move_namespace_transfer is disabled' do
-            it 'correctly moves the repository, uploads and pages' do
-              stub_feature_flags(async_pages_move_namespace_transfer: false)
-
-              parent.update!(parent: new_parent)
-
-              expect_project_directories_at('new_parent/parent/child')
-            end
-          end
-
           context 'when no projects have pages deployed' do
             it 'moves the repository and uploads', :sidekiq_inline do
               project.pages_metadatum.update!(deployed: false)
@@ -556,12 +542,21 @@ RSpec.describe Namespace do
           end
 
           context 'when the project has pages deployed' do
-            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
+            before do
               project.pages_metadatum.update!(deployed: true)
+            end
+
+            it 'correctly moves the repository, uploads and pages', :sidekiq_inline do
               parent.update!(parent: new_parent)
 
               expect_project_directories_at('new_parent/parent/child')
             end
+
+            it 'performs the move async of pages async' do
+              expect(PagesTransferWorker).to receive(:perform_async).with('move_namespace', ['parent', nil, 'new_parent'])
+
+              parent.update!(parent: new_parent)
+            end
           end
         end
       end
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index 4867ac2a75b..7fb6e6d63c6 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -264,7 +264,7 @@ RSpec.describe Packages::Package, type: :model do
         let!(:package) { create(:npm_package) }
 
         it 'will not allow a package of the same name' do
-          new_package = build(:npm_package, name: package.name)
+          new_package = build(:npm_package, project: create(:project), name: package.name)
 
           expect(new_package).not_to be_valid
         end
diff --git a/spec/models/x509_certificate_spec.rb b/spec/models/x509_certificate_spec.rb
index 880c5014a84..d3b4470d3f4 100644
--- a/spec/models/x509_certificate_spec.rb
+++ b/spec/models/x509_certificate_spec.rb
@@ -68,6 +68,8 @@ RSpec.describe X509Certificate do
   end
 
   describe 'validators' do
+    let_it_be(:issuer) { create(:x509_issuer) }
+
     it 'accepts correct subject_key_identifier' do
       subject_key_identifiers = [
         'AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB:AB',
@@ -75,7 +77,7 @@ RSpec.describe X509Certificate do
       ]
 
       subject_key_identifiers.each do |identifier|
-        expect(build(:x509_certificate, subject_key_identifier: identifier)).to be_valid
+        expect(build(:x509_certificate, x509_issuer: issuer, subject_key_identifier: identifier)).to be_valid
       end
     end
 
@@ -88,7 +90,7 @@ RSpec.describe X509Certificate do
       ]
 
       subject_key_identifiers.each do |identifier|
-        expect(build(:x509_certificate, subject_key_identifier: identifier)).to be_invalid
+        expect(build(:x509_certificate, x509_issuer: issuer, subject_key_identifier: identifier)).to be_invalid
       end
     end
 
@@ -99,7 +101,7 @@ RSpec.describe X509Certificate do
       ]
 
       emails.each do |email|
-        expect(build(:x509_certificate, email: email)).to be_valid
+        expect(build(:x509_certificate, x509_issuer: issuer, email: email)).to be_valid
       end
     end
 
@@ -110,20 +112,20 @@ RSpec.describe X509Certificate do
       ]
 
       emails.each do |email|
-        expect(build(:x509_certificate, email: email)).to be_invalid
+        expect(build(:x509_certificate, x509_issuer: issuer, email: email)).to be_invalid
       end
     end
 
     it 'accepts valid serial_number' do
-      expect(build(:x509_certificate, serial_number: 123412341234)).to be_valid
+      expect(build(:x509_certificate, x509_issuer: issuer, serial_number: 123412341234)).to be_valid
 
       # rfc 5280 - 4.1.2.2  Serial number (20 octets is the maximum)
-      expect(build(:x509_certificate, serial_number: 1461501637330902918203684832716283019655932542975)).to be_valid
-      expect(build(:x509_certificate, serial_number: 'ffffffffffffffffffffffffffffffffffffffff'.to_i(16))).to be_valid
+      expect(build(:x509_certificate, x509_issuer: issuer, serial_number: 1461501637330902918203684832716283019655932542975)).to be_valid
+      expect(build(:x509_certificate, x509_issuer: issuer, serial_number: 'ffffffffffffffffffffffffffffffffffffffff'.to_i(16))).to be_valid
     end
 
     it 'rejects invalid serial_number' do
-      expect(build(:x509_certificate, serial_number: "sgsgfsdgdsfg")).to be_invalid
+      expect(build(:x509_certificate, x509_issuer: issuer, serial_number: "sgsgfsdgdsfg")).to be_invalid
     end
   end
 end
diff --git a/spec/requests/api/ci/runner/jobs_artifacts_spec.rb b/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
index 1c2abbb887b..77ff561bbdf 100644
--- a/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
@@ -238,13 +238,6 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             expect(json_response['ProcessLsif']).to be_truthy
           end
 
-          it 'adds ProcessLsifReferences header' do
-            authorize_artifacts_with_token_in_headers(artifact_type: :lsif)
-
-            expect(response).to have_gitlab_http_status(:ok)
-            expect(json_response['ProcessLsifReferences']).to be_truthy
-          end
-
           context 'code_navigation feature flag is disabled' do
             it 'responds with a forbidden error' do
               stub_feature_flags(code_navigation: false)
@@ -253,20 +246,6 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
               aggregate_failures do
                 expect(response).to have_gitlab_http_status(:forbidden)
                 expect(json_response['ProcessLsif']).to be_falsy
-                expect(json_response['ProcessLsifReferences']).to be_falsy
-              end
-            end
-          end
-
-          context 'code_navigation_references feature flag is disabled' do
-            it 'sets ProcessLsifReferences header to false' do
-              stub_feature_flags(code_navigation_references: false)
-              authorize_artifacts_with_token_in_headers(artifact_type: :lsif)
-
-              aggregate_failures do
-                expect(response).to have_gitlab_http_status(:ok)
-                expect(json_response['ProcessLsif']).to be_truthy
-                expect(json_response['ProcessLsifReferences']).to be_falsy
               end
             end
           end
diff --git a/spec/services/pages/delete_services_spec.rb b/spec/services/pages/delete_services_spec.rb
index 661ccb36ba9..440549020a2 100644
--- a/spec/services/pages/delete_services_spec.rb
+++ b/spec/services/pages/delete_services_spec.rb
@@ -27,16 +27,6 @@ RSpec.describe Pages::DeleteService do
     end
   end
 
-  context 'with feature flag disabled' do
-    before do
-      stub_feature_flags(async_pages_removal: false)
-
-      expect(PagesRemoveWorker).not_to receive(:perform_async)
-    end
-
-    it_behaves_like 'remove pages'
-  end
-
   context 'with feature flag enabled' do
     before do
       expect(PagesRemoveWorker).to receive(:perform_async).and_call_original
diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb
index a6bde5b86f6..f03e1ed0e22 100644
--- a/spec/services/projects/after_rename_service_spec.rb
+++ b/spec/services/projects/after_rename_service_spec.rb
@@ -64,16 +64,6 @@ RSpec.describe Projects::AfterRenameService do
           allow(project_storage).to receive(:rename_repo) { true }
         end
 
-        context 'when async_pages_move_project_rename is disabled' do
-          it 'moves pages folder to new location' do
-            stub_feature_flags(async_pages_move_project_rename: false)
-
-            expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project)
-
-            service_execute
-          end
-        end
-
         context 'when the project has pages deployed' do
           it 'schedules a move of the pages directory' do
             allow(project).to receive(:pages_deployed?).and_return(true)
@@ -183,16 +173,6 @@ RSpec.describe Projects::AfterRenameService do
       end
 
       context 'gitlab pages' do
-        context 'when async_pages_move_project_rename is disabled' do
-          it 'moves pages folder to new location' do
-            stub_feature_flags(async_pages_move_project_rename: false)
-
-            expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project)
-
-            service_execute
-          end
-        end
-
         context 'when the project has pages deployed' do
           it 'schedules a move of the pages directory' do
             allow(project).to receive(:pages_deployed?).and_return(true)
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 01af999f117..a0e83fb4a21 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -510,20 +510,6 @@ RSpec.describe Projects::TransferService do
 
       execute_transfer
     end
-
-    context 'when async_pages_move_project_transfer is disabled' do
-      before do
-        stub_feature_flags(async_pages_move_project_transfer: false)
-      end
-
-      it 'moves pages inline' do
-        expect_next_instance_of(Gitlab::PagesTransfer) do |transfer|
-          expect(transfer).to receive(:move_project).with(project.path, user.namespace.full_path, group.full_path)
-        end
-
-        execute_transfer
-      end
-    end
   end
 
   def rugged_config
diff --git a/spec/support/helpers/navbar_structure_helper.rb b/spec/support/helpers/navbar_structure_helper.rb
index c7aa2ffe536..11e67ba394c 100644
--- a/spec/support/helpers/navbar_structure_helper.rb
+++ b/spec/support/helpers/navbar_structure_helper.rb
@@ -4,13 +4,13 @@ module NavbarStructureHelper
   def insert_after_nav_item(before_nav_item_name, new_nav_item:)
     expect(structure).to include(a_hash_including(nav_item: before_nav_item_name))
 
-    index = structure.find_index { |h| h[:nav_item] == before_nav_item_name }
+    index = structure.find_index { |h| h[:nav_item] == before_nav_item_name if h }
     structure.insert(index + 1, new_nav_item)
   end
 
   def insert_after_sub_nav_item(before_sub_nav_item_name, within:, new_sub_nav_item_name:)
     expect(structure).to include(a_hash_including(nav_item: within))
-    hash = structure.find { |h| h[:nav_item] == within }
+    hash = structure.find { |h| h[:nav_item] == within if h }
 
     expect(hash).to have_key(:nav_sub_items)
     expect(hash[:nav_sub_items]).to include(before_sub_nav_item_name)
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 5e06aad99eb..747358fc1e0 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -138,6 +138,13 @@ RSpec.shared_context 'group navbar structure' do
     }
   end
 
+  let(:push_rules_nav_item) do
+    {
+      nav_item: _('Push Rules'),
+      nav_sub_items: []
+    }
+  end
+
   let(:structure) do
     [
       {
@@ -160,6 +167,7 @@ RSpec.shared_context 'group navbar structure' do
         nav_item: _('Merge Requests'),
         nav_sub_items: []
       },
+      (push_rules_nav_item if Gitlab.ee?),
       {
         nav_item: _('Kubernetes'),
         nav_sub_items: []
diff --git a/spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb b/spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb
index b0cdc77a378..759b22f794e 100644
--- a/spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb
+++ b/spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb
@@ -18,8 +18,6 @@ RSpec.shared_examples 'a valid diff positionable note' do |factory_on_commit|
       )
     end
 
-    subject { build(factory_on_commit, commit_id: commit_id, position: position) }
-
     context 'position diff refs matches commit diff refs' do
       it 'is valid' do
         expect(subject).to be_valid
diff --git a/yarn.lock b/yarn.lock
index 027cd147c9c..67f564fc6b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12340,10 +12340,10 @@ vuedraggable@^2.23.0:
   dependencies:
     sortablejs "^1.9.0"
 
-vuex@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz#634b81515cf0cfe976bd1ffe9601755e51f843b9"
-  integrity sha512-mdHeHT/7u4BncpUZMlxNaIdcN/HIt1GsGG5LKByArvYG/v6DvHcOxvDCts+7SRdCoIRGllK8IMZvQtQXLppDYg==
+vuex@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz#f1b8dcea649bc25254cf4f4358081dbf5da18b3d"
+  integrity sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==
 
 w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
   version "1.0.2"