From 517b5d6e032bad7ed2b70113749f948c435c2591 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 12 Nov 2024 21:28:41 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../layout/line_continuation_spacing.yml      |   1 -
 .rubocop_todo/rspec/feature_category.yml      |   1 -
 .../javascripts/ci/common/pipelines_table.vue |   6 -
 .../components/pipelines_table_wrapper.vue    |   2 -
 .../ci/pipeline_details/utils/index.js        |   4 +
 .../header/pipeline_editor_mini_graph.vue     |   3 +-
 .../pipeline_mini_graph/job_action_button.vue |   1 +
 .../ci/pipeline_mini_graph/job_item.vue       |   3 +-
 .../legacy_pipeline_mini_graph.vue            |  43 ++--
 .../pipeline_mini_graph.vue                   |   2 +-
 .../ci/pipeline_mini_graph/pipeline_stage.vue |  15 +-
 .../pipeline_mini_graph/pipeline_stages.vue   |  13 +-
 .../pipeline_failed_jobs_widget.vue           |   4 +-
 .../ci/pipelines_page/pipelines.vue           |   1 -
 .../legacy_pipelines_table_wrapper.vue        |   1 -
 .../javascripts/graphql_shared/constants.js   |   5 +-
 .../extensions_marketplace_warning.vue        |   2 +-
 .../components/integration_view.vue           |   7 +-
 .../components/profile_preferences.vue        |   1 +
 .../projects/commit_box/info/utils.js         |   1 +
 .../releases/components/expand_button.vue     |   6 +-
 .../repository/components/commit_info.vue     |   2 +-
 .../reviewers/uncollapsed_reviewer_list.vue   |   2 +-
 .../todos/components/todos_app.vue            |   7 +-
 .../groups_and_projects_listbox.vue           | 115 ----------
 .../components/inbound_token_access.vue       |  53 +++--
 .../components/logs_viewer/logs_top_bar.vue   |   2 +-
 app/assets/stylesheets/framework/top_bar.scss |   5 +
 app/assets/stylesheets/pages/commits.scss     |  24 --
 app/assets/stylesheets/utilities.scss         |   5 -
 app/helpers/preferences_helper.rb             |  22 +-
 app/models/integrations/asana.rb              |   6 +-
 app/serializers/stage_entity.rb               |   2 +
 .../ci/job_token_scope/add_group_service.rb   |   2 +-
 .../ci/job_token_scope/add_project_service.rb |   2 +-
 .../job_token_scope/edit_scope_validations.rb |   2 +-
 app/services/uploads/destroy_service.rb       |   2 +-
 .../_collapsed_inline_list.html.haml          |   4 +-
 app/views/projects/commits/_commit.html.haml  |   2 +-
 .../17-4-secure-container-registries.yml      |   1 +
 ...kfill_operations_strategies_project_id.yml |   2 +-
 ...ckfill_operations_strategies_project_id.rb |  21 ++
 db/schema_migrations/20241108232843           |   1 +
 .../replication/selective_synchronization.md  |   4 +-
 doc/api/notes.md                              |  15 +-
 doc/ci/jobs/ci_job_token.md                   |   3 +-
 doc/development/advanced_search.md            |   5 +-
 .../advanced_search_migration_styleguide.md   |  12 +-
 .../execution_context_selection.md            |  66 +++---
 .../testing_guide/end_to_end/index.md         | 217 ++++++++----------
 .../end_to_end/test_pipelines.md              |   4 +-
 .../visual_studio_code/custom_queries.md      |   2 +-
 .../visual_studio_code/remote_urls.md         |   2 +-
 .../visual_studio_code/ssl.md                 |   2 +-
 .../visual_studio_code/troubleshooting.md     |   2 +-
 doc/user/profile/preferences.md               |   4 +
 doc/user/workspace/index.md                   |  11 +-
 .../lib/gitlab/backup/cli/shell/command.rb    |  24 +-
 .../lib/gitlab/backup/cli/shell/pipeline.rb   |  10 +-
 .../lib/gitlab/backup/cli/targets/database.rb |  91 ++------
 .../gitlab/backup/cli/shell/command_spec.rb   | 102 ++++++++
 .../gitlab/backup/cli/shell/pipeline_spec.rb  |  15 ++
 lib/gitlab/auth/atlassian/token_refresher.rb  |   2 +-
 locale/gitlab.pot                             |  38 ++-
 qa/qa/page/merge_request/show.rb              |   7 +-
 .../resource/project_imported_from_github.rb  |   5 +-
 .../import/import_large_github_repo_spec.rb   |   1 -
 .../merge_request_set_to_auto_merge_spec.rb   | 119 +++-------
 .../import/github_import_shared_context.rb    |   1 -
 .../projects/jobs_controller_spec.rb          |   2 +-
 .../projects/pipelines/pipelines_spec.rb      |   2 +-
 spec/fixtures/api/schemas/pipeline_stage.json |  39 +++-
 .../ci/common/pipelines_table_spec.js         |   6 +
 .../legacy_pipeline_mini_graph_spec.js        |   5 +-
 .../pipeline_stage_spec.js                    |   1 -
 .../ci/pipelines_page/pipelines_spec.js       |  77 -------
 .../legacy_pipelines_table_wrapper_spec.js    |   7 +-
 .../components/integration_view_spec.js       |   6 +
 .../__snapshots__/expand_button_spec.js.snap  |   8 +-
 .../uncollapsed_reviewer_list_spec.js         |  26 +++
 .../groups_and_projects_listbox_spec.js       | 101 --------
 .../token_access/inbound_token_access_spec.js |  82 +++----
 spec/frontend/token_access/mock_data.js       |   4 +-
 .../vue_merge_request_widget/mock_data.js     |   2 +
 spec/helpers/preferences_helper_spec.rb       |  41 ++--
 spec/models/integrations/asana_spec.rb        |  42 ++--
 spec/serializers/stage_entity_spec.rb         |   4 +
 .../job_token_scope/add_group_service_spec.rb |   2 +-
 .../add_project_service_spec.rb               |  13 ++
 89 files changed, 731 insertions(+), 909 deletions(-)
 delete mode 100644 app/assets/javascripts/token_access/components/groups_and_projects_listbox.vue
 create mode 100644 db/post_migrate/20241108232843_finalize_backfill_operations_strategies_project_id.rb
 create mode 100644 db/schema_migrations/20241108232843
 delete mode 100644 spec/frontend/token_access/groups_and_projects_listbox_spec.js

diff --git a/.rubocop_todo/layout/line_continuation_spacing.yml b/.rubocop_todo/layout/line_continuation_spacing.yml
index 7afbdc3321b..ddfa81c64c4 100644
--- a/.rubocop_todo/layout/line_continuation_spacing.yml
+++ b/.rubocop_todo/layout/line_continuation_spacing.yml
@@ -15,7 +15,6 @@ Layout/LineContinuationSpacing:
     - 'app/services/feature_flags/update_service.rb'
     - 'app/services/issues/build_service.rb'
     - 'app/services/merge_requests/merge_service.rb'
-    - 'app/services/uploads/destroy_service.rb'
     - 'app/services/users/email_verification/validate_token_service.rb'
     - 'ee/app/controllers/ee/ldap/omniauth_callbacks_controller.rb'
     - 'ee/app/graphql/mutations/requirements_management/export_requirements.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index f37c04501ef..aa29ebeece0 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -395,7 +395,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/helpers/markup_helper_spec.rb'
     - 'ee/spec/helpers/notes_helper_spec.rb'
     - 'ee/spec/helpers/path_locks_helper_spec.rb'
-    - 'ee/spec/helpers/preferences_helper_spec.rb'
     - 'ee/spec/helpers/prevent_forking_helper_spec.rb'
     - 'ee/spec/helpers/projects/on_demand_scans_helper_spec.rb'
     - 'ee/spec/helpers/projects/project_members_helper_spec.rb'
diff --git a/app/assets/javascripts/ci/common/pipelines_table.vue b/app/assets/javascripts/ci/common/pipelines_table.vue
index 021aa6cb0e6..fac1521f1d1 100644
--- a/app/assets/javascripts/ci/common/pipelines_table.vue
+++ b/app/assets/javascripts/ci/common/pipelines_table.vue
@@ -72,11 +72,6 @@ export default {
         return value === PIPELINE_IID_KEY || value === PIPELINE_ID_KEY;
       },
     },
