From ce97c898865e06644ae9c04d5c3666775b9998cb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 15 Mar 2023 15:08:30 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 GITALY_SERVER_VERSION                         |   2 +-
 .../value_streams_dashboard_link.vue          |   2 +-
 .../javascripts/diffs/components/diff_row.vue |   5 +
 .../emoji/components/emoji_group.vue          |   5 +
 .../javascripts/entrypoints/super_sidebar.js  |   5 +
 .../import_entities/import_projects/index.js  |   4 +-
 .../vue3compat/compat_functional_mixin.js     |  14 +
 app/assets/javascripts/main.js                |  10 +-
 .../components/form/form_footer_actions.vue   |   3 +-
 app/assets/stylesheets/framework/filters.scss |   3 +-
 .../admin/{geo_nodes.scss => geo_sites.scss}  |  12 +-
 .../page_bundles/merge_requests.scss          |   3 +-
 .../projects/cycle_analytics_controller.rb    |   2 +-
 .../encrypted.rb                              |   2 +-
 app/models/group.rb                           |   2 +-
 app/models/project.rb                         |   2 +-
 .../application_settings/_outbound.html.haml  |  19 +-
 app/views/explore/projects/topic.html.haml    |  26 +-
 app/views/groups/settings/_general.html.haml  |   3 +-
 app/views/layouts/_head.html.haml             |   2 +
 app/views/layouts/_page.html.haml             |   2 +-
 .../projects/settings/_general.html.haml      |   3 +-
 app/views/shared/topics/_topic.html.haml      |   5 +-
 config/application.rb                         |   2 +-
 .../deny_all_requests_except_allowed.yml      |   8 -
 config/webpack.config.js                      |   1 +
 doc/api/graphql/reference/index.md            |  12 +
 doc/ci/jobs/ci_job_token.md                   |  11 +-
 doc/development/snowplow/implementation.md    |  46 +-
 doc/development/snowplow/review_guidelines.md |   2 +-
 .../testing_guide/frontend_testing.md         |  19 +
 .../account/two_factor_authentication.md      |  64 ++
 lib/gitlab/url_blocker.rb                     |   2 -
 locale/gitlab.pot                             |  13 +-
 patches/@vue+compiler-sfc+3.2.47.patch        |  28 +
 .../confirmations_controller_spec.rb          |   4 +-
 spec/features/admin/admin_settings_spec.rb    |   4 -
 spec/features/issues/form_spec.rb             |  66 +-
 spec/features/topic_show_spec.rb              |   2 +-
 spec/frontend/__helpers__/gon_helper.js       |   5 +
 .../frontend/__helpers__/shared_test_setup.js |  12 +-
 .../registration_instructions_spec.js         |  14 +-
 .../components/registration/utils_spec.js     |  14 +-
 .../source_editor_ci_schema_ext_spec.js       |  11 +-
 spec/frontend/environment.js                  |   8 +-
 .../header_search/components/app_spec.js      |   6 +-
 .../issues/show/components/app_spec.js        | 567 ++++++++----------
 .../issues/show/mock_data/mock_data.js        |  13 +
 spec/frontend/lib/dompurify_spec.js           |  14 +-
 .../observability/observability_app_spec.js   |   2 +-
 .../bulk_imports_history_app_spec.js          |   7 +-
 .../components/import_error_details_spec.js   |  10 +-
 .../components/import_history_app_spec.js     |  10 +-
 .../new/components/project_namespace_spec.js  |  11 +-
 .../date/sidebar_date_widget_spec.js          |   8 +-
 .../entity_select/project_select_spec.js      |   5 +-
 spec/lib/gitlab/url_blocker_spec.rb           |  10 -
 .../encrypted_spec.rb                         |  12 +-
 .../graphql/current_user/todos_query_spec.rb  |   2 +-
 .../work_items/create_from_task_spec.rb       |   2 +-
 .../mutations/work_items/update_task_spec.rb  |   2 +-
 .../api/graphql/namespace/projects_spec.rb    |   2 +-
 .../project/container_repositories_spec.rb    |   4 +-
 spec/support/helpers/graphql_helpers.rb       |   4 +-
 .../notes_on_noteables_shared_examples.rb     |   2 +-
 .../network.html.haml_spec.rb                 |   1 -
 66 files changed, 599 insertions(+), 579 deletions(-)
 create mode 100644 app/assets/javascripts/entrypoints/super_sidebar.js
 create mode 100644 app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js
 rename app/assets/stylesheets/page_bundles/admin/{geo_nodes.scss => geo_sites.scss} (76%)
 delete mode 100644 config/feature_flags/development/deny_all_requests_except_allowed.yml
 create mode 100644 patches/@vue+compiler-sfc+3.2.47.patch
 create mode 100644 spec/frontend/__helpers__/gon_helper.js

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index fa35093a0a3..2d5269488e5 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-6d7521c579ecb1b0a76c4c29e12ce9b72dd4057e
+71dbaa115c10ae08292a7df74d3f8297ab38f208
diff --git a/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue b/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
index 59c14f5e2ac..95a6447ebaf 100644
--- a/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
+++ b/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
@@ -18,7 +18,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-display-flex gl-flex-direction-column">
+  <div class="gl-display-flex gl-flex-direction-column" data-testid="vsd-link">
     <div class="gl-display-flex gl-mb-2">
       <span>{{ $options.i18n.title }}</span>
     </div>
diff --git a/app/assets/javascripts/diffs/components/diff_row.vue b/app/assets/javascripts/diffs/components/diff_row.vue
index dfca6d61270..1f5c9b4f2f5 100644
--- a/app/assets/javascripts/diffs/components/diff_row.vue
+++ b/app/assets/javascripts/diffs/components/diff_row.vue
@@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57842
 * */
 import { memoize } from 'lodash';
 import { isLoggedIn } from '~/lib/utils/common_utils';
