From 9fe0324bb213eec9e45777eaa68f834758b05a38 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 17 Jul 2025 12:08:09 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab-ci.yml                                |   1 -
 .gitlab/ci/setup.gitlab-ci.yml                |  29 +-
 .gitlab/ci/test-metadata.gitlab-ci.yml        |  27 +-
 .gitlab/duo/mr-review-instructions.yaml       |   2 +
 Gemfile                                       |   2 +-
 Gemfile.checksum                              |   2 +-
 Gemfile.lock                                  |   4 +-
 Gemfile.next.checksum                         |   2 +-
 Gemfile.next.lock                             |   4 +-
 .../admin/groups/index/constants.js           |   2 +-
 .../fragments/admin_group.fragment.graphql    |   7 +
 .../graphql/queries/groups.query.graphql      |   5 +-
 .../behaviors/shortcuts/keybindings.js        |   5 +-
 .../entrypoints/lookbook/rapid_diffs.js       |   9 +-
 .../list/components/issue_card_time_info.vue  |   8 +-
 .../notes/store/legacy_notes/actions.js       |   2 +-
 .../pages/dashboard/groups/index/index.js     |   7 -
 .../projects/commit/rapid_diffs/index.js      |   2 +-
 .../projects/compare/rapid_diffs/index.js     |   2 +-
 .../creations/rapid_diffs/index.js            |   2 +-
 .../merge_requests/rapid_diffs/index.js       |   2 +-
 .../javascripts/rapid_diffs/adapter_events.js |   6 +
 .../javascripts/rapid_diffs/adapters.js       |  16 -
 .../disable_diff_side.js}                     |   4 +-
 .../adapter.js => adapters/expand_lines.js}   |   6 +-
 .../expand_lines/diff_line_row.js             |   0
 .../{ => adapters}/expand_lines/get_lines.js  |   0
 .../adapter.js => adapters/image_viewer.js}   |   4 +-
 .../adapter.js => adapters/line_link.js}      |   4 +-
 .../adapter.js => adapters/load_file.js}      |   2 +-
 .../adapter.js => adapters/options_menu.js}   |   2 +-
 .../adapter.js => adapters/toggle_file.js}    |   4 +-
 .../javascripts/rapid_diffs/app/adapters.js   |  16 +
 .../app/{ => file_browser}/file_browser.vue   |   0
 .../file_browser_drawer.vue                   |   0
 .../file_browser_drawer_toggle.vue            |   0
 .../index.js}                                 |   2 +-
 .../javascripts/rapid_diffs/app/index.js      |  29 +-
 .../app/init_hidden_files_warning.js          |   2 +-
 .../javascripts/rapid_diffs/app/pinia.js      |   5 -
 .../{ => quirks}/content_visibility_fix.js    |   0
 .../app/{ => quirks}/safari_fix.js            |   0
 .../rapid_diffs/app/view_settings.js          |   4 +-
 app/assets/javascripts/rapid_diffs/events.js  |   6 -
 app/assets/javascripts/rapid_diffs/index.js   |   5 +
 .../rapid_diffs/stores/diffs_list.js          |   2 +-
 .../{ => web_components}/diff_file.js         |   8 +-
 .../web_components/diff_file_mounted.js       |   8 +
 .../{ => web_components}/streaming_error.js   |   0
 .../components/header_area/blob_controls.vue  |   6 +-
 .../super_sidebar/components/create_menu.vue  |  86 +++--
 .../components/groups_list/utils.js           |   9 +-
 .../work_item_bulk_edit_sidebar.vue           |  20 +-
 .../components/work_item_description.vue      |   4 +-
 .../javascripts/work_items/constants.js       |   1 -
 app/controllers/admin/groups_controller.rb    |   3 +
 app/controllers/application_controller.rb     |  14 +-
 app/controllers/base_action_controller.rb     |  15 -
 .../oauth/authorizations_controller.rb        |   5 +-
 app/controllers/projects/blob_controller.rb   |   1 -
 app/controllers/projects/tree_controller.rb   |   1 -
 app/controllers/projects_controller.rb        |   1 -
 .../concerns/resolves_merge_requests.rb       |   2 -
 .../resolvers/merge_requests_resolver.rb      |   1 -
 app/helpers/nav/new_dropdown_helper.rb        |   3 +-
 app/mailers/emails/projects.rb                |  12 +
 app/mailers/previews/notify_preview.rb        |  16 +
 ...safe_disable_pipeline_variables_service.rb |  10 +-
 app/views/dashboard/groups/_groups.html.haml  |   1 -
 app/views/dashboard/groups/index.html.haml    |  25 +-
 ...riables_migration_complete_email.html.haml |  17 +
 ...ariables_migration_complete_email.text.erb |   7 +
 .../safe_disable_pipeline_variables_worker.rb |   7 +
 .../feature_flags/beta/filter_blob_path.yml   |   9 -
 .../beta/your_work_groups_vue.yml             |   9 -
 config/initializers/trusted_proxies.rb        |  19 +-
 ..._top_level_ancestor_to_sbom_graph_paths.rb |   9 +
 db/schema_migrations/20250714093056           |   1 +
 db/structure.sql                              |   3 +-
 doc/api/graphql/reference/_index.md           |  60 ++--
 doc/integration/exact_code_search/zoekt.md    |  84 +++++
 doc/subscriptions/_index.md                   |   1 +
 doc/user/gitlab_duo/prompt_examples/_index.md |   1 +
 .../analyze_vulnerabilities.md                | 100 ++++++
 doc/user/group/_index.md                      |  11 +-
 doc/user/project/repository/files/_index.md   |   1 +
 lib/banzai/filter/placeholders_post_filter.rb |   3 +-
 lib/gitlab/auth/ip_rate_limiter.rb            |   8 +-
 lib/gitlab/current/organization.rb            |  15 +-
 locale/gitlab.pot                             |  38 +-
 package.json                                  |   2 +-
 .../lib/deployment/default_values.rb          |   8 +-
 .../deployment/default_values_spec.rb         |   8 +-
 qa/qa/page/dashboard/groups.rb                |   2 +-
 .../page/project/sub_menus/create_new_menu.rb |   7 +
 .../2_plan/issue/create_issue_spec.rb         |  16 +-
 scripts/rspec_helpers.sh                      |  29 --
 .../admin/groups_controller_spec.rb           |   5 +
 .../application_controller_spec.rb            |   5 +-
 spec/features/dashboard/group_spec.rb         |  24 --
 spec/features/dashboard/groups_list_spec.rb   | 256 -------------
 .../groups/members/leave_group_spec.rb        |  79 ----
 .../files/file_open_mrs_dropdown_spec.rb      |  42 +--
 spec/frontend/fixtures/admin.rb               |  49 +++
 .../components/issue_card_time_info_spec.js   |  10 +-
 .../notes/store/legacy_notes/actions_spec.js  |  11 +
 .../disable_diff_side_spec.js}                |  10 +-
 .../expand_lines/diff_line_row_spec.js        |   2 +-
 .../expand_lines/get_lines_spec.js            |   2 +-
 .../expand_lines_spec.js}                     |  12 +-
 .../image_viewer_spec.js}                     |   8 +-
 .../line_link_spec.js}                        |  10 +-
 .../load_file_spec.js}                        |   8 +-
 .../options_menu_spec.js}                     |   6 +-
 .../toggle_file_spec.js}                      |   8 +-
 spec/frontend/rapid_diffs/app/app_spec.js     |  22 +-
 .../file_browser_drawer_spec.js               |   2 +-
 .../file_browser_drawer_toggle_spec.js        |   2 +-
 .../{ => file_browser}/file_browser_spec.js   |   2 +-
 .../index_spec.js}                            |  14 +-
 .../rapid_diffs/app/view_settings_spec.js     |   4 +-
 .../rapid_diffs/stores/diffs_list_spec.js     |   2 +-
 .../web_components/diff_file_mounted_spec.js  |  20 ++
 .../{ => web_components}/diff_file_spec.js    |  29 +-
 .../streaming_error_spec.js                   |   2 +-
 .../header_area/blob_controls_spec.js         |  11 +-
 .../components/create_menu_spec.js            | 177 +++++----
 spec/frontend/super_sidebar/mock_data.js      |   3 +-
 .../group_list_item_actions_spec.js           |   2 +-
 .../groups_list/groups_list_item_spec.js      |  17 +-
 .../components/groups_list/mock_data.js       |  74 +---
 .../components/groups_list/utils_spec.js      |   4 +-
 .../resource_lists/list_item_spec.js          |  52 +--
 .../work_item_bulk_edit_sidebar_spec.js       |  91 ++---
 spec/frontend/work_items/mock_data.js         |   8 -
 .../resolvers/merge_requests_resolver_spec.rb |  10 -
 spec/helpers/nav/new_dropdown_helper_spec.rb  |   2 +
 spec/initializers/trusted_proxies_spec.rb     |  42 ++-
 .../filter/placeholders_post_filter_spec.rb   |   9 +-
 spec/lib/gitlab/auth/ip_rate_limiter_spec.rb  |  12 +
 spec/lib/gitlab/current/organization_spec.rb  |  81 ++---
 .../middleware/basic_health_check_spec.rb     |   5 +-
 spec/mailers/emails/projects_spec.rb          |  34 ++
 spec/mailers/notify_spec.rb                   |  26 ++
 spec/requests/api/graphql/work_item_spec.rb   |   4 +-
 ...disable_pipeline_variables_service_spec.rb |   2 +
 ..._disable_pipeline_variables_worker_spec.rb |  21 +-
 tooling/bin/predictive_test_metrics           |  83 +++++
 tooling/bin/predictive_tests                  | 336 ++++++++++--------
 yarn.lock                                     |  15 +-
 150 files changed, 1402 insertions(+), 1337 deletions(-)
 create mode 100644 app/assets/javascripts/admin/groups/index/graphql/fragments/admin_group.fragment.graphql
 create mode 100644 app/assets/javascripts/rapid_diffs/adapter_events.js
 delete mode 100644 app/assets/javascripts/rapid_diffs/adapters.js
 rename app/assets/javascripts/rapid_diffs/{disable_diff_side/adapter.js => adapters/disable_diff_side.js} (87%)
 rename app/assets/javascripts/rapid_diffs/{expand_lines/adapter.js => adapters/expand_lines.js} (91%)
 rename app/assets/javascripts/rapid_diffs/{ => adapters}/expand_lines/diff_line_row.js (100%)
 rename app/assets/javascripts/rapid_diffs/{ => adapters}/expand_lines/get_lines.js (100%)
 rename app/assets/javascripts/rapid_diffs/{image_viewer/adapter.js => adapters/image_viewer.js} (91%)
 rename app/assets/javascripts/rapid_diffs/{line_link/adapter.js => adapters/line_link.js} (92%)
 rename app/assets/javascripts/rapid_diffs/{load_file/adapter.js => adapters/load_file.js} (97%)
 rename app/assets/javascripts/rapid_diffs/{options_menu/adapter.js => adapters/options_menu.js} (97%)
 rename app/assets/javascripts/rapid_diffs/{toggle_file/adapter.js => adapters/toggle_file.js} (97%)
 create mode 100644 app/assets/javascripts/rapid_diffs/app/adapters.js
 rename app/assets/javascripts/rapid_diffs/app/{ => file_browser}/file_browser.vue (100%)
 rename app/assets/javascripts/rapid_diffs/app/{ => file_browser}/file_browser_drawer.vue (100%)
 rename app/assets/javascripts/rapid_diffs/app/{ => file_browser}/file_browser_drawer_toggle.vue (100%)
 rename app/assets/javascripts/rapid_diffs/app/{init_file_browser.js => file_browser/index.js} (97%)
 delete mode 100644 app/assets/javascripts/rapid_diffs/app/pinia.js
 rename app/assets/javascripts/rapid_diffs/app/{ => quirks}/content_visibility_fix.js (100%)
 rename app/assets/javascripts/rapid_diffs/app/{ => quirks}/safari_fix.js (100%)
 delete mode 100644 app/assets/javascripts/rapid_diffs/events.js
 create mode 100644 app/assets/javascripts/rapid_diffs/index.js
 rename app/assets/javascripts/rapid_diffs/{ => web_components}/diff_file.js (95%)
 create mode 100644 app/assets/javascripts/rapid_diffs/web_components/diff_file_mounted.js
 rename app/assets/javascripts/rapid_diffs/{ => web_components}/streaming_error.js (100%)
 delete mode 100644 app/views/dashboard/groups/_groups.html.haml
 create mode 100644 app/views/notify/pipeline_variables_migration_complete_email.html.haml
 create mode 100644 app/views/notify/pipeline_variables_migration_complete_email.text.erb
 delete mode 100644 config/feature_flags/beta/filter_blob_path.yml
 delete mode 100644 config/feature_flags/beta/your_work_groups_vue.yml
 create mode 100644 db/migrate/20250714093056_add_top_level_ancestor_to_sbom_graph_paths.rb
 create mode 100644 db/schema_migrations/20250714093056
 create mode 100644 doc/user/gitlab_duo/prompt_examples/analyze_vulnerabilities.md
 create mode 100644 spec/frontend/fixtures/admin.rb
 rename spec/frontend/rapid_diffs/{disable_diff_side/adapter_spec.js => adapters/disable_diff_side_spec.js} (83%)
 rename spec/frontend/rapid_diffs/{ => adapters}/expand_lines/diff_line_row_spec.js (90%)
 rename spec/frontend/rapid_diffs/{ => adapters}/expand_lines/get_lines_spec.js (98%)
 rename spec/frontend/rapid_diffs/{expand_lines/adapter_spec.js => adapters/expand_lines_spec.js} (91%)
 rename spec/frontend/rapid_diffs/{image_viewer/adapter.spec.js => adapters/image_viewer_spec.js} (88%)
 rename spec/frontend/rapid_diffs/{line_link/adapter_spec.js => adapters/line_link_spec.js} (84%)
 rename spec/frontend/rapid_diffs/{load_file/adapter_spec.js => adapters/load_file_spec.js} (93%)
 rename spec/frontend/rapid_diffs/{options_menu/adapter_spec.js => adapters/options_menu_spec.js} (93%)
 rename spec/frontend/rapid_diffs/{toggle_file/adapter_spec.js => adapters/toggle_file_spec.js} (91%)
 rename spec/frontend/rapid_diffs/app/{ => file_browser}/file_browser_drawer_spec.js (96%)
 rename spec/frontend/rapid_diffs/app/{ => file_browser}/file_browser_drawer_toggle_spec.js (95%)
 rename spec/frontend/rapid_diffs/app/{ => file_browser}/file_browser_spec.js (96%)
 rename spec/frontend/rapid_diffs/app/{init_file_browser_spec.js => file_browser/index_spec.js} (91%)
 create mode 100644 spec/frontend/rapid_diffs/web_components/diff_file_mounted_spec.js
 rename spec/frontend/rapid_diffs/{ => web_components}/diff_file_spec.js (84%)
 rename spec/frontend/rapid_diffs/{ => web_components}/streaming_error_spec.js (89%)
 create mode 100755 tooling/bin/predictive_test_metrics

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37f3224a538..4eaa1b38567 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,6 @@ variables:
   RSPEC_MATCHING_JS_FILES_PATH: rspec/js_matching_files.txt
   RSPEC_MATCHING_TESTS_EE_PATH: rspec/matching_tests-ee.txt
   RSPEC_MATCHING_TESTS_FOSS_PATH: rspec/matching_tests-foss.txt
-  RSPEC_MATCHING_TEST_FILES_PATH: rspec/matching_test_files.txt
   RSPEC_PACKED_TESTS_MAPPING_PATH: crystalball/packed-mapping.json
   RSPEC_PACKED_TESTS_MAPPING_ALT_PATH: crystalball/packed-mapping-alt.json
   RSPEC_PREDICTIVE_PIPELINE_TEMPLATE_YML: .gitlab/ci/rails/rspec-predictive.gitlab-ci.yml.erb
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 572603c1959..9cd1392b3cf 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -132,35 +132,27 @@ detect-tests:
   needs: []
   stage: prepare
   before_script:
-    - source ./scripts/utils.sh
-    - source ./scripts/rspec_helpers.sh
     # Use alternative coverage based mappings for tier-2 pipeline
     - |
       if echo "$CI_MERGE_REQUEST_LABELS" | grep -q "pipeline::tier-2"; then
-        echo "Using alternative coverage based mappings"
         MAPPING_TYPE=coverage
       else
-        echo "Using standard described_class based mappings"
         MAPPING_TYPE=described_class
       fi
   script:
     - |
       # $FIND_CHANGES_MERGE_REQUEST_IID is defined in as-if-foss.gitlab-ci.yml
       if [ -n "$CI_MERGE_REQUEST_IID" ] || [ -n "$FIND_CHANGES_MERGE_REQUEST_IID" ]; then
-        mkdir -p $(dirname "$RSPEC_CHANGED_FILES_PATH")
-
-        tooling/bin/predictive_tests --ci --select-tests --with-crystalball-mappings --mapping-type $MAPPING_TYPE
-
-        filter_rspec_matched_foss_tests ${RSPEC_MATCHING_TEST_FILES_PATH} ${RSPEC_MATCHING_TESTS_FOSS_PATH};
-        filter_rspec_matched_ee_tests ${RSPEC_MATCHING_TEST_FILES_PATH} ${RSPEC_MATCHING_TESTS_EE_PATH};
-
-        echoinfo 'Related FOSS RSpec tests:'
-        echoinfo "$(tr ' ' '\n' < $RSPEC_MATCHING_TESTS_FOSS_PATH)"
-        echo ""
-
-        echoinfo 'Related EE RSpec tests:'
-        echoinfo "$(tr ' ' '\n' < $RSPEC_MATCHING_TESTS_EE_PATH)"
-        echo ""
+        tooling/bin/predictive_tests \
+          --ci \
+          --with-crystalball-mappings \
+          --mapping-type $MAPPING_TYPE \
+          --with-frontend-fixture-mappings \
+          --frontend-fixtures-mapping-path $FRONTEND_FIXTURES_MAPPING_PATH \
+          --matching-foss-rspec-test-files-path $RSPEC_MATCHING_TESTS_FOSS_PATH \
+          --matching-ee-rspec-test-files-path $RSPEC_MATCHING_TESTS_EE_PATH \
+          --matching-jest-test-files-path $RSPEC_MATCHING_JS_FILES_PATH \
+          --changed-files-path $RSPEC_CHANGED_FILES_PATH
       fi
   artifacts:
     expire_in: 7d
@@ -170,7 +162,6 @@ detect-tests:
       - ${RSPEC_MATCHING_JS_FILES_PATH}
       - ${RSPEC_MATCHING_TESTS_EE_PATH}
       - ${RSPEC_MATCHING_TESTS_FOSS_PATH}
-      - ${RSPEC_MATCHING_TEST_FILES_PATH}
 
 detect-previous-failed-tests:
   extends:
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index 543c0e2ea71..f745d35f0d7 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -82,35 +82,16 @@ export-predictive-test-metrics:
   dependencies: []
   variables:
     GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR: "tmp/predictive_tests"
-    GLCI_ALL_FAILED_RSPEC_TESTS_FILE: "${GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR}/rspec_all_failed_tests.txt"
   before_script:
     - source ./scripts/utils.sh
     - source ./scripts/rspec_helpers.sh
     - retrieve_failed_tests "${GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR}" "oneline" "latest"
   script:
-    - tooling/bin/predictive_tests --export-predictive-backend-metrics
+    - |
+      tooling/bin/predictive_test_metrics \
+        --export-backend-metrics \
+        --failed-backend-tests-file "${GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR}/rspec_all_failed_tests.txt"
   artifacts:
     expire_in: 7d
     paths:
       - $GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR
-
-export-predictive-test-metrics-frontend:
-  extends:
-    - export-predictive-test-metrics
-    - .yarn-cache
-    - .with-ci-node-image
-  dependencies:
-    - detect-tests
-    - graphql-schema-dump
-  variables:
-    GLCI_JEST_FAILED_TESTS_FILE: "${GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR}/jest_failed_tests.txt"
-  before_script:
-    - !reference [export-predictive-test-metrics, before_script]
-    - yarn_install_script
-  script:
-    - tooling/bin/predictive_tests --export-predictive-frontend-metrics
-  artifacts:
-    expire_in: 7d
-    paths:
-      - $GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR
-      - $JEST_MATCHING_TEST_FILES_PATH
diff --git a/.gitlab/duo/mr-review-instructions.yaml b/.gitlab/duo/mr-review-instructions.yaml
index 1466a2b66eb..d5c19e24ce5 100644
--- a/.gitlab/duo/mr-review-instructions.yaml
+++ b/.gitlab/duo/mr-review-instructions.yaml
@@ -45,6 +45,8 @@ instructions:
     fileFilters:
       - "spec/**/*_spec.rb"
       - "ee/spec/**/*_spec.rb"
+      - "!spec/factories/**/*"
+      - "!spec/support/**/*"
     instructions: |
       1. Test both happy paths and edge cases
       2. Include error scenarios
diff --git a/Gemfile b/Gemfile
index df0d47f9b88..96987fdcfe7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -164,7 +164,7 @@ gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
 
 # GraphQL API
-gem 'graphql', '2.4.13', feature_category: :api
+gem 'graphql', '2.5.11', feature_category: :api
 gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
 gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
 