-    updateGraphDropdown: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   computed: {
     isMobile() {
@@ -260,7 +255,6 @@ export default {
           :downstream-pipelines="getDownstreamPipelines(item)"
           :pipeline-path="item.path"
           :stages="getStages(item)"
-          :update-dropdown="updateGraphDropdown"
           :upstream-pipeline="item.triggered_by"
           @miniGraphStageClick="trackPipelineMiniGraph"
         />
diff --git a/app/assets/javascripts/ci/merge_requests/components/pipelines_table_wrapper.vue b/app/assets/javascripts/ci/merge_requests/components/pipelines_table_wrapper.vue
index 818c167c67f..76f4007023a 100644
--- a/app/assets/javascripts/ci/merge_requests/components/pipelines_table_wrapper.vue
+++ b/app/assets/javascripts/ci/merge_requests/components/pipelines_table_wrapper.vue
@@ -58,7 +58,6 @@ export default {
       page: 1,
       pageInfo: {},
       pipelines: [],
-      updateGraphDropdown: false,
     };
   },
   apollo: {
@@ -345,7 +344,6 @@ export default {
 
       <pipelines-table-component
         :pipelines="pipelines"
-        :update-graph-dropdown="updateGraphDropdown"
         :source-project-full-path="sourceProjectFullPath"
         @cancel-pipeline="cancelPipeline"
         @retry-pipeline="retryPipeline"
diff --git a/app/assets/javascripts/ci/pipeline_details/utils/index.js b/app/assets/javascripts/ci/pipeline_details/utils/index.js
index 9109342707e..650daf5f78a 100644
--- a/app/assets/javascripts/ci/pipeline_details/utils/index.js
+++ b/app/assets/javascripts/ci/pipeline_details/utils/index.js
@@ -145,3 +145,7 @@ export const graphqlEtagPipelinePath = (graphqlPath, pipelineId) => {
 export const graphqlEtagMergeRequestPipelines = (graphqlPath, mergeRequestId) => {
   return `${graphqlPath}merge_requests/id/${mergeRequestId}`;
 };
+
+export const graphqlEtagStagePath = (graphqlPath, stageId) => {
+  return `${graphqlPath}/stages/id/${stageId}`;
+};
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue
index 993820b854c..b7442f06391 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue
@@ -65,11 +65,12 @@ export default {
       }
 
       return stages.map(({ node }) => {
-        const { name, detailedStatus } = node;
+        const { id, detailedStatus, name } = node;
         return {
           // TODO: fetch dropdown_path from graphql when available
           // see https://gitlab.com/gitlab-org/gitlab/-/issues/342585
           dropdown_path: `${this.pipelinePath}/stage.json?stage=${name}`,
+          id,
           name,
           path: `${this.pipelinePath}#${name}`,
           status: {
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/job_action_button.vue b/app/assets/javascripts/ci/pipeline_mini_graph/job_action_button.vue
index cd3c88dac54..68eb79a07cf 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/job_action_button.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/job_action_button.vue
@@ -121,6 +121,7 @@ export default {
       :aria-label="jobAction.title"
       :disabled="isLoading"
       class="gl-h-6 gl-w-6 !gl-rounded-full !gl-p-0"
+      data-testid="ci-action-button"
       @click.prevent="onActionButtonClick"
     >
       <gl-loading-icon v-if="isLoading" size="sm" class="gl-m-2" />
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue b/app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue
index 19b741b9e50..802128e0997 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue
@@ -48,7 +48,7 @@ export default {
 };
 </script>
 <template>
-  <gl-disclosure-dropdown-item :item="item" class="ci-job-component">
+  <gl-disclosure-dropdown-item :item="item" class="ci-job-component" data-testid="job-item">
     <template #list-item>
       <div class="-gl-my-2 gl-flex gl-h-6">
         <job-name-component
@@ -57,6 +57,7 @@ export default {
           :title="tooltipText"
           :name="job.name"
           :status="status"
+          data-testid="job-name"
         />
         <job-action-button
           v-if="hasJobAction"
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue
index d5adb96c4d3..c7e36600d26 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue
@@ -1,19 +1,24 @@
 <script>
 import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
-import { TYPENAME_CI_PIPELINE } from '~/graphql_shared/constants';
+import { TYPENAME_CI_PIPELINE, TYPENAME_CI_STAGE } from '~/graphql_shared/constants';
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 import DownstreamPipelines from '../downstream_pipelines.vue';
-import LegacyPipelineStages from './legacy_pipeline_stages.vue';
+import PipelineStages from '../pipeline_stages.vue';
 /**
  * Renders the REST instance of the pipeline mini graph.
+ * Reformatting stages and downstream pipelines to match GraphQL structure.
+ * We do not want to change the GraphQL files since
+ * the REST version will soon be changed to GraphQL,
+ * so we are keeping this logic in the legacy file.
+ *
  */
 export default {
   components: {
     CiIcon,
     DownstreamPipelines,
     GlIcon,
-    LegacyPipelineStages,
+    PipelineStages,
   },
   arrowStyles: ['arrow-icon gl-inline-block gl-mx-1 gl-text-gray-500 !gl-align-middle'],
   directives: {
@@ -40,27 +45,18 @@ export default {
       required: true,
       default: () => [],
     },
-    updateDropdown: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     upstreamPipeline: {
       type: Object,
       required: false,
       default: () => {},
     },
   },
+  emits: ['miniGraphStageClick'],
   computed: {
     formattedDownstreamPipelines() {
-      /** Reformatting to match GraphQL structure.
-       * We do not want to change the GraphQL files since
-       * the REST version will soon be changed to GraphQL,
-       * so we are keeping this logic in the legacy file.
-       */
       return this.downstreamPipelines.map((p) => {
         return {
-          detailedStatus: p.details.status,
+          detailedStatus: p?.details?.status || p.detailedStatus,
           id: convertToGraphQLId(TYPENAME_CI_PIPELINE, p.id),
           path: p.path,
           project: {
@@ -70,6 +66,20 @@ export default {
         };
       });
     },
+    formattedStages() {
+      return this.stages.map((s) => {
+        const { id, name, status } = s;
+        return {
+          id: convertToGraphQLId(TYPENAME_CI_STAGE, id),
+          detailedStatus: {
+            icon: status.icon,
+            label: status.label,
+            tooltip: status.tooltip,
+          },
+          name,
+        };
+      });
+    },
     hasDownstreamPipelines() {
       return Boolean(this.downstreamPipelines.length);
     },
@@ -97,10 +107,9 @@ export default {
       name="arrow-right"
       data-testid="upstream-arrow-icon"
     />
-    <legacy-pipeline-stages
+    <pipeline-stages
       :is-merge-train="isMergeTrain"
-      :stages="stages"
-      :update-dropdown="updateDropdown"
+      :stages="formattedStages"
       @miniGraphStageClick="$emit('miniGraphStageClick')"
     />
     <gl-icon
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue
index 92809fb65a5..1d545751227 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue
@@ -53,6 +53,7 @@ export default {
       default: PIPELINE_MINI_GRAPH_POLL_INTERVAL,
     },
   },
+  emits: ['miniGraphStageClick'],
   data() {
     return {
       pipeline: {},
@@ -130,7 +131,6 @@ export default {
       />
       <pipeline-stages
         :is-merge-train="isMergeTrain"
-        :pipeline-etag="pipelineEtag"
         :stages="pipelineStages"
         @miniGraphStageClick="$emit('miniGraphStageClick')"
       />
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue
index 4ffe73c805a..d931943d241 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue
@@ -6,6 +6,8 @@ import { reportToSentry } from '~/ci/utils';
 import { PIPELINE_MINI_GRAPH_POLL_INTERVAL } from '~/ci/pipeline_details/constants';
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 import { getQueryHeaders, toggleQueryPollingByVisibility } from '~/ci/pipeline_details/graph/utils';
+import { graphqlEtagStagePath } from '~/ci/pipeline_details/utils';
+import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import getPipelineStageJobsQuery from './graphql/queries/get_pipeline_stage_jobs.query.graphql';
 import JobItem from './job_item.vue';
 
@@ -34,10 +36,6 @@ export default {
       required: false,
       default: false,
     },
-    pipelineEtag: {
-      type: String,
-      required: true,
-    },
     pollInterval: {
       type: Number,
       required: false,
@@ -48,6 +46,7 @@ export default {
       required: true,
     },
   },
+  emits: ['miniGraphStageClick'],
   data() {
     return {
       isDropdownOpen: false,
@@ -58,7 +57,7 @@ export default {
   apollo: {
     stageJobs: {
       context() {
-        return getQueryHeaders(this.pipelineEtag);
+        return getQueryHeaders(this.graphqlEtag);
       },
       query: getPipelineStageJobsQuery,
       variables() {
@@ -88,6 +87,9 @@ export default {
     dropdownTooltipTitle() {
       return this.isDropdownOpen ? '' : `${this.stage.name}: ${this.stage.detailedStatus.tooltip}`;
     },
+    graphqlEtag() {
+      return graphqlEtagStagePath('/api/graphql', getIdFromGraphQLId(this.stage.id));
+    },
     isLoading() {
       return this.$apollo.queries.stageJobs.loading;
     },
@@ -103,6 +105,9 @@ export default {
     onShowDropdown() {
       this.isDropdownOpen = true;
       this.isPolling = true;
+
+      // used for tracking in the pipeline table
+      this.$emit('miniGraphStageClick');
     },
     stageAriaLabel(title) {
       return sprintf(this.$options.i18n.viewStageLabel, { title });
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue
index ea397bdc680..9b5b5c864e0 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue
@@ -4,30 +4,22 @@ import PipelineStage from './pipeline_stage.vue';
  * Renders the pipeline stages portion of the pipeline mini graph.
  */
 export default {
+  name: 'PipelineStages',
   components: {
     PipelineStage,
   },
   props: {
-    updateDropdown: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     isMergeTrain: {
       type: Boolean,
       required: false,
       default: false,
     },
-    pipelineEtag: {
-      type: String,
-      required: false,
-      default: '',
-    },
     stages: {
       type: Array,
       required: true,
     },
   },
+  emits: ['miniGraphStageClick'],
 };
 </script>
 <template>
@@ -40,7 +32,6 @@ export default {
       <pipeline-stage
         :stage="stage"
         :is-merge-train="isMergeTrain"
-        :pipeline-etag="pipelineEtag"
         @miniGraphStageClick="$emit('miniGraphStageClick')"
       />
     </div>
diff --git a/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue b/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue
index 67222f701d7..a57dcfb1e22 100644
--- a/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue
@@ -57,7 +57,7 @@ export default {
         return project?.pipeline?.jobs?.count || 0;
       },
       error() {
-        createAlert({ message: this.$options.i18n.fetchError });
+        createAlert({ message: this.$options.fetchError });
       },
     },
   },
@@ -92,7 +92,7 @@ export default {
       try {
         await this.$apollo.queries.failedJobsCount.refetch();
       } catch {
-        createAlert({ message: this.$options.i18n.fetchError });
+        createAlert({ message: this.$options.fetchError });
       }
     },
   },
diff --git a/app/assets/javascripts/ci/pipelines_page/pipelines.vue b/app/assets/javascripts/ci/pipelines_page/pipelines.vue
index bd9fabd97d8..410f47cef58 100644
--- a/app/assets/javascripts/ci/pipelines_page/pipelines.vue
+++ b/app/assets/javascripts/ci/pipelines_page/pipelines.vue
@@ -410,7 +410,6 @@ export default {
       <div v-else-if="stateToRender === $options.stateMap.tableList">
         <pipelines-table
           :pipelines="state.pipelines"
-          :update-graph-dropdown="updateGraphDropdown"
           :pipeline-id-type="selectedPipelineKeyOption.value"
           @cancel-pipeline="onCancelPipeline"
           @refresh-pipelines-table="onRefreshPipelinesTable"
diff --git a/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue b/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue
index d5c8dcf72f4..edfd9c707c0 100644
--- a/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue
+++ b/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue
@@ -300,7 +300,6 @@ export default {
         :is-creating-pipeline="state.isRunningMergeRequestPipeline"
         :pipeline-id-type="$options.pipelineIdKey"
         :pipelines="state.pipelines"
-        :update-graph-dropdown="updateGraphDropdown"
         :view-type="viewType"
         @cancel-pipeline="onCancelPipeline"
         @refresh-pipelines-table="onRefreshPipelinesTable"
diff --git a/app/assets/javascripts/graphql_shared/constants.js b/app/assets/javascripts/graphql_shared/constants.js
index 6e764bea737..681a8f371b2 100644
--- a/app/assets/javascripts/graphql_shared/constants.js
+++ b/app/assets/javascripts/graphql_shared/constants.js
@@ -2,9 +2,10 @@ export const MINIMUM_SEARCH_LENGTH = 3;
 
 export const TYPENAME_BOARD = 'Board';
 export const TYPENAME_CI_BUILD = 'Ci::Build';
-export const TYPENAME_CI_TRIGGER = 'Ci::Trigger';
-export const TYPENAME_CI_PIPELINE = 'Ci::Pipeline';
 export const TYPENAME_CI_RUNNER = 'Ci::Runner';
+export const TYPENAME_CI_PIPELINE = 'Ci::Pipeline';
+export const TYPENAME_CI_STAGE = 'Ci::Stage';
+export const TYPENAME_CI_TRIGGER = 'Ci::Trigger';
 export const TYPENAME_CI_VARIABLE = 'Ci::Variable';
 export const TYPENAME_COMMIT_STATUS = 'CommitStatus';
 export const TYPENAME_CONTAINER_REPOSITORY = 'ContainerRepository';
diff --git a/app/assets/javascripts/profile/preferences/components/extensions_marketplace_warning.vue b/app/assets/javascripts/profile/preferences/components/extensions_marketplace_warning.vue
index 95500565cda..3260a8d548e 100644
--- a/app/assets/javascripts/profile/preferences/components/extensions_marketplace_warning.vue
+++ b/app/assets/javascripts/profile/preferences/components/extensions_marketplace_warning.vue
@@ -3,7 +3,7 @@ import { GlIcon, GlLink, GlModal, GlSprintf } from '@gitlab/ui';
 import { s__ } from '~/locale';
 
 export const WARNING_PARAGRAPH_1 = s__(
-  'PreferencesIntegrations|Third-party extensions are now available in the Web IDE. While each extension runs in a secure browser sandbox, %{boldStart}third-party extensions%{boldEnd} may have access to the contents of the files opened in the Web IDE, %{boldStart}including any personal data in those files%{boldEnd}, and may communicate with external servers.',
+  'PreferencesIntegrations|Third-party extensions are now available in the Web IDE and Workspaces. While each extension runs in a secure browser sandbox, %{boldStart}third-party extensions%{boldEnd} may have access to the contents of the files opened in the Web IDE or Workspaces, %{boldStart}including any personal data in those files%{boldEnd}, and may communicate with external servers.',
 );
 
 export const WARNING_PARAGRAPH_2 = s__(
diff --git a/app/assets/javascripts/profile/preferences/components/integration_view.vue b/app/assets/javascripts/profile/preferences/components/integration_view.vue
index 06f8459e637..31f81d85479 100644
--- a/app/assets/javascripts/profile/preferences/components/integration_view.vue
+++ b/app/assets/javascripts/profile/preferences/components/integration_view.vue
@@ -34,6 +34,11 @@ export default {
       type: Boolean,
       required: true,
     },
+    title: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -65,7 +70,7 @@ export default {
 <template>
   <gl-form-group>
     <template #label>
-      {{ config.title }}
+      {{ title || config.title }}
       <gl-link class="has-tooltip" title="More information" :href="helpLink">
         <gl-icon name="question-o" class="vertical-align-middle" />
       </gl-link>
diff --git a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
index 631830a1218..d2c0f7cddad 100644
--- a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
+++ b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
@@ -151,6 +151,7 @@ export default {
           :message="view.message"
           :message-url="view.message_url"
           :config="$options.integrationViewConfigs[view.name]"
+          :title="view.title"
         />
       </div>
     </div>
diff --git a/app/assets/javascripts/projects/commit_box/info/utils.js b/app/assets/javascripts/projects/commit_box/info/utils.js
index ea7eb35cbaf..01708ed6882 100644
--- a/app/assets/javascripts/projects/commit_box/info/utils.js
+++ b/app/assets/javascripts/projects/commit_box/info/utils.js
@@ -6,6 +6,7 @@ export const formatStages = (graphQLStages = [], restStages = []) => {
   return graphQLStages.map((stage, index) => {
     return {
       name: stage.name,
+      id: restStages[index]?.id,
       status: stage.detailedStatus,
       dropdown_path: restStages[index]?.dropdown_path || '',
       title: restStages[index].title || '',
diff --git a/app/assets/javascripts/releases/components/expand_button.vue b/app/assets/javascripts/releases/components/expand_button.vue
index 12d06ec88bb..51aa1b2e25a 100644
--- a/app/assets/javascripts/releases/components/expand_button.vue
+++ b/app/assets/javascripts/releases/components/expand_button.vue
@@ -43,8 +43,9 @@ export default {
       v-show="isCollapsed"
       :aria-label="ariaLabel"
       type="button"
-      class="js-text-expander-prepend text-expander gl-rounded-none gl-border-none !gl-bg-transparent gl-p-0 !gl-shadow-none !gl-outline-none"
+      class="js-text-expander-prepend"
       icon="ellipsis_h"
+      category="tertiary"
       @click="onClick"
     />
     <span v-if="isCollapsed"> <slot name="short"></slot> </span>
@@ -53,8 +54,9 @@ export default {
       v-show="!isCollapsed"
       :aria-label="ariaLabel"
       type="button"
-      class="js-text-expander-append text-expander gl-rounded-none gl-border-none !gl-bg-transparent gl-p-0 !gl-shadow-none !gl-outline-none"
+      class="js-text-expander-append"
       icon="ellipsis_h"
+      category="tertiary"
       @click="onClick"
     />
   </span>
diff --git a/app/assets/javascripts/repository/components/commit_info.vue b/app/assets/javascripts/repository/components/commit_info.vue
index 0ccd7f10916..ae9002f9f35 100644
--- a/app/assets/javascripts/repository/components/commit_info.vue
+++ b/app/assets/javascripts/repository/components/commit_info.vue
@@ -103,7 +103,7 @@ export default {
             :title="$options.i18n.toggleCommitDescription"
             :aria-label="$options.i18n.toggleCommitDescription"
             :selected="showDescription"
-            class="text-expander !gl-ml-0"
+            class="!gl-ml-0"
             icon="ellipsis_h"
             @click="toggleShowDescription"
           />
diff --git a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue
index 68b30f0a8be..1a64a290cb5 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue
@@ -156,7 +156,7 @@ export default {
     },
     showRequestReviewButton(user) {
       if (!user.mergeRequestInteraction.approved) {
-        return !['UNREVIEWED', 'UNAPPROVED'].includes(user.mergeRequestInteraction.reviewState);
+        return !['UNREVIEWED'].includes(user.mergeRequestInteraction.reviewState);
       }
 
       return true;
diff --git a/app/assets/javascripts/todos/components/todos_app.vue b/app/assets/javascripts/todos/components/todos_app.vue
index de240b42583..6bb33119703 100644
--- a/app/assets/javascripts/todos/components/todos_app.vue
+++ b/app/assets/javascripts/todos/components/todos_app.vue
@@ -211,8 +211,11 @@ export default {
         </gl-tab>
       </gl-tabs>
 
-      <div v-if="showMarkAllAsDone" class="gl-my-3 gl-mr-5 gl-flex gl-items-center gl-justify-end">
-        <todos-mark-all-done-button :filters="queryFilterValues" @change="updateCounts" />
+      <div
+        v-show="showMarkAllAsDone"
+        class="gl-my-3 gl-mr-5 gl-flex gl-items-center gl-justify-end"
+      >
+        <todos-mark-all-done-button :filters="queryFilterValues" @change="updateAllQueries" />
       </div>
     </div>
 
diff --git a/app/assets/javascripts/token_access/components/groups_and_projects_listbox.vue b/app/assets/javascripts/token_access/components/groups_and_projects_listbox.vue
deleted file mode 100644
index a54d5a86d32..00000000000
--- a/app/assets/javascripts/token_access/components/groups_and_projects_listbox.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<script>
-import { GlCollapsibleListbox } from '@gitlab/ui';
-import { __ } from '~/locale';
-import ProjectAvatar from '~/vue_shared/components/project_avatar.vue';
-import getGroupsAndProjectsQuery from '../graphql/queries/get_groups_and_projects.query.graphql';
-
-export default {
-  components: {
-    GlCollapsibleListbox,
-    ProjectAvatar,
-  },
-  props: {
-    placeholder: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    isValid: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
-    value: {
-      type: String,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      groupsAndProjects: { groups: [], projects: [] },
-      search: '',
-    };
-  },
-  apollo: {
-    groupsAndProjects: {
-      query: getGroupsAndProjectsQuery,
-      variables() {
-        return {
-          search: this.search,
-        };
-      },
-      update(data) {
-        return {
-          groups: data?.groups?.nodes,
-          projects: data?.projects?.nodes,
-        };
-      },
-    },
-  },
-  computed: {
-    listboxItems() {
-      const { groups = [], projects = [] } = this.groupsAndProjects;
-      return [
-        {
-          text: __('Groups'),
-          options: groups.map(this.setValueToFullPath),
-        },
-        {
-          text: __('Projects'),
-          options: projects.map(this.setValueToFullPath),
-        },
-      ];
-    },
-    loading() {
-      return this.$apollo.queries.groupsAndProjects.loading;
-    },
-    toggleText() {
-      if (!this.value) {
-        return this.placeholder;
-      }
-      return this.value;
-    },
-  },
-  methods: {
-    onSelect(path) {
-      this.$emit('select', path);
-    },
-    onSearch(query) {
-      this.search = query;
-    },
-    setValueToFullPath(item) {
-      return { ...item, value: item.fullPath };
-    },
-  },
-};
-</script>
-<template>
-  <gl-collapsible-listbox
-    :items="listboxItems"
-    :value="value"
-    :selected="value"
-    :toggle-text="toggleText"
-    fluid-width
-    block
-    searchable
-    is-check-centered
-    :searching="loading"
-    :toggle-class="{ '!gl-border-1 !gl-border-red-500': !isValid, '!gl-text-gray-500': !value }"
-    @select="onSelect"
-    @search="onSearch"
-  >
-    <template #list-item="{ item: { id, name, avatarUrl, fullPath } }">
-      <div class="gl-inline-flex gl-items-center">
-        <project-avatar
-          :alt="name"
-          :project-avatar-url="avatarUrl"
-          :project-id="id"
-          :project-name="name"
-          class="gl-mr-3"
-        />
-        <span>{{ fullPath }}</span>
-      </div>
-    </template>
-  </gl-collapsible-listbox>
-</template>
diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue
index 84d3c762292..fc0f23bd098 100644
--- a/app/assets/javascripts/token_access/components/inbound_token_access.vue
+++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue
@@ -4,6 +4,7 @@ import {
   GlButton,
   GlForm,
   GlFormGroup,
+  GlFormInput,
   GlLink,
   GlIcon,
   GlLoadingIcon,
@@ -22,7 +23,6 @@ import inboundRemoveGroupCIJobTokenScopeMutation from '../graphql/mutations/inbo
 import inboundUpdateCIJobTokenScopeMutation from '../graphql/mutations/inbound_update_ci_job_token_scope.mutation.graphql';
 import inboundGetCIJobTokenScopeQuery from '../graphql/queries/inbound_get_ci_job_token_scope.query.graphql';
 import inboundGetGroupsAndProjectsWithCIJobTokenScopeQuery from '../graphql/queries/inbound_get_groups_and_projects_with_ci_job_token_scope.query.graphql';
-import GroupsAndProjectsListbox from './groups_and_projects_listbox.vue';
 import TokenAccessTable from './token_access_table.vue';
 
 export default {
@@ -42,10 +42,11 @@ export default {
     addGroupOrProject: __('Add group or project'),
     add: __('Add'),
     cancel: __('Cancel'),
-    addProjectPlaceholder: __('Pick a group or project'),
+    addProjectPlaceholder: __(
+      'Paste group or project path. Example: %{codeStart}gitlab-org/gitlab%{codeEnd}.',
+    ),
     projectsFetchError: __('There was a problem fetching the projects'),
     scopeFetchError: __('There was a problem fetching the job token scope value'),
-    projectInScopeError: s__('CICD|Target project is already in the job token scope.'),
     saveButtonTitle: __('Save Changes'),
   },
   inboundJobTokenScopeOptions: [
@@ -63,12 +64,12 @@ export default {
     GlButton,
     GlForm,
     GlFormGroup,
+    GlFormInput,
     GlLink,
     GlIcon,
     GlLoadingIcon,
     GlSprintf,
     CrudComponent,
-    GroupsAndProjectsListbox,
     TokenAccessTable,
     GlFormRadioGroup,
   },
@@ -117,6 +118,7 @@ export default {
   },
   data() {
     return {
+      errorMessage: null,
       inboundJobTokenScopeEnabled: null,
       isUpdating: false,
       groupsAndProjectsWithAccess: [],
@@ -130,11 +132,6 @@ export default {
     isGroupOrProjectPathEmpty() {
       return this.groupOrProjectPath === '';
     },
-    isGroupOrProjectPathInScope() {
-      return this.groupsAndProjectsWithAccess.some(
-        (item) => item.fullPath === this.groupOrProjectPath,
-      );
-    },
     ciJobTokenHelpPage() {
       return helpPagePath('ci/jobs/ci_job_token#control-job-token-access-to-your-project');
     },
@@ -204,14 +201,14 @@ export default {
           },
         });
 
-        if (errors.length) {
+        if (errors.length > 0) {
           throw new Error(errors[0]);
         }
-      } catch (error) {
-        createAlert({ message: error.message });
-      } finally {
+
         this.clearGroupOrProjectPath();
         this.getGroupsAndProjects();
+      } catch (error) {
+        this.errorMessage = error.message;
       }
     },
     async removeItem(item) {
@@ -252,8 +249,8 @@ export default {
         this.getGroupsAndProjects();
       }
     },
-    setGroupOrProjectPath(path) {
-      this.groupOrProjectPath = path;
+    clearErrorMessage() {
+      this.errorMessage = null;
     },
     clearGroupOrProjectPath() {
       this.groupOrProjectPath = '';
@@ -352,23 +349,31 @@ export default {
               <gl-form-group
                 :label-for="$options.CI_JOB_TOKEN_ALLOWLIST"
                 :label="$options.i18n.addGroupOrProject"
-                :state="!isGroupOrProjectPathInScope"
-                :invalid-feedback="$options.projectInScopeError"
+                :invalid-feedback="errorMessage"
                 data-testid="group-or-project-form-group"
               >
-                <groups-and-projects-listbox
+                <gl-form-input
                   :id="$options.CI_JOB_TOKEN_ALLOWLIST"
-                  :placeholder="$options.i18n.addProjectPlaceholder"
-                  :is-valid="!isGroupOrProjectPathInScope"
-                  :value="groupOrProjectPath"
-                  @select="setGroupOrProjectPath"
+                  v-model="groupOrProjectPath"
+                  autofocus
+                  :state="!errorMessage"
+                  type="text"
+                  data-testid="target-path-field"
+                  @input="clearErrorMessage"
                 />
+                <template #description>
+                  <gl-sprintf :message="$options.i18n.addProjectPlaceholder">
+                    <template #code="{ content }">
+                      <code>{{ content }}</code>
+                    </template>
+                  </gl-sprintf>
+                </template>
               </gl-form-group>
               <div class="gl-mt-5 gl-flex gl-gap-3">
                 <gl-button
                   variant="confirm"
-                  :disabled="isGroupOrProjectPathEmpty || isGroupOrProjectPathInScope"
-                  data-testid="add-project-btn"
+                  :disabled="isGroupOrProjectPathEmpty"
+                  data-testid="add-group-or-project-btn"
                   @click="addGroupOrProject"
                 >
                   {{ $options.i18n.add }}
diff --git a/app/assets/javascripts/vue_shared/components/logs_viewer/logs_top_bar.vue b/app/assets/javascripts/vue_shared/components/logs_viewer/logs_top_bar.vue
index abbd98849ad..89c69d148af 100644
--- a/app/assets/javascripts/vue_shared/components/logs_viewer/logs_top_bar.vue
+++ b/app/assets/javascripts/vue_shared/components/logs_viewer/logs_top_bar.vue
@@ -34,7 +34,7 @@ export default {
         : this.$options.i18n.enterFullScreen;
     },
     headerTopClass() {
-      return this.isFullScreen ? 'gl-top-0' : 'gl-top-app-header';
+      return this.isFullScreen ? 'gl-top-0' : 'top-app-header';
     },
   },
 };
diff --git a/app/assets/stylesheets/framework/top_bar.scss b/app/assets/stylesheets/framework/top_bar.scss
index 0b1449a22cc..433b5168ed7 100644
--- a/app/assets/stylesheets/framework/top_bar.scss
+++ b/app/assets/stylesheets/framework/top_bar.scss
@@ -20,3 +20,8 @@
     @apply gl-transition-[width,left,right];
   }
 }
+
+.top-app-header {
+  top: $calc-application-header-height;
+}
+
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 44d608eb8c3..8e954651220 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -40,30 +40,6 @@
   }
 }
 
-.text-expander {
-  display: inline-flex;
-  background: $white;
-  color: $gl-text-color-secondary;
-  padding: 1px $gl-padding-4;
-  cursor: pointer;
-  border: 1px solid $gray-100;
-  border-radius: $gl-border-radius-base;
-  margin-left: 5px;
-  font-size: 12px;
-  line-height: $gl-font-size;
-  outline: none;
-
-  &.open {
-    background-color: $gray-100;
-    box-shadow: inset 0 0 2px rgba($black, 0.2);
-  }
-
-  &:hover {
-    background-color: $gray-100;
-    text-decoration: none;
-  }
-}
-
 .commit-content {
   padding-right: 10px;
   white-space: normal;
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index eeb4bcf93c5..8f87709ea51 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -43,11 +43,6 @@ $type-scale: (
   }
 }
 
-// stylelint-disable-next-line gitlab/no-gl-class
-.gl-top-app-header {
-  top: $calc-application-header-height;
-}
-
 // This CSS Class definition will be removed in
 // https://gitlab.com/gitlab-org/gitlab/-/issues/479423.
 // More context: https://gitlab.com/gitlab-org/gitlab/-/issues/482689#note_2200591361
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index b5b6d681970..f9b9af7b53d 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -164,22 +164,28 @@ module PreferencesHelper
         }
       end
 
-      views << extensions_marketplace_view if WebIde::ExtensionsMarketplace.feature_enabled?(user: current_user)
-    end
+      views << extensions_marketplace_view
+    end.compact
   end
 
   private
 
   def extensions_marketplace_view
-    # We handle the linkStart / linkEnd inside of a Vue sprintf
-    extensions_marketplace_home = "%{linkStart}#{::WebIde::ExtensionsMarketplace.marketplace_home_url}%{linkEnd}"
-    message = format(
-      s_('PreferencesIntegrations|Uses %{extensions_marketplace_home} as the extension marketplace for the Web IDE.'),
-      extensions_marketplace_home: extensions_marketplace_home
+    return unless WebIde::ExtensionsMarketplace.feature_enabled?(user: current_user)
+
+    build_extensions_marketplace_view(
+      title: s_("Preferences|Web IDE"),
+      message: s_(
+        "PreferencesIntegrations|Uses %{extensions_marketplace_home} as the extension marketplace for the Web IDE.")
     )
+  end
+
+  def build_extensions_marketplace_view(title:, message:)
+    extensions_marketplace_home = "%{linkStart}#{::WebIde::ExtensionsMarketplace.marketplace_home_url}%{linkEnd}"
     {
       name: 'extensions_marketplace',
-      message: message,
+      message: format(message, extensions_marketplace_home: extensions_marketplace_home),
+      title: title,
       message_url: WebIde::ExtensionsMarketplace.marketplace_home_url,
       help_link: WebIde::ExtensionsMarketplace.help_preferences_url
     }
diff --git a/app/models/integrations/asana.rb b/app/models/integrations/asana.rb
index 5a5daa61e51..1424c9893d5 100644
--- a/app/models/integrations/asana.rb
+++ b/app/models/integrations/asana.rb
@@ -75,11 +75,11 @@ module Integrations
 
         begin
           story_on_task_url = format(STORY_URL_TEMPLATE, task_gid: task_id)
-          Gitlab::HTTP_V2.post(story_on_task_url, headers: { "Authorization" => "Bearer #{api_key}" }, body: { text: "#{push_msg} #{message}" })
+          Gitlab::HTTP.post(story_on_task_url, headers: { "Authorization" => "Bearer #{api_key}" }, body: { text: "#{push_msg} #{message}" })
 
           if prepended_text.match?(proceded_keyword_finder)
             task_url = format(TASK_URL_TEMPLATE, task_gid: task_id)
-            Gitlab::HTTP_V2.put(task_url, headers: { "Authorization" => "Bearer #{api_key}" }, body: { completed: true })
+            Gitlab::HTTP.put(task_url, headers: { "Authorization" => "Bearer #{api_key}" }, body: { completed: true })
           end
         rescue StandardError => e
           log_error(e.message)
@@ -89,7 +89,7 @@ module Integrations
     end
 
     def test(_)
-      result = Gitlab::HTTP_V2.get(PERSONAL_ACCESS_TOKEN_TEST_URL, headers: { "Authorization" => "Bearer #{api_key}" })
+      result = Gitlab::HTTP.get(PERSONAL_ACCESS_TOKEN_TEST_URL, headers: { "Authorization" => "Bearer #{api_key}" })
 
       if result.success?
         { success: true }
diff --git a/app/serializers/stage_entity.rb b/app/serializers/stage_entity.rb
index 59cf823e41e..4ba752c235d 100644
--- a/app/serializers/stage_entity.rb
+++ b/app/serializers/stage_entity.rb
@@ -4,6 +4,8 @@ class StageEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :name
+  # This is temporary and will be removed with the migration of pipelines tables to GraphQL: https://gitlab.com/gitlab-org/gitlab/-/issues/461917
+  expose :id
 
   expose :title do |stage|
     "#{stage.name}: #{detailed_status.label}"
diff --git a/app/services/ci/job_token_scope/add_group_service.rb b/app/services/ci/job_token_scope/add_group_service.rb
index 6402fe17041..2ab8493212e 100644
--- a/app/services/ci/job_token_scope/add_group_service.rb
+++ b/app/services/ci/job_token_scope/add_group_service.rb
@@ -14,7 +14,7 @@ module Ci
         ServiceResponse.success(payload: { group_link: link })
 
       rescue ActiveRecord::RecordNotUnique
-        ServiceResponse.error(message: 'Target group is already in the job token scope')
+        ServiceResponse.error(message: 'This group is already in the job token allowlist.')
       rescue ActiveRecord::RecordInvalid => e
         ServiceResponse.error(message: e.message)
       rescue EditScopeValidations::ValidationError => e
diff --git a/app/services/ci/job_token_scope/add_project_service.rb b/app/services/ci/job_token_scope/add_project_service.rb
index c1fc23f7742..0c9f37f7322 100644
--- a/app/services/ci/job_token_scope/add_project_service.rb
+++ b/app/services/ci/job_token_scope/add_project_service.rb
@@ -14,7 +14,7 @@ module Ci
         ServiceResponse.success(payload: { project_link: link })
 
       rescue ActiveRecord::RecordNotUnique
-        ServiceResponse.error(message: "Target project is already in the job token scope")
+        ServiceResponse.error(message: 'This project is already in the job token allowlist.')
       rescue ActiveRecord::RecordInvalid => e
         ServiceResponse.error(message: e.message)
       rescue EditScopeValidations::ValidationError => e
diff --git a/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb b/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb
index 8d720968ca3..96fdcf15a3e 100644
--- a/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb
+++ b/app/services/concerns/ci/job_token_scope/edit_scope_validations.rb
@@ -12,7 +12,7 @@ module Ci
       TARGET_GROUP_UNAUTHORIZED_OR_UNFOUND = "The target_group that you are attempting to access does " \
           "not exist or you don't have permission to perform this action"
 
-      TARGET_DOES_NOT_EXIST = 'The target does not exists'
+      TARGET_DOES_NOT_EXIST = 'The group or project does not exist.'
 
       def validate_source_project_and_target_project_access!(source_project, target_project, current_user)
         unless can?(current_user, :admin_project, source_project)
diff --git a/app/services/uploads/destroy_service.rb b/app/services/uploads/destroy_service.rb
index 91d50b1d58c..bbe5200aa20 100644
--- a/app/services/uploads/destroy_service.rb
+++ b/app/services/uploads/destroy_service.rb
@@ -11,7 +11,7 @@ module Uploads
 
     def execute(upload)
       unless current_user && upload && current_user.can?(:destroy_upload, upload)
-        return error(_("The resource that you are attempting to access does not "\
+        return error(_("The resource that you are attempting to access does not " \
                        "exist or you don't have permission to perform this action."))
       end
 
diff --git a/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml b/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
index edd94484c52..fc51907a856 100644
--- a/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
+++ b/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
@@ -2,8 +2,8 @@
 - button_tooltip = local_assigns.fetch(:title, _("Show all breadcrumbs"))
 - if defined?(@breadcrumb_collapsed_links) && @breadcrumb_collapsed_links.key?(dropdown_location)
   %li.expander.gl-breadcrumb-item.gl-inline-flex
-    %button.text-expander.has-tooltip.js-breadcrumbs-collapsed-expander.gl-ml-0{ type: "button", data: { container: "body" }, "aria-label": button_tooltip, title: button_tooltip }
-      = sprite_icon("ellipsis_h", size: 12)
+    = render Pajamas::ButtonComponent.new(icon: 'ellipsis_h',
+      button_options: { class: 'button-ellipsis-horizontal js-breadcrumbs-collapsed-expander gl-ml-0', type: "button", data: { container: 'body' }, "aria-label": button_tooltip, title: button_tooltip })
   - @breadcrumb_collapsed_links[dropdown_location].each_with_index do |item, index|
     %li.gl-breadcrumb-item{ :class => "!gl-hidden" }
       = link_to item[:href] do
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index d5a2fc82f8d..3b10e81272a 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -39,7 +39,7 @@
         = commit.short_id
       - if commit.description? && collapsible
         = render Pajamas::ButtonComponent.new(icon: 'ellipsis_h',
-          button_options: { class: 'button-ellipsis-horizontal text-expander js-toggle-button', data: { toggle: 'tooltip', container: 'body', collapse_title: toggle_commit_message, expand_title: toggle_commit_message }, title: toggle_commit_message, aria: { label: toggle_commit_message }})
+          button_options: { class: 'button-ellipsis-horizontal js-toggle-button', data: { toggle: 'tooltip', container: 'body', collapse_title: toggle_commit_message, expand_title: toggle_commit_message }, title: toggle_commit_message, aria: { label: toggle_commit_message }})
 
       .committer.gl-text-sm
         - commit_author_link = commit_author_link(commit, avatar: false, size: 24)
diff --git a/data/deprecations/17-4-secure-container-registries.yml b/data/deprecations/17-4-secure-container-registries.yml
index d946a3c9e48..3f1256825bd 100644
--- a/data/deprecations/17-4-secure-container-registries.yml
+++ b/data/deprecations/17-4-secure-container-registries.yml
@@ -2,6 +2,7 @@
   removal_milestone: "18.0"
   announcement_milestone: "17.4"
   breaking_change: true
+  window: 1
   reporter: thiagocsf
   stage: secure
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/470641
diff --git a/db/docs/batched_background_migrations/backfill_operations_strategies_project_id.yml b/db/docs/batched_background_migrations/backfill_operations_strategies_project_id.yml
index a71a7f22529..27638a8f067 100644
--- a/db/docs/batched_background_migrations/backfill_operations_strategies_project_id.yml
+++ b/db/docs/batched_background_migrations/backfill_operations_strategies_project_id.yml
@@ -5,4 +5,4 @@ feature_category: feature_flags
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155286
 milestone: '17.1'
 queued_migration_version: 20240604150020
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20241108232843'
diff --git a/db/post_migrate/20241108232843_finalize_backfill_operations_strategies_project_id.rb b/db/post_migrate/20241108232843_finalize_backfill_operations_strategies_project_id.rb
new file mode 100644
index 00000000000..a34bfbe5691
--- /dev/null
+++ b/db/post_migrate/20241108232843_finalize_backfill_operations_strategies_project_id.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillOperationsStrategiesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.6'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillOperationsStrategiesProjectId',
+      table_name: :operations_strategies,
+      column_name: :id,
+      job_arguments: [:project_id, :operations_feature_flags, :project_id, :feature_flag_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20241108232843 b/db/schema_migrations/20241108232843
new file mode 100644
index 00000000000..ce407a677fa
--- /dev/null
+++ b/db/schema_migrations/20241108232843
@@ -0,0 +1 @@
+d68bbf73637c6540c315385304f67c58b6e2330c5c31963cf2e8911404e3275f
\ No newline at end of file
diff --git a/doc/administration/geo/replication/selective_synchronization.md b/doc/administration/geo/replication/selective_synchronization.md
index 3dadfc60665..5b7c8b78392 100644
--- a/doc/administration/geo/replication/selective_synchronization.md
+++ b/doc/administration/geo/replication/selective_synchronization.md
@@ -23,10 +23,12 @@ Geo's synchronization logic is outlined in the [documentation](../index.md). Bot
 Selective synchronization:
 
 1. Does not restrict permissions from **secondary** sites.
+1. Does not prevent users from viewing, interacting with, cloning, and pushing to project repositories that are not included in the selective sync.
+   - For more details, see [Geo proxying for secondary sites](../secondary_proxy/index.md).
 1. Does not hide project metadata from **secondary** sites.
    - Since Geo relies on PostgreSQL replication, all project metadata
      gets replicated to **secondary** sites, but repositories that have not been
-     selected are empty.
+     selected will not exist on the secondary site.
 1. Does not reduce the number of events generated for the Geo event log.
    - The **primary** site generates events as long as any **secondary** sites are present.
      Selective synchronization restrictions are implemented on the **secondary** sites,
diff --git a/doc/api/notes.md b/doc/api/notes.md
index 6b0ddd5dcda..ee687a10336 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -424,13 +424,14 @@ POST /projects/:id/merge_requests/:merge_request_iid/notes
 
 Parameters:
 
-| Attribute           | Type           | Required | Description                                                                                                                  |
-|---------------------|----------------|----------|------------------------------------------------------------------------------------------------------------------------------|
-| `id`                    | integer or string | yes      | The ID or [URL-encoded path of the project](rest/index.md#namespaced-paths)                                              |
-| `merge_request_iid`     | integer        | yes      | The IID of a project merge request                                                                                           |
-| `body`                  | string         | yes      | The content of a note. Limited to 1,000,000 characters.                                                                      |
-| `created_at`            | string         | no       | Date time string, ISO 8601 formatted. Example: `2016-03-11T03:45:40Z` (requires administrator or project/group owner rights) |
-| `merge_request_diff_head_sha`| string         | no       | Required for the `/merge` [quick action](../user/project/quick_actions.md). The SHA of the head commit, which ensures the merge request wasn't updated after the API request was sent. |
+| Attribute                     | Type              | Required | Description |
+|-------------------------------|-------------------|----------|-------------|
+| `body`                        | string            | yes      | The content of a note. Limited to 1,000,000 characters. |
+| `id`                          | integer or string | yes      | The ID or [URL-encoded path of the project](rest/index.md#namespaced-paths) |
+| `merge_request_iid`           | integer           | yes      | The IID of a project merge request |
+| `created_at`                  | string            | no       | Date time string, ISO 8601 formatted. Example: `2016-03-11T03:45:40Z` (requires administrator or project/group owner rights) |
+| `internal`                    | boolean           | no       | The internal flag of a note. Default is false. |
+| `merge_request_diff_head_sha` | string            | no       | Required for the `/merge` [quick action](../user/project/quick_actions.md). The SHA of the head commit, which ensures the merge request wasn't updated after the API request was sent. |
 
 ### Modify existing merge request note
 
diff --git a/doc/ci/jobs/ci_job_token.md b/doc/ci/jobs/ci_job_token.md
index 69b6326c7a9..4dd296fb000 100644
--- a/doc/ci/jobs/ci_job_token.md
+++ b/doc/ci/jobs/ci_job_token.md
@@ -97,6 +97,7 @@ the CI/CD job token will always be restricted to the project's allowlist.
 > - **Allow access to this project with a CI_JOB_TOKEN** setting [renamed to **Limit access _to_ this project**](https://gitlab.com/gitlab-org/gitlab/-/issues/411406) in GitLab 16.3.
 > - Adding groups to the job token allowlist [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/415519) in GitLab 17.0.
 > - **Token Access** setting [renamed to **Job token permissions**](https://gitlab.com/gitlab-org/gitlab/-/issues/415519) in GitLab 17.2.
+> - **Add project** option [renamed to **Add**](https://gitlab.com/gitlab-org/gitlab/-/issues/470880/) in GitLab 17.6.
 
 You can add groups or projects to your job token allowlist to allow access your project's resources
 with a job token for authentication. By default, the allowlist of any project only includes itself.
@@ -126,7 +127,7 @@ To add a group or project to the allowlist:
    It is a security risk to disable this feature, so project maintainers or owners should
    keep this setting enabled at all times.
 1. Select **Add group or project**.
-1. Input the path to the group or project to add to the allowlist, and select **Add project**.
+1. Input the path to the group or project to add to the allowlist, and select **Add**.
 
 You can also add a group or project to the allowlist [with the API](../../api/graphql/reference/index.md#mutationcijobtokenscopeaddgrouporproject).
 
diff --git a/doc/development/advanced_search.md b/doc/development/advanced_search.md
index d51423ec4e1..866c728b8a3 100644
--- a/doc/development/advanced_search.md
+++ b/doc/development/advanced_search.md
@@ -223,6 +223,7 @@ All new indexes must have:
   - For project data - `visibility_level`
   - For group data - `namespace_visibility_level`
   - Any required access level fields. These correspond to project feature access levels such as `issues_access_level` or `repository_access_level`
+- A `schema_version` integer field in a `YYWW` (year/week) format. This field is used for data migrations.
 
 1. Create a `Search::Elastic::Types::` class in `ee/lib/search/elastic/types/`.
 1. Define the following class methods:
@@ -252,11 +253,13 @@ All new indexes must have:
 Create a `Search::Elastic::References::` class in `ee/lib/search/elastic/references/`.
 
 The reference is used to perform bulk operations in Elasticsearch.
-The file must inherit from `Search::Elastic::Reference` and define the following methods:
+The file must inherit from `Search::Elastic::Reference` and define the following constant and methods:
 
 ```ruby
 include Search::Elastic::Concerns::DatabaseReference # if there is a corresponding database record for every document
 
+SCHEMA_VERSION = 24_46 # integer in YYWW format
+
 override :serialize
 def self.serialize(record)
    # a string representation of the reference
diff --git a/doc/development/search/advanced_search_migration_styleguide.md b/doc/development/search/advanced_search_migration_styleguide.md
index 5d66a492dc4..b20db8660ba 100644
--- a/doc/development/search/advanced_search_migration_styleguide.md
+++ b/doc/development/search/advanced_search_migration_styleguide.md
@@ -232,7 +232,10 @@ end
 Reindexes all documents in the index that stores the specified document type and updates `schema_version`.
 
 Requires the `DOCUMENT_TYPE` and `NEW_SCHEMA_VERSION` constants.
-The index mapping must have a `schema_version` integer field in a `YYMM` format.
+The index mapping must have a `schema_version` integer field in a `YYWW` (year/week) format.
+
+NOTE:
+Previously index mapping `schema_version` used `YYMM` format. New versions should use the `YYWW` format.
 
 ```ruby
 class MigrationName < Elastic::Migration
@@ -243,7 +246,7 @@ class MigrationName < Elastic::Migration
   throttle_delay 1.minute
 
   DOCUMENT_TYPE = WorkItem
-  NEW_SCHEMA_VERSION = 23_08
+  NEW_SCHEMA_VERSION = 24_46
   UPDATE_BATCH_SIZE = 100
 end
 ```
@@ -253,7 +256,10 @@ end
 Deletes all documents in the index that stores the specified document type and has `schema_version` less than the given value.
 
 Requires the `DOCUMENT_TYPE` constant and `schema_version` method.
-The index mapping must have a `schema_version` integer field in a `YYMM` format.
+The index mapping must have a `schema_version` integer field in a `YYWW` (year/week) format.
+
+NOTE:
+Previously index mapping `schema_version` used `YYMM` format. New versions should use the `YYWW` format.
 
 ```ruby
 class MigrationName < Elastic::Migration
diff --git a/doc/development/testing_guide/end_to_end/best_practices/execution_context_selection.md b/doc/development/testing_guide/end_to_end/best_practices/execution_context_selection.md
index 9997d1543c2..309ab44d5ef 100644
--- a/doc/development/testing_guide/end_to_end/best_practices/execution_context_selection.md
+++ b/doc/development/testing_guide/end_to_end/best_practices/execution_context_selection.md
@@ -10,14 +10,14 @@ Some tests are designed to be run against specific environments, or in specific
 
 ## Available switches
 
-| Switch | Function | Type |
-| -------| ------- | ----- |
-| `tld`  | Set the top-level domain matcher | `String` |
-| `subdomain` | Set the subdomain matcher | `Array` or `String` |
-| `domain` | Set the domain matcher | `String` |
-| `production` | Match the production environment | `Static` |
-| `pipeline` | Match a pipeline | `Array` or `Static`|
-| `job` | Match a job | `Array` or `Static`|
+| Switch       | Function                         | Type                |
+| ------------ | -------------------------------- | ------------------- |
+| `tld`        | Set the top-level domain matcher | `String`            |
+| `subdomain`  | Set the subdomain matcher        | `Array` or `String` |
+| `domain`     | Set the domain matcher           | `String`            |
+| `production` | Match the production environment | `Static`            |
+| `pipeline`   | Match a pipeline                 | `Array` or `Static` |
+| `job`        | Match a job                      | `Array` or `Static` |
 
 WARNING:
 You cannot specify `:production` and `{ <switch>: 'value' }` simultaneously.
@@ -37,19 +37,19 @@ Matches use:
 - Regex or string matching for jobs
 - Lambda or truthy/falsey value for generic condition
 
-| Test execution context                   | Key | Matches |
-| ----------------                         | --- | ---------------                                                            |
-| `gitlab.com`                             | `only: :production` | `gitlab.com`                                               |
-| `staging.gitlab.com`                     | `only: { subdomain: :staging }` | `(staging).+.com`                              |
-| `gitlab.com and staging.gitlab.com`      | `only: { subdomain: /(staging.)?/, domain: 'gitlab' }` | `(staging.)?gitlab.com` |
-| `dev.gitlab.org`                         | `only: { tld: '.org', domain: 'gitlab', subdomain: 'dev' }` | `(dev).gitlab.org` |
-| `staging.gitlab.com and domain.gitlab.com` | `only: { subdomain: %i[staging domain] }` | `(staging\|domain).+.com`             |
-| The `nightly` pipeline                     | `only: { pipeline: :nightly }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) |
-| The `nightly` and `canary` pipelines | `only: { pipeline: [:nightly, :canary] }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) |
-| The `ee:instance` job | `only: { job: 'ee:instance' }` | The `ee:instance` job in any pipeline |
-| Any `quarantine` job | `only: { job: '.*quarantine' }` | Any job ending in `quarantine` in any pipeline |
-| Local development environment | `only: :local` | Any environment where `Runtime::Env.running_in_ci?` is false |
-| Any run where condition evaluates to a truthy value | `only: { condition: -> { ENV['TEST_ENV'] == 'true' } }` | Any run where `TEST_ENV` is set to true |
+| Test execution context                              | Key                                                         | Matches                                                                                                                                                |
+| --------------------------------------------------- | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `gitlab.com`                                        | `only: :production`                                         | `gitlab.com`                                                                                                                                           |
+| `staging.gitlab.com`                                | `only: { subdomain: :staging }`                             | `(staging).+.com`                                                                                                                                      |
+| `gitlab.com and staging.gitlab.com`                 | `only: { subdomain: /(staging.)?/, domain: 'gitlab' }`      | `(staging.)?gitlab.com`                                                                                                                                |
+| `dev.gitlab.org`                                    | `only: { tld: '.org', domain: 'gitlab', subdomain: 'dev' }` | `(dev).gitlab.org`                                                                                                                                     |
+| `staging.gitlab.com and domain.gitlab.com`          | `only: { subdomain: %i[staging domain] }`                   | `(staging\|domain).+.com`                                                                                                                              |
+| The `nightly` pipeline                              | `only: { pipeline: :nightly }`                              | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules)                                                              |
+| The `nightly` and `canary` pipelines                | `only: { pipeline: [:nightly, :canary] }`                   | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) |
+| The `ee:instance` job                               | `only: { job: 'ee:instance' }`                              | The `ee:instance` job in any pipeline                                                                                                                  |
+| Any `quarantine` job                                | `only: { job: '.*quarantine' }`                             | Any job ending in `quarantine` in any pipeline                                                                                                         |
+| Local development environment                       | `only: :local`                                              | Any environment where `Runtime::Env.running_in_ci?` is false                                                                                           |
+| Any run where condition evaluates to a truthy value | `only: { condition: -> { ENV['TEST_ENV'] == 'true' } }`     | Any run where `TEST_ENV` is set to true                                                                                                                |
 
 ```ruby
 RSpec.describe 'Area' do
@@ -81,18 +81,18 @@ Matches use:
 - Regex or string matching for jobs
 - Lambda or truthy/falsey value for generic condition
 
-| Test execution context                   | Key | Matches |
-| ----------------                         | --- | ---------------                                                            |
-| `gitlab.com`                             | `except: :production` | `gitlab.com`                                               |
-| `staging.gitlab.com`                     | `except: { subdomain: :staging }` | `(staging).+.com`                              |
-| `gitlab.com and staging.gitlab.com`      | `except: { subdomain: /(staging.)?/, domain: 'gitlab' }` | `(staging.)?gitlab.com` |
-| `dev.gitlab.org`                         | `except: { tld: '.org', domain: 'gitlab', subdomain: 'dev' }` | `(dev).gitlab.org` |
-| `staging.gitlab.com and domain.gitlab.com` | `except: { subdomain: %i[staging domain] }` | `(staging\|domain).+.com`             |
-| The `nightly` pipeline                     | `only: { pipeline: :nightly }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) |
-| The `nightly` and `canary` pipelines | `only: { pipeline: [:nightly, :canary] }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) |
-| The `ee:instance` job | `except: { job: 'ee:instance' }` | The `ee:instance` job in any pipeline |
-| Any `quarantine` job | `except: { job: '.*quarantine' }` | Any job ending in `quarantine` in any pipeline |
-| Any run except where condition evaluates to a truthy value | `except: { condition: -> { ENV['TEST_ENV'] == 'true' } }` | Any run where `TEST_ENV` is not set to true |
+| Test execution context                                     | Key                                                           | Matches                                                                                                                                                |
+| ---------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `gitlab.com`                                               | `except: :production`                                         | `gitlab.com`                                                                                                                                           |
+| `staging.gitlab.com`                                       | `except: { subdomain: :staging }`                             | `(staging).+.com`                                                                                                                                      |
+| `gitlab.com and staging.gitlab.com`                        | `except: { subdomain: /(staging.)?/, domain: 'gitlab' }`      | `(staging.)?gitlab.com`                                                                                                                                |
+| `dev.gitlab.org`                                           | `except: { tld: '.org', domain: 'gitlab', subdomain: 'dev' }` | `(dev).gitlab.org`                                                                                                                                     |
+| `staging.gitlab.com and domain.gitlab.com`                 | `except: { subdomain: %i[staging domain] }`                   | `(staging\|domain).+.com`                                                                                                                              |
+| The `nightly` pipeline                                     | `only: { pipeline: :nightly }`                                | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules)                                                              |
+| The `nightly` and `canary` pipelines                       | `only: { pipeline: [:nightly, :canary] }`                     | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) |
+| The `ee:instance` job                                      | `except: { job: 'ee:instance' }`                              | The `ee:instance` job in any pipeline                                                                                                                  |
+| Any `quarantine` job                                       | `except: { job: '.*quarantine' }`                             | Any job ending in `quarantine` in any pipeline                                                                                                         |
+| Any run except where condition evaluates to a truthy value | `except: { condition: -> { ENV['TEST_ENV'] == 'true' } }`     | Any run where `TEST_ENV` is not set to true                                                                                                            |
 
 ```ruby
 RSpec.describe 'Area' do
diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md
index b5646f7e7d3..92792a4b1a1 100644
--- a/doc/development/testing_guide/end_to_end/index.md
+++ b/doc/development/testing_guide/end_to_end/index.md
@@ -8,42 +8,31 @@ info: Any user with at least the Maintainer role can merge updates to this conte
 
 ## What is end-to-end testing?
 
-End-to-end (e2e) testing is a strategy used to check whether your application works
-as expected across the entire software stack and architecture, including
-integration of all micro-services and components that are supposed to work
-together.
+End-to-end (e2e) testing is a strategy used to check whether your application works as expected across the entire software stack and architecture, including integration of all micro-services and components that are supposed to work together.
 
 ## How do we test GitLab?
 
-We use [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab) to build GitLab packages and then we test these packages
-using the [GitLab QA orchestrator](https://gitlab.com/gitlab-org/gitlab-qa) tool to run the end-to-end tests located in the `qa` directory.
+We use [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab) to build GitLab packages and then we test these packages using the [GitLab QA orchestrator](https://gitlab.com/gitlab-org/gitlab-qa) tool to run the end-to-end tests located in the `qa` directory.
 
 Additionally, we use the [GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit) (GDK) as a test environment that can be deployed quickly for faster test feedback.
 
 ### Testing nightly builds
 
-We run scheduled pipelines each night to test nightly builds created by Omnibus.
-You can find these pipelines at <https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules>
-(requires the Developer role). Results are reported in the `#e2e-run-master` Slack channel.
+We run scheduled pipelines each night to test nightly builds created by Omnibus. You can find these pipelines at <https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules> (requires the Developer role). Results are reported in the `#e2e-run-master` Slack channel.
 
 ### Testing staging
 
-We run scheduled pipelines each night to test staging.
-You can find these pipelines at <https://gitlab.com/gitlab-org/quality/staging/pipelines>
-(requires the Developer role). Results are reported in the `#e2e-run-staging` Slack channel.
+We run scheduled pipelines each night to test staging. You can find these pipelines at <https://gitlab.com/gitlab-org/quality/staging/pipelines> (requires the Developer role). Results are reported in the `#e2e-run-staging` Slack channel.
 
 ### Testing code in merge requests
 
 #### Using the test-on-omnibus job
 
-It is possible to run end-to-end tests for a merge request by triggering the `e2e:test-on-omnibus` manual action in the `qa` stage (not
-available for forks).
+It is possible to run end-to-end tests for a merge request by triggering the `e2e:test-on-omnibus` manual action in the `qa` stage (not available for forks).
 
-**This runs end-to-end tests against a custom EE (with an Ultimate license)
-Docker image built from your merge request's changes.**
+**This runs end-to-end tests against a custom EE (with an Ultimate license) Docker image built from your merge request's changes.**
 
-Manual action that starts end-to-end tests is also available
-in [`gitlab-org/omnibus-gitlab` merge requests](https://docs.gitlab.com/omnibus/build/team_member_docs.html#i-have-an-mr-in-the-omnibus-gitlab-project-and-want-a-package-or-docker-image-to-test-it).
+Manual action that starts end-to-end tests is also available in [`gitlab-org/omnibus-gitlab` merge requests](https://docs.gitlab.com/omnibus/build/team_member_docs.html#i-have-an-mr-in-the-omnibus-gitlab-project-and-want-a-package-or-docker-image-to-test-it).
 
 ##### How does it work?
 
@@ -87,8 +76,7 @@ subgraph " `gitlab-org/gitlab-qa-mirror` pipeline"
 
 NOTE:
 You may have noticed that we use `gitlab-org/build/omnibus-gitlab-mirror` instead of
-`gitlab-org/omnibus-gitlab`.
-This is due to technical limitations in the GitLab permission model: the ability to run a pipeline
+`gitlab-org/omnibus-gitlab`. This is due to technical limitations in the GitLab permission model: the ability to run a pipeline
 against a protected branch is controlled by the ability to push/merge to this branch.
 This means that for developers to be able to trigger a pipeline for the default branch in
 `gitlab-org/omnibus-gitlab`, they would need to have the Maintainer role for this project.
@@ -98,20 +86,17 @@ This problem was discovered in <https://gitlab.com/gitlab-org/gitlab-qa/-/issues
 work-around was suggested in <https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4717>.
 A feature proposal to segregate access control regarding running pipelines from ability to push/merge was also created at <https://gitlab.com/gitlab-org/gitlab/-/issues/24585>.
 
-For more technical details on CI/CD setup and documentation on adding new test jobs to `e2e:test-on-omnibus` pipeline, see
-[`e2e:test-on-omnibus` setup documentation](test_pipelines.md).
+For more technical details on CI/CD setup and documentation on adding new test jobs to `e2e:test-on-omnibus` pipeline, see [`e2e:test-on-omnibus` setup documentation](test_pipelines.md).
 
 #### Using the `test-on-gdk` job
 
-The `e2e:test-on-gdk` job is run automatically in most merge requests, which triggers a [child-pipeline](../../../ci/pipelines/downstream_pipelines.md#parent-child-pipelines)
-that builds and installs a GDK instance from your merge request's changes, and then executes end-to-end tests against that GDK instance.
+The `e2e:test-on-gdk` job is run automatically in most merge requests, which triggers a [child-pipeline](../../../ci/pipelines/downstream_pipelines.md#parent-child-pipelines) that builds and installs a GDK instance from your merge request's changes, and then executes end-to-end tests against that GDK instance.
 
 ##### How does it work?
 
 In the [`gitlab-org/gitlab` pipeline](https://gitlab.com/gitlab-org/gitlab):
 
-1. The [`build-gdk-image` job](https://gitlab.com/gitlab-org/gitlab/-/blob/07504c34b28ac656537cd60810992aa15e9e91b8/.gitlab/ci/build-images.gitlab-ci.yml#L32)
-   uses the code from the merge request to build a Docker image for a GDK instance.
+1. The [`build-gdk-image` job](https://gitlab.com/gitlab-org/gitlab/-/blob/07504c34b28ac656537cd60810992aa15e9e91b8/.gitlab/ci/build-images.gitlab-ci.yml#L32) uses the code from the merge request to build a Docker image for a GDK instance.
 1. The `e2e:test-on-gdk` trigger job creates a child pipeline that executes the end-to-end tests against GDK instances launched from the image built in the previous job.
 
 For more details, see the [documentation for the `e2e:test-on-gdk` pipeline](test_pipelines.md#e2etest-on-gdk).
@@ -140,19 +125,13 @@ The [existing scenarios](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/doc
 that run in the downstream `gitlab-qa-mirror` pipeline include many tests, but there are times when you might want to run a
 test or a group of tests that are different than the groups in any of the existing scenarios.
 
-For example, when we [dequarantine](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#dequarantining-tests)
-a flaky test we first want to make sure that it's no longer flaky.
-We can do that by running `_ee:quarantine` manual job.
-When selecting the name (not the play icon) of manual job,
-you are prompted to enter variables. You can use any of
-[the variables that can be used with `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md#supported-gitlab-environment-variables)
-as well as these:
+For example, when we [dequarantine](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#dequarantining-tests) a flaky test we first want to make sure that it's no longer flaky. We can do that by running `_ee:quarantine` manual job. When selecting the name (not the play icon) of manual job, you are prompted to enter variables. You can use any of [the variables that can be used with `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md#supported-gitlab-environment-variables) as well as these:
 
-| Variable | Description |
-|-|-|
-| `QA_SCENARIO` | The scenario to run (default `Test::Instance::Image`) |
-| `QA_TESTS` | The tests to run (no default, which means run all the tests in the scenario). Use file paths as you would when running tests via RSpec, for example, `qa/specs/features/ee/browser_ui` would include all the `EE` UI tests. |
-| `QA_RSPEC_TAGS` | The RSpec tags to add (default `--tag quarantine`) |
+| Variable        | Description                                                                                                                                                                                                                 |
+| --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `QA_SCENARIO`   | The scenario to run (default `Test::Instance::Image`)                                                                                                                                                                       |
+| `QA_TESTS`      | The tests to run (no default, which means run all the tests in the scenario). Use file paths as you would when running tests by using RSpec, for example, `qa/specs/features/ee/browser_ui` would include all the `EE` UI tests. |
+| `QA_RSPEC_TAGS` | The RSpec tags to add (default `--tag quarantine`)                                                                                                                                                                          |
 
 For now,
 [manual jobs with custom variables don't use the same variable when retried](https://gitlab.com/gitlab-org/gitlab/-/issues/31367),
@@ -162,8 +141,7 @@ many of the 10 available jobs that you want to run).
 
 #### Selective test execution
 
-In order to limit amount of tests executed in a merge request, dynamic selection of which tests to execute is present. Algorithm of which tests to run is based
-on changed files and merge request labels. Following criteria determine which tests will run:
+In order to limit amount of tests executed in a merge request, dynamic selection of which tests to execute is present. Algorithm of which tests to run is based on changed files and merge request labels. Following criteria determine which tests will run:
 
 1. Changes in `qa` framework code would execute the full suite
 1. Changes in particular `_spec.rb` file in `qa` folder would execute only that particular test. In this case knapsack will not be used to run jobs in parallel.
@@ -186,89 +164,60 @@ Examples could include:
 Skip running end-to-end tests by applying the `pipeline:skip-e2e` label to the merge request.
 
 WARNING:
-There is a risk in skipping end-to-end tests. Use caution and discretion when applying this label.
-The end-to-end test suite is the last line of defense before changes are merged into the default branch.
-Skipping these tests increases the risk of introducing regressions into the codebase.
+There is a risk in skipping end-to-end tests. Use caution and discretion when applying this label. The end-to-end test suite is the last line of defense before changes are merged into the default branch. Skipping these tests increases the risk of introducing regressions into the codebase.
 
-### Run tests in parallel
+## Test pipeline tools and configuration
 
-To run tests in parallel on CI, the [Knapsack](https://github.com/KnapsackPro/knapsack)
-gem is used. Knapsack reports are generated automatically and stored in the `GCS` bucket
-`knapsack-reports` in the `gitlab-qa-resources` project. The [`KnapsackReport`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/qa/support/knapsack_report.rb)
-helper handles automated report generation and upload.
+### Test parallelization
 
-## Test metrics
+Our CI setup uses the [`knapsack`](https://github.com/KnapsackPro/knapsack) gem to enable test parallelization. Knapsack reports are automatically generated and stored in the `knapsack-reports` GCS bucket within the `gitlab-qa-resources` project. The [`KnapsackReport`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/qa/support/knapsack_report.rb) helper manages the report generation and upload process.
 
-For additional test health visibility, use a custom setup to export test execution
-results to your [InfluxDb](https://influxdb.quality.gitlab.net/) instance, and visualize
-results as [Grafana](https://dashboards.quality.gitlab.net/) dashboards.
+### Test metrics
+
+To enhance test health visibility, a custom setup exports the pipeline's test execution results to an [InfluxDB](https://influxdb.quality.gitlab.net/) instance, with results visualized on [Grafana](https://dashboards.quality.gitlab.net/) dashboards.
+
+### Test reports
+
+#### Allure report
+
+For additional test results visibility, tests that run on pipelines generate and host [Allure](https://github.com/allure-framework/allure2) test reports.
+
+The `QA` framework is using the [Allure RSpec](https://github.com/allure-framework/allure-ruby/blob/master/allure-rspec/README.md) gem to generate source files for the `Allure` test report. An additional job in the pipeline:
+
+- Fetches these source files from all test jobs.
+- Generates and uploads the report to the `S3` bucket `gitlab-qa-allure-report` located in `AWS` group project `eng-quality-ops-ci-cd-shared-infra`.
+
+A common CI template for report uploading is stored in [`allure-report.yml`](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/allure-report.yml).
+
+##### Merge requests
+
+When these tests are executed in the scope of merge requests, the `Allure` report is uploaded to the `GCS` bucket and a bot comment is added linking to their respective reports.
+
+##### Scheduled pipelines
+
+Scheduled pipelines for these tests contain a `generate-allure-report` job under the `Report` stage. They also output a link to the current test report. Each type of scheduled pipeline generates a static link for the latest test report according to its stage. You can find a list of this in the [GitLab handbook](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/pipeline-monitoring/#allure-report).
 
 ### Provisioning
 
-Provisioning of all components is performed by the
-[`engineering-productivity-infrastructure`](https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure) project.
+Provisioning of all components is performed by the [`engineering-productivity-infrastructure`](https://gitlab.com/gitlab-org/quality/engineering-productivity-infrastructure) project.
 
 ### Exporting metrics in CI
 
 Use these environment variables to configure metrics export:
 
-| Variable | Required | Information |
-| -------- | -------- | ----------- |
-| `QA_INFLUXDB_URL` | `true` | Should be set to `https://influxdb.quality.gitlab.net`. No default value. |
-| `QA_INFLUXDB_TOKEN` | `true` | InfluxDB write token that can be found under `Influxdb auth tokens` document in `Gitlab-QA` `1Password` vault. No default value. |
-| `QA_RUN_TYPE` | `false` | Arbitrary name for test execution, like `e2e:test-on-omnibus`. Automatically inferred from the project name for live environment test executions. No default value. |
-| `QA_EXPORT_TEST_METRICS` | `false` | Flag to enable or disable metrics export to InfluxDB. Defaults to `false`. |
-| `QA_SAVE_TEST_METRICS` | `false` | Flag to enable or disable saving metrics as JSON file. Defaults to `false`. |
-
-## Test reports
-
-### Allure report
-
-For additional test results visibility, tests that run on pipelines generate
-and host [Allure](https://github.com/allure-framework/allure2) test reports.
-
-The `QA` framework is using the [Allure RSpec](https://github.com/allure-framework/allure-ruby/blob/master/allure-rspec/README.md)
-gem to generate source files for the `Allure` test report. An additional job in the pipeline:
-
-- Fetches these source files from all test jobs.
-- Generates and uploads the report to the `S3` bucket `gitlab-qa-allure-report` located in `AWS` group project `eng-quality-ops-ci-cd-shared-infra`.
-
-A common CI template for report uploading is stored in
-[`allure-report.yml`](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/allure-report.yml).
-
-#### Merge requests
-
-When these tests are executed in the scope of merge requests, the `Allure` report is
-uploaded to the `GCS` bucket and comment is added linking to their respective reports.
-
-#### Scheduled pipelines
-
-Scheduled pipelines for these tests contain a `generate-allure-report` job under the `Report` stage. They also output
-a link to the current test report.
-
-#### Static report links
-
-Each type of scheduled pipeline generates a static link for the latest test report according to its stage:
-
-- [`master`](http://gitlab-qa-allure-reports.s3.amazonaws.com/e2e-test-on-omnibus/master/index.html)
-- [`staging-full`](http://gitlab-qa-allure-reports.s3.amazonaws.com/staging-full/master/index.html)
-- [`staging-sanity`](http://gitlab-qa-allure-reports.s3.amazonaws.com/staging-sanity/master/index.html)
-- [`canary-sanity`](http://gitlab-qa-allure-reports.s3.amazonaws.com/canary-sanity/master/index.html)
-- [`production`](http://gitlab-qa-allure-reports.s3.amazonaws.com/production-full/master/index.html)
-- [`production-sanity`](http://gitlab-qa-allure-reports.s3.amazonaws.com/production-sanity/master/index.html)
+| Variable                 | Required | Information                                                                                                                                                         |
+| ------------------------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `QA_INFLUXDB_URL`        | `true`   | Should be set to `https://influxdb.quality.gitlab.net`. No default value.                                                                                           |
+| `QA_INFLUXDB_TOKEN`      | `true`   | InfluxDB write token that can be found under `Influxdb auth tokens` document in `Gitlab-QA` `1Password` vault. No default value.                                    |
+| `QA_RUN_TYPE`            | `false`  | Arbitrary name for test execution, like `e2e:test-on-omnibus`. Automatically inferred from the project name for live environment test executions. No default value. |
+| `QA_EXPORT_TEST_METRICS` | `false`  | Flag to enable or disable metrics export to InfluxDB. Defaults to `false`.                                                                                          |
+| `QA_SAVE_TEST_METRICS`   | `false`  | Flag to enable or disable saving metrics as JSON file. Defaults to `false`.                                                                                         |
 
 ## How do you run the tests?
 
-If you are not [testing code in a merge request](#testing-code-in-merge-requests),
-there are two main options for running the tests. If you want to run
-the existing tests against a live GitLab instance or against a pre-built Docker image,
-use the [GitLab QA orchestrator](https://gitlab.com/gitlab-org/gitlab-qa/tree/master/README.md). See also
-[examples of the test scenarios you can run via the orchestrator](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md#examples).
+If you are not [testing code in a merge request](#testing-code-in-merge-requests), there are two main options for running the tests. If you want to run the existing tests against a live GitLab instance or against a pre-built Docker image, use the [GitLab QA orchestrator](https://gitlab.com/gitlab-org/gitlab-qa/tree/master/README.md). See also [examples of the test scenarios you can run by using the orchestrator](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md#examples).
 
-On the other hand, if you would like to run against a local development GitLab
-environment, you can use the [GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit/).
-Refer to the instructions in the [QA README](https://gitlab.com/gitlab-org/gitlab/-/tree/master/qa/README.md#how-can-i-use-it)
-and the section below.
+On the other hand, if you would like to run against a local development GitLab environment, you can use the [GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit/). Refer to the instructions in the [QA README](https://gitlab.com/gitlab-org/gitlab/-/tree/master/qa/README.md#how-can-i-use-it) and the section below.
 
 ### Running tests that require special setup
 
@@ -278,10 +227,7 @@ Learn how to perform [tests that require special setup or consideration to run o
 
 Before you write new tests, review the [GitLab QA architecture](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/architecture.md).
 
-After you've decided where to put [test environment orchestration scenarios](https://gitlab.com/gitlab-org/gitlab-qa/tree/master/lib/gitlab/qa/scenario) and
-[instance-level scenarios](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/qa/qa/specs/features), take a look at the [GitLab QA README](https://gitlab.com/gitlab-org/gitlab/-/tree/master/qa/README.md),
-the [GitLab QA orchestrator README](https://gitlab.com/gitlab-org/gitlab-qa/tree/master/README.md),
-and [the already existing instance-level scenarios](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/qa/qa/specs/features).
+After you've decided where to put [test environment orchestration scenarios](https://gitlab.com/gitlab-org/gitlab-qa/tree/master/lib/gitlab/qa/scenario) and [instance-level scenarios](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/qa/qa/specs/features), take a look at the [GitLab QA README](https://gitlab.com/gitlab-org/gitlab/-/tree/master/qa/README.md), the [GitLab QA orchestrator README](https://gitlab.com/gitlab-org/gitlab-qa/tree/master/README.md), and [the already existing instance-level scenarios](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/qa/qa/specs/features).
 
 ### Consider **not** writing an end-to-end test
 
@@ -290,20 +236,43 @@ We should follow these best practices for end-to-end tests:
 - Do not write an end-to-end test if a lower-level feature test exists. End-to-end tests require more work and resources.
 - Troubleshooting for end-to-end tests can be more complex as connections to the application under test are not known.
 
-Continued reading:
+## Continued reading
 
-- [Beginner's Guide](beginners_guide/index.md)
-- [Style Guide](style_guide.md)
-- [Best Practices](best_practices/index.md)
-- [Testing with feature flags](best_practices/feature_flags.md)
-- [Flows](beginners_guide/flows.md)
-- [RSpec metadata/tags](best_practices/rspec_metadata_tests.md)
-- [Execution context selection](best_practices/execution_context_selection.md)
-- [Troubleshooting](troubleshooting.md)
+### Getting started with E2E testing
+
+- [Beginner's Guide](beginners_guide/index.md): An introductory guide to help new contributors get started with E2E testing
+  - [Flows](beginners_guide/flows.md): Overview of `Flows` used to capture reusable sequences of actions in tests
+  - [Page objects](beginners_guide/page_objects.md): Explanation of page objects and their role in test design
+  - [Resources](beginners_guide/resources.md): Overview of `Resources` class that used for creating test data
+
+### Best practices
+
+- [Best practices when writing end-to-end tests](best_practices/index.md): Guidelines for efficient and reliable E2E testing
+  - [Dynamic element validation](best_practices/dynamic_element_validation.md): Techniques for handling dynamic elements in tests
+  - [Execution context selection](best_practices/execution_context_selection.md): Tips for choosing the right execution context for tests to run on
+  - [Testing with feature flags](best_practices/feature_flags.md): Managing feature flags during tests
+  - [RSpec metadata for end-to-end tests](best_practices/rspec_metadata_tests.md): Using metadata to organize and categorize tests
+  - [Test users](best_practices/users.md): Guidelines for creating and managing test users
+  - [Waits](best_practices/waits.md): Best practices for using waits to handle asynchronous elements
+- [Style guide for writing end-to-end tests](style_guide.md): Standards and conventions to ensure consistency in E2E tests
+
+### Testing infrastructure
+
+- [Test pipelines](test_pipelines.md): Overview of the pipeline setup for E2E tests, including parallelization and CI configuration
+- [Test infrastructure for cloud integrations](test_infrastructure.md): Describes cloud-specific setups
+
+### Running and troubleshooting tests
+
+- [Running tests](running_tests/index.md): Instructions for executing tests
+  - [Running tests that require special setup](running_tests/running_tests_that_require_special_setup.md): Specific setup requirements for certain tests
+- [Troubleshooting](troubleshooting.md): Common issues encountered during E2E testing and solutions
+
+### Miscellaneous
+
+- [Test Platform Sub-Department handbook](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/): Topics related to our vision, monitoring practices, failure triage processes, etc
+- [`gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/tree/master/docs): For information regarding the use of the GitLab QA orchestrator
+- [`customers-gitlab-com`](https://gitlab.com/gitlab-org/customers-gitlab-com/-/tree/main/qa/doc) (internal only): For guides that are specific to the CustomersDot platform
 
 ## Where can you ask for help?
 
-You can ask question in the `#test-platform` channel on Slack (GitLab internal) or
-you can find an issue you would like to work on in
-[the `gitlab` issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues?label_name%5B%5D=QA&label_name%5B%5D=test), or
-[the `gitlab-qa` issue tracker](https://gitlab.com/gitlab-org/gitlab-qa/-/issues?label_name%5B%5D=new+scenario).
+You can ask question in the `#test-platform` channel on Slack (GitLab internal) or you can find an issue you would like to work on in [the `gitlab` issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues?label_name%5B%5D=QA&label_name%5B%5D=test).
diff --git a/doc/development/testing_guide/end_to_end/test_pipelines.md b/doc/development/testing_guide/end_to_end/test_pipelines.md
index ac6360e5cd1..13f258a8a50 100644
--- a/doc/development/testing_guide/end_to_end/test_pipelines.md
+++ b/doc/development/testing_guide/end_to_end/test_pipelines.md
@@ -39,7 +39,7 @@ E2E test execution pipeline consists of several stages which all support executi
 
 This stage is responsible for the following tasks:
 
-- Fetching `knapsack` reports that support [parallel test execution](index.md#run-tests-in-parallel).
+- Fetching `knapsack` reports that support [parallel test execution](index.md#test-parallelization).
 - Triggering downstream pipeline which builds the [`omnibus-gitlab`](https://gitlab.com/gitlab-org/omnibus-gitlab) Docker image.
 
 ##### test
@@ -175,7 +175,7 @@ execution of E2E tests.
 
 ##### .pre
 
-This stage is responsible for fetching `knapsack` reports that support [parallel test execution](index.md#run-tests-in-parallel).
+This stage is responsible for fetching `knapsack` reports that support [parallel test execution](index.md#test-parallelization).
 
 ##### test
 
diff --git a/doc/editor_extensions/visual_studio_code/custom_queries.md b/doc/editor_extensions/visual_studio_code/custom_queries.md
index 61424b298b5..8066a3492b4 100644
--- a/doc/editor_extensions/visual_studio_code/custom_queries.md
+++ b/doc/editor_extensions/visual_studio_code/custom_queries.md
@@ -1,7 +1,7 @@
 ---
 stage: Create
 group: Editor Extensions
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
 # Custom queries in the VS Code extension
diff --git a/doc/editor_extensions/visual_studio_code/remote_urls.md b/doc/editor_extensions/visual_studio_code/remote_urls.md
index a06447b385b..e7955fd9040 100644
--- a/doc/editor_extensions/visual_studio_code/remote_urls.md
+++ b/doc/editor_extensions/visual_studio_code/remote_urls.md
@@ -1,7 +1,7 @@
 ---
 stage: Create
 group: Editor Extensions
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
 # GitLab remote URL format
diff --git a/doc/editor_extensions/visual_studio_code/ssl.md b/doc/editor_extensions/visual_studio_code/ssl.md
index ac6c4ccaca0..9bb2022a02a 100644
--- a/doc/editor_extensions/visual_studio_code/ssl.md
+++ b/doc/editor_extensions/visual_studio_code/ssl.md
@@ -1,7 +1,7 @@
 ---
 stage: Create
 group: Editor Extensions
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
 # Using the VS Code extension with self-signed certificates
diff --git a/doc/editor_extensions/visual_studio_code/troubleshooting.md b/doc/editor_extensions/visual_studio_code/troubleshooting.md
index 8af3bc97178..2ce5c62c972 100644
--- a/doc/editor_extensions/visual_studio_code/troubleshooting.md
+++ b/doc/editor_extensions/visual_studio_code/troubleshooting.md
@@ -1,7 +1,7 @@
 ---
 stage: Create
 group: Editor Extensions
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
 # Troubleshooting the GitLab Workflow extension for VS Code
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index a90a9d0cb0d..172230bd8d7 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -406,6 +406,7 @@ DETAILS:
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151352) as a [beta](../../policy/experiment-beta-support.md#beta) in GitLab 17.0 [with flags](../../administration/feature_flags.md) named `web_ide_oauth` and `web_ide_extensions_marketplace`. Disabled by default.
 > - Feature flag `web_ide_oauth` [enabled on GitLab.com, self-managed, and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163181) and feature flag `web_ide_extensions_marketplace` [enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/459028) in GitLab 17.4.
 > - Feature flag `web_ide_oauth` [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167464) in GitLab 17.5.
+> - Enabled by default for [workspaces](../workspace/index.md) in GitLab 17.6. Workspaces do not require any feature flags for the extension marketplace to be available.
 
 FLAG:
 The availability of this feature is controlled by a feature flag.
@@ -424,6 +425,9 @@ To enable the extension marketplace for the Web IDE and workspaces:
 1. In the third-party extension acknowledgement, select **I understand**.
 1. Select **Save changes**.
 
+NOTE:
+This preferences checkbox will always be available, even if the feature flags are disabled.
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/doc/user/workspace/index.md b/doc/user/workspace/index.md
index 5d395ececc8..ee7303d1ff6 100644
--- a/doc/user/workspace/index.md
+++ b/doc/user/workspace/index.md
@@ -198,14 +198,11 @@ DETAILS:
 **Status:** Beta
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/438491) as a [beta](../../policy/experiment-beta-support.md#beta) in GitLab 16.9 [with a flag](../../administration/feature_flags.md) named `allow_extensions_marketplace_in_workspace`. Disabled by default.
+> - Feature flag `allow_extensions_marketplace_in_workspace` [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/454669) in GitLab 17.6.
 
-FLAG:
-The availability of this feature is controlled by a feature flag.
-For more information, see the history.
-
-When `allow_extensions_marketplace_in_workspace` is enabled, you can use the
-[extension marketplace](../project/web_ide/index.md#extension-marketplace) in workspaces.
-An administrator can enable or disable the flag for top-level groups only.
+You can use the
+[extension marketplace](../project/web_ide/index.md#extension-marketplace) in workspaces
+when it is [enabled](../profile/preferences.md#integrate-with-the-extension-marketplace).
 
 The extension marketplace connects to the [Open VSX Registry](https://open-vsx.org/).
 
diff --git a/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/command.rb b/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/command.rb
index afd226797c2..c1429d366ae 100644
--- a/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/command.rb
+++ b/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/command.rb
@@ -7,7 +7,7 @@ module Gitlab
         # Abstraction to control shell command execution
         # It provides an easier API to common usages
         class Command
-          attr_reader :cmd_args, :env
+          attr_reader :env
 
           # Result data structure from running a command
           #
@@ -29,8 +29,24 @@ module Gitlab
           # @param [Array<String>] cmd_args
           # @param [Hash<String,String>] env
           def initialize(*cmd_args, env: {})
-            @cmd_args = cmd_args
-            @env = env
+            @cmd_args = cmd_args.freeze
+            @env = env.freeze
+          end
+
+          # List of command arguments
+          #
+          # @param [Boolean] with_env whether to include env hash in the returned list
+          # @return [Array<Hash|String>]
+          def cmd_args(with_env: false)
+            if with_env && env.any?
+              # When providing cmd_args to `Open3.pipeline`, the env needs to be the first element of the array.
+              #
+              # While `Open3.capture3` accepts an empty hash as a valid parameter, it doesn't work with
+              # `Open3.pipeline`, so we modify the returned array only when the env hash is not empty.
+              @cmd_args.dup.prepend(env)
+            else
+              @cmd_args.dup
+            end
           end
 
           # Execute a process and return its output and status
@@ -61,7 +77,7 @@ module Gitlab
             options[:in] = input if input # redirect stdin
             options[:out] = output if output # redirect stdout
 
-            status_list = Open3.pipeline(cmd_args, **options)
+            status_list = Open3.pipeline(cmd_args(with_env: true), **options)
             duration = Time.now - start
 
             err_write.close # close the pipe before reading
diff --git a/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/pipeline.rb b/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/pipeline.rb
index e07da53ef5c..ea8ab0f35dd 100644
--- a/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/pipeline.rb
+++ b/gems/gitlab-backup-cli/lib/gitlab/backup/cli/shell/pipeline.rb
@@ -18,9 +18,10 @@ module Gitlab
             end
           end
 
+          # List of Shell::Commands that are part of the pipeline
           attr_reader :shell_commands
 
-          # @param [Array<Shell::Command>] shell_commands
+          # @param [Array<Shell::Command>] shell_commands list of commands
           def initialize(*shell_commands)
             @shell_commands = shell_commands
           end
@@ -58,8 +59,13 @@ module Gitlab
 
           private
 
+          # Returns an array of arrays that contains the expanded command args with their env hashes when available
+          #
+          # The output is intended to be used directly by Open3.pipeline
+          #
+          # @return [Array<Array<Hash,String>>]
           def build_command_list
-            @shell_commands.map(&:cmd_args)
+            @shell_commands.map { |command| command.cmd_args(with_env: true) }
           end
         end
       end
diff --git a/gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/database.rb b/gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/database.rb
index ea5dc775782..58493c9b7dc 100644
--- a/gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/database.rb
+++ b/gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/database.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Cli
       module Targets
         class Database < Target
-          attr_reader :force, :errors
+          attr_reader :errors
 
           IGNORED_ERRORS = [
             # Ignore warnings
@@ -19,11 +19,6 @@ module Gitlab
 
           def initialize
             @errors = []
-
-            # This flag will be removed as part of https://gitlab.com/gitlab-org/gitlab/-/issues/494209
-            # This option will be reintroduced as part of
-            # https://gitlab.com/gitlab-org/gitlab/-/issues/498453
-            @force = false
           end
 
           def dump(destination_dir)
@@ -58,7 +53,7 @@ module Gitlab
 
               raise DatabaseBackupError.new(active_record_config, dump_file_name) unless success
 
-              report_success(success)
+              report_finish_status(success)
             end
           ensure
             if multiple_databases?
@@ -77,8 +72,6 @@ module Gitlab
           end
 
           def restore(destination_dir)
-            @errors = []
-
             base_models_for_backup.each do |database_name, _|
               backup_connection = ::Backup::DatabaseConnection.new(database_name)
 
@@ -89,7 +82,7 @@ module Gitlab
 
               unless File.exist?(db_file_name)
                 if main_database?(database_name)
-                  raise(::Backup::Error, "Source database file does not exist #{db_file_name}")
+                  raise(DatabaseBackupError, "Source database file does not exist #{db_file_name}")
                 end
 
                 Gitlab::Backup::Cli::Output.warning(
@@ -99,48 +92,33 @@ module Gitlab
                 return false
               end
 
-              unless force
-                Gitlab::Backup::Cli::Output.warning(
-                  'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'
-                )
-
-                sleep(5)
-              end
+              Gitlab::Backup::Cli::Output.warning("Removing all tables from #{database_name}.")
 
               # Drop all tables Load the schema to ensure we don't have any newer tables
               # hanging out from a failed upgrade
               drop_tables(database_name)
 
-              tracked_errors = []
               pg_env = backup_connection.database_configuration.pg_env_variables
-              success = with_transient_pg_env(pg_env) do
-                decompress_rd, decompress_wr = IO.pipe
 
-                decompress_pid = spawn(decompression_cmd, out: decompress_wr, in: db_file_name)
-                decompress_wr.close
+              pipeline = Gitlab::Backup::Cli::Shell::Pipeline.new(
+                Utils::Compression.decompression_command,
+                pg_restore_cmd(database, pg_env)
+              )
 
-                status, tracked_errors =
-                  case config[:adapter]
-                  when "postgresql"
-                    Gitlab::Backup::Cli::Output.print_info "Restoring PostgreSQL database #{database} ... "
-                    execute_and_track_errors(pg_restore_cmd(database), decompress_rd)
-                  end
-                decompress_rd.close
+              Gitlab::Backup::Cli::Output.print_info "Restoring PostgreSQL database #{database} ... "
 
-                Process.waitpid(decompress_pid)
-                $CHILD_STATUS.success? && status.success?
-              end
+              pipeline_status = pipeline.run!(input: db_file_name)
+              tracked_errors = pipeline_status.stderr
 
               unless tracked_errors.empty?
                 Gitlab::Backup::Cli::Output.error "------ BEGIN ERRORS -----"
                 Gitlab::Backup::Cli::Output.print(tracked_errors.join, stderr: true)
                 Gitlab::Backup::Cli::Output.error "------ END ERRORS -------"
-
-                @errors += tracked_errors
               end
 
-              report_success(success)
-              raise ::Backup::Error, 'Restore failed' unless success
+              report_finish_status(pipeline_status.success?)
+
+              raise DatabaseBackupError, 'Restore failed' unless pipeline_status.success?
             end
           end
 
@@ -164,43 +142,10 @@ module Gitlab
             IGNORED_ERRORS_REGEXP.match?(line)
           end
 
-          def execute_and_track_errors(cmd, decompress_rd)
-            errors = []
-
-            Open3.popen3(ENV, *cmd) do |stdin, stdout, stderr, thread|
-              stdin.binmode
-
-              out_reader = Thread.new do
-                data = stdout.read
-                $stdout.write(data) # rubocop:disable Rails/Output
-              end
-
-              err_reader = Thread.new do
-                until (raw_line = stderr.gets).nil?
-                  warn(raw_line)
-                  errors << raw_line unless ignore_error?(raw_line)
-                end
-              end
-
-              begin
-                IO.copy_stream(decompress_rd, stdin)
-              rescue Errno::EPIPE
-              end
-
-              stdin.close
-              [thread, out_reader, err_reader].each(&:join)
-              [thread.value, errors]
-            end
-          end
-
           private
 
-          def decompression_cmd
-            Utils::Compression.decompression_command.cmd_args.flatten.first
-          end
-
-          def report_success(success)
-            Gitlab::Backup::Cli::Output.print_tag(success ? :success : :failure)
+          def report_finish_status(status)
+            Gitlab::Backup::Cli::Output.print_tag(status ? :success : :failure)
           end
 
           def drop_tables(database_name)
@@ -225,8 +170,8 @@ module Gitlab
             result
           end
 
-          def pg_restore_cmd(database)
-            ['psql', database]
+          def pg_restore_cmd(database, pg_env)
+            Shell::Command.new('psql', database, env: pg_env)
           end
 
           def each_database(destination_dir, &block)
diff --git a/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/command_spec.rb b/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/command_spec.rb
index a9be4c09c06..053bc3a2732 100644
--- a/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/command_spec.rb
+++ b/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/command_spec.rb
@@ -17,6 +17,33 @@ RSpec.describe Gitlab::Backup::Cli::Shell::Command do
     end
   end
 
+  describe '#cmd_args' do
+    let(:cmd_args) { %w[ls -l] }
+
+    it 'returns a list of command args' do
+      cmd = command.new(*cmd_args)
+
+      expect(cmd.cmd_args).to eq(cmd_args)
+    end
+
+    context 'when with_env is true' do
+      it 'returns the same list of command args when no env is provided' do
+        cmd = command.new(*cmd_args)
+
+        expect(cmd.cmd_args(with_env: true)).to eq(cmd_args)
+      end
+
+      it 'returns a list of command args with the env hash as its first element' do
+        cmd = command.new(*cmd_args, env: envdata)
+
+        result = cmd.cmd_args(with_env: true)
+
+        expect(result.first).to eq(envdata)
+        expect(result[1..]).to eq(cmd_args)
+      end
+    end
+  end
+
   describe '#capture' do
     it 'returns stdout from executed command' do
       expected_output = 'my custom content'
@@ -48,5 +75,80 @@ RSpec.describe Gitlab::Backup::Cli::Shell::Command do
 
       expect(result.duration).to be > 0.1
     end
+
+    it 'sets the provided env variables as part of process execution' do
+      result = command.new("echo \"variable value ${CUSTOM}\"", env: envdata).capture
+
+      expect(result.stdout.chomp).to eq('variable value data')
+    end
+  end
+
+  describe '#run_single_pipeline!' do
+    it 'runs without any exceptions' do
+      expect { command.new('true').run_single_pipeline! }.not_to raise_exception
+    end
+
+    it 'sets env variables from provided commands as part of pipeline execution' do
+      echo_command = command.new("echo \"variable value ${CUSTOM}\"", env: envdata)
+      read_io, write_io = IO.pipe
+
+      echo_command.run_single_pipeline!(output: write_io)
+      write_io.close
+      output = read_io.read.chomp
+      read_io.close
+
+      expect(output).to eq('variable value data')
+    end
+
+    it 'accepts stdin and stdout redirection' do
+      echo_command = command.new(%(ruby -e "print 'stdin is : ' + STDIN.readline"))
+      input_r, input_w = IO.pipe
+      input_w.sync = true
+      input_w.print 'my custom content'
+      input_w.close
+
+      output_r, output_w = IO.pipe
+
+      result = echo_command.run_single_pipeline!(input: input_r, output: output_w)
+
+      input_r.close
+      output_w.close
+      output = output_r.read
+      output_r.close
+
+      expect(result.status).to be_success
+      expect(output).to match(/stdin is : my custom content/)
+    end
+
+    it 'returns a Command::SinglePipelineResult' do
+      result = command.new('true').run_single_pipeline!
+
+      expect(result).to be_a(Gitlab::Backup::Cli::Shell::Command::SinglePipelineResult)
+    end
+
+    context 'with Pipeline::Status' do
+      it 'includes stderr from the executed pipeline' do
+        expected_output = 'my custom error content'
+        err_command = command.new("echo #{expected_output} > /dev/stderr")
+
+        result = err_command.run_single_pipeline!
+
+        expect(result.stderr.chomp).to eq(expected_output)
+      end
+
+      it 'executed pipelines returns a Process::Status in the status field' do
+        result = command.new('true').run_single_pipeline!
+
+        expect(result.status).to be_a(Process::Status)
+        expect(result.status).to respond_to(:exited?, :termsig, :stopsig, :exitstatus, :success?, :pid)
+      end
+
+      it 'includes a list of Process::Status that handles exit signals' do
+        result = command.new('false').run_single_pipeline!
+
+        expect(result.status).to satisfy { |status| !status.success? }
+        expect(result.status).to satisfy { |status| status.exitstatus == 1 }
+      end
+    end
   end
 end
diff --git a/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/pipeline_spec.rb b/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/pipeline_spec.rb
index b76fe23989f..16470d89574 100644
--- a/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/pipeline_spec.rb
+++ b/gems/gitlab-backup-cli/spec/gitlab/backup/cli/shell/pipeline_spec.rb
@@ -6,6 +6,9 @@ RSpec.describe Gitlab::Backup::Cli::Shell::Pipeline do
   let(:sort_command) { command.new('sort') }
   let(:true_command) { command.new('true') }
   let(:false_command) { command.new('false') }
+  let(:envdata) do
+    { 'CUSTOM' => 'data' }
+  end
 
   subject(:pipeline) { described_class }
 
@@ -28,6 +31,18 @@ RSpec.describe Gitlab::Backup::Cli::Shell::Pipeline do
       expect(result).to be_a(Gitlab::Backup::Cli::Shell::Pipeline::Result)
     end
 
+    it 'sets env variables from provided commands as part of pipeline execution' do
+      echo_command = command.new("echo \"variable value ${CUSTOM}\"", env: envdata)
+      read_io, write_io = IO.pipe
+
+      pipeline.new(true_command, echo_command).run!(output: write_io)
+      write_io.close
+      output = read_io.read.chomp
+      read_io.close
+
+      expect(output).to eq('variable value data')
+    end
+
     context 'with Pipeline::Status' do
       it 'includes stderr from the executed pipeline' do
         expected_output = 'my custom error content'
diff --git a/lib/gitlab/auth/atlassian/token_refresher.rb b/lib/gitlab/auth/atlassian/token_refresher.rb
index ca700cff194..9756b99c7fc 100644
--- a/lib/gitlab/auth/atlassian/token_refresher.rb
+++ b/lib/gitlab/auth/atlassian/token_refresher.rb
@@ -19,7 +19,7 @@ module Gitlab
         end
 
         def refresh!
-          response = Gitlab::HTTP_V2.post(REFRESH_TOKEN_URL, body: payload.to_json, headers: headers)
+          response = Gitlab::HTTP.post(REFRESH_TOKEN_URL, body: payload.to_json, headers: headers)
           raise AtlassianTokenRefreshError, response["error"] unless response.success?
 
           identity.update!(
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6717f184864..466485608c8 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5109,6 +5109,9 @@ msgstr ""
 msgid "AiImpactAnalytics|Value can't be calculated due to insufficient data."
 msgstr ""
 
+msgid "AiPowered|Assign seats"
+msgstr ""
+
 msgid "AiPowered|By turning on self-hosted AI models, you agree to the %{linkStart}GitLab Testing Agreement%{linkEnd}. This action cannot be reversed."
 msgstr ""
 
@@ -5127,6 +5130,9 @@ msgstr ""
 msgid "AiPowered|Enabling these features is your acceptance of the %{linkStart}GitLab Testing Agreement%{linkEnd}."
 msgstr ""
 
+msgid "AiPowered|End date: %{endDate}"
+msgstr ""
+
 msgid "AiPowered|Enroll in the Early Access Program"
 msgstr ""
 
@@ -5151,6 +5157,9 @@ msgstr ""
 msgid "AiPowered|Might result in requests having higher latency."
 msgstr ""
 
+msgid "AiPowered|Monitor, manage, and customize AI features to ensure efficient utilization and alignment."
+msgstr ""
+
 msgid "AiPowered|Never on"
 msgstr ""
 
@@ -5163,6 +5172,9 @@ msgstr ""
 msgid "AiPowered|Participate in the Early Access Program and help make GitLab better"
 msgstr ""
 
+msgid "AiPowered|Purchase seats"
+msgstr ""
+
 msgid "AiPowered|Self-hosted AI models"
 msgstr ""
 
@@ -5172,6 +5184,9 @@ msgstr ""
 msgid "AiPowered|Specify how code completion requests are sent to the AI gateway."
 msgstr ""
 
+msgid "AiPowered|Start date: %{startDate}"
+msgstr ""
+
 msgid "AiPowered|These features are being developed and might be unstable. %{linkStart}What do experiment and beta mean?%{linkEnd}"
 msgstr ""
 
@@ -10611,9 +10626,6 @@ msgstr ""
 msgid "CICD|Select the groups and projects authorized to use a CI/CD job token to authenticate requests to this project. %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
-msgid "CICD|Target project is already in the job token scope."
-msgstr ""
-
 msgid "CICD|The %{boldStart}Limit access %{boldEnd}%{italicAndBoldStart}from%{italicAndBoldEnd}%{boldStart} this project%{boldEnd} setting is deprecated and scheduled for removal in the 18.0 milestone. Use the %{boldStart}Authorized groups and projects%{boldEnd} setting and allowlist instead. %{linkStart}How do I do this?%{linkEnd}"
 msgstr ""
 
@@ -39815,6 +39827,9 @@ msgstr ""
 msgid "Paste a public key here. %{link_start}How do I generate it?%{link_end}"
 msgstr ""
 
+msgid "Paste group or project path. Example: %{codeStart}gitlab-org/gitlab%{codeEnd}."
+msgstr ""
+
 msgid "Paste project path (i.e. gitlab-org/gitlab)"
 msgstr ""
 
@@ -40088,9 +40103,6 @@ msgstr ""
 msgid "PhoneVerification|You've reached the maximum number of tries. Wait %{interval} and try again."
 msgstr ""
 
-msgid "Pick a group or project"
-msgstr ""
-
 msgid "Pipeline"
 msgstr ""
 
@@ -41602,7 +41614,13 @@ msgstr ""
 msgid "PreferencesIntegrations|Third-Party Extensions Acknowledgement"
 msgstr ""
 
-msgid "PreferencesIntegrations|Third-party extensions are now available in the Web IDE. While each extension runs in a secure browser sandbox, %{boldStart}third-party extensions%{boldEnd} may have access to the contents of the files opened in the Web IDE, %{boldStart}including any personal data in those files%{boldEnd}, and may communicate with external servers."
+msgid "PreferencesIntegrations|Third-party extensions are now available in the Web IDE and Workspaces. While each extension runs in a secure browser sandbox, %{boldStart}third-party extensions%{boldEnd} may have access to the contents of the files opened in the Web IDE or Workspaces, %{boldStart}including any personal data in those files%{boldEnd}, and may communicate with external servers."
+msgstr ""
+
+msgid "PreferencesIntegrations|Uses %{extensions_marketplace_home} as the extension marketplace for Workspaces."
+msgstr ""
+
+msgid "PreferencesIntegrations|Uses %{extensions_marketplace_home} as the extension marketplace for the Web IDE and Workspaces."
 msgstr ""
 
 msgid "PreferencesIntegrations|Uses %{extensions_marketplace_home} as the extension marketplace for the Web IDE."
@@ -41785,12 +41803,18 @@ msgstr ""
 msgid "Preferences|Web IDE"
 msgstr ""
 
+msgid "Preferences|Web IDE and Workspaces"
+msgstr ""
+
 msgid "Preferences|When you type in a description or comment box, pressing %{kbdOpen}Enter%{kbdClose} in a list adds a new item below."
 msgstr ""
 
 msgid "Preferences|When you type in a description or comment box, selected text is surrounded by the corresponding character after typing one of the following characters: %{supported_characters}."
 msgstr ""
 
+msgid "Preferences|Workspaces"
+msgstr ""
+
 msgid "Premium plan"
 msgstr ""
 
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index d8e5e90ab64..fe93727de91 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -358,8 +358,7 @@ module QA
         # then check again if it's ready to merge. For example, it will refresh if a new change was pushed and the page
         # needs to be refreshed to show the change.
         #
-        # @param [Boolean] transient_test true if the current test is a transient test (default: false)
-        def wait_until_ready_to_merge(transient_test: false)
+        def wait_until_ready_to_merge
           wait_until(message: "Waiting for ready to merge", sleep_interval: 1) do
             # changes in mr are rendered async, because of that mr can sometimes show no changes and there will be no
             # merge button, in such case we must retry loop otherwise find_element will raise ElementNotFound error
@@ -370,10 +369,6 @@ module QA
             # If the widget shows "Merge blocked: new changes were just added" we can refresh the page and check again
             next false if has_element?('head-mismatch-content', wait: 1)
 
-            # Stop waiting if we're in a transient test. By this point we're in an unexpected state and should let the
-            # test fail so we can investigate. If we're not in a transient test we keep trying until we reach timeout.
-            next true unless transient_test
-
             QA::Runtime::Logger.debug("MR widget text: #{mr_widget_text}")
 
             false
diff --git a/qa/qa/resource/project_imported_from_github.rb b/qa/qa/resource/project_imported_from_github.rb
index f1a623d9ddf..97c2ae1103e 100644
--- a/qa/qa/resource/project_imported_from_github.rb
+++ b/qa/qa/resource/project_imported_from_github.rb
@@ -3,8 +3,7 @@
 module QA
   module Resource
     class ProjectImportedFromGithub < Resource::Project
-      attr_accessor :issue_events_import,
-        :full_notes_import,
+      attr_accessor :full_notes_import,
         :attachments_import,
         :allow_partial_import
 
@@ -22,7 +21,6 @@ module QA
         Page::Project::Import::Github.perform do |import_page|
           import_page.add_personal_access_token(github_personal_access_token)
 
-          import_page.select_advanced_option(:single_endpoint_issue_events_import) if issue_events_import
           import_page.select_advanced_option(:single_endpoint_notes_import) if full_notes_import
           import_page.select_advanced_option(:attachments_import) if attachments_import
 
@@ -63,7 +61,6 @@ module QA
           personal_access_token: github_personal_access_token,
           ci_cd_only: false,
           optional_stages: {
-            single_endpoint_issue_events_import: issue_events_import,
             single_endpoint_notes_import: full_notes_import,
             attachments_import: attachments_import
           }
diff --git a/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
index 253e241ee45..c1313e3bf1c 100644
--- a/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
@@ -203,7 +203,6 @@ module QA
           project.github_repository_path = github_repo
           project.personal_namespace = user.username
           project.api_client = Runtime::API::Client.new(user: user)
-          project.issue_events_import = true
           project.full_notes_import = true
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_request_set_to_auto_merge_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_request_set_to_auto_merge_spec.rb
index 8fe5b674c42..38d9a16bc5f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_request_set_to_auto_merge_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_request_set_to_auto_merge_spec.rb
@@ -2,99 +2,52 @@
 
 module QA
   RSpec.describe 'Create', :runner, product_group: :code_review do
-    describe 'Merge request' do
-      shared_examples 'set to auto-merge' do |repeat: 1|
-        let(:runner_name) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(number: 8)}" }
-        let(:project) { create(:project, :with_readme, name: 'set-to-auto-merge') }
-        let!(:runner) { create(:project_runner, project: project, name: runner_name, tags: [runner_name]) }
+    describe 'Merge request set to auto-merge' do
+      let(:runner_name) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(number: 8)}" }
+      let(:project) { create(:project, name: 'set-to-auto-merge') }
+      let!(:runner) { create(:project_runner, project: project, name: runner_name, tags: [runner_name]) }
 
-        let!(:ci_file) do
-          create(:commit, project: project, commit_message: 'Add .gitlab-ci.yml', actions: [
-            {
-              action: 'create',
-              file_path: '.gitlab-ci.yml',
-              content: <<~YAML
-                test:
-                  tags: ["#{runner_name}"]
-                  script: sleep 15
-                  only:
-                    - merge_requests
-              YAML
-            }
-          ])
-        end
+      let!(:ci_file) do
+        create(:commit, project: project, commit_message: 'Add .gitlab-ci.yml', actions: [
+          {
+            action: 'create',
+            file_path: '.gitlab-ci.yml',
+            content: <<~YAML
+              test:
+                tags: ["#{runner_name}"]
+                script: sleep 25
+                only:
+                  - merge_requests
+            YAML
+          }
+        ])
+      end
 
-        before do
-          Flow::Login.sign_in
-        end
+      before do
+        Flow::Login.sign_in
+      end
 
-        after do
-          runner&.remove_via_api!
-        end
+      after do
+        runner&.remove_via_api!
+      end
 
-        it 'merges after pipeline succeeds', quarantine: {
-          type: :flaky,
-          issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403017'
-        } do
-          transient_test = repeat > 1
+      it 'merges after pipeline succeeds',
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347686' do
+        merge_request = create(:merge_request, project: project)
 
-          repeat.times do |i|
-            QA::Runtime::Logger.info("Transient bug test - Trial #{i + 1}") if transient_test
+        merge_request.visit!
 
-            # Create a merge request to trigger pipeline
-            merge_request = create(:merge_request,
-              project: project,
-              description: Faker::Lorem.sentence,
-              target_new_branch: false,
-              source_branch: "mr-test-#{SecureRandom.hex(6)}-#{i + 1}")
+        Page::MergeRequest::Show.perform do |mr|
+          mr.set_to_auto_merge!
 
-            # Load the page so that the browser is as prepared as possible to display the pipeline in progress when we
-            # start it.
-            merge_request.visit!
-
-            Page::MergeRequest::Show.perform do |mr|
-              # Part of the challenge with this test is that the MR widget has many components that could be displayed
-              # and many errors states that those components could encounter. Most of the time few of those
-              # possible components will be relevant, so it would be inefficient for this test to check for each of
-              # them. Instead, we fail on anything but the expected state.
-              #
-              # The following method allows us to handle and ignore states (as we find them) that users could safely
-              # ignore.
-              mr.wait_until_ready_to_merge(transient_test: transient_test)
-
-              mr.retry_until(reload: true, message: 'Wait until ready to click Set to auto-merge') do
-                # Click the Set to auto-merge button if we can
-                break mr.set_to_auto_merge! if mr.has_element?('merge-button', text: 'Set to auto-merge')
-
-                # But fail if the button is missing because the pipeline is complete
-                raise "The pipeline already finished before we could set to auto-merge" if mr.wait_until do
-                                                                                             project.pipelines.first
-                                                                                           end[:status] == 'success'
-
-                # Otherwise, if this is not a transient test reload the page and retry
-                next false unless transient_test
-              end
-
-              aggregate_failures do
-                expect { mr.merged? }.to eventually_be_truthy.within(max_duration: 120),
-                  "Expected content 'The changes were merged' but it did not appear."
-                expect(merge_request.reload!.merge_when_pipeline_succeeds).to be_truthy
-                expect(merge_request.state).to eq('merged')
-                expect(project.pipelines.last[:status]).to eq('success')
-              end
-            end
+          aggregate_failures do
+            expect { mr.merged? }.to eventually_be_truthy.within(max_duration: 120),
+              "Expected content 'The changes were merged' but it did not appear."
+            expect(merge_request.reload!.state).to eq('merged')
+            expect(project.pipelines.last[:status]).to eq('success')
           end
         end
       end
-
-      context 'when merging once', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347686' do
-        it_behaves_like 'set to auto-merge'
-      end
-
-      context 'when merging several times', :transient,
-        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347641' do
-        it_behaves_like 'set to auto-merge', repeat: Runtime::Env.transient_trials
-      end
     end
   end
 end
diff --git a/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb b/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb
index e1cfebeebb2..88318899932 100644
--- a/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb
+++ b/qa/qa/specs/features/shared_contexts/import/github_import_shared_context.rb
@@ -25,7 +25,6 @@ module QA
         project.github_personal_access_token = Runtime::Env.github_access_token
         project.github_repository_path = github_repo
         project.api_client = user_api_client
-        project.issue_events_import = true
         project.full_notes_import = true
       end
     end
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index 5ab639ec639..b6db1ab8097 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -182,7 +182,7 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu
 
         json_response.dig('pipeline', 'details', 'stages').tap do |stages|
           expect(stages.flat_map(&:keys))
-            .to eq %w[name title status path dropdown_path]
+            .to eq %w[name id title status path dropdown_path]
         end
       end
 
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 88627c058c1..121b282732d 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -616,7 +616,7 @@ RSpec.describe 'Pipelines', :js, feature_category: :continuous_integration do
 
               wait_for_requests
 
-              within first('[data-testid="job-with-link"]') do
+              within first('[data-testid="job-item"]') do
                 expect(find_by_testid('play-icon')).to be_visible
               end
 
diff --git a/spec/fixtures/api/schemas/pipeline_stage.json b/spec/fixtures/api/schemas/pipeline_stage.json
index c01a1946185..41d918b4cd4 100644
--- a/spec/fixtures/api/schemas/pipeline_stage.json
+++ b/spec/fixtures/api/schemas/pipeline_stage.json
@@ -1,29 +1,48 @@
 {
   "type": "object",
-  "required" : [
+  "required": [
     "name",
     "title",
     "status",
     "path",
     "dropdown_path"
   ],
-  "properties" : {
-    "name": { "type": "string" },
-    "title": { "type": "string" },
-    "groups": { "optional": true },
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "id": {
+      "type": "integer"
+    },
+    "title": {
+      "type": "string"
+    },
+    "groups": {
+      "optional": true
+    },
     "latest_statuses": {
       "type": "array",
-      "items": { "$ref": "job/job.json" },
+      "items": {
+        "$ref": "job/job.json"
+      },
       "optional": true
     },
     "retried": {
       "type": "array",
-      "items": { "$ref": "job/job.json" },
+      "items": {
+        "$ref": "job/job.json"
+      },
       "optional": true
     },
-    "status": { "$ref": "status/ci_detailed_status.json" },
-    "path": { "type": "string" },
-    "dropdown_path": { "type": "string" }
+    "status": {
+      "$ref": "status/ci_detailed_status.json"
+    },
+    "path": {
+      "type": "string"
+    },
+    "dropdown_path": {
+      "type": "string"
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/frontend/ci/common/pipelines_table_spec.js b/spec/frontend/ci/common/pipelines_table_spec.js
index 255e5973107..ec49b98e44a 100644
--- a/spec/frontend/ci/common/pipelines_table_spec.js
+++ b/spec/frontend/ci/common/pipelines_table_spec.js
@@ -1,6 +1,9 @@
+import Vue from 'vue';
+import VueApollo from 'vue-apollo';
 import { GlTableLite, GlSkeletonLoader } from '@gitlab/ui';
 // fixture located in spec/frontend/fixtures/pipelines.rb
 import fixture from 'test_fixtures/pipelines/pipelines.json';
+import createMockApollo from 'helpers/mock_apollo_helper';
 import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue';
@@ -19,6 +22,8 @@ import {
 
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 
+Vue.use(VueApollo);
+
 describe('Pipelines Table', () => {
   let wrapper;
   let trackingSpy;
@@ -56,6 +61,7 @@ describe('Pipelines Table', () => {
         PipelineOperations: true,
         ...stubs,
       },
+      apolloProvider: createMockApollo(),
     });
   };
 
diff --git a/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js
index 5ddb6763385..d4f527dbb65 100644
--- a/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js
+++ b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js
@@ -3,7 +3,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 import DownstreamPipelines from '~/ci/pipeline_mini_graph/downstream_pipelines.vue';
 import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue';
-import PipelineStages from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue';
+import PipelineStages from '~/ci/pipeline_mini_graph/pipeline_stages.vue';
 import mockLinkedPipelines from '../legacy_linked_pipelines_mock_data';
 
 const mockStages = pipelines[0].details.stages;
@@ -43,7 +43,6 @@ describe('Legacy Pipeline Mini Graph', () => {
         isMergeTrain: false,
         pipelinePath: '',
         stages: expect.any(Array),
-        updateDropdown: false,
         upstreamPipeline: undefined,
       });
     });
@@ -72,7 +71,6 @@ describe('Legacy Pipeline Mini Graph', () => {
         isMergeTrain: false,
         pipelinePath: '',
         stages: expect.any(Array),
-        updateDropdown: false,
         upstreamPipeline: expect.any(Object),
       });
     });
@@ -103,7 +101,6 @@ describe('Legacy Pipeline Mini Graph', () => {
         isMergeTrain: false,
         pipelinePath: 'my/pipeline/path',
         stages: expect.any(Array),
-        updateDropdown: false,
         upstreamPipeline: undefined,
       });
     });
diff --git a/spec/frontend/ci/pipeline_mini_graph/pipeline_stage_spec.js b/spec/frontend/ci/pipeline_mini_graph/pipeline_stage_spec.js
index 366ddca537e..f1c44262b78 100644
--- a/spec/frontend/ci/pipeline_mini_graph/pipeline_stage_spec.js
+++ b/spec/frontend/ci/pipeline_mini_graph/pipeline_stage_spec.js
@@ -23,7 +23,6 @@ describe('PipelineStage', () => {
   let pipelineStageResponse;
 
   const defaultProps = {
-    pipelineEtag: '/etag',
     stage: pipelineStage,
   };
 
diff --git a/spec/frontend/ci/pipelines_page/pipelines_spec.js b/spec/frontend/ci/pipelines_page/pipelines_spec.js
index bb1a30670b7..96345949d71 100644
--- a/spec/frontend/ci/pipelines_page/pipelines_spec.js
+++ b/spec/frontend/ci/pipelines_page/pipelines_spec.js
@@ -42,7 +42,6 @@ import {
   setIdTypePreferenceMutationResponse,
   setIdTypePreferenceMutationResponseWithErrors,
 } from 'jest/issues/list/mock_data';
-import { legacyStageReply } from 'jest/ci/pipeline_mini_graph/mock_data';
 import { describeSkipVue3, SkipReason } from 'helpers/vue3_conditional';
 import { branches, mockSearch, users } from '../pipeline_details/mock_data';
 
@@ -56,9 +55,6 @@ const mockProjectId = '21';
 const mockDefaultBranchName = 'main';
 const mockPipelinesEndpoint = `/${mockProjectPath}/pipelines.json`;
 const mockPipelinesIds = mockPipelinesResponse.pipelines.map(({ id }) => id);
-const mockPipelineWithStages = mockPipelinesResponse.pipelines.find(
-  (p) => p.details.stages && p.details.stages.length,
-);
 
 const skipReason = new SkipReason({
   name: 'Pipelines',
@@ -96,8 +92,6 @@ describeSkipVue3(skipReason, () => {
   const findTab = (tab) => wrapper.findByTestId(`pipelines-tab-${tab}`);
   const findRunPipelineButton = () => wrapper.findByTestId('run-pipeline-button');
   const findCleanCacheButton = () => wrapper.findByTestId('clear-cache-button');
-  const findStagesDropdownToggle = () =>
-    wrapper.find('[data-testid="pipeline-mini-graph-dropdown-toggle"]');
   const findPipelineUrlLinks = () => wrapper.findAll('[data-testid="pipeline-url-link"]');
 
   const createComponent = ({ props = {}, withPermissions = true } = {}) => {
@@ -742,77 +736,6 @@ describeSkipVue3(skipReason, () => {
     });
   });
 
-  describe('when a pipeline with stages exists', () => {
-    describe('updates results when a staged is clicked', () => {
-      let stopMock;
-      let restartMock;
-      let cancelMock;
-
-      beforeEach(() => {
-        mock.onGet(mockPipelinesEndpoint, { scope: 'all', page: '1' }).reply(
-          HTTP_STATUS_OK,
-          {
-            pipelines: [mockPipelineWithStages],
-            count: { all: '1' },
-          },
-          {
-            'POLL-INTERVAL': 100,
-          },
-        );
-
-        mock
-          .onGet(mockPipelineWithStages.details.stages[0].dropdown_path)
-          .reply(HTTP_STATUS_OK, legacyStageReply);
-
-        // cancelMock is getting overwritten in pipelines_service.js#L29
-        // so we have to spy on it again here
-        cancelMock = { cancel: jest.fn() };
-        jest.spyOn(axios.CancelToken, 'source').mockReturnValue(cancelMock);
-
-        createComponent();
-
-        stopMock = jest.spyOn(window, 'clearTimeout');
-        restartMock = jest.spyOn(axios, 'get');
-      });
-
-      describe('when a request is being made', () => {
-        beforeEach(async () => {
-          mock.onGet(mockPipelinesEndpoint).reply(HTTP_STATUS_OK, mockPipelinesResponse);
-
-          await waitForPromises();
-        });
-
-        it('stops polling, cancels the request, & restarts polling', async () => {
-          // Mock init a polling cycle
-          wrapper.vm.poll.options.notificationCallback(true);
-
-          await findStagesDropdownToggle().trigger('click');
-          jest.runOnlyPendingTimers();
-
-          await waitForPromises();
-
-          expect(cancelMock.cancel).toHaveBeenCalled();
-          expect(stopMock).toHaveBeenCalled();
-          expect(restartMock).toHaveBeenCalledWith(
-            `${mockPipelinesResponse.pipelines[0].path}/stage.json?stage=test`,
-          );
-        });
-
-        it('stops polling & restarts polling', async () => {
-          await findStagesDropdownToggle().trigger('click');
-          jest.runOnlyPendingTimers();
-          await waitForPromises();
-
-          expect(cancelMock.cancel).not.toHaveBeenCalled();
-          expect(stopMock).toHaveBeenCalled();
-          expect(restartMock).toHaveBeenCalledWith(
-            `${mockPipelinesResponse.pipelines[0].path}/stage.json?stage=test`,
-          );
-        });
-      });
-    });
-  });
-
   describe('when pipelines cannot be loaded', () => {
     beforeEach(() => {
       mock.onGet(mockPipelinesEndpoint).reply(HTTP_STATUS_INTERNAL_SERVER_ERROR, {});
diff --git a/spec/frontend/commit/pipelines/legacy_pipelines_table_wrapper_spec.js b/spec/frontend/commit/pipelines/legacy_pipelines_table_wrapper_spec.js
index 991296efcce..4556a156b98 100644
--- a/spec/frontend/commit/pipelines/legacy_pipelines_table_wrapper_spec.js
+++ b/spec/frontend/commit/pipelines/legacy_pipelines_table_wrapper_spec.js
@@ -1,7 +1,9 @@
+import Vue, { nextTick } from 'vue';
+import VueApollo from 'vue-apollo';
 import { GlLoadingIcon, GlModal, GlTableLite } from '@gitlab/ui';
 import MockAdapter from 'axios-mock-adapter';
-import { nextTick } from 'vue';
 import fixture from 'test_fixtures/pipelines/pipelines.json';
+import createMockApollo from 'helpers/mock_apollo_helper';
 import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { stubComponent } from 'helpers/stub_component';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -18,6 +20,8 @@ import { createAlert } from '~/alert';
 import { TOAST_MESSAGE } from '~/ci/pipeline_details/constants';
 import axios from '~/lib/utils/axios_utils';
 
+Vue.use(VueApollo);
+
 const $toast = {
   show: jest.fn(),
 };
@@ -59,6 +63,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
           methods: { show: showMock },
         }),
       },
+      apolloProvider: createMockApollo(),
     });
   };
 
diff --git a/spec/frontend/profile/preferences/components/integration_view_spec.js b/spec/frontend/profile/preferences/components/integration_view_spec.js
index 0ea6271c944..3cd1db1b4ac 100644
--- a/spec/frontend/profile/preferences/components/integration_view_spec.js
+++ b/spec/frontend/profile/preferences/components/integration_view_spec.js
@@ -41,6 +41,12 @@ describe('IntegrationView component', () => {
     expect(wrapper.findByText(defaultProps.config.title).exists()).toBe(true);
   });
 
+  it('allows title to be specified via props', () => {
+    wrapper = createComponent({ title: 'Custom title' });
+
+    expect(wrapper.findByText('Custom title').exists()).toBe(true);
+  });
+
   it('should render the form correctly', () => {
     wrapper = createComponent();
 
diff --git a/spec/frontend/releases/components/__snapshots__/expand_button_spec.js.snap b/spec/frontend/releases/components/__snapshots__/expand_button_spec.js.snap
index 4f74dee7fe3..b96efd922f5 100644
--- a/spec/frontend/releases/components/__snapshots__/expand_button_spec.js.snap
+++ b/spec/frontend/releases/components/__snapshots__/expand_button_spec.js.snap
@@ -4,7 +4,7 @@ exports[`Expand button on click when short text is provided renders button after
 <span>
   <button
     aria-label="Click to expand text"
-    class="!gl-bg-transparent !gl-outline-none !gl-shadow-none btn btn-default btn-icon btn-md button-ellipsis-horizontal gl-border-none gl-button gl-p-0 gl-rounded-none js-text-expander-prepend text-expander"
+    class="btn btn-default btn-default-tertiary btn-icon btn-md button-ellipsis-horizontal gl-button js-text-expander-prepend"
     style="display: none;"
     type="button"
   >
@@ -26,7 +26,7 @@ exports[`Expand button on click when short text is provided renders button after
   </span>
   <button
     aria-label="Click to expand text"
-    class="!gl-bg-transparent !gl-outline-none !gl-shadow-none btn btn-default btn-icon btn-md button-ellipsis-horizontal gl-border-none gl-button gl-p-0 gl-rounded-none js-text-expander-append text-expander"
+    class="btn btn-default btn-default-tertiary btn-icon btn-md button-ellipsis-horizontal gl-button js-text-expander-append"
     style=""
     type="button"
   >
@@ -48,7 +48,7 @@ exports[`Expand button when short text is provided renders button before text 1`
 <span>
   <button
     aria-label="Click to expand text"
-    class="!gl-bg-transparent !gl-outline-none !gl-shadow-none btn btn-default btn-icon btn-md button-ellipsis-horizontal gl-border-none gl-button gl-p-0 gl-rounded-none js-text-expander-prepend text-expander"
+    class="btn btn-default btn-default-tertiary btn-icon btn-md button-ellipsis-horizontal gl-button js-text-expander-prepend"
     type="button"
   >
     <svg
@@ -69,7 +69,7 @@ exports[`Expand button when short text is provided renders button before text 1`
   </span>
   <button
     aria-label="Click to expand text"
-    class="!gl-bg-transparent !gl-outline-none !gl-shadow-none btn btn-default btn-icon btn-md button-ellipsis-horizontal gl-border-none gl-button gl-p-0 gl-rounded-none js-text-expander-append text-expander"
+    class="btn btn-default btn-default-tertiary btn-icon btn-md button-ellipsis-horizontal gl-button js-text-expander-append"
     style="display: none;"
     type="button"
   >
diff --git a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
index ed6e1a3afe0..fc72f6d2d68 100644
--- a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
+++ b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
@@ -69,6 +69,32 @@ describe('UncollapsedReviewerList component', () => {
     });
   });
 
+  describe('when reviewer status is unapproved', () => {
+    beforeEach(() => {
+      const user = userDataMock();
+
+      createComponent({
+        users: [
+          {
+            ...user,
+            id: 2,
+            name: 'nonrooty-nonrootersen',
+            username: 'hello-world',
+            mergeRequestInteraction: {
+              ...user.mergeRequestInteraction,
+              approved: false,
+              reviewState: 'UNAPPROVED',
+            },
+          },
+        ],
+      });
+    });
+
+    it('renders re-request review button', () => {
+      expect(findAllRerequestButtons().exists()).toBe(true);
+    });
+  });
+
   describe('multiple reviewers', () => {
     const user = userDataMock();
     const user2 = {
diff --git a/spec/frontend/token_access/groups_and_projects_listbox_spec.js b/spec/frontend/token_access/groups_and_projects_listbox_spec.js
deleted file mode 100644
index 1c492bb856a..00000000000
--- a/spec/frontend/token_access/groups_and_projects_listbox_spec.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import { GlCollapsibleListbox, GlListboxItem } from '@gitlab/ui';
-import Vue from 'vue';
-import VueApollo from 'vue-apollo';
-import createMockApollo from 'helpers/mock_apollo_helper';
-import { mountExtended } from 'helpers/vue_test_utils_helper';
-import waitForPromises from 'helpers/wait_for_promises';
-import GroupsAndProjectsListbox from '~/token_access/components/groups_and_projects_listbox.vue';
-import getGroupsAndProjectsQuery from '~/token_access/graphql/queries/get_groups_and_projects.query.graphql';
-import { getGroupsAndProjectsResponse } from './mock_data';
-
-const placeholder = 'Pick a group or project';
-
-Vue.use(VueApollo);
-
-describe('GroupsAndProjectsListbox component', () => {
-  let wrapper;
-
-  const findListbox = () => wrapper.findComponent(GlCollapsibleListbox);
-  const openListbox = () => findListbox().vm.$emit('shown');
-  const findListboxItems = () => wrapper.findAllComponents(GlListboxItem);
-
-  const createComponent = ({
-    mountFn = mountExtended,
-    requestHandlers = [
-      [
-        getGroupsAndProjectsQuery,
-        jest.fn().mockImplementation(({ search }) => {
-          if (search !== '') {
-            return {
-              data: {
-                groups: {
-                  nodes: [getGroupsAndProjectsResponse.data.groups.nodes[0]],
-                },
-                projects: {
-                  nodes: [getGroupsAndProjectsResponse.data.projects.nodes[0]],
-                },
-              },
-            };
-          }
-          return getGroupsAndProjectsResponse;
-        }),
-      ],
-    ],
-    value = '',
-  } = {}) => {
-    wrapper = mountFn(GroupsAndProjectsListbox, {
-      apolloProvider: createMockApollo(requestHandlers),
-      propsData: {
-        value,
-        placeholder,
-      },
-    });
-  };
-
-  beforeEach(async () => {
-    createComponent();
-
-    await waitForPromises();
-  });
-
-  it('displays a listbox', () => {
-    expect(findListbox().exists()).toBe(true);
-  });
-
-  it('displays the placeholder as the toggle text', () => {
-    expect(findListbox().props('toggleText')).toBe(placeholder);
-  });
-
-  it('lists groups and projects', () => {
-    expect(findListbox().props('items')).toMatchObject([
-      { text: 'Groups', options: getGroupsAndProjectsResponse.data.groups.nodes },
-      { text: 'Projects', options: getGroupsAndProjectsResponse.data.projects.nodes },
-    ]);
-  });
-
-  it('searches for groups and projects', async () => {
-    expect(findListbox().props('items')[0].options).toHaveLength(
-      getGroupsAndProjectsResponse.data.groups.nodes.length,
-    );
-    expect(findListbox().props('items')[1].options).toHaveLength(
-      getGroupsAndProjectsResponse.data.projects.nodes.length,
-    );
-
-    openListbox();
-    findListbox().vm.$emit('search', 'gitlab');
-
-    await waitForPromises();
-
-    expect(findListbox().props('items')[0].options).toHaveLength(1);
-    expect(findListbox().props('items')[1].options).toHaveLength(1);
-  });
-
-  it('emits select event with the fullPath when an item is selected', () => {
-    openListbox();
-    findListboxItems().at(0).trigger('click');
-
-    expect(wrapper.emitted('select')[0][0]).toEqual(
-      getGroupsAndProjectsResponse.data.groups.nodes[0].fullPath,
-    );
-  });
-});
diff --git a/spec/frontend/token_access/inbound_token_access_spec.js b/spec/frontend/token_access/inbound_token_access_spec.js
index b7a195740da..1c6be53f8c8 100644
--- a/spec/frontend/token_access/inbound_token_access_spec.js
+++ b/spec/frontend/token_access/inbound_token_access_spec.js
@@ -1,4 +1,4 @@
-import { GlAlert, GlCollapsibleListbox, GlLoadingIcon, GlFormRadioGroup } from '@gitlab/ui';
+import { GlAlert, GlFormInput, GlLoadingIcon, GlFormRadioGroup } from '@gitlab/ui';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
@@ -6,7 +6,6 @@ import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_help
 import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/alert';
 import InboundTokenAccess from '~/token_access/components/inbound_token_access.vue';
-import GroupsAndProjectsListbox from '~/token_access/components/groups_and_projects_listbox.vue';
 import inboundAddGroupOrProjectCIJobTokenScopeMutation from '~/token_access/graphql/mutations/inbound_add_group_or_project_ci_job_token_scope.mutation.graphql';
 import inboundRemoveGroupCIJobTokenScopeMutation from '~/token_access/graphql/mutations/inbound_remove_group_ci_job_token_scope.mutation.graphql';
 import inboundRemoveProjectCIJobTokenScopeMutation from '~/token_access/graphql/mutations/inbound_remove_project_ci_job_token_scope.mutation.graphql';
@@ -66,11 +65,10 @@ describe('TokenAccess component', () => {
 
   const findRadioGroup = () => wrapper.findComponent(GlFormRadioGroup);
   const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
-  const findAddProjectBtn = () => wrapper.findByTestId('add-project-btn');
+  const findAddGroupOrProjectBtn = () => wrapper.findByTestId('add-group-or-project-btn');
   const findCancelBtn = () => wrapper.findByRole('button', { name: 'Cancel' });
   const findGroupOrProjectFormGroup = () => wrapper.findByTestId('group-or-project-form-group');
-  const findGroupsAndProjectsListbox = () => wrapper.findComponent(GroupsAndProjectsListbox);
-  const findListboxInput = () => wrapper.findComponent(GlCollapsibleListbox);
+  const findTargetPathInput = () => wrapper.findComponent(GlFormInput);
   const findRemoveProjectBtnAt = (i) =>
     wrapper.findAllByRole('button', { name: 'Remove access' }).at(i);
   const findToggleFormBtn = () => wrapper.findByTestId('toggle-form-btn');
@@ -354,8 +352,8 @@ describe('TokenAccess component', () => {
       await waitForPromises();
 
       await findToggleFormBtn().trigger('click');
-      await findListboxInput().vm.$emit('select', testPath);
-      findAddProjectBtn().trigger('click');
+      await findTargetPathInput().vm.$emit('input', testPath);
+      findAddGroupOrProjectBtn().trigger('click');
 
       expect(inboundAddGroupOrProjectSuccessResponseHandler).toHaveBeenCalledWith({
         projectPath,
@@ -391,8 +389,8 @@ describe('TokenAccess component', () => {
       );
 
       await findToggleFormBtn().trigger('click');
-      await findListboxInput().vm.$emit('select', testPath);
-      findAddProjectBtn().trigger('click');
+      await findTargetPathInput().vm.$emit('input', testPath);
+      findAddGroupOrProjectBtn().trigger('click');
 
       await waitForPromises();
 
@@ -419,12 +417,20 @@ describe('TokenAccess component', () => {
       await waitForPromises();
 
       await findToggleFormBtn().trigger('click');
-      await findListboxInput().vm.$emit('select', testPath);
-      await findAddProjectBtn().trigger('click');
+      await findTargetPathInput().vm.$emit('input', testPath);
+      await findAddGroupOrProjectBtn().trigger('click');
 
       await waitForPromises();
 
-      expect(createAlert).toHaveBeenCalledWith({ message });
+      // show error message
+      expect(findTargetPathInput().classes()).toContain('is-invalid');
+      expect(findGroupOrProjectFormGroup().text()).toContain(message);
+
+      // remove error message on new input
+      await findTargetPathInput().vm.$emit('input', 'new-path');
+
+      expect(findTargetPathInput().classes()).not.toContain('is-invalid');
+      expect(findGroupOrProjectFormGroup().text()).not.toContain(message);
     });
 
     it('clicking cancel hides the form and clears the target path', async () => {
@@ -442,56 +448,24 @@ describe('TokenAccess component', () => {
 
       await waitForPromises();
 
+      // open form
       await findToggleFormBtn().trigger('click');
 
-      expect(findListboxInput().exists()).toBe(true);
+      expect(findTargetPathInput().exists()).toBe(true);
+
+      // add input then cancel form
+      await findTargetPathInput().vm.$emit('input', testPath);
+
+      expect(findTargetPathInput().element.value).toEqual(testPath);
 
-      await findListboxInput().vm.$emit('select', testPath);
       await findCancelBtn().trigger('click');
 
-      expect(findListboxInput().exists()).toBe(false);
+      expect(findTargetPathInput().exists()).toBe(false);
 
+      // re-open form
       await findToggleFormBtn().trigger('click');
 
-      expect(findListboxInput().props('selected')).toEqual('');
-    });
-  });
-
-  describe.each`
-    type         | testPath
-    ${'group'}   | ${inboundGroupsAndProjectsWithScopeResponse.data.project.ciJobTokenScope.inboundAllowlist.nodes[0].fullPath}
-    ${'project'} | ${inboundGroupsAndProjectsWithScopeResponse.data.project.ciJobTokenScope.groupsAllowlist.nodes[0].fullPath}
-  `('add a duplicate $type', ({ testPath }) => {
-    it(`validates whether path is already in the allowlist`, async () => {
-      createComponent(
-        [
-          [inboundGetCIJobTokenScopeQuery, inboundJobTokenScopeEnabledResponseHandler],
-          [
-            inboundGetGroupsAndProjectsWithCIJobTokenScopeQuery,
-            inboundGroupsAndProjectsWithScopeResponseHandler,
-          ],
-          [getGroupsAndProjectsQuery, getGroupsAndProjectsSuccessResponseHandler],
-          [
-            inboundAddGroupOrProjectCIJobTokenScopeMutation,
-            inboundAddGroupOrProjectSuccessResponseHandler,
-          ],
-        ],
-        mountExtended,
-      );
-
-      await waitForPromises();
-
-      await findToggleFormBtn().trigger('click');
-
-      expect(findGroupOrProjectFormGroup().attributes('aria-invalid')).toBe(undefined);
-      expect(findGroupsAndProjectsListbox().props('isValid')).toBe(true);
-
-      await findListboxInput().vm.$emit('select', testPath);
-
-      expect(findGroupOrProjectFormGroup().attributes('aria-invalid')).toBe('true');
-      expect(findGroupsAndProjectsListbox().props('isValid')).toBe(false);
-      expect(findAddProjectBtn().props('disabled')).toBe(true);
-      expect(findGroupOrProjectFormGroup().find('label').text()).toBe('Add group or project');
+      expect(findTargetPathInput().element.value).toEqual('');
     });
   });
 
diff --git a/spec/frontend/token_access/mock_data.js b/spec/frontend/token_access/mock_data.js
index dd679998513..1c1e97d7047 100644
--- a/spec/frontend/token_access/mock_data.js
+++ b/spec/frontend/token_access/mock_data.js
@@ -257,9 +257,9 @@ export const getGroupsAndProjectsResponse = {
 
 export const inboundAddGroupOrProjectSuccessResponse = {
   data: {
-    ciJobTokenScopeAddProject: {
+    ciJobTokenScopeAddGroupOrProject: {
       errors: [],
-      __typename: 'CiJobTokenScopeAddProjectPayload',
+      __typename: 'CiJobTokenScopeAddGroupOrProjectPayload',
     },
   },
 };
diff --git a/spec/frontend/vue_merge_request_widget/mock_data.js b/spec/frontend/vue_merge_request_widget/mock_data.js
index b4c3e282e4f..54105c04543 100644
--- a/spec/frontend/vue_merge_request_widget/mock_data.js
+++ b/spec/frontend/vue_merge_request_widget/mock_data.js
@@ -209,6 +209,7 @@ export default {
       stages: [
         {
           name: 'build',
+          id: 1,
           title: 'build: failed',
           status: {
             icon: 'status_failed',
@@ -224,6 +225,7 @@ export default {
         },
         {
           name: 'review',
+          id: 2,
           title: 'review: skipped',
           status: {
             icon: 'status_skipped',
diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb
index f101676437e..0c1bd9809e4 100644
--- a/spec/helpers/preferences_helper_spec.rb
+++ b/spec/helpers/preferences_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe PreferencesHelper do
+RSpec.describe PreferencesHelper, feature_category: :shared do
   let_it_be(:user) { build(:user) }
 
   before do
@@ -253,9 +253,30 @@ RSpec.describe PreferencesHelper do
     end
 
     context 'on default' do
-      it 'does not include integration views' do
+      it 'includes integration views' do
         expect(helper.integration_views).to be_empty
       end
+
+      context 'when Web IDE Extension Marketplace feature is enabled' do
+        before do
+          allow(::WebIde::ExtensionsMarketplace).to receive(:feature_enabled?).with(user: user).and_return(true)
+        end
+
+        it 'includes extension marketplace integration' do
+          expect(helper.integration_views).to include(
+            a_hash_including({
+              name: 'extensions_marketplace',
+              message: 'Uses %{linkStart}https://open-vsx.org%{linkEnd} as the extension marketplace ' \
+                'for the Web IDE.',
+              message_url: 'https://open-vsx.org'
+            })
+          )
+        end
+      end
+
+      it 'does not include extensions_marketplace' do
+        expect(helper.integration_views).not_to match(a_hash_including(name: 'extensions_marketplace'))
+      end
     end
 
     context 'when Gitpod is enabled' do
@@ -277,21 +298,5 @@ RSpec.describe PreferencesHelper do
         end
       end
     end
-
-    context 'when WebIdeExtensionsMarketplace is enabled' do
-      before do
-        allow(WebIde::ExtensionsMarketplace).to receive(:feature_enabled?).with(user: user).and_return(true)
-      end
-
-      it 'includes extension marketplace integration' do
-        expect(helper.integration_views).to include(
-          a_hash_including({
-            name: 'extensions_marketplace',
-            message: 'Uses %{linkStart}https://open-vsx.org%{linkEnd} as the extension marketplace for the Web IDE.',
-            message_url: 'https://open-vsx.org'
-          })
-        )
-      end
-    end
   end
 end
diff --git a/spec/models/integrations/asana_spec.rb b/spec/models/integrations/asana_spec.rb
index 0928e43154b..e7ab0437c24 100644
--- a/spec/models/integrations/asana_spec.rb
+++ b/spec/models/integrations/asana_spec.rb
@@ -69,9 +69,9 @@ RSpec.describe Integrations::Asana, feature_category: :integrations do
         let(:ref) { 'main' }
 
         it 'calls the Asana integration' do
-          expect(Gitlab::HTTP_V2).to receive(:post)
+          expect(Gitlab::HTTP).to receive(:post)
             .with("https://app.asana.com/api/1.0/tasks/456789/stories", anything).once.and_return(asana_task)
-          expect(Gitlab::HTTP_V2).to receive(:put)
+          expect(Gitlab::HTTP).to receive(:put)
             .with("https://app.asana.com/api/1.0/tasks/456789", completed_message).once.and_return(asana_task)
 
           execute_integration
@@ -82,8 +82,8 @@ RSpec.describe Integrations::Asana, feature_category: :integrations do
         let(:ref) { 'mai' }
 
         it 'does not call the Asana integration' do
-          expect(Gitlab::HTTP_V2).not_to receive(:post)
-          expect(Gitlab::HTTP_V2).not_to receive(:put)
+          expect(Gitlab::HTTP).not_to receive(:post)
+          expect(Gitlab::HTTP).not_to receive(:put)
 
           execute_integration
         end
@@ -102,7 +102,7 @@ RSpec.describe Integrations::Asana, feature_category: :integrations do
       end
 
       it 'calls Asana integration to create a story' do
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
             .with("https://app.asana.com/api/1.0/tasks/#{gid}/stories", expected_message).once.and_return(asana_task)
 
         execute_integration
@@ -113,9 +113,9 @@ RSpec.describe Integrations::Asana, feature_category: :integrations do
       let(:message) { 'fix #456789' }
 
       it 'calls Asana integration to create a story and close a task' do
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/456789/stories", anything).once.and_return(asana_task)
-        expect(Gitlab::HTTP_V2).to receive(:put)
+        expect(Gitlab::HTTP).to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/456789", completed_message).once.and_return(asana_task)
 
         execute_integration
@@ -126,9 +126,9 @@ RSpec.describe Integrations::Asana, feature_category: :integrations do
       let(:message) { 'closes https://app.asana.com/19292/956299/42' }
 
       it 'calls Asana integration to close via url' do
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/42/stories", anything).once.and_return(asana_task)
-        expect(Gitlab::HTTP_V2).to receive(:put)
+        expect(Gitlab::HTTP).to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/42", completed_message).once.and_return(asana_task)
 
         execute_integration
@@ -146,41 +146,41 @@ RSpec.describe Integrations::Asana, feature_category: :integrations do
       end
 
       it 'allows multiple matches per line' do
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/123/stories", anything).once.and_return(asana_task)
-        expect(Gitlab::HTTP_V2).to receive(:put)
+        expect(Gitlab::HTTP).to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/123", completed_message).once.and_return(asana_task)
 
         asana_task_2 = double(double(data: { gid: 456 }))
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/456/stories", anything).once.and_return(asana_task_2)
-        expect(Gitlab::HTTP_V2).to receive(:put)
+        expect(Gitlab::HTTP).to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/456", completed_message).once.and_return(asana_task_2)
 
         asana_task_3 = double(double(data: { gid: 789 }))
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/789/stories", anything).once.and_return(asana_task_3)
 
         asana_task_4 = double(double(data: { gid: 42 }))
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/42/stories", anything).once.and_return(asana_task_4)
 
         asana_task_5 = double(double(data: { gid: 12 }))
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/12/stories", anything).once.and_return(asana_task_5)
-        expect(Gitlab::HTTP_V2).to receive(:put)
+        expect(Gitlab::HTTP).to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/12", completed_message).once.and_return(asana_task_5)
 
         asana_task_5 = double(double(data: { gid: 11 }))
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/11/stories", anything).once.and_return(asana_task_5)
-        expect(Gitlab::HTTP_V2).not_to receive(:put)
+        expect(Gitlab::HTTP).not_to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/11", completed_message)
 
         asana_task_6 = double(double(data: { gid: 222 }))
-        expect(Gitlab::HTTP_V2).to receive(:post)
+        expect(Gitlab::HTTP).to receive(:post)
           .with("https://app.asana.com/api/1.0/tasks/222/stories", anything).once.and_return(asana_task_6)
-        expect(Gitlab::HTTP_V2).not_to receive(:put)
+        expect(Gitlab::HTTP).not_to receive(:put)
           .with("https://app.asana.com/api/1.0/tasks/222", completed_message)
 
         execute_integration
diff --git a/spec/serializers/stage_entity_spec.rb b/spec/serializers/stage_entity_spec.rb
index 7adb5292ae0..e97c9b39e83 100644
--- a/spec/serializers/stage_entity_spec.rb
+++ b/spec/serializers/stage_entity_spec.rb
@@ -36,6 +36,10 @@ RSpec.describe StageEntity, feature_category: :continuous_integration do
       expect(subject[:name]).to eq 'test'
     end
 
+    it 'contains valid id' do
+      expect(subject[:id]).to eq stage.id
+    end
+
     it 'contains path to the stage' do
       expect(subject[:path])
         .to include "pipelines/#{pipeline.id}##{stage.name}"
diff --git a/spec/services/ci/job_token_scope/add_group_service_spec.rb b/spec/services/ci/job_token_scope/add_group_service_spec.rb
index 358f6665d29..8556dbc2d94 100644
--- a/spec/services/ci/job_token_scope/add_group_service_spec.rb
+++ b/spec/services/ci/job_token_scope/add_group_service_spec.rb
@@ -75,7 +75,7 @@ RSpec.describe Ci::JobTokenScope::AddGroupService, feature_category: :continuous
           service.execute(target_group)
         end
 
-        it_behaves_like 'returns error', 'Target group is already in the job token scope'
+        it_behaves_like 'returns error', 'This group is already in the job token allowlist.'
       end
 
       context 'when create method raises an invalid record exception' do
diff --git a/spec/services/ci/job_token_scope/add_project_service_spec.rb b/spec/services/ci/job_token_scope/add_project_service_spec.rb
index e00d9f6299a..d61518d91c6 100644
--- a/spec/services/ci/job_token_scope/add_project_service_spec.rb
+++ b/spec/services/ci/job_token_scope/add_project_service_spec.rb
@@ -86,6 +86,19 @@ RSpec.describe Ci::JobTokenScope::AddProjectService, feature_category: :continuo
         end
       end
 
+      context 'when project is already in the allowlist' do
+        before_all do
+          project.add_maintainer(current_user)
+          target_project.add_developer(current_user)
+        end
+
+        before do
+          service.execute(target_project)
+        end
+
+        it_behaves_like 'returns error', 'This project is already in the job token allowlist.'
+      end
+
       context 'when target project is same as the source project' do
         before do
           project.add_maintainer(current_user)