+import { compatFunctionalMixin } from '~/lib/utils/vue3compat/compat_functional_mixin';
 import {
   PARALLEL_DIFF_VIEW_TYPE,
   CONFLICT_MARKER_THEIR,
@@ -24,6 +25,10 @@ import * as utils from './diff_row_utils';
 export default {
   DiffGutterAvatars,
   CodeQualityGutterIcon: () => import('ee_component/diffs/components/code_quality_gutter_icon.vue'),
+
+  // Temporary mixin for migration from Vue.js 2 to @vue/compat
+  mixins: [compatFunctionalMixin],
+
   props: {
     fileHash: {
       type: String,
diff --git a/app/assets/javascripts/emoji/components/emoji_group.vue b/app/assets/javascripts/emoji/components/emoji_group.vue
index 4f4c32af113..bbac6866636 100644
--- a/app/assets/javascripts/emoji/components/emoji_group.vue
+++ b/app/assets/javascripts/emoji/components/emoji_group.vue
@@ -1,5 +1,10 @@
 <script>
+import { compatFunctionalMixin } from '~/lib/utils/vue3compat/compat_functional_mixin';
+
 export default {
+  // Temporary mixin for migration from Vue.js 2 to @vue/compat
+  mixins: [compatFunctionalMixin],
+
   props: {
     emojis: {
       type: Array,
diff --git a/app/assets/javascripts/entrypoints/super_sidebar.js b/app/assets/javascripts/entrypoints/super_sidebar.js
new file mode 100644
index 00000000000..308077f98b1
--- /dev/null
+++ b/app/assets/javascripts/entrypoints/super_sidebar.js
@@ -0,0 +1,5 @@
+import '~/webpack';
+import '~/commons';
+import { initSuperSidebar } from '~/super_sidebar/super_sidebar_bundle';
+
+initSuperSidebar();
diff --git a/app/assets/javascripts/import_entities/import_projects/index.js b/app/assets/javascripts/import_entities/import_projects/index.js
index ca667931348..66ffd378426 100644
--- a/app/assets/javascripts/import_entities/import_projects/index.js
+++ b/app/assets/javascripts/import_entities/import_projects/index.js
@@ -73,7 +73,9 @@ export default function mountImportProjectsTable({
     store,
     apolloProvider,
     render(createElement) {
-      return createElement(Component, { props: { ...props, ...extraProps(mountElement.dataset) } });
+      // We are using attrs instead of props so root-level component with inheritAttrs
+      // will be able to pass them down
+      return createElement(Component, { attrs: { ...props, ...extraProps(mountElement.dataset) } });
     },
   });
 }
diff --git a/app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js b/app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js
new file mode 100644
index 00000000000..ec8feb7d2e6
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js
@@ -0,0 +1,14 @@
+import Vue from 'vue';
+
+export const compatFunctionalMixin = Vue.version.startsWith('3')
+  ? {
+      created() {
+        this.props = this.$props;
+        this.listeners = this.$listeners;
+      },
+    }
+  : {
+      created() {
+        throw new Error('This mixin should not be executed in Vue.js 2');
+      },
+    };
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 4c715c4993f..a1539aba786 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -89,7 +89,7 @@ initRails();
 function deferredInitialisation() {
   const $body = $('body');
 
-  initTopNav();
+  if (!gon.use_new_navigation) initTopNav();
   initBreadcrumbs();
   initTodoToggle();
   initPrefetchLinks('.js-prefetch-document');
@@ -104,14 +104,6 @@ function deferredInitialisation() {
   initCopyCodeButton();
   initGitlabVersionCheck();
 
-  // Init super sidebar
-  if (gon.use_new_navigation) {
-    // eslint-disable-next-line promise/catch-or-return
-    import('./super_sidebar/super_sidebar_bundle').then(({ initSuperSidebar }) => {
-      initSuperSidebar();
-    });
-  }
-
   addSelectOnFocusBehaviour('.js-select-on-focus');
 
   const glTooltipDelay = localStorage.getItem('gl-tooltip-delay');
diff --git a/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue b/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue
index 26c50345c19..fe221d2fefa 100644
--- a/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue
+++ b/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue
@@ -1,5 +1,4 @@
-<!-- eslint-disable-next-line vue/no-deprecated-functional-template -->
-<template functional>
+<template>
   <footer class="form-actions d-flex justify-content-between">
     <div><slot name="prepend"></slot></div>
     <div><slot></slot></div>
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index b35175f4ef6..f10b1974a4b 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -197,7 +197,7 @@
   min-width: 0;
   border: 1px solid $border-color;
   background-color: $white;
-  border-radius: $border-radius-default 0 0 $border-radius-default;
+  border-radius: $border-radius-default;
 
   @include media-breakpoint-down(sm) {
     flex: 1 1 auto;
@@ -263,6 +263,7 @@
   min-width: 0;
   height: 2rem;
   background-color: $input-bg;
+  border-radius: $border-radius-default;
 }
 
 .filtered-search-input-dropdown-menu {
diff --git a/app/assets/stylesheets/page_bundles/admin/geo_nodes.scss b/app/assets/stylesheets/page_bundles/admin/geo_sites.scss
similarity index 76%
rename from app/assets/stylesheets/page_bundles/admin/geo_nodes.scss
rename to app/assets/stylesheets/page_bundles/admin/geo_sites.scss
index b0aaa48569a..37bc2394d58 100644
--- a/app/assets/stylesheets/page_bundles/admin/geo_nodes.scss
+++ b/app/assets/stylesheets/page_bundles/admin/geo_sites.scss
@@ -1,6 +1,6 @@
 @import '../mixins_and_variables_and_functions';
 
-.geo-node-header-grid-columns {
+.geo-site-header-grid-columns {
   grid-template-columns: 1fr auto;
   grid-gap: $gl-spacing-scale-5;
 
@@ -9,7 +9,7 @@
   }
 }
 
-.geo-node-details-grid-columns {
+.geo-site-details-grid-columns {
   grid-gap: $gl-spacing-scale-5;
 
   @include media-breakpoint-up(lg) {
@@ -17,12 +17,12 @@
   }
 }
 
-.geo-node-core-details-grid-columns {
+.geo-site-core-details-grid-columns {
   grid-template-columns: 1fr 1fr;
   grid-gap: $gl-spacing-scale-5;
 }
 
-.geo-node-replication-details-grid-columns {
+.geo-site-replication-details-grid-columns {
   grid-template-columns: 1fr 1fr;
   grid-gap: 1rem;
 
@@ -31,7 +31,7 @@
   }
 }
 
-.geo-node-filter-grid-columns {
+.geo-site-filter-grid-columns {
   grid-template-columns: 1fr;
 
   @include media-breakpoint-up(md) {
@@ -39,7 +39,7 @@
   }
 }
 
-.geo-node-replication-counts-grid {
+.geo-site-replication-counts-grid {
   grid-template-columns: 2fr 1fr 1fr;
   grid-gap: 1rem;
 }
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss
index 8495ba9b71f..396c590d912 100644
--- a/app/assets/stylesheets/page_bundles/merge_requests.scss
+++ b/app/assets/stylesheets/page_bundles/merge_requests.scss
@@ -1021,7 +1021,8 @@ $tabs-holder-z-index: 250;
     .md-header {
       .gl-tab-nav-item {
         color: var(--gl-text-color, $gl-text-color);
-        @include gl-pb-5;
+        @include gl-py-4;
+        @include gl-px-3;
 
         &:hover {
           @include gl-bg-none;
diff --git a/app/controllers/projects/cycle_analytics_controller.rb b/app/controllers/projects/cycle_analytics_controller.rb
index 38c309836f1..6e19c0e45bf 100644
--- a/app/controllers/projects/cycle_analytics_controller.rb
+++ b/app/controllers/projects/cycle_analytics_controller.rb
@@ -23,7 +23,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
   before_action do
     push_licensed_feature(:cycle_analytics_for_groups) if project.licensed_feature_available?(:cycle_analytics_for_groups)
     push_licensed_feature(:group_level_analytics_dashboard) if project.licensed_feature_available?(:group_level_analytics_dashboard)
-    push_frontend_feature_flag(:group_analytics_dashboards_page)
+    push_frontend_feature_flag(:group_analytics_dashboards_page, @project.namespace)
   end
 
   def show
diff --git a/app/models/concerns/token_authenticatable_strategies/encrypted.rb b/app/models/concerns/token_authenticatable_strategies/encrypted.rb
index 58049bf3c20..4b3b80437db 100644
--- a/app/models/concerns/token_authenticatable_strategies/encrypted.rb
+++ b/app/models/concerns/token_authenticatable_strategies/encrypted.rb
@@ -106,7 +106,7 @@ module TokenAuthenticatableStrategies
     end
 
     def matches_prefix?(instance, token)
-      !options[:ensure_prefix] || token.start_with?(prefix_for(instance))
+      !options[:require_prefix_for_validation] || token.start_with?(prefix_for(instance))
     end
 
     def token_set?(instance)
diff --git a/app/models/group.rb b/app/models/group.rb
index 1276344fc09..01e2c220dbe 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -164,7 +164,7 @@ class Group < Namespace
   add_authentication_token_field :runners_token,
                                  encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption) ? :optional : :required },
                                  format_with_prefix: :runners_token_prefix,
-                                 ensure_prefix: true
+                                 require_prefix_for_validation: true
 
   after_create :post_create_hook
   after_create -> { create_or_load_association(:group_feature) }
diff --git a/app/models/project.rb b/app/models/project.rb
index 50fad2c210d..a44468a0b2c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -112,7 +112,7 @@ class Project < ApplicationRecord
   add_authentication_token_field :runners_token,
                                  encrypted: -> { Feature.enabled?(:projects_tokens_optional_encryption) ? :optional : :required },
                                  format_with_prefix: :runners_token_prefix,
-                                 ensure_prefix: true
+                                 require_prefix_for_validation: true
 
   # Storage specific hooks
   after_initialize :use_hashed_storage
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml
index 079bde11c4a..6efafa3c415 100644
--- a/app/views/admin/application_settings/_outbound.html.haml
+++ b/app/views/admin/application_settings/_outbound.html.haml
@@ -1,19 +1,18 @@
-- deny_all_requests = Feature.enabled?(:deny_all_requests_except_allowed) && @application_setting.deny_all_requests_except_allowed
+- deny_all_requests = @application_setting.deny_all_requests_except_allowed
 
 = gitlab_ui_form_for @application_setting, url: network_admin_application_settings_path(anchor: 'js-outbound-settings'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset
     .form-group
-      - if Feature.enabled?(:deny_all_requests_except_allowed)
-        = f.gitlab_ui_checkbox_component :deny_all_requests_except_allowed,
-            s_('OutboundRequests|Block all requests, except for IP addresses, IP ranges, and domain names defined in the allowlist'),
-            checkbox_options: { class: 'js-deny-all-requests' }
-        = render Pajamas::AlertComponent.new(variant: :warning,
-          dismissible: false,
-          alert_options: { class: "gl-mb-3 js-deny-all-requests-warning #{'gl-display-none' unless deny_all_requests}" }) do |c|
-          = c.body do
-            = s_('OutboundRequests|Webhooks and integrations might not work properly.')
+      = f.gitlab_ui_checkbox_component :deny_all_requests_except_allowed,
+          s_('OutboundRequests|Block all requests, except for IP addresses, IP ranges, and domain names defined in the allowlist'),
+          checkbox_options: { class: 'js-deny-all-requests' }
+      = render Pajamas::AlertComponent.new(variant: :warning,
+        dismissible: false,
+        alert_options: { class: "gl-mb-3 js-deny-all-requests-warning #{'gl-display-none' unless deny_all_requests}" }) do |c|
+        = c.body do
+          = s_('OutboundRequests|Webhooks and integrations might not work properly.')
       = f.gitlab_ui_checkbox_component :allow_local_requests_from_web_hooks_and_services,
           s_('OutboundRequests|Allow requests to the local network from webhooks and integrations'),
           checkbox_options: { disabled: deny_all_requests, class: 'js-allow-local-requests', data: { qa_selector: 'allow_requests_from_services_checkbox' } }
diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml
index ad8d1276bb1..b26abefcb0e 100644
--- a/app/views/explore/projects/topic.html.haml
+++ b/app/views/explore/projects/topic.html.haml
@@ -5,19 +5,19 @@
 
 = render_dashboard_ultimate_trial(current_user)
 
-.gl-text-center.gl-bg-gray-10.gl-pb-2.gl-pt-6
-  .gl-pb-5.gl-align-items-center.gl-justify-content-center.gl-display-flex
-    .avatar-container.rect-avatar.s60.gl-flex-shrink-0
-      = topic_icon(@topic, alt: _('Topic avatar'), class: 'avatar topic-avatar s60')
-    - if @topic.title_or_name.length > max_topic_title_length
-      %h1.gl-mt-3.gl-str-truncated.has-tooltip{ title: @topic.title_or_name }
-        = truncate(@topic.title_or_name, length: max_topic_title_length)
-    - else
-      %h1.gl-mt-3
-        = @topic.title_or_name
-  - if @topic.description.present?
-    .topic-description.gl-ml-4.gl-mr-4
-      = markdown(@topic.description)
+.gl-text-center.gl-bg-gray-10.gl-pb-3.gl-pt-6
+  %div{ class: container_class }
+    .gl-pb-5.gl-align-items-center.gl-justify-content-center.gl-display-flex
+      = render Pajamas::AvatarComponent.new(@topic, size: 64, alt: '')
+      - if @topic.title_or_name.length > max_topic_title_length
+        %h1.gl-mt-3.gl-ml-5.gl-str-truncated.has-tooltip{ title: @topic.title_or_name }
+          = truncate(@topic.title_or_name, length: max_topic_title_length)
+      - else
+        %h1.gl-mt-3.gl-ml-5
+          = @topic.title_or_name
+    - if @topic.description.present?
+      .topic-description
+        = markdown(@topic.description)
 
 %div{ class: container_class }
   .gl-py-5.gl-border-gray-100.gl-border-b-solid.gl-border-b-1
diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml
index 658109fde64..5258854c931 100644
--- a/app/views/groups/settings/_general.html.haml
+++ b/app/views/groups/settings/_general.html.haml
@@ -23,8 +23,7 @@
   = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
 
   .form-group.gl-mt-3.gl-mb-6
-    .avatar-container.rect-avatar.s90
-      = group_icon(@group, alt: '', class: 'avatar group-avatar s90')
+    = render Pajamas::AvatarComponent.new(@group, size: 96, alt: '', class: 'gl-float-left gl-mr-5')
     = f.label :avatar, s_('Groups|Group avatar'), class: 'label-bold d-block'
     = render 'shared/choose_avatar_button', f: f
     - if @group.avatar?
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index f0c1b090140..2dd6eab2e17 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -58,6 +58,8 @@
 
   = yield :page_specific_javascripts
 
+  = webpack_bundle_tag 'super_sidebar' if show_super_sidebar?
+
   = webpack_controller_bundle_tags
 
   = yield :project_javascripts
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index ec80c2ba353..74567af3554 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -48,4 +48,4 @@
     -# This is needed by [GitLab JH](https://gitlab.com/gitlab-jh/jh-team/gitlab-cn/-/issues/81)
     = render_if_exists "shared/footer/global_footer"
 
-= render "layouts/nav/top_nav_responsive", class: 'layout-page content-wrapper-margin'
+= render "layouts/nav/top_nav_responsive", class: 'layout-page content-wrapper-margin' unless show_super_sidebar?
diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml
index 5f1dee39e25..93a40683161 100644
--- a/app/views/projects/settings/_general.html.haml
+++ b/app/views/projects/settings/_general.html.haml
@@ -31,8 +31,7 @@
   = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project
 
   .form-group.gl-mt-3.gl-mb-3
-    .avatar-container.rect-avatar.s90
-      = project_icon(@project, alt: _('Project avatar'), class: 'avatar project-avatar s90')
+    = render Pajamas::AvatarComponent.new(@project, size: 96, alt: '', class: 'gl-float-left gl-mr-5')
     = f.label :avatar, _('Project avatar'), class: 'label-bold d-block'
     = render 'shared/choose_avatar_button', f: f
     - if @project.avatar?
diff --git a/app/views/shared/topics/_topic.html.haml b/app/views/shared/topics/_topic.html.haml
index 83d5ecdb833..9b9630733fd 100644
--- a/app/views/shared/topics/_topic.html.haml
+++ b/app/views/shared/topics/_topic.html.haml
@@ -5,9 +5,8 @@
   = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' },
                                       body_options: { class: 'gl-display-flex gl-align-items-center' }) do |c|
     = c.body do
-      .avatar-container.rect-avatar.s40.gl-flex-shrink-0
-        = link_to detail_page_link do
-          = topic_icon(topic, class: "avatar s40")
+      = link_to detail_page_link do
+        = render Pajamas::AvatarComponent.new(topic, size: 48, alt: '', class: 'gl-mr-3')
       = link_to detail_page_link do
         - if topic.title_or_name.length > max_topic_title_length
           %h5.gl-str-truncated.has-tooltip{ title: topic.title_or_name }
diff --git a/config/application.rb b/config/application.rb
index 8dded7bed4e..96ae34d430d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -258,7 +258,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
     config.assets.precompile << "page_bundles/admin/application_settings_metrics_and_profiling.css"
     config.assets.precompile << "page_bundles/admin/elasticsearch_form.css"
-    config.assets.precompile << "page_bundles/admin/geo_nodes.css"
+    config.assets.precompile << "page_bundles/admin/geo_sites.css"
     config.assets.precompile << "page_bundles/admin/geo_replicable.css"
     config.assets.precompile << "page_bundles/admin/jobs_index.css"
     config.assets.precompile << "page_bundles/alert_management_details.css"
diff --git a/config/feature_flags/development/deny_all_requests_except_allowed.yml b/config/feature_flags/development/deny_all_requests_except_allowed.yml
deleted file mode 100644
index 18b1cfbce8c..00000000000
--- a/config/feature_flags/development/deny_all_requests_except_allowed.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: deny_all_requests_except_allowed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110599
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390746
-milestone: '15.10'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8e218184f20..3308fa3d210 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -182,6 +182,7 @@ function generateEntries() {
     sandboxed_mermaid: './lib/mermaid.js',
     redirect_listbox: './entrypoints/behaviors/redirect_listbox.js',
     sandboxed_swagger: './lib/swagger.js',
+    super_sidebar: './entrypoints/super_sidebar.js',
   };
 
   return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries));
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 53ec9eb58de..5b5449a972a 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -18215,6 +18215,7 @@ Represents a product analytics dashboard visualization.
 | <a id="projectpathlocks"></a>`pathLocks` | [`PathLockConnection`](#pathlockconnection) | The project's path locks. (see [Connections](#connections)) |
 | <a id="projectpipelineanalytics"></a>`pipelineAnalytics` | [`PipelineAnalytics`](#pipelineanalytics) | Pipeline analytics. |
 | <a id="projectprintingmergerequestlinkenabled"></a>`printingMergeRequestLinkEnabled` | [`Boolean`](#boolean) | Indicates if a link to create or view a merge request should display after a push to Git repositories of the project from the command line. |
+| <a id="projectproductanalyticsstate"></a>`productAnalyticsState` **{warning-solid}** | [`ProductAnalyticsState`](#productanalyticsstate) | **Introduced** in 15.10. This feature is in Alpha. It can be changed or removed at any time. Current state of the product analytics stack for this project.Can only be called for one project in a single request. |
 | <a id="projectpublicjobs"></a>`publicJobs` | [`Boolean`](#boolean) | Indicates if there is public access to pipelines and job details of the project, including output logs and artifacts. |
 | <a id="projectpushrules"></a>`pushRules` | [`PushRules`](#pushrules) | Project's push rules settings. |
 | <a id="projectrecentissueboards"></a>`recentIssueBoards` | [`BoardConnection`](#boardconnection) | List of recently visited boards of the project. Maximum size is 4. (see [Connections](#connections)) |
@@ -23974,6 +23975,17 @@ Event type of the pipeline associated with a merge request.
 | <a id="pipelinestatusenumsuccess"></a>`SUCCESS` | Pipeline completed successfully. |
 | <a id="pipelinestatusenumwaiting_for_resource"></a>`WAITING_FOR_RESOURCE` | A resource (for example, a runner) that the pipeline requires to run is unavailable. |
 
+### `ProductAnalyticsState`
+
+Current state of the product analytics stack.
+
+| Value | Description |
+| ----- | ----------- |
+| <a id="productanalyticsstatecomplete"></a>`COMPLETE` | Stack has been initialized and has data. |
+| <a id="productanalyticsstatecreate_instance"></a>`CREATE_INSTANCE` | Stack has not been created yet. |
+| <a id="productanalyticsstateloading_instance"></a>`LOADING_INSTANCE` | Stack is currently initializing. |
+| <a id="productanalyticsstatewaiting_for_events"></a>`WAITING_FOR_EVENTS` | Stack is waiting for events from users. |
+
 ### `ProjectMemberRelation`
 
 Project member relation.
diff --git a/doc/ci/jobs/ci_job_token.md b/doc/ci/jobs/ci_job_token.md
index c82904b04ea..db916d8d125 100644
--- a/doc/ci/jobs/ci_job_token.md
+++ b/doc/ci/jobs/ci_job_token.md
@@ -65,7 +65,9 @@ tries to steal tokens from other jobs.
 
 You can control what projects a CI/CD job token can access to increase the
 job token's security. A job token might give extra permissions that aren't necessary
-to access specific private resources.
+to access specific private resources. The job token scope only controls access
+to private projects. If an accessed project is public or internal, token scoping does
+not apply.
 
 If a job token is leaked, it could potentially be used to access private data
 to the job token's user. By limiting the job token access scope, private data cannot
@@ -83,7 +85,8 @@ their `CI_JOB_TOKEN`.
 
 For example, project `A` can add project `B` to the inbound allowlist. CI/CD jobs
 in project `B` (the "allowed project") can now use their CI/CD job token to
-authenticate API calls to access project `A`.
+authenticate API calls to access project `A`. If project `A` is public or internal,
+the project can be accessed by project `B` without adding it to the inbound allowlist.
 
 By default the inbound allowlist of any project only includes itself.
 
@@ -159,8 +162,8 @@ limited only by the user's access permissions.
 For example, when the setting is enabled, jobs in a pipeline in project `A` have
 a `CI_JOB_TOKEN` scope limited to project `A`. If the job needs to use the token
 to make an API request to a private project `B`, then `B` must be added to the allowlist for `A`.
-If project `B` is public or internal, it's not required to be added to the allowlist.
-The job token scope is only for controlling access to private projects.
+If project `B` is public or internal, you do not need to add
+`B` to the allowlist to grant access.
 
 ### Configure the outbound job token scope
 
diff --git a/doc/development/snowplow/implementation.md b/doc/development/snowplow/implementation.md
index a448e842bce..ae90b45b1f0 100644
--- a/doc/development/snowplow/implementation.md
+++ b/doc/development/snowplow/implementation.md
@@ -473,9 +473,7 @@ For a video tutorial, see the [Snowplow plugin walk through](https://www.youtube
 1. To open the extension, select the Snowplow Inspector icon beside the address bar.
 1. Click around on a webpage with Snowplow to see JavaScript events firing in the inspector window.
 
-### Test backend events
-
-#### Snowplow Micro
+### Test backend events with Snowplow Micro
 
 [Snowplow Micro](https://snowplow.io/blog/introducing-snowplow-micro/) is a
 Docker-based solution for testing backend and frontend in a local development environment. Snowplow Micro
@@ -484,50 +482,10 @@ records the same events as the full Snowplow pipeline. To query events, use the
 It can be set up automatically using [GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit).
 See the [how-to docs](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/snowplow_micro.md) for more details.
 
-Optionally, you can set it up manually, using the following instructions.
-
-#### Set up Snowplow Micro manually
-
-To install and run Snowplow Micro, complete these steps to modify the
-[GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit):
-
-1. Ensure [Docker is installed](https://docs.docker.com/get-docker/) and running.
-
-1. To install Snowplow Micro, clone the settings in
-[this project](https://gitlab.com/gitlab-org/snowplow-micro-configuration).
-
-1. Navigate to the directory with the cloned project,
-   and start the appropriate Docker container:
-
-   ```shell
-   ./snowplow-micro.sh
-   ```
-
 1. Set the environment variable to tell the GDK to use Snowplow Micro in development. This overrides two `application_settings` options:
    - `snowplow_enabled` setting will instead return `true` from `Gitlab::Tracking.enabled?`
    - `snowplow_collector_hostname` setting will instead always return `localhost:9090` (or whatever port is set for `snowplow_micro.port` GDK setting) from `Gitlab::Tracking.collector_hostname`.
-
-   ```shell
-   gdk config set snowplow_micro.enabled true
-   ```
-
-   Optionally, you can set the port for you Snowplow Micro instance as well (the default value is `9090`):
-
-   ```shell
-   gdk config set snowplow_micro.port 8080
-   ```
-
-1. Regenerate the project YAML config:
-
-   ```shell
-   gdk reconfigure
-   ```
-
-1. Restart GDK:
-
-   ```shell
-   gdk restart
-   ```
+With Snowplow Micro set up you can now manually test backend Snowplow events:
 
 1. Send a test Snowplow event from the Rails console:
 
diff --git a/doc/development/snowplow/review_guidelines.md b/doc/development/snowplow/review_guidelines.md
index 95e1bbacbe1..da7f2bc2781 100644
--- a/doc/development/snowplow/review_guidelines.md
+++ b/doc/development/snowplow/review_guidelines.md
@@ -28,7 +28,7 @@ events or touches Snowplow related files.
 - For frontend events, when relevant, add a screenshot of the event in
   the [testing tool](implementation.md#develop-and-test-snowplow) used.
 - For backend events, when relevant, add the output of the
-  [Snowplow Micro](implementation.md#snowplow-micro) good events
+  [Snowplow Micro](implementation.md#test-backend-events-with-snowplow-micro) good events
   `GET http://localhost:9090/micro/good` (it might be a good idea
   to reset with `GET http://localhost:9090/micro/reset` first).
 - Update the [Event Dictionary](event_dictionary_guide.md).
diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md
index 85d807eceb1..6134e0f9959 100644
--- a/doc/development/testing_guide/frontend_testing.md
+++ b/doc/development/testing_guide/frontend_testing.md
@@ -520,6 +520,25 @@ it('waits for an event', () => {
 });
 ```
 
+### Manipulate `gon` object
+
+`gon` (or `window.gon`) is a global object used to pass data from the backend. If your test depends
+on its value you can directly modify it:
+
+```javascript
+describe('when logged in', () => {
+  beforeEach(() => {
+    gon.current_user_id = 1;
+  });
+
+  it('shows message', () => {
+    expect(wrapper.text()).toBe('Logged in!');
+  });
+})
+```
+
+`gon` is reset in every test to ensure tests are isolated.
+
 ### Ensuring that tests are isolated
 
 Tests are normally architected in a pattern which requires a recurring setup of the component under test. This is often achieved by making use of the `beforeEach` hook.
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 33002e687bd..df366d563b6 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -141,6 +141,70 @@ Configure FortiAuthenticator in GitLab. On your GitLab server:
 1. [Reconfigure](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) (Omnibus GitLab) or
    [restart](../../../administration/restart_gitlab.md#installations-from-source) (GitLab installed from source).
 
+### Enable one-time password using Duo
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15760) in GitLab 15.10.
+
+FLAG:
+On self-managed GitLab, by default this feature is available. On GitLab.com this feature is not available.
+
+You can use Duo as a one-time password (OTP) provider in GitLab.
+
+#### Prerequisites
+
+You must:
+
+- Exist in both Duo and GitLab, with the same username in both applications.
+- Have configured Duo and have an integration key, secret key, and API hostname for Duo. Access this information in the [Duo Admin Panel](https://admin.duosecurity.com/).
+
+For more information, see the [Duo API documentation](https://duo.com/docs/authapi).
+
+GitLab 15.10 has been tested with Duo version D261.14
+
+#### Configure Duo in GitLab
+
+On your GitLab server:
+
+1. Open the configuration file.
+
+   For Omnibus GitLab:
+
+   ```shell
+   sudo editor /etc/gitlab/gitlab.rb
+   ```
+
+   For installations from source:
+
+   ```shell
+   cd /home/git/gitlab
+   sudo -u git -H editor config/gitlab.yml
+   ```
+
+1. Add the provider configuration:
+
+   For Omnibus package:
+
+   ```ruby
+    gitlab_rails['duo_auth_enabled'] = false
+    gitlab_rails['duo_auth_integration_key'] = '<duo_integration_key_value>'
+    gitlab_rails['duo_auth_secret_key'] = '<duo_secret_key_value>'
+    gitlab_rails['duo_auth_hostname'] = '<duo_api_hostname>'
+   ```
+
+   For installations from source:
+
+   ```yaml
+   duo_auth:
+     enabled: true
+     hostname: <duo_api_hostname>
+     integration_key: <duo_integration_key_value>
+     secret_key: <duo_secret_key_value>
+   ```
+
+1. Save the configuration file.
+1. [Reconfigure](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) (Omnibus GitLab) or
+   [restart](../../../administration/restart_gitlab.md#installations-from-source) (GitLab installed from source).
+
 ### Enable one-time password using FortiToken Cloud
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/212313) in GitLab 13.7 [with a flag](../../../administration/feature_flags.md) named `forti_token_cloud`. Disabled by default.
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb
index fba1166e7ad..1be9190e5f8 100644
--- a/lib/gitlab/url_blocker.rb
+++ b/lib/gitlab/url_blocker.rb
@@ -335,8 +335,6 @@ module Gitlab
       end
 
       def deny_all_requests_except_allowed?(should_deny)
-        return unless Feature.enabled?(:deny_all_requests_except_allowed)
-
         should_deny.is_a?(Proc) ? should_deny.call : should_deny
       end
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1dd1873a1e4..00d6110154e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4792,9 +4792,6 @@ msgstr ""
 msgid "Analytics|Error while saving Dashboard!"
 msgstr ""
 
-msgid "Analytics|For being able to create your own dashboards please configure a special project to store your dashboards."
-msgstr ""
-
 msgid "Analytics|Host"
 msgstr ""
 
@@ -4840,6 +4837,9 @@ msgstr ""
 msgid "Analytics|Single Statistic"
 msgstr ""
 
+msgid "Analytics|To create your own dashboards, first configure a project to store your dashboards."
+msgstr ""
+
 msgid "Analytics|URL"
 msgstr ""
 
@@ -18581,7 +18581,7 @@ msgstr ""
 msgid "Geo|Does not match the primary storage configuration"
 msgstr ""
 
-msgid "Geo|Edit %{nodeType} site"
+msgid "Geo|Edit %{siteType} site"
 msgstr ""
 
 msgid "Geo|Edit Geo Site"
@@ -18764,7 +18764,7 @@ msgstr ""
 msgid "Geo|Remove"
 msgstr ""
 
-msgid "Geo|Remove %{nodeType} site"
+msgid "Geo|Remove %{siteType} site"
 msgstr ""
 
 msgid "Geo|Remove entry"
@@ -51197,6 +51197,9 @@ msgstr ""
 msgid "ciReport|There was an error dismissing the vulnerability. Please try again."
 msgstr ""
 
+msgid "ciReport|There was an error dismissing the vulnerability: %{error}"
+msgstr ""
+
 msgid "ciReport|There was an error fetching the codequality report."
 msgstr ""
 
diff --git a/patches/@vue+compiler-sfc+3.2.47.patch b/patches/@vue+compiler-sfc+3.2.47.patch
new file mode 100644
index 00000000000..9cbedbb0d0f
--- /dev/null
+++ b/patches/@vue+compiler-sfc+3.2.47.patch
@@ -0,0 +1,28 @@
+diff --git a/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js b/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js
+index 6093500..5e9bcbb 100644
+--- a/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js
++++ b/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js
+@@ -5226,7 +5226,8 @@ function parse$4(source, { sourceMap = true, filename = DEFAULT_FILENAME, source
+                     const templateBlock = (descriptor.template = createBlock(node, source, false));
+                     templateBlock.ast = node;
+                     // warn against 2.x <template functional>
+-                    if (templateBlock.attrs.functional) {
++                    // disabled by patch-package in gitlab as temporary migration
++                    if (false && templateBlock.attrs.functional) {
+                         const err = new SyntaxError(`<template functional> is no longer supported in Vue 3, since ` +
+                             `functional components no longer have significant performance ` +
+                             `difference from stateful ones. Just use a normal <template> ` +
+diff --git a/node_modules/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js b/node_modules/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js
+index 2ce8d7a..2fbe75b 100644
+--- a/node_modules/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js
++++ b/node_modules/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js
+@@ -37376,7 +37376,8 @@ function parse$5(source, { sourceMap = true, filename = DEFAULT_FILENAME, source
+                     const templateBlock = (descriptor.template = createBlock(node, source, false));
+                     templateBlock.ast = node;
+                     // warn against 2.x <template functional>
+-                    if (templateBlock.attrs.functional) {
++                    // disabled by patch-package in gitlab as temporary migration
++                    if (false && templateBlock.attrs.functional) {
+                         const err = new SyntaxError(`<template functional> is no longer supported in Vue 3, since ` +
+                             `functional components no longer have significant performance ` +
+                             `difference from stateful ones. Just use a normal <template> ` +
diff --git a/spec/controllers/confirmations_controller_spec.rb b/spec/controllers/confirmations_controller_spec.rb
index 0e88811550a..b1aa40d4d7b 100644
--- a/spec/controllers/confirmations_controller_spec.rb
+++ b/spec/controllers/confirmations_controller_spec.rb
@@ -176,10 +176,12 @@ RSpec.describe ConfirmationsController, feature_category: :system_access do
           end
 
           it 'displays an error' do
+            alert_text = _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
+
             perform_request
 
             expect(response).to render_template(:new)
-            expect(flash[:alert]).to include _('There was an error with the reCAPTCHA.')
+            expect(flash[:alert]).to include alert_text
           end
 
           it 'sets gon variables' do
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 293b902ca72..3a1aa36208e 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -662,10 +662,6 @@ RSpec.describe 'Admin updates settings', feature_category: :shared do
     end
 
     context 'Network page' do
-      before do
-        stub_feature_flags(deny_all_requests_except_allowed: false)
-      end
-
       it 'changes Outbound requests settings' do
         visit network_admin_application_settings_path
 
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 585740f7782..fa5dd8c893c 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe 'New/edit issue', :js, feature_category: :team_planning do
   let_it_be(:label)     { create(:label, project: project) }
   let_it_be(:label2)    { create(:label, project: project) }
   let_it_be(:issue)     { create(:issue, project: project, assignees: [user], milestone: milestone) }
+  let_it_be(:issue2)    { create(:issue, project: project, assignees: [user], milestone: milestone) }
   let_it_be(:confidential_issue) { create(:issue, project: project, assignees: [user], milestone: milestone, confidential: true) }
 
   let(:current_user) { user }
@@ -477,14 +478,69 @@ RSpec.describe 'New/edit issue', :js, feature_category: :team_planning do
   end
 
   describe 'inline edit' do
-    before do
-      visit project_issue_path(project, issue)
+    context 'within issue 1' do
+      before do
+        visit project_issue_path(project, issue)
+        wait_for_requests
+      end
+
+      it 'opens inline edit form with shortcut' do
+        find('body').send_keys('e')
+
+        expect(page).to have_selector('.detail-page-description form')
+      end
+
+      describe 'when user has made no changes' do
+        it 'let user leave the page without warnings' do
+          expected_content = 'Issue created'
+          expect(page).to have_content(expected_content)
+
+          find('body').send_keys('e')
+
+          click_link 'Boards'
+
+          expect(page).not_to have_content(expected_content)
+        end
+      end
+
+      describe 'when user has made changes' do
+        it 'shows a warning and can stay on page' do
+          content = 'new issue content'
+
+          find('body').send_keys('e')
+          fill_in 'issue-description', with: content
+
+          click_link 'Boards'
+
+          page.driver.browser.switch_to.alert.dismiss
+
+          click_button 'Save changes'
+          wait_for_requests
+
+          expect(page).to have_content(content)
+        end
+      end
     end
 
-    it 'opens inline edit form with shortcut' do
-      find('body').send_keys('e')
+    context 'within issue 2' do
+      before do
+        visit project_issue_path(project, issue2)
+        wait_for_requests
+      end
 
-      expect(page).to have_selector('.detail-page-description form')
+      describe 'when user has made changes' do
+        it 'shows a warning and can leave page' do
+          content = 'new issue content'
+          find('body').send_keys('e')
+          fill_in 'issue-description', with: content
+
+          click_link 'Boards'
+
+          page.driver.browser.switch_to.alert.accept
+
+          expect(page).not_to have_content(content)
+        end
+      end
     end
   end
 
diff --git a/spec/features/topic_show_spec.rb b/spec/features/topic_show_spec.rb
index d640e4e4edb..39b8782ea58 100644
--- a/spec/features/topic_show_spec.rb
+++ b/spec/features/topic_show_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Topic show page', feature_category: :projects do
     it 'shows title, avatar and description as markdown' do
       expect(page).to have_content(topic.title)
       expect(page).not_to have_content(topic.name)
-      expect(page).to have_selector('.avatar-container > img.topic-avatar')
+      expect(page).to have_selector('.gl-avatar.gl-avatar-s64')
       expect(find('.topic-description')).to have_selector('p > strong')
       expect(find('.topic-description')).to have_selector('p > a[rel]')
       expect(find('.topic-description')).to have_selector('p > gl-emoji')
diff --git a/spec/frontend/__helpers__/gon_helper.js b/spec/frontend/__helpers__/gon_helper.js
new file mode 100644
index 00000000000..51d5ece5fc1
--- /dev/null
+++ b/spec/frontend/__helpers__/gon_helper.js
@@ -0,0 +1,5 @@
+export const createGon = (IS_EE) => {
+  return {
+    ee: IS_EE,
+  };
+};
diff --git a/spec/frontend/__helpers__/shared_test_setup.js b/spec/frontend/__helpers__/shared_test_setup.js
index 7fc81cf6548..0217835b2a3 100644
--- a/spec/frontend/__helpers__/shared_test_setup.js
+++ b/spec/frontend/__helpers__/shared_test_setup.js
@@ -6,6 +6,7 @@ import { enableAutoDestroy } from '@vue/test-utils';
 import 'jquery';
 import Translate from '~/vue_shared/translate';
 import setWindowLocation from './set_window_location_helper';
+import { createGon } from './gon_helper';
 import { setGlobalDateToFakeDate } from './fake_date';
 import { TEST_HOST } from './test_constants';
 import * as customMatchers from './matchers';
@@ -71,8 +72,13 @@ beforeEach(() => {
   // eslint-disable-next-line jest/no-standalone-expect
   expect.hasAssertions();
 
-  // Reset the mocked window.location. This ensures tests don't interfere with
-  // each other, and removes the need to tidy up if it was changed for a given
-  // test.
+  // Reset globals: This ensures tests don't interfere with
+  // each other, and removes the need to tidy up if it was
+  // changed for a given test.
+
+  // Reset the mocked window.location
   setWindowLocation(TEST_HOST);
+
+  // Reset window.gon object
+  window.gon = createGon(window.IS_EE);
 });
diff --git a/spec/frontend/ci/runner/components/registration/registration_instructions_spec.js b/spec/frontend/ci/runner/components/registration/registration_instructions_spec.js
index 72064a3895f..9b264e17c41 100644
--- a/spec/frontend/ci/runner/components/registration/registration_instructions_spec.js
+++ b/spec/frontend/ci/runner/components/registration/registration_instructions_spec.js
@@ -16,10 +16,6 @@ import {
 } from '~/ci/runner/constants';
 import { runnerForRegistration } from '../../mock_data';
 
-const DUMMY_GON = {
-  gitlab_url: TEST_HOST,
-};
-
 const AUTH_TOKEN = 'AUTH_TOKEN';
 
 const mockRunner = {
@@ -29,7 +25,6 @@ const mockRunner = {
 
 describe('RegistrationInstructions', () => {
   let wrapper;
-  let originalGon;
 
   const findHeading = () => wrapper.find('h1');
   const findStepAt = (i) => extendedWrapper(wrapper.findAll('section').at(i));
@@ -48,13 +43,8 @@ describe('RegistrationInstructions', () => {
     });
   };
 
-  beforeAll(() => {
-    originalGon = window.gon;
-    window.gon = { ...DUMMY_GON };
-  });
-
-  afterAll(() => {
-    window.gon = originalGon;
+  beforeEach(() => {
+    window.gon.gitlab_url = TEST_HOST;
   });
 
   describe('renders heading', () => {
diff --git a/spec/frontend/ci/runner/components/registration/utils_spec.js b/spec/frontend/ci/runner/components/registration/utils_spec.js
index c2bf28b4a25..acf5993b15b 100644
--- a/spec/frontend/ci/runner/components/registration/utils_spec.js
+++ b/spec/frontend/ci/runner/components/registration/utils_spec.js
@@ -16,20 +16,10 @@ import {
 
 const REGISTRATION_TOKEN = 'REGISTRATION_TOKEN';
 const DESCRIPTION = 'RUNNER';
-const DUMMY_GON = {
-  gitlab_url: TEST_HOST,
-};
 
 describe('registration utils', () => {
-  let originalGon;
-
-  beforeAll(() => {
-    originalGon = window.gon;
-    window.gon = { ...DUMMY_GON };
-  });
-
-  afterAll(() => {
-    window.gon = originalGon;
+  beforeEach(() => {
+    window.gon.gitlab_url = TEST_HOST;
   });
 
   describe.each([LINUX_PLATFORM, MACOS_PLATFORM, WINDOWS_PLATFORM])(
diff --git a/spec/frontend/editor/source_editor_ci_schema_ext_spec.js b/spec/frontend/editor/source_editor_ci_schema_ext_spec.js
index 21f8979f1a9..e515285601b 100644
--- a/spec/frontend/editor/source_editor_ci_schema_ext_spec.js
+++ b/spec/frontend/editor/source_editor_ci_schema_ext_spec.js
@@ -17,7 +17,6 @@ describe('~/editor/editor_ci_config_ext', () => {
   let editor;
   let instance;
   let editorEl;
-  let originalGitlabUrl;
 
   const createMockEditor = ({ blobPath = defaultBlobPath } = {}) => {
     setHTMLFixture('<div id="editor"></div>');
@@ -31,16 +30,8 @@ describe('~/editor/editor_ci_config_ext', () => {
     instance.use({ definition: CiSchemaExtension });
   };
 
-  beforeAll(() => {
-    originalGitlabUrl = gon.gitlab_url;
-    gon.gitlab_url = TEST_HOST;
-  });
-
-  afterAll(() => {
-    gon.gitlab_url = originalGitlabUrl;
-  });
-
   beforeEach(() => {
+    gon.gitlab_url = TEST_HOST;
     createMockEditor();
   });
 
diff --git a/spec/frontend/environment.js b/spec/frontend/environment.js
index 82e3b50aeb8..7b160c48501 100644
--- a/spec/frontend/environment.js
+++ b/spec/frontend/environment.js
@@ -8,6 +8,7 @@ const {
   setGlobalDateToRealDate,
 } = require('./__helpers__/fake_date/fake_date');
 const { TEST_HOST } = require('./__helpers__/test_constants');
+const { createGon } = require('./__helpers__/gon_helper');
 
 const ROOT_PATH = path.resolve(__dirname, '../..');
 
@@ -40,11 +41,12 @@ class CustomEnvironment extends TestEnvironment {
     });
 
     const { IS_EE } = projectConfig.testEnvironmentOptions;
-    this.global.gon = {
-      ee: IS_EE,
-    };
+
     this.global.IS_EE = IS_EE;
 
+    // Set up global `gon` object
+    this.global.gon = createGon(IS_EE);
+
     // Set up global `gl` object
     this.global.gl = {};
 
diff --git a/spec/frontend/header_search/components/app_spec.js b/spec/frontend/header_search/components/app_spec.js
index 8adc108d38a..35104b84a88 100644
--- a/spec/frontend/header_search/components/app_spec.js
+++ b/spec/frontend/header_search/components/app_spec.js
@@ -350,8 +350,8 @@ describe('HeaderSearchApp', () => {
 
   describe('events', () => {
     beforeEach(() => {
-      createComponent();
       window.gon.current_username = MOCK_USERNAME;
+      createComponent();
     });
 
     describe('Header Search Input', () => {
@@ -459,8 +459,8 @@ describe('HeaderSearchApp', () => {
       ${2}                | ${'test1'}
     `('currentFocusedOption', ({ MOCK_INDEX, search }) => {
       beforeEach(() => {
-        createComponent({ search });
         window.gon.current_username = MOCK_USERNAME;
+        createComponent({ search });
         findHeaderSearchInput().vm.$emit('click');
       });
 
@@ -500,8 +500,8 @@ describe('HeaderSearchApp', () => {
       const MOCK_INDEX = 1;
 
       beforeEach(() => {
-        createComponent();
         window.gon.current_username = MOCK_USERNAME;
+        createComponent();
         findHeaderSearchInput().vm.$emit('click');
       });
 
diff --git a/spec/frontend/issues/show/components/app_spec.js b/spec/frontend/issues/show/components/app_spec.js
index abc44f19855..1006f54eeaf 100644
--- a/spec/frontend/issues/show/components/app_spec.js
+++ b/spec/frontend/issues/show/components/app_spec.js
@@ -1,7 +1,6 @@
 import { GlIcon, GlIntersectionObserver } from '@gitlab/ui';
 import MockAdapter from 'axios-mock-adapter';
-import { nextTick } from 'vue';
-import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
+import { setHTMLFixture } from 'helpers/fixtures';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -21,29 +20,27 @@ import FormComponent from '~/issues/show/components/form.vue';
 import TitleComponent from '~/issues/show/components/title.vue';
 import IncidentTabs from '~/issues/show/components/incidents/incident_tabs.vue';
 import PinnedLinks from '~/issues/show/components/pinned_links.vue';
-import { POLLING_DELAY } from '~/issues/show/constants';
 import eventHub from '~/issues/show/event_hub';
 import axios from '~/lib/utils/axios_utils';
-import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
+import { HTTP_STATUS_OK, HTTP_STATUS_UNAUTHORIZED } from '~/lib/utils/http_status';
 import { visitUrl } from '~/lib/utils/url_utility';
 import {
   appProps,
   initialRequest,
   publishedIncidentUrl,
+  putRequest,
   secondRequest,
   zoomMeetingUrl,
 } from '../mock_data/mock_data';
 
 jest.mock('~/alert');
-jest.mock('~/issues/show/event_hub');
 jest.mock('~/lib/utils/url_utility');
 jest.mock('~/behaviors/markdown/render_gfm');
 
 const REALTIME_REQUEST_STACK = [initialRequest, secondRequest];
 
 describe('Issuable output', () => {
-  let mock;
-  let realtimeRequestCount = 0;
+  let axiosMock;
   let wrapper;
 
   const findStickyHeader = () => wrapper.findByTestId('issue-sticky-header');
@@ -57,7 +54,7 @@ describe('Issuable output', () => {
   const findForm = () => wrapper.findComponent(FormComponent);
   const findPinnedLinks = () => wrapper.findComponent(PinnedLinks);
 
-  const mountComponent = (props = {}, options = {}, data = {}) => {
+  const createComponent = ({ props = {}, options = {}, data = {} } = {}) => {
     wrapper = shallowMountExtended(IssuableApp, {
       directives: {
         GlTooltip: createMockDirective('gl-tooltip'),
@@ -78,6 +75,28 @@ describe('Issuable output', () => {
       },
       ...options,
     });
+
+    jest.advanceTimersToNextTimer(2);
+    return waitForPromises();
+  };
+
+  const emitHubEvent = (event) => {
+    eventHub.$emit(event);
+    return waitForPromises();
+  };
+
+  const openForm = () => {
+    return emitHubEvent('open.form');
+  };
+
+  const updateIssuable = () => {
+    return emitHubEvent('update.issuable');
+  };
+
+  const advanceToNextPoll = () => {
+    // We get new data through the HTTP request.
+    jest.advanceTimersToNextTimer();
+    return waitForPromises();
   };
 
   beforeEach(() => {
@@ -97,78 +116,100 @@ describe('Issuable output', () => {
       </div>
     `);
 
-    mock = new MockAdapter(axios);
-    mock
-      .onGet('/gitlab-org/gitlab-shell/-/issues/9/realtime_changes/realtime_changes')
-      .reply(() => {
-        const res = Promise.resolve([HTTP_STATUS_OK, REALTIME_REQUEST_STACK[realtimeRequestCount]]);
-        realtimeRequestCount += 1;
-        return res;
-      });
+    jest.spyOn(eventHub, '$emit');
 
-    mountComponent();
+    axiosMock = new MockAdapter(axios);
+    const endpoint = '/gitlab-org/gitlab-shell/-/issues/9/realtime_changes/realtime_changes';
 
-    jest.advanceTimersByTime(2);
+    axiosMock.onGet(endpoint).replyOnce(HTTP_STATUS_OK, REALTIME_REQUEST_STACK[0], {
+      'POLL-INTERVAL': '1',
+    });
+    axiosMock.onGet(endpoint).reply(HTTP_STATUS_OK, REALTIME_REQUEST_STACK[1], {
+      'POLL-INTERVAL': '-1',
+    });
+    axiosMock.onPut().reply(HTTP_STATUS_OK, putRequest);
   });
 
-  afterEach(() => {
-    mock.restore();
-    realtimeRequestCount = 0;
-    wrapper.vm.poll.stop();
-    resetHTMLFixture();
+  describe('update', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
+
+    it('should render a title/description/edited and update title/description/edited on update', async () => {
+      expect(findTitle().props('titleText')).toContain(initialRequest.title_text);
+      expect(findDescription().props('descriptionText')).toContain('this is a description');
+
+      expect(findEdited().exists()).toBe(true);
+      expect(findEdited().props('updatedByPath')).toMatch(/\/some_user$/);
+      expect(findEdited().props('updatedAt')).toBe(initialRequest.updated_at);
+      expect(findDescription().props().lockVersion).toBe(initialRequest.lock_version);
+
+      await advanceToNextPoll();
+
+      expect(findTitle().props('titleText')).toContain('2');
+      expect(findDescription().props('descriptionText')).toContain('42');
+
+      expect(findEdited().exists()).toBe(true);
+      expect(findEdited().props('updatedByName')).toBe('Other User');
+      expect(findEdited().props('updatedByPath')).toMatch(/\/other_user$/);
+      expect(findEdited().props('updatedAt')).toBe(secondRequest.updated_at);
+    });
   });
 
-  it('should render a title/description/edited and update title/description/edited on update', () => {
-    return axios
-      .waitForAll()
-      .then(() => {
-        expect(findTitle().props('titleText')).toContain('this is a title');
-        expect(findDescription().props('descriptionText')).toContain('this is a description');
+  describe('with permissions', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
 
-        expect(findEdited().exists()).toBe(true);
-        expect(findEdited().props('updatedByPath')).toMatch(/\/some_user$/);
-        expect(findEdited().props('updatedAt')).toBe(initialRequest.updated_at);
-        expect(wrapper.vm.state.lock_version).toBe(initialRequest.lock_version);
-      })
-      .then(() => {
-        wrapper.vm.poll.makeRequest();
-        return axios.waitForAll();
-      })
-      .then(() => {
-        expect(findTitle().props('titleText')).toContain('2');
-        expect(findDescription().props('descriptionText')).toContain('42');
+    it('shows actions on `open.form` event', async () => {
+      expect(findForm().exists()).toBe(false);
 
-        expect(findEdited().exists()).toBe(true);
-        expect(findEdited().props('updatedByName')).toBe('Other User');
-        expect(findEdited().props('updatedByPath')).toMatch(/\/other_user$/);
-        expect(findEdited().props('updatedAt')).toBe(secondRequest.updated_at);
-      });
+      await openForm();
+
+      expect(findForm().exists()).toBe(true);
+    });
+
+    it('update formState if form is not open', async () => {
+      const titleValue = initialRequest.title_text;
+
+      expect(findTitle().exists()).toBe(true);
+      expect(findTitle().props('titleText')).toBe(titleValue);
+
+      await advanceToNextPoll();
+
+      // The title component has the new data, so the state was updated
+      expect(findTitle().exists()).toBe(true);
+      expect(findTitle().props('titleText')).toBe(secondRequest.title_text);
+    });
+
+    it('does not update formState if form is already open', async () => {
+      const titleValue = initialRequest.title_text;
+
+      expect(findTitle().exists()).toBe(true);
+      expect(findTitle().props('titleText')).toBe(titleValue);
+
+      await openForm();
+
+      // Opening the form, the data has not changed
+      expect(findForm().props().formState.title).toBe(titleValue);
+
+      await advanceToNextPoll();
+
+      // We expect the prop value not to have changed after another API call
+      expect(findForm().props().formState.title).toBe(titleValue);
+    });
   });
 
-  it('shows actions if permissions are correct', async () => {
-    wrapper.vm.showForm = true;
+  describe('without permissions', () => {
+    beforeEach(async () => {
+      await createComponent({ props: { canUpdate: false } });
+    });
 
-    await nextTick();
-    expect(findForm().exists()).toBe(true);
-  });
+    it('does not show actions if permissions are incorrect', async () => {
+      await openForm();
 
-  it('does not show actions if permissions are incorrect', async () => {
-    wrapper.vm.showForm = true;
-    wrapper.setProps({ canUpdate: false });
-
-    await nextTick();
-    expect(findForm().exists()).toBe(false);
-  });
-
-  it('does not update formState if form is already open', async () => {
-    wrapper.vm.updateAndShowForm();
-
-    wrapper.vm.state.titleText = 'testing 123';
-
-    wrapper.vm.updateAndShowForm();
-
-    await nextTick();
-    expect(wrapper.vm.store.formState.title).not.toBe('testing 123');
+      expect(findForm().exists()).toBe(false);
+    });
   });
 
   describe('Pinned links propagated', () => {
@@ -176,268 +217,130 @@ describe('Issuable output', () => {
       prop                      | value
       ${'zoomMeetingUrl'}       | ${zoomMeetingUrl}
       ${'publishedIncidentUrl'} | ${publishedIncidentUrl}
-    `('sets the $prop correctly on underlying pinned links', ({ prop, value }) => {
+    `('sets the $prop correctly on underlying pinned links', async ({ prop, value }) => {
+      await createComponent();
+
       expect(findPinnedLinks().props(prop)).toBe(value);
     });
   });
 
-  describe('updateIssuable', () => {
-    it('fetches new data after update', async () => {
-      const updateStoreSpy = jest.spyOn(wrapper.vm, 'updateStoreState');
-      const getDataSpy = jest.spyOn(wrapper.vm.service, 'getData');
-      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
-        data: { web_url: window.location.pathname },
-      });
-
-      await wrapper.vm.updateIssuable();
-      expect(updateStoreSpy).toHaveBeenCalled();
-      expect(getDataSpy).toHaveBeenCalled();
+  describe('updating an issue', () => {
+    beforeEach(async () => {
+      await createComponent();
     });
 
-    it('correctly updates issuable data', async () => {
-      const spy = jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
-        data: { web_url: window.location.pathname },
-      });
+    it('fetches new data after update', async () => {
+      await advanceToNextPoll();
+
+      await updateIssuable();
+
+      expect(axiosMock.history.put).toHaveLength(1);
+      // The call was made with the new data
+      expect(axiosMock.history.put[0].data.title).toEqual(findTitle().props().title);
+    });
+
+    it('closes the form after fetching data', async () => {
+      await updateIssuable();
 
-      await wrapper.vm.updateIssuable();
-      expect(spy).toHaveBeenCalledWith(wrapper.vm.formState);
       expect(eventHub.$emit).toHaveBeenCalledWith('close.form');
     });
 
     it('does not redirect if issue has not moved', async () => {
-      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
-        data: {
-          web_url: window.location.pathname,
-          confidential: wrapper.vm.isConfidential,
-        },
+      axiosMock.onPut().reply(HTTP_STATUS_OK, {
+        ...putRequest,
+        confidential: appProps.isConfidential,
       });
 
-      await wrapper.vm.updateIssuable();
+      await updateIssuable();
+
       expect(visitUrl).not.toHaveBeenCalled();
     });
 
     it('does not redirect if issue has not moved and user has switched tabs', async () => {
-      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
-        data: {
-          web_url: '',
-          confidential: wrapper.vm.isConfidential,
-        },
+      axiosMock.onPut().reply(HTTP_STATUS_OK, {
+        ...putRequest,
+        web_url: '',
+        confidential: appProps.isConfidential,
       });
 
-      await wrapper.vm.updateIssuable();
+      await updateIssuable();
+
       expect(visitUrl).not.toHaveBeenCalled();
     });
 
     it('redirects if returned web_url has changed', async () => {
-      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
-        data: {
-          web_url: '/testing-issue-move',
-          confidential: wrapper.vm.isConfidential,
-        },
+      const webUrl = '/testing-issue-move';
+
+      axiosMock.onPut().reply(HTTP_STATUS_OK, {
+        ...putRequest,
+        web_url: webUrl,
+        confidential: appProps.isConfidential,
       });
 
-      wrapper.vm.updateIssuable();
+      await updateIssuable();
 
-      await wrapper.vm.updateIssuable();
-      expect(visitUrl).toHaveBeenCalledWith('/testing-issue-move');
-    });
-
-    describe('shows dialog when issue has unsaved changed', () => {
-      it('confirms on title change', async () => {
-        wrapper.vm.showForm = true;
-        wrapper.vm.state.titleText = 'title has changed';
-        const e = { returnValue: null };
-        wrapper.vm.handleBeforeUnloadEvent(e);
-
-        await nextTick();
-        expect(e.returnValue).not.toBeNull();
-      });
-
-      it('confirms on description change', async () => {
-        wrapper.vm.showForm = true;
-        wrapper.vm.state.descriptionText = 'description has changed';
-        const e = { returnValue: null };
-        wrapper.vm.handleBeforeUnloadEvent(e);
-
-        await nextTick();
-        expect(e.returnValue).not.toBeNull();
-      });
-
-      it('does nothing when nothing has changed', async () => {
-        const e = { returnValue: null };
-        wrapper.vm.handleBeforeUnloadEvent(e);
-
-        await nextTick();
-        expect(e.returnValue).toBeNull();
-      });
+      expect(visitUrl).toHaveBeenCalledWith(webUrl);
     });
 
     describe('error when updating', () => {
-      it('closes form on error', async () => {
-        jest.spyOn(wrapper.vm.service, 'updateIssuable').mockRejectedValue();
+      it('closes form', async () => {
+        axiosMock.onPut().reply(HTTP_STATUS_UNAUTHORIZED);
+
+        await updateIssuable();
 
-        await wrapper.vm.updateIssuable();
         expect(eventHub.$emit).not.toHaveBeenCalledWith('close.form');
-        expect(createAlert).toHaveBeenCalledWith({ message: `Error updating issue` });
+        expect(createAlert).toHaveBeenCalledWith({
+          message: `Error updating issue. Request failed with status code 401`,
+        });
       });
 
       it('returns the correct error message for issuableType', async () => {
-        jest.spyOn(wrapper.vm.service, 'updateIssuable').mockRejectedValue();
+        axiosMock.onPut().reply(HTTP_STATUS_UNAUTHORIZED);
+
+        await updateIssuable();
+
         wrapper.setProps({ issuableType: 'merge request' });
 
-        await nextTick();
-        await wrapper.vm.updateIssuable();
+        await updateIssuable();
+
         expect(eventHub.$emit).not.toHaveBeenCalledWith('close.form');
-        expect(createAlert).toHaveBeenCalledWith({ message: `Error updating merge request` });
+        expect(createAlert).toHaveBeenCalledWith({
+          message: `Error updating merge request. Request failed with status code 401`,
+        });
       });
 
       it('shows error message from backend if exists', async () => {
         const msg = 'Custom error message from backend';
-        jest
-          .spyOn(wrapper.vm.service, 'updateIssuable')
-          .mockRejectedValue({ response: { data: { errors: [msg] } } });
+        axiosMock.onPut().reply(HTTP_STATUS_UNAUTHORIZED, { errors: [msg] });
+
+        await updateIssuable();
 
-        await wrapper.vm.updateIssuable();
         expect(createAlert).toHaveBeenCalledWith({
-          message: `${wrapper.vm.defaultErrorMessage}. ${msg}`,
+          message: `Error updating issue. ${msg}`,
         });
       });
     });
   });
 
-  describe('updateAndShowForm', () => {
+  describe('Locked warning', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
+
     it('shows locked warning if form is open & data is different', async () => {
-      await nextTick();
-      wrapper.vm.updateAndShowForm();
+      await openForm();
+      await advanceToNextPoll();
 
-      wrapper.vm.poll.makeRequest();
-
-      await new Promise((resolve) => {
-        wrapper.vm.$watch('formState.lockedWarningVisible', (value) => {
-          if (value) {
-            resolve();
-          }
-        });
-      });
-
-      expect(wrapper.vm.formState.lockedWarningVisible).toBe(true);
-      expect(wrapper.vm.formState.lock_version).toBe(1);
-    });
-  });
-
-  describe('requestTemplatesAndShowForm', () => {
-    let formSpy;
-
-    beforeEach(() => {
-      formSpy = jest.spyOn(wrapper.vm, 'updateAndShowForm');
-    });
-
-    it('shows the form if template names as hash request is successful', () => {
-      const mockData = {
-        test: [{ name: 'test', id: 'test', project_path: '/', namespace_path: '/' }],
-      };
-      mock
-        .onGet('/issuable-templates-path')
-        .reply(() => Promise.resolve([HTTP_STATUS_OK, mockData]));
-
-      return wrapper.vm.requestTemplatesAndShowForm().then(() => {
-        expect(formSpy).toHaveBeenCalledWith(mockData);
-      });
-    });
-
-    it('shows the form if template names as array request is successful', () => {
-      const mockData = [{ name: 'test', id: 'test', project_path: '/', namespace_path: '/' }];
-      mock
-        .onGet('/issuable-templates-path')
-        .reply(() => Promise.resolve([HTTP_STATUS_OK, mockData]));
-
-      return wrapper.vm.requestTemplatesAndShowForm().then(() => {
-        expect(formSpy).toHaveBeenCalledWith(mockData);
-      });
-    });
-
-    it('shows the form if template names request failed', () => {
-      mock
-        .onGet('/issuable-templates-path')
-        .reply(() => Promise.reject(new Error('something went wrong')));
-
-      return wrapper.vm.requestTemplatesAndShowForm().then(() => {
-        expect(createAlert).toHaveBeenCalledWith({ message: 'Error updating issue' });
-
-        expect(formSpy).toHaveBeenCalledWith();
-      });
-    });
-  });
-
-  describe('updateStoreState', () => {
-    it('should make a request and update the state of the store', () => {
-      const data = { foo: 1 };
-      const getDataSpy = jest.spyOn(wrapper.vm.service, 'getData').mockResolvedValue({ data });
-      const updateStateSpy = jest
-        .spyOn(wrapper.vm.store, 'updateState')
-        .mockImplementation(jest.fn);
-
-      return wrapper.vm.updateStoreState().then(() => {
-        expect(getDataSpy).toHaveBeenCalled();
-        expect(updateStateSpy).toHaveBeenCalledWith(data);
-      });
-    });
-
-    it('should show error message if store update fails', () => {
-      jest.spyOn(wrapper.vm.service, 'getData').mockRejectedValue();
-      wrapper.setProps({ issuableType: 'merge request' });
-
-      return wrapper.vm.updateStoreState().then(() => {
-        expect(createAlert).toHaveBeenCalledWith({
-          message: `Error updating ${wrapper.vm.issuableType}`,
-        });
-      });
-    });
-  });
-
-  describe('issueChanged', () => {
-    beforeEach(() => {
-      wrapper.vm.store.formState.title = '';
-      wrapper.vm.store.formState.description = '';
-      wrapper.setProps({
-        initialDescriptionText: '',
-        initialTitleText: '',
-      });
-    });
-
-    it('returns true when title is changed', () => {
-      wrapper.vm.store.formState.title = 'RandomText';
-
-      expect(wrapper.vm.issueChanged).toBe(true);
-    });
-
-    it('returns false when title is empty null', () => {
-      wrapper.vm.store.formState.title = null;
-
-      expect(wrapper.vm.issueChanged).toBe(false);
-    });
-
-    it('returns true when description is changed', () => {
-      wrapper.vm.store.formState.description = 'RandomText';
-
-      expect(wrapper.vm.issueChanged).toBe(true);
-    });
-
-    it('returns false when description is empty null', () => {
-      wrapper.vm.store.formState.description = null;
-
-      expect(wrapper.vm.issueChanged).toBe(false);
-    });
-
-    it('returns false when `initialDescriptionText` is null and `formState.description` is empty string', () => {
-      wrapper.vm.store.formState.description = '';
-      wrapper.setProps({ initialDescriptionText: null });
-
-      expect(wrapper.vm.issueChanged).toBe(false);
+      expect(findForm().props().formState.lockedWarningVisible).toBe(true);
+      expect(findForm().props().formState.lock_version).toBe(1);
     });
   });
 
   describe('sticky header', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
+
     describe('when title is in view', () => {
       it('is not shown', () => {
         expect(findStickyHeader().exists()).toBe(false);
@@ -445,21 +348,18 @@ describe('Issuable output', () => {
     });
 
     describe('when title is not in view', () => {
-      beforeEach(() => {
-        wrapper.vm.state.titleText = 'Sticky header title';
+      beforeEach(async () => {
         wrapper.findComponent(GlIntersectionObserver).vm.$emit('disappear');
       });
 
       it('shows with title', () => {
-        expect(findStickyHeader().text()).toContain('Sticky header title');
+        expect(findStickyHeader().text()).toContain(initialRequest.title_text);
       });
 
       it('shows with title for an epic', async () => {
-        wrapper.setProps({ issuableType: 'epic' });
+        await wrapper.setProps({ issuableType: 'epic' });
 
-        await nextTick();
-
-        expect(findStickyHeader().text()).toContain('Sticky header title');
+        expect(findStickyHeader().text()).toContain(' this is a title');
       });
 
       it.each`
@@ -471,9 +371,7 @@ describe('Issuable output', () => {
       `(
         'shows with state icon "$statusIcon" for $issuableType when status is $issuableStatus',
         async ({ issuableType, issuableStatus, statusIcon }) => {
-          wrapper.setProps({ issuableType, issuableStatus });
-
-          await nextTick();
+          await wrapper.setProps({ issuableType, issuableStatus });
 
           expect(findStickyHeader().findComponent(GlIcon).props('name')).toBe(statusIcon);
         },
@@ -485,9 +383,7 @@ describe('Issuable output', () => {
         ${'shows with Closed when status is closed'} | ${STATUS_CLOSED}
         ${'shows with Open when status is reopened'} | ${STATUS_REOPENED}
       `('$title', async ({ state }) => {
-        wrapper.setProps({ issuableStatus: state });
-
-        await nextTick();
+        await wrapper.setProps({ issuableStatus: state });
 
         expect(findStickyHeader().text()).toContain(IssuableStatusText[state]);
       });
@@ -497,9 +393,7 @@ describe('Issuable output', () => {
         ${'does not show confidential badge when issue is not confidential'} | ${false}
         ${'shows confidential badge when issue is confidential'}             | ${true}
       `('$title', async ({ isConfidential }) => {
-        wrapper.setProps({ isConfidential });
-
-        await nextTick();
+        await wrapper.setProps({ isConfidential });
 
         const confidentialEl = findConfidentialBadge();
         expect(confidentialEl.exists()).toBe(isConfidential);
@@ -516,9 +410,7 @@ describe('Issuable output', () => {
         ${'does not show locked badge when issue is not locked'} | ${false}
         ${'shows locked badge when issue is locked'}             | ${true}
       `('$title', async ({ isLocked }) => {
-        wrapper.setProps({ isLocked });
-
-        await nextTick();
+        await wrapper.setProps({ isLocked });
 
         expect(findLockedBadge().exists()).toBe(isLocked);
       });
@@ -528,9 +420,7 @@ describe('Issuable output', () => {
         ${'does not show hidden badge when issue is not hidden'} | ${false}
         ${'shows hidden badge when issue is hidden'}             | ${true}
       `('$title', async ({ isHidden }) => {
-        wrapper.setProps({ isHidden });
-
-        await nextTick();
+        await wrapper.setProps({ isHidden });
 
         const hiddenBadge = findHiddenBadge();
 
@@ -547,6 +437,10 @@ describe('Issuable output', () => {
   });
 
   describe('Composable description component', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
+
     const findIncidentTabs = () => wrapper.findComponent(IncidentTabs);
     const borderClass = 'gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid gl-mb-6';
 
@@ -565,13 +459,13 @@ describe('Issuable output', () => {
     });
 
     describe('when using incident tabs description wrapper', () => {
-      beforeEach(() => {
-        mountComponent(
-          {
+      beforeEach(async () => {
+        await createComponent({
+          props: {
             descriptionComponent: IncidentTabs,
             showTitleBorder: false,
           },
-          {
+          options: {
             mocks: {
               $apollo: {
                 queries: {
@@ -582,7 +476,7 @@ describe('Issuable output', () => {
               },
             },
           },
-        );
+        });
       });
 
       it('does not the description component', () => {
@@ -600,48 +494,77 @@ describe('Issuable output', () => {
   });
 
   describe('taskListUpdateStarted', () => {
-    it('stops polling', () => {
-      jest.spyOn(wrapper.vm.poll, 'stop');
+    beforeEach(async () => {
+      await createComponent();
+    });
 
-      wrapper.vm.taskListUpdateStarted();
+    it('stops polling', async () => {
+      expect(findTitle().props().titleText).toBe(initialRequest.title_text);
 
-      expect(wrapper.vm.poll.stop).toHaveBeenCalled();
+      findDescription().vm.$emit('taskListUpdateStarted');
+
+      await advanceToNextPoll();
+
+      expect(findTitle().props().titleText).toBe(initialRequest.title_text);
     });
   });
 
   describe('taskListUpdateSucceeded', () => {
-    it('enables polling', () => {
-      jest.spyOn(wrapper.vm.poll, 'enable');
-      jest.spyOn(wrapper.vm.poll, 'makeDelayedRequest');
+    beforeEach(async () => {
+      await createComponent();
+      findDescription().vm.$emit('taskListUpdateStarted');
+    });
 
-      wrapper.vm.taskListUpdateSucceeded();
+    it('enables polling', async () => {
+      // Ensure that polling is not working before
+      expect(findTitle().props().titleText).toBe(initialRequest.title_text);
+      await advanceToNextPoll();
 
-      expect(wrapper.vm.poll.enable).toHaveBeenCalled();
-      expect(wrapper.vm.poll.makeDelayedRequest).toHaveBeenCalledWith(POLLING_DELAY);
+      expect(findTitle().props().titleText).toBe(initialRequest.title_text);
+
+      // Enable Polling an move forward
+      findDescription().vm.$emit('taskListUpdateSucceeded');
+      await advanceToNextPoll();
+
+      // Title has changed: polling works!
+      expect(findTitle().props().titleText).toBe(secondRequest.title_text);
     });
   });
 
   describe('taskListUpdateFailed', () => {
-    it('enables polling and calls updateStoreState', () => {
-      jest.spyOn(wrapper.vm.poll, 'enable');
-      jest.spyOn(wrapper.vm.poll, 'makeDelayedRequest');
-      jest.spyOn(wrapper.vm, 'updateStoreState');
+    beforeEach(async () => {
+      await createComponent();
+      findDescription().vm.$emit('taskListUpdateStarted');
+    });
 
-      wrapper.vm.taskListUpdateFailed();
+    it('enables polling and calls updateStoreState', async () => {
+      // Ensure that polling is not working before
+      expect(findTitle().props().titleText).toBe(initialRequest.title_text);
+      await advanceToNextPoll();
 
-      expect(wrapper.vm.poll.enable).toHaveBeenCalled();
-      expect(wrapper.vm.poll.makeDelayedRequest).toHaveBeenCalledWith(POLLING_DELAY);
-      expect(wrapper.vm.updateStoreState).toHaveBeenCalled();
+      expect(findTitle().props().titleText).toBe(initialRequest.title_text);
+
+      // Enable Polling an move forward
+      findDescription().vm.$emit('taskListUpdateFailed');
+      await advanceToNextPoll();
+
+      // Title has changed: polling works!
+      expect(findTitle().props().titleText).toBe(secondRequest.title_text);
     });
   });
 
   describe('saveDescription event', () => {
+    beforeEach(async () => {
+      await createComponent();
+    });
+
     it('makes request to update issue', async () => {
       const description = 'I have been updated!';
       findDescription().vm.$emit('saveDescription', description);
+
       await waitForPromises();
 
-      expect(mock.history.put[0].data).toContain(description);
+      expect(axiosMock.history.put[0].data).toContain(description);
     });
   });
 });
diff --git a/spec/frontend/issues/show/mock_data/mock_data.js b/spec/frontend/issues/show/mock_data/mock_data.js
index d09bbf7c7f6..86d09665947 100644
--- a/spec/frontend/issues/show/mock_data/mock_data.js
+++ b/spec/frontend/issues/show/mock_data/mock_data.js
@@ -24,6 +24,19 @@ export const secondRequest = {
   lock_version: 2,
 };
 
+export const putRequest = {
+  web_url: window.location.pathname,
+  title: '<p>PUT</p>',
+  title_text: 'PUT',
+  description: '<p>PUT_DESC</p>',
+  description_text: 'PUT_DESC',
+  task_status: '0 of 0 completed',
+  updated_at: '2016-05-15T12:31:04.428Z',
+  updated_by_name: 'Other User',
+  updated_by_path: '/other_user',
+  lock_version: 2,
+};
+
 export const descriptionProps = {
   canUpdate: true,
   descriptionHtml: 'test',
diff --git a/spec/frontend/lib/dompurify_spec.js b/spec/frontend/lib/dompurify_spec.js
index f767a673553..fdc8789c1a8 100644
--- a/spec/frontend/lib/dompurify_spec.js
+++ b/spec/frontend/lib/dompurify_spec.js
@@ -49,8 +49,6 @@ const forbiddenDataAttrs = defaultConfig.FORBID_ATTR;
 const acceptedDataAttrs = ['data-random', 'data-custom'];
 
 describe('~/lib/dompurify', () => {
-  let originalGon;
-
   it('uses local configuration when given', () => {
     // As dompurify uses a "Persistent Configuration", it might
     // ignore config, this check verifies we respect
@@ -104,15 +102,10 @@ describe('~/lib/dompurify', () => {
     ${'root'}     | ${rootGon}
     ${'absolute'} | ${absoluteGon}
   `('when gon contains $type icon urls', ({ type, gon }) => {
-    beforeAll(() => {
-      originalGon = window.gon;
+    beforeEach(() => {
       window.gon = gon;
     });
 
-    afterAll(() => {
-      window.gon = originalGon;
-    });
-
     it('allows no href attrs', () => {
       const htmlHref = `<svg><use></use></svg>`;
       expect(sanitize(htmlHref)).toBe(htmlHref);
@@ -137,14 +130,9 @@ describe('~/lib/dompurify', () => {
 
   describe('when gon does not contain icon urls', () => {
     beforeAll(() => {
-      originalGon = window.gon;
       window.gon = {};
     });
 
-    afterAll(() => {
-      window.gon = originalGon;
-    });
-
     it.each([...safeUrls.root, ...safeUrls.absolute, ...unsafeUrls])('sanitizes URL %s', (url) => {
       const htmlHref = `<svg><use href="${url}"></use></svg>`;
       const htmlXlink = `<svg><use xlink:href="${url}"></use></svg>`;
diff --git a/spec/frontend/observability/observability_app_spec.js b/spec/frontend/observability/observability_app_spec.js
index 1f8386b97db..5f41e36595f 100644
--- a/spec/frontend/observability/observability_app_spec.js
+++ b/spec/frontend/observability/observability_app_spec.js
@@ -51,7 +51,7 @@ describe('Observability root app', () => {
   describe('iframe src', () => {
     const TEST_USERNAME = 'test-user';
 
-    beforeAll(() => {
+    beforeEach(() => {
       gon.current_username = TEST_USERNAME;
     });
 
diff --git a/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js b/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js
index 79db288c19b..477511cde64 100644
--- a/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js
+++ b/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js
@@ -68,15 +68,10 @@ describe('BulkImportsHistoryApp', () => {
 
   const findLocalStorageSync = () => wrapper.findComponent(LocalStorageSync);
 
-  const originalApiVersion = gon.api_version;
-  beforeAll(() => {
+  beforeEach(() => {
     gon.api_version = 'v4';
   });
 
-  afterAll(() => {
-    gon.api_version = originalApiVersion;
-  });
-
   beforeEach(() => {
     mock = new MockAdapter(axios);
     mock.onGet(API_URL).reply(HTTP_STATUS_OK, DUMMY_RESPONSE, DEFAULT_HEADERS);
diff --git a/spec/frontend/pages/import/history/components/import_error_details_spec.js b/spec/frontend/pages/import/history/components/import_error_details_spec.js
index e51ace44fe6..239826c1458 100644
--- a/spec/frontend/pages/import/history/components/import_error_details_spec.js
+++ b/spec/frontend/pages/import/history/components/import_error_details_spec.js
@@ -21,16 +21,8 @@ describe('ImportErrorDetails', () => {
     });
   }
 
-  const originalApiVersion = gon.api_version;
-  beforeAll(() => {
-    gon.api_version = 'v4';
-  });
-
-  afterAll(() => {
-    gon.api_version = originalApiVersion;
-  });
-
   beforeEach(() => {
+    gon.api_version = 'v4';
     mock = new MockAdapter(axios);
   });
 
diff --git a/spec/frontend/pages/import/history/components/import_history_app_spec.js b/spec/frontend/pages/import/history/components/import_history_app_spec.js
index 07a031e5949..43cbac25fe8 100644
--- a/spec/frontend/pages/import/history/components/import_history_app_spec.js
+++ b/spec/frontend/pages/import/history/components/import_history_app_spec.js
@@ -59,17 +59,9 @@ describe('ImportHistoryApp', () => {
     });
   }
 
-  const originalApiVersion = gon.api_version;
-  beforeAll(() => {
+  beforeEach(() => {
     gon.api_version = 'v4';
     gon.features = { fullPathProjectSearch: true };
-  });
-
-  afterAll(() => {
-    gon.api_version = originalApiVersion;
-  });
-
-  beforeEach(() => {
     mock = new MockAdapter(axios);
   });
 
diff --git a/spec/frontend/pages/projects/forks/new/components/project_namespace_spec.js b/spec/frontend/pages/projects/forks/new/components/project_namespace_spec.js
index 509ce3c3443..af578b69a81 100644
--- a/spec/frontend/pages/projects/forks/new/components/project_namespace_spec.js
+++ b/spec/frontend/pages/projects/forks/new/components/project_namespace_spec.js
@@ -11,7 +11,6 @@ jest.mock('~/alert');
 
 describe('ProjectNamespace component', () => {
   let wrapper;
-  let originalGon;
 
   const data = {
     project: {
@@ -85,14 +84,8 @@ describe('ProjectNamespace component', () => {
     findListBox().vm.$emit('shown');
   };
 
-  beforeAll(() => {
-    originalGon = window.gon;
-    window.gon = { gitlab_url: gitlabUrl };
-  });
-
-  afterAll(() => {
-    window.gon = originalGon;
-    wrapper.destroy();
+  beforeEach(() => {
+    gon.gitlab_url = gitlabUrl;
   });
 
   describe('Initial state', () => {
diff --git a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
index 4246cc15ee3..b9c8655d5d8 100644
--- a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
+++ b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
@@ -22,10 +22,6 @@ describe('Sidebar date Widget', () => {
   let fakeApollo;
   const date = '2021-04-15';
 
-  window.gon = {
-    first_day_of_week: 1,
-  };
-
   const findEditableItem = () => wrapper.findComponent(SidebarEditableItem);
   const findPopoverIcon = () => wrapper.find('[data-testid="inherit-date-popover"]');
   const findDatePicker = () => wrapper.findComponent(GlDatepicker);
@@ -61,6 +57,10 @@ describe('Sidebar date Widget', () => {
     });
   };
 
+  beforeEach(() => {
+    window.gon.first_day_of_week = 1;
+  });
+
   afterEach(() => {
     fakeApollo = null;
   });
diff --git a/spec/frontend/vue_shared/components/entity_select/project_select_spec.js b/spec/frontend/vue_shared/components/entity_select/project_select_spec.js
index 57dce032d30..32ce2155494 100644
--- a/spec/frontend/vue_shared/components/entity_select/project_select_spec.js
+++ b/spec/frontend/vue_shared/components/entity_select/project_select_spec.js
@@ -63,11 +63,8 @@ describe('ProjectSelect', () => {
   };
   const openListbox = () => findListbox().vm.$emit('shown');
 
-  beforeAll(() => {
-    gon.api_version = apiVersion;
-  });
-
   beforeEach(() => {
+    gon.api_version = apiVersion;
     mock = new MockAdapter(axios);
   });
 
diff --git a/spec/lib/gitlab/url_blocker_spec.rb b/spec/lib/gitlab/url_blocker_spec.rb
index d0d52cc83d0..912093be29f 100644
--- a/spec/lib/gitlab/url_blocker_spec.rb
+++ b/spec/lib/gitlab/url_blocker_spec.rb
@@ -35,16 +35,6 @@ RSpec.describe Gitlab::UrlBlocker, :stub_invalid_dns_only do
         it 'blocks the request' do
           expect { subject }.to raise_error(described_class::BlockedUrlError)
         end
-
-        context 'when the flag is disabled' do
-          before do
-            stub_feature_flags(deny_all_requests_except_allowed: false)
-          end
-
-          it 'does not block the request' do
-            expect { subject }.not_to raise_error
-          end
-        end
       end
 
       context 'when instance setting is not enabled' do
diff --git a/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb b/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb
index 4860780ae2d..3bdb0647d62 100644
--- a/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb
+++ b/spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb
@@ -45,12 +45,12 @@ RSpec.describe TokenAuthenticatableStrategies::Encrypted, feature_category: :sys
       end
     end
 
-    shared_examples 'finds the resource with/without setting ensure_prefix' do
+    shared_examples 'finds the resource with/without setting require_prefix_for_validation' do
       let(:standard_runner_token_prefix) { 'GR1348941' }
       it_behaves_like 'finds the resource'
 
-      context 'when a ensure_prefix is provided' do
-        let(:other_options) { { format_with_prefix: :format_with_prefix_method, ensure_prefix: true } }
+      context 'when a require_prefix_for_validation is provided' do
+        let(:other_options) { { format_with_prefix: :format_with_prefix_method, require_prefix_for_validation: true } }
 
         before do
           allow(resource).to receive(:format_with_prefix_method).and_return(standard_runner_token_prefix)
@@ -78,7 +78,7 @@ RSpec.describe TokenAuthenticatableStrategies::Encrypted, feature_category: :sys
           .and_return(resource)
       end
 
-      it_behaves_like 'finds the resource with/without setting ensure_prefix'
+      it_behaves_like 'finds the resource with/without setting require_prefix_for_validation'
     end
 
     context 'when encryption is optional' do
@@ -93,7 +93,7 @@ RSpec.describe TokenAuthenticatableStrategies::Encrypted, feature_category: :sys
           .and_return(resource)
       end
 
-      it_behaves_like 'finds the resource with/without setting ensure_prefix'
+      it_behaves_like 'finds the resource with/without setting require_prefix_for_validation'
 
       it 'uses insecure strategy when encrypted token cannot be found' do
         allow(subject.send(:insecure_strategy))
@@ -123,7 +123,7 @@ RSpec.describe TokenAuthenticatableStrategies::Encrypted, feature_category: :sys
           .and_return(resource)
       end
 
-      it_behaves_like 'finds the resource with/without setting ensure_prefix'
+      it_behaves_like 'finds the resource with/without setting require_prefix_for_validation'
     end
   end
 
diff --git a/spec/requests/api/graphql/current_user/todos_query_spec.rb b/spec/requests/api/graphql/current_user/todos_query_spec.rb
index f7e23aeb241..ee019a99f8d 100644
--- a/spec/requests/api/graphql/current_user/todos_query_spec.rb
+++ b/spec/requests/api/graphql/current_user/todos_query_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe 'Query current user todos', feature_category: :source_code_manage
   let(:fields) do
     <<~QUERY
     nodes {
-      #{all_graphql_fields_for('todos'.classify, max_depth: 2)}
+      #{all_graphql_fields_for('todos'.classify, max_depth: 2, excluded: ['productAnalyticsState'])}
     }
     QUERY
   end
diff --git a/spec/requests/api/graphql/mutations/work_items/create_from_task_spec.rb b/spec/requests/api/graphql/mutations/work_items/create_from_task_spec.rb
index 97bf060356a..d2df3e8bda2 100644
--- a/spec/requests/api/graphql/mutations/work_items/create_from_task_spec.rb
+++ b/spec/requests/api/graphql/mutations/work_items/create_from_task_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe "Create a work item from a task in a work item's description", fe
     }
   end
 
-  let(:mutation) { graphql_mutation(:workItemCreateFromTask, input) }
+  let(:mutation) { graphql_mutation(:workItemCreateFromTask, input, nil, ['productAnalyticsState']) }
   let(:mutation_response) { graphql_mutation_response(:work_item_create_from_task) }
 
   context 'the user is not allowed to update a work item' do
diff --git a/spec/requests/api/graphql/mutations/work_items/update_task_spec.rb b/spec/requests/api/graphql/mutations/work_items/update_task_spec.rb
index 999c685ac6a..717de983871 100644
--- a/spec/requests/api/graphql/mutations/work_items/update_task_spec.rb
+++ b/spec/requests/api/graphql/mutations/work_items/update_task_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe 'Update a work item task', feature_category: :team_planning do
   let(:task_params) { { 'title' => 'UPDATED' } }
   let(:task_input) { { 'id' => task.to_global_id.to_s }.merge(task_params) }
   let(:input) { { 'id' => work_item.to_global_id.to_s, 'taskData' => task_input } }
-  let(:mutation) { graphql_mutation(:workItemUpdateTask, input) }
+  let(:mutation) { graphql_mutation(:workItemUpdateTask, input, nil, ['productAnalyticsState']) }
   let(:mutation_response) { graphql_mutation_response(:work_item_update_task) }
 
   context 'the user is not allowed to read a work item' do
diff --git a/spec/requests/api/graphql/namespace/projects_spec.rb b/spec/requests/api/graphql/namespace/projects_spec.rb
index 4e12da3e3ab..83edacaf831 100644
--- a/spec/requests/api/graphql/namespace/projects_spec.rb
+++ b/spec/requests/api/graphql/namespace/projects_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'getting projects', feature_category: :projects do
       projects(includeSubgroups: #{include_subgroups}) {
         edges {
           node {
-            #{all_graphql_fields_for('Project', max_depth: 1)}
+            #{all_graphql_fields_for('Project', max_depth: 1, excluded: ['productAnalyticsState'])}
           }
         }
       }
diff --git a/spec/requests/api/graphql/project/container_repositories_spec.rb b/spec/requests/api/graphql/project/container_repositories_spec.rb
index 7ccf8a6f5bf..9a40a972256 100644
--- a/spec/requests/api/graphql/project/container_repositories_spec.rb
+++ b/spec/requests/api/graphql/project/container_repositories_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'getting container repositories in a project', feature_category:
   let_it_be(:container_repositories) { [container_repository, container_repositories_delete_scheduled, container_repositories_delete_failed].flatten }
   let_it_be(:container_expiration_policy) { project.container_expiration_policy }
 
-  let(:excluded_fields) { %w[pipeline jobs] }
+  let(:excluded_fields) { %w[pipeline jobs productAnalyticsState] }
   let(:container_repositories_fields) do
     <<~GQL
       edges {
@@ -155,7 +155,7 @@ RSpec.describe 'getting container repositories in a project', feature_category:
   it_behaves_like 'handling graphql network errors with the container registry'
 
   it_behaves_like 'not hitting graphql network errors with the container registry' do
-    let(:excluded_fields) { %w[pipeline jobs tags tagsCount] }
+    let(:excluded_fields) { %w[pipeline jobs tags tagsCount productAnalyticsState] }
   end
 
   it 'returns the total count of container repositories' do
diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb
index 2176a477371..191e5192a61 100644
--- a/spec/support/helpers/graphql_helpers.rb
+++ b/spec/support/helpers/graphql_helpers.rb
@@ -310,7 +310,7 @@ module GraphqlHelpers
     "{ #{q} }"
   end
 
-  def graphql_mutation(name, input, fields = nil, &block)
+  def graphql_mutation(name, input, fields = nil, excluded = [], &block)
     raise ArgumentError, 'Please pass either `fields` parameter or a block to `#graphql_mutation`, but not both.' if fields.present? && block
 
     name = name.graphql_name if name.respond_to?(:graphql_name)
@@ -319,7 +319,7 @@ module GraphqlHelpers
     mutation_field = GitlabSchema.mutation.fields[mutation_name]
 
     fields = yield if block
-    fields ||= all_graphql_fields_for(mutation_field.type.to_type_signature)
+    fields ||= all_graphql_fields_for(mutation_field.type.to_type_signature, excluded: excluded)
 
     query = <<~MUTATION
       mutation(#{input_variable_name}: #{mutation_field.arguments['input'].type.to_type_signature}) {
diff --git a/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb b/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb
index 0d2e9f6ec8c..09239ced73a 100644
--- a/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb
@@ -46,7 +46,7 @@ RSpec.shared_context 'exposing regular notes on a noteable in GraphQL' do
       discussions {
         edges {
           node {
-            #{all_graphql_fields_for('Discussion', max_depth: 4)}
+            #{all_graphql_fields_for('Discussion', max_depth: 4, excluded: ['productAnalyticsState'])}
           }
         }
       }
diff --git a/spec/views/admin/application_settings/network.html.haml_spec.rb b/spec/views/admin/application_settings/network.html.haml_spec.rb
index 110676da6be..3df55be92d5 100644
--- a/spec/views/admin/application_settings/network.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/network.html.haml_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe 'admin/application_settings/network.html.haml', feature_category:
   let_it_be(:application_setting) { build(:application_setting) }
 
   before do
-    stub_feature_flags(deny_all_requests_except_allowed: false)
     assign(:application_setting, application_setting)
     allow(view).to receive(:current_user) { admin }
   end