diff --git a/Gemfile.checksum b/Gemfile.checksum
index fa7a22b2bd9..cc637b4bb74 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -292,7 +292,7 @@
 {"name":"grape-swagger-entity","version":"0.5.5","platform":"ruby","checksum":"a2a0eb28964b1a56775a3571358a9f0a300b703dbaee1ee535adb2a7bed7ece6"},
 {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"},
 {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"},
-{"name":"graphql","version":"2.4.13","platform":"ruby","checksum":"fb1db6e9e24c93c995f8083d66ec65ea70991aa2b68da1b15a360b418af5aa9d"},
+{"name":"graphql","version":"2.5.11","platform":"ruby","checksum":"1169ffc6e215fd4d60056455b672c40a0cafa0607262049c2cca343b0f6bdb5c"},
 {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"},
 {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"},
 {"name":"grpc","version":"1.63.0","platform":"arm64-darwin","checksum":"91b93a354508a9d1772f095554f2e4c04358c2b32d7a670e3705b7fc4695c996"},
diff --git a/Gemfile.lock b/Gemfile.lock
index b335a0b14e9..9bfc65eaf06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -948,7 +948,7 @@ GEM
       grape
       rack
     graphlyte (1.0.0)
-    graphql (2.4.13)
+    graphql (2.5.11)
       base64
       fiber-storage
       logger
@@ -2205,7 +2205,7 @@ DEPENDENCIES
   grape-swagger-entity (~> 0.5.5)
   grape_logging (~> 1.8, >= 1.8.4)
   graphlyte (~> 1.0.0)
-  graphql (= 2.4.13)
+  graphql (= 2.5.11)
   graphql-docs (~> 5.0.0)
   grpc (= 1.63.0)
   gssapi (~> 1.3.1)
diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum
index 164d0f50634..82b31797eba 100644
--- a/Gemfile.next.checksum
+++ b/Gemfile.next.checksum
@@ -292,7 +292,7 @@
 {"name":"grape-swagger-entity","version":"0.5.5","platform":"ruby","checksum":"a2a0eb28964b1a56775a3571358a9f0a300b703dbaee1ee535adb2a7bed7ece6"},
 {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"},
 {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"},
-{"name":"graphql","version":"2.4.13","platform":"ruby","checksum":"fb1db6e9e24c93c995f8083d66ec65ea70991aa2b68da1b15a360b418af5aa9d"},
+{"name":"graphql","version":"2.5.11","platform":"ruby","checksum":"1169ffc6e215fd4d60056455b672c40a0cafa0607262049c2cca343b0f6bdb5c"},
 {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"},
 {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"},
 {"name":"grpc","version":"1.63.0","platform":"arm64-darwin","checksum":"91b93a354508a9d1772f095554f2e4c04358c2b32d7a670e3705b7fc4695c996"},
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 26589db2109..034f4540a34 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -942,7 +942,7 @@ GEM
       grape
       rack
     graphlyte (1.0.0)
-    graphql (2.4.13)
+    graphql (2.5.11)
       base64
       fiber-storage
       logger
@@ -2200,7 +2200,7 @@ DEPENDENCIES
   grape-swagger-entity (~> 0.5.5)
   grape_logging (~> 1.8, >= 1.8.4)
   graphlyte (~> 1.0.0)
-  graphql (= 2.4.13)
+  graphql (= 2.5.11)
   graphql-docs (~> 5.0.0)
   grpc (= 1.63.0)
   gssapi (~> 1.3.1)
diff --git a/app/assets/javascripts/admin/groups/index/constants.js b/app/assets/javascripts/admin/groups/index/constants.js
index 821b8db8811..0806de5174b 100644
--- a/app/assets/javascripts/admin/groups/index/constants.js
+++ b/app/assets/javascripts/admin/groups/index/constants.js
@@ -9,7 +9,7 @@ import {
 import GroupsList from '~/vue_shared/components/groups_list/groups_list.vue';
 import { formatGraphQLGroups } from '~/vue_shared/components/groups_list/formatter';
 import ResourceListsEmptyState from '~/vue_shared/components/resource_lists/empty_state.vue';
-import adminGroupsQuery from 'ee_else_ce/admin/groups/index/graphql/queries/groups.query.graphql';
+import adminGroupsQuery from './graphql/queries/groups.query.graphql';
 
 const baseTab = {
   formatter: (groups) =>
diff --git a/app/assets/javascripts/admin/groups/index/graphql/fragments/admin_group.fragment.graphql b/app/assets/javascripts/admin/groups/index/graphql/fragments/admin_group.fragment.graphql
new file mode 100644
index 00000000000..2110cc12e45
--- /dev/null
+++ b/app/assets/javascripts/admin/groups/index/graphql/fragments/admin_group.fragment.graphql
@@ -0,0 +1,7 @@
+# id field is requested by ~/graphql_shared/fragments/group.fragment.graphql
+# eslint-disable-next-line @graphql-eslint/require-selections
+fragment AdminGroup on Group {
+  projectStatistics {
+    storageSize
+  }
+}
diff --git a/app/assets/javascripts/admin/groups/index/graphql/queries/groups.query.graphql b/app/assets/javascripts/admin/groups/index/graphql/queries/groups.query.graphql
index 114429fa400..bea74177af4 100644
--- a/app/assets/javascripts/admin/groups/index/graphql/queries/groups.query.graphql
+++ b/app/assets/javascripts/admin/groups/index/graphql/queries/groups.query.graphql
@@ -1,5 +1,6 @@
 #import "~/graphql_shared/fragments/group.fragment.graphql"
 #import "~/graphql_shared/fragments/page_info.fragment.graphql"
+#import "ee_else_ce/admin/groups/index/graphql/fragments/admin_group.fragment.graphql"
 
 query adminGroupsQuery(
   $first: Int
@@ -22,9 +23,7 @@ query adminGroupsQuery(
   ) {
     nodes {
       ...Group
-      projectStatistics {
-        storageSize
-      }
+      ...AdminGroup
     }
     pageInfo {
       ...PageInfo
diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
index 7c6d0bc10e3..56f17e20052 100644
--- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js
+++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
@@ -190,7 +190,10 @@ export const TOGGLE_MARKDOWN_PREVIEW = {
   // However, this particular shortcut has been in place since before the `mod` key was available.
   // We've chosen to leave this implemented as-is for the time being to avoid breaking people's workflows.
   // See discussion in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45308#note_527490548.
-  defaultKeys: ['ctrl+shift+p', 'command+shift+p'],
+  // Update 2025-07-17: Adding `alt` version to fix an issue in Windows
+  // This new combination is compatible across Mac, Linux and Windows.
+  // See https://gitlab.com/gitlab-org/gitlab/-/issues/17600#note_2633177789
+  defaultKeys: ['ctrl+shift+p', 'command+shift+p', 'alt+shift+p'],
 };
 
 /**
diff --git a/app/assets/javascripts/entrypoints/lookbook/rapid_diffs.js b/app/assets/javascripts/entrypoints/lookbook/rapid_diffs.js
index 3ac183cf152..ab7f2f0e059 100644
--- a/app/assets/javascripts/entrypoints/lookbook/rapid_diffs.js
+++ b/app/assets/javascripts/entrypoints/lookbook/rapid_diffs.js
@@ -1,12 +1,15 @@
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { VIEWER_ADAPTERS } from '~/rapid_diffs/adapters';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { VIEWER_ADAPTERS } from '~/rapid_diffs/app/adapters';
 
 customElements.define('diff-file', DiffFile);
 customElements.define(
   'diff-file-mounted',
   class extends HTMLElement {
     connectedCallback() {
-      this.parentElement.mount({ adapterConfig: VIEWER_ADAPTERS, observe: () => {} });
+      this.parentElement.mount({
+        adapterConfig: VIEWER_ADAPTERS,
+        observe: () => {},
+      });
     }
   },
 );
diff --git a/app/assets/javascripts/issues/list/components/issue_card_time_info.vue b/app/assets/javascripts/issues/list/components/issue_card_time_info.vue
index 29fb418379d..d33ecd30bee 100644
--- a/app/assets/javascripts/issues/list/components/issue_card_time_info.vue
+++ b/app/assets/javascripts/issues/list/components/issue_card_time_info.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlIcon, GlSkeletonLoader } from '@gitlab/ui';
 import { STATUS_CLOSED } from '~/issues/constants';
-import { humanTimeframe, isInPast, localeDateFormat, newDate } from '~/lib/utils/datetime_utility';
+import { humanTimeframe, isInPast, newDate } from '~/lib/utils/datetime_utility';
 import { __ } from '~/locale';
 import { STATE_CLOSED, METADATA_KEYS } from '~/work_items/constants';
 import {
@@ -46,12 +46,10 @@ export default {
       return this.issue.dueDate || findStartAndDueDateWidget(this.issue)?.dueDate;
     },
     datesText() {
-      if (this.startDate) {
+      if (this.startDate || this.dueDate) {
         return humanTimeframe(newDate(this.startDate), newDate(this.dueDate));
       }
-      if (this.dueDate) {
-        return localeDateFormat.asDate.format(newDate(this.dueDate));
-      }
+
       return null;
     },
     isClosed() {
diff --git a/app/assets/javascripts/notes/store/legacy_notes/actions.js b/app/assets/javascripts/notes/store/legacy_notes/actions.js
index 25f2f0ea072..8d6814cc38e 100644
--- a/app/assets/javascripts/notes/store/legacy_notes/actions.js
+++ b/app/assets/javascripts/notes/store/legacy_notes/actions.js
@@ -176,7 +176,7 @@ export function initPolling() {
       noteable_id: this.notesData.noteableId,
     },
     {
-      connected() {
+      connected: () => {
         this.fetchUpdatedNotes();
       },
       received(data) {
diff --git a/app/assets/javascripts/pages/dashboard/groups/index/index.js b/app/assets/javascripts/pages/dashboard/groups/index/index.js
index 699cb71f867..12862768e6a 100644
--- a/app/assets/javascripts/pages/dashboard/groups/index/index.js
+++ b/app/assets/javascripts/pages/dashboard/groups/index/index.js
@@ -1,10 +1,3 @@
-import { initGroupsListWithFilteredSearch } from '~/groups/init_groups_list_with_filtered_search';
 import { initYourWorkGroups } from '~/groups/your_work';
-import { DASHBOARD_FILTERED_SEARCH_NAMESPACE } from '~/groups/constants';
-import DashboardGroupsEmptyState from '~/groups/components/empty_states/dashboard_groups_empty_state.vue';
 
-initGroupsListWithFilteredSearch({
-  filteredSearchNamespace: DASHBOARD_FILTERED_SEARCH_NAMESPACE,
-  EmptyState: DashboardGroupsEmptyState,
-});
 initYourWorkGroups();
diff --git a/app/assets/javascripts/pages/projects/commit/rapid_diffs/index.js b/app/assets/javascripts/pages/projects/commit/rapid_diffs/index.js
index a7f1ebf8dd6..f994c4302e0 100644
--- a/app/assets/javascripts/pages/projects/commit/rapid_diffs/index.js
+++ b/app/assets/javascripts/pages/projects/commit/rapid_diffs/index.js
@@ -1,6 +1,6 @@
 import initCommitActions from '~/projects/commit';
 import { initCommitBoxInfo } from '~/projects/commit_box/info';
-import { createRapidDiffsApp } from '~/rapid_diffs/app';
+import { createRapidDiffsApp } from '~/rapid_diffs';
 
 initCommitBoxInfo();
 initCommitActions();
diff --git a/app/assets/javascripts/pages/projects/compare/rapid_diffs/index.js b/app/assets/javascripts/pages/projects/compare/rapid_diffs/index.js
index 6e493f79508..dc0b9e8d227 100644
--- a/app/assets/javascripts/pages/projects/compare/rapid_diffs/index.js
+++ b/app/assets/javascripts/pages/projects/compare/rapid_diffs/index.js
@@ -1,5 +1,5 @@
 import initCompareSelector from '~/projects/compare';
-import { createRapidDiffsApp } from '~/rapid_diffs/app';
+import { createRapidDiffsApp } from '~/rapid_diffs';
 
 initCompareSelector();
 
diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/rapid_diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/rapid_diffs/index.js
index 6c5b503e93b..f65a69cb9cc 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/creations/rapid_diffs/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/creations/rapid_diffs/index.js
@@ -7,7 +7,7 @@ import initPipelines from '~/commit/pipelines/pipelines_bundle';
 import MergeRequest from '~/merge_request';
 import CompareApp from '~/merge_requests/components/compare_app.vue';
 import { __ } from '~/locale';
-import { createRapidDiffsApp } from '~/rapid_diffs/app';
+import { createRapidDiffsApp } from '~/rapid_diffs';
 
 const mrNewCompareNode = document.querySelector('.js-merge-request-new-compare');
 if (mrNewCompareNode) {
diff --git a/app/assets/javascripts/pages/projects/merge_requests/rapid_diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/rapid_diffs/index.js
index d68bd98f7c1..04acb0f512d 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/rapid_diffs/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/rapid_diffs/index.js
@@ -1,4 +1,4 @@
 import { initMrPage } from '~/pages/projects/merge_requests/page';
-import { createRapidDiffsApp } from '~/rapid_diffs/app';
+import { createRapidDiffsApp } from '~/rapid_diffs';
 
 initMrPage(createRapidDiffsApp);
diff --git a/app/assets/javascripts/rapid_diffs/adapter_events.js b/app/assets/javascripts/rapid_diffs/adapter_events.js
new file mode 100644
index 00000000000..7a3bf4870b2
--- /dev/null
+++ b/app/assets/javascripts/rapid_diffs/adapter_events.js
@@ -0,0 +1,6 @@
+export const MOUNTED = 'MOUNTED';
+export const CLICK = 'CLICK';
+export const VISIBLE = 'VISIBLE';
+export const INVISIBLE = 'INVISIBLE';
+export const EXPAND_FILE = 'EXPAND_FILE';
+export const COLLAPSE_FILE = 'COLLAPSE_FILE';
diff --git a/app/assets/javascripts/rapid_diffs/adapters.js b/app/assets/javascripts/rapid_diffs/adapters.js
deleted file mode 100644
index b0f3b22bbca..00000000000
--- a/app/assets/javascripts/rapid_diffs/adapters.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ExpandLinesAdapter } from '~/rapid_diffs/expand_lines/adapter';
-import { OptionsMenuAdapter } from '~/rapid_diffs/options_menu/adapter';
-import { ToggleFileAdapter } from '~/rapid_diffs/toggle_file/adapter';
-import { DisableDiffSideAdapter } from '~/rapid_diffs/disable_diff_side/adapter';
-import { ImageAdapter } from '~/rapid_diffs/image_viewer/adapter';
-import { LoadFileAdapter } from '~/rapid_diffs/load_file/adapter';
-import { LineLinkAdapter } from '~/rapid_diffs/line_link/adapter';
-
-const HEADER_ADAPTERS = [OptionsMenuAdapter, ToggleFileAdapter];
-
-export const VIEWER_ADAPTERS = {
-  text_inline: [...HEADER_ADAPTERS, ExpandLinesAdapter, LineLinkAdapter],
-  text_parallel: [...HEADER_ADAPTERS, ExpandLinesAdapter, DisableDiffSideAdapter, LineLinkAdapter],
-  image: [...HEADER_ADAPTERS, ImageAdapter],
-  no_preview: [...HEADER_ADAPTERS, LoadFileAdapter],
-};
diff --git a/app/assets/javascripts/rapid_diffs/disable_diff_side/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/disable_diff_side.js
similarity index 87%
rename from app/assets/javascripts/rapid_diffs/disable_diff_side/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/disable_diff_side.js
index ce87cee6ac1..d4c483ea90f 100644
--- a/app/assets/javascripts/rapid_diffs/disable_diff_side/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/disable_diff_side.js
@@ -1,4 +1,4 @@
-import { INVISIBLE, VISIBLE } from '~/rapid_diffs/events';
+import { INVISIBLE, VISIBLE } from '~/rapid_diffs/adapter_events';
 
 const opposingSides = {
   old: 'new',
@@ -14,7 +14,7 @@ function disableDiffsSideHandler(e) {
 
 const getBody = (diffElement) => diffElement.querySelector('[data-file-body]');
 
-export const DisableDiffSideAdapter = {
+export const disableDiffSideAdapter = {
   [VISIBLE]() {
     this.sink.disableDiffsSideHandler = disableDiffsSideHandler.bind(this);
     getBody(this.diffElement).addEventListener('mousedown', this.sink.disableDiffsSideHandler);
diff --git a/app/assets/javascripts/rapid_diffs/expand_lines/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/expand_lines.js
similarity index 91%
rename from app/assets/javascripts/rapid_diffs/expand_lines/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/expand_lines.js
index ef3541c1317..020efbeaa1e 100644
--- a/app/assets/javascripts/rapid_diffs/expand_lines/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/expand_lines.js
@@ -1,5 +1,5 @@
-import { getLines } from '~/rapid_diffs/expand_lines/get_lines';
-import { DiffLineRow } from '~/rapid_diffs/expand_lines/diff_line_row';
+import { getLines } from '~/rapid_diffs/adapters/expand_lines/get_lines';
+import { DiffLineRow } from '~/rapid_diffs/adapters/expand_lines/diff_line_row';
 import { createAlert } from '~/alert';
 import { s__ } from '~/locale';
 
@@ -13,7 +13,7 @@ const getSurroundingLines = (hunkHeaderRow) => {
   return [lineBefore, lineAfter].map((lineRow) => (lineRow ? new DiffLineRow(lineRow) : null));
 };
 
-export const ExpandLinesAdapter = {
+export const expandLinesAdapter = {
   clicks: {
     async expandLines(event, button) {
       const { expandDirection } = button.dataset;
diff --git a/app/assets/javascripts/rapid_diffs/expand_lines/diff_line_row.js b/app/assets/javascripts/rapid_diffs/adapters/expand_lines/diff_line_row.js
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/expand_lines/diff_line_row.js
rename to app/assets/javascripts/rapid_diffs/adapters/expand_lines/diff_line_row.js
diff --git a/app/assets/javascripts/rapid_diffs/expand_lines/get_lines.js b/app/assets/javascripts/rapid_diffs/adapters/expand_lines/get_lines.js
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/expand_lines/get_lines.js
rename to app/assets/javascripts/rapid_diffs/adapters/expand_lines/get_lines.js
diff --git a/app/assets/javascripts/rapid_diffs/image_viewer/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/image_viewer.js
similarity index 91%
rename from app/assets/javascripts/rapid_diffs/image_viewer/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/image_viewer.js
index 91862682372..2d161506e14 100644
--- a/app/assets/javascripts/rapid_diffs/image_viewer/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/image_viewer.js
@@ -1,8 +1,8 @@
 import Vue from 'vue';
 import ImageDiffViewer from '~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue';
-import { MOUNTED } from '../events';
+import { MOUNTED } from '../adapter_events';
 
-export const ImageAdapter = {
+export const imageAdapter = {
   [MOUNTED]() {
     const data = JSON.parse(this.diffElement.querySelector('[data-image-data]').dataset.imageData);
     // eslint-disable-next-line no-new
diff --git a/app/assets/javascripts/rapid_diffs/line_link/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/line_link.js
similarity index 92%
rename from app/assets/javascripts/rapid_diffs/line_link/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/line_link.js
index f186ac54287..0e29e8c05ea 100644
--- a/app/assets/javascripts/rapid_diffs/line_link/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/line_link.js
@@ -1,4 +1,4 @@
-import { INVISIBLE, VISIBLE } from '~/rapid_diffs/events';
+import { INVISIBLE, VISIBLE } from '~/rapid_diffs/adapter_events';
 import { NO_SCROLL_TO_HASH_CLASS } from '~/lib/utils/common_utils';
 
 function disableScrollToLink(e) {
@@ -24,7 +24,7 @@ function disableScrollToLink(e) {
 
 const getBody = (diffElement) => diffElement.querySelector('[data-file-body]');
 
-export const LineLinkAdapter = {
+export const lineLinkAdapter = {
   [VISIBLE]() {
     this.sink.disableScrollToLink = disableScrollToLink.bind(this);
     getBody(this.diffElement).addEventListener('click', this.sink.disableScrollToLink);
diff --git a/app/assets/javascripts/rapid_diffs/load_file/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/load_file.js
similarity index 97%
rename from app/assets/javascripts/rapid_diffs/load_file/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/load_file.js
index 2737cd7e58e..14a3dece954 100644
--- a/app/assets/javascripts/rapid_diffs/load_file/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/load_file.js
@@ -10,7 +10,7 @@ function htmlToElement(html) {
   return doc.body.firstChild;
 }
 
-export const LoadFileAdapter = {
+export const loadFileAdapter = {
   clicks: {
     async showChanges(event, button) {
       const { parallelView, showWhitespace } = useDiffsView(pinia);
diff --git a/app/assets/javascripts/rapid_diffs/options_menu/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/options_menu.js
similarity index 97%
rename from app/assets/javascripts/rapid_diffs/options_menu/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/options_menu.js
index 798fb1156a4..f69a96b82e7 100644
--- a/app/assets/javascripts/rapid_diffs/options_menu/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/options_menu.js
@@ -6,7 +6,7 @@ function getMenuItems(container) {
   return JSON.parse(container.querySelector('script').textContent);
 }
 
-export const OptionsMenuAdapter = {
+export const optionsMenuAdapter = {
   clicks: {
     toggleOptionsMenu(event, button) {
       const menuContainer = this.diffElement.querySelector('[data-options-menu]');
diff --git a/app/assets/javascripts/rapid_diffs/toggle_file/adapter.js b/app/assets/javascripts/rapid_diffs/adapters/toggle_file.js
similarity index 97%
rename from app/assets/javascripts/rapid_diffs/toggle_file/adapter.js
rename to app/assets/javascripts/rapid_diffs/adapters/toggle_file.js
index 25002a4cc5a..a5595b6e699 100644
--- a/app/assets/javascripts/rapid_diffs/toggle_file/adapter.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/toggle_file.js
@@ -1,4 +1,4 @@
-import { COLLAPSE_FILE, EXPAND_FILE, MOUNTED } from '~/rapid_diffs/events';
+import { COLLAPSE_FILE, EXPAND_FILE, MOUNTED } from '~/rapid_diffs/adapter_events';
 
 function getDetails(root) {
   return root.querySelector('[data-file-body]');
@@ -32,7 +32,7 @@ function stopTransition(element) {
   });
 }
 
-export const ToggleFileAdapter = {
+export const toggleFileAdapter = {
   clicks: {
     toggleFile(event, button) {
       const collapsed = this.diffElement.dataset.collapsed === 'true';
diff --git a/app/assets/javascripts/rapid_diffs/app/adapters.js b/app/assets/javascripts/rapid_diffs/app/adapters.js
new file mode 100644
index 00000000000..778168cc5af
--- /dev/null
+++ b/app/assets/javascripts/rapid_diffs/app/adapters.js
@@ -0,0 +1,16 @@
+import { expandLinesAdapter } from '~/rapid_diffs/adapters/expand_lines';
+import { optionsMenuAdapter } from '~/rapid_diffs/adapters/options_menu';
+import { toggleFileAdapter } from '~/rapid_diffs/adapters/toggle_file';
+import { disableDiffSideAdapter } from '~/rapid_diffs/adapters/disable_diff_side';
+import { imageAdapter } from '~/rapid_diffs/adapters/image_viewer';
+import { loadFileAdapter } from '~/rapid_diffs/adapters/load_file';
+import { lineLinkAdapter } from '~/rapid_diffs/adapters/line_link';
+
+const HEADER_ADAPTERS = [optionsMenuAdapter, toggleFileAdapter];
+
+export const VIEWER_ADAPTERS = {
+  text_inline: [...HEADER_ADAPTERS, expandLinesAdapter, lineLinkAdapter],
+  text_parallel: [...HEADER_ADAPTERS, expandLinesAdapter, disableDiffSideAdapter, lineLinkAdapter],
+  image: [...HEADER_ADAPTERS, imageAdapter],
+  no_preview: [...HEADER_ADAPTERS, loadFileAdapter],
+};
diff --git a/app/assets/javascripts/rapid_diffs/app/file_browser.vue b/app/assets/javascripts/rapid_diffs/app/file_browser/file_browser.vue
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/app/file_browser.vue
rename to app/assets/javascripts/rapid_diffs/app/file_browser/file_browser.vue
diff --git a/app/assets/javascripts/rapid_diffs/app/file_browser_drawer.vue b/app/assets/javascripts/rapid_diffs/app/file_browser/file_browser_drawer.vue
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/app/file_browser_drawer.vue
rename to app/assets/javascripts/rapid_diffs/app/file_browser/file_browser_drawer.vue
diff --git a/app/assets/javascripts/rapid_diffs/app/file_browser_drawer_toggle.vue b/app/assets/javascripts/rapid_diffs/app/file_browser/file_browser_drawer_toggle.vue
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/app/file_browser_drawer_toggle.vue
rename to app/assets/javascripts/rapid_diffs/app/file_browser/file_browser_drawer_toggle.vue
diff --git a/app/assets/javascripts/rapid_diffs/app/init_file_browser.js b/app/assets/javascripts/rapid_diffs/app/file_browser/index.js
similarity index 97%
rename from app/assets/javascripts/rapid_diffs/app/init_file_browser.js
rename to app/assets/javascripts/rapid_diffs/app/file_browser/index.js
index 850de569aab..e0720dfc9d6 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_file_browser.js
+++ b/app/assets/javascripts/rapid_diffs/app/file_browser/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import axios from '~/lib/utils/axios_utils';
 import { pinia } from '~/pinia/instance';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import FileBrowserToggle from '~/diffs/components/file_browser_toggle.vue';
 import { generateTreeList } from '~/diffs/utils/tree_worker_utils';
 import { SET_TREE_DATA } from '~/diffs/store/mutation_types';
diff --git a/app/assets/javascripts/rapid_diffs/app/index.js b/app/assets/javascripts/rapid_diffs/app/index.js
index 0f43a515ca7..119f52f8f3a 100644
--- a/app/assets/javascripts/rapid_diffs/app/index.js
+++ b/app/assets/javascripts/rapid_diffs/app/index.js
@@ -1,20 +1,20 @@
-// eslint-disable-next-line max-classes-per-file
 import { pinia } from '~/pinia/instance';
 import { initViewSettings } from '~/rapid_diffs/app/view_settings';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
-import { initFileBrowser } from '~/rapid_diffs/app/init_file_browser';
-import { StreamingError } from '~/rapid_diffs/streaming_error';
+import { initFileBrowser } from '~/rapid_diffs/app/file_browser';
+import { StreamingError } from '~/rapid_diffs/web_components/streaming_error';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
 import { initHiddenFilesWarning } from '~/rapid_diffs/app/init_hidden_files_warning';
 import { createAlert } from '~/alert';
 import { __ } from '~/locale';
-import { fixWebComponentsStreamingOnSafari } from '~/rapid_diffs/app/safari_fix';
+import { fixWebComponentsStreamingOnSafari } from '~/rapid_diffs/app/quirks/safari_fix';
 import { DIFF_FILE_MOUNTED } from '~/rapid_diffs/dom_events';
-import { VIEWER_ADAPTERS } from '~/rapid_diffs/adapters';
+import { VIEWER_ADAPTERS } from '~/rapid_diffs/app/adapters';
 import { camelizeKeys } from '~/lib/utils/object_utils';
-import { disableBrokenContentVisibility } from '~/rapid_diffs/app/content_visibility_fix';
+import { disableBrokenContentVisibility } from '~/rapid_diffs/app/quirks/content_visibility_fix';
 import { useApp } from '~/rapid_diffs/stores/app';
+import { createDiffFileMounted } from '~/rapid_diffs/web_components/diff_file_mounted';
 
 // This facade interface joins together all the bits and pieces of Rapid Diffs: DiffFile, Settings, File browser, etc.
 // It's a unified entrypoint for Rapid Diffs and all external communications should happen through this interface.
@@ -25,9 +25,11 @@ export class RapidDiffsFacade {
   adapterConfig = VIEWER_ADAPTERS;
 
   #DiffFileImplementation;
+  #DiffFileMounted;
 
   constructor({ DiffFileImplementation = DiffFile } = {}) {
     this.#DiffFileImplementation = DiffFileImplementation;
+    this.#DiffFileMounted = createDiffFileMounted(this);
     this.root = document.querySelector('[data-rapid-diffs]');
   }
 
@@ -105,15 +107,6 @@ export class RapidDiffsFacade {
     );
   }
 
-  get #DiffFileMounted() {
-    const appContext = this;
-    return class extends HTMLElement {
-      connectedCallback() {
-        this.parentElement.mount(appContext);
-      }
-    };
-  }
-
   #initHeader() {
     useDiffsView(pinia).diffsStatsEndpoint = this.appData.diffsStatsEndpoint;
     useDiffsView(pinia).streamUrl = this.appData.reloadStreamUrl;
@@ -155,7 +148,3 @@ export class RapidDiffsFacade {
     return this.appData.lazy;
   }
 }
-
-export const createRapidDiffsApp = (options) => {
-  return new RapidDiffsFacade(options);
-};
diff --git a/app/assets/javascripts/rapid_diffs/app/init_hidden_files_warning.js b/app/assets/javascripts/rapid_diffs/app/init_hidden_files_warning.js
index 1d04dfe3b33..98e90600393 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_hidden_files_warning.js
+++ b/app/assets/javascripts/rapid_diffs/app/init_hidden_files_warning.js
@@ -4,7 +4,7 @@ import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
 import { pinia } from '~/pinia/instance';
 import HiddenFilesWarning from '~/diffs/components/hidden_files_warning.vue';
 
-export async function initHiddenFilesWarning(el) {
+export function initHiddenFilesWarning(el) {
   // eslint-disable-next-line no-new
   new Vue({
     el,
diff --git a/app/assets/javascripts/rapid_diffs/app/pinia.js b/app/assets/javascripts/rapid_diffs/app/pinia.js
deleted file mode 100644
index 31624d1ffb9..00000000000
--- a/app/assets/javascripts/rapid_diffs/app/pinia.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Vue from 'vue';
-import { createPinia, PiniaVuePlugin } from 'pinia';
-
-Vue.use(PiniaVuePlugin);
-export const pinia = createPinia();
diff --git a/app/assets/javascripts/rapid_diffs/app/content_visibility_fix.js b/app/assets/javascripts/rapid_diffs/app/quirks/content_visibility_fix.js
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/app/content_visibility_fix.js
rename to app/assets/javascripts/rapid_diffs/app/quirks/content_visibility_fix.js
diff --git a/app/assets/javascripts/rapid_diffs/app/safari_fix.js b/app/assets/javascripts/rapid_diffs/app/quirks/safari_fix.js
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/app/safari_fix.js
rename to app/assets/javascripts/rapid_diffs/app/quirks/safari_fix.js
diff --git a/app/assets/javascripts/rapid_diffs/app/view_settings.js b/app/assets/javascripts/rapid_diffs/app/view_settings.js
index 745decf78b8..a731941908d 100644
--- a/app/assets/javascripts/rapid_diffs/app/view_settings.js
+++ b/app/assets/javascripts/rapid_diffs/app/view_settings.js
@@ -3,8 +3,8 @@ import { mapState, mapActions } from 'pinia';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
 import DiffAppControls from '~/diffs/components/diff_app_controls.vue';
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { COLLAPSE_FILE, EXPAND_FILE } from '~/rapid_diffs/events';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { COLLAPSE_FILE, EXPAND_FILE } from '~/rapid_diffs/adapter_events';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
 
 const collapseAllFiles = () => {
diff --git a/app/assets/javascripts/rapid_diffs/events.js b/app/assets/javascripts/rapid_diffs/events.js
deleted file mode 100644
index 83fe4927ac8..00000000000
--- a/app/assets/javascripts/rapid_diffs/events.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const MOUNTED = 'mounted';
-export const CLICK = 'click';
-export const VISIBLE = 'visible';
-export const INVISIBLE = 'invisible';
-export const EXPAND_FILE = 'EXPAND_FILE';
-export const COLLAPSE_FILE = 'COLLAPSE_FILE';
diff --git a/app/assets/javascripts/rapid_diffs/index.js b/app/assets/javascripts/rapid_diffs/index.js
new file mode 100644
index 00000000000..2dabbec3963
--- /dev/null
+++ b/app/assets/javascripts/rapid_diffs/index.js
@@ -0,0 +1,5 @@
+import { RapidDiffsFacade } from '~/rapid_diffs/app';
+
+export const createRapidDiffsApp = (options) => {
+  return new RapidDiffsFacade(options);
+};
diff --git a/app/assets/javascripts/rapid_diffs/stores/diffs_list.js b/app/assets/javascripts/rapid_diffs/stores/diffs_list.js
index 8a15703f8a3..6382c9d20fb 100644
--- a/app/assets/javascripts/rapid_diffs/stores/diffs_list.js
+++ b/app/assets/javascripts/rapid_diffs/stores/diffs_list.js
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { debounce } from 'lodash';
 import { renderHtmlStreams } from '~/streaming/render_html_streams';
 import { toPolyfillReadable } from '~/streaming/polyfills';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { performanceMarkAndMeasure } from '~/performance/utils';
 
 export const statuses = {
diff --git a/app/assets/javascripts/rapid_diffs/diff_file.js b/app/assets/javascripts/rapid_diffs/web_components/diff_file.js
similarity index 95%
rename from app/assets/javascripts/rapid_diffs/diff_file.js
rename to app/assets/javascripts/rapid_diffs/web_components/diff_file.js
index 55cba43292b..709510ceede 100644
--- a/app/assets/javascripts/rapid_diffs/diff_file.js
+++ b/app/assets/javascripts/rapid_diffs/web_components/diff_file.js
@@ -1,7 +1,7 @@
-/** @typedef {import('./app/index.js').RapidDiffsFacade} */
+/** @typedef {import('../app').RapidDiffsFacade} */
 import { camelizeKeys } from '~/lib/utils/object_utils';
-import { DIFF_FILE_MOUNTED } from './dom_events';
-import * as events from './events';
+import { DIFF_FILE_MOUNTED } from '../dom_events';
+import * as events from '../adapter_events';
 
 const eventNames = Object.values(events);
 const dataCacheKey = Symbol('data');
@@ -66,7 +66,7 @@ export class DiffFile extends HTMLElement {
   _trigger(event, ...args) {
     if (!eventNames.includes(event))
       throw new Error(
-        `Missing event declaration: ${event}. Did you forget to declare this in ~/rapid_diffs/events.js?`,
+        `Missing event declaration: ${event}. Did you forget to declare this in ~/rapid_diffs/adapter_events.js?`,
       );
     this.adapters.forEach((adapter) => adapter[event]?.call?.(this.adapterContext, ...args));
   }
diff --git a/app/assets/javascripts/rapid_diffs/web_components/diff_file_mounted.js b/app/assets/javascripts/rapid_diffs/web_components/diff_file_mounted.js
new file mode 100644
index 00000000000..d42b37fdd3e
--- /dev/null
+++ b/app/assets/javascripts/rapid_diffs/web_components/diff_file_mounted.js
@@ -0,0 +1,8 @@
+export const createDiffFileMounted = (appContext) => {
+  return class extends HTMLElement {
+    connectedCallback() {
+      // this context is injected into the DiffFile component
+      this.parentElement.mount(appContext);
+    }
+  };
+};
diff --git a/app/assets/javascripts/rapid_diffs/streaming_error.js b/app/assets/javascripts/rapid_diffs/web_components/streaming_error.js
similarity index 100%
rename from app/assets/javascripts/rapid_diffs/streaming_error.js
rename to app/assets/javascripts/rapid_diffs/web_components/streaming_error.js
diff --git a/app/assets/javascripts/repository/components/header_area/blob_controls.vue b/app/assets/javascripts/repository/components/header_area/blob_controls.vue
index febbd38037b..19a0867839b 100644
--- a/app/assets/javascripts/repository/components/header_area/blob_controls.vue
+++ b/app/assets/javascripts/repository/components/header_area/blob_controls.vue
@@ -273,11 +273,7 @@ export default {
     class="gl-flex gl-flex-wrap gl-items-center gl-gap-3 gl-self-end"
     data-testid="blob-controls"
   >
-    <open-mr-badge
-      v-if="glFeatures.filterBlobPath"
-      :project-path="projectPath"
-      :blob-path="filePath"
-    />
+    <open-mr-badge :project-path="projectPath" :blob-path="filePath" />
     <gl-button
       v-gl-tooltip.html="findFileTooltip"
       :title="findFileTooltip"
diff --git a/app/assets/javascripts/super_sidebar/components/create_menu.vue b/app/assets/javascripts/super_sidebar/components/create_menu.vue
index 181168a1c30..1d9dce69553 100644
--- a/app/assets/javascripts/super_sidebar/components/create_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/create_menu.vue
@@ -4,7 +4,9 @@ import {
   GlTooltipDirective,
   GlDisclosureDropdownGroup,
   GlDisclosureDropdownItem,
+  GlLink,
 } from '@gitlab/ui';
+import { isMetaClick } from '~/lib/utils/common_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue';
 import { __, s__ } from '~/locale';
@@ -13,9 +15,9 @@ import {
   TRIGGER_ELEMENT_DISCLOSURE_DROPDOWN,
 } from '~/invite_members/constants';
 import {
+  BASE_ALLOWED_CREATE_TYPES,
   WORK_ITEM_TYPE_NAME_EPIC,
   CREATE_NEW_WORK_ITEM_MODAL,
-  CREATE_NEW_GROUP_WORK_ITEM_MODAL,
   NAME_TO_TEXT_LOWERCASE_MAP,
   sprintfWorkItem,
 } from '~/work_items/constants';
@@ -30,6 +32,7 @@ export default {
     GlDisclosureDropdown,
     GlDisclosureDropdownGroup,
     GlDisclosureDropdownItem,
+    GlLink,
     InviteMembersTrigger,
     CreateWorkItemModal: () => import('~/work_items/components/create_work_item_modal.vue'),
   },
@@ -39,7 +42,7 @@ export default {
   i18n: {
     createNew: __('Create new…'),
   },
-  inject: ['isImpersonating', 'fullPath', 'workItemPlanningViewEnabled'],
+  inject: ['isGroup', 'isImpersonating', 'fullPath', 'workItemPlanningViewEnabled'],
   props: {
     groups: {
       type: Array,
@@ -49,17 +52,27 @@ export default {
   data() {
     return {
       dropdownOpen: false,
-      showCreateGroupWorkItemModal: false,
       showCreateWorkItemModal: false,
     };
   },
   computed: {
+    allowedWorkItemTypes() {
+      if (this.isGroup) {
+        return [];
+      }
+      return BASE_ALLOWED_CREATE_TYPES;
+    },
     dropdownOffset() {
       return {
         mainAxis: DROPDOWN_Y_OFFSET,
         crossAxis: this.isImpersonating ? DROPDOWN_X_OFFSET_IMPERSONATING : DROPDOWN_X_OFFSET_BASE,
       };
     },
+    preselectedWorkItemType() {
+      return !this.workItemPlanningViewEnabled && this.isGroup
+        ? WORK_ITEM_TYPE_NAME_EPIC
+        : undefined;
+    },
   },
   methods: {
     isInvitedMembers(groupItem) {
@@ -68,15 +81,24 @@ export default {
     isCreateWorkItem(groupItem) {
       return groupItem.component === CREATE_NEW_WORK_ITEM_MODAL;
     },
-    isCreateGroupWorkItem(groupItem) {
-      return groupItem.component === CREATE_NEW_GROUP_WORK_ITEM_MODAL;
+    getCreateWorkItemItem(groupItem) {
+      // Make sure <gl-disclosure-dropdown-item> doesn't have an href so it's
+      // not rendered as <a> which prevents us from opening the create modal
+      return { ...groupItem, href: undefined };
     },
-    handleCreateWorkItemClick() {
-      if (this.workItemPlanningViewEnabled) {
-        this.showCreateWorkItemModal = true;
-      } else {
-        this.showCreateGroupWorkItemModal = true;
+    getCreateWorkItemHref(groupItem) {
+      return this.workItemPlanningViewEnabled ? undefined : groupItem.href;
+    },
+    handleCreateWorkItemClick(event) {
+      if (event && isMetaClick(event)) {
+        // opening in a new tab
+        return;
       }
+
+      // don't follow the link for normal clicks - open in modal
+      event?.preventDefault?.();
+
+      this.showCreateWorkItemModal = true;
     },
     handleWorkItemCreated(workItem) {
       // Triggering the toast at this component, because we want to lazy load the modal
@@ -85,7 +107,6 @@ export default {
 
       // Hide the modal first to prevent the component from being destroyed
       // before we can capture the event data
-      this.showCreateGroupWorkItemModal = false;
       this.showCreateWorkItemModal = false;
 
       const workItemType = NAME_TO_TEXT_LOWERCASE_MAP[workItem?.workItemType?.name];
@@ -134,40 +155,37 @@ export default {
           trigger-source="top_nav"
           :trigger-element="$options.TRIGGER_ELEMENT_DISCLOSURE_DROPDOWN"
         />
-        <gl-disclosure-dropdown-item
-          v-else-if="isCreateGroupWorkItem(groupItem)"
-          :key="`${groupItem.text}-group-modal-trigger`"
-          :item="groupItem"
-          data-testid="new-group-work-item-trigger"
-          @action="showCreateGroupWorkItemModal = true"
-        />
         <gl-disclosure-dropdown-item
           v-else-if="isCreateWorkItem(groupItem)"
           :key="`${groupItem.text}-modal-trigger`"
-          :item="groupItem"
+          :item="getCreateWorkItemItem(groupItem)"
           data-testid="new-work-item-trigger"
           @action="handleCreateWorkItemClick"
-        />
+        >
+          <template #list-item>
+            <gl-link
+              v-if="getCreateWorkItemHref(groupItem)"
+              class="gl-block gl-text-default hover:gl-text-default hover:gl-no-underline"
+              :href="getCreateWorkItemHref(groupItem)"
+              @click.stop="handleCreateWorkItemClick"
+            >
+              {{ groupItem.text }}
+            </gl-link>
+          </template>
+        </gl-disclosure-dropdown-item>
         <gl-disclosure-dropdown-item v-else :key="groupItem.text" :item="groupItem" />
       </template>
     </gl-disclosure-dropdown-group>
-    <create-work-item-modal
-      v-if="showCreateGroupWorkItemModal"
-      visible
-      :full-path="fullPath"
-      hide-button
-      is-group
-      data-testid="new-group-work-item-modal"
-      :preselected-work-item-type="$options.WORK_ITEM_TYPE_NAME_EPIC"
-      @hideModal="showCreateGroupWorkItemModal = false"
-      @workItemCreated="handleWorkItemCreated"
-    />
     <create-work-item-modal
       v-if="showCreateWorkItemModal"
-      visible
-      hide-button
-      data-testid="new-work-item-modal"
+      :allowed-work-item-types="allowedWorkItemTypes"
+      :always-show-work-item-type-select="!isGroup"
       :full-path="fullPath"
+      hide-button
+      :is-group="isGroup"
+      :preselected-work-item-type="preselectedWorkItemType"
+      visible
+      data-testid="new-work-item-modal"
       @hideModal="showCreateWorkItemModal = false"
       @workItemCreated="handleWorkItemCreated"
     />
diff --git a/app/assets/javascripts/vue_shared/components/groups_list/utils.js b/app/assets/javascripts/vue_shared/components/groups_list/utils.js
index aed1177cccd..1a97954dba4 100644
--- a/app/assets/javascripts/vue_shared/components/groups_list/utils.js
+++ b/app/assets/javascripts/vue_shared/components/groups_list/utils.js
@@ -14,13 +14,18 @@ export const availableGraphQLGroupActions = ({
   isSelfDeletionInProgress,
   isSelfDeletionScheduled,
 }) => {
+  // No actions available when group deletion is in progress
+  if (isSelfDeletionInProgress) {
+    return [];
+  }
+
   const baseActions = [];
 
   if (userPermissions.viewEditPage) {
     baseActions.push(ACTION_EDIT);
   }
 
-  if (userPermissions.removeGroup && isSelfDeletionScheduled && !isSelfDeletionInProgress) {
+  if (userPermissions.removeGroup && isSelfDeletionScheduled) {
     baseActions.push(ACTION_RESTORE);
   }
 
@@ -33,7 +38,7 @@ export const availableGraphQLGroupActions = ({
     if (!markedForDeletion) {
       baseActions.push(ACTION_DELETE);
       // Groups with self deletion scheduled can be deleted immediately
-    } else if (isSelfDeletionScheduled && !isSelfDeletionInProgress) {
+    } else if (isSelfDeletionScheduled) {
       baseActions.push(ACTION_DELETE_IMMEDIATELY);
     }
   }
diff --git a/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue b/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue
index e85a3efefa0..d854bd23b13 100644
--- a/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue
+++ b/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue
@@ -17,7 +17,6 @@ import {
 } from '../../constants';
 import workItemBulkUpdateMutation from '../../graphql/list/work_item_bulk_update.mutation.graphql';
 import getAvailableBulkEditWidgets from '../../graphql/list/get_available_bulk_edit_widgets.query.graphql';
-import workItemParent from '../../graphql/list/work_item_parent.query.graphql';
 import WorkItemBulkEditAssignee from './work_item_bulk_edit_assignee.vue';
 import WorkItemBulkEditDropdown from './work_item_bulk_edit_dropdown.vue';
 import WorkItemBulkEditLabels from './work_item_bulk_edit_labels.vue';
@@ -84,7 +83,6 @@ export default {
       assigneeId: undefined,
       confidentiality: undefined,
       healthStatus: undefined,
-      parentNamespaceId: undefined,
       removeLabelIds: [],
       state: undefined,
       subscription: undefined,
@@ -94,22 +92,6 @@ export default {
     };
   },
   apollo: {
-    parentNamespaceId: {
-      query: workItemParent,
-      variables() {
-        return {
-          fullPath: this.isGroup
-            ? this.fullPath
-            : this.fullPath.substring(0, this.fullPath.lastIndexOf('/')),
-        };
-      },
-      update(data) {
-        return data.namespace.id;
-      },
-      skip() {
-        return !this.shouldUseGraphQLBulkEdit;
-      },
-    },
     availableWidgets: {
       query: getAvailableBulkEditWidgets,
       variables() {
@@ -196,7 +178,7 @@ export default {
         mutation: workItemBulkUpdateMutation,
         variables: {
           input: {
-            parentId: this.parentNamespaceId,
+            fullPath: this.fullPath,
             ids: this.checkedItems.map((item) => item.id),
             labelsWidget: hasLabelsToUpdate
               ? {
diff --git a/app/assets/javascripts/work_items/components/work_item_description.vue b/app/assets/javascripts/work_items/components/work_item_description.vue
index acdc1415613..d6fd29fccc1 100644
--- a/app/assets/javascripts/work_items/components/work_item_description.vue
+++ b/app/assets/javascripts/work_items/components/work_item_description.vue
@@ -270,7 +270,7 @@ export default {
   mounted() {
     const DEFAULT_TEMPLATE_NAME = 'default';
     const templateNameFromRoute =
-      this.$route.query[paramName] || this.$route.query[oldParamNameFromPreWorkItems];
+      this.$route?.query[paramName] || this.$route?.query[oldParamNameFromPreWorkItems];
     const templateName = !this.isNewWorkItemRoute
       ? DEFAULT_TEMPLATE_NAME
       : templateNameFromRoute || DEFAULT_TEMPLATE_NAME;
@@ -459,7 +459,7 @@ export default {
         return;
       }
 
-      const params = new URLSearchParams(this.$route.query);
+      const params = new URLSearchParams(this.$route?.query);
       params.delete(paramName);
       params.delete(oldParamNameFromPreWorkItems);
       if (this.selectedTemplate && this.isNewWorkItemRoute) {
diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js
index b4e483a825d..4c3f13700ce 100644
--- a/app/assets/javascripts/work_items/constants.js
+++ b/app/assets/javascripts/work_items/constants.js
@@ -206,7 +206,6 @@ export const DEFAULT_EPIC_COLORS = '#1068bf';
 export const MAX_FREQUENT_PROJECTS = 3;
 export const MAX_FREQUENT_ITEMS = 3;
 export const CREATE_NEW_WORK_ITEM_MODAL = 'create_new_work_item_modal';
-export const CREATE_NEW_GROUP_WORK_ITEM_MODAL = 'create_new_group_work_item_modal';
 export const RELATED_ITEM_ID_URL_QUERY_PARAM = 'related_item_id';
 
 export const WORK_ITEM_REFERENCE_CHAR = '#';
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 3202dabe6f3..8deeeb5d129 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -8,6 +8,9 @@ class Admin::GroupsController < Admin::ApplicationController
   feature_category :groups_and_projects, [:create, :destroy, :edit, :index, :members_update, :new, :show, :update]
 
   def index
+    # Groups are loaded via GraphQL query on frontend
+    return if Feature.enabled?(:admin_groups_vue, current_user)
+
     @groups = groups.sort_by_attribute(@sort = pagination_params[:sort])
     @groups = @groups.search(safe_params[:name]) if safe_params[:name].present?
     @groups = @groups.page(pagination_params[:page])
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ca0ed716c43..2f0489faa5e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -548,11 +548,15 @@ class ApplicationController < BaseActionController
     auth_user if strong_memoized?(:auth_user)
   end
 
-  # Used by `set_current_organization` in BaseActionController
-  def organization_params
-    params.permit(
-      :controller, :namespace_id, :group_id, :id, :organization_path
-    )
+  def set_current_organization
+    return if ::Current.organization_assigned
+
+    ::Current.organization = Gitlab::Current::Organization.new(
+      params: params.permit(
+        :controller, :namespace_id, :group_id, :id, :organization_path
+      ),
+      user: current_user
+    ).organization
   end
 end
 
diff --git a/app/controllers/base_action_controller.rb b/app/controllers/base_action_controller.rb
index 93ba8a6e800..dcb05c6522b 100644
--- a/app/controllers/base_action_controller.rb
+++ b/app/controllers/base_action_controller.rb
@@ -30,21 +30,6 @@ class BaseActionController < ActionController::Base
     connect_src_values = Array.wrap(default_connect_src) | [Gitlab::CurrentSettings.snowplow_collector_hostname]
     p.connect_src(*connect_src_values)
   end
-
-  def set_current_organization
-    return if ::Current.organization_assigned
-
-    organization = Gitlab::Current::Organization.new(
-      params: organization_params,
-      user: current_user,
-      session: session
-    ).organization
-
-    session_key = Gitlab::Current::Organization::SESSION_KEY
-    session[session_key] = organization.id if organization && session[session_key] != organization.id
-
-    ::Current.organization = organization
-  end
 end
 # rubocop:enable Gitlab/NamespacedClass
 # rubocop:enable Rails/ApplicationController
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 334504780da..4bf34197ec6 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -148,9 +148,8 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
     ) && !doorkeeper_application&.trusted?
   end
 
-  # Used by `set_current_organization` in BaseActionController
-  def organization_params
-    {}
+  def set_current_organization
+    ::Current.organization = Gitlab::Current::Organization.new(user: current_user).organization
   end
 end
 
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 1042ae519d1..4f30afc87b1 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -47,7 +47,6 @@ class Projects::BlobController < Projects::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:inline_blame, @project)
-    push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)
     push_frontend_feature_flag(:repository_file_tree_browser, @project)
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index f4df8f3f27d..798d4da6126 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -19,7 +19,6 @@ class Projects::TreeController < Projects::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:inline_blame, @project)
-    push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)
     push_frontend_feature_flag(:repository_file_tree_browser, @project)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ece48374d0f..4700acd6244 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -42,7 +42,6 @@ class ProjectsController < Projects::ApplicationController
     push_frontend_feature_flag(:edit_branch_rules, @project)
     # TODO: We need to remove the FF eventually when we rollout page_specific_styles
     push_frontend_feature_flag(:page_specific_styles, current_user)
-    push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)
 
diff --git a/app/graphql/resolvers/concerns/resolves_merge_requests.rb b/app/graphql/resolvers/concerns/resolves_merge_requests.rb
index 66a8284223e..fd7b3fb06a2 100644
--- a/app/graphql/resolvers/concerns/resolves_merge_requests.rb
+++ b/app/graphql/resolvers/concerns/resolves_merge_requests.rb
@@ -22,8 +22,6 @@ module ResolvesMergeRequests
       args[:include_subgroups] = true
     end
 
-    args.delete(:blob_path) if Feature.disabled?(:filter_blob_path, current_user)
-
     validate_blob_path!(args)
 
     rewrite_param_name(args, :reviewer_wildcard_id, :reviewer_id)
diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb
index 3ac77af08a8..dc5c0367d35 100644
--- a/app/graphql/resolvers/merge_requests_resolver.rb
+++ b/app/graphql/resolvers/merge_requests_resolver.rb
@@ -90,7 +90,6 @@ module Resolvers
       description: <<~DESC
                Path of the blob changed in merge request.
                Requires state, targetBranches, and createdAfter arguments.
-               Available only when the feature flag `filter_blob_path` is enabled.
       DESC
 
     argument :created_after, Types::TimeType,
diff --git a/app/helpers/nav/new_dropdown_helper.rb b/app/helpers/nav/new_dropdown_helper.rb
index ef829cb80fe..099944be036 100644
--- a/app/helpers/nav/new_dropdown_helper.rb
+++ b/app/helpers/nav/new_dropdown_helper.rb
@@ -61,7 +61,7 @@ module Nav
           ::Gitlab::Nav::TopNavMenuItem.build(
             id: 'new_group_work_item',
             title: _('New work item'),
-            component: 'create_new_group_work_item_modal',
+            component: 'create_new_work_item_modal',
             data: {
               track_action: 'click_link_new_group_work_item',
               track_label: 'plus_menu_dropdown',
@@ -109,6 +109,7 @@ module Nav
               id: 'new_issue',
               title: _('New issue'),
               href: new_project_issue_path(project),
+              component: 'create_new_work_item_modal',
               data: {
                 track_action: 'click_link_new_issue',
                 track_label: 'plus_menu_dropdown',
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index ba9d7fef1da..56b94c27ff4 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -81,6 +81,18 @@ module Emails
       )
     end
 
+    def pipeline_variables_migration_complete_email(user, group, counts)
+      @user = user
+      @group = group
+      @updated_count = counts[:updated_count]
+      @skipped_count = counts[:skipped_count]
+
+      email_with_layout(
+        to: @user.notification_email_for(@group),
+        subject: subject("Pipeline variables settings migration complete")
+      )
+    end
+
     def repository_push_email(project_id, opts = {})
       @message =
         Gitlab::Email::Message::RepositoryPush.new(self, project_id, opts)
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index d3788806ed7..deab24c3ead 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -253,6 +253,22 @@ class NotifyPreview < ActionMailer::Preview
     Notify.pipeline_fixed_email(pipeline, pipeline.user.try(:email))
   end
 
+  def pipeline_variables_migration_complete_email
+    Notify.pipeline_variables_migration_complete_email(user, group, { updated_count: 5, skipped_count: 3 }).message
+  end
+
+  def pipeline_variables_migration_complete_email_all_updated
+    Notify.pipeline_variables_migration_complete_email(user, group, { updated_count: 10, skipped_count: 0 }).message
+  end
+
+  def pipeline_variables_migration_complete_email_single_project
+    Notify.pipeline_variables_migration_complete_email(user, group, { updated_count: 1, skipped_count: 0 }).message
+  end
+
+  def pipeline_variables_migration_complete_email_single_skipped
+    Notify.pipeline_variables_migration_complete_email(user, group, { updated_count: 2, skipped_count: 1 }).message
+  end
+
   def pipeline_schedule_owner_unavailable
     Notify.pipeline_schedule_owner_unavailable_email(pipeline_schedule, user)
   end
diff --git a/app/services/ci/safe_disable_pipeline_variables_service.rb b/app/services/ci/safe_disable_pipeline_variables_service.rb
index a43317d3119..c666a1e9251 100644
--- a/app/services/ci/safe_disable_pipeline_variables_service.rb
+++ b/app/services/ci/safe_disable_pipeline_variables_service.rb
@@ -13,11 +13,14 @@ module Ci
       return ServiceResponse.error(message: 'You are not authorized to perform this action') unless authorized?
 
       updated_count = 0
+      total_projects_with_pipeline_variables = 0
 
       parent_group.self_and_descendants.each_batch do |group_batch|
         all_projects_ci_cd_settings = ProjectCiCdSetting.for_namespace(group_batch)
           .with_pipeline_variables_enabled
 
+        total_projects_with_pipeline_variables += all_projects_ci_cd_settings.count
+
         all_projects_ci_cd_settings
           .each_batch(of: PROJECTS_BATCH_SIZE) do |ci_cd_settings|
           batch_updated_count =
@@ -29,7 +32,12 @@ module Ci
         end
       end
 
-      ServiceResponse.success(payload: { updated_count: updated_count })
+      skipped_count = total_projects_with_pipeline_variables - updated_count
+
+      ServiceResponse.success(payload: {
+        updated_count: updated_count,
+        skipped_count: skipped_count
+      })
     end
 
     private
diff --git a/app/views/dashboard/groups/_groups.html.haml b/app/views/dashboard/groups/_groups.html.haml
deleted file mode 100644
index 86dd1f33bd8..00000000000
--- a/app/views/dashboard/groups/_groups.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-#js-groups-list-with-filtered-search{ data: { app_data: groups_list_with_filtered_search_app_data(dashboard_groups_path(format: :json, archived: false)) } }
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index bd109c2771c..87442bdf42d 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -3,26 +3,5 @@
 = render_dashboard_ultimate_trial(current_user)
 = render_product_usage_data_collection_changes(current_user)
 
-- if Feature.enabled?(:your_work_groups_vue, current_user)
-  = render 'dashboard/groups_head'
-  #js-your-work-groups-app{ data: { app_data: groups_list_with_filtered_search_app_data(dashboard_groups_path(format: :json)) } }
-- else
-  %div{ data: { testid: 'groups-page' } }
-    - if current_user.groups.exists?
-      = render 'dashboard/groups_head'
-      = render 'groups'
-    - else
-      - button_text = _("New group") if current_user.can_create_group?
-      - button_link = new_group_path if current_user.can_create_group?
-      = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-groups-md.svg',
-        title: s_('GroupsEmptyState|A group is a collection of several projects'),
-        primary_button_text: button_text,
-        primary_button_link: button_link,
-        primary_button_options: { data: { testid: "new-group-button" } },
-        secondary_button_text: _("Explore groups"),
-        secondary_button_link: explore_groups_path,
-        secondary_button_options: { data: { testid: "explore-groups-button" } },
-        empty_state_options: { data: { testid: 'groups-empty-state' } }) do |c|
-
-        - c.with_description do
-          = s_("GroupsEmptyState|If you organize your projects under a group, it works like a folder. You can manage your group member's permissions and access to each project in the group.")
+= render 'dashboard/groups_head'
+#js-your-work-groups-app{ data: { app_data: groups_list_with_filtered_search_app_data(dashboard_groups_path(format: :json)) } }
diff --git a/app/views/notify/pipeline_variables_migration_complete_email.html.haml b/app/views/notify/pipeline_variables_migration_complete_email.html.haml
new file mode 100644
index 00000000000..cdf211361e8
--- /dev/null
+++ b/app/views/notify/pipeline_variables_migration_complete_email.html.haml
@@ -0,0 +1,17 @@
+%p
+  = s_('Notify|All projects in the %{group_name} group were checked for pipeline variables usage.').html_safe % { group_name: link_to(@group.name, @group.web_url) }
+%p
+  - if @updated_count == 1
+    = s_('Notify|1 project was not using pipeline variables. CI/CD settings were updated to prevent future pipeline variable usage.')
+  - else
+    = s_('Notify|%{updated_count} projects were not using pipeline variables. CI/CD settings were updated to prevent future pipeline variable usage.') % { updated_count: @updated_count }
+%p
+  - if @skipped_count == 0
+    = s_('Notify|All projects in this group have CI/CD setting set to prevent pipeline variable usage. 🎉')
+  - else
+    - if @skipped_count == 1
+      = s_('Notify|1 project has used pipeline variables in the past. This project\'s CI/CD settings were not updated as there is a risk the setting change would impact pipelines.')
+    - else
+      = s_('Notify|%{skipped_count} have used pipeline variables in the past. These projects\' CI/CD settings were not updated as there is a risk the setting change would impact pipelines.') % { skipped_count: @skipped_count }
+%p
+  = s_('Notify|Projects that could not be updated need manual review. You can check the documentation for more information about the pipeline variable setting migration tool.')
diff --git a/app/views/notify/pipeline_variables_migration_complete_email.text.erb b/app/views/notify/pipeline_variables_migration_complete_email.text.erb
new file mode 100644
index 00000000000..fa26fc2217c
--- /dev/null
+++ b/app/views/notify/pipeline_variables_migration_complete_email.text.erb
@@ -0,0 +1,7 @@
+Pipeline variables migration has completed for group <%= @group.name %>
+
+Group URL: <%= @group.web_url %>
+
+<%= @updated_count %> project CI/CD settings were updated to restrict pipeline variable access.
+
+Projects in this group hierarchy now have pipeline variables restricted to maintainers and owners only.
diff --git a/app/workers/ci/safe_disable_pipeline_variables_worker.rb b/app/workers/ci/safe_disable_pipeline_variables_worker.rb
index 8b80c88fb31..d3cea6eec05 100644
--- a/app/workers/ci/safe_disable_pipeline_variables_worker.rb
+++ b/app/workers/ci/safe_disable_pipeline_variables_worker.rb
@@ -28,6 +28,13 @@ module Ci
       return unless result.success?
 
       log_extra_metadata_on_done(:disabled_pipeline_variables_count, result.payload[:updated_count])
+
+      Notify.pipeline_variables_migration_complete_email(
+        current_user, group, {
+          updated_count: result.payload[:updated_count],
+          skipped_count: result.payload[:skipped_count]
+        }
+      ).deliver_later
     end
   end
 end
diff --git a/config/feature_flags/beta/filter_blob_path.yml b/config/feature_flags/beta/filter_blob_path.yml
deleted file mode 100644
index 164ee6edc3f..00000000000
--- a/config/feature_flags/beta/filter_blob_path.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: filter_blob_path
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/499245
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172997
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/505449
-milestone: '17.7'
-group: group::source code
-type: beta
-default_enabled: true
diff --git a/config/feature_flags/beta/your_work_groups_vue.yml b/config/feature_flags/beta/your_work_groups_vue.yml
deleted file mode 100644
index e28973b4cb8..00000000000
--- a/config/feature_flags/beta/your_work_groups_vue.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: your_work_groups_vue
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/502477
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183596
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/542790
-milestone: '17.10'
-group: group::organizations
-type: beta
-default_enabled: false
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index f03561b5617..12015c539dd 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -8,20 +8,29 @@
 module Rack
   class Request
     def trusted_proxy?(ip)
-      Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip }
+      Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy.include?(ip) }
     rescue IPAddr::InvalidAddressError
       false
     end
   end
 end
 
-gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
+# Trust custom proxies from config.
+trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
   IPAddr.new(proxy)
 rescue IPAddr::InvalidAddressError
-end.compact
+end
 
-Rails.application.config.action_dispatch.trusted_proxies = (
-  ['127.0.0.1', '::1'] + gitlab_trusted_proxies)
+# Default to private IPs if no proxies configured.
+trusted_proxies = ActionDispatch::RemoteIp::TRUSTED_PROXIES if trusted_proxies.empty?
+
+# Always trust localhost.
+trusted_proxies += [IPAddr.new('127.0.0.1'), IPAddr.new('::1')]
+
+# Trust all proxies in their IPv6 mapped format.
+trusted_proxies += trusted_proxies.compact.select(&:ipv4?).map(&:ipv4_mapped)
+
+Rails.application.config.action_dispatch.trusted_proxies = trusted_proxies.uniq
 
 # A monkey patch to make trusted proxies work with Rails 5.0.
 # Inspired by https://github.com/rails/rails/issues/5223#issuecomment-263778719
diff --git a/db/migrate/20250714093056_add_top_level_ancestor_to_sbom_graph_paths.rb b/db/migrate/20250714093056_add_top_level_ancestor_to_sbom_graph_paths.rb
new file mode 100644
index 00000000000..d84231198ae
--- /dev/null
+++ b/db/migrate/20250714093056_add_top_level_ancestor_to_sbom_graph_paths.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddTopLevelAncestorToSbomGraphPaths < Gitlab::Database::Migration[2.3]
+  milestone '18.3'
+
+  def change
+    add_column :sbom_graph_paths, :top_level_ancestor, :boolean, default: false, null: false
+  end
+end
diff --git a/db/schema_migrations/20250714093056 b/db/schema_migrations/20250714093056
new file mode 100644
index 00000000000..df5ad36867a
--- /dev/null
+++ b/db/schema_migrations/20250714093056
@@ -0,0 +1 @@
+322a14c59203133addd60adada1e77b5b81e6ab540186756ef1b72304cf25959
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5f75a44e60d..9fbf0a27e07 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -23019,7 +23019,8 @@ CREATE TABLE sbom_graph_paths (
     project_id bigint NOT NULL,
     path_length integer NOT NULL,
     created_at timestamp with time zone NOT NULL,
-    updated_at timestamp with time zone NOT NULL
+    updated_at timestamp with time zone NOT NULL,
+    top_level_ancestor boolean DEFAULT false NOT NULL
 );
 
 CREATE SEQUENCE sbom_graph_paths_id_seq
diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md
index 757644740e0..7382f01a830 100644
--- a/doc/api/graphql/reference/_index.md
+++ b/doc/api/graphql/reference/_index.md
@@ -21650,7 +21650,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="addonuserassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="addonuserassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="addonuserassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="addonuserassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="addonuserassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="addonuserassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="addonuserassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="addonuserassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -21708,7 +21708,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="addonuserauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="addonuserauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="addonuserauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="addonuserauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="addonuserauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="addonuserauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="addonuserauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="addonuserauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -21828,7 +21828,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="addonuserreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="addonuserreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="addonuserreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="addonuserreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="addonuserreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="addonuserreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="addonuserreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="addonuserreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -22875,7 +22875,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="autocompleteduserassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="autocompleteduserassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="autocompleteduserassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="autocompleteduserassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="autocompleteduserassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="autocompleteduserassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="autocompleteduserassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="autocompleteduserassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -22933,7 +22933,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="autocompleteduserauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="autocompleteduserauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="autocompleteduserauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="autocompleteduserauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="autocompleteduserauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="autocompleteduserauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="autocompleteduserauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="autocompleteduserauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -23065,7 +23065,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="autocompleteduserreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="autocompleteduserreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="autocompleteduserreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="autocompleteduserreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="autocompleteduserreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="autocompleteduserreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="autocompleteduserreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="autocompleteduserreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -25974,7 +25974,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="currentuserassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="currentuserassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="currentuserassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="currentuserassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="currentuserassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="currentuserassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="currentuserassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="currentuserassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -26035,7 +26035,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="currentuserassigneeorreviewermergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="currentuserassigneeorreviewermergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="currentuserassigneeorreviewermergerequestsassignedreviewstates"></a>`assignedReviewStates` | [`[MergeRequestReviewState!]`](#mergerequestreviewstate) | Reviewer states for merge requests the current user is assigned to. |
-| <a id="currentuserassigneeorreviewermergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="currentuserassigneeorreviewermergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="currentuserassigneeorreviewermergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="currentuserassigneeorreviewermergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="currentuserassigneeorreviewermergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -26092,7 +26092,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="currentuserauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="currentuserauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="currentuserauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="currentuserauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="currentuserauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="currentuserauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="currentuserauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="currentuserauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -26212,7 +26212,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="currentuserreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="currentuserreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="currentuserreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="currentuserreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="currentuserreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="currentuserreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="currentuserreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="currentuserreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -30124,7 +30124,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="groupmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="groupmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="groupmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="groupmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="groupmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="groupmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="groupmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="groupmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -32808,7 +32808,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestassigneeassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="mergerequestassigneeassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="mergerequestassigneeassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestassigneeassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestassigneeassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestassigneeassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestassigneeassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestassigneeassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -32866,7 +32866,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestassigneeauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="mergerequestassigneeauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestassigneeauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="mergerequestassigneeauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestassigneeauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestassigneeauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestassigneeauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestassigneeauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -32986,7 +32986,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestassigneereviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestassigneereviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="mergerequestassigneereviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestassigneereviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestassigneereviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestassigneereviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestassigneereviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestassigneereviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -33229,7 +33229,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestauthorassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="mergerequestauthorassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="mergerequestauthorassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestauthorassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestauthorassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestauthorassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestauthorassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestauthorassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -33287,7 +33287,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestauthorauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="mergerequestauthorauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestauthorauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="mergerequestauthorauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestauthorauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestauthorauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestauthorauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestauthorauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -33407,7 +33407,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestauthorreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestauthorreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="mergerequestauthorreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestauthorreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestauthorreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestauthorreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestauthorreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestauthorreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -33701,7 +33701,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestparticipantassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="mergerequestparticipantassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="mergerequestparticipantassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestparticipantassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestparticipantassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestparticipantassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestparticipantassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestparticipantassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -33759,7 +33759,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestparticipantauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="mergerequestparticipantauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestparticipantauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="mergerequestparticipantauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestparticipantauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestparticipantauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestparticipantauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestparticipantauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -33879,7 +33879,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestparticipantreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestparticipantreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="mergerequestparticipantreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestparticipantreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestparticipantreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestparticipantreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestparticipantreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestparticipantreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -34141,7 +34141,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestreviewerassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="mergerequestreviewerassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="mergerequestreviewerassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestreviewerassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestreviewerassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestreviewerassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestreviewerassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestreviewerassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -34199,7 +34199,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestreviewerauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="mergerequestreviewerauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestreviewerauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="mergerequestreviewerauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestreviewerauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestreviewerauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestreviewerauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestreviewerauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -34319,7 +34319,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="mergerequestreviewerreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="mergerequestreviewerreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="mergerequestreviewerreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="mergerequestreviewerreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="mergerequestreviewerreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="mergerequestreviewerreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="mergerequestreviewerreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="mergerequestreviewerreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -38352,7 +38352,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="projectmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="projectmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="projectmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="projectmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="projectmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="projectmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="projectmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="projectmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -42124,7 +42124,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="usercoreassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="usercoreassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="usercoreassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="usercoreassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="usercoreassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="usercoreassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="usercoreassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="usercoreassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -42182,7 +42182,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="usercoreauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="usercoreauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="usercoreauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="usercoreauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="usercoreauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="usercoreauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="usercoreauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="usercoreauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -42302,7 +42302,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="usercorereviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="usercorereviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="usercorereviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="usercorereviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="usercorereviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="usercorereviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="usercorereviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="usercorereviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -51348,7 +51348,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="userassignedmergerequestsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Usernames of the approvers. |
 | <a id="userassignedmergerequestsapprover"></a>`approver` | [`[String!]`](#string) | Usernames of possible approvers. |
 | <a id="userassignedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="userassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="userassignedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="userassignedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="userassignedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="userassignedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -51406,7 +51406,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="userauthoredmergerequestsassigneeusername"></a>`assigneeUsername` | [`String`](#string) | Username of the assignee. |
 | <a id="userauthoredmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="userauthoredmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
-| <a id="userauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="userauthoredmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="userauthoredmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="userauthoredmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="userauthoredmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
@@ -51526,7 +51526,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="userreviewrequestedmergerequestsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Usernames of users assigned to the merge request. |
 | <a id="userreviewrequestedmergerequestsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee presence. Incompatible with assigneeUsernames and assigneeUsername. |
 | <a id="userreviewrequestedmergerequestsauthorusername"></a>`authorUsername` | [`String`](#string) | Username of the author. |
-| <a id="userreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. Available only when the feature flag `filter_blob_path` is enabled. |
+| <a id="userreviewrequestedmergerequestsblobpath"></a>`blobPath` {{< icon name="warning-solid" >}} | [`String`](#string) | **Introduced** in GitLab 17.7. **Status**: Experiment. Path of the blob changed in merge request. Requires state, targetBranches, and createdAfter arguments. |
 | <a id="userreviewrequestedmergerequestscreatedafter"></a>`createdAfter` | [`Time`](#time) | Merge requests created after the timestamp. |
 | <a id="userreviewrequestedmergerequestscreatedbefore"></a>`createdBefore` | [`Time`](#time) | Merge requests created before the timestamp. |
 | <a id="userreviewrequestedmergerequestsdeployedafter"></a>`deployedAfter` | [`Time`](#time) | Merge requests deployed after the timestamp. |
diff --git a/doc/integration/exact_code_search/zoekt.md b/doc/integration/exact_code_search/zoekt.md
index 134e79b5071..228772d2a4a 100644
--- a/doc/integration/exact_code_search/zoekt.md
+++ b/doc/integration/exact_code_search/zoekt.md
@@ -377,6 +377,90 @@ To define the retry interval for failed namespaces:
    (for example, `30m` (30 minutes), `2h` (two hours), or `1d` (one day)).
 1. Select **Save changes**.
 
+## Sizing recommendations
+
+The following recommendations might be over-provisioned for some deployments.
+You should monitor your deployment to ensure:
+
+- No out-of-memory events occur.
+- CPU throttling is not excessive.
+- Indexing performance meets your requirements.
+
+Adjust resources based on your specific workload characteristics, including:
+
+- Repository size and complexity
+- Number of active developers
+- Frequency of code changes
+- Indexing patterns
+
+### Nodes
+
+For optimal performance, proper sizing of Zoekt nodes is crucial.
+Sizing recommendations differ between Kubernetes and VM deployments
+due to how resources are allocated and managed.
+
+#### Kubernetes deployments
+
+The following table shows recommended resources for Kubernetes deployments
+based on index storage requirements:
+
+| Disk   | Webserver CPU | Webserver memory  | Indexer CPU | Indexer memory |
+|--------|---------------|-------------------|-------------|----------------|
+| 128 GB | 1             | 16 GiB            | 1           | 6 GiB  |
+| 256 GB | 1.5           | 32 GiB            | 1           | 8 GiB  |
+| 512 GB | 2             | 64 GiB            | 1           | 12 GiB |
+| 1 TB   | 3             | 128 GiB           | 1.5         | 24 GiB |
+| 2 TB   | 4             | 256 GiB           | 2           | 32 GiB |
+
+To manage resources more granularly, you can allocate
+CPU and memory separately to different containers.
+
+For Kubernetes deployments:
+
+- Do not set CPU limits for Zoekt containers.
+  CPU limits might cause unnecessary throttling during indexing bursts,
+  which would significantly impact performance.
+  Instead, rely on resource requests to guarantee minimum CPU availability
+  and ensure containers use additional CPU when available and needed.
+- Set appropriate memory limits to prevent resource contention
+  and out-of-memory conditions.
+- Use high-performance storage classes for better indexing performance.
+  GitLab.com uses `pd-balanced` on GCP, which balances performance and cost.
+  Equivalent options include `gp3` on AWS and `Premium_LRS` on Azure.
+
+#### VM and bare metal deployments
+
+The following table shows recommended resources for VM and bare metal deployments
+based on index storage requirements:
+
+| Disk   | VM size  | Total CPU | Total memory | AWS          | GCP             | Azure |
+|--------|----------|-----------|--------------|--------------|-----------------|-------|
+| 128 GB | Small    | 2 cores   | 16 GB        | `r5.large`   | `n1-highmem-2`  | `Standard_E2s_v3`  |
+| 256 GB | Medium   | 4 cores   | 32 GB        | `r5.xlarge`  | `n1-highmem-4`  | `Standard_E4s_v3`  |
+| 512 GB | Large    | 4 cores   | 64 GB        | `r5.2xlarge` | `n1-highmem-8`  | `Standard_E8s_v3`  |
+| 1 TB   | X-Large  | 8 cores   | 128 GB       | `r5.4xlarge` | `n1-highmem-16` | `Standard_E16s_v3` |
+| 2 TB   | 2X-Large | 16 cores  | 256 GB       | `r5.8xlarge` | `n1-highmem-32` | `Standard_E32s_v3` |
+
+You can allocate these resources only to the entire node.
+
+For VM and bare metal deployments:
+
+- Monitor CPU, memory, and disk usage to identify bottlenecks.
+  Both webserver and indexer processes share the same CPU and memory resources.
+- Consider using SSD storage for better indexing performance.
+- Ensure adequate network bandwidth for data transfer between GitLab and Zoekt nodes.
+
+### Storage
+
+Storage requirements for Zoekt vary significantly based on repository characteristics,
+including the number of large and binary files.
+
+As a starting point, you can estimate your Zoekt storage to be half your Gitaly storage.
+For example, if your Gitaly storage is 1 TB, you might need approximately 500 GB of Zoekt storage.
+
+To monitor the use of Zoekt nodes, see [check indexing status](#check-indexing-status).
+If namespaces are not being indexed due to low disk space, consider adding or scaling up nodes.
+
 ## Run Zoekt on a separate server
 
 {{< history >}}
diff --git a/doc/subscriptions/_index.md b/doc/subscriptions/_index.md
index 1992cae0cee..ac80eb0ba35 100644
--- a/doc/subscriptions/_index.md
+++ b/doc/subscriptions/_index.md
@@ -12,6 +12,7 @@ Choose and manage the subscription that's right for you and your organization.
 
 - [GitLab plans](choosing_subscription.md)
 - [Manage subscription](manage_subscription.md)
+- [Manage users and seats](manage_users_and_seats.md)
 - [GitLab.com subscription](gitlab_com/_index.md)
 - [GitLab Self-Managed subscription](self_managed/_index.md)
 - [GitLab Dedicated](gitlab_dedicated/_index.md)
diff --git a/doc/user/gitlab_duo/prompt_examples/_index.md b/doc/user/gitlab_duo/prompt_examples/_index.md
index ef3c62a46b6..eba0450bda0 100644
--- a/doc/user/gitlab_duo/prompt_examples/_index.md
+++ b/doc/user/gitlab_duo/prompt_examples/_index.md
@@ -14,5 +14,6 @@ Use these examples to instruct GitLab Duo.
 - [Refactor legacy code](refactor_legacy_code.md)
 - [Generate tests](generate_tests.md)
 - [Debug failing code](debug_failing_code.md)
+- [Analyze security vulnerabilities](analyze_vulnerabilities.md)
 
 {{< /cards >}}
diff --git a/doc/user/gitlab_duo/prompt_examples/analyze_vulnerabilities.md b/doc/user/gitlab_duo/prompt_examples/analyze_vulnerabilities.md
new file mode 100644
index 00000000000..edb74fa5792
--- /dev/null
+++ b/doc/user/gitlab_duo/prompt_examples/analyze_vulnerabilities.md
@@ -0,0 +1,100 @@
+---
+stage: AI-powered
+group: AI Framework
+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
+description: Analyze security vulnerabilities and prioritize fixes based on business impact.
+title: Analyze security vulnerabilities and prioritize fixes
+---
+
+Follow these guidelines when you need to evaluate multiple security vulnerabilities
+and determine which ones require immediate attention.
+
+- Time estimate: 15-25 minutes
+- Level: Intermediate
+- Prerequisites: GitLab Duo Enterprise add-on, vulnerabilities available in the vulnerability report
+
+## The challenge
+
+Security scans often generate numerous vulnerability alerts, making it difficult
+to identify false positives and determine which issues pose the greatest business risk.
+
+## The approach
+
+Analyze vulnerabilities, assess business impact, and create prioritized remediation plans
+by using GitLab Duo Chat, Vulnerability Explanation, and Vulnerability Resolution.
+
+### Step 1: Explain vulnerabilities
+
+Go to the vulnerability report for your project.
+For each high or critical vulnerability, use Vulnerability Explanation to explain the issue. Then, use Duo Chat to ask follow-up questions.
+
+```plaintext
+Based on the earlier vulnerability explanation:
+
+1. What specific security risk does this pose?
+2. How could this be exploited in our [application_type]?
+3. What data or systems could be compromised?
+4. Is this a true positive or likely false positive?
+5. What is the realistic business impact?
+
+Consider our application stack: [technology_stack] and deployment environment: [environment_details].
+```
+
+Expected outcome: Clear explanation of each vulnerability's real-world impact and how it could be exploited.
+
+### Step 2: Prioritize risks
+
+Use GitLab Duo Chat to analyze multiple vulnerabilities together and create a priority matrix.
+
+```plaintext
+Based on these vulnerability explanations, help me prioritize fixes:
+
+[paste_vulnerability_summaries]
+
+Create a priority matrix considering:
+1. Exploitability (how easy to exploit)
+2. Business impact (what gets compromised)
+3. Exposure level (public-facing vs internal)
+4. Fix complexity (simple patch vs major changes)
+
+Rank as Critical/High/Medium/Low priority with justification.
+```
+
+Expected outcome: Prioritized vulnerability list with business-focused risk assessment.
+
+### Step 3: Generate fix plans
+
+For high-priority vulnerabilities, use Vulnerability Resolution or Chat to get specific remediation guidance.
+
+```plaintext
+Provide a detailed remediation plan for this [vulnerability_type]:
+
+1. Immediate steps to reduce risk
+2. Code changes needed (with examples)
+3. Configuration updates required
+4. Testing approach to verify the fix
+5. Timeline estimate for implementation
+
+Focus on [security_framework] compliance and our [coding_standards].
+```
+
+Expected outcome: Actionable remediation plans with specific implementation steps.
+
+## Tips
+
+- Start with Critical and High severity vulnerabilities first.
+- Use Vulnerability Explanation to understand the context before diving into fixes.
+- Consider your specific application architecture when assessing business impact.
+- Ask GitLab Duo Chat to explain technical terms or attack vectors you're unfamiliar with.
+- Group similar vulnerabilities together for batch analysis and consistent fixes.
+- Use the Security Dashboard to track progress on remediation efforts.
+
+## Verify
+
+Ensure that:
+
+- Priority rankings reflect actual business risk, not just CVSS scores.
+- Remediation plans include specific code examples and testing steps.
+- False positives are clearly identified and documented.
+- Critical vulnerabilities have immediate mitigation strategies identified.
+- Fix timelines are realistic and account for testing and deployment processes.
diff --git a/doc/user/group/_index.md b/doc/user/group/_index.md
index 7f9111ca413..47911c5feac 100644
--- a/doc/user/group/_index.md
+++ b/doc/user/group/_index.md
@@ -110,6 +110,7 @@ To explore all public or internal groups:
 {{< history >}}
 
 - **Member** tab [introduced](https://gitlab.com/groups/gitlab-org/-/epics/13781) in GitLab 18.2 [with a flag](../../administration/feature_flags/_index.md) named `your_work_groups_vue`. Disabled by default.
+- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/542790) in GitLab 18.3. Feature flag `your_work_groups_vue` removed.
 
 {{< /history >}}
 
@@ -123,8 +124,6 @@ This page shows groups that you are a member of through:
 - Membership of a subgroup's parent group.
 - Direct or inherited membership of a project in the group or subgroup.
 
-If the `your_work_groups_vue` feature flag is enabled, groups that you are a member of appear in the **Member** tab.
-
 ## View a group
 
 {{< history >}}
@@ -283,18 +282,18 @@ the deletion job will instead restore and unarchive the group, so the group will
 {{< history >}}
 
 - **Inactive** tab [introduced](https://gitlab.com/groups/gitlab-org/-/epics/13781) in GitLab 18.2 [with a flag](../../administration/feature_flags/_index.md) named `your_work_groups_vue`. Disabled by default.
+- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/542790) in GitLab 18.3. Feature flag `your_work_groups_vue` removed.
 
 {{< /history >}}
 
-To view a list of the subgroups that are pending deletion in a group:
+To view a list of the groups that are pending deletion:
 
 1. On the left sidebar, select **Search or go to** and find your group.
-1. Select **Subgroups and projects**.
+1. Select **View all my groups**.
+1. Select the **Inactive** tab.
 
 Groups that are marked for deletion are labeled **Pending deletion**.
 
-If the `your_work_groups_vue` feature flag is enabled, groups marked for deletion appear in the **Inactive** tab.
-
 ## Delete a group immediately
 
 {{< history >}}
diff --git a/doc/user/project/repository/files/_index.md b/doc/user/project/repository/files/_index.md
index e26f3466d62..b72adad980f 100644
--- a/doc/user/project/repository/files/_index.md
+++ b/doc/user/project/repository/files/_index.md
@@ -118,6 +118,7 @@ To create a permalink:
 - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/448868) in GitLab 17.10 [with a flag](../../../../administration/feature_flags/_index.md) named `filter_blob_path`.
 - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/505449) in GitLab 17.11.
 - [Enabled on GitLab Self-Managed and GitLab Dedicated](https://gitlab.com/gitlab-org/gitlab/-/issues/505449) in GitLab 18.0.
+- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/539215) in GitLab 18.2. Feature flag `filter_blob_path` removed.
 
 {{< /history >}}
 
diff --git a/lib/banzai/filter/placeholders_post_filter.rb b/lib/banzai/filter/placeholders_post_filter.rb
index 2a6fd1d51c5..312ce0654ea 100644
--- a/lib/banzai/filter/placeholders_post_filter.rb
+++ b/lib/banzai/filter/placeholders_post_filter.rb
@@ -136,6 +136,7 @@ module Banzai
         node['href'] = new_href
 
         # the rich text editor needs to know what the original placeholders were
+        node['data-canonical-src'] = href
         node['data-placeholder'] = href
 
         sanitize_link(node)
@@ -174,9 +175,9 @@ module Banzai
         end
 
         node['data-src'] = new_url
-        node['data-canonical-src'] = url
 
         # the rich text editor needs to know what the original placeholders were
+        node['data-canonical-src'] = url
         node['data-placeholder'] = url
 
         sanitize_link(node)
diff --git a/lib/gitlab/auth/ip_rate_limiter.rb b/lib/gitlab/auth/ip_rate_limiter.rb
index 0d50420b9f5..a941b87ff30 100644
--- a/lib/gitlab/auth/ip_rate_limiter.rb
+++ b/lib/gitlab/auth/ip_rate_limiter.rb
@@ -53,10 +53,14 @@ module Gitlab
 
       def trusted_ips
         strong_memoize(:trusted_ips) do
-          config.ip_whitelist.map do |proxy|
+          trusted = config.ip_whitelist.map do |proxy|
             IPAddr.new(proxy)
           rescue IPAddr::InvalidAddressError
-          end.compact
+          end
+
+          trusted += trusted.compact.select(&:ipv4?).map(&:ipv4_mapped)
+
+          trusted.uniq
         end
       end
     end
diff --git a/lib/gitlab/current/organization.rb b/lib/gitlab/current/organization.rb
index 7020b00fcc1..cabf7b03be9 100644
--- a/lib/gitlab/current/organization.rb
+++ b/lib/gitlab/current/organization.rb
@@ -3,18 +3,15 @@
 module Gitlab
   module Current
     class Organization
-      attr_reader :params, :user, :session
+      attr_reader :params, :user
 
-      SESSION_KEY = :organization_id
-
-      def initialize(params: {}, session: nil, user: nil)
+      def initialize(params: {}, user: nil)
         @params = params
         @user = user
-        @session = session
       end
 
       def organization
-        from_params || from_session || from_user || fallback_organization
+        from_params || from_user || fallback_organization
       end
 
       private
@@ -29,12 +26,6 @@ module Gitlab
         ::Organizations::Organization.with_user(user).first
       end
 
-      def from_session
-        return unless session.respond_to?(:[]) && session[SESSION_KEY]
-
-        ::Organizations::Organization.find_by_id(session[SESSION_KEY])
-      end
-
       def from_group_params
         path = params[:namespace_id] || params[:group_id]
         path ||= params[:id] if params[:controller] == 'groups'
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 775dc8a4e63..cb86a1e0614 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6054,7 +6054,7 @@ msgstr ""
 msgid "AiPowered|Failed to disable GitLab Duo Workflow."
 msgstr ""
 
-msgid "AiPowered|Failed to enable GitLab Duo Workflow."
+msgid "AiPowered|Failed to enable GitLab Duo Agent Platform."
 msgstr ""
 
 msgid "AiPowered|Features are available. However, any group, subgroup, or project can turn them off."
@@ -6072,6 +6072,12 @@ msgstr ""
 msgid "AiPowered|Get started with GitLab Duo Core"
 msgstr ""
 
+msgid "AiPowered|GitLab Duo Agent Platform is now on for the instance and the service account (%{accountId}) was created. To use Agent Platform in your groups, you must turn on AI features for specific groups."
+msgstr ""
+
+msgid "AiPowered|GitLab Duo Agent Platform is now on for the instance. To use Agent Platform in your groups, you must turn on AI features for specific groups."
+msgstr ""
+
 msgid "AiPowered|GitLab Duo Chat conversation expiration"
 msgstr ""
 
@@ -6093,12 +6099,6 @@ msgstr ""
 msgid "AiPowered|GitLab Duo Workflow has successfully been turned off."
 msgstr ""
 
-msgid "AiPowered|GitLab Duo Workflow is now on for the instance and the service account (%{accountId}) was created. To use Workflow in your groups, you must turn on AI features for specific groups."
-msgstr ""
-
-msgid "AiPowered|GitLab Duo Workflow is now on for the instance. To use Workflow in your groups, you must turn on AI features for specific groups."
-msgstr ""
-
 msgid "AiPowered|GitLab Duo availability"
 msgstr ""
 
@@ -42369,6 +42369,9 @@ msgstr ""
 msgid "Notify|%{singular_or_plural_line} %{error_lines}: Work item type is not available. Please check your license and permissions."
 msgstr ""
 
+msgid "Notify|%{skipped_count} have used pipeline variables in the past. These projects' CI/CD settings were not updated as there is a risk the setting change would impact pipelines."
+msgstr ""
+
 msgid "Notify|%{strong_open}%{user_name}%{strong_close} updated the custom email address credentials for the Service Desk of %{project_link_start}%{project_name}%{project_link_end} and triggered the verification process."
 msgstr ""
 
@@ -42381,9 +42384,18 @@ msgstr ""
 msgid "Notify|%{updated_by_user_name} pushed new commits to merge request %{mr_link}"
 msgstr ""
 
+msgid "Notify|%{updated_count} projects were not using pipeline variables. CI/CD settings were updated to prevent future pipeline variable usage."
+msgstr ""
+
 msgid "Notify|%{work_items} successfully imported."
 msgstr ""
 
+msgid "Notify|1 project has used pipeline variables in the past. This project's CI/CD settings were not updated as there is a risk the setting change would impact pipelines."
+msgstr ""
+
+msgid "Notify|1 project was not using pipeline variables. CI/CD settings were updated to prevent future pipeline variable usage."
+msgstr ""
+
 msgid "Notify|A new GPG key was added to your account:"
 msgstr ""
 
@@ -42399,6 +42411,12 @@ msgstr ""
 msgid "Notify|All discussions on merge request %{mr_link} were resolved by %{name}"
 msgstr ""
 
+msgid "Notify|All projects in the %{group_name} group were checked for pipeline variables usage."
+msgstr ""
+
+msgid "Notify|All projects in this group have CI/CD setting set to prevent pipeline variable usage. 🎉"
+msgstr ""
+
 msgid "Notify|And %{total_stripped_new_commits_count} more"
 msgstr ""
 
@@ -42564,6 +42582,9 @@ msgstr ""
 msgid "Notify|Project %{project_name} was exported successfully."
 msgstr ""
 
+msgid "Notify|Projects that could not be updated need manual review. You can check the documentation for more information about the pipeline variable setting migration tool."
+msgstr ""
+
 msgid "Notify|Read timeout:"
 msgstr ""
 
@@ -70873,6 +70894,9 @@ msgstr ""
 msgid "WorkItems|Fields"
 msgstr ""
 
+msgid "WorkItems|How do I use statuses?"
+msgstr ""
+
 msgid "WorkItems|Open items in side panel"
 msgstr ""
 
diff --git a/package.json b/package.json
index f94ae244ec9..7b3dc489146 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/query-language-rust": "0.13.1",
-    "@gitlab/svgs": "3.138.0",
+    "@gitlab/svgs": "3.141.0",
     "@gitlab/ui": "115.5.0",
     "@gitlab/vue-router-vue3": "npm:vue-router@4.5.1",
     "@gitlab/vuex-vue3": "npm:vuex@4.1.0",
diff --git a/qa/gems/gitlab-orchestrator/lib/gitlab/orchestrator/lib/deployment/default_values.rb b/qa/gems/gitlab-orchestrator/lib/gitlab/orchestrator/lib/deployment/default_values.rb
index 0c788432410..1265cb8d375 100644
--- a/qa/gems/gitlab-orchestrator/lib/gitlab/orchestrator/lib/deployment/default_values.rb
+++ b/qa/gems/gitlab-orchestrator/lib/gitlab/orchestrator/lib/deployment/default_values.rb
@@ -43,7 +43,13 @@ module Gitlab
                   ]
                 }
               },
-              gitlab: { "gitlab-exporter": { enabled: false } },
+              gitlab: {
+                "gitlab-exporter": { enabled: false },
+                "gitlab-shell": {
+                  sshDaemon: 'gitlab-sshd',
+                  config: { proxyProtocol: true }
+                }
+              },
               redis: { metrics: { enabled: false } },
               prometheus: { install: false },
               certmanager: { install: false },
diff --git a/qa/gems/gitlab-orchestrator/spec/unit/gitlab/orchestrator/deployment/default_values_spec.rb b/qa/gems/gitlab-orchestrator/spec/unit/gitlab/orchestrator/deployment/default_values_spec.rb
index 577889a41cc..3f65606b70f 100644
--- a/qa/gems/gitlab-orchestrator/spec/unit/gitlab/orchestrator/deployment/default_values_spec.rb
+++ b/qa/gems/gitlab-orchestrator/spec/unit/gitlab/orchestrator/deployment/default_values_spec.rb
@@ -72,7 +72,13 @@ RSpec.describe Gitlab::Orchestrator::Deployment::DefaultValues do
           ]
         }
       },
-      gitlab: { "gitlab-exporter": { enabled: false } },
+      gitlab: {
+        "gitlab-exporter": { enabled: false },
+        "gitlab-shell": {
+          sshDaemon: 'gitlab-sshd',
+          config: { proxyProtocol: true }
+        }
+      },
       redis: { metrics: { enabled: false } },
       prometheus: { install: false },
       certmanager: { install: false },
diff --git a/qa/qa/page/dashboard/groups.rb b/qa/qa/page/dashboard/groups.rb
index 957e0b48cf1..57b6904b2c9 100644
--- a/qa/qa/page/dashboard/groups.rb
+++ b/qa/qa/page/dashboard/groups.rb
@@ -10,7 +10,7 @@ module QA
           element 'new-group-button'
         end
 
-        view 'app/views/dashboard/groups/index.html.haml' do
+        view 'app/assets/javascripts/groups/your_work/constants.js' do
           element 'groups-empty-state'
         end
 
diff --git a/qa/qa/page/project/sub_menus/create_new_menu.rb b/qa/qa/page/project/sub_menus/create_new_menu.rb
index f79478b09d4..fc6f236074f 100644
--- a/qa/qa/page/project/sub_menus/create_new_menu.rb
+++ b/qa/qa/page/project/sub_menus/create_new_menu.rb
@@ -12,6 +12,10 @@ module QA
 
             base.class_eval do
               include QA::Page::SubMenus::CreateNewMenu
+
+              view 'app/assets/javascripts/work_items/components/create_work_item_modal.vue' do
+                element 'new-work-item-modal-link'
+              end
             end
           end
 
@@ -19,6 +23,9 @@ module QA
             within_new_item_menu do
               click_element(:create_menu_item, create_menu_item: 'new_issue')
             end
+
+            # Click the "Open in full page" link if modal appears
+            click_element('new-work-item-modal-link') if has_element?('new-work-item-modal-link')
           end
 
           def go_to_new_merge_request
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index edee9ac351e..4fffe0f3e6c 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -92,16 +92,14 @@ module QA
         project.visit!
         Page::Project::Menu.perform(&:go_to_new_issue)
         work_item_view_enabled = Page::Project::Issue::Show.perform(&:work_item_enabled?)
+        index_page_type = Page::Project::Issue::Index
+        show_page_type = Page::Project::WorkItem::Show
 
-        if work_item_view_enabled
-          resource = Resource::WorkItem.fabricate_via_browser_ui! { |work_item| work_item.project = project }
-          index_page_type = Page::Project::Issue::Index
-          show_page_type = Page::Project::WorkItem::Show
-        else
-          resource = Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
-          index_page_type = Page::Project::Issue::Index
-          show_page_type = Page::Project::Issue::Show
-        end
+        resource = if work_item_view_enabled
+                     Resource::WorkItem.fabricate_via_browser_ui! { |work_item| work_item.project = project }
+                   else
+                     Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
+                   end
 
         [resource, index_page_type, show_page_type]
       end
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh
index 33992d1202d..18da6ce15e9 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -15,19 +15,6 @@ function update_tests_metadata() {
   cleanup_individual_job_reports
 }
 
-function retrieve_tests_mapping() {
-  local mapping_archive="${1:-$RSPEC_PACKED_TESTS_MAPPING_PATH}"
-  local mapping_path="${2:-$RSPEC_TESTS_MAPPING_PATH}"
-
-  mkdir -p $(dirname "$mapping_archive")
-
-  if [[ ! -f "${mapping_archive}" ]]; then
-    (curl --fail --location  -o "${mapping_archive}.gz" "https://gitlab-org.gitlab.io/gitlab/${mapping_archive}.gz" && gzip -d "${mapping_archive}.gz") || echo "{}" > "${mapping_archive}"
-  fi
-
-  scripts/unpack-test-mapping "${mapping_archive}" "${mapping_path}"
-}
-
 function retrieve_frontend_fixtures_mapping() {
   mkdir -p $(dirname "$FRONTEND_FIXTURES_MAPPING_PATH")
 
@@ -526,22 +513,6 @@ function rspec_fail_fast() {
   fi
 }
 
-function filter_rspec_matched_foss_tests() {
-  local matching_tests_file="${1}"
-  local foss_matching_tests_file="${2}"
-
-  # Keep only FOSS files that exists
-  cat ${matching_tests_file} | ruby -e 'puts $stdin.read.split(" ").select { |f| f.start_with?("spec/") && File.exist?(f) }.join(" ")' > "${foss_matching_tests_file}"
-}
-
-function filter_rspec_matched_ee_tests() {
-  local matching_tests_file="${1}"
-  local ee_matching_tests_file="${2}"
-
-  # Keep only EE files that exists
-  cat ${matching_tests_file} | ruby -e 'puts $stdin.read.split(" ").select { |f| f.start_with?("ee/spec/") && File.exist?(f) }.join(" ")' > "${ee_matching_tests_file}"
-}
-
 function generate_frontend_fixtures_mapping() {
   local pattern=""
 
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index d157dc25770..9a769251590 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -15,6 +15,11 @@ RSpec.describe Admin::GroupsController, :with_current_organization, feature_cate
     let!(:group_2) { create(:group, name: 'Ygroup') }
     let!(:group_3) { create(:group, name: 'Jgroup', created_at: 2.days.ago, updated_at: 1.day.ago) }
 
+    before do
+      # This endpoint will become a no-op once the `admin_groups_vue` flag has been rolled out.
+      stub_feature_flags(admin_groups_vue: false)
+    end
+
     render_views
 
     it 'lists available groups' do
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index b9a639eef2e..f8d736b6c53 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe ApplicationController, :with_current_organization, feature_category: :shared do
+RSpec.describe ApplicationController, feature_category: :shared do
   include TermsHelper
 
   let(:user) { create(:user) }
@@ -68,11 +68,10 @@ RSpec.describe ApplicationController, :with_current_organization, feature_catego
       def index; end
     end
 
-    it 'sets current organization and session' do
+    it 'sets current organization' do
       get :index, format: :json
 
       expect(Current.organization).to eq(current_organization)
-      expect(session[Gitlab::Current::Organization::SESSION_KEY]).to eq(current_organization.id)
     end
 
     context 'when multiple calls in one example are done' do
diff --git a/spec/features/dashboard/group_spec.rb b/spec/features/dashboard/group_spec.rb
index fd4d163118d..4f52000e19b 100644
--- a/spec/features/dashboard/group_spec.rb
+++ b/spec/features/dashboard/group_spec.rb
@@ -18,18 +18,6 @@ RSpec.describe 'Dashboard Group', :with_current_organization, :js, feature_categ
       sign_in(user)
     end
 
-    context 'when your_work_groups_vue feature flag is disabled' do
-      before do
-        stub_feature_flags(your_work_groups_vue: false)
-      end
-
-      it 'renders empty state' do
-        visit dashboard_groups_path
-
-        expect(page).to have_css '[data-testid="groups-empty-state"]'
-      end
-    end
-
     it 'renders empty state' do
       visit dashboard_groups_path
 
@@ -75,18 +63,6 @@ RSpec.describe 'Dashboard Group', :with_current_organization, :js, feature_categ
       group.add_developer(user)
     end
 
-    context 'when your_work_groups_vue feature flag is disabled' do
-      before do
-        stub_feature_flags(your_work_groups_vue: false)
-      end
-
-      it 'defaults sort dropdown to Created date' do
-        visit dashboard_groups_path
-
-        expect(page).to have_button('Created date')
-      end
-    end
-
     it 'defaults sort dropdown to Updated date' do
       visit dashboard_groups_path
 
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index 118376371ce..a6cf64f8bcc 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -21,262 +21,6 @@ RSpec.describe 'Dashboard Groups page', :js, feature_category: :groups_and_proje
     end
   end
 
-  context 'when your_work_groups_vue feature flag is disabled' do
-    before do
-      stub_feature_flags(your_work_groups_vue: false)
-    end
-
-    it_behaves_like 'a "Your work" page with sidebar and breadcrumbs', :dashboard_groups_path, :groups
-
-    it 'shows groups user is member of' do
-      group.add_owner(user)
-      nested_group.add_owner(user)
-      expect(another_group).to be_persisted
-
-      sign_in(user)
-      visit dashboard_groups_path
-      wait_for_requests
-
-      expect(page).to have_content(group.name)
-
-      expect(page).not_to have_content(another_group.name)
-    end
-
-    it 'shows subgroups the user is member of' do
-      group.add_owner(user)
-      nested_group.add_owner(user)
-
-      sign_in(user)
-      visit dashboard_groups_path
-      wait_for_requests
-
-      expect(page).to have_content(nested_group.parent.name)
-      click_group_caret(nested_group.parent)
-      expect(page).to have_content(nested_group.name)
-    end
-
-    context 'when filtering groups' do
-      before do
-        group.add_owner(user)
-        nested_group.add_owner(user)
-        expect(another_group).to be_persisted
-
-        sign_in(user)
-
-        visit dashboard_groups_path
-      end
-
-      it 'expands when filtering groups' do
-        search(nested_group.name)
-        wait_for_requests
-
-        expect(page).not_to have_content(group.name)
-        expect(page).to have_content(nested_group.parent.name)
-        expect(page).to have_content(nested_group.name)
-        expect(page).not_to have_content(another_group.name)
-      end
-
-      it 'resets search when user cleans the input' do
-        search(group.name)
-        wait_for_requests
-
-        expect(page).to have_content(group.name)
-        expect(page).not_to have_content(nested_group.parent.name)
-
-        find_by_testid('filtered-search-clear-button').click
-        wait_for_requests
-
-        expect(page).to have_content(group.name)
-        expect(page).to have_content(nested_group.parent.name)
-        expect(page).not_to have_content(another_group.name)
-        within find_by_testid('nested-groups-projects-list') do
-          expect(find_all('li').length).to eq 2
-        end
-      end
-    end
-
-    context 'with subgroups' do
-      let!(:subgroup) { create(:group, :public, parent: group) }
-
-      before do
-        group.add_owner(user)
-        subgroup.add_owner(user)
-
-        sign_in(user)
-
-        visit dashboard_groups_path
-      end
-
-      it 'shows subgroups inside of its parent group' do
-        expect(has_testid?("groups-list-item-#{group.id}")).to be true
-        click_group_caret(group)
-        expect(page).to have_selector(
-          "[data-testid=\"groups-list-item-#{group.id}\"] [data-testid=\"groups-list-item-#{subgroup.id}\"]"
-        )
-      end
-
-      it 'can toggle parent group' do
-        # expand
-        click_group_caret(group)
-
-        expect(page).to have_selector(
-          "[data-testid=\"groups-list-item-#{group.id}\"] [data-testid=\"groups-list-item-#{subgroup.id}\"]"
-        )
-
-        # collapse
-        click_group_caret(group)
-
-        expect(page).not_to have_selector(
-          "[data-testid=\"groups-list-item-#{group.id}\"] [data-testid=\"groups-list-item-#{subgroup.id}\"]"
-        )
-      end
-    end
-
-    context 'group actions dropdown' do
-      let!(:subgroup) { create(:group, :public, parent: group) }
-
-      context 'user with subgroup ownership' do
-        before do
-          subgroup.add_owner(user)
-          sign_in(user)
-
-          visit dashboard_groups_path
-        end
-
-        it 'cannot remove parent group' do
-          within_testid("groups-list-item-#{group.id}") do
-            expect(has_testid?('groups-projects-more-actions-dropdown')).to be false
-          end
-        end
-      end
-
-      context 'user with parent group ownership' do
-        before do
-          group.add_owner(user)
-          sign_in(user)
-
-          visit dashboard_groups_path
-        end
-
-        it 'can remove parent group' do
-          click_options_menu(group)
-
-          within_testid("groups-list-item-#{group.id}") do
-            expect(page).to have_link('Delete')
-          end
-        end
-
-        it 'can remove subgroups' do
-          click_group_caret(group)
-          click_options_menu(subgroup)
-
-          within_testid("groups-list-item-#{subgroup.id}") do
-            expect(page).to have_link('Delete')
-          end
-        end
-      end
-
-      context 'user is a maintainer' do
-        before do
-          group.add_maintainer(user)
-          sign_in(user)
-
-          visit dashboard_groups_path
-          click_options_menu(group)
-        end
-
-        it 'cannot remove the group' do
-          within_testid("groups-list-item-#{group.id}") do
-            expect(page).not_to have_link('Delete')
-          end
-        end
-
-        it 'cannot edit the group' do
-          within_testid("groups-list-item-#{group.id}") do
-            expect(page).not_to have_link('Edit')
-          end
-        end
-
-        it 'can leave the group' do
-          within_testid("groups-list-item-#{group.id}") do
-            expect(page).to have_button('Leave group')
-          end
-        end
-      end
-    end
-
-    context 'when using pagination' do
-      let(:group)  { create(:group, created_at: 5.days.ago) }
-      let(:group2) { create(:group, created_at: 2.days.ago) }
-
-      before do
-        group.add_owner(user)
-        group2.add_owner(user)
-
-        allow(Kaminari.config).to receive(:default_per_page).and_return(1)
-
-        sign_in(user)
-        visit dashboard_groups_path
-      end
-
-      it 'loads results for next page' do
-        expect(page).to have_selector('[data-testid="gl-pagination-item"]', count: 2)
-        expect(page).to have_selector('[data-testid="gl-pagination-next"]')
-
-        # Check first page
-        expect(page).to have_content(group2.full_name)
-        expect(has_testid?("groups-list-item-#{group2.id}")).to be true
-        expect(page).not_to have_content(group.full_name)
-        expect(has_testid?("groups-list-item-#{group.id}")).to be false
-
-        # Go to next page
-        find_by_testid('gl-pagination-next').click
-
-        wait_for_requests
-
-        # Check second page
-        expect(page).to have_content(group.full_name)
-        expect(has_testid?("groups-list-item-#{group.id}")).to be true
-        expect(page).not_to have_content(group2.full_name)
-        expect(has_testid?("groups-list-item-#{group2.id}")).to be false
-      end
-    end
-
-    context 'when signed in as admin' do
-      let(:admin) { create(:admin) }
-
-      it 'shows only groups admin is member of' do
-        group.add_owner(admin)
-        expect(another_group).to be_persisted
-
-        sign_in(admin)
-        visit dashboard_groups_path
-        wait_for_requests
-
-        expect(page).to have_content(group.name)
-        expect(page).not_to have_content(another_group.name)
-      end
-    end
-
-    it 'links to the "Explore groups" page' do
-      sign_in(user)
-      visit dashboard_groups_path
-
-      expect(page).to have_link("Explore groups", href: explore_groups_path)
-    end
-
-    context 'when there are no groups to display' do
-      before do
-        sign_in(user)
-        visit dashboard_groups_path
-      end
-
-      it 'shows empty state' do
-        expect(page).to have_content(s_('GroupsEmptyState|A group is a collection of several projects'))
-      end
-    end
-  end
-
   it_behaves_like 'a "Your work" page with sidebar and breadcrumbs', :dashboard_groups_path, :groups
 
   it 'shows groups user is member of' do
diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb
index fc5a4a01909..4563fbc4a6c 100644
--- a/spec/features/groups/members/leave_group_spec.rb
+++ b/spec/features/groups/members/leave_group_spec.rb
@@ -17,85 +17,6 @@ RSpec.describe 'Groups > Members > Leave group', feature_category: :groups_and_p
     sign_in(user)
   end
 
-  context 'when your_work_groups_vue feature flag is disabled' do
-    before do
-      stub_feature_flags(your_work_groups_vue: false)
-    end
-
-    it 'guest leaves the group', :js do
-      group.add_guest(user)
-      group.add_owner(other_user)
-
-      visit group_path(group)
-      more_actions_dropdown.click
-      click_link 'Leave group'
-      accept_gl_confirm(button_text: 'Leave group')
-
-      expect(page).to have_current_path(dashboard_groups_path, ignore_query: true)
-      expect(page).to have_content left_group_message(group)
-      expect(group).not_to have_user(user)
-    end
-
-    it 'guest leaves the group by url param', :js do
-      group.add_guest(user)
-      group.add_owner(other_user)
-
-      visit group_path(group, leave: 1)
-      accept_gl_confirm(button_text: 'Leave group')
-
-      expect(page).to have_current_path(dashboard_groups_path, ignore_query: true)
-      expect(group).not_to have_user(user)
-    end
-
-    it 'guest leaves the group as last member', :js do
-      group.add_guest(user)
-
-      visit group_path(group)
-      more_actions_dropdown.click
-      click_link 'Leave group'
-      accept_gl_confirm(button_text: 'Leave group')
-
-      expect(page).to have_current_path(dashboard_groups_path, ignore_query: true)
-      expect(page).to have_content left_group_message(group)
-      expect(group).not_to have_user(user)
-    end
-
-    it 'owner leaves the group if they are not the last owner', :js do
-      group.add_owner(user)
-      group.add_owner(other_user)
-
-      visit group_path(group)
-      more_actions_dropdown.click
-      click_link 'Leave group'
-      accept_gl_confirm(button_text: 'Leave group')
-
-      expect(page).to have_current_path(dashboard_groups_path, ignore_query: true)
-      expect(page).to have_content left_group_message(group)
-      expect(group).not_to have_user(user)
-    end
-
-    it 'owner can not leave the group if they are the last owner', :js do
-      group.add_owner(user)
-
-      visit group_path(group)
-      more_actions_dropdown.click
-
-      expect(page).not_to have_content 'Leave group'
-
-      visit group_group_members_path(group)
-
-      expect(members_table).not_to have_selector 'button[title="Leave"]'
-    end
-
-    it 'owner can not leave the group by url param if they are the last owner', :js do
-      group.add_owner(user)
-
-      visit group_path(group, leave: 1)
-
-      expect(find_by_testid('alert-danger')).to have_content 'You do not have permission to leave this group'
-    end
-  end
-
   it 'guest leaves the group', :js do
     group.add_guest(user)
     group.add_owner(other_user)
diff --git a/spec/features/projects/files/file_open_mrs_dropdown_spec.rb b/spec/features/projects/files/file_open_mrs_dropdown_spec.rb
index 32f3529b63b..2f9e059d66f 100644
--- a/spec/features/projects/files/file_open_mrs_dropdown_spec.rb
+++ b/spec/features/projects/files/file_open_mrs_dropdown_spec.rb
@@ -35,44 +35,22 @@ RSpec.describe 'Projects > Files > Open MRs dropdown', :js, feature_category: :s
     create_mr(another_source_branch, another_mr_title)
   end
 
-  context 'when feature flags are enabled' do
-    before do
-      stub_feature_flags(
-        filter_blob_path: true
-      )
-    end
+  it 'shows correct count and lists all MRs in dropdown' do
+    visit project_blob_path(project, "master/#{file_path}")
 
-    it 'shows correct count and lists all MRs in dropdown' do
-      visit project_blob_path(project, "master/#{file_path}")
+    badge = find_by_testid('open-mr-badge')
+    expect(badge).to have_content('2 Open')
 
-      badge = find_by_testid('open-mr-badge')
-      expect(badge).to have_content('2 Open')
-
-      badge.click
-      wait_for_requests
-
-      within_testid('disclosure-content') do
-        expect(page).to have_content(mr_title)
-        expect(page).to have_content(another_mr_title)
-
-        click_link mr_title
-      end
+    badge.click
+    wait_for_requests
 
+    within_testid('disclosure-content') do
       expect(page).to have_content(mr_title)
-    end
-  end
+      expect(page).to have_content(another_mr_title)
 
-  context 'when feature flags are disabled' do
-    before do
-      stub_feature_flags(
-        filter_blob_path: false
-      )
+      click_link mr_title
     end
 
-    it 'does not display the open MRs badge' do
-      visit project_blob_path(project, "master/#{file_path}")
-
-      expect(page).not_to have_testid('open-mr-badge')
-    end
+    expect(page).to have_content(mr_title)
   end
 end
diff --git a/spec/frontend/fixtures/admin.rb b/spec/frontend/fixtures/admin.rb
new file mode 100644
index 00000000000..87f5f2d836b
--- /dev/null
+++ b/spec/frontend/fixtures/admin.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Admin (GraphQL fixtures)', feature_category: :organization do
+  describe GraphQL::Query, type: :request do
+    include GraphqlHelpers
+    include JavaScriptFixturesHelpers
+
+    let_it_be(:current_user) { create(:user, :admin) }
+    let_it_be(:group_owner) { create(:user) }
+    let_it_be(:groups) do
+      create_list(:group, 3, :with_avatar, owners: [group_owner, current_user], description: 'foo bar')
+    end
+
+    let_it_be(:project) do
+      create(:project,
+        namespace: groups.first,
+        statistics: build(
+          :project_statistics,
+          namespace: groups.first,
+          storage_size: 100.megabytes
+        )
+      )
+    end
+
+    before do
+      sign_in(current_user)
+    end
+
+    describe 'groups' do
+      base_input_path = 'admin/groups/index/graphql/queries/'
+      base_output_path = 'graphql/admin/'
+      query_name = 'groups.query.graphql'
+
+      it "#{base_output_path}#{query_name}.json" do
+        query = get_graphql_query_as_string("#{base_input_path}#{query_name}")
+
+        post_graphql(
+          query,
+          current_user: current_user,
+          variables: { search: '', first: 3, sort: 'created_at_asc', active: true }
+        )
+
+        expect_graphql_errors_to_be_empty
+      end
+    end
+  end
+end
diff --git a/spec/frontend/issues/list/components/issue_card_time_info_spec.js b/spec/frontend/issues/list/components/issue_card_time_info_spec.js
index 566d87730df..c8e885acf1f 100644
--- a/spec/frontend/issues/list/components/issue_card_time_info_spec.js
+++ b/spec/frontend/issues/list/components/issue_card_time_info_spec.js
@@ -102,9 +102,9 @@ describe('CE IssueCardTimeInfo component', () => {
 
     describe('due date', () => {
       describe('when upcoming', () => {
-        it('renders', () => {
+        it('renders with "No start date" prefix when no start date is present', () => {
           wrapper = mountComponent({ issue: object({ dueDate: '2020-12-12' }) });
-          expect(findWorkItemAttribute().props('title')).toBe('Dec 12, 2020');
+          expect(findWorkItemAttribute().props('title')).toBe('No start date – Dec 12, 2020');
           expect(findWorkItemAttribute().props('tooltipText')).toBe('Dates');
           expect(findDueDateIcon().props()).toMatchObject({
             variant: 'current',
@@ -124,8 +124,9 @@ describe('CE IssueCardTimeInfo component', () => {
 
       describe('when in the past', () => {
         describe('when issue is open', () => {
-          it('renders in red with overdue icon', () => {
+          it('renders in red with overdue icon and "No start date" prefix', () => {
             wrapper = mountComponent({ issue: object({ dueDate: '2020-01-01' }) });
+            expect(findWorkItemAttribute().props('title')).toBe('No start date – Jan 1, 2020');
             expect(findDueDateIcon().props()).toMatchObject({
               variant: 'danger',
               name: 'calendar-overdue',
@@ -134,11 +135,12 @@ describe('CE IssueCardTimeInfo component', () => {
         });
 
         describe('when issue is closed', () => {
-          it('does not render in red with overdue icon', () => {
+          it('does not render in red with overdue icon but shows "No start date" prefix', () => {
             wrapper = mountComponent({
               issue: object({ dueDate: '2020-01-01', state: STATUS_CLOSED }),
             });
 
+            expect(findWorkItemAttribute().props('title')).toBe('No start date – Jan 1, 2020');
             expect(findDueDateIcon().props()).toMatchObject({
               variant: 'current',
               name: 'calendar',
diff --git a/spec/frontend/notes/store/legacy_notes/actions_spec.js b/spec/frontend/notes/store/legacy_notes/actions_spec.js
index 5e5535313d3..238f7a6dd15 100644
--- a/spec/frontend/notes/store/legacy_notes/actions_spec.js
+++ b/spec/frontend/notes/store/legacy_notes/actions_spec.js
@@ -330,6 +330,17 @@ describe('Actions Notes Store', () => {
       );
     });
 
+    it('calls fetchUpdatedNotes in the connected callback', () => {
+      store.fetchUpdatedNotes.mockResolvedValue();
+
+      store.setNotesData(notesDataMock);
+      store.initPolling();
+
+      actionCable.subscriptions.subscriptions.at(-1).connected();
+
+      expect(store.fetchUpdatedNotes).toHaveBeenCalledTimes(1);
+    });
+
     it('prevents `fetchUpdatedNotes` being called multiple times within time limit when action cable receives contineously new events', () => {
       store.fetchUpdatedNotes.mockResolvedValue();
       getters = { getNotesDataByProp: () => 123456789 };
diff --git a/spec/frontend/rapid_diffs/disable_diff_side/adapter_spec.js b/spec/frontend/rapid_diffs/adapters/disable_diff_side_spec.js
similarity index 83%
rename from spec/frontend/rapid_diffs/disable_diff_side/adapter_spec.js
rename to spec/frontend/rapid_diffs/adapters/disable_diff_side_spec.js
index bb2f9cd01ab..ffac0bd7ea3 100644
--- a/spec/frontend/rapid_diffs/disable_diff_side/adapter_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/disable_diff_side_spec.js
@@ -1,8 +1,8 @@
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { DisableDiffSideAdapter } from '~/rapid_diffs/disable_diff_side/adapter';
-import { INVISIBLE, VISIBLE } from '~/rapid_diffs/events';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { disableDiffSideAdapter } from '~/rapid_diffs/adapters/disable_diff_side';
+import { INVISIBLE, VISIBLE } from '~/rapid_diffs/adapter_events';
 
-describe('DisableDiffSideAdapter', () => {
+describe('disableDiffSideAdapter', () => {
   const getComponent = () => document.querySelector('diff-file');
   const getSide = (type) => document.querySelector(`[data-position="${type}"]`);
   const getWrapper = () => document.querySelector('#wrapper');
@@ -20,7 +20,7 @@ describe('DisableDiffSideAdapter', () => {
       </diff-file>
     `;
     getComponent().mount({
-      adapterConfig: { [viewer]: [DisableDiffSideAdapter] },
+      adapterConfig: { [viewer]: [disableDiffSideAdapter] },
       appData: {},
       observe: jest.fn(),
       unobserve: jest.fn(),
diff --git a/spec/frontend/rapid_diffs/expand_lines/diff_line_row_spec.js b/spec/frontend/rapid_diffs/adapters/expand_lines/diff_line_row_spec.js
similarity index 90%
rename from spec/frontend/rapid_diffs/expand_lines/diff_line_row_spec.js
rename to spec/frontend/rapid_diffs/adapters/expand_lines/diff_line_row_spec.js
index 3589b314356..81622b9edfe 100644
--- a/spec/frontend/rapid_diffs/expand_lines/diff_line_row_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/expand_lines/diff_line_row_spec.js
@@ -1,4 +1,4 @@
-import { DiffLineRow } from '~/rapid_diffs/expand_lines/diff_line_row';
+import { DiffLineRow } from '~/rapid_diffs/adapters/expand_lines/diff_line_row';
 import { setHTMLFixture } from 'helpers/fixtures';
 
 describe('DiffLineRow', () => {
diff --git a/spec/frontend/rapid_diffs/expand_lines/get_lines_spec.js b/spec/frontend/rapid_diffs/adapters/expand_lines/get_lines_spec.js
similarity index 98%
rename from spec/frontend/rapid_diffs/expand_lines/get_lines_spec.js
rename to spec/frontend/rapid_diffs/adapters/expand_lines/get_lines_spec.js
index 853cdedbc05..075c80fb1f0 100644
--- a/spec/frontend/rapid_diffs/expand_lines/get_lines_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/expand_lines/get_lines_spec.js
@@ -1,7 +1,7 @@
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
-import { getLines } from '~/rapid_diffs/expand_lines/get_lines';
+import { getLines } from '~/rapid_diffs/adapters/expand_lines/get_lines';
 
 describe('getLines', () => {
   const diffLinesPath = '/lines';
diff --git a/spec/frontend/rapid_diffs/expand_lines/adapter_spec.js b/spec/frontend/rapid_diffs/adapters/expand_lines_spec.js
similarity index 91%
rename from spec/frontend/rapid_diffs/expand_lines/adapter_spec.js
rename to spec/frontend/rapid_diffs/adapters/expand_lines_spec.js
index 1748747d75b..db2477fd451 100644
--- a/spec/frontend/rapid_diffs/expand_lines/adapter_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/expand_lines_spec.js
@@ -1,13 +1,13 @@
-import { ExpandLinesAdapter } from '~/rapid_diffs/expand_lines/adapter';
+import { expandLinesAdapter } from '~/rapid_diffs/adapters/expand_lines';
 import { setHTMLFixture } from 'helpers/fixtures';
-import { getLines } from '~/rapid_diffs/expand_lines/get_lines';
-import { DiffLineRow } from '~/rapid_diffs/expand_lines/diff_line_row';
+import { getLines } from '~/rapid_diffs/adapters/expand_lines/get_lines';
+import { DiffLineRow } from '~/rapid_diffs/adapters/expand_lines/diff_line_row';
 import { createAlert } from '~/alert';
 
 jest.mock('~/alert');
-jest.mock('~/rapid_diffs/expand_lines/get_lines');
+jest.mock('~/rapid_diffs/adapters/expand_lines/get_lines');
 
-describe('ExpandLinesAdapter', () => {
+describe('expandLinesAdapter', () => {
   const getExpandButton = (direction = 'up') =>
     document.querySelector(`[data-expand-direction="${direction}"]`);
   const getFirstInsertedRow = () => document.querySelector('[data-hunk-lines="3"]');
@@ -25,7 +25,7 @@ describe('ExpandLinesAdapter', () => {
     };
   };
   const click = (direction) => {
-    return ExpandLinesAdapter.clicks.expandLines.call(
+    return expandLinesAdapter.clicks.expandLines.call(
       getDiffFileContext(),
       new MouseEvent('click'),
       getExpandButton(direction),
diff --git a/spec/frontend/rapid_diffs/image_viewer/adapter.spec.js b/spec/frontend/rapid_diffs/adapters/image_viewer_spec.js
similarity index 88%
rename from spec/frontend/rapid_diffs/image_viewer/adapter.spec.js
rename to spec/frontend/rapid_diffs/adapters/image_viewer_spec.js
index 8cbbad91def..a12518dfa56 100644
--- a/spec/frontend/rapid_diffs/image_viewer/adapter.spec.js
+++ b/spec/frontend/rapid_diffs/adapters/image_viewer_spec.js
@@ -1,6 +1,6 @@
-import { ImageAdapter } from '~/rapid_diffs/image_viewer/adapter';
+import { imageAdapter } from '~/rapid_diffs/adapters/image_viewer';
 import { setHTMLFixture } from 'helpers/fixtures';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 
 jest.mock('~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue', () => ({
   props: jest.requireActual('~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue')
@@ -20,7 +20,7 @@ jest.mock('~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue', (
   },
 }));
 
-describe('ImageAdapter', () => {
+describe('imageAdapter', () => {
   const imageData = {
     old_path: '/old',
     new_path: '/old',
@@ -43,7 +43,7 @@ describe('ImageAdapter', () => {
       </diff-file>
     `);
     getDiffFile().mount({
-      adapterConfig: { image: [ImageAdapter] },
+      adapterConfig: { image: [imageAdapter] },
       appData: {},
       unobserve: jest.fn(),
     });
diff --git a/spec/frontend/rapid_diffs/line_link/adapter_spec.js b/spec/frontend/rapid_diffs/adapters/line_link_spec.js
similarity index 84%
rename from spec/frontend/rapid_diffs/line_link/adapter_spec.js
rename to spec/frontend/rapid_diffs/adapters/line_link_spec.js
index bc25a864830..5e77ee60eb8 100644
--- a/spec/frontend/rapid_diffs/line_link/adapter_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/line_link_spec.js
@@ -1,9 +1,9 @@
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { INVISIBLE, VISIBLE } from '~/rapid_diffs/events';
-import { LineLinkAdapter } from '~/rapid_diffs/line_link/adapter';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { INVISIBLE, VISIBLE } from '~/rapid_diffs/adapter_events';
+import { lineLinkAdapter } from '~/rapid_diffs/adapters/line_link';
 import { NO_SCROLL_TO_HASH_CLASS } from '~/lib/utils/common_utils';
 
-describe('LineLinkAdapter', () => {
+describe('lineLinkAdapter', () => {
   const getComponent = () => document.querySelector('diff-file');
   const getLink = () => document.querySelector(`[data-line-number]`);
   const getTarget = () => document.querySelector('#target');
@@ -21,7 +21,7 @@ describe('LineLinkAdapter', () => {
       </diff-file>
     `;
     getComponent().mount({
-      adapterConfig: { [viewer]: [LineLinkAdapter] },
+      adapterConfig: { [viewer]: [lineLinkAdapter] },
       appData: {},
       observe: jest.fn(),
       unobserve: jest.fn(),
diff --git a/spec/frontend/rapid_diffs/load_file/adapter_spec.js b/spec/frontend/rapid_diffs/adapters/load_file_spec.js
similarity index 93%
rename from spec/frontend/rapid_diffs/load_file/adapter_spec.js
rename to spec/frontend/rapid_diffs/adapters/load_file_spec.js
index 9112975643f..b098ad83452 100644
--- a/spec/frontend/rapid_diffs/load_file/adapter_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/load_file_spec.js
@@ -1,8 +1,8 @@
 import MockAxiosAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { setHTMLFixture } from 'helpers/fixtures';
-import { LoadFileAdapter } from '~/rapid_diffs/load_file/adapter';
+import { loadFileAdapter } from '~/rapid_diffs/adapters/load_file';
 import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import { TEST_HOST } from 'spec/test_constants';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
@@ -12,7 +12,7 @@ import { createAlert } from '~/alert';
 
 jest.mock('~/alert');
 
-describe('LoadFileAdapter', () => {
+describe('loadFileAdapter', () => {
   const viewer = 'any';
   const diffFileEndpoint = '/diff-file';
 
@@ -26,7 +26,7 @@ describe('LoadFileAdapter', () => {
 
   const mountComponent = (component = getDiffFile()) => {
     component.mount({
-      adapterConfig: { [viewer]: [LoadFileAdapter] },
+      adapterConfig: { [viewer]: [loadFileAdapter] },
       appData: { diffFileEndpoint },
       unobserve: jest.fn(),
     });
diff --git a/spec/frontend/rapid_diffs/options_menu/adapter_spec.js b/spec/frontend/rapid_diffs/adapters/options_menu_spec.js
similarity index 93%
rename from spec/frontend/rapid_diffs/options_menu/adapter_spec.js
rename to spec/frontend/rapid_diffs/adapters/options_menu_spec.js
index be53245f470..1540e71f47e 100644
--- a/spec/frontend/rapid_diffs/options_menu/adapter_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/options_menu_spec.js
@@ -1,5 +1,5 @@
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { OptionsMenuAdapter } from '~/rapid_diffs/options_menu/adapter';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { optionsMenuAdapter } from '~/rapid_diffs/adapters/options_menu';
 
 describe('Diff File Options Menu', () => {
   const item1 = { text: 'item 1', path: 'item/1/path' };
@@ -49,7 +49,7 @@ describe('Diff File Options Menu', () => {
       </diff-file>
     `;
     get('file').mount({
-      adapterConfig: { [viewer]: [OptionsMenuAdapter] },
+      adapterConfig: { [viewer]: [optionsMenuAdapter] },
       appData: {},
       unobserve: jest.fn(),
     });
diff --git a/spec/frontend/rapid_diffs/toggle_file/adapter_spec.js b/spec/frontend/rapid_diffs/adapters/toggle_file_spec.js
similarity index 91%
rename from spec/frontend/rapid_diffs/toggle_file/adapter_spec.js
rename to spec/frontend/rapid_diffs/adapters/toggle_file_spec.js
index 8dae0ebc9f8..8378e99c144 100644
--- a/spec/frontend/rapid_diffs/toggle_file/adapter_spec.js
+++ b/spec/frontend/rapid_diffs/adapters/toggle_file_spec.js
@@ -1,6 +1,6 @@
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { ToggleFileAdapter } from '~/rapid_diffs/toggle_file/adapter';
-import { COLLAPSE_FILE, EXPAND_FILE } from '~/rapid_diffs/events';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { toggleFileAdapter } from '~/rapid_diffs/adapters/toggle_file';
+import { COLLAPSE_FILE, EXPAND_FILE } from '~/rapid_diffs/adapter_events';
 
 describe('Diff File Toggle Behavior', () => {
   function get(element) {
@@ -42,7 +42,7 @@ describe('Diff File Toggle Behavior', () => {
       </diff-file>
     `;
     get('file').mount({
-      adapterConfig: { [viewer]: [ToggleFileAdapter] },
+      adapterConfig: { [viewer]: [toggleFileAdapter] },
       appData: {},
       unobserve: jest.fn(),
     });
diff --git a/spec/frontend/rapid_diffs/app/app_spec.js b/spec/frontend/rapid_diffs/app/app_spec.js
index ad2210c2e64..2751a9bec9a 100644
--- a/spec/frontend/rapid_diffs/app/app_spec.js
+++ b/spec/frontend/rapid_diffs/app/app_spec.js
@@ -1,29 +1,29 @@
 import { createTestingPinia } from '@pinia/testing';
 import { setHTMLFixture } from 'helpers/fixtures';
-import { createRapidDiffsApp } from '~/rapid_diffs/app';
+import { RapidDiffsFacade } from '~/rapid_diffs/app';
 import { initViewSettings } from '~/rapid_diffs/app/view_settings';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
 import { pinia } from '~/pinia/instance';
 import { initHiddenFilesWarning } from '~/rapid_diffs/app/init_hidden_files_warning';
-import { initFileBrowser } from '~/rapid_diffs/app/init_file_browser';
-import { StreamingError } from '~/rapid_diffs/streaming_error';
+import { initFileBrowser } from '~/rapid_diffs/app/file_browser';
+import { StreamingError } from '~/rapid_diffs/web_components/streaming_error';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
-import { fixWebComponentsStreamingOnSafari } from '~/rapid_diffs/app/safari_fix';
+import { fixWebComponentsStreamingOnSafari } from '~/rapid_diffs/app/quirks/safari_fix';
 import { DIFF_FILE_MOUNTED } from '~/rapid_diffs/dom_events';
 import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
-import { disableBrokenContentVisibility } from '~/rapid_diffs/app/content_visibility_fix';
+import { disableBrokenContentVisibility } from '~/rapid_diffs/app/quirks/content_visibility_fix';
 import { useApp } from '~/rapid_diffs/stores/app';
 
 jest.mock('~/lib/graphql');
 jest.mock('~/awards_handler');
 jest.mock('~/rapid_diffs/app/view_settings');
 jest.mock('~/rapid_diffs/app/init_hidden_files_warning');
-jest.mock('~/rapid_diffs/app/init_file_browser');
-jest.mock('~/rapid_diffs/app/safari_fix');
-jest.mock('~/rapid_diffs/app/content_visibility_fix');
+jest.mock('~/rapid_diffs/app/file_browser');
+jest.mock('~/rapid_diffs/app/quirks/safari_fix');
+jest.mock('~/rapid_diffs/app/quirks/content_visibility_fix');
 
-describe('Rapid Diffs App', () => {
+describe('Rapid Diffs App Facade', () => {
   const { trigger } = useMockIntersectionObserver();
 
   let app;
@@ -57,7 +57,7 @@ describe('Rapid Diffs App', () => {
         </div>
       `,
     );
-    app = createRapidDiffsApp();
+    app = new RapidDiffsFacade();
   };
 
   beforeAll(() => {
diff --git a/spec/frontend/rapid_diffs/app/file_browser_drawer_spec.js b/spec/frontend/rapid_diffs/app/file_browser/file_browser_drawer_spec.js
similarity index 96%
rename from spec/frontend/rapid_diffs/app/file_browser_drawer_spec.js
rename to spec/frontend/rapid_diffs/app/file_browser/file_browser_drawer_spec.js
index c68119fa4ee..c10fb54af6f 100644
--- a/spec/frontend/rapid_diffs/app/file_browser_drawer_spec.js
+++ b/spec/frontend/rapid_diffs/app/file_browser/file_browser_drawer_spec.js
@@ -3,7 +3,7 @@ import { createTestingPinia } from '@pinia/testing';
 import Vue, { nextTick } from 'vue';
 import { PiniaVuePlugin } from 'pinia';
 import { GlDrawer } from '@gitlab/ui';
-import FileBrowserDrawer from '~/rapid_diffs/app/file_browser_drawer.vue';
+import FileBrowserDrawer from '~/rapid_diffs/app/file_browser/file_browser_drawer.vue';
 import DiffsFileTree from '~/diffs/components/diffs_file_tree.vue';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
 import { useFileBrowser } from '~/diffs/stores/file_browser';
diff --git a/spec/frontend/rapid_diffs/app/file_browser_drawer_toggle_spec.js b/spec/frontend/rapid_diffs/app/file_browser/file_browser_drawer_toggle_spec.js
similarity index 95%
rename from spec/frontend/rapid_diffs/app/file_browser_drawer_toggle_spec.js
rename to spec/frontend/rapid_diffs/app/file_browser/file_browser_drawer_toggle_spec.js
index 77a4f44868a..14781f304ab 100644
--- a/spec/frontend/rapid_diffs/app/file_browser_drawer_toggle_spec.js
+++ b/spec/frontend/rapid_diffs/app/file_browser/file_browser_drawer_toggle_spec.js
@@ -3,7 +3,7 @@ import { createTestingPinia } from '@pinia/testing';
 import Vue from 'vue';
 import { PiniaVuePlugin } from 'pinia';
 import { GlButton } from '@gitlab/ui';
-import FileBrowserDrawerToggle from '~/rapid_diffs/app/file_browser_drawer_toggle.vue';
+import FileBrowserDrawerToggle from '~/rapid_diffs/app/file_browser/file_browser_drawer_toggle.vue';
 import { useFileBrowser } from '~/diffs/stores/file_browser';
 
 Vue.use(PiniaVuePlugin);
diff --git a/spec/frontend/rapid_diffs/app/file_browser_spec.js b/spec/frontend/rapid_diffs/app/file_browser/file_browser_spec.js
similarity index 96%
rename from spec/frontend/rapid_diffs/app/file_browser_spec.js
rename to spec/frontend/rapid_diffs/app/file_browser/file_browser_spec.js
index 585ca5135a1..0d7b4b92430 100644
--- a/spec/frontend/rapid_diffs/app/file_browser_spec.js
+++ b/spec/frontend/rapid_diffs/app/file_browser/file_browser_spec.js
@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import { createTestingPinia } from '@pinia/testing';
 import Vue from 'vue';
 import { PiniaVuePlugin } from 'pinia';
-import FileBrowser from '~/rapid_diffs/app/file_browser.vue';
+import FileBrowser from '~/rapid_diffs/app/file_browser/file_browser.vue';
 import DiffsFileTree from '~/diffs/components/diffs_file_tree.vue';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
 import { useFileBrowser } from '~/diffs/stores/file_browser';
diff --git a/spec/frontend/rapid_diffs/app/init_file_browser_spec.js b/spec/frontend/rapid_diffs/app/file_browser/index_spec.js
similarity index 91%
rename from spec/frontend/rapid_diffs/app/init_file_browser_spec.js
rename to spec/frontend/rapid_diffs/app/file_browser/index_spec.js
index c7d73fad70c..50905e7c9a9 100644
--- a/spec/frontend/rapid_diffs/app/init_file_browser_spec.js
+++ b/spec/frontend/rapid_diffs/app/file_browser/index_spec.js
@@ -3,15 +3,15 @@ import { setActivePinia } from 'pinia';
 import { nextTick } from 'vue';
 import axios from '~/lib/utils/axios_utils';
 import { resetHTMLFixture, setHTMLFixture } from 'helpers/fixtures';
-import { initFileBrowser } from '~/rapid_diffs/app/init_file_browser';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { initFileBrowser } from '~/rapid_diffs/app/file_browser';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import { useViewport } from '~/pinia/global_stores/viewport';
 import { pinia } from '~/pinia/instance';
 import { useApp } from '~/rapid_diffs/stores/app';
 
-jest.mock('~/rapid_diffs/app/file_browser.vue', () => ({
-  props: jest.requireActual('~/rapid_diffs/app/file_browser.vue').default.props,
+jest.mock('~/rapid_diffs/app/file_browser/file_browser.vue', () => ({
+  props: jest.requireActual('~/rapid_diffs/app/file_browser/file_browser.vue').default.props,
   render(h) {
     return h('div', {
       attrs: {
@@ -27,8 +27,8 @@ jest.mock('~/rapid_diffs/app/file_browser.vue', () => ({
   },
 }));
 
-jest.mock('~/rapid_diffs/app/file_browser_drawer.vue', () => ({
-  props: jest.requireActual('~/rapid_diffs/app/file_browser_drawer.vue').default.props,
+jest.mock('~/rapid_diffs/app/file_browser/file_browser_drawer.vue', () => ({
+  props: jest.requireActual('~/rapid_diffs/app/file_browser/file_browser_drawer.vue').default.props,
   render(h) {
     return h('div', {
       attrs: {
@@ -54,7 +54,7 @@ jest.mock('~/diffs/components/file_browser_toggle.vue', () => ({
   },
 }));
 
-jest.mock('~/rapid_diffs/app/file_browser_drawer_toggle.vue', () => ({
+jest.mock('~/rapid_diffs/app/file_browser/file_browser_drawer_toggle.vue', () => ({
   render(h) {
     return h('div', {
       attrs: {
diff --git a/spec/frontend/rapid_diffs/app/view_settings_spec.js b/spec/frontend/rapid_diffs/app/view_settings_spec.js
index e2fdc820c03..c32f7b1e8a7 100644
--- a/spec/frontend/rapid_diffs/app/view_settings_spec.js
+++ b/spec/frontend/rapid_diffs/app/view_settings_spec.js
@@ -5,8 +5,8 @@ import { initViewSettings } from '~/rapid_diffs/app/view_settings';
 import { setHTMLFixture } from 'helpers/fixtures';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
-import { DiffFile } from '~/rapid_diffs/diff_file';
-import { COLLAPSE_FILE, EXPAND_FILE } from '~/rapid_diffs/events';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
+import { COLLAPSE_FILE, EXPAND_FILE } from '~/rapid_diffs/adapter_events';
 
 jest.mock('~/diffs/components/diff_app_controls.vue', () => ({
   props: jest.requireActual('~/diffs/components/diff_app_controls.vue').default.props,
diff --git a/spec/frontend/rapid_diffs/stores/diffs_list_spec.js b/spec/frontend/rapid_diffs/stores/diffs_list_spec.js
index 5118c7fa758..9dae974c690 100644
--- a/spec/frontend/rapid_diffs/stores/diffs_list_spec.js
+++ b/spec/frontend/rapid_diffs/stores/diffs_list_spec.js
@@ -5,7 +5,7 @@ import { setHTMLFixture } from 'helpers/fixtures';
 import { renderHtmlStreams } from '~/streaming/render_html_streams';
 import waitForPromises from 'helpers/wait_for_promises';
 import { toPolyfillReadable } from '~/streaming/polyfills';
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { performanceMarkAndMeasure } from '~/performance/utils';
 
 jest.mock('~/streaming/polyfills');
diff --git a/spec/frontend/rapid_diffs/web_components/diff_file_mounted_spec.js b/spec/frontend/rapid_diffs/web_components/diff_file_mounted_spec.js
new file mode 100644
index 00000000000..b125f5c1c40
--- /dev/null
+++ b/spec/frontend/rapid_diffs/web_components/diff_file_mounted_spec.js
@@ -0,0 +1,20 @@
+import { setHTMLFixture } from 'helpers/fixtures';
+import { createDiffFileMounted } from '~/rapid_diffs/web_components/diff_file_mounted';
+
+describe('DiffFileMounted', () => {
+  const appContext = {};
+  const DiffFileStub = class extends HTMLElement {
+    mount = jest.fn();
+  };
+
+  beforeAll(() => {
+    const DiffFileMounted = createDiffFileMounted(appContext);
+    customElements.define('diff-file', DiffFileStub);
+    customElements.define('diff-file-mounted', DiffFileMounted);
+  });
+
+  it('mounts app context to the parent element', () => {
+    setHTMLFixture(`<diff-file><diff-file-mounted></diff-file-mounted></diff-file>`);
+    expect(document.querySelector('diff-file').mount).toHaveBeenCalledWith(appContext);
+  });
+});
diff --git a/spec/frontend/rapid_diffs/diff_file_spec.js b/spec/frontend/rapid_diffs/web_components/diff_file_spec.js
similarity index 84%
rename from spec/frontend/rapid_diffs/diff_file_spec.js
rename to spec/frontend/rapid_diffs/web_components/diff_file_spec.js
index ef3aee4bc42..eb3ebc86418 100644
--- a/spec/frontend/rapid_diffs/diff_file_spec.js
+++ b/spec/frontend/rapid_diffs/web_components/diff_file_spec.js
@@ -1,5 +1,6 @@
-import { DiffFile } from '~/rapid_diffs/diff_file';
+import { DiffFile } from '~/rapid_diffs/web_components/diff_file';
 import { DIFF_FILE_MOUNTED } from '~/rapid_diffs/dom_events';
+import { CLICK, INVISIBLE, MOUNTED, VISIBLE } from '~/rapid_diffs/adapter_events';
 
 describe('DiffFile Web Component', () => {
   const fileData = JSON.stringify({ viewer: 'current', custom: 'bar' });
@@ -24,13 +25,13 @@ describe('DiffFile Web Component', () => {
   };
 
   const createDefaultAdapter = () => ({
-    click: jest.fn(),
+    [CLICK]: jest.fn(),
     clicks: {
       foo: jest.fn(),
     },
-    visible: jest.fn(),
-    invisible: jest.fn(),
-    mounted: jest.fn((onUnmounted) => {
+    [VISIBLE]: jest.fn(),
+    [INVISIBLE]: jest.fn(),
+    [MOUNTED]: jest.fn((onUnmounted) => {
       adapterMountedCleanup = jest.fn();
       onUnmounted(adapterMountedCleanup);
     }),
@@ -96,8 +97,8 @@ describe('DiffFile Web Component', () => {
       emitted = true;
     });
     mount();
-    expect(adapter.mounted).toHaveBeenCalled();
-    expect(adapter.mounted.mock.instances[0]).toStrictEqual(getContext());
+    expect(adapter[MOUNTED]).toHaveBeenCalled();
+    expect(adapter[MOUNTED].mock.instances[0]).toStrictEqual(getContext());
     expect(emitted).toBe(true);
   });
 
@@ -113,7 +114,7 @@ describe('DiffFile Web Component', () => {
     const focusFirstButton = jest.fn();
     const mockNode = { focusFirstButton };
     mount({
-      mounted() {
+      [MOUNTED]() {
         this.replaceWith(mockNode);
       },
     });
@@ -135,8 +136,8 @@ describe('DiffFile Web Component', () => {
     it('handles all clicks', () => {
       triggerVisibility(true);
       delegatedClick(getDiffElement());
-      expect(adapter.click).toHaveBeenCalledWith(expect.any(MouseEvent));
-      expect(adapter.click.mock.instances[0]).toStrictEqual(getContext());
+      expect(adapter[CLICK]).toHaveBeenCalledWith(expect.any(MouseEvent));
+      expect(adapter[CLICK].mock.instances[0]).toStrictEqual(getContext());
     });
 
     it('handles specific clicks', () => {
@@ -149,14 +150,14 @@ describe('DiffFile Web Component', () => {
 
     it('handles visible event', () => {
       triggerVisibility(true);
-      expect(adapter.visible).toHaveBeenCalled();
-      expect(adapter.visible.mock.instances[0]).toStrictEqual(getContext());
+      expect(adapter[VISIBLE]).toHaveBeenCalled();
+      expect(adapter[VISIBLE].mock.instances[0]).toStrictEqual(getContext());
     });
 
     it('handles invisible event', () => {
       triggerVisibility(false);
-      expect(adapter.invisible).toHaveBeenCalled();
-      expect(adapter.invisible.mock.instances[0]).toStrictEqual(getContext());
+      expect(adapter[INVISIBLE]).toHaveBeenCalled();
+      expect(adapter[INVISIBLE].mock.instances[0]).toStrictEqual(getContext());
     });
   });
 
diff --git a/spec/frontend/rapid_diffs/streaming_error_spec.js b/spec/frontend/rapid_diffs/web_components/streaming_error_spec.js
similarity index 89%
rename from spec/frontend/rapid_diffs/streaming_error_spec.js
rename to spec/frontend/rapid_diffs/web_components/streaming_error_spec.js
index 2cfcac913a4..fe957183221 100644
--- a/spec/frontend/rapid_diffs/streaming_error_spec.js
+++ b/spec/frontend/rapid_diffs/web_components/streaming_error_spec.js
@@ -1,4 +1,4 @@
-import { StreamingError } from '~/rapid_diffs/streaming_error';
+import { StreamingError } from '~/rapid_diffs/web_components/streaming_error';
 import { createAlert } from '~/alert';
 
 jest.mock('~/alert');
diff --git a/spec/frontend/repository/components/header_area/blob_controls_spec.js b/spec/frontend/repository/components/header_area/blob_controls_spec.js
index ed34a918249..026c430ee55 100644
--- a/spec/frontend/repository/components/header_area/blob_controls_spec.js
+++ b/spec/frontend/repository/components/header_area/blob_controls_spec.js
@@ -89,7 +89,6 @@ describe('Blob controls component', () => {
     blobControlsResolver = blobControlsSuccessResolver,
     currentUserResolver = currentUserSuccessResolver,
     applicationInfoResolver = applicationInfoSuccessResolver,
-    glFeatures = {},
   } = {}) => {
     const projectPath = 'some/project';
     router = createRouter(projectPath, refMock);
@@ -111,7 +110,6 @@ describe('Blob controls component', () => {
       router,
       apolloProvider: fakeApollo,
       provide: {
-        glFeatures,
         currentRef: refMock,
       },
       directives: {
@@ -153,17 +151,12 @@ describe('Blob controls component', () => {
   });
 
   describe('MR badge', () => {
-    it('should render the badge if `filter_blob_path` flag is on', async () => {
-      await createComponent({ glFeatures: { filterBlobPath: true } });
+    it('should render the badge', async () => {
+      await createComponent();
       expect(findOpenMrBadge().exists()).toBe(true);
       expect(findOpenMrBadge().props('blobPath')).toBe('/some/file.js');
       expect(findOpenMrBadge().props('projectPath')).toBe('some/project');
     });
-
-    it('should not render the badge if `filter_blob_path` flag is off', async () => {
-      await createComponent({ glFeatures: { filterBlobPath: false } });
-      expect(findOpenMrBadge().exists()).toBe(false);
-    });
   });
 
   describe('Find file button', () => {
diff --git a/spec/frontend/super_sidebar/components/create_menu_spec.js b/spec/frontend/super_sidebar/components/create_menu_spec.js
index a6b945220dd..1c5486d8f69 100644
--- a/spec/frontend/super_sidebar/components/create_menu_spec.js
+++ b/spec/frontend/super_sidebar/components/create_menu_spec.js
@@ -3,11 +3,13 @@ import {
   GlDisclosureDropdown,
   GlDisclosureDropdownGroup,
   GlDisclosureDropdownItem,
+  GlLink,
 } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue';
 import CreateWorkItemModal from '~/work_items/components/create_work_item_modal.vue';
 import CreateMenu from '~/super_sidebar/components/create_menu.vue';
+import { WORK_ITEM_TYPE_NAME_EPIC } from '~/work_items/constants';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { createNewMenuGroups, createNewMenuProjects } from '../mock_data';
 
@@ -19,13 +21,10 @@ describe('CreateMenu component', () => {
   const findGlDisclosureDropdownGroups = () => wrapper.findAllComponents(GlDisclosureDropdownGroup);
   const findGlDisclosureDropdownItems = () => wrapper.findAllComponents(GlDisclosureDropdownItem);
   const findInviteMembersTrigger = () => wrapper.findComponent(InviteMembersTrigger);
-  const findCreateGroupWorkItemModalTrigger = () =>
-    wrapper.findByTestId('new-group-work-item-trigger');
   const findCreateWorkItemModalTrigger = () => wrapper.findByTestId('new-work-item-trigger');
-  const findCreateGroupWorkItemModal = () => wrapper.findByTestId('new-group-work-item-modal');
   const findCreateWorkItemModal = () => wrapper.findByTestId('new-work-item-modal');
 
-  const createWrapper = ({ provide = {} } = {}, groups = createNewMenuGroups) => {
+  const createWrapper = ({ props = {}, provide = {}, stubs = {} } = {}) => {
     wrapper = shallowMountExtended(CreateMenu, {
       provide: {
         isImpersonating: false,
@@ -35,13 +34,15 @@ describe('CreateMenu component', () => {
         ...provide,
       },
       propsData: {
-        groups,
+        groups: createNewMenuGroups,
+        ...props,
       },
       stubs: {
         InviteMembersTrigger,
         CreateWorkItemModal,
         GlDisclosureDropdown,
         GlEmoji: { template: '<div/>' },
+        ...stubs,
       },
       directives: {
         GlTooltip: createMockDirective('gl-tooltip'),
@@ -91,75 +92,22 @@ describe('CreateMenu component', () => {
       expect(findInviteMembersTrigger().exists()).toBe(true);
     });
 
-    describe('create new group work item modal', () => {
-      it('renders work item menu item correctly', () => {
-        expect(findCreateGroupWorkItemModalTrigger().exists()).toBe(true);
-      });
-
-      it('does not render the modal by default', () => {
-        expect(findCreateGroupWorkItemModal().exists()).toBe(false);
-      });
-
-      it('shows modal when clicking work item dropdown item', async () => {
-        findCreateGroupWorkItemModalTrigger().vm.$emit('action');
-        await nextTick();
-
-        expect(findCreateGroupWorkItemModal().exists()).toBe(true);
-        expect(findCreateGroupWorkItemModal().props('isGroup')).toBe(true);
-        expect(findCreateGroupWorkItemModal().props('visible')).toBe(true);
-        expect(findCreateGroupWorkItemModal().props('hideButton')).toBe(true);
-      });
-
-      it('hides modal when hideModal event is emitted', async () => {
-        findCreateGroupWorkItemModalTrigger().vm.$emit('action');
-        await nextTick();
-
-        expect(findCreateGroupWorkItemModal().exists()).toBe(true);
-
-        findCreateGroupWorkItemModal().vm.$emit('hideModal');
-        await nextTick();
-
-        expect(findCreateGroupWorkItemModal().exists()).toBe(false);
-      });
-
-      it('shows a toast when work item is created', async () => {
-        const workItem = {
-          workItemType: { name: 'Epic' },
-          webUrl: 'https://gitlab.com/group/project/-/epics/123',
-        };
-
-        findCreateGroupWorkItemModalTrigger().vm.$emit('action');
-        await nextTick();
-
-        expect(findCreateGroupWorkItemModal().exists()).toBe(true);
-        findCreateGroupWorkItemModal().vm.$emit('workItemCreated', workItem);
-        await nextTick();
-
-        expect(findCreateGroupWorkItemModal().exists()).toBe(false);
-
-        expect(mockToast).toHaveBeenCalledWith('Epic created', {
-          autoHideDelay: 10000,
-          action: {
-            text: 'View details',
-            onClick: expect.any(Function),
-          },
-        });
-      });
-    });
-
     describe('create new work item modal', () => {
-      beforeEach(() => {
-        createWrapper({}, createNewMenuProjects);
-      });
       it('renders work item menu item correctly', () => {
+        createWrapper({ props: { groups: createNewMenuProjects } });
+
         expect(findCreateWorkItemModalTrigger().exists()).toBe(true);
       });
 
       it('does not render the modal by default', () => {
+        createWrapper({ props: { groups: createNewMenuProjects } });
+
         expect(findCreateWorkItemModal().exists()).toBe(false);
       });
 
       it('shows modal when clicking work item dropdown item', async () => {
+        createWrapper({ props: { groups: createNewMenuProjects } });
+
         findCreateWorkItemModalTrigger().vm.$emit('action');
         await nextTick();
 
@@ -170,6 +118,8 @@ describe('CreateMenu component', () => {
       });
 
       it('hides modal when hideModal event is emitted', async () => {
+        createWrapper({ props: { groups: createNewMenuProjects } });
+
         findCreateWorkItemModalTrigger().vm.$emit('action');
         await nextTick();
 
@@ -186,6 +136,7 @@ describe('CreateMenu component', () => {
           workItemType: { name: 'Epic' },
           webUrl: 'https://gitlab.com/group/project/-/epics/123',
         };
+        createWrapper({ props: { groups: createNewMenuProjects } });
 
         findCreateWorkItemModalTrigger().vm.$emit('action');
         await nextTick();
@@ -194,7 +145,6 @@ describe('CreateMenu component', () => {
         await nextTick();
 
         expect(findCreateWorkItemModal().exists()).toBe(false);
-
         expect(mockToast).toHaveBeenCalledWith('Epic created', {
           autoHideDelay: 10000,
           action: {
@@ -203,6 +153,103 @@ describe('CreateMenu component', () => {
           },
         });
       });
+
+      it('does not include href on dropdown item, to prevent it being rendered as an `<a>`', () => {
+        createWrapper({
+          provide: { workItemPlanningViewEnabled: false },
+          props: { groups: createNewMenuProjects },
+          stubs: { GlDisclosureDropdownItem },
+        });
+
+        expect(findCreateWorkItemModalTrigger().props('item')).toMatchObject({
+          href: undefined,
+        });
+      });
+
+      describe('link', () => {
+        it('renders link', () => {
+          createWrapper({
+            provide: { workItemPlanningViewEnabled: false },
+            props: { groups: createNewMenuProjects },
+            stubs: { GlDisclosureDropdownItem },
+          });
+
+          expect(findCreateWorkItemModalTrigger().findComponent(GlLink).attributes('href')).toBe(
+            'issues/new',
+          );
+        });
+
+        it('opens modal when clicked', async () => {
+          createWrapper({
+            provide: { workItemPlanningViewEnabled: false },
+            props: { groups: createNewMenuProjects },
+            stubs: { GlDisclosureDropdownItem },
+          });
+
+          findCreateWorkItemModalTrigger()
+            .findComponent(GlLink)
+            .vm.$emit('click', { stopPropagation: jest.fn() });
+          await nextTick();
+
+          expect(findCreateWorkItemModal().exists()).toBe(true);
+        });
+
+        it('does not render when workItemPlanningViewEnabled=true', () => {
+          createWrapper({
+            provide: { workItemPlanningViewEnabled: true },
+            props: { groups: createNewMenuProjects },
+            stubs: { GlDisclosureDropdownItem },
+          });
+
+          expect(findCreateWorkItemModalTrigger().findComponent(GlLink).exists()).toBe(false);
+        });
+      });
+
+      describe('allowed work item types', () => {
+        it('returns empty array when group', async () => {
+          createWrapper({ provide: { isGroup: true } });
+
+          findCreateWorkItemModalTrigger().vm.$emit('action');
+          await nextTick();
+
+          expect(findCreateWorkItemModal().props('allowedWorkItemTypes')).toEqual([]);
+        });
+
+        it('returns Incident, Issue, and Task when project', async () => {
+          createWrapper({ provide: { isGroup: false, workItemPlanningViewEnabled: true } });
+
+          findCreateWorkItemModalTrigger().vm.$emit('action');
+          await nextTick();
+
+          expect(findCreateWorkItemModal().props('allowedWorkItemTypes')).toEqual([
+            'Incident',
+            'Issue',
+            'Task',
+          ]);
+        });
+      });
+
+      describe('preselected work item type', () => {
+        it.each`
+          isGroup  | workItemPlanningViewEnabled | preselectedWorkItemType
+          ${true}  | ${false}                    | ${WORK_ITEM_TYPE_NAME_EPIC}
+          ${true}  | ${true}                     | ${null}
+          ${false} | ${true}                     | ${null}
+          ${false} | ${false}                    | ${null}
+        `(
+          'only returns Epic when group and workItemPlanningViewEnabled=false',
+          async ({ isGroup, workItemPlanningViewEnabled, preselectedWorkItemType }) => {
+            createWrapper({ provide: { isGroup, workItemPlanningViewEnabled } });
+
+            findCreateWorkItemModalTrigger().vm.$emit('action');
+            await nextTick();
+
+            expect(findCreateWorkItemModal().props('preselectedWorkItemType')).toBe(
+              preselectedWorkItemType,
+            );
+          },
+        );
+      });
     });
 
     it('hides the tooltip when the dropdown is opened', async () => {
diff --git a/spec/frontend/super_sidebar/mock_data.js b/spec/frontend/super_sidebar/mock_data.js
index eea2a741c2a..9ffa921b0a1 100644
--- a/spec/frontend/super_sidebar/mock_data.js
+++ b/spec/frontend/super_sidebar/mock_data.js
@@ -14,7 +14,7 @@ export const createNewMenuGroups = [
       },
       {
         text: 'New work item',
-        component: 'create_new_group_work_item_modal',
+        component: 'create_new_work_item_modal',
       },
       {
         text: 'Invite members',
@@ -47,6 +47,7 @@ export const createNewMenuProjects = [
     items: [
       {
         text: 'New work item',
+        href: 'issues/new',
         component: 'create_new_work_item_modal',
       },
       {
diff --git a/spec/frontend/vue_shared/components/groups_list/group_list_item_actions_spec.js b/spec/frontend/vue_shared/components/groups_list/group_list_item_actions_spec.js
index 3073d7faee6..f230bf1523b 100644
--- a/spec/frontend/vue_shared/components/groups_list/group_list_item_actions_spec.js
+++ b/spec/frontend/vue_shared/components/groups_list/group_list_item_actions_spec.js
@@ -61,7 +61,7 @@ describe('GroupListItemActions', () => {
             action: expect.any(Function),
           },
         },
-        availableActions: [ACTION_EDIT, ACTION_DELETE, ACTION_RESTORE, ACTION_LEAVE],
+        availableActions: [ACTION_EDIT, ACTION_LEAVE, ACTION_DELETE],
       });
     });
   });
diff --git a/spec/frontend/vue_shared/components/groups_list/groups_list_item_spec.js b/spec/frontend/vue_shared/components/groups_list/groups_list_item_spec.js
index 5ab7fa498e4..549ee607d1a 100644
--- a/spec/frontend/vue_shared/components/groups_list/groups_list_item_spec.js
+++ b/spec/frontend/vue_shared/components/groups_list/groups_list_item_spec.js
@@ -14,7 +14,7 @@ import GroupListItemLeaveModal from '~/vue_shared/components/groups_list/group_l
 import GroupListItemActions from '~/vue_shared/components/groups_list/group_list_item_actions.vue';
 import {
   VISIBILITY_TYPE_ICON,
-  VISIBILITY_LEVEL_INTERNAL_STRING,
+  VISIBILITY_LEVEL_PUBLIC_STRING,
   GROUP_VISIBILITY_TYPE,
 } from '~/visibility_level/constants';
 import { ACCESS_LEVEL_LABELS, ACCESS_LEVEL_NO_ACCESS_INTEGER } from '~/access_level/constants';
@@ -114,8 +114,8 @@ describe('GroupsListItem', () => {
     const icon = findAvatarLabeled().findComponent(GlIcon);
     const tooltip = getBinding(icon.element, 'gl-tooltip');
 
-    expect(icon.props('name')).toBe(VISIBILITY_TYPE_ICON[VISIBILITY_LEVEL_INTERNAL_STRING]);
-    expect(tooltip.value).toBe(GROUP_VISIBILITY_TYPE[VISIBILITY_LEVEL_INTERNAL_STRING]);
+    expect(icon.props('name')).toBe(VISIBILITY_TYPE_ICON[VISIBILITY_LEVEL_PUBLIC_STRING]);
+    expect(tooltip.value).toBe(GROUP_VISIBILITY_TYPE[VISIBILITY_LEVEL_PUBLIC_STRING]);
   });
 
   it('renders subgroup count', () => {
@@ -211,8 +211,11 @@ describe('GroupsListItem', () => {
   });
 
   describe('when group does not have projectStatistics key', () => {
+    const { projectStatistics, ...groupWithoutProjectStatistics } = group;
     beforeEach(() => {
-      createComponent();
+      createComponent({
+        propsData: { group: groupWithoutProjectStatistics },
+      });
     });
 
     it('does not render storage size', () => {
@@ -222,11 +225,9 @@ describe('GroupsListItem', () => {
 
   describe('when group has projectStatistics key', () => {
     it('renders storage size in human size', () => {
-      createComponent({
-        propsData: { group: { ...group, projectStatistics: { storageSize: 3072 } } },
-      });
+      createComponent();
 
-      expect(findStorageSize().text()).toBe('3.00 KiB');
+      expect(findStorageSize().text()).toBe('100.00 MiB');
     });
 
     describe('when storage size is null', () => {
diff --git a/spec/frontend/vue_shared/components/groups_list/mock_data.js b/spec/frontend/vue_shared/components/groups_list/mock_data.js
index fd6df4c497a..c890d802d64 100644
--- a/spec/frontend/vue_shared/components/groups_list/mock_data.js
+++ b/spec/frontend/vue_shared/components/groups_list/mock_data.js
@@ -1,66 +1,12 @@
-import {
-  ACTION_EDIT,
-  ACTION_DELETE,
-  ACTION_LEAVE,
-  ACTION_RESTORE,
-} from '~/vue_shared/components/list_actions/constants';
+import adminGroupsGraphQlResponse from 'test_fixtures/graphql/admin/groups.query.graphql.json';
+import { formatGraphQLGroups } from '~/vue_shared/components/groups_list/formatter';
 
-export const groups = [
-  {
-    id: 1,
-    fullName: 'Gitlab Org',
-    fullPath: 'gitlab-org',
-    relativeWebUrl: '/gitlab-org',
-    parent: null,
-    webUrl: 'http://127.0.0.1:3000/groups/gitlab-org',
-    descriptionHtml:
-      '<p data-sourcepos="1:1-1:64" dir="auto">Dolorem dolorem omnis impedit cupiditate pariatur officia velit. Fusce eget orci a ipsum tempus vehicula. Donec rhoncus ante sed lacus pharetra, vitae imperdiet felis lobortis. Donec maximus dapibus orci, sit amet euismod dolor rhoncus vel. In nec mauris nibh.</p>',
-    avatarUrl: 'avatar.jpg',
-    avatarLabel: 'Gitlab Org',
-    descendantGroupsCount: 1,
-    projectsCount: 1,
-    groupMembersCount: 2,
-    visibility: 'internal',
-    accessLevel: {
-      integerValue: 10,
-    },
-    editPath: 'http://127.0.0.1:3000/groups/gitlab-org/-/edit',
-    availableActions: [ACTION_EDIT, ACTION_DELETE, ACTION_RESTORE, ACTION_LEAVE],
-    createdAt: '2023-09-19T14:42:38Z',
-    updatedAt: '2024-04-24T03:47:38Z',
-    lastActivityAt: '2024-05-24T03:47:38Z',
-    isLinkedToSubscription: false,
-    markedForDeletion: false,
-    isSelfDeletionInProgress: false,
-    isSelfDeletionScheduled: false,
+const {
+  data: {
+    groups: { nodes: graphqlGroups },
   },
-  {
-    id: 2,
-    fullName: 'Gitlab Org / test subgroup',
-    fullPath: 'gitlab-org/test-subgroup',
-    relativeWebUrl: '/gitlab-org/test-subgroup',
-    parent: {
-      id: 1,
-    },
-    webUrl: 'http://127.0.0.1:3000/groups/gitlab-org/test-subgroup',
-    descriptionHtml: '',
-    avatarUrl: null,
-    avatarLabel: 'Gitlab Org / test subgroup',
-    descendantGroupsCount: 4,
-    projectsCount: 4,
-    groupMembersCount: 4,
-    visibility: 'private',
-    accessLevel: {
-      integerValue: 20,
-    },
-    editPath: 'http://127.0.0.1:3000/groups/gitlab-org/test-subgroup/-/edit',
-    availableActions: [ACTION_EDIT, ACTION_DELETE, ACTION_RESTORE, ACTION_LEAVE],
-    createdAt: '2023-09-19T14:42:38Z',
-    updatedAt: '2024-04-24T03:47:38Z',
-    lastActivityAt: '2024-05-24T03:47:38Z',
-    isLinkedToSubscription: false,
-    markedForDeletion: false,
-    isSelfDeletionInProgress: false,
-    isSelfDeletionScheduled: false,
-  },
-];
+} = adminGroupsGraphQlResponse;
+
+const groups = formatGraphQLGroups(graphqlGroups);
+
+export { groups };
diff --git a/spec/frontend/vue_shared/components/groups_list/utils_spec.js b/spec/frontend/vue_shared/components/groups_list/utils_spec.js
index 770e6ca0311..15c0b64d5f2 100644
--- a/spec/frontend/vue_shared/components/groups_list/utils_spec.js
+++ b/spec/frontend/vue_shared/components/groups_list/utils_spec.js
@@ -45,8 +45,8 @@ describe('availableGraphQLGroupActions', () => {
     ${{ viewEditPage: true, removeGroup: true }}                 | ${true}           | ${false}                 | ${true}                 | ${[ACTION_EDIT, ACTION_RESTORE, ACTION_DELETE_IMMEDIATELY]}
     ${{ viewEditPage: true, removeGroup: true, canLeave: true }} | ${true}           | ${false}                 | ${false}                | ${[ACTION_EDIT, ACTION_LEAVE]}
     ${{ viewEditPage: true, removeGroup: true, canLeave: true }} | ${true}           | ${false}                 | ${true}                 | ${[ACTION_EDIT, ACTION_RESTORE, ACTION_LEAVE, ACTION_DELETE_IMMEDIATELY]}
-    ${{ viewEditPage: true, removeGroup: true }}                 | ${true}           | ${true}                  | ${false}                | ${[ACTION_EDIT]}
-    ${{ viewEditPage: true, removeGroup: true }}                 | ${true}           | ${true}                  | ${true}                 | ${[ACTION_EDIT]}
+    ${{ viewEditPage: true, removeGroup: true }}                 | ${true}           | ${true}                  | ${false}                | ${[]}
+    ${{ viewEditPage: true, removeGroup: true }}                 | ${true}           | ${true}                  | ${true}                 | ${[]}
   `(
     'availableGraphQLGroupActions',
     ({
diff --git a/spec/frontend/vue_shared/components/resource_lists/list_item_spec.js b/spec/frontend/vue_shared/components/resource_lists/list_item_spec.js
index 3751d0760c2..e1d0955f0a2 100644
--- a/spec/frontend/vue_shared/components/resource_lists/list_item_spec.js
+++ b/spec/frontend/vue_shared/components/resource_lists/list_item_spec.js
@@ -1,9 +1,11 @@
 import { GlAvatarLabeled, GlIcon } from '@gitlab/ui';
+import membershipProjectsGraphQlResponse from 'test_fixtures/graphql/projects/your_work/membership_projects.query.graphql.json';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import ListItem from '~/vue_shared/components/resource_lists/list_item.vue';
 import ListItemDescription from '~/vue_shared/components/resource_lists/list_item_description.vue';
 import ListActions from '~/vue_shared/components/list_actions/list_actions.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import { formatGraphQLProjects } from '~/vue_shared/components/projects_list/formatter';
 import { ACTION_EDIT, ACTION_DELETE } from '~/vue_shared/components/list_actions/constants';
 import {
   TIMESTAMP_TYPE_CREATED_AT,
@@ -15,7 +17,16 @@ import { groups } from '../groups_list/mock_data';
 describe('ListItem', () => {
   let wrapper;
 
-  const [resource] = groups;
+  const [group] = groups;
+
+  const {
+    data: {
+      projects: { nodes: graphqlProjects },
+    },
+  } = membershipProjectsGraphQlResponse;
+
+  const [project] = formatGraphQLProjects(graphqlProjects);
+
   const actions = {
     [ACTION_EDIT]: {
       href: '/foo',
@@ -26,7 +37,7 @@ describe('ListItem', () => {
   };
 
   const defaultPropsData = {
-    resource,
+    resource: group,
   };
 
   const createComponent = ({ propsData = {}, stubs = {}, scopedSlots = {} } = {}) => {
@@ -55,14 +66,14 @@ describe('ListItem', () => {
     const avatarLabeled = findAvatarLabeled();
 
     expect(avatarLabeled.props()).toMatchObject({
-      label: resource.avatarLabel,
-      labelLink: resource.relativeWebUrl,
+      label: group.avatarLabel,
+      labelLink: group.relativeWebUrl,
     });
 
     expect(avatarLabeled.attributes()).toMatchObject({
-      'entity-id': resource.id.toString(),
-      'entity-name': resource.fullName,
-      src: resource.avatarUrl,
+      'entity-id': group.id.toString(),
+      'entity-name': group.fullName,
+      src: group.avatarUrl,
       shape: 'rect',
     });
   });
@@ -71,7 +82,7 @@ describe('ListItem', () => {
     const avatarLabelLink = '/foo';
 
     beforeEach(() => {
-      createComponent({ propsData: { resource: { ...resource, avatarLabelLink } } });
+      createComponent({ propsData: { resource: { ...group, avatarLabelLink } } });
     });
 
     it('uses that for labeLink prop', () => {
@@ -151,7 +162,7 @@ describe('ListItem', () => {
         createComponent({
           propsData: {
             resource: {
-              ...resource,
+              ...group,
               descriptionHtml: null,
             },
           },
@@ -193,7 +204,7 @@ describe('ListItem', () => {
 
         expect(findListActions().props()).toMatchObject({
           actions,
-          availableActions: resource.availableActions,
+          availableActions: group.availableActions,
         });
       });
     });
@@ -204,7 +215,7 @@ describe('ListItem', () => {
           propsData: {
             actions,
             resource: {
-              ...resource,
+              ...group,
               availableActions: [],
             },
           },
@@ -246,17 +257,18 @@ describe('ListItem', () => {
   });
 
   describe.each`
-    timestampType                      | expectedText | expectedTimeProp
-    ${TIMESTAMP_TYPE_CREATED_AT}       | ${'Created'} | ${resource.createdAt}
-    ${TIMESTAMP_TYPE_UPDATED_AT}       | ${'Updated'} | ${resource.updatedAt}
-    ${TIMESTAMP_TYPE_LAST_ACTIVITY_AT} | ${'Updated'} | ${resource.lastActivityAt}
-    ${undefined}                       | ${'Created'} | ${resource.createdAt}
+    resource   | timestampType                      | expectedText | expectedTimeProp
+    ${group}   | ${TIMESTAMP_TYPE_CREATED_AT}       | ${'Created'} | ${'createdAt'}
+    ${group}   | ${TIMESTAMP_TYPE_UPDATED_AT}       | ${'Updated'} | ${'updatedAt'}
+    ${project} | ${TIMESTAMP_TYPE_LAST_ACTIVITY_AT} | ${'Updated'} | ${'lastActivityAt'}
+    ${group}   | ${undefined}                       | ${'Created'} | ${'createdAt'}
   `(
     'when `timestampType` prop is $timestampType',
-    ({ timestampType, expectedText, expectedTimeProp }) => {
+    ({ resource, timestampType, expectedText, expectedTimeProp }) => {
       beforeEach(() => {
         createComponent({
           propsData: {
+            resource,
             timestampType,
           },
         });
@@ -264,17 +276,17 @@ describe('ListItem', () => {
 
       it('displays correct text and passes correct `time` prop to `TimeAgoTooltip`', () => {
         expect(wrapper.findByText(expectedText).exists()).toBe(true);
-        expect(findTimeAgoTooltip().props('time')).toBe(expectedTimeProp);
+        expect(findTimeAgoTooltip().props('time')).toBe(resource[expectedTimeProp]);
       });
     },
   );
 
   describe('when timestamp type is not available in resource data', () => {
     beforeEach(() => {
-      const { createdAt, ...resourceWithoutCreatedAt } = resource;
+      const { createdAt, ...groupWithoutCreatedAt } = group;
       createComponent({
         propsData: {
-          resource: resourceWithoutCreatedAt,
+          resource: groupWithoutCreatedAt,
         },
       });
     });
diff --git a/spec/frontend/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar_spec.js b/spec/frontend/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar_spec.js
index 6761671b300..2f8e9dc9848 100644
--- a/spec/frontend/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar_spec.js
+++ b/spec/frontend/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar_spec.js
@@ -14,7 +14,6 @@ import WorkItemBulkEditMilestone from '~/work_items/components/work_item_bulk_ed
 import WorkItemBulkEditParent from '~/work_items/components/work_item_bulk_edit/work_item_bulk_edit_parent.vue';
 import WorkItemBulkEditSidebar from '~/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue';
 import workItemBulkUpdateMutation from '~/work_items/graphql/list/work_item_bulk_update.mutation.graphql';
-import workItemParentQuery from '~/work_items/graphql/list//work_item_parent.query.graphql';
 import getAvailableBulkEditWidgets from '~/work_items/graphql/list/get_available_bulk_edit_widgets.query.graphql';
 import {
   WIDGET_TYPE_ASSIGNEES,
@@ -23,10 +22,7 @@ import {
   WIDGET_TYPE_LABELS,
   WIDGET_TYPE_MILESTONE,
 } from '~/work_items/constants';
-import {
-  workItemParentQueryResponse,
-  availableBulkEditWidgetsQueryResponse,
-} from '../../mock_data';
+import { availableBulkEditWidgetsQueryResponse } from '../../mock_data';
 
 jest.mock('~/alert');
 
@@ -63,7 +59,6 @@ describe('WorkItemBulkEditSidebar component', () => {
     },
   ];
 
-  const workItemParentQueryHandler = jest.fn().mockResolvedValue(workItemParentQueryResponse);
   const workItemBulkUpdateHandler = jest
     .fn()
     .mockResolvedValue({ data: { workItemBulkUpdate: { updatedWorkItemCount: 1 } } });
@@ -79,7 +74,6 @@ describe('WorkItemBulkEditSidebar component', () => {
   } = {}) => {
     wrapper = shallowMountExtended(WorkItemBulkEditSidebar, {
       apolloProvider: createMockApollo([
-        [workItemParentQuery, workItemParentQueryHandler],
         [workItemBulkUpdateMutation, mutationHandler],
         [getAvailableBulkEditWidgets, availableWidgetsHandler],
       ]),
@@ -124,51 +118,9 @@ describe('WorkItemBulkEditSidebar component', () => {
       expect(findForm().attributes('id')).toBe('work-item-list-bulk-edit');
     });
 
-    describe('when epics list', () => {
-      it('calls mutation to bulk edit', async () => {
-        const addLabelIds = ['gid://gitlab/Label/1'];
-        const removeLabelIds = ['gid://gitlab/Label/2'];
-        createComponent({ props: { isEpicsList: true } });
-        await waitForPromises();
-
-        findAddLabelsComponent().vm.$emit('select', addLabelIds);
-        findRemoveLabelsComponent().vm.$emit('select', removeLabelIds);
-        findForm().vm.$emit('submit', { preventDefault: () => {} });
-
-        expect(workItemBulkUpdateHandler).toHaveBeenCalledWith({
-          input: {
-            parentId: 'gid://gitlab/Group/1',
-            ids: ['gid://gitlab/WorkItem/11', 'gid://gitlab/WorkItem/22'],
-            labelsWidget: {
-              addLabelIds,
-              removeLabelIds,
-            },
-          },
-        });
-        expect(findAddLabelsComponent().props('selectedLabelsIds')).toEqual([]);
-        expect(findRemoveLabelsComponent().props('selectedLabelsIds')).toEqual([]);
-      });
-
-      it('renders error when there is a mutation error', async () => {
-        createComponent({
-          props: { isEpicsList: true },
-          mutationHandler: jest.fn().mockRejectedValue(new Error('oh no')),
-        });
-
-        findForm().vm.$emit('submit', { preventDefault: () => {} });
-        await waitForPromises();
-
-        expect(createAlert).toHaveBeenCalledWith({
-          captureError: true,
-          error: new Error('oh no'),
-          message: 'Something went wrong while bulk editing.',
-        });
-      });
-    });
-
-    describe('when not epics list', () => {
+    describe('when on project work items list page', () => {
       describe('when work_items_bulk_edit is enabled', () => {
-        it('calls mutation to bulk edit', async () => {
+        it('calls mutation to bulk edit with project fullPath', async () => {
           const addLabelIds = ['gid://gitlab/Label/1'];
           const removeLabelIds = ['gid://gitlab/Label/2'];
           createComponent({
@@ -176,7 +128,7 @@ describe('WorkItemBulkEditSidebar component', () => {
               hasIssuableHealthStatusFeature: true,
               glFeatures: { workItemsBulkEdit: true },
             },
-            props: { isEpicsList: false },
+            props: { isEpicsList: false, fullPath: 'group/project' },
           });
           await waitForPromises();
 
@@ -193,7 +145,7 @@ describe('WorkItemBulkEditSidebar component', () => {
 
           expect(workItemBulkUpdateHandler).toHaveBeenCalledWith({
             input: {
-              parentId: 'gid://gitlab/Group/1',
+              fullPath: 'group/project',
               ids: ['gid://gitlab/WorkItem/11', 'gid://gitlab/WorkItem/22'],
               labelsWidget: {
                 addLabelIds,
@@ -220,6 +172,25 @@ describe('WorkItemBulkEditSidebar component', () => {
           expect(findRemoveLabelsComponent().props('selectedLabelsIds')).toEqual([]);
         });
 
+        it('calls mutation with namespace fullPath', async () => {
+          createComponent({
+            provide: {
+              glFeatures: { workItemsBulkEdit: true },
+            },
+            props: { isEpicsList: false, fullPath: 'group/subgroup/project' },
+          });
+          await waitForPromises();
+
+          findForm().vm.$emit('submit', { preventDefault: () => {} });
+
+          expect(workItemBulkUpdateHandler).toHaveBeenCalledWith({
+            input: {
+              fullPath: 'group/subgroup/project',
+              ids: ['gid://gitlab/WorkItem/11', 'gid://gitlab/WorkItem/22'],
+            },
+          });
+        });
+
         it('renders error when there is a mutation error', async () => {
           createComponent({
             props: { isEpicsList: true },
@@ -337,20 +308,6 @@ describe('WorkItemBulkEditSidebar component', () => {
     });
   });
 
-  describe('workItemParent query', () => {
-    it('is called when isEpicsList=true', () => {
-      createComponent({ props: { isEpicsList: true } });
-
-      expect(workItemParentQueryHandler).toHaveBeenCalled();
-    });
-
-    it('is not called when isEpicsList=false', () => {
-      createComponent({ props: { isEpicsList: false } });
-
-      expect(workItemParentQueryHandler).not.toHaveBeenCalled();
-    });
-  });
-
   describe('"State" component', () => {
     it.each([true, false])('renders depending on isEpicsList prop', (isEpicsList) => {
       createComponent({ props: { isEpicsList } });
diff --git a/spec/frontend/work_items/mock_data.js b/spec/frontend/work_items/mock_data.js
index cb8e63914b2..8de9de61e69 100644
--- a/spec/frontend/work_items/mock_data.js
+++ b/spec/frontend/work_items/mock_data.js
@@ -6951,14 +6951,6 @@ export const errorTrackingQueryResponseWithStackTrace = getErrorTrackingQueryRes
 
 export const mockRolledUpHealthStatus = [];
 
-export const workItemParentQueryResponse = {
-  data: {
-    namespace: {
-      id: 'gid://gitlab/Group/1',
-    },
-  },
-};
-
 export const mockCreateWorkItemDraftData = {
   workspace: {
     __typename: 'Namespace',
diff --git a/spec/graphql/resolvers/merge_requests_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
index 492df1f72de..0c7b04cd3ba 100644
--- a/spec/graphql/resolvers/merge_requests_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
@@ -621,16 +621,6 @@ RSpec.describe Resolvers::MergeRequestsResolver, feature_category: :code_review_
         it 'does not find anything' do
           is_expected.to be_empty
         end
-
-        context 'when feature flag "filter_blob_path" is disabled' do
-          before do
-            stub_feature_flags(filter_blob_path: false)
-          end
-
-          it 'ignores requested blob path' do
-            is_expected.to contain_exactly(merge_request_1)
-          end
-        end
       end
     end
 
diff --git a/spec/helpers/nav/new_dropdown_helper_spec.rb b/spec/helpers/nav/new_dropdown_helper_spec.rb
index d038962dbda..5febd4a780e 100644
--- a/spec/helpers/nav/new_dropdown_helper_spec.rb
+++ b/spec/helpers/nav/new_dropdown_helper_spec.rb
@@ -319,6 +319,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
                   id: 'new_issue',
                   title: 'New issue',
                   href: "/#{project.path_with_namespace}/-/issues/new",
+                  component: 'create_new_work_item_modal',
                   data: {
                     track_action: 'click_link_new_issue',
                     track_label: 'plus_menu_dropdown',
@@ -434,6 +435,7 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
               id: 'new_issue',
               title: 'New issue',
               href: "/#{project.path_with_namespace}/-/issues/new",
+              component: 'create_new_work_item_modal',
               data: {
                 track_action: 'click_link_new_issue',
                 track_label: 'plus_menu_dropdown',
diff --git a/spec/initializers/trusted_proxies_spec.rb b/spec/initializers/trusted_proxies_spec.rb
index 63c96ce17d1..d499f68ed32 100644
--- a/spec/initializers/trusted_proxies_spec.rb
+++ b/spec/initializers/trusted_proxies_spec.rb
@@ -15,21 +15,15 @@ RSpec.describe 'trusted_proxies' do
     end
 
     it 'filters out localhost' do
-      request = stub_request('HTTP_X_FORWARDED_FOR' => '1.1.1.1, 10.1.5.89, 127.0.0.1')
-      expect(request.remote_ip).to eq('10.1.5.89')
-      expect(request.ip).to eq('10.1.5.89')
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '1.1.1.1, 11.1.5.89, 127.0.0.1')
+      expect(request.remote_ip).to eq('11.1.5.89')
+      expect(request.ip).to eq('11.1.5.89')
     end
 
     it 'filters out bad values' do
-      request = stub_request('HTTP_X_FORWARDED_FOR' => '(null), 10.1.5.89')
-      expect(request.remote_ip).to eq('10.1.5.89')
-      expect(request.ip).to eq('10.1.5.89')
-    end
-  end
-
-  context 'with private IP ranges added' do
-    before do
-      set_trusted_proxies(["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"])
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '(null), 11.1.5.89')
+      expect(request.remote_ip).to eq('11.1.5.89')
+      expect(request.ip).to eq('11.1.5.89')
     end
 
     it 'filters out private and local IPs' do
@@ -37,6 +31,14 @@ RSpec.describe 'trusted_proxies' do
       expect(request.remote_ip).to eq('1.1.1.1')
       expect(request.ip).to eq('1.1.1.1')
     end
+
+    it 'filters out private and local IPv6 addresses' do
+      request = stub_request(
+        'HTTP_X_FORWARDED_FOR' => '::ffff:1.2.3.6, ::ffff:1.1.1.1, ::ffff:10.1.5.89, ::ffff:127.0.0.1'
+      )
+      expect(request.remote_ip).to eq('::ffff:1.1.1.1')
+      expect(request.ip).to eq('::ffff:1.1.1.1')
+    end
   end
 
   context 'with proxy IP added' do
@@ -50,11 +52,25 @@ RSpec.describe 'trusted_proxies' do
       expect(request.ip).to eq('1.1.1.1')
     end
 
-    it 'handles invalid ip addresses' do
+    it 'handles mapped IPv6 addresses' do
+      request = stub_request(
+        'HTTP_X_FORWARDED_FOR' => '::ffff:1.2.3.6, ::ffff:1.1.1.1, ::ffff:60.98.25.47, ::ffff::127.0.0.1'
+      )
+      expect(request.remote_ip).to eq('::ffff:1.1.1.1')
+      expect(request.ip).to eq('::ffff:1.1.1.1')
+    end
+
+    it 'handles invalid IP addresses' do
       request = stub_request('HTTP_X_FORWARDED_FOR' => '(null), 1.1.1.1:12345, 1.1.1.1')
       expect(request.remote_ip).to eq('1.1.1.1')
       expect(request.ip).to eq('1.1.1.1')
     end
+
+    it 'does not trust private IPs' do
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '1.2.3.6, 10.1.1.1, 60.98.25.47, 127.0.0.1')
+      expect(request.remote_ip).to eq('10.1.1.1')
+      expect(request.ip).to eq('10.1.1.1')
+    end
   end
 
   def stub_request(headers = {})
diff --git a/spec/lib/banzai/filter/placeholders_post_filter_spec.rb b/spec/lib/banzai/filter/placeholders_post_filter_spec.rb
index ca58e8fcac9..0008aa2533d 100644
--- a/spec/lib/banzai/filter/placeholders_post_filter_spec.rb
+++ b/spec/lib/banzai/filter/placeholders_post_filter_spec.rb
@@ -285,7 +285,8 @@ RSpec.describe Banzai::Filter::PlaceholdersPostFilter, feature_category: :markdo
       markdown = '[test](%{gitlab_server}/%{project_title}/foo.png)'
       expected = '<p dir="auto"><a href="localhost/%{project_title}/foo.png" ' \
         'data-placeholder="%%7Bgitlab_server%7D/%%7Bproject_title%7D/foo.png" ' \
-        'rel="nofollow noreferrer noopener" target="_blank">test</a></p>'
+        'rel="nofollow noreferrer noopener" target="_blank" ' \
+        'data-canonical-src="%%7Bgitlab_server%7D/%%7Bproject_title%7D/foo.png">test</a></p>'
 
       expect(run_pipeline(markdown)).to eq expected
     end
@@ -294,7 +295,8 @@ RSpec.describe Banzai::Filter::PlaceholdersPostFilter, feature_category: :markdo
       markdown = '[test](%{gitlab_server}/%{foo}/foo.png)'
       expected = '<p dir="auto"><a href="localhost/%%7Bfoo%7D/foo.png" ' \
         'data-placeholder="%%7Bgitlab_server%7D/%%7Bfoo%7D/foo.png" ' \
-        'rel="nofollow noreferrer noopener" target="_blank">test</a></p>'
+        'rel="nofollow noreferrer noopener" target="_blank" ' \
+        'data-canonical-src="%%7Bgitlab_server%7D/%%7Bfoo%7D/foo.png">test</a></p>'
 
       expect(run_pipeline(markdown)).to eq expected
     end
@@ -302,7 +304,8 @@ RSpec.describe Banzai::Filter::PlaceholdersPostFilter, feature_category: :markdo
     it 'does not allow placeholders in link text (parser limitation)' do
       markdown = '[%{gitlab_server}](%{gitlab_server})'
       expected = '<p dir="auto"><a href="localhost" data-placeholder="%%7Bgitlab_server%7D" ' \
-        'rel="nofollow noreferrer noopener" target="_blank">%{gitlab_server}</a></p>'
+        'rel="nofollow noreferrer noopener" target="_blank" ' \
+        'data-canonical-src="%%7Bgitlab_server%7D">%{gitlab_server}</a></p>'
 
       expect(run_pipeline(markdown)).to eq expected
     end
diff --git a/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb b/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb
index c5703cf5c24..604830f9d00 100644
--- a/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb
+++ b/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb
@@ -107,10 +107,22 @@ RSpec.describe Gitlab::Auth::IpRateLimiter, :use_clean_rails_memory_store_cachin
       it { is_expected.to be_truthy }
     end
 
+    context 'when mapped ip is in the trusted list' do
+      let(:ip) { '::ffff:127.0.0.1' }
+
+      it { is_expected.to be_truthy }
+    end
+
     context 'when ip is not in the trusted list' do
       let(:ip) { '10.0.0.1' }
 
       it { is_expected.to be_falsey }
     end
+
+    context 'when mapped ip is not in the trusted list' do
+      let(:ip) { '::ffff:10.0.0.1' }
+
+      it { is_expected.to be_falsey }
+    end
   end
 end
diff --git a/spec/lib/gitlab/current/organization_spec.rb b/spec/lib/gitlab/current/organization_spec.rb
index cebd08dc27e..fba19186234 100644
--- a/spec/lib/gitlab/current/organization_spec.rb
+++ b/spec/lib/gitlab/current/organization_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe Gitlab::Current::Organization, feature_category: :organization do
   let_it_be(:other_organization) { create(:organization) }
   let_it_be(:organization) { create(:organization) }
   let_it_be(:user_organization) { create(:organization) }
-  let_it_be(:session_organization) { create(:organization) }
   let_it_be(:default_organization) { create(:organization, :default) }
   let_it_be(:group) { create(:group, organization: organization) }
   let_it_be(:user) { create(:user, organization_users: [create(:organization_user, organization: user_organization)]) }
@@ -24,56 +23,50 @@ RSpec.describe Gitlab::Current::Organization, feature_category: :organization do
   let(:params_with_invalid_groups_id) { { controller: 'groups', id: 'not_found' } }
   let(:params_with_invalid_group_id) { { group_id: 'not_found' } }
   let(:empty_params) { {} }
-  let(:session_with_org) { { organization_id: session_organization.id } }
-  let(:session_with_invalid_org) { { organization_id: non_existing_record_id } }
-  let(:empty_session) { {} }
-  let(:nil_session) { nil }
 
   describe '#organization' do
-    subject(:current_organization) do
-      described_class.new(params: params, user: user_param, session: session_param)
+    subject(:current_organization) { described_class.new(params: params, user: user_param).organization }
+
+    where(:params, :user_param, :expected, :enables_fallback) do
+      # Valid params without user - should find organization from params
+      ref(:params_with_namespace_id)      | nil        | ref(:organization)         | false
+      ref(:params_with_group_id)          | nil        | ref(:organization)         | false
+      ref(:params_with_groups_id)         | nil        | ref(:organization)         | false
+      ref(:params_with_org_path)          | nil        | ref(:other_organization)   | false
+
+      # Valid params with user - params should take precedence over user
+      ref(:params_with_namespace_id)      | ref(:user) | ref(:organization)         | false
+      ref(:params_with_group_id)          | ref(:user) | ref(:organization)         | false
+      ref(:params_with_groups_id)         | ref(:user) | ref(:organization)         | false
+      ref(:params_with_org_path)          | ref(:user) | ref(:other_organization)   | false
+
+      # Params without user when organization is not found - should fall back to default
+      ref(:params_with_invalid_namespace) | nil        | ref(:default_organization) | true
+      ref(:params_with_empty_namespace)   | nil        | ref(:default_organization) | true
+      ref(:params_with_empty_org_path)    | nil        | ref(:default_organization) | true
+      ref(:params_with_invalid_org_path)  | nil        | ref(:default_organization) | true
+      ref(:params_with_invalid_groups_id) | nil        | ref(:default_organization) | true
+      ref(:params_with_invalid_group_id)  | nil        | ref(:default_organization) | true
+
+      # Invalid params with user - should fall back to user (params tried first but failed)
+      ref(:params_with_invalid_namespace) | ref(:user) | ref(:user_organization)    | false
+      ref(:params_with_empty_namespace)   | ref(:user) | ref(:user_organization)    | false
+      ref(:params_with_invalid_org_path)  | ref(:user) | ref(:user_organization)    | false
+      ref(:params_with_invalid_groups_id) | ref(:user) | ref(:user_organization)    | false
+      ref(:params_with_invalid_group_id)  | ref(:user) | ref(:user_organization)    | false
+
+      # No params with user - should find organization from user
+      ref(:empty_params)                 | ref(:user)  | ref(:user_organization)    | false
+
+      # No params without user - should fall back to default
+      ref(:empty_params)                 | nil         | ref(:default_organization) | true
     end
 
-    # rubocop:disable Layout/LineLength -- Parameterized table format requires long lines
-    where(:params, :session_param, :user_param, :expected, :enables_fallback) do
-      # Valid params
-      ref(:params_with_namespace_id)      | ref(:session_with_org)         | ref(:user) | ref(:organization)         | false
-      ref(:params_with_group_id)          | ref(:session_with_org)         | ref(:user) | ref(:organization)         | false
-      ref(:params_with_groups_id)         | ref(:session_with_org)         | ref(:user) | ref(:organization)         | false
-      ref(:params_with_org_path)          | ref(:session_with_org)         | ref(:user) | ref(:other_organization)   | false
-
-      # Invalid params fall back to session, then user, then default
-      ref(:params_with_invalid_namespace) | ref(:session_with_org)         | ref(:user) | ref(:session_organization) | false
-      ref(:params_with_invalid_namespace) | ref(:empty_session)            | ref(:user) | ref(:user_organization)    | false
-      ref(:params_with_invalid_namespace) | ref(:session_with_invalid_org) | ref(:user) | ref(:user_organization)    | false
-      ref(:params_with_invalid_namespace) | ref(:empty_session)            | nil        | ref(:default_organization) | true
-      ref(:params_with_invalid_namespace) | ref(:session_with_invalid_org) | nil        | ref(:default_organization) | true
-
-      # Empty params follow same fallback chain
-      ref(:empty_params)                  | ref(:session_with_org)         | ref(:user) | ref(:session_organization) | false
-      ref(:empty_params)                  | ref(:empty_session)            | ref(:user) | ref(:user_organization)    | false
-      ref(:empty_params)                  | ref(:nil_session)              | ref(:user) | ref(:user_organization)    | false
-      ref(:empty_params)                  | ref(:session_with_invalid_org) | ref(:user) | ref(:user_organization)    | false
-      ref(:empty_params)                  | ref(:session_with_invalid_org) | nil        | ref(:default_organization) | true
-      ref(:empty_params)                  | ref(:empty_session)            | nil        | ref(:default_organization) | true
-      ref(:empty_params)                  | ref(:nil_session)              | nil        | ref(:default_organization) | true
-
-      # Test other invalid parameter types to ensure consistent fallback behavior
-      ref(:params_with_empty_namespace)   | ref(:empty_session)            | nil        | ref(:default_organization) | true
-      ref(:params_with_invalid_groups_id) | ref(:session_with_org)         | ref(:user) | ref(:session_organization) | false
-      ref(:params_with_invalid_org_path)  | ref(:empty_session)            | ref(:user) | ref(:user_organization)    | false
-      ref(:params_with_invalid_group_id)  | ref(:session_with_invalid_org) | nil        | ref(:default_organization) | true
-    end
-    # rubocop:enable Layout/LineLength
-
     with_them do
-      it 'correctly sets the current organization' do
-        expect(current_organization.organization).to eq(expected)
-      end
+      it { is_expected.to eq(expected) }
 
       it 'sets fallback tracking correctly', :request_store do
-        current_organization.organization
-
+        current_organization
         expect(Gitlab::Organizations::FallbackOrganizationTracker.enabled?).to eq(enables_fallback)
       end
     end
diff --git a/spec/lib/gitlab/middleware/basic_health_check_spec.rb b/spec/lib/gitlab/middleware/basic_health_check_spec.rb
index 40e25e5e272..451370498c0 100644
--- a/spec/lib/gitlab/middleware/basic_health_check_spec.rb
+++ b/spec/lib/gitlab/middleware/basic_health_check_spec.rb
@@ -60,11 +60,12 @@ RSpec.describe Gitlab::Middleware::BasicHealthCheck do
 
       context 'IPv6 compatibility' do
         before do
-          env['REMOTE_ADDR'] = '::ffff:127.0.0.1'
+          env['HTTP_X_FORWARDED_FOR'] = "::ffff:8.8.8.8"
+          env['REMOTE_ADDR'] = '::ffff:8.8.8.8'
         end
 
         it 'returns 200 response when entry is a mapped IPv4' do
-          allow(Settings.monitoring).to receive(:ip_whitelist).and_return(['127.0.0.1'])
+          allow(Settings.monitoring).to receive(:ip_whitelist).and_return(['8.8.8.8'])
           expect(app).not_to receive(:call)
 
           response = middleware.call(env)
diff --git a/spec/mailers/emails/projects_spec.rb b/spec/mailers/emails/projects_spec.rb
index ebfc4cf608b..b27b96b3bd9 100644
--- a/spec/mailers/emails/projects_spec.rb
+++ b/spec/mailers/emails/projects_spec.rb
@@ -308,4 +308,38 @@ RSpec.describe Emails::Projects do
       is_expected.to have_body_text(deletion_date)
     end
   end
+
+  describe '#pipeline_variables_migration_complete_email' do
+    let(:updated_count) { 5 }
+    let(:skipped_count) { 2 }
+
+    let(:mail) do
+      Notify.pipeline_variables_migration_complete_email(
+        recipient,
+        group,
+        { updated_count: updated_count, skipped_count: skipped_count }
+      )
+    end
+
+    subject { mail }
+
+    it_behaves_like 'an email sent to a user'
+    it_behaves_like 'an email sent from GitLab'
+    it_behaves_like 'it should not have Gmail Actions links'
+    it_behaves_like 'a user cannot unsubscribe through footer link'
+    it_behaves_like 'appearance header and footer enabled'
+    it_behaves_like 'appearance header and footer not enabled'
+
+    it 'has the correct subject and body' do
+      is_expected.to have_subject("#{group.name} | Pipeline variables settings migration complete")
+      is_expected.to have_body_text('All projects in the')
+      is_expected.to have_body_text(group.name)
+      is_expected.to have_body_text('group were checked for pipeline variables usage')
+      is_expected.to have_body_text("#{updated_count} projects were not using pipeline variables")
+      is_expected.to have_body_text('CI/CD settings were updated to prevent future pipeline variable usage')
+      is_expected.to have_body_text("#{skipped_count} have used pipeline variables in the past")
+      is_expected.to have_body_text('These projects\' CI/CD settings were not updated as there is a risk')
+      is_expected.to have_body_text('Projects that could not be updated need manual review')
+    end
+  end
 end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 3b87cb0baff..6f0f82300d5 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -596,6 +596,32 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
       end
     end
 
+    describe 'pipeline variables migration complete' do
+      let(:updated_count) { 5 }
+      let(:skipped_count) { 2 }
+
+      subject { described_class.pipeline_variables_migration_complete_email(recipient, group, { updated_count: updated_count, skipped_count: skipped_count }) }
+
+      it_behaves_like 'an email sent to a user'
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like "a user cannot unsubscribe through footer link"
+      it_behaves_like 'appearance header and footer enabled'
+      it_behaves_like 'appearance header and footer not enabled'
+
+      it 'has the correct subject and body' do
+        is_expected.to have_subject("#{group.name} | Pipeline variables settings migration complete")
+        is_expected.to have_body_text('All projects in the')
+        is_expected.to have_body_text(group.name)
+        is_expected.to have_body_text('group were checked for pipeline variables usage')
+        is_expected.to have_body_text("#{updated_count} projects were not using pipeline variables")
+        is_expected.to have_body_text('CI/CD settings were updated to prevent future pipeline variable usage')
+        is_expected.to have_body_text("#{skipped_count} have used pipeline variables in the past")
+        is_expected.to have_body_text('These projects\' CI/CD settings were not updated as there is a risk')
+        is_expected.to have_body_text('Projects that could not be updated need manual review')
+      end
+    end
+
     def invite_to_project(project, inviter:, user: nil)
       create(
         :project_member,
diff --git a/spec/requests/api/graphql/work_item_spec.rb b/spec/requests/api/graphql/work_item_spec.rb
index 4943918a3b6..d212b26c851 100644
--- a/spec/requests/api/graphql/work_item_spec.rb
+++ b/spec/requests/api/graphql/work_item_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Query.work_item(id)', :with_current_organization, feature_category: :team_planning do
+RSpec.describe 'Query.work_item(id)', feature_category: :team_planning do
   include GraphqlHelpers
 
   let_it_be(:group) { create(:group) }
@@ -1473,7 +1473,7 @@ RSpec.describe 'Query.work_item(id)', :with_current_organization, feature_catego
 
           it 'avoids N + 1 queries', :use_sql_query_cache do
             # warm-up already done in the before block
-            control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+            control = ActiveRecord::QueryRecorder.new do
               post_graphql(query, current_user: current_user)
             end
             expect(graphql_errors).to be_blank
diff --git a/spec/services/ci/safe_disable_pipeline_variables_service_spec.rb b/spec/services/ci/safe_disable_pipeline_variables_service_spec.rb
index b7ffa214b68..d7be4a6cd4d 100644
--- a/spec/services/ci/safe_disable_pipeline_variables_service_spec.rb
+++ b/spec/services/ci/safe_disable_pipeline_variables_service_spec.rb
@@ -58,6 +58,7 @@ RSpec.describe Ci::SafeDisablePipelineVariablesService, feature_category: :ci_va
 
           expect(response.status).to eq(:success)
           expect(response.payload[:updated_count]).to eq(2)
+          expect(response.payload[:skipped_count]).to eq(2)
         end
 
         it 'is idempotent' do
@@ -67,6 +68,7 @@ RSpec.describe Ci::SafeDisablePipelineVariablesService, feature_category: :ci_va
           second_response = service.execute
           expect(second_response.status).to eq(:success)
           expect(second_response.payload[:updated_count]).to eq(0)
+          expect(second_response.payload[:skipped_count]).to eq(2)
         end
       end
 
diff --git a/spec/workers/ci/safe_disable_pipeline_variables_worker_spec.rb b/spec/workers/ci/safe_disable_pipeline_variables_worker_spec.rb
index c1a03415ef4..abf81452a70 100644
--- a/spec/workers/ci/safe_disable_pipeline_variables_worker_spec.rb
+++ b/spec/workers/ci/safe_disable_pipeline_variables_worker_spec.rb
@@ -3,34 +3,39 @@
 require 'spec_helper'
 
 RSpec.describe Ci::SafeDisablePipelineVariablesWorker, feature_category: :ci_variables do
-  let_it_be(:group_id) { create(:group).id }
-  let_it_be(:current_user_id) { create(:user).id }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:current_user) { create(:user) }
   let(:worker) { described_class.new }
 
   describe '#perform' do
     subject(:perform_worker) { worker.perform(*job_args) }
 
-    let(:job_args) { [current_user_id, group_id] }
+    let(:job_args) { [current_user.id, group.id] }
 
     it_behaves_like 'an idempotent worker'
 
     shared_examples 'fails to execute the service' do
-      it 'fails to execute' do
+      it 'fails to execute and does not send email' do
         expect(worker).not_to receive(:log_extra_metadata_on_done)
         expect(::Ci::SafeDisablePipelineVariablesService).not_to receive(:new)
+        expect(Notify).not_to receive(:pipeline_variables_migration_complete_email)
 
         perform_worker
       end
     end
 
-    it 'executes SafeDisablePipelineVariablesService' do
-      expected_response = ServiceResponse.success(payload: { updated_count: 5 })
+    it 'executes SafeDisablePipelineVariablesService and sends email' do
+      expected_response = ServiceResponse.success(payload: { updated_count: 5, skipped_count: 2 })
+      email = instance_double(ActionMailer::MessageDelivery)
 
       expect_next_instance_of(::Ci::SafeDisablePipelineVariablesService) do |service|
         expect(service).to receive(:execute).and_return(expected_response)
       end
 
       expect(worker).to receive(:log_extra_metadata_on_done).with(:disabled_pipeline_variables_count, 5)
+      expect(Notify).to receive(:pipeline_variables_migration_complete_email)
+        .with(current_user, group, { updated_count: 5, skipped_count: 2 }).and_return(email)
+      expect(email).to receive(:deliver_later)
 
       perform_worker
     end
@@ -57,13 +62,13 @@ RSpec.describe Ci::SafeDisablePipelineVariablesWorker, feature_category: :ci_var
       end
 
       context 'and group does not exist' do
-        let(:job_args) { [current_user_id, group_id + 1] }
+        let(:job_args) { [current_user.id, group.id + 1] }
 
         it_behaves_like 'fails to execute the service'
       end
 
       context 'and user does not exist' do
-        let(:job_args) { [current_user_id + 1, group_id] }
+        let(:job_args) { [current_user.id + 1, group.id] }
 
         it_behaves_like 'fails to execute the service'
       end
diff --git a/tooling/bin/predictive_test_metrics b/tooling/bin/predictive_test_metrics
new file mode 100755
index 00000000000..7257d124163
--- /dev/null
+++ b/tooling/bin/predictive_test_metrics
@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/inline'
+require 'optparse'
+
+gemfile do
+  source 'https://rubygems.org'
+
+  gem 'gitlab', '~> 5.1'
+  gem 'test_file_finder', '~> 0.3'
+  # loaded from standard library by gitlab and will stop working on ruby 3.4
+  gem 'base64'
+  gem 'csv'
+end
+
+require_relative '../lib/tooling/predictive_tests/metrics_exporter'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
+
+  opts.on('--export-backend-metrics', 'Export predictive test metrics for rspec') do
+    options[:export_backend_metrics] = true
+  end
+
+  opts.on('--export-frontend-metrics', 'Export predictive test metrics for frontend') do
+    options[:export_frontend_metrics] = true
+  end
+
+  opts.on('--output-dir [string]', String, 'Output directory for generated metrics files') do |value|
+    options[:output_dir] = value
+  end
+
+  opts.on('--failed-backend-tests-file', String, 'File with list of failed rspec tests') do |value|
+    options[:failed_backend_tests_file] = value
+  end
+
+  opts.on('--failed-frontend-tests-file', String, 'File with list of failed jest tests') do |value|
+    options[:failed_frontend_tests_file] = value
+  end
+
+  opts.on('-h', '--help', 'Show this help message') do
+    puts opts
+    exit
+  end
+end.parse!
+
+# Validate at least one option is provided
+if [options[:export_backend_metrics], options[:export_frontend_metrics]].all?(&:nil?)
+  puts <<~MSG
+    Error: Please specify at least one of these flags:
+      1. --export-backend-metrics
+      2. --export-frontend-metrics
+  MSG
+
+  exit 1
+end
+
+if options[:export_backend_metrics]
+  options[:failed_backend_tests_file].tap do |file|
+    next unless file.nil? || file.empty?
+
+    warn "[predictive tests] Missing argument: --failed-backend-tests-file"
+    exit 1
+  end
+
+  Tooling::PredictiveTests::MetricsExporter.new(
+    output_dir: options[:output_dir] || 'tmp/predictive_test_metrics',
+    rspec_all_failed_tests_file: options[:failed_backend_tests_file]
+  ).execute
+end
+
+if options[:export_frontend_metrics]
+  options[:failed_frontend_tests_file].tap do |file|
+    next unless file.nil? || file.empty?
+
+    warn "[predictive tests] Missing argument: --failed-frontend-tests-file"
+    exit 1
+  end
+
+  # TODO: Move the logic of exporting metrics of frontend tests to MetricsExporter in a follow up mr
+end
diff --git a/tooling/bin/predictive_tests b/tooling/bin/predictive_tests
index 7e05aefb056..60f05e1c349 100755
--- a/tooling/bin/predictive_tests
+++ b/tooling/bin/predictive_tests
@@ -1,164 +1,212 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/inline'
+# use inline bundler only when executed as standalone script
+if __FILE__ == $PROGRAM_NAME
+  require 'bundler/inline'
 
-gemfile do
-  source 'https://rubygems.org'
+  gemfile do
+    source 'https://rubygems.org'
 
-  gem 'gitlab', '~> 5.1'
-  gem 'test_file_finder', '~> 0.3'
-  # loaded from standard library by gitlab and will stop working on ruby 3.4
-  gem 'base64'
-  gem 'csv'
-end
-
-require 'optparse'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
-
-  opts.on('--ci', 'Use ci specific setup') do
-    options[:ci] = true
-  end
-
-  opts.on('--select-tests', 'Run test selection logic') do
-    options[:select_tests] = true
-  end
-
-  opts.on('--export-predictive-backend-metrics', 'Export predictive test metrics for rspec') do
-    options[:export_rspec_metrics] = true
-  end
-
-  opts.on('--export-predictive-frontend-metrics', 'Export predictive test metrics for frontend') do
-    options[:export_jest_metrics] = true
-  end
-
-  opts.on('--with-crystalball-mappings', 'Download crystalball mappings for rspec tests') do
-    options[:with_crystalball_mappings] = true
-  end
-
-  opts.on('--mapping-type [string]', String, 'Crystalball mapping type, coverage or described_class') do |value|
-    options[:mapping_type] = value
-  end
-
-  opts.on('--changed-files [string]', String, 'Space separated list of changed files. Used outside CI.') do |value|
-    options[:changed_files] = value
-  end
-
-  opts.on('-h', '--help', 'Show this help message') do
-    puts opts
-    exit
-  end
-end.parse!
-
-# Validate at least one option is provided
-if [options[:select_tests], options[:export_rspec_metrics], options[:export_jest_metrics]].all?(&:nil?)
-  puts <<~MSG
-    Error: Please specify one of these flags:
-      1. --select-tests
-      2. --export-predictive-backend-metrics
-      3. --export-predictive-frontend-metrics
-  MSG
-
-  exit 1
-end
-
-def validate_required_env_variables!(variables)
-  variables.select { |key| ENV[key.to_s].to_s.empty? }.tap do |missing_variables|
-    next if missing_variables.empty?
-
-    warn "[predictive tests] Missing ENV variable(s): #{missing_variables.join(',')}."
-    exit 1
+    gem 'gitlab', '~> 5.1'
+    gem 'test_file_finder', '~> 0.3'
+    # loaded from standard library by gitlab and will stop working on ruby 3.4
+    gem 'base64'
+    gem 'csv'
   end
 end
 
-if options[:select_tests]
-  require_relative '../lib/tooling/predictive_tests/test_selector'
-  require_relative '../lib/tooling/predictive_tests/changed_files'
-  require_relative '../lib/tooling/predictive_tests/mapping_fetcher'
+require 'fileutils'
+require 'tmpdir'
+require 'json'
 
-  ci = options[:ci]
+require_relative '../lib/tooling/predictive_tests/test_selector'
+require_relative '../lib/tooling/predictive_tests/changed_files'
+require_relative '../lib/tooling/predictive_tests/mapping_fetcher'
 
-  if ci
-    validate_required_env_variables!(%w[
-      RSPEC_MATCHING_TEST_FILES_PATH
-      FRONTEND_FIXTURES_MAPPING_PATH
-      RSPEC_MATCHING_JS_FILES_PATH
-    ])
-  elsif options[:changed_files].nil? || options[:changed_files].strip.empty?
-    warn 'Please provide --changed-files with list of changed files for local run.'
-    exit 1
+class PredictiveTests # rubocop:disable Gitlab/NamespacedClass -- standalone non rails script
+  def initialize(options)
+    @with_crystalball_mappings = options[:with_crystalball_mappings]
+    @mapping_type = options[:mapping_type] || :described_class
+    @with_frontend_fixture_mappings = options[:with_frontend_fixture_mappings]
+    @changed_files = options[:changed_files]
+    @changed_files_path = options[:changed_files_path]
+    @matching_foss_rspec_test_files_path = options[:matching_foss_rspec_test_files_path]
+    @matching_ee_rspec_test_files_path = options[:matching_ee_rspec_test_files_path]
+    @matching_jest_test_files_path = options[:matching_jest_test_files_path]
+    @ci = options[:ci]
+    @debug = options[:debug]
+
+    # unlike backend mappings, this file is reused in other ci jobs so it's location needs to be configurable
+    @frontend_fixtures_mapping_path = options[:frontend_fixtures_mapping_path] || File.join(
+      Dir.tmpdir, 'frontend_fixtures_mapping.json'
+    )
   end
 
-  # silence all output on non ci and only output list of spec files to run so it could be used in scripts/hooks
-  logger = Logger.new($stdout, progname: '[Predictive Tests]', level: ci ? :info : :error)
-  logger.info("Running predictive test selection")
+  def execute
+    logger.info('Running predictive test selection')
+    create_output_files
+    return if @ci
 
-  mapping_fetcher = Tooling::PredictiveTests::MappingFetcher.new(logger: logger)
-  test_mapping_file = if options[:with_crystalball_mappings]
-                        mapping_fetcher.fetch_rspec_mappings(
-                          'tmp/crystalball_mappings.json',
-                          type: options[:mapping_type] || :described_class
-                        )
-                      end
-
-  changed_files = if ci
-                    Tooling::PredictiveTests::ChangedFiles.fetch(
-                      frontend_fixtures_file: mapping_fetcher.fetch_frontend_fixtures_mappings(
-                        ENV['FRONTEND_FIXTURES_MAPPING_PATH']
-                      )
-                    )
-                  else
-                    options[:changed_files].split(" ")
-                  end
-
-  test_selector = Tooling::PredictiveTests::TestSelector.new(
-    changed_files: changed_files,
-    rspec_test_mapping_path: test_mapping_file,
-    logger: logger
-  )
-  rspec_spec_list = test_selector.rspec_spec_list
-  js_spec_list = test_selector.js_spec_list
-
-  if ci
-    # Used to generate predictive rspec test pipelines
-    File.write(ENV['RSPEC_MATCHING_TEST_FILES_PATH'], rspec_spec_list.join(" "))
-    # Used by frontend related pipelines/jobs
-    File.write(ENV['RSPEC_MATCHING_JS_FILES_PATH'], js_spec_list.join(" "))
-    File.write(ENV['RSPEC_CHANGED_FILES_PATH'], changed_files.join("\n"))
-  else
     puts (rspec_spec_list + js_spec_list).join(' ')
   end
+
+  private
+
+  def logger
+    @logger ||= Logger.new($stdout, progname: 'Predictive Tests').tap do |l|
+      l.level = if @debug
+                  :debug
+                else
+                  # silence logger locally so output can be used in shell scripts
+                  @ci ? :info : :error
+                end
+
+      l.formatter = proc do |severity, _datetime, progname, msg|
+        # remove datetime to keep more neat cli like output
+        "[#{progname}] #{severity}: #{msg}\n"
+      end
+    end
+  end
+
+  def mapping_fetcher
+    @mapping_fetcher ||= Tooling::PredictiveTests::MappingFetcher.new(logger: logger)
+  end
+
+  def test_mapping_file
+    return unless @with_crystalball_mappings
+
+    @test_mapping_file ||= mapping_fetcher.fetch_rspec_mappings(
+      File.join(Dir.tmpdir, 'crystalball_mapping.json'),
+      type: @mapping_type
+    )
+  end
+
+  def frontend_fixtures_mapping_file
+    return unless @with_frontend_fixture_mappings
+
+    @frontend_fixtures_mapping_file ||= mapping_fetcher.fetch_frontend_fixtures_mappings(
+      @frontend_fixtures_mapping_path
+    )
+  end
+
+  def changed_file_list
+    @changed_file_list ||= if @changed_files
+                             @changed_files.split(" ")
+                           else
+                             Tooling::PredictiveTests::ChangedFiles.fetch(
+                               frontend_fixtures_file: frontend_fixtures_mapping_file
+                             )
+                           end
+  end
+
+  def test_selector
+    @test_selector ||= Tooling::PredictiveTests::TestSelector.new(
+      changed_files: changed_file_list,
+      rspec_test_mapping_path: test_mapping_file,
+      logger: logger
+    )
+  end
+
+  def rspec_spec_list
+    @rspec_spec_list ||= test_selector.rspec_spec_list
+  end
+
+  def js_spec_list
+    @js_spec_list ||= test_selector.js_spec_list
+  end
+
+  # rubocop:disable Gitlab/Json -- non rails
+  def create_output_files
+    # Used by frontend related pipelines/jobs
+    save_output(changed_file_list.join("\n"), @changed_files_path) if valid_file_path?(@changed_files_path)
+
+    # Used by predictive rspec pipelines
+    if valid_file_path?(@matching_foss_rspec_test_files_path)
+      list = rspec_spec_list.select { |f| f.start_with?("spec/") && File.exist?(f) }
+      save_output(list.join(" "), @matching_foss_rspec_test_files_path)
+      logger.info("Following foss rspec tests saved: #{JSON.pretty_generate(list)}")
+    end
+
+    if valid_file_path?(@matching_ee_rspec_test_files_path)
+      list = rspec_spec_list.select { |f| f.start_with?("ee/spec/") && File.exist?(f) }
+      save_output(list.join(" "), @matching_ee_rspec_test_files_path)
+      logger.info("Following ee rspec tests saved: #{JSON.pretty_generate(list)}")
+    end
+
+    return unless valid_file_path?(@matching_jest_test_files_path)
+
+    save_output(js_spec_list.join(" "), @matching_jest_test_files_path)
+  end
+  # rubocop:enable Gitlab/Json
+
+  def save_output(output, file_path)
+    logger.debug("Writing #{file_path}")
+    FileUtils.mkdir_p(File.dirname(file_path))
+    File.write(file_path, output)
+  end
+
+  def valid_file_path?(file_path)
+    !(file_path.nil? || file_path.empty?)
+  end
 end
 
-if options[:export_rspec_metrics]
-  require_relative '../lib/tooling/predictive_tests/metrics_exporter'
+if __FILE__ == $PROGRAM_NAME
+  require 'optparse'
 
-  validate_required_env_variables!(%w[
-    GLCI_ALL_FAILED_RSPEC_TESTS_FILE
-    GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR
-  ])
+  options = {}
+  OptionParser.new do |opts|
+    opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
 
-  Tooling::PredictiveTests::MetricsExporter.new(
-    rspec_all_failed_tests_file: ENV['GLCI_ALL_FAILED_RSPEC_TESTS_FILE'],
-    output_dir: ENV['GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR']
-  ).execute
-end
-
-if options[:export_jest_metrics]
-  require_relative '../lib/tooling/predictive_tests/frontend_metrics_exporter'
-  validate_required_env_variables!(%w[
-    JEST_MATCHING_TEST_FILES_PATH
-    GLCI_JEST_FAILED_TESTS_FILE
-    GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR
-  ])
-
-  Tooling::PredictiveTests::FrontendMetricsExporter.new(
-    rspec_changed_files_path: ENV['RSPEC_CHANGED_FILES_PATH'],
-    rspec_matching_js_files_path: ENV['RSPEC_MATCHING_JS_FILES_PATH'],
-    jest_failed_test_files_path: ENV['GLCI_JEST_FAILED_TESTS_FILE'],
-    output_dir: ENV['GLCI_PREDICTIVE_TEST_METRICS_OUTPUT_DIR']
-  ).execute
+    opts.on('--ci', 'Enable more verbose logging instead of returning list of tests to stdout') do
+      options[:ci] = true
+    end
+
+    opts.on('--debug', 'Enable debug log level') do
+      options[:debug] = true
+    end
+
+    opts.on('--changed-files [string]', String, 'Manual space separated list of changed files.') do |value|
+      options[:changed_files] = value
+    end
+
+    opts.on('--changed-files-path [string]', String, 'Path to save list of calculated changed files') do |value|
+      options[:changed_files_path] = value
+    end
+
+    opts.on('--with-crystalball-mappings', 'Download crystalball mappings for rspec tests') do
+      options[:with_crystalball_mappings] = true
+    end
+
+    opts.on('--mapping-type [string]', String, 'Crystalball mapping type, coverage or described_class') do |value|
+      options[:mapping_type] = value
+    end
+
+    opts.on('--with-frontend-fixture-mappings', 'Download frontend fixture mappings') do
+      options[:with_frontend_fixture_mappings] = true
+    end
+
+    opts.on('--frontend-fixtures-mapping-path [string]', String, 'Path to save frontend fixtures mappings') do |value|
+      options[:frontend_fixtures_mapping_path] = value
+    end
+
+    opts.on('--matching-foss-rspec-test-files-path [string]', String, 'Path for list of foss rspec tests') do |value|
+      options[:matching_foss_rspec_test_files_path] = value
+    end
+
+    opts.on('--matching-ee-rspec-test-files-path [string]', String, 'Path for list of ee rspec tests') do |value|
+      options[:matching_ee_rspec_test_files_path] = value
+    end
+
+    opts.on('--matching-jest-test-files-path [string]', String, 'File to save list of matching rspec tests') do |value|
+      options[:matching_jest_test_files_path] = value
+    end
+
+    opts.on('-h', '--help', 'Show this help message') do
+      puts opts
+      exit
+    end
+  end.parse!
+
+  PredictiveTests.new(options).execute
 end
diff --git a/yarn.lock b/yarn.lock
index 8920c505126..66886900039 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1425,7 +1425,7 @@
   resolved "https://registry.yarnpkg.com/@gitlab/fonts/-/fonts-1.3.0.tgz#df89c1bb6714e4a8a5d3272568aa4de7fb337267"
   integrity sha512-DoMUIN3DqjEn7wvcxBg/b7Ite5fTdF5EmuOZoBRo2j0UBGweDXmNBi+9HrTZs4cBU660dOxcf1hATFcG3npbPg==
 
-"@gitlab/noop@^1.0.1":
+"@gitlab/noop@^1.0.1", jackspeak@^3.1.2, "jackspeak@npm:@gitlab/noop@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.1.tgz#71a831146ee02732b4a61d2d3c11204564753454"
   integrity sha512-s++4wjMYeDvBp9IO59DBrWjy8SE/gFkjTDO5ck2W0S6Vv7OlqgErwL7pHngAnrSmTJAzyUG8wHGqo0ViS4jn5Q==
@@ -1444,10 +1444,10 @@
     stylelint-declaration-strict-value "1.10.4"
     stylelint-scss "6.0.0"
 
-"@gitlab/svgs@3.138.0":
-  version "3.138.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.138.0.tgz#5db6d76ceedcf3716e9ce624b272a58052d8d121"
-  integrity sha512-Jzd7GhmKxsQdCTttOe6C4AjqGvq8L91N6uUYnAmwnLGeY3aRD12BKBSgId5FrTH6rvk2w36o1+AwIqP+YuHV4g==
+"@gitlab/svgs@3.141.0":
+  version "3.141.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.141.0.tgz#0be316b5dfdcbac0796c9b71b941740bccb89ec6"
+  integrity sha512-xLrEY14dc1jGknP4tZ5SgrGojDsmkI7S2sii83MBqwdqy9QQ3DWxdreeClQkBDXC/A6wDTbJAN0U4ebGBX7Y7w==
 
 "@gitlab/ui@115.5.0":
   version "115.5.0"
@@ -9495,11 +9495,6 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jackspeak@^3.1.2, "jackspeak@npm:@gitlab/noop@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.1.tgz#71a831146ee02732b4a61d2d3c11204564753454"
-  integrity sha512-s++4wjMYeDvBp9IO59DBrWjy8SE/gFkjTDO5ck2W0S6Vv7OlqgErwL7pHngAnrSmTJAzyUG8wHGqo0ViS4jn5Q==
-
 jed@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz#7a549bbd9ffe1585b0cd0a191e203055bee574b4"