diff --git a/.gitlab/issue_templates/Service Ping reporting and monitoring.md b/.gitlab/issue_templates/Service Ping reporting and monitoring.md
new file mode 100644
index 00000000000..045f13c1c40
--- /dev/null
+++ b/.gitlab/issue_templates/Service Ping reporting and monitoring.md	
@@ -0,0 +1,122 @@
+<!-- This issue template is used by https://about.gitlab.com/handbook/engineering/development/growth/product-intelligence/ for tracking effort around Service Ping reporting for GitLab.com -->
+
+The [Product Intelligence group](https://about.gitlab.com/handbook/engineering/development/growth/product-intelligence/) runs manual reporting of ServicePing for GitLab.com on a weekly basis. This issue captures:
+
+- Captures the work required to complete the reporting process,.
+- Captures the follow-up tasks that are focused on metrics performance verification.
+- Identifies any potential issues.
+
+# New metrics to be verified
+
+<!-- Add new metrics that must be verified -->
+
+# Failed metrics
+
+Broken metrics issues are marked with the ~"broken metric" label.
+
+# Use a detached screen session to generate Service Ping for GitLab.com
+
+## Prerequisites
+
+1. Make sure the SSH key is added to the local SSH agent: `ssh-add`.
+
+## Triggering
+
+1. Add the SSH key to the local SSH agent: `ssh-add`.
+1. Connect to the bastion with SSH agent forwarding: `ssh -A lb-bastion.gprd.gitlab.com`.
+1. Note which bastion host machine was assigned. For example: `<username>@bastion-01-inf-gprd.c.gitlab-production.internal:~$` shows that you are connected to `bastion-01-inf-gprd.c.gitlab-production.internal`.
+1. Create a named screen: `screen -S $USER-service-ping-$(date +%F)`.
+1. Connect to the console host: `ssh $USER-rails@console-01-sv-gprd.c.gitlab-production.internal`.
+1. Run: `ServicePing::SubmitService.new.execute`.
+1. Press <kbd>Control</kbd>+<kbd>a</kbd> followed by <kbd>Control</kbd>+<kbd>d</kbd> to detach from the screen session.
+1. Exit from the bastion: `exit`.
+
+## Verification (After approximately 30 hours)
+
+1. Reconnect to the bastion: `ssh -A lb-bastion.gprd.gitlab.com`. Make sure that you are connected to the same host machine that ServicePing was started on. For example, to connect directly to the host machine, use `ssh bastion-01-inf-gprd.c.gitlab-production.internal`.
+1. Find your screen session: `screen -ls`.
+1. Attach to your screen session: `screen -x 14226.mwawrzyniak_service_ping_2021_01_22`.
+1. Check the last payload in the `raw_usage_data` table: `RawUsageData.last.payload`.
+1. Check the when the payload was sent: `RawUsageData.last.sent_at`.
+
+## Stop the Service Ping process
+
+Use either of these processes:
+
+1. Reconnect to the bastion host machine. For example, use: `ssh bastion-01-inf-gprd.c.gitlab-production.internal`.
+1. Find your screen session: `$ screen -ls`.
+1. Attach to your screen session: `$ sudo -u <username> screen -r`.
+1. Press <kbd>Control</kbd>+<kbd>c</kbd> to stop the Service Ping process.
+
+OR
+
+1. Reconnect to the bastion host machine. For example, type: `ssh bastion-01-inf-gprd.c.gitlab-production.internal`.
+1. List all process started by your username: `ps faux | grep <username>`.
+1. Locate the username that owns ServicePing reporting.
+1. Send the kill signal for the ServicePing PID: `kill -9 <service_ping_pid>`.
+
+## Service Ping process triggering (through a long-running SSH session)
+
+1. Connect to the `gprd` Rails console.
+1. Run `SubmitUsagePingService.new.execute`. This process requires more than 30 hours to complete.
+1. Find the last payload in the `raw_usage_data` table: `RawUsageData.last.payload`.
+1. Check the when the payload was sent: `RawUsageData.last.sent_at`.
+
+```plaintext
+ServicePing::SubmitService.new.execute
+
+# Get the payload
+RawUsageData.last.payload
+
+# Time when payload was sent to VersionsAppp
+RawUsageData.last.sent_at
+```
+
+# Verify Service Ping in VersionsApp
+
+To verify that the ServicePing was received in the VersionsApp do the following steps:
+
+1. Go to the VersionsApp console and locate: `RawUsageData.find(uuid: '')`.
+1. Check the object. Either:
+   - Go to the Rails console and check the related `RawUsageData` object.
+   - Go to the VersionsApp UI <https://version.gitlab.com/usage_data/usage_data_id>.
+
+```ruby
+/bin/herokuish procfile exec rails console
+
+puts UsageData.select(:recorded_at, :app_server_type).where(hostname: 'gitlab.com', uuid: 'ea8bf810-1d6f-4a6a-b4fd-93e8cbd8b57f').order('id desc').limit(5).to_json
+
+puts UsageData.find(21635202).raw_usage_data.payload.to_json
+```
+
+# Monitoring events tracked using Redis HLL
+
+Trigger some events from the User Interface.
+
+```ruby
+Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'event_name', start_date: 28.days.ago, end_date: Date.current)
+```
+
+# What to do if you get mentioned
+
+In this issue, we keep the track of new metrics added to the Service Ping, and the metrics that are timing out.
+
+If you get mentioned, check the failing metric and open an optimization issue.
+
+# Service Ping manual generation for GitLab.com schedule
+
+| Generation start date | GitLab developer handle | Link to comment with payload |
+| --------------------- | ----------------------- | ---------------------------- |
+| 2022-04-18            |                         |                              |
+| 2022-04-25            |                         |                              |
+| 2022-05-02            |                         |                              |
+| 2022-05-09            |                         |                              |
+| 2022-05-16            |                         |                              |
+
+<!-- Do not edit below this line -->
+
+/confidential
+/label ~"group::product intelligence" ~"devops::growth" ~backend ~"section::growth" ~"Category:Service Ping"
+/epic https://gitlab.com/groups/gitlab-org/-/epics/6000
+/weight 5
+/title Monitor and Generate GitLab.com Service Ping
diff --git a/Gemfile b/Gemfile
index cc0277a547d..50ef5283522 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'grape-entity', '~> 0.10.0'
 gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
 
 # GraphQL API
-gem 'graphql', '~> 1.11.10'
+gem 'graphql', '~> 1.13.12'
 gem 'graphiql-rails', '~> 1.8'
 gem 'apollo_upload_server', '~> 2.1.0'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
diff --git a/Gemfile.lock b/Gemfile.lock
index d95cf0d9d0b..41794b552ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -581,7 +581,7 @@ GEM
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.10)
+    graphql (1.13.12)
     graphql-client (0.17.0)
       activesupport (>= 3.0)
       graphql (~> 1.10)
@@ -1526,7 +1526,7 @@ DEPENDENCIES
   grape_logging (~> 1.8)
   graphiql-rails (~> 1.8)
   graphlient (~> 0.5.0)
-  graphql (~> 1.11.10)
+  graphql (~> 1.13.12)
   graphql-docs (~> 1.6.0)
   grpc (~> 1.42.0)
   gssapi
diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue
index c369d879739..3fdf70e1621 100644
--- a/app/assets/javascripts/error_tracking/components/error_details.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details.vue
@@ -301,7 +301,7 @@ export default {
             <gl-button
               class="ml-2"
               category="secondary"
-              variant="info"
+              variant="confirm"
               :loading="updatingResolveStatus"
               data-testid="update-resolve-status-btn"
               @click="onResolveStatusUpdate"
diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue b/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
index 9438900c736..a5e712f4fc2 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
@@ -73,7 +73,7 @@ export default {
     <gl-button
       :href="detailsLink"
       category="primary"
-      variant="info"
+      variant="confirm"
       class="gl-display-block d-md-none gl-mb-4 mb-md-0"
     >
       {{ __('More details') }}
diff --git a/app/assets/javascripts/issuable/components/csv_export_modal.vue b/app/assets/javascripts/issuable/components/csv_export_modal.vue
index b0af3612e05..736da92fa9f 100644
--- a/app/assets/javascripts/issuable/components/csv_export_modal.vue
+++ b/app/assets/javascripts/issuable/components/csv_export_modal.vue
@@ -1,16 +1,18 @@
 <script>
-import { GlButton, GlModal, GlSprintf, GlIcon } from '@gitlab/ui';
+import { GlModal, GlSprintf, GlIcon } from '@gitlab/ui';
 import { __, n__ } from '~/locale';
 import { ISSUABLE_TYPE } from '../constants';
 
 export default {
+  actionCancel: {
+    text: __('Cancel'),
+  },
   i18n: {
     exportText: __(
       'The CSV export will be created in the background. Once finished, it will be sent to %{email} in an attachment.',
     ),
   },
   components: {
-    GlButton,
     GlModal,
     GlSprintf,
     GlIcon,
@@ -38,6 +40,19 @@ export default {
     },
   },
   computed: {
+    actionPrimary() {
+      return {
+        text: this.exportText,
+        attributes: {
+          href: this.exportCsvPath,
+          variant: 'confirm',
+          'data-method': 'post',
+          'data-qa-selector': `export_${this.issuableType}_button`,
+          'data-track-action': 'click_button',
+          'data-track-label': `export_${this.issuableType}_csv`,
+        },
+      };
+    },
     isIssue() {
       return this.issuableType === ISSUABLE_TYPE.issues;
     },
@@ -56,6 +71,8 @@ export default {
 <template>
   <gl-modal
     :modal-id="modalId"
+    :action-primary="actionPrimary"
+    :action-cancel="$options.actionCancel"
     body-class="gl-p-0!"
     :title="exportText"
     data-qa-selector="export_issuable_modal"
@@ -73,18 +90,5 @@ export default {
         </template>
       </gl-sprintf>
     </div>
-    <template #modal-footer>
-      <gl-button
-        category="primary"
-        variant="confirm"
-        :href="exportCsvPath"
-        data-method="post"
-        :data-qa-selector="`export_${issuableType}_button`"
-        data-track-action="click_button"
-        :data-track-label="`export_${issuableType}_csv`"
-      >
-        {{ exportText }}
-      </gl-button>
-    </template>
   </gl-modal>
 </template>
diff --git a/app/assets/javascripts/issuable/components/csv_import_modal.vue b/app/assets/javascripts/issuable/components/csv_import_modal.vue
index 7e2cbf03801..72293343c48 100644
--- a/app/assets/javascripts/issuable/components/csv_import_modal.vue
+++ b/app/assets/javascripts/issuable/components/csv_import_modal.vue
@@ -18,6 +18,9 @@ export default {
   actionPrimary: {
     text: __('Import issues'),
   },
+  actionCancel: {
+    text: __('Cancel'),
+  },
   components: {
     GlModal,
     GlFormGroup,
@@ -55,6 +58,7 @@ export default {
     :modal-id="modalId"
     :title="$options.i18n.importIssuesText"
     :action-primary="$options.actionPrimary"
+    :action-cancel="$options.actionCancel"
     @primary="submitForm"
   >
     <form ref="form" :action="importCsvIssuesPath" enctype="multipart/form-data" method="post">
diff --git a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue
index b41611001ab..cac6d722ced 100644
--- a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue
+++ b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue
@@ -80,7 +80,7 @@ export default {
   },
   primaryAction: {
     text: s__('Milestones|Promote Milestone'),
-    attributes: [{ variant: 'warning' }],
+    attributes: [{ variant: 'confirm' }],
   },
   cancelAction: {
     text: __('Cancel'),
diff --git a/app/assets/javascripts/pipeline_editor/components/popovers/file_tree_popover.vue b/app/assets/javascripts/pipeline_editor/components/popovers/file_tree_popover.vue
index 6270429535d..efa6a54c638 100644
--- a/app/assets/javascripts/pipeline_editor/components/popovers/file_tree_popover.vue
+++ b/app/assets/javascripts/pipeline_editor/components/popovers/file_tree_popover.vue
@@ -26,11 +26,8 @@ export default {
     this.showPopover = localStorage.getItem(FILE_TREE_POPOVER_DISMISSED_KEY) !== 'true';
   },
   methods: {
-    closePopover() {
-      this.showPopover = false;
-    },
     dismissPermanently() {
-      this.closePopover();
+      this.showPopover = false;
       localStorage.setItem(FILE_TREE_POPOVER_DISMISSED_KEY, 'true');
     },
   },
@@ -48,7 +45,7 @@ export default {
     data-qa-selector="file_tree_popover"
     @close-button-clicked="dismissPermanently"
   >
-    <div v-outside="closePopover" class="gl-font-base gl-mb-3">
+    <div v-outside="dismissPermanently" class="gl-font-base gl-mb-3">
       <gl-sprintf :message="$options.i18n.description">
         <template #link="{ content }">
           <gl-link :href="includesHelpPagePath" target="_blank">{{ content }}</gl-link>
diff --git a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue
index f62bf686f85..424cab20c7e 100644
--- a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue
+++ b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue
@@ -149,7 +149,7 @@ export default {
   >
     <slot>
       <button
-        class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+        class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
         type="button"
         @click="openFileUpload"
       >
@@ -192,7 +192,7 @@ export default {
     <transition name="upload-dropzone-fade">
       <div
         v-show="dragging && !enableDragBehavior"
-        class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+        class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       >
         <div v-show="!isDragDataValid" class="mw-50 gl-text-center">
           <slot name="invalid-drag-data-slot">
diff --git a/app/assets/stylesheets/components/upload_dropzone/upload_dropzone.scss b/app/assets/stylesheets/components/upload_dropzone/upload_dropzone.scss
index 2bc6eba3342..f6be241d644 100644
--- a/app/assets/stylesheets/components/upload_dropzone/upload_dropzone.scss
+++ b/app/assets/stylesheets/components/upload_dropzone/upload_dropzone.scss
@@ -1,25 +1,50 @@
+@function encodecolor($string) {
+  @if type-of($string) == 'color' {
+    $hex: str-slice(ie-hex-str($string), 4);
+    $string: unquote('#{$hex}');
+  }
+  $string: '%23' + $string;
+  @return $string;
+}
+
+@mixin dropzone-background($stroke-color, $stroke-width: 4, $stroke-linecap: 'butt') {
+  background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' rx='8' ry='8' stroke='#{encodecolor($stroke-color)}' stroke-width='#{$stroke-width}' stroke-dasharray='6%2c4' stroke-dashoffset='0' stroke-linecap='#{encodecolor($stroke-linecap)}'/%3e%3c/svg%3e");
+}
+
 .upload-dropzone-border {
-  border: 2px dashed $gray-100;
+  border: 0;
+  @include dropzone-background($gray-400, 2, 'round');
+  border-radius: 8px;
 }
 
 .upload-dropzone-card {
-  transition: border $gl-transition-duration-medium $general-hover-transition-curve;
+  transition: background $gl-transition-duration-medium $general-hover-transition-curve,
+    border $gl-transition-duration-medium $general-hover-transition-curve;
   color: $gl-text-color;
 
+  &:hover,
   &:focus,
+  &:focus-within,
   &:active {
     outline: none;
-    border: 2px dashed $purple;
+    @include dropzone-background($blue-500);
     color: $gl-text-color;
   }
 
+  &:focus,
+  &:focus-within,
+  &:active {
+    @include gl-focus;
+  }
+
   &:hover {
     border-color: $gray-300;
   }
 }
 
 .upload-dropzone-overlay {
-  border: 2px dashed $purple;
+  background-color: $blue-50;
+  @include dropzone-background($blue-500);
   top: 0;
   left: 0;
   pointer-events: none;
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index b1e44a81267..fc5b07b6420 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -135,11 +135,13 @@
 
   blockquote,
   .blockquote {
-    color: $gl-grayish-blue;
     font-size: inherit;
-    padding: 8px 24px;
-    margin: 16px 0;
-    border-left: 3px solid $white-dark;
+    @include gl-text-gray-700;
+    @include gl-py-3;
+    @include gl-pl-6;
+    @include gl-my-3;
+    @include gl-mx-0;
+    @include gl-inset-border-l-4-gray-100;
 
     &:dir(rtl) {
       border-left: 0;
@@ -147,9 +149,8 @@
     }
 
     p {
-      color: $gl-grayish-blue !important;
-      font-size: inherit;
       line-height: 1.5;
+      @include gl-reset-color;
 
       &:last-child {
         margin: 0;
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index 815a41d1e99..0b21cd5c032 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -367,3 +367,38 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
   -webkit-backdrop-filter: blur(2px); // still required by Safari
 }
 
+/*
+ * The styles from here to END-#1825 will be moved to @gitlab/ui by
+ * https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1825
+ */
+.gl-lg-mx-12 {
+  @include media-breakpoint-up(lg) {
+    margin-left: $gl-spacing-scale-12;
+    margin-right: $gl-spacing-scale-12;
+  }
+}
+
+.gl-lg-ml-12 {
+  @include media-breakpoint-up(lg) {
+    margin-left: $gl-spacing-scale-12;
+  }
+}
+
+.gl-lg-mr-12 {
+  @include media-breakpoint-up(lg) {
+    margin-right: $gl-spacing-scale-12;
+  }
+}
+
+.gl-lg-ml-10 {
+  @include media-breakpoint-up(lg) {
+    margin-left: $gl-spacing-scale-10;
+  }
+}
+
+.gl-lg-mr-10 {
+  @include media-breakpoint-up(lg) {
+    margin-right: $gl-spacing-scale-10;
+  }
+}
+/* END-#1825 */
diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb
index 9b23aa60eab..b399f0490ee 100644
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@@ -14,17 +14,19 @@ class GitlabSchema < GraphQL::Schema
   use Gitlab::Graphql::Tracers::ApplicationContextTracer
   use Gitlab::Graphql::Tracers::MetricsTracer
   use Gitlab::Graphql::Tracers::LoggerTracer
-  use Gitlab::Graphql::GenericTracing # Old tracer which will be removed eventually
+
+  # TODO: Old tracer which will be removed eventually
+  #       See https://gitlab.com/gitlab-org/gitlab/-/issues/345396
+  use Gitlab::Graphql::GenericTracing
   use Gitlab::Graphql::Tracers::TimerTracer
 
   use GraphQL::Subscriptions::ActionCableSubscriptions
-  use GraphQL::Pagination::Connections
   use BatchLoader::GraphQL
   use Gitlab::Graphql::Pagination::Connections
   use Gitlab::Graphql::Timeout, max_seconds: Gitlab.config.gitlab.graphql_timeout
 
-  query_analyzer Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer.new
-  query_analyzer Gitlab::Graphql::QueryAnalyzers::RecursionAnalyzer.new
+  query_analyzer Gitlab::Graphql::QueryAnalyzers::AST::LoggerAnalyzer
+  query_analyzer Gitlab::Graphql::QueryAnalyzers::AST::RecursionAnalyzer
 
   query Types::QueryType
   mutation Types::MutationType
@@ -49,10 +51,10 @@ class GitlabSchema < GraphQL::Schema
       super(queries, **kwargs)
     end
 
-    def get_type(type_name)
+    def get_type(type_name, context = GraphQL::Query::NullContext)
       type_name = Gitlab::GlobalId::Deprecations.apply_to_graphql_name(type_name)
 
-      super(type_name)
+      super(type_name, context)
     end
 
     def id_from_object(object, _type = nil, _ctx = nil)
@@ -77,8 +79,7 @@ class GitlabSchema < GraphQL::Schema
     end
 
     def resolve_type(type, object, ctx = :__undefined__)
-      tc = type.metadata[:type_class]
-      return if tc.respond_to?(:assignable?) && !tc.assignable?(object)
+      return if type.respond_to?(:assignable?) && !type.assignable?(object)
 
       super
     end
@@ -168,14 +169,3 @@ class GitlabSchema < GraphQL::Schema
 end
 
 GitlabSchema.prepend_mod_with('GitlabSchema') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
-# Force the schema to load as a workaround for intermittent errors we
-# see due to a lack of thread safety.
-#
-# TODO: We can remove this workaround when we convert the schema to use
-# the new query interpreter runtime.
-#
-# See:
-# - https://gitlab.com/gitlab-org/gitlab/-/issues/211478
-# - https://gitlab.com/gitlab-org/gitlab/-/issues/210556
-GitlabSchema.graphql_definition
diff --git a/app/graphql/mutations/base_mutation.rb b/app/graphql/mutations/base_mutation.rb
index d57a097a9e2..5f98b222099 100644
--- a/app/graphql/mutations/base_mutation.rb
+++ b/app/graphql/mutations/base_mutation.rb
@@ -39,14 +39,16 @@ module Mutations
       true
     end
 
-    def load_application_object(argument, lookup_as_type, id, context)
-      ::Gitlab::Graphql::Lazy.new { super }.catch(::GraphQL::UnauthorizedError) do |e|
-        Gitlab::ErrorTracking.track_exception(e)
-        # The default behaviour is to abort processing and return nil for the
-        # entire mutation field, but not set any top-level errors. We prefer to
-        # at least say that something went wrong.
-        raise_resource_not_available_error!
-      end
+    def load_application_object(argument, id, context)
+      ::Gitlab::Graphql::Lazy.new { super }
+    end
+
+    def unauthorized_object(error)
+      # The default behavior is to abort processing and return nil for the
+      # entire mutation field, but not set any top-level errors. We prefer to
+      # at least say that something went wrong.
+      Gitlab::ErrorTracking.track_exception(error)
+      raise_resource_not_available_error!
     end
 
     def self.authorizes_object?
diff --git a/app/graphql/types/base_field.rb b/app/graphql/types/base_field.rb
index 83c53e568e9..6aee9a5c052 100644
--- a/app/graphql/types/base_field.rb
+++ b/app/graphql/types/base_field.rb
@@ -53,6 +53,30 @@ module Types
       field_authorized?(object, ctx) && resolver_authorized?(object, ctx)
     end
 
+    # This gets called from the gem's `calculate_complexity` method, allowing us
+    # to ensure our complexity calculation is used even for connections.
+    # This code is actually a copy of the default case in `calculate_complexity`
+    # in `lib/graphql/schema/field.rb`
+    # (https://github.com/rmosolgo/graphql-ruby/blob/master/lib/graphql/schema/field.rb)
+    def complexity_for(child_complexity:, query:, lookahead:)
+      defined_complexity = complexity
+
+      case defined_complexity
+      when Proc
+        arguments = query.arguments_for(lookahead.ast_nodes.first, self)
+
+        if arguments.respond_to?(:keyword_arguments)
+          defined_complexity.call(query.context, arguments.keyword_arguments, child_complexity)
+        else
+          child_complexity
+        end
+      when Numeric
+        defined_complexity + child_complexity
+      else
+        raise("Invalid complexity: #{defined_complexity.inspect} on #{path} (#{inspect})")
+      end
+    end
+
     def base_complexity
       complexity = DEFAULT_COMPLEXITY
       complexity += 1 if calls_gitaly?
diff --git a/app/graphql/types/ci/detailed_status_type.rb b/app/graphql/types/ci/detailed_status_type.rb
index e3413551a3f..3fab040cc0b 100644
--- a/app/graphql/types/ci/detailed_status_type.rb
+++ b/app/graphql/types/ci/detailed_status_type.rb
@@ -33,7 +33,7 @@ module Types
             method: :status_tooltip
 
       def id(parent:)
-        "#{object.id}-#{parent.object.object.id}"
+        "#{object.id}-#{parent.id}"
       end
 
       def action
diff --git a/app/graphql/types/ci/runner_web_url_edge.rb b/app/graphql/types/ci/runner_web_url_edge.rb
index 035d75c22c6..7dfcd1f3510 100644
--- a/app/graphql/types/ci/runner_web_url_edge.rb
+++ b/app/graphql/types/ci/runner_web_url_edge.rb
@@ -4,8 +4,6 @@ module Types
   module Ci
     # rubocop: disable Graphql/AuthorizeTypes
     class RunnerWebUrlEdge < ::Types::BaseEdge
-      include FindClosest
-
       field :edit_url, GraphQL::Types::String, null: true,
             description: 'Web URL of the runner edit page. The value depends on where you put this field in the query. You can use it for projects or groups.',
             extras: [:parent]
@@ -19,19 +17,18 @@ module Types
         @runner = node.node
       end
 
+      # here parent is a Keyset::Connection
       def edit_url(parent:)
-        runner_url(parent: parent, url_type: :edit_url)
+        runner_url(owner: parent.parent, url_type: :edit_url)
       end
 
       def web_url(parent:)
-        runner_url(parent: parent, url_type: :default)
+        runner_url(owner: parent.parent, url_type: :default)
       end
 
       private
 
-      def runner_url(parent:, url_type: :default)
-        owner = closest_parent([::Types::ProjectType, ::Types::GroupType], parent)
-
+      def runner_url(owner:, url_type: :default)
         # Only ::Group is supported at the moment, future iterations will include ::Project.
         # See https://gitlab.com/gitlab-org/gitlab/-/issues/16338
         case owner
diff --git a/app/graphql/types/ci/status_action_type.rb b/app/graphql/types/ci/status_action_type.rb
index 26ca3c1438a..c0f61cf49f2 100644
--- a/app/graphql/types/ci/status_action_type.rb
+++ b/app/graphql/types/ci/status_action_type.rb
@@ -21,7 +21,8 @@ module Types
             description: 'Title for the action, for example: Retry.'
 
       def id(parent:)
-        "#{parent.parent.object.object.class.name}-#{parent.object.object.id}"
+        # parent is a SimpleDelegator
+        "#{parent.subject.class.name}-#{parent.id}"
       end
 
       def action_method
diff --git a/app/graphql/types/concerns/find_closest.rb b/app/graphql/types/concerns/find_closest.rb
deleted file mode 100644
index 3064db19ea0..00000000000
--- a/app/graphql/types/concerns/find_closest.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module FindClosest
-  # Find the closest node which has any of the given types above this node, and return the domain object
-  def closest_parent(types, parent)
-    while parent
-
-      if types.any? {|type| parent.object.instance_of? type}
-        return parent.object.object
-      else
-        parent = parent.try(:parent)
-      end
-    end
-  end
-end
diff --git a/app/graphql/types/global_id_type.rb b/app/graphql/types/global_id_type.rb
index 6a924c13a3c..145a5a22460 100644
--- a/app/graphql/types/global_id_type.rb
+++ b/app/graphql/types/global_id_type.rb
@@ -84,7 +84,8 @@ module Types
         end
 
         define_singleton_method(:suitable?) do |gid|
-          next false if gid.nil?
+          # an argument can be nil, so allow it here
+          next true if gid.nil?
 
           gid.model_name.safe_constantize.present? &&
             gid.model_class.ancestors.include?(model_class)
diff --git a/app/graphql/types/merge_requests/interacts_with_merge_request.rb b/app/graphql/types/merge_requests/interacts_with_merge_request.rb
index 15621ef1472..bef2d39dc5c 100644
--- a/app/graphql/types/merge_requests/interacts_with_merge_request.rb
+++ b/app/graphql/types/merge_requests/interacts_with_merge_request.rb
@@ -5,8 +5,6 @@ module Types
     module InteractsWithMergeRequest
       extend ActiveSupport::Concern
 
-      include FindClosest
-
       included do
         field :merge_request_interaction,
               type: ::Types::UserMergeRequestInteractionType,
@@ -16,11 +14,9 @@ module Types
       end
 
       def merge_request_interaction(parent:, id: nil)
-        merge_request = closest_parent([::Types::MergeRequestType], parent)
-
-        return unless merge_request
-
-        Users::MergeRequestInteraction.new(user: object, merge_request: merge_request)
+        # need the connection parent if called from a connection node:
+        parent = parent.parent if parent.try(:field)&.connection?
+        Users::MergeRequestInteraction.new(user: object, merge_request: parent)
       end
     end
   end
diff --git a/app/graphql/types/query_complexity_type.rb b/app/graphql/types/query_complexity_type.rb
index 13b618cf5ce..ddcf448c64a 100644
--- a/app/graphql/types/query_complexity_type.rb
+++ b/app/graphql/types/query_complexity_type.rb
@@ -5,7 +5,7 @@ module Types
   class QueryComplexityType < ::Types::BaseObject
     graphql_name 'QueryComplexity'
 
-    ANALYZER = GraphQL::Analysis::QueryComplexity.new { |_query, complexity| complexity }
+    ANALYZER = GraphQL::Analysis::AST::QueryComplexity
 
     alias_method :query, :object
 
@@ -23,7 +23,7 @@ module Types
           description: 'GraphQL query complexity score.'
 
     def score
-      ::GraphQL::Analysis.analyze_query(query, [ANALYZER]).first
+      ::GraphQL::Analysis::AST.analyze_query(query, [ANALYZER]).first
     end
   end
   # rubocop: enable Graphql/AuthorizeTypes
diff --git a/app/graphql/types/time_type.rb b/app/graphql/types/time_type.rb
index 2db14953308..121515c04db 100644
--- a/app/graphql/types/time_type.rb
+++ b/app/graphql/types/time_type.rb
@@ -12,6 +12,9 @@ module Types
     DESC
 
     def self.coerce_input(value, ctx)
+      # arguments can be nil, so don't raise an error
+      return if value.nil?
+
       Time.parse(value)
     rescue ArgumentError, TypeError => e
       raise GraphQL::CoercionError, e.message
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index bf0fa2c3e77..a157b1b7b21 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -203,7 +203,7 @@ module IssuesHelper
       is_anonymous_search_disabled: Feature.enabled?(:disable_anonymous_search, type: :ops).to_s,
       is_issue_repositioning_disabled: issue_repositioning_disabled?.to_s,
       is_public_visibility_restricted:
-        Gitlab::CurrentSettings.restricted_visibility_levels.include?(Gitlab::VisibilityLevel::PUBLIC).to_s,
+        Gitlab::CurrentSettings.restricted_visibility_levels&.include?(Gitlab::VisibilityLevel::PUBLIC).to_s,
       is_signed_in: current_user.present?.to_s,
       jira_integration_path: help_page_url('integration/jira/issues', anchor: 'view-jira-issues'),
       rss_path: url_for(safe_params.merge(rss_url_options)),
diff --git a/db/docs/geo_lfs_object_deleted_events.yml b/db/docs/geo_lfs_object_deleted_events.yml
deleted file mode 100644
index 05cafd6d806..00000000000
--- a/db/docs/geo_lfs_object_deleted_events.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-table_name: geo_lfs_object_deleted_events
-classes: []
-feature_categories:
-- geo_replication
-description: Geo event for when an LFS object gets deleted, belongs to geo_event_log.
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3481
-milestone: '10.2'
diff --git a/db/post_migrate/20220526042017_remove_geo_lfs_object_deleted_event_references.rb b/db/post_migrate/20220526042017_remove_geo_lfs_object_deleted_event_references.rb
new file mode 100644
index 00000000000..4569424dca0
--- /dev/null
+++ b/db/post_migrate/20220526042017_remove_geo_lfs_object_deleted_event_references.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class RemoveGeoLfsObjectDeletedEventReferences < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      remove_column :geo_event_log, :lfs_object_deleted_event_id, :bigint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      unless column_exists?(:geo_event_log, :lfs_object_deleted_event_id)
+        add_column(:geo_event_log, :lfs_object_deleted_event_id, :bigint)
+      end
+    end
+
+    add_concurrent_foreign_key :geo_event_log, :geo_lfs_object_deleted_events,
+                               column: :lfs_object_deleted_event_id,
+                               name: 'fk_d5af95fcd9',
+                               on_delete: :cascade
+
+    add_concurrent_index :geo_event_log,
+                         :lfs_object_deleted_event_id,
+                         name: 'index_geo_event_log_on_lfs_object_deleted_event_id',
+                         where: "(lfs_object_deleted_event_id IS NOT NULL)"
+  end
+end
diff --git a/db/post_migrate/20220526044516_remove_geo_lfs_object_deleted_events_table.rb b/db/post_migrate/20220526044516_remove_geo_lfs_object_deleted_events_table.rb
new file mode 100644
index 00000000000..29a2e34aefa
--- /dev/null
+++ b/db/post_migrate/20220526044516_remove_geo_lfs_object_deleted_events_table.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveGeoLfsObjectDeletedEventsTable < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    drop_table :geo_lfs_object_deleted_events
+  end
+
+  def down
+    create_table :geo_lfs_object_deleted_events, id: :bigserial do |t|
+      t.integer :lfs_object_id, null: false, index: true
+      t.string :oid, null: false
+      t.string :file_path, null: false
+    end
+  end
+end
diff --git a/db/schema_migrations/20220526042017 b/db/schema_migrations/20220526042017
new file mode 100644
index 00000000000..ac391e2aa5b
--- /dev/null
+++ b/db/schema_migrations/20220526042017
@@ -0,0 +1 @@
+2f814744441d104b0d5e533c7f27f4b9284563f20f3bd332a876fee2b4a8b6a0
\ No newline at end of file
diff --git a/db/schema_migrations/20220526044516 b/db/schema_migrations/20220526044516
new file mode 100644
index 00000000000..71241178af6
--- /dev/null
+++ b/db/schema_migrations/20220526044516
@@ -0,0 +1 @@
+e9f7958f28a6dc22d907052e3c58c2213b97110fdfedffee97b37bd1293e2dd0
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 581ded16425..5f7a15891d9 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -15249,7 +15249,6 @@ CREATE TABLE geo_event_log (
     repositories_changed_event_id bigint,
     repository_created_event_id bigint,
     hashed_storage_migrated_event_id bigint,
-    lfs_object_deleted_event_id bigint,
     hashed_storage_attachments_event_id bigint,
     reset_checksum_event_id bigint,
     cache_invalidation_event_id bigint,
@@ -15322,22 +15321,6 @@ CREATE SEQUENCE geo_hashed_storage_migrated_events_id_seq
 
 ALTER SEQUENCE geo_hashed_storage_migrated_events_id_seq OWNED BY geo_hashed_storage_migrated_events.id;
 
-CREATE TABLE geo_lfs_object_deleted_events (
-    id bigint NOT NULL,
-    lfs_object_id integer NOT NULL,
-    oid character varying NOT NULL,
-    file_path character varying NOT NULL
-);
-
-CREATE SEQUENCE geo_lfs_object_deleted_events_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE geo_lfs_object_deleted_events_id_seq OWNED BY geo_lfs_object_deleted_events.id;
-
 CREATE TABLE geo_node_namespace_links (
     id integer NOT NULL,
     geo_node_id integer NOT NULL,
@@ -22902,8 +22885,6 @@ ALTER TABLE ONLY geo_hashed_storage_attachments_events ALTER COLUMN id SET DEFAU
 
 ALTER TABLE ONLY geo_hashed_storage_migrated_events ALTER COLUMN id SET DEFAULT nextval('geo_hashed_storage_migrated_events_id_seq'::regclass);
 
-ALTER TABLE ONLY geo_lfs_object_deleted_events ALTER COLUMN id SET DEFAULT nextval('geo_lfs_object_deleted_events_id_seq'::regclass);
-
 ALTER TABLE ONLY geo_node_namespace_links ALTER COLUMN id SET DEFAULT nextval('geo_node_namespace_links_id_seq'::regclass);
 
 ALTER TABLE ONLY geo_node_statuses ALTER COLUMN id SET DEFAULT nextval('geo_node_statuses_id_seq'::regclass);
@@ -24760,9 +24741,6 @@ ALTER TABLE ONLY geo_hashed_storage_attachments_events
 ALTER TABLE ONLY geo_hashed_storage_migrated_events
     ADD CONSTRAINT geo_hashed_storage_migrated_events_pkey PRIMARY KEY (id);
 
-ALTER TABLE ONLY geo_lfs_object_deleted_events
-    ADD CONSTRAINT geo_lfs_object_deleted_events_pkey PRIMARY KEY (id);
-
 ALTER TABLE ONLY geo_node_namespace_links
     ADD CONSTRAINT geo_node_namespace_links_pkey PRIMARY KEY (id);
 
@@ -27987,8 +27965,6 @@ CREATE INDEX index_geo_event_log_on_hashed_storage_attachments_event_id ON geo_e
 
 CREATE INDEX index_geo_event_log_on_hashed_storage_migrated_event_id ON geo_event_log USING btree (hashed_storage_migrated_event_id) WHERE (hashed_storage_migrated_event_id IS NOT NULL);
 
-CREATE INDEX index_geo_event_log_on_lfs_object_deleted_event_id ON geo_event_log USING btree (lfs_object_deleted_event_id) WHERE (lfs_object_deleted_event_id IS NOT NULL);
-
 CREATE INDEX index_geo_event_log_on_repositories_changed_event_id ON geo_event_log USING btree (repositories_changed_event_id) WHERE (repositories_changed_event_id IS NOT NULL);
 
 CREATE INDEX index_geo_event_log_on_repository_created_event_id ON geo_event_log USING btree (repository_created_event_id) WHERE (repository_created_event_id IS NOT NULL);
@@ -28005,8 +27981,6 @@ CREATE INDEX index_geo_hashed_storage_attachments_events_on_project_id ON geo_ha
 
 CREATE INDEX index_geo_hashed_storage_migrated_events_on_project_id ON geo_hashed_storage_migrated_events USING btree (project_id);
 
-CREATE INDEX index_geo_lfs_object_deleted_events_on_lfs_object_id ON geo_lfs_object_deleted_events USING btree (lfs_object_id);
-
 CREATE INDEX index_geo_node_namespace_links_on_geo_node_id ON geo_node_namespace_links USING btree (geo_node_id);
 
 CREATE UNIQUE INDEX index_geo_node_namespace_links_on_geo_node_id_and_namespace_id ON geo_node_namespace_links USING btree (geo_node_id, namespace_id);
@@ -32057,9 +32031,6 @@ ALTER TABLE ONLY web_hooks
 ALTER TABLE ONLY ci_sources_pipelines
     ADD CONSTRAINT fk_d4e29af7d7 FOREIGN KEY (source_pipeline_id) REFERENCES ci_pipelines(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY geo_event_log
-    ADD CONSTRAINT fk_d5af95fcd9 FOREIGN KEY (lfs_object_deleted_event_id) REFERENCES geo_lfs_object_deleted_events(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY incident_management_timeline_events
     ADD CONSTRAINT fk_d606a2a890 FOREIGN KEY (promoted_from_note_id) REFERENCES notes(id) ON DELETE SET NULL;
 
diff --git a/doc/administration/monitoring/prometheus/puma_exporter.md b/doc/administration/monitoring/prometheus/puma_exporter.md
index 4b449a1d74e..a3e095f5f09 100644
--- a/doc/administration/monitoring/prometheus/puma_exporter.md
+++ b/doc/administration/monitoring/prometheus/puma_exporter.md
@@ -1,53 +1,11 @@
 ---
-stage: Data Stores
-group: Memory
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+redirect_to: 'web_exporter.md'
+remove_date: '2022-09-01'
 ---
 
-# Web exporter (dedicated metrics server) **(FREE SELF)**
+This document was moved to [another location](web_exporter.md).
 
-When [monitoring GitLab with Prometheus](index.md), GitLab runs various collectors that
-sample the application for data related to usage, load and performance. GitLab can then make
-this data available to a Prometheus scraper by running one or more Prometheus exporters.
-A Prometheus exporter is an HTTP server that serializes metric data into a format the
-Prometheus scraper understands.
-
-NOTE:
-This page is about web application metrics.
-To export background job metrics, learn how to [configure the Sidekiq metrics server](../../sidekiq.md#configure-the-sidekiq-metrics-server).
-
-We provide two mechanisms by which web application metrics can be exported:
-
-- Through the main Rails application. This means [Puma](../../operations/puma.md), the application server we use,
-  makes metric data available via its own `/-/metrics` endpoint. This is the default,
-  and is described in [GitLab Metrics](index.md#gitlab-metrics). We recommend this
-  default for small GitLab installations where the amount of metrics collected is small.
-- Through a dedicated metrics server. Enabling this server will cause Puma to launch an
-  additional process whose sole responsibility is to serve metrics. This approach leads
-  to better fault isolation and performance for very large GitLab installations, but
-  comes with additional memory use. We recommend this approach for medium to large
-  GitLab installations that seek high performance and availability.
-
-Both the dedicated server and the Rails `/-/metrics` endpoint serve the same data, so
-they are functionally equivalent and differ merely in their performance characteristics.
-
-To enable the dedicated server:
-
-1. [Enable Prometheus](index.md#configuring-prometheus).
-1. Edit `/etc/gitlab/gitlab.rb` to add (or find and uncomment) the following lines. Make sure
-   `puma['exporter_enabled']` is set to `true`:
-
-   ```ruby
-   puma['exporter_enabled'] = true
-   puma['exporter_address'] = "127.0.0.1"
-   puma['exporter_port'] = 8083
-   ```
-
-1. When using the GitLab-bundled Prometheus, make sure that its `scrape_config` is pointing
-   to `localhost:8083/metrics`. Refer to the [Adding custom scrape configurations](index.md#adding-custom-scrape-configurations) page
-   for how to configure scraper targets. For external Prometheus setup, refer to
-   [Using an external Prometheus server](index.md#using-an-external-prometheus-server) instead.
-1. Save the file and [reconfigure GitLab](../../restart_gitlab.md#omnibus-gitlab-reconfigure)
-   for the changes to take effect.
-
-Metrics can now be served and scraped from `localhost:8083/metrics`.
+<!-- This redirect file can be deleted after <2022-09-01>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/administration/monitoring/prometheus/web_exporter.md b/doc/administration/monitoring/prometheus/web_exporter.md
new file mode 100644
index 00000000000..4b449a1d74e
--- /dev/null
+++ b/doc/administration/monitoring/prometheus/web_exporter.md
@@ -0,0 +1,53 @@
+---
+stage: Data Stores
+group: Memory
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+---
+
+# Web exporter (dedicated metrics server) **(FREE SELF)**
+
+When [monitoring GitLab with Prometheus](index.md), GitLab runs various collectors that
+sample the application for data related to usage, load and performance. GitLab can then make
+this data available to a Prometheus scraper by running one or more Prometheus exporters.
+A Prometheus exporter is an HTTP server that serializes metric data into a format the
+Prometheus scraper understands.
+
+NOTE:
+This page is about web application metrics.
+To export background job metrics, learn how to [configure the Sidekiq metrics server](../../sidekiq.md#configure-the-sidekiq-metrics-server).
+
+We provide two mechanisms by which web application metrics can be exported:
+
+- Through the main Rails application. This means [Puma](../../operations/puma.md), the application server we use,
+  makes metric data available via its own `/-/metrics` endpoint. This is the default,
+  and is described in [GitLab Metrics](index.md#gitlab-metrics). We recommend this
+  default for small GitLab installations where the amount of metrics collected is small.
+- Through a dedicated metrics server. Enabling this server will cause Puma to launch an
+  additional process whose sole responsibility is to serve metrics. This approach leads
+  to better fault isolation and performance for very large GitLab installations, but
+  comes with additional memory use. We recommend this approach for medium to large
+  GitLab installations that seek high performance and availability.
+
+Both the dedicated server and the Rails `/-/metrics` endpoint serve the same data, so
+they are functionally equivalent and differ merely in their performance characteristics.
+
+To enable the dedicated server:
+
+1. [Enable Prometheus](index.md#configuring-prometheus).
+1. Edit `/etc/gitlab/gitlab.rb` to add (or find and uncomment) the following lines. Make sure
+   `puma['exporter_enabled']` is set to `true`:
+
+   ```ruby
+   puma['exporter_enabled'] = true
+   puma['exporter_address'] = "127.0.0.1"
+   puma['exporter_port'] = 8083
+   ```
+
+1. When using the GitLab-bundled Prometheus, make sure that its `scrape_config` is pointing
+   to `localhost:8083/metrics`. Refer to the [Adding custom scrape configurations](index.md#adding-custom-scrape-configurations) page
+   for how to configure scraper targets. For external Prometheus setup, refer to
+   [Using an external Prometheus server](index.md#using-an-external-prometheus-server) instead.
+1. Save the file and [reconfigure GitLab](../../restart_gitlab.md#omnibus-gitlab-reconfigure)
+   for the changes to take effect.
+
+Metrics can now be served and scraped from `localhost:8083/metrics`.
diff --git a/lib/gitlab/application_rate_limiter.rb b/lib/gitlab/application_rate_limiter.rb
index dbd9d0e9412..a79d4e25e5c 100644
--- a/lib/gitlab/application_rate_limiter.rb
+++ b/lib/gitlab/application_rate_limiter.rb
@@ -190,3 +190,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::ApplicationRateLimiter.prepend_mod
diff --git a/lib/gitlab/database/gitlab_schemas.yml b/lib/gitlab/database/gitlab_schemas.yml
index e45c65001b7..67c27496d67 100644
--- a/lib/gitlab/database/gitlab_schemas.yml
+++ b/lib/gitlab/database/gitlab_schemas.yml
@@ -218,7 +218,6 @@ geo_event_log: :gitlab_main
 geo_events: :gitlab_main
 geo_hashed_storage_attachments_events: :gitlab_main
 geo_hashed_storage_migrated_events: :gitlab_main
-geo_lfs_object_deleted_events: :gitlab_main
 geo_node_namespace_links: :gitlab_main
 geo_nodes: :gitlab_main
 geo_node_statuses: :gitlab_main
diff --git a/lib/gitlab/graphql/generic_tracing.rb b/lib/gitlab/graphql/generic_tracing.rb
index 936b22d5afa..d3de9c714f4 100644
--- a/lib/gitlab/graphql/generic_tracing.rb
+++ b/lib/gitlab/graphql/generic_tracing.rb
@@ -23,6 +23,14 @@ module Gitlab
         "#{type.name}.#{field.name}"
       end
 
+      def platform_authorized_key(type)
+        "#{type.graphql_name}.authorized"
+      end
+
+      def platform_resolve_type_key(type)
+        "#{type.graphql_name}.resolve_type"
+      end
+
       def platform_trace(platform_key, key, data, &block)
         tags = { platform_key: platform_key, key: key }
         start = Gitlab::Metrics::System.monotonic_time
diff --git a/lib/gitlab/graphql/present/field_extension.rb b/lib/gitlab/graphql/present/field_extension.rb
index 050a3a276ea..bc6d0c6fd35 100644
--- a/lib/gitlab/graphql/present/field_extension.rb
+++ b/lib/gitlab/graphql/present/field_extension.rb
@@ -21,6 +21,7 @@ module Gitlab
             # TODO: remove this when resolve procs are removed from the
             # graphql-ruby library, and all field instrumentation is removed.
             # See: https://github.com/rmosolgo/graphql-ruby/issues/3385
+            # See: https://gitlab.com/gitlab-org/gitlab/-/issues/363131
             presented = field.owner.try(:present, object, attrs) || object
             yield(presented, arguments)
           end
diff --git a/lib/gitlab/graphql/query_analyzers/ast/logger_analyzer.rb b/lib/gitlab/graphql/query_analyzers/ast/logger_analyzer.rb
new file mode 100644
index 00000000000..9a7069249ec
--- /dev/null
+++ b/lib/gitlab/graphql/query_analyzers/ast/logger_analyzer.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Graphql
+    module QueryAnalyzers
+      module AST
+        class LoggerAnalyzer < GraphQL::Analysis::AST::Analyzer
+          COMPLEXITY_ANALYZER = GraphQL::Analysis::AST::QueryComplexity
+          DEPTH_ANALYZER = GraphQL::Analysis::AST::QueryDepth
+          FIELD_USAGE_ANALYZER = GraphQL::Analysis::AST::FieldUsage
+          ALL_ANALYZERS = [COMPLEXITY_ANALYZER, DEPTH_ANALYZER, FIELD_USAGE_ANALYZER].freeze
+
+          def initialize(query)
+            super
+
+            @results = default_initial_values(query).merge({
+              time_started: Gitlab::Metrics::System.monotonic_time
+            })
+          rescue StandardError => e
+            Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)
+            @results = default_initial_values(query_or_multiplex)
+          end
+
+          def result
+            complexity, depth, field_usages =
+              GraphQL::Analysis::AST.analyze_query(@subject, ALL_ANALYZERS, multiplex_analyzers: [])
+
+            results[:depth] = depth
+            results[:complexity] = complexity
+            # This duration is not the execution time of the
+            # query but the execution time of the analyzer.
+            results[:duration_s] = duration(results[:time_started])
+            results[:used_fields] = field_usages[:used_fields]
+            results[:used_deprecated_fields] = field_usages[:used_deprecated_fields]
+
+            push_to_request_store(results)
+
+            # This gl_analysis is included in the tracer log
+            query.context[:gl_analysis] = results.except!(:time_started, :query)
+          rescue StandardError => e
+            Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)
+          end
+
+          private
+
+          attr_reader :results
+
+          def push_to_request_store(results)
+            query = @subject
+
+            # TODO: This RequestStore management is used to handle setting request wide metadata
+            # to improve preexisting logging. We should handle this either with ApplicationContext
+            # or in a separate tracer.
+            # https://gitlab.com/gitlab-org/gitlab/-/issues/343802
+
+            RequestStore.store[:graphql_logs] ||= []
+            RequestStore.store[:graphql_logs] << results.except(:time_started, :duration_s).merge({
+              variables: process_variables(query.provided_variables),
+              operation_name: query.operation_name
+            })
+          end
+
+          def process_variables(variables)
+            filtered_variables = filter_sensitive_variables(variables)
+            filtered_variables.try(:to_s) || filtered_variables
+          end
+
+          def filter_sensitive_variables(variables)
+            ActiveSupport::ParameterFilter
+              .new(::Rails.application.config.filter_parameters)
+              .filter(variables)
+          end
+
+          def duration(time_started)
+            Gitlab::Metrics::System.monotonic_time - time_started
+          end
+
+          def default_initial_values(query)
+            {
+              time_started: Gitlab::Metrics::System.monotonic_time,
+              duration_s: nil
+            }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb b/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb
new file mode 100644
index 00000000000..4e90e4c912f
--- /dev/null
+++ b/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# Recursive queries, with relatively low effort, can quickly spiral out of control exponentially
+# and may not be picked up by depth and complexity alone.
+module Gitlab
+  module Graphql
+    module QueryAnalyzers
+      module AST
+        class RecursionAnalyzer < GraphQL::Analysis::AST::Analyzer
+          IGNORED_FIELDS = %w(node edges nodes ofType).freeze
+          RECURSION_THRESHOLD = 2
+
+          def initialize(query)
+            super
+
+            @node_visits = {}
+            @recurring_fields = {}
+          end
+
+          def on_enter_field(node, _parent, visitor)
+            return if skip_node?(node, visitor)
+
+            node_name = node.name
+            node_visits[node_name] ||= 0
+            node_visits[node_name] += 1
+
+            times_encountered = @node_visits[node_name]
+            recurring_fields[node_name] = times_encountered if recursion_too_deep?(node_name, times_encountered)
+          end
+
+          # Visitors are all defined on the AST::Analyzer base class
+          # We override them for custom analyzers.
+          def on_leave_field(node, _parent, visitor)
+            return if skip_node?(node, visitor)
+
+            node_name = node.name
+            node_visits[node_name] ||= 0
+            node_visits[node_name] -= 1
+          end
+
+          def result
+            @recurring_fields = @recurring_fields.select { |k, v| recursion_too_deep?(k, v) }
+
+            if @recurring_fields.any?
+              GraphQL::AnalysisError.new(<<~MSG)
+                Recursive query - too many of fields '#{@recurring_fields}' detected
+                in single branch of the query")
+              MSG
+            end
+          end
+
+          private
+
+          attr_reader :node_visits, :recurring_fields
+
+          def recursion_too_deep?(node_name, times_encountered)
+            return if IGNORED_FIELDS.include?(node_name)
+
+            times_encountered > recursion_threshold
+          end
+
+          def skip_node?(node, visitor)
+            # We don't want to count skipped fields or fields
+            # inside fragment definitions
+            return false if visitor.skipping? || visitor.visiting_fragment_definition?
+
+            !node.is_a?(GraphQL::Language::Nodes::Field) || node.selections.empty?
+          end
+
+          # separated into a method for use in allow_high_graphql_recursion
+          def recursion_threshold
+            RECURSION_THRESHOLD
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb b/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
deleted file mode 100644
index 207324e73bd..00000000000
--- a/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Graphql
-    module QueryAnalyzers
-      class LoggerAnalyzer
-        COMPLEXITY_ANALYZER = GraphQL::Analysis::QueryComplexity.new { |query, complexity_value| complexity_value }
-        DEPTH_ANALYZER = GraphQL::Analysis::QueryDepth.new { |query, depth_value| depth_value }
-        FIELD_USAGE_ANALYZER = GraphQL::Analysis::FieldUsage.new { |query, used_fields, used_deprecated_fields| [used_fields, used_deprecated_fields] }
-        ALL_ANALYZERS = [COMPLEXITY_ANALYZER, DEPTH_ANALYZER, FIELD_USAGE_ANALYZER].freeze
-
-        def initial_value(query)
-          {
-            time_started: Gitlab::Metrics::System.monotonic_time,
-            query: query
-          }
-        end
-
-        def call(memo, *)
-          memo
-        end
-
-        def final_value(memo)
-          return if memo.nil?
-
-          query = memo[:query]
-          complexity, depth, field_usages = GraphQL::Analysis.analyze_query(query, ALL_ANALYZERS)
-
-          memo[:depth] = depth
-          memo[:complexity] = complexity
-          # This duration is not the execution time of the
-          # query but the execution time of the analyzer.
-          memo[:duration_s] = duration(memo[:time_started])
-          memo[:used_fields] = field_usages.first
-          memo[:used_deprecated_fields] = field_usages.second
-
-          push_to_request_store(memo)
-
-          # This gl_analysis is included in the tracer log
-          query.context[:gl_analysis] = memo.except!(:time_started, :query)
-        rescue StandardError => e
-          Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)
-        end
-
-        private
-
-        def push_to_request_store(memo)
-          query = memo[:query]
-
-          # TODO: This RequestStore management is used to handle setting request wide metadata
-          # to improve preexisting logging. We should handle this either with ApplicationContext
-          # or in a separate tracer.
-          # https://gitlab.com/gitlab-org/gitlab/-/issues/343802
-
-          RequestStore.store[:graphql_logs] ||= []
-          RequestStore.store[:graphql_logs] << memo.except(:time_started, :duration_s, :query).merge({
-            variables: process_variables(query.provided_variables),
-            operation_name: query.operation_name
-          })
-        end
-
-        def process_variables(variables)
-          filtered_variables = filter_sensitive_variables(variables)
-
-          if filtered_variables.respond_to?(:to_s)
-            filtered_variables.to_s
-          else
-            filtered_variables
-          end
-        end
-
-        def filter_sensitive_variables(variables)
-          ActiveSupport::ParameterFilter
-            .new(::Rails.application.config.filter_parameters)
-            .filter(variables)
-        end
-
-        def duration(time_started)
-          Gitlab::Metrics::System.monotonic_time - time_started
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/graphql/query_analyzers/recursion_analyzer.rb b/lib/gitlab/graphql/query_analyzers/recursion_analyzer.rb
deleted file mode 100644
index 79a7104a2ff..00000000000
--- a/lib/gitlab/graphql/query_analyzers/recursion_analyzer.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-# Recursive queries, with relatively low effort, can quickly spiral out of control exponentially
-# and may not be picked up by depth and complexity alone.
-module Gitlab
-  module Graphql
-    module QueryAnalyzers
-      class RecursionAnalyzer
-        IGNORED_FIELDS = %w(node edges nodes ofType).freeze
-        RECURSION_THRESHOLD = 2
-
-        def initial_value(query)
-          {
-              recurring_fields: {}
-          }
-        end
-
-        def call(memo, visit_type, irep_node)
-          return memo if skip_node?(irep_node)
-
-          node_name = irep_node.ast_node.name
-          times_encountered = memo[node_name] || 0
-
-          if visit_type == :enter
-            times_encountered += 1
-            memo[:recurring_fields][node_name] = times_encountered if recursion_too_deep?(node_name, times_encountered)
-          else
-            times_encountered -= 1
-          end
-
-          memo[node_name] = times_encountered
-          memo
-        end
-
-        def final_value(memo)
-          recurring_fields = memo[:recurring_fields]
-          recurring_fields = recurring_fields.select { |k, v| recursion_too_deep?(k, v) }
-          if recurring_fields.any?
-            GraphQL::AnalysisError.new("Recursive query - too many of fields '#{recurring_fields}' detected in single branch of the query")
-          end
-        end
-
-        private
-
-        def recursion_too_deep?(node_name, times_encountered)
-          return if IGNORED_FIELDS.include?(node_name)
-
-          times_encountered > recursion_threshold
-        end
-
-        def skip_node?(irep_node)
-          ast_node = irep_node.ast_node
-          !ast_node.is_a?(GraphQL::Language::Nodes::Field) || ast_node.selections.empty?
-        end
-
-        def recursion_threshold
-          RECURSION_THRESHOLD
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/page/project/pipeline_editor/show.rb b/qa/qa/page/project/pipeline_editor/show.rb
index 197fd8fd9fb..78f16a8a65c 100644
--- a/qa/qa/page/project/pipeline_editor/show.rb
+++ b/qa/qa/page/project/pipeline_editor/show.rb
@@ -66,7 +66,6 @@ module QA
           end
 
           def open_branch_selector_dropdown
-            dismiss_file_tree_popover if has_element?(:file_tree_popover, wait: 1)
             click_element(:branch_selector_button)
           end
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
index db02d1e8390..f05db3dfd6e 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
@@ -2,7 +2,10 @@
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Project transfer between groups', :reliable do
+    describe 'Project transfer between groups', :reliable, quarantine: {
+      issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/359043',
+      type: :investigating
+    } do
       let(:source_group) do
         Resource::Group.fabricate_via_api! do |group|
           group.path = "source-group-#{SecureRandom.hex(8)}"
diff --git a/qa/qa/specs/spec_helper.rb b/qa/qa/specs/spec_helper.rb
index b130fff0488..085727fb0c2 100644
--- a/qa/qa/specs/spec_helper.rb
+++ b/qa/qa/specs/spec_helper.rb
@@ -15,6 +15,9 @@ QA::Runtime::Scenario.from_env(QA::Runtime::Env.runtime_scenario_attributes)
 Dir[::File.join(__dir__, "features/shared_examples/*.rb")].sort.each { |f| require f }
 Dir[::File.join(__dir__, "features/shared_contexts/*.rb")].sort.each { |f| require f }
 
+# For JH additionally process when `jh/` exists
+require_relative('../../../jh/qa/qa/specs/spec_helper') if GitlabEdition.jh?
+
 RSpec.configure do |config|
   config.include QA::Support::Matchers::EventuallyMatcher
   config.include QA::Support::Matchers::HaveMatcher
diff --git a/spec/controllers/graphql_controller_spec.rb b/spec/controllers/graphql_controller_spec.rb
index 0818dce776d..e85f5b7a972 100644
--- a/spec/controllers/graphql_controller_spec.rb
+++ b/spec/controllers/graphql_controller_spec.rb
@@ -5,6 +5,9 @@ require 'spec_helper'
 RSpec.describe GraphqlController do
   include GraphqlHelpers
 
+  # two days is enough to make timezones irrelevant
+  let_it_be(:last_activity_on) { 2.days.ago.to_date }
+
   before do
     stub_feature_flags(graphql: true)
   end
@@ -40,7 +43,7 @@ RSpec.describe GraphqlController do
 
   describe 'POST #execute' do
     context 'when user is logged in' do
-      let(:user) { create(:user, last_activity_on: Date.yesterday) }
+      let(:user) { create(:user, last_activity_on: last_activity_on) }
 
       before do
         sign_in(user)
@@ -161,7 +164,7 @@ RSpec.describe GraphqlController do
     end
 
     context 'when 2FA is required for the user' do
-      let(:user) { create(:user, last_activity_on: Date.yesterday) }
+      let(:user) { create(:user, last_activity_on: last_activity_on) }
 
       before do
         group = create(:group, require_two_factor_authentication: true)
@@ -186,14 +189,14 @@ RSpec.describe GraphqlController do
     end
 
     context 'when user uses an API token' do
-      let(:user) { create(:user, last_activity_on: Date.yesterday) }
+      let(:user) { create(:user, last_activity_on: last_activity_on) }
       let(:token) { create(:personal_access_token, user: user, scopes: [:api]) }
       let(:query) { '{ __typename }' }
 
       subject { post :execute, params: { query: query, access_token: token.token } }
 
       context 'when the user is a project bot' do
-        let(:user) { create(:user, :project_bot, last_activity_on: Date.yesterday) }
+        let(:user) { create(:user, :project_bot, last_activity_on: last_activity_on) }
 
         it 'updates the users last_activity_on field' do
           expect { subject }.to change { user.reload.last_activity_on }
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 17a9b8dc69c..2d8454988d9 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -47,7 +47,6 @@ RSpec.describe 'Database schema' do
     events: %w[target_id],
     forked_project_links: %w[forked_from_project_id],
     geo_event_log: %w[hashed_storage_attachments_event_id],
-    geo_lfs_object_deleted_events: %w[lfs_object_id],
     geo_node_statuses: %w[last_event_id cursor_last_event_id],
     geo_nodes: %w[oauth_application_id],
     geo_repository_deleted_events: %w[project_id],
diff --git a/spec/frontend/issuable/components/csv_export_modal_spec.js b/spec/frontend/issuable/components/csv_export_modal_spec.js
index ad4abda6912..f798f87b6b2 100644
--- a/spec/frontend/issuable/components/csv_export_modal_spec.js
+++ b/spec/frontend/issuable/components/csv_export_modal_spec.js
@@ -1,7 +1,8 @@
-import { GlModal, GlIcon, GlButton } from '@gitlab/ui';
+import { GlModal, GlIcon } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import { stubComponent } from 'helpers/stub_component';
 import CsvExportModal from '~/issuable/components/csv_export_modal.vue';
+import { __ } from '~/locale';
 
 describe('CsvExportModal', () => {
   let wrapper;
@@ -34,7 +35,6 @@ describe('CsvExportModal', () => {
 
   const findModal = () => wrapper.findComponent(GlModal);
   const findIcon = () => wrapper.findComponent(GlIcon);
-  const findButton = () => wrapper.findComponent(GlButton);
 
   describe('template', () => {
     describe.each`
@@ -47,11 +47,25 @@ describe('CsvExportModal', () => {
       });
 
       it('displays the modal title "$modalTitle"', () => {
-        expect(findModal().text()).toContain(modalTitle);
+        expect(findModal().props('title')).toBe(modalTitle);
       });
 
-      it('displays the button with title "$modalTitle"', () => {
-        expect(findButton().text()).toBe(modalTitle);
+      it('displays the primary button with title "$modalTitle" and href', () => {
+        expect(findModal().props('actionPrimary')).toMatchObject({
+          text: modalTitle,
+          attributes: {
+            href: 'export/csv/path',
+            variant: 'confirm',
+            'data-method': 'post',
+            'data-qa-selector': `export_${issuableType}_button`,
+            'data-track-action': 'click_button',
+            'data-track-label': `export_${issuableType}_csv`,
+          },
+        });
+      });
+
+      it('displays the cancel button', () => {
+        expect(findModal().props('actionCancel')).toEqual({ text: __('Cancel') });
       });
     });
 
@@ -72,13 +86,5 @@ describe('CsvExportModal', () => {
         );
       });
     });
-
-    describe('primary button', () => {
-      it('passes the exportCsvPath to the button', () => {
-        const exportCsvPath = '/gitlab-org/gitlab-test/-/issues/export_csv';
-        wrapper = createComponent({ props: { exportCsvPath } });
-        expect(findButton().attributes('href')).toBe(exportCsvPath);
-      });
-    });
   });
 });
diff --git a/spec/frontend/issuable/components/csv_import_modal_spec.js b/spec/frontend/issuable/components/csv_import_modal_spec.js
index f4636fd7e6a..6e954c91f46 100644
--- a/spec/frontend/issuable/components/csv_import_modal_spec.js
+++ b/spec/frontend/issuable/components/csv_import_modal_spec.js
@@ -76,6 +76,10 @@ describe('CsvImportModal', () => {
 
         expect(formSubmitSpy).toHaveBeenCalled();
       });
+
+      it('displays the cancel button', () => {
+        expect(findModal().props('actionCancel')).toEqual({ text: __('Cancel') });
+      });
     });
   });
 });
diff --git a/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap b/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
index a613b325462..1798ca5ccde 100644
--- a/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
+++ b/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
@@ -5,7 +5,7 @@ exports[`Upload dropzone component correctly overrides description and drop mess
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -41,7 +41,7 @@ exports[`Upload dropzone component correctly overrides description and drop mess
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style="display: none;"
     >
       <div
@@ -86,7 +86,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -126,7 +126,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style=""
     >
       <div
@@ -171,7 +171,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -211,7 +211,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style=""
     >
       <div
@@ -256,7 +256,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -296,7 +296,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style=""
     >
       <div
@@ -342,7 +342,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -382,7 +382,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style=""
     >
       <div
@@ -428,7 +428,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -468,7 +468,7 @@ exports[`Upload dropzone component when dragging renders correct template when d
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style="display: none;"
     >
       <div
@@ -514,7 +514,7 @@ exports[`Upload dropzone component when no slot provided renders default dropzon
   class="gl-w-full gl-relative"
 >
   <button
-    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
+    class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4"
     type="button"
   >
     <div
@@ -554,7 +554,7 @@ exports[`Upload dropzone component when no slot provided renders default dropzon
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style="display: none;"
     >
       <div
@@ -606,7 +606,7 @@ exports[`Upload dropzone component when slot provided renders dropzone with slot
     name="upload-dropzone-fade"
   >
     <div
-      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
+      class="card upload-dropzone-border upload-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-4"
       style="display: none;"
     >
       <div
diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb
index 02c686af688..60b3edfc279 100644
--- a/spec/graphql/gitlab_schema_spec.rb
+++ b/spec/graphql/gitlab_schema_spec.rb
@@ -4,15 +4,16 @@ require 'spec_helper'
 
 RSpec.describe GitlabSchema do
   let_it_be(:connections) { GitlabSchema.connections.all_wrappers }
+  let_it_be(:tracers) { described_class.tracers }
 
   let(:user) { build :user }
 
   it 'uses batch loading' do
-    expect(field_instrumenters).to include(BatchLoader::GraphQL)
+    expect(tracers).to include(BatchLoader::GraphQL)
   end
 
   it 'enables the generic instrumenter' do
-    expect(field_instrumenters).to include(instance_of(::Gitlab::Graphql::GenericTracing))
+    expect(tracers).to include(instance_of(::Gitlab::Graphql::GenericTracing))
   end
 
   it 'has the base mutation' do
@@ -219,6 +220,8 @@ RSpec.describe GitlabSchema do
             badField
             veryBadField
             alsoNotAGoodField
+            yetAnotherBadField
+            andYetAnother
           }
         }
       GQL
@@ -308,8 +311,4 @@ RSpec.describe GitlabSchema do
       end
     end
   end
-
-  def field_instrumenters
-    described_class.instrumenters[:field] + described_class.instrumenters[:field_after_built_ins]
-  end
 end
diff --git a/spec/graphql/mutations/boards/issues/issue_move_list_spec.rb b/spec/graphql/mutations/boards/issues/issue_move_list_spec.rb
index b9d19b68001..10aed8a1f00 100644
--- a/spec/graphql/mutations/boards/issues/issue_move_list_spec.rb
+++ b/spec/graphql/mutations/boards/issues/issue_move_list_spec.rb
@@ -67,7 +67,7 @@ RSpec.describe Mutations::Boards::Issues::IssueMoveList do
       end
 
       it 'raises an error' do
-        expect { subject }.to raise_error(::GraphQL::LoadApplicationObjectFailedError)
+        expect { subject }.to raise_error(::GraphQL::CoercionError, "\"#{params[:board_id]}\" does not represent an instance of Board")
       end
     end
 
diff --git a/spec/graphql/mutations/branches/create_spec.rb b/spec/graphql/mutations/branches/create_spec.rb
index 9b92753a349..5e9b914d87c 100644
--- a/spec/graphql/mutations/branches/create_spec.rb
+++ b/spec/graphql/mutations/branches/create_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::Branches::Create do
+  include GraphqlHelpers
+
   subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
 
   let_it_be(:project) { create(:project, :public, :repository) }
@@ -10,7 +12,7 @@ RSpec.describe Mutations::Branches::Create do
 
   let(:context) do
     GraphQL::Query::Context.new(
-      query: double('query', schema: nil),
+      query: query_double(schema: nil),
       values: { current_user: user },
       object: nil
     )
diff --git a/spec/graphql/mutations/clusters/agent_tokens/create_spec.rb b/spec/graphql/mutations/clusters/agent_tokens/create_spec.rb
index f60aa16c68c..7998be19c20 100644
--- a/spec/graphql/mutations/clusters/agent_tokens/create_spec.rb
+++ b/spec/graphql/mutations/clusters/agent_tokens/create_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::Clusters::AgentTokens::Create do
+  include GraphqlHelpers
+
   subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
 
   let_it_be(:cluster_agent) { create(:cluster_agent) }
@@ -10,7 +12,7 @@ RSpec.describe Mutations::Clusters::AgentTokens::Create do
 
   let(:context) do
     GraphQL::Query::Context.new(
-      query: double('query', schema: nil), # rubocop:disable RSpec/VerifiedDoubles
+      query: query_double(schema: nil), # rubocop:disable RSpec/VerifiedDoubles
       values: { current_user: user },
       object: nil
     )
diff --git a/spec/graphql/mutations/clusters/agents/create_spec.rb b/spec/graphql/mutations/clusters/agents/create_spec.rb
index 62498357d68..e2c04254ed8 100644
--- a/spec/graphql/mutations/clusters/agents/create_spec.rb
+++ b/spec/graphql/mutations/clusters/agents/create_spec.rb
@@ -3,13 +3,15 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::Clusters::Agents::Create do
+  include GraphqlHelpers
+
   subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
 
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
   let(:context) do
     GraphQL::Query::Context.new(
-      query: double('query', schema: nil), # rubocop:disable RSpec/VerifiedDoubles
+      query: query_double(schema: nil), # rubocop:disable RSpec/VerifiedDoubles
       values: { current_user: user },
       object: nil
     )
diff --git a/spec/graphql/mutations/clusters/agents/delete_spec.rb b/spec/graphql/mutations/clusters/agents/delete_spec.rb
index ab01a2d93b8..c3a2c0dcbb4 100644
--- a/spec/graphql/mutations/clusters/agents/delete_spec.rb
+++ b/spec/graphql/mutations/clusters/agents/delete_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::Clusters::Agents::Delete do
+  include GraphqlHelpers
+
   subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
 
   let(:cluster_agent) { create(:cluster_agent) }
@@ -10,7 +12,7 @@ RSpec.describe Mutations::Clusters::Agents::Delete do
   let(:user) { create(:user) }
   let(:context) do
     GraphQL::Query::Context.new(
-      query: double('query', schema: nil), # rubocop:disable RSpec/VerifiedDoubles
+      query: query_double(schema: nil), # rubocop:disable RSpec/VerifiedDoubles
       values: { current_user: user },
       object: nil
     )
diff --git a/spec/graphql/mutations/commits/create_spec.rb b/spec/graphql/mutations/commits/create_spec.rb
index 456f6dc03f7..9fc9c731b96 100644
--- a/spec/graphql/mutations/commits/create_spec.rb
+++ b/spec/graphql/mutations/commits/create_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::Commits::Create do
+  include GraphqlHelpers
+
   subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
 
   let_it_be(:user) { create(:user) }
@@ -10,7 +12,7 @@ RSpec.describe Mutations::Commits::Create do
 
   let(:context) do
     GraphQL::Query::Context.new(
-      query: double('query', schema: nil), # rubocop:disable RSpec/VerifiedDoubles
+      query: query_double(schema: nil), # rubocop:disable RSpec/VerifiedDoubles
       values: { current_user: user },
       object: nil
     )
diff --git a/spec/graphql/resolvers/incident_management/timeline_events_resolver_spec.rb b/spec/graphql/resolvers/incident_management/timeline_events_resolver_spec.rb
index 6604141abfe..bd41af533ce 100644
--- a/spec/graphql/resolvers/incident_management/timeline_events_resolver_spec.rb
+++ b/spec/graphql/resolvers/incident_management/timeline_events_resolver_spec.rb
@@ -66,6 +66,6 @@ RSpec.describe 'Resolvers::IncidentManagement::TimelineEventsResolver' do
   private
 
   def resolve_timeline_events(args = {}, context = { current_user: current_user })
-    resolve(resolver, obj: incident, args: args, ctx: context)
+    resolve(resolver, obj: incident, args: args, ctx: context, arg_style: :internal_prepared)
   end
 end
diff --git a/spec/graphql/subscriptions/issuable_updated_spec.rb b/spec/graphql/subscriptions/issuable_updated_spec.rb
index 0b8fcf67513..bc640e9e3c4 100644
--- a/spec/graphql/subscriptions/issuable_updated_spec.rb
+++ b/spec/graphql/subscriptions/issuable_updated_spec.rb
@@ -52,7 +52,8 @@ RSpec.describe Subscriptions::IssuableUpdated do
         let(:current_user) { unauthorized_user }
 
         it 'unsubscribes the user' do
-          expect { subject }.to throw_symbol(:graphql_subscription_unsubscribed)
+          # GraphQL::Execution::Execute::Skip is returned when unsubscribed
+          expect(subject).to be_an(GraphQL::Execution::Execute::Skip)
         end
       end
     end
diff --git a/spec/graphql/types/base_edge_spec.rb b/spec/graphql/types/base_edge_spec.rb
index 3afb4202173..b02ccbaffef 100644
--- a/spec/graphql/types/base_edge_spec.rb
+++ b/spec/graphql/types/base_edge_spec.rb
@@ -25,7 +25,6 @@ RSpec.describe Types::BaseEdge do
 
     Class.new(GraphQL::Schema) do
       lazy_resolve ::Gitlab::Graphql::Lazy, :force
-      use ::GraphQL::Pagination::Connections
       use ::Gitlab::Graphql::Pagination::Connections
 
       query(Class.new(::Types::BaseObject) do
diff --git a/spec/graphql/types/base_object_spec.rb b/spec/graphql/types/base_object_spec.rb
index 45dc885ecba..3c42c708187 100644
--- a/spec/graphql/types/base_object_spec.rb
+++ b/spec/graphql/types/base_object_spec.rb
@@ -137,7 +137,6 @@ RSpec.describe Types::BaseObject do
 
       Class.new(GraphQL::Schema) do
         lazy_resolve ::Gitlab::Graphql::Lazy, :force
-        use ::GraphQL::Pagination::Connections
         use ::Gitlab::Graphql::Pagination::Connections
 
         query(Class.new(::Types::BaseObject) do
diff --git a/spec/graphql/types/ci/detailed_status_type_spec.rb b/spec/graphql/types/ci/detailed_status_type_spec.rb
index 5ed79b73a47..0bcb58202ad 100644
--- a/spec/graphql/types/ci/detailed_status_type_spec.rb
+++ b/spec/graphql/types/ci/detailed_status_type_spec.rb
@@ -17,12 +17,10 @@ RSpec.describe Types::Ci::DetailedStatusType do
 
   describe 'id field' do
     it 'correctly renders the field' do
-      parent_object = double(:parent_object, object: stage)
-      parent = double(:parent, object: parent_object)
       status = stage.detailed_status(stage.pipeline.user)
       expected_id = "#{status.id}-#{stage.id}"
 
-      expect(resolve_field('id', status, extras: { parent: parent })).to eq(expected_id)
+      expect(resolve_field('id', status, extras: { parent: stage })).to eq(expected_id)
     end
   end
 
diff --git a/spec/graphql/types/ci/status_action_type_spec.rb b/spec/graphql/types/ci/status_action_type_spec.rb
index ab7dee3dd11..1ea31416ef5 100644
--- a/spec/graphql/types/ci/status_action_type_spec.rb
+++ b/spec/graphql/types/ci/status_action_type_spec.rb
@@ -25,15 +25,9 @@ RSpec.describe Types::Ci::StatusActionType do
       stage = build(:ci_stage_entity, status: :skipped)
       status = stage.detailed_status(stage.pipeline.user)
 
-      grandparent_object = double(:grandparent_object, object: stage)
-      parent_object = double(:parent_object, object: status)
-
-      grandparent = double(:parent, object: grandparent_object)
-      parent = double(:parent, object: parent_object, parent: grandparent)
-
       expected_id = "#{stage.class.name}-#{status.id}"
 
-      expect(resolve_field('id', status, extras: { parent: parent })).to eq(expected_id)
+      expect(resolve_field('id', status, extras: { parent: status })).to eq(expected_id)
     end
   end
 end
diff --git a/spec/graphql/types/time_type_spec.rb b/spec/graphql/types/time_type_spec.rb
index 3b0d257e1d7..367a2371694 100644
--- a/spec/graphql/types/time_type_spec.rb
+++ b/spec/graphql/types/time_type_spec.rb
@@ -21,8 +21,7 @@ RSpec.describe GitlabSchema.types['Time'] do
       .to raise_error(GraphQL::CoercionError)
   end
 
-  it 'rejects nil' do
-    expect { described_class.coerce_isolated_input(nil) }
-      .to raise_error(GraphQL::CoercionError)
+  it 'allows nil' do
+    expect(described_class.coerce_isolated_input(nil)).to be_nil
   end
 end
diff --git a/spec/graphql/types/work_items/widget_interface_spec.rb b/spec/graphql/types/work_items/widget_interface_spec.rb
index 63d7782df28..6cb9ff65a4f 100644
--- a/spec/graphql/types/work_items/widget_interface_spec.rb
+++ b/spec/graphql/types/work_items/widget_interface_spec.rb
@@ -21,9 +21,8 @@ RSpec.describe Types::WorkItems::WidgetInterface do
     it 'raises an error for an unknown type' do
       project = build(:project)
 
-      expect_graphql_error_to_be_created("Unknown GraphQL type for widget #{project}") do
-        described_class.resolve_type(project, {})
-      end
+      expect { described_class.resolve_type(project, {}) }
+        .to raise_error("Unknown GraphQL type for widget #{project}")
     end
   end
 end
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index 64d596595bb..a58fe9a6cd9 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -302,7 +302,7 @@ RSpec.describe IssuesHelper do
         is_anonymous_search_disabled: 'true',
         is_issue_repositioning_disabled: 'true',
         is_project: 'true',
-        is_public_visibility_restricted: 'false',
+        is_public_visibility_restricted: Gitlab::CurrentSettings.restricted_visibility_levels ? 'false' : '',
         is_signed_in: current_user.present?.to_s,
         jira_integration_path: help_page_url('integration/jira/issues', anchor: 'view-jira-issues'),
         markdown_help_path: help_page_path('user/markdown'),
@@ -337,6 +337,16 @@ RSpec.describe IssuesHelper do
         let(:current_user) { nil }
       end
     end
+
+    context 'when restricted visibility levels is nil' do
+      before do
+        allow(Gitlab::CurrentSettings).to receive(:restricted_visibility_levels).and_return(nil)
+      end
+
+      it_behaves_like 'issues list data' do
+        let(:current_user) { double.as_null_object }
+      end
+    end
   end
 
   describe '#group_issues_list_data' do
diff --git a/spec/lib/gitlab/graphql/markdown_field_spec.rb b/spec/lib/gitlab/graphql/markdown_field_spec.rb
index a73eba1e9db..4d38941a618 100644
--- a/spec/lib/gitlab/graphql/markdown_field_spec.rb
+++ b/spec/lib/gitlab/graphql/markdown_field_spec.rb
@@ -22,13 +22,6 @@ RSpec.describe Gitlab::Graphql::MarkdownField do
         expect { class_with_markdown_field(:test_html, null: true, resolver: 'not really') }
           .to raise_error(expected_error)
       end
-
-      # TODO: remove as part of https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27536
-      # so that until that time, the developer check is there
-      it 'raises when passing a resolve block' do
-        expect { class_with_markdown_field(:test_html, null: true, resolve: -> (_, _, _) { 'not really' } ) }
-          .to raise_error(expected_error)
-      end
     end
 
     context 'resolving markdown' do
diff --git a/spec/lib/gitlab/graphql/negatable_arguments_spec.rb b/spec/lib/gitlab/graphql/negatable_arguments_spec.rb
index 71ef75836c0..04ee1c1b820 100644
--- a/spec/lib/gitlab/graphql/negatable_arguments_spec.rb
+++ b/spec/lib/gitlab/graphql/negatable_arguments_spec.rb
@@ -25,7 +25,9 @@ RSpec.describe Gitlab::Graphql::NegatableArguments do
       expect(test_resolver.arguments['not'].type.arguments.keys).to match_array(['foo'])
     end
 
-    it 'defines all arguments passed as block even if called multiple times' do
+    # TODO: suffers from the `DuplicateNamesError` error. skip until we upgrade
+    # to the graphql 2.0 gem https://gitlab.com/gitlab-org/gitlab/-/issues/363131
+    xit 'defines all arguments passed as block even if called multiple times' do
       test_resolver.negated do
         argument :foo, GraphQL::Types::String, required: false
       end
diff --git a/spec/lib/gitlab/graphql/present/field_extension_spec.rb b/spec/lib/gitlab/graphql/present/field_extension_spec.rb
index 5f0f444e0bb..49992d7b71f 100644
--- a/spec/lib/gitlab/graphql/present/field_extension_spec.rb
+++ b/spec/lib/gitlab/graphql/present/field_extension_spec.rb
@@ -143,23 +143,6 @@ RSpec.describe Gitlab::Graphql::Present::FieldExtension do
       it_behaves_like 'calling the presenter method'
     end
 
-    # This is exercised here using an explicit `resolve:` proc, but
-    # @resolver_proc values are used in field instrumentation as well.
-    context 'when the field uses a resolve proc' do
-      let(:presenter) { base_presenter }
-      let(:field) do
-        ::Types::BaseField.new(
-          name: field_name,
-          type: GraphQL::Types::String,
-          null: true,
-          owner: owner,
-          resolve: ->(obj, args, ctx) { 'Hello from a proc' }
-        )
-      end
-
-      specify { expect(resolve_value).to eq 'Hello from a proc' }
-    end
-
     context 'when the presenter provides a new method' do
       def presenter
         Class.new(base_presenter) do
diff --git a/spec/lib/gitlab/graphql/query_analyzers/ast/logger_analyzer_spec.rb b/spec/lib/gitlab/graphql/query_analyzers/ast/logger_analyzer_spec.rb
new file mode 100644
index 00000000000..a5274d49fdb
--- /dev/null
+++ b/spec/lib/gitlab/graphql/query_analyzers/ast/logger_analyzer_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Graphql::QueryAnalyzers::AST::LoggerAnalyzer do
+  let(:query) { GraphQL::Query.new(GitlabSchema, document: document, context: {}, variables: { body: 'some note' }) }
+  let(:document) do
+    GraphQL.parse <<-GRAPHQL
+      mutation createNote($body: String!) {
+        createNote(input: {noteableId: "gid://gitlab/Noteable/1", body: $body}) {
+          note {
+            id
+          }
+        }
+      }
+    GRAPHQL
+  end
+
+  describe '#result' do
+    let(:monotonic_time_before) { 42 }
+    let(:monotonic_time_after) { 500 }
+    let(:monotonic_time_duration) { monotonic_time_after - monotonic_time_before }
+
+    before do
+      RequestStore.store[:graphql_logs] = nil
+
+      allow(Gitlab::Metrics::System).to receive(:monotonic_time)
+        .and_return(monotonic_time_before, monotonic_time_before,
+                    monotonic_time_before, monotonic_time_before,
+                    monotonic_time_after)
+    end
+
+    it 'returns the complexity, depth, duration, etc' do
+      results = GraphQL::Analysis::AST.analyze_query(query, [described_class], multiplex_analyzers: [])
+      result = results.first
+
+      expect(result[:duration_s]).to eq monotonic_time_duration
+      expect(result[:depth]).to eq 3
+      expect(result[:complexity]).to eq 3
+      expect(result[:used_fields]).to eq ['Note.id', 'CreateNotePayload.note', 'Mutation.createNote']
+      expect(result[:used_deprecated_fields]).to eq []
+
+      request = result.except(:duration_s).merge({
+        operation_name: 'createNote',
+        variables: { body: "[FILTERED]" }.to_s
+      })
+
+      expect(RequestStore.store[:graphql_logs]).to match([request])
+    end
+  end
+end
diff --git a/spec/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer_spec.rb b/spec/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer_spec.rb
new file mode 100644
index 00000000000..997fb129f42
--- /dev/null
+++ b/spec/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Graphql::QueryAnalyzers::AST::RecursionAnalyzer do
+  let(:query) { GraphQL::Query.new(GitlabSchema, document: document, context: {}, variables: { body: 'some note' }) }
+
+  context 'when recursion threshold not exceeded' do
+    let(:document) do
+      GraphQL.parse <<-GRAPHQL
+          query recurse {
+            group(fullPath: "h5bp") {
+              projects {
+                nodes {
+                  name
+                  group {
+                    projects {
+                      nodes {
+                        name
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+      GRAPHQL
+    end
+
+    it 'returns the complexity, depth, duration, etc' do
+      result = GraphQL::Analysis::AST.analyze_query(query, [described_class], multiplex_analyzers: [])
+
+      expect(result.first).to be_nil
+    end
+  end
+
+  context 'when recursion threshold exceeded' do
+    let(:document) do
+      GraphQL.parse <<-GRAPHQL
+          query recurse {
+            group(fullPath: "h5bp") {
+              projects {
+                nodes {
+                  name
+                  group {
+                    projects {
+                      nodes {
+                        name
+                        group {
+                          projects {
+                            nodes {
+                              name
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+      GRAPHQL
+    end
+
+    it 'returns error' do
+      result = GraphQL::Analysis::AST.analyze_query(query, [described_class], multiplex_analyzers: [])
+
+      expect(result.first.is_a?(GraphQL::AnalysisError)).to be_truthy
+    end
+  end
+end
diff --git a/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb b/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
deleted file mode 100644
index dee8f9e3c64..00000000000
--- a/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer do
-  let(:initial_value) { analyzer.initial_value(query) }
-  let(:analyzer) { described_class.new }
-  let(:query) { GraphQL::Query.new(GitlabSchema, document: document, context: {}, variables: { body: "some note" }) }
-  let(:document) do
-    GraphQL.parse <<-GRAPHQL
-      mutation createNote($body: String!) {
-        createNote(input: {noteableId: "1", body: $body}) {
-          note {
-            id
-          }
-        }
-      }
-    GRAPHQL
-  end
-
-  describe '#final_value' do
-    let(:monotonic_time_before) { 42 }
-    let(:monotonic_time_after) { 500 }
-    let(:monotonic_time_duration) { monotonic_time_after - monotonic_time_before }
-    let(:memo) { initial_value }
-
-    subject(:final_value) { analyzer.final_value(memo) }
-
-    before do
-      RequestStore.store[:graphql_logs] = nil
-
-      allow(GraphQL::Analysis).to receive(:analyze_query).and_return([4, 2, [[], []]])
-      allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after)
-      allow(Gitlab::GraphqlLogger).to receive(:info)
-    end
-
-    it 'inserts duration in seconds to memo and sets request store' do
-      expect { final_value }.to change { memo[:duration_s] }.to(monotonic_time_duration)
-                            .and change { RequestStore.store[:graphql_logs] }.to([{
-                              complexity: 4,
-                              depth: 2,
-                              operation_name: query.operation_name,
-                              used_deprecated_fields: [],
-                              used_fields: [],
-                              variables: { body: "[FILTERED]" }.to_s
-                            }])
-    end
-  end
-end
diff --git a/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb b/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb
index 5bc077a963e..20792fb4554 100644
--- a/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb
+++ b/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Graphql::Tracers::LoggerTracer do
       use Gitlab::Graphql::Tracers::LoggerTracer
       use Gitlab::Graphql::Tracers::TimerTracer
 
-      query_analyzer Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer.new
+      query_analyzer Gitlab::Graphql::QueryAnalyzers::AST::LoggerAnalyzer
 
       query Graphql::FakeQueryType
     end
@@ -20,11 +20,11 @@ RSpec.describe Gitlab::Graphql::Tracers::LoggerTracer do
     end
   end
 
-  it "logs every query", :aggregate_failures do
+  it "logs every query", :aggregate_failures, :unlimited_max_formatted_output_length do
     variables = { name: "Ada Lovelace" }
     query_string = 'query fooOperation($name: String) { helloWorld(message: $name) }'
 
-    # Build an actual query so we don't have to hardocde the "fingerprint" calculations
+    # Build an actual query so we don't have to hardcode the "fingerprint" calculations
     query = GraphQL::Query.new(dummy_schema, query_string, variables: variables)
 
     expect(::Gitlab::GraphqlLogger).to receive(:info).with({
diff --git a/spec/requests/api/graphql/ci/runners_spec.rb b/spec/requests/api/graphql/ci/runners_spec.rb
index d3e94671724..db611200084 100644
--- a/spec/requests/api/graphql/ci/runners_spec.rb
+++ b/spec/requests/api/graphql/ci/runners_spec.rb
@@ -123,3 +123,47 @@ RSpec.describe 'Query.runners' do
     end
   end
 end
+
+RSpec.describe 'Group.runners' do
+  include GraphqlHelpers
+
+  let_it_be(:group) { create(:group) }
+  let_it_be(:group_owner) { create_default(:user) }
+
+  before do
+    group.add_owner(group_owner)
+  end
+
+  describe 'edges' do
+    let_it_be(:runner) do
+      create(:ci_runner, :group, active: false, version: 'def', revision: '456',
+             description: 'Project runner', groups: [group], ip_address: '127.0.0.1')
+    end
+
+    let(:query) do
+      %(
+        query($path: ID!) {
+          group(fullPath: $path) {
+            runners {
+              edges {
+                webUrl
+                editUrl
+                node { #{all_graphql_fields_for('CiRunner')} }
+              }
+            }
+          }
+        }
+      )
+    end
+
+    it 'contains custom edge information' do
+      r = GitlabSchema.execute(query,
+                               context: { current_user: group_owner },
+                               variables: { path: group.full_path })
+
+      edges = graphql_dig_at(r.to_h, :data, :group, :runners, :edges)
+
+      expect(edges).to contain_exactly(a_graphql_entity_for(web_url: be_present, edit_url: be_present))
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/gitlab_schema_spec.rb b/spec/requests/api/graphql/gitlab_schema_spec.rb
index e80f5e0e0ff..c1beadb6c45 100644
--- a/spec/requests/api/graphql/gitlab_schema_spec.rb
+++ b/spec/requests/api/graphql/gitlab_schema_spec.rb
@@ -190,7 +190,7 @@ RSpec.describe 'GitlabSchema configurations' do
     let(:query) { File.read(Rails.root.join('spec/fixtures/api/graphql/introspection.graphql')) }
 
     it 'logs the query complexity and depth' do
-      expect_any_instance_of(Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer).to receive(:duration).and_return(7)
+      expect_any_instance_of(Gitlab::Graphql::QueryAnalyzers::AST::LoggerAnalyzer).to receive(:duration).and_return(7)
 
       expect(Gitlab::GraphqlLogger).to receive(:info).with(
         hash_including(
diff --git a/spec/requests/api/graphql/mutations/container_repository/destroy_tags_spec.rb b/spec/requests/api/graphql/mutations/container_repository/destroy_tags_spec.rb
index decb2e7bccc..ef00f45ef18 100644
--- a/spec/requests/api/graphql/mutations/container_repository/destroy_tags_spec.rb
+++ b/spec/requests/api/graphql/mutations/container_repository/destroy_tags_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe 'Destroying a container repository tags' do
       it 'returns too many tags error' do
         expect { subject }.not_to change { ::Packages::Event.count }
 
-        explanation = graphql_errors.dig(0, 'extensions', 'problems', 0, 'explanation')
+        explanation = graphql_errors.dig(0, 'message')
         expect(explanation).to eq(Mutations::ContainerRepositories::DestroyTags::TOO_MANY_TAGS_ERROR_MESSAGE)
       end
     end
diff --git a/spec/requests/api/graphql/mutations/design_management/delete_spec.rb b/spec/requests/api/graphql/mutations/design_management/delete_spec.rb
index 1f43f113e65..e2ab08b301b 100644
--- a/spec/requests/api/graphql/mutations/design_management/delete_spec.rb
+++ b/spec/requests/api/graphql/mutations/design_management/delete_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe "deleting designs" do
   context 'the designs list is empty' do
     it_behaves_like 'a failed request' do
       let(:designs) { [] }
-      let(:the_error) { a_string_matching %r/was provided invalid value/ }
+      let(:the_error) { a_string_matching %r/no filenames/ }
     end
   end
 
diff --git a/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/create_spec.rb b/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/create_spec.rb
index 5bc3c68cf26..9ef443af76a 100644
--- a/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/create_spec.rb
@@ -76,7 +76,6 @@ RSpec.describe Mutations::Metrics::Dashboard::Annotations::Create do
       context 'when environment_id is missing' do
         let(:mutation) do
           variables = {
-            environment_id: nil,
             starting_at: starting_at,
             ending_at: ending_at,
             dashboard_path: dashboard_path,
@@ -147,7 +146,6 @@ RSpec.describe Mutations::Metrics::Dashboard::Annotations::Create do
       context 'when cluster_id is missing' do
         let(:mutation) do
           variables = {
-            cluster_id: nil,
             starting_at: starting_at,
             ending_at: ending_at,
             dashboard_path: dashboard_path,
diff --git a/spec/requests/api/graphql/mutations/notes/reposition_image_diff_note_spec.rb b/spec/requests/api/graphql/mutations/notes/reposition_image_diff_note_spec.rb
index 0f7ccac3179..c4674155aa0 100644
--- a/spec/requests/api/graphql/mutations/notes/reposition_image_diff_note_spec.rb
+++ b/spec/requests/api/graphql/mutations/notes/reposition_image_diff_note_spec.rb
@@ -68,15 +68,7 @@ RSpec.describe 'Repositioning an ImageDiffNote' do
     let(:new_position) { { x: nil } }
 
     it_behaves_like 'a mutation that returns top-level errors' do
-      let(:match_errors) { include(/RepositionImageDiffNoteInput! was provided invalid value/) }
-    end
-
-    it 'contains an explanation for the error' do
-      post_graphql_mutation(mutation, current_user: current_user)
-
-      explanation = graphql_errors.first['extensions']['problems'].first['explanation']
-
-      expect(explanation).to eq('At least one property of `UpdateDiffImagePositionInput` must be set')
+      let(:match_errors) { include(/At least one property of `UpdateDiffImagePositionInput` must be set/) }
     end
   end
 end
diff --git a/spec/requests/api/graphql_spec.rb b/spec/requests/api/graphql_spec.rb
index 3bd59450d49..d94257c61eb 100644
--- a/spec/requests/api/graphql_spec.rb
+++ b/spec/requests/api/graphql_spec.rb
@@ -67,10 +67,10 @@ RSpec.describe 'GraphQL' do
 
     context 'when there is an error in the logger' do
       before do
-        logger_analyzer = GitlabSchema.query_analyzers.find do |qa|
-          qa.is_a? Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer
-        end
-        allow(logger_analyzer).to receive(:process_variables)
+        allow(GraphQL::Analysis::AST).to receive(:analyze_query)
+          .and_call_original
+        allow(GraphQL::Analysis::AST).to receive(:analyze_query)
+          .with(anything, Gitlab::Graphql::QueryAnalyzers::AST::LoggerAnalyzer::ALL_ANALYZERS, anything)
           .and_raise(StandardError.new("oh noes!"))
       end
 
diff --git a/spec/support/graphql/field_inspection.rb b/spec/support/graphql/field_inspection.rb
index e5fe37ec555..8730f82b893 100644
--- a/spec/support/graphql/field_inspection.rb
+++ b/spec/support/graphql/field_inspection.rb
@@ -20,7 +20,7 @@ module Graphql
 
     def type
       @type ||= begin
-        field_type = @field.type.respond_to?(:to_graphql) ? @field.type.to_graphql : @field.type
+        field_type = @field.type
 
         # The type could be nested. For example `[GraphQL::Types::String]`:
         # - List
diff --git a/spec/support/graphql/field_selection.rb b/spec/support/graphql/field_selection.rb
index 00323c46d69..432340cfdb5 100644
--- a/spec/support/graphql/field_selection.rb
+++ b/spec/support/graphql/field_selection.rb
@@ -46,7 +46,7 @@ module Graphql
 
     NO_SKIP = ->(_name, _field) { false }
 
-    def self.select_fields(type, skip = NO_SKIP, parent_types = Set.new, max_depth = 3)
+    def self.select_fields(type, skip = NO_SKIP, max_depth = 3)
       return new if max_depth <= 0 || !type.kind.fields?
 
       new(type.fields.flat_map do |name, field|
@@ -55,12 +55,8 @@ module Graphql
         inspected = ::Graphql::FieldInspection.new(field)
         singular_field_type = inspected.type
 
-        # If field type is the same as parent type, then we're hitting into
-        # mutual dependency. Break it from infinite recursion
-        next [] if parent_types.include?(singular_field_type)
-
         if inspected.nested_fields?
-          subselection = select_fields(singular_field_type, skip, parent_types | [type], max_depth - 1)
+          subselection = select_fields(singular_field_type, skip, max_depth - 1)
           next [] if subselection.empty?
 
           [[name, subselection.to_h]]
diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb
index 7aaf11498cf..6cdd8a9446e 100644
--- a/spec/support/helpers/graphql_helpers.rb
+++ b/spec/support/helpers/graphql_helpers.rb
@@ -26,10 +26,44 @@ module GraphqlHelpers
     end
   end
 
+  # Some arguments use `as:` to expose a different name internally.
+  # Transform the args to use those names
+  def self.deep_transform_args(args, field)
+    args.to_h do |k, v|
+      argument = field.arguments[k.to_s.camelize(:lower)]
+      [argument.keyword, v.is_a?(Hash) ? deep_transform_args(v, argument.type) : v]
+    end
+  end
+
+  # Convert incoming args into the form usually passed in from the client,
+  # all strings, etc.
+  def self.as_graphql_argument_literals(args)
+    args.transform_values { |value| transform_arg_value(value) }
+  end
+
+  def self.transform_arg_value(value)
+    case value
+    when Hash
+      as_graphql_argument_literals(value)
+    when Array
+      value.map { |x| transform_arg_value(x) }
+    when Time, ActiveSupport::TimeWithZone
+      value.strftime("%F %T.%N %z")
+    when Date, GlobalID, Symbol
+      value.to_s
+    else
+      value
+    end
+  end
+
   # Run this resolver exactly as it would be called in the framework. This
   # includes all authorization hooks, all argument processing and all result
   # wrapping.
   # see: GraphqlHelpers#resolve_field
+  #
+  # TODO: this is too coupled to gem internals, making upgrades incredibly
+  #       painful, and bypasses much of the validation of the framework.
+  #       See https://gitlab.com/gitlab-org/gitlab/-/issues/363121
   def resolve(
     resolver_class, # [Class[<= BaseResolver]] The resolver at test.
     obj: nil, # [Any] The BaseObject#object for the resolver (available as `#object` in the resolver).
@@ -37,7 +71,8 @@ module GraphqlHelpers
     ctx: {},  # [#to_h] The current context values.
     schema: GitlabSchema, # [GraphQL::Schema] Schema to use during execution.
     parent: :not_given, # A GraphQL query node to be passed as the `:parent` extra.
-    lookahead: :not_given # A GraphQL lookahead object to be passed as the `:lookahead` extra.
+    lookahead: :not_given, # A GraphQL lookahead object to be passed as the `:lookahead` extra.
+    arg_style: :internal # Args are in internal format, rather than client/external format
   )
     # All resolution goes through fields, so we need to create one here that
     # uses our resolver. Thankfully, apart from the field name, resolvers
@@ -49,7 +84,6 @@ module GraphqlHelpers
     field = ::Types::BaseField.new(**field_options)
 
     # All mutations accept a single `:input` argument. Wrap arguments here.
-    # See the unwrapping below in GraphqlHelpers#resolve_field
     args = { input: args } if resolver_class <= ::Mutations::BaseMutation && !args.key?(:input)
 
     resolve_field(field, obj,
@@ -57,7 +91,8 @@ module GraphqlHelpers
                   ctx: ctx,
                   schema: schema,
                   object_type: resolver_parent,
-                  extras: { parent: parent, lookahead: lookahead })
+                  extras: { parent: parent, lookahead: lookahead },
+                  arg_style: arg_style)
   end
 
   # Resolve the value of a field on an object.
@@ -85,21 +120,22 @@ module GraphqlHelpers
   # NB: Arguments are passed from the client's perspective. If there is an argument
   # `foo` aliased as `bar`, then we would pass `args: { bar: the_value }`, and
   # types are checked before resolution.
+  # rubocop:disable Metrics/ParameterLists
   def resolve_field(
-    field,                       # An instance of `BaseField`, or the name of a field on the current described_class
-    object,                      # The current object of the `BaseObject` this field 'belongs' to
-    args:   {},                  # Field arguments (keys will be fieldnamerized)
-    ctx:    {},                  # Context values (important ones are :current_user)
-    extras: {},                  # Stub values for field extras (parent and lookahead)
-    current_user: :not_given,    # The current user (specified explicitly, overrides ctx[:current_user])
-    schema: GitlabSchema,        # A specific schema instance
-    object_type: described_class # The `BaseObject` type this field belongs to
+    field,                        # An instance of `BaseField`, or the name of a field on the current described_class
+    object,                       # The current object of the `BaseObject` this field 'belongs' to
+    args:   {},                   # Field arguments (keys will be fieldnamerized)
+    ctx:    {},                   # Context values (important ones are :current_user)
+    extras: {},                   # Stub values for field extras (parent and lookahead)
+    current_user: :not_given,     # The current user (specified explicitly, overrides ctx[:current_user])
+    schema: GitlabSchema,         # A specific schema instance
+    object_type: described_class, # The `BaseObject` type this field belongs to
+    arg_style: :internal          # Args are in internal format, rather than client/external format
   )
     field = to_base_field(field, object_type)
     ctx[:current_user] = current_user unless current_user == :not_given
     query = GraphQL::Query.new(schema, context: ctx.to_h)
     extras[:lookahead] = negative_lookahead if extras[:lookahead] == :not_given && field.extras.include?(:lookahead)
-
     query_ctx = query.context
 
     mock_extras(query_ctx, **extras)
@@ -107,30 +143,62 @@ module GraphqlHelpers
     parent = object_type.authorized_new(object, query_ctx)
     raise UnauthorizedObject unless parent
 
-    # TODO: This will need to change when we move to the interpreter:
-    # At that point, arguments will be a plain ruby hash rather than
-    # an Arguments object
-    # see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27536
-    #      https://gitlab.com/gitlab-org/gitlab/-/issues/210556
-    arguments = field.to_graphql.arguments_class.new(
-      GraphqlHelpers.deep_fieldnamerize(args),
-      context: query_ctx,
-      defaults_used: []
-    )
+    # mutations already working with :internal_prepared
+    arg_style = :internal_prepared if args[:input] && arg_style == :internal
 
     # we enable the request store so we can track gitaly calls.
     ::Gitlab::WithRequestStore.with_request_store do
-      # TODO: This will need to change when we move to the interpreter - at that
-      # point we will call `field#resolve`
+      prepared_args = case arg_style
+                      when :internal_prepared
+                        args_internal_prepared(field, args: args, query_ctx: query_ctx, parent: parent, extras: extras, query: query)
+                      else
+                        args_internal(field, args: args, query_ctx: query_ctx, parent: parent, extras: extras, query: query)
+                      end
 
-      # Unwrap the arguments to mutations. This pairs with the wrapping in GraphqlHelpers#resolve
-      # If arguments are not wrapped first, then arguments processing will raise.
-      # If arguments are not unwrapped here, then the resolve method of the mutation will raise argument errors.
-      arguments = arguments.to_kwargs[:input] if field.resolver && field.resolver <= ::Mutations::BaseMutation
-
-      field.resolve_field(parent, arguments, query_ctx)
+      if prepared_args.class <= Gitlab::Graphql::Errors::BaseError
+        prepared_args
+      else
+        field.resolve(parent, prepared_args, query_ctx)
+      end
     end
   end
+  # rubocop:enable Metrics/ParameterLists
+
+  # Pros:
+  #   - Most arguments we use in specs, which are already in an "internal" state, work
+  #
+  # Cons:
+  #   - the `prepare` method of a type is not called.  Whether as a proc or as a method
+  #     on the type, it's not called. For example `:cluster_id` in ee/app/graphql/resolvers/vulnerabilities_resolver.rb,
+  #     or `prepare` in app/graphql/types/range_input_type.rb, used by Types::TimeframeInputType
+  def args_internal(field, args:, query_ctx:, parent:, extras:, query:)
+    arguments = GraphqlHelpers.deep_transform_args(args, field)
+    arguments.merge!(extras.reject {|k, v| v == :not_given})
+  end
+
+  # Pros:
+  #   - Allows the use of ruby types, without having to pass in strings
+  #   - All args are converted into strings just like if it was called from a client,
+  #     so stronger arg verification
+  #
+  # Cons:
+  #   - Some values, such as enums, would need to be changed in the specs to use the
+  #     external values, because there is no easy way to handle them.
+  #
+  # take internal style args, and force them into client style args
+  def args_internal_prepared(field, args:, query_ctx:, parent:, extras:, query:)
+    arguments = GraphqlHelpers.as_graphql_argument_literals(args)
+    arguments.merge!(extras.reject {|k, v| v == :not_given})
+
+    # Use public API to properly prepare the args for use by the resolver.
+    # It uses `coerce_arguments` under the covers
+    prepared_args = nil
+    query.arguments_cache.dataload_for(GraphqlHelpers.deep_fieldnamerize(arguments), field, parent) do |kwarg_arguments|
+      prepared_args = kwarg_arguments
+    end
+
+    prepared_args.respond_to?(:keyword_arguments) ? prepared_args.keyword_arguments : prepared_args
+  end
 
   def mock_extras(context, parent: :not_given, lookahead: :not_given)
     allow(context).to receive(:parent).and_return(parent) unless parent == :not_given
@@ -148,7 +216,7 @@ module GraphqlHelpers
 
   def resolver_instance(resolver_class, obj: nil, ctx: {}, field: nil, schema: GitlabSchema, subscription_update: false)
     if ctx.is_a?(Hash)
-      q = double('Query', schema: schema, subscription_update?: subscription_update)
+      q = double('Query', schema: schema, subscription_update?: subscription_update, warden: GraphQL::Schema::Warden::PassThruWarden)
       ctx = GraphQL::Query::Context.new(query: q, object: obj, values: ctx)
     end
 
@@ -358,7 +426,7 @@ module GraphqlHelpers
   end
 
   def query_double(schema:)
-    double('query', schema: schema)
+    double('query', schema: schema, warden: GraphQL::Schema::Warden::PassThruWarden)
   end
 
   def wrap_fields(fields)
@@ -380,7 +448,7 @@ module GraphqlHelpers
     FIELDS
   end
 
-  def all_graphql_fields_for(class_name, parent_types = Set.new, max_depth: 3, excluded: [])
+  def all_graphql_fields_for(class_name, max_depth: 3, excluded: [])
     # pulling _all_ fields can generate a _huge_ query (like complexity 180,000),
     # and significantly increase spec runtime. so limit the depth by default
     return if max_depth <= 0
@@ -397,7 +465,7 @@ module GraphqlHelpers
     # We can't guess arguments, so skip fields that require them
     skip = ->(name, field) { excluded.include?(name) || required_arguments?(field) }
 
-    ::Graphql::FieldSelection.select_fields(type, skip, parent_types, max_depth)
+    ::Graphql::FieldSelection.select_fields(type, skip, max_depth)
   end
 
   def with_signature(variables, query)
@@ -569,8 +637,11 @@ module GraphqlHelpers
 
   # Helps migrate to the new GraphQL interpreter,
   # https://gitlab.com/gitlab-org/gitlab/-/issues/210556
-  def expect_graphql_error_to_be_created(error_class, match_message = nil)
-    expect { yield }.to raise_error(error_class, match_message)
+  def expect_graphql_error_to_be_created(error_class, match_message = '')
+    resolved = yield
+
+    expect(resolved).to be_instance_of(error_class)
+    expect(resolved.message).to match(match_message)
   end
 
   def flattened_errors
@@ -644,7 +715,7 @@ module GraphqlHelpers
   end
 
   def allow_high_graphql_recursion
-    allow_any_instance_of(Gitlab::Graphql::QueryAnalyzers::RecursionAnalyzer).to receive(:recursion_threshold).and_return 1000
+    allow_any_instance_of(Gitlab::Graphql::QueryAnalyzers::AST::RecursionAnalyzer).to receive(:recursion_threshold).and_return 1000
   end
 
   def allow_high_graphql_transaction_threshold
@@ -717,7 +788,6 @@ module GraphqlHelpers
 
   def empty_schema
     Class.new(GraphQL::Schema) do
-      use GraphQL::Pagination::Connections
       use Gitlab::Graphql::Pagination::Connections
       use BatchLoader::GraphQL
 
@@ -817,7 +887,3 @@ module GraphqlHelpers
     object_type.fields[name] || (raise ArgumentError, "Unknown field #{name} for #{described_class.graphql_name}")
   end
 end
-
-# This warms our schema, doing this as part of loading the helpers to avoid
-# duplicate loading error when Rails tries autoload the types.
-GitlabSchema.graphql_definition