From dc980bd29b1cede73aa59de97a5a3713dc84fa94 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 2 Dec 2024 06:18:44 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 GITALY_SERVER_VERSION                         |   2 +-
 GITLAB_KAS_VERSION                            |   2 +-
 .../components/value_stream_filters.vue       |   2 +-
 .../components/devops_score.vue               |   2 +-
 .../admin/jobs_table/admin_jobs_table_app.vue |   2 +-
 .../ci/artifacts/components/artifact_row.vue  |   5 +-
 .../components/artifacts_bulk_delete.vue      |   2 +-
 .../list/ci_resources_list_item.vue           |   2 +-
 .../ci/jobs_page/jobs_page_app.vue            |   2 +-
 .../editor/ci_config_merged_preview.vue       |   2 +-
 .../components/editor/ci_editor_header.vue    |   2 +-
 .../components/editor/text_editor.vue         |   2 +-
 .../components/lint/ci_lint_results.vue       |   2 +-
 .../components/empty_state/ci_templates.vue   |   2 +-
 .../runner/components/runner_bulk_delete.vue  |   2 +-
 .../ci/runner/components/runner_details.vue   |   2 +-
 .../ci/runner/components/runner_groups.vue    |   2 +-
 .../ci/runner/components/runner_projects.vue  |   4 +-
 app/assets/javascripts/ci/runner/constants.js |   2 +-
 .../components/activity_events_list.vue       |   2 +-
 .../clusters/agents/components/show.vue       |   4 +-
 .../agents/components/token_table.vue         |   2 +-
 .../components/content_editor.vue             |   2 +-
 .../components/formatting_toolbar.vue         |   2 +-
 .../components/wrappers/code_block.vue        |   2 +-
 .../components/wrappers/html_comment.vue      |   2 +-
 .../components/wrappers/table_of_contents.vue |   2 +-
 .../extensions/table_of_contents.js           |   2 +-
 .../deploy_keys/components/key.vue            |   2 +-
 .../deploy_keys/components/keys_panel.vue     |   2 +-
 .../javascripts/emoji/components/picker.vue   |   2 +-
 .../components/environment_folder.vue         |   6 +-
 .../components/environments_app.vue           |   2 +-
 .../components/new_environment_item.vue       |   4 +-
 .../folder/environments_folder_app.vue        |   4 +-
 .../feature_flags/components/strategy.vue     |   2 +-
 .../cloudsql/create_instance_form.vue         |   2 +-
 .../google_cloud/gcp_regions/form.vue         |   2 +-
 .../google_cloud/service_accounts/form.vue    |   2 +-
 .../import_groups/components/import_table.vue |   2 +-
 .../components/import_target_cell.vue         |   2 +-
 .../components/github_status_table.vue        |   2 +-
 .../edit/components/override_dropdown.vue     |   2 +-
 .../issues/show/components/app.vue            |   2 +-
 .../incidents/create_timeline_event.vue       |   2 +-
 .../incidents/edit_timeline_event.vue         |   2 +-
 .../components/incidents/highlight_bar.vue    |   2 +-
 .../jira_connect/branches/pages/index.vue     |   2 +-
 .../add_namespace_modal/groups_list.vue       |   2 +-
 .../add_namespace_modal/groups_list_item.vue  |   2 +-
 .../subscriptions/components/app.vue          |   2 +-
 .../components/workload_details.vue           |   2 +-
 .../components/workload_details_item.vue      |   2 +-
 .../language_switcher/components/app.vue      |   2 +-
 .../ml/model_registry/apps/show_ml_model.vue  |  17 +
 .../discussion_notes_replies_wrapper.vue      |   2 +-
 .../components/manifests_list.vue             |   2 +-
 .../details/additional_metadata_loader.vue    |   2 +-
 .../project/components/expiration_input.vue   |   2 +-
 .../permissions/components/settings_panel.vue |   4 +-
 .../wikis/components/table_of_contents.vue    |   2 +-
 .../pipeline_wizard/components/wrapper.vue    |   2 +-
 .../profile/components/overview_tab.vue       |   4 +-
 .../components/view/protection_row.vue        |   2 +-
 .../releases/components/release_block.vue     |   4 +-
 .../repository/components/fork_suggestion.vue |   2 +-
 .../components/training_provider_list.vue     |   2 +-
 .../components/time_tracking/help_state.vue   |   2 +-
 .../super_sidebar/components/counter.vue      |   2 +-
 .../super_sidebar/components/flyout_menu.vue  |   2 +-
 .../todos/components/todos_app.vue            |   2 +-
 .../user_lists/components/edit_user_list.vue  |   2 +-
 .../user_lists/components/new_user_list.vue   |   2 +-
 .../user_lists/components/user_list.vue       |   4 +-
 .../user_lists/components/user_list_form.vue  |   2 +-
 .../components/user_lists_table.vue           |   2 +-
 .../components/sidebar/sidebar_assignees.vue  |   2 +-
 .../components/sidebar/sidebar_header.vue     |   2 +-
 .../components/sidebar/sidebar_status.vue     |   2 +-
 .../components/system_notes/system_note.vue   |   2 +-
 .../constants.js                              |   2 +-
 .../components/registry/details_row.vue       |   2 +-
 .../components/registry/list_item.vue         |   6 +-
 .../components/settings/settings_block.vue    |  12 +-
 .../new_namespace/components/welcome.vue      |   2 +-
 .../new_namespace/new_namespace_page.vue      |   2 +-
 .../whats_new/components/feature.vue          |   2 +-
 .../stylesheets/framework/super_sidebar.scss  |  10 +-
 app/views/explore/projects/topic.html.haml    |   2 +-
 ...roup_from_another_instance_panel.html.haml |   4 +-
 .../_import_group_from_file_panel.html.haml   |   4 +-
 app/views/groups/new.html.haml                |   2 +-
 app/views/groups/settings/_advanced.html.haml |   2 +-
 app/views/groups/settings/_transfer.html.haml |   2 +-
 app/views/import/github/new.html.haml         |   2 +-
 app/views/import/github/status.html.haml      |   2 +-
 app/views/projects/blame/show.html.haml       |   2 +-
 .../issues/_design_management.html.haml       |   2 +-
 app/views/shared/_divider.html.haml           |   4 +-
 app/views/shared/_md_preview.html.haml        |   2 +-
 doc/integration/index.md                      |   2 +-
 locale/gitlab.pot                             |   3 +
 qa/knapsack/master_report.json                | 503 +++++++++---------
 scripts/verify-tff-mapping                    |  23 +-
 .../table_of_contents_spec.js.snap            |   2 +-
 .../components/wrappers/html_comment_spec.js  |   4 +-
 .../components/deployment_aside_spec.js       |   4 +-
 .../issues/show/components/app_spec.js        |   2 +-
 .../model_registry/apps/show_ml_model_spec.js |  36 +-
 .../__snapshots__/file_sha_spec.js.snap       |   2 +-
 .../package_list_row_spec.js.snap             |   2 +-
 .../__snapshots__/file_sha_spec.js.snap       |   2 +-
 .../package_list_row_spec.js.snap             |   2 +-
 .../components/registry/details_row_spec.js   |   2 +-
 .../components/registry/list_item_spec.js     |   8 +-
 .../lib/tooling/predictive_tests_spec.rb      |   9 +-
 tests.yml                                     |  12 +
 117 files changed, 487 insertions(+), 397 deletions(-)

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index f03a34b9064..e377716b3b3 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-25020130cc7c734d56bc729cba1134f7de89cb7c
+96b154da1923b73abd2c3f8fa9a932e5c371e75c
diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index a3c93503315..7d55e729f79 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-4fe9bfd64a3a6ed177743db3f0905aaffb2c10c2
+7d833696b8717ca3de55d1bf7fd8db0fd1415c52
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
index f0e8a6babb7..e94a65b55a1 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
@@ -130,7 +130,7 @@ export default {
 </script>
 <template>
   <div
-    class="gl-mt-3 gl-border-b-1 gl-border-t-1 gl-border-gray-100 gl-bg-gray-10 gl-px-3 gl-py-5 gl-border-b-solid gl-border-t-solid"
+    class="gl-mt-3 gl-border-b-1 gl-border-t-1 gl-border-default gl-bg-gray-10 gl-px-3 gl-py-5 gl-border-b-solid gl-border-t-solid"
   >
     <filter-bar
       data-testid="vsa-filter-bar"
diff --git a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
index 86701f57381..0b38990d421 100644
--- a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
+++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
@@ -97,7 +97,7 @@ export default {
       <gl-table-lite
         :fields="$options.tableHeaderFields"
         :items="devopsScoreMetrics.cards"
-        thead-class="gl-border-t-0 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100"
+        thead-class="gl-border-t-0 gl-border-b-solid gl-border-b-1 gl-border-b-default"
         stacked="sm"
       >
         <template #cell(usage)="{ item }">
diff --git a/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue b/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue
index f3d7a45c7a2..dc5528d4e4d 100644
--- a/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue
+++ b/app/assets/javascripts/ci/admin/jobs_table/admin_jobs_table_app.vue
@@ -35,7 +35,7 @@ export default {
     cancelableJobsErrorMsg: CANCELABLE_JOBS_ERROR_MSG,
   },
   filterSearchBoxStyles:
-    'gl-my-0 gl-p-5 gl-bg-gray-10 gl-text-default gl-border-b gl-border-gray-100',
+    'gl-my-0 gl-p-5 gl-bg-gray-10 gl-text-default gl-border-b gl-border-default',
   components: {
     JobsSkeletonLoader,
     JobsTableEmptyState,
diff --git a/app/assets/javascripts/ci/artifacts/components/artifact_row.vue b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue
index 8d8cd32e519..99fa9005ea0 100644
--- a/app/assets/javascripts/ci/artifacts/components/artifact_row.vue
+++ b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue
@@ -81,10 +81,7 @@ export default {
 };
 </script>
 <template>
-  <div
-    class="gl-py-4"
-    :class="{ 'gl-border-b-1 gl-border-gray-100 gl-border-b-solid': !isLastRow }"
-  >
+  <div class="gl-py-4" :class="{ 'gl-border-b-1 gl-border-default gl-border-b-solid': !isLastRow }">
     <div class="gl-inline-flex gl-w-full gl-items-center">
       <span v-if="canBulkDestroyArtifacts" class="gl-pl-5">
         <gl-form-checkbox
diff --git a/app/assets/javascripts/ci/artifacts/components/artifacts_bulk_delete.vue b/app/assets/javascripts/ci/artifacts/components/artifacts_bulk_delete.vue
index d842a27dd9d..425dfcf13bb 100644
--- a/app/assets/javascripts/ci/artifacts/components/artifacts_bulk_delete.vue
+++ b/app/assets/javascripts/ci/artifacts/components/artifacts_bulk_delete.vue
@@ -45,7 +45,7 @@ export default {
 
     <div
       v-if="selectedArtifacts.length > 0"
-      class="gl-my-4 gl-border-1 gl-border-solid gl-border-gray-100 gl-p-4"
+      class="gl-my-4 gl-border-1 gl-border-solid gl-border-default gl-p-4"
       data-testid="bulk-delete-container"
     >
       <div class="gl-flex gl-items-center">
diff --git a/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue b/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue
index 00d579edbeb..6078b25bfec 100644
--- a/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue
+++ b/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue
@@ -150,7 +150,7 @@ export default {
 </script>
 <template>
   <li
-    class="gl-flex gl-items-center gl-border-b-1 gl-border-gray-100 gl-py-3 gl-text-subtle gl-border-b-solid"
+    class="gl-flex gl-items-center gl-border-b-1 gl-border-default gl-py-3 gl-text-subtle gl-border-b-solid"
     data-testid="catalog-resource-item"
   >
     <gl-avatar
diff --git a/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue b/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue
index 6a2fca992a4..39597266af8 100644
--- a/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue
+++ b/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue
@@ -23,7 +23,7 @@ export default {
     loadingAriaLabel: __('Loading'),
   },
   filterSearchBoxStyles:
-    'gl-my-0 gl-p-5 gl-bg-gray-10 gl-text-default gl-border-b gl-border-gray-100',
+    'gl-my-0 gl-p-5 gl-bg-gray-10 gl-text-default gl-border-b gl-border-default',
   components: {
     GlAlert,
     GlKeysetPagination,
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue
index 864a9e8b5f7..db2302727d9 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_config_merged_preview.vue
@@ -40,7 +40,7 @@ export default {
       <gl-icon class="gl-mr-3" :size="16" name="lock" variant="subtle" />
       {{ $options.i18n.viewOnlyMessage }}
     </div>
-    <div class="gl-mt-3 gl-border-1 gl-border-solid gl-border-gray-100">
+    <div class="gl-mt-3 gl-border-1 gl-border-solid gl-border-default">
       <source-editor
         ref="editor"
         :value="mergedYaml"
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue
index 7e5e5be5965..1d89d62018c 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue
@@ -61,7 +61,7 @@ export default {
 
 <template>
   <div
-    class="gl-flex gl-flex-col gl-gap-3 gl-border-1 gl-border-solid gl-border-gray-100 gl-p-3 md:gl-flex-row"
+    class="gl-flex gl-flex-col gl-gap-3 gl-border-1 gl-border-solid gl-border-default gl-p-3 md:gl-flex-row"
   >
     <slot></slot>
     <gl-button
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue b/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue
index a44450398f3..c12eb771381 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue
@@ -40,7 +40,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-border-1 !gl-border-t-0 gl-border-solid gl-border-gray-100">
+  <div class="gl-border-1 !gl-border-t-0 gl-border-solid gl-border-default">
     <source-editor
       ref="editor"
       :debounce-value="$options.debounceValue"
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/lint/ci_lint_results.vue b/app/assets/javascripts/ci/pipeline_editor/components/lint/ci_lint_results.vue
index 9a9b6aa54ae..9b70ecde931 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/lint/ci_lint_results.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/lint/ci_lint_results.vue
@@ -5,7 +5,7 @@ import CiLintResultsParam from './ci_lint_results_param.vue';
 import CiLintResultsValue from './ci_lint_results_value.vue';
 import CiLintWarnings from './ci_lint_warnings.vue';
 
-const thBorderColor = '!gl-border-gray-100';
+const thBorderColor = '!gl-border-default';
 
 export default {
   correct: {
diff --git a/app/assets/javascripts/ci/pipelines_page/components/empty_state/ci_templates.vue b/app/assets/javascripts/ci/pipelines_page/components/empty_state/ci_templates.vue
index 54026f02805..98b30464812 100644
--- a/app/assets/javascripts/ci/pipelines_page/components/empty_state/ci_templates.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/empty_state/ci_templates.vue
@@ -66,7 +66,7 @@ export default {
   <ul class="gl-list-none gl-pl-0">
     <li v-for="template in templates" :key="template.name">
       <div
-        class="gl-flex gl-items-center gl-justify-between gl-border-b-1 gl-border-b-gray-100 gl-pb-3 gl-pt-3 gl-border-b-solid"
+        class="gl-flex gl-items-center gl-justify-between gl-border-b-1 gl-border-b-default gl-pb-3 gl-pt-3 gl-border-b-solid"
       >
         <div class="gl-flex gl-flex-row gl-items-center">
           <gl-avatar
diff --git a/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue b/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue
index c82947e7faf..f504aeea46a 100644
--- a/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue
@@ -166,7 +166,7 @@ export default {
     <div
       v-if="checkedCount"
       data-testid="runner-bulk-delete-banner"
-      class="gl-my-4 gl-border-1 gl-border-solid gl-border-gray-100 gl-p-4"
+      class="gl-my-4 gl-border-1 gl-border-solid gl-border-default gl-p-4"
     >
       <div class="gl-flex gl-items-center">
         <div>
diff --git a/app/assets/javascripts/ci/runner/components/runner_details.vue b/app/assets/javascripts/ci/runner/components/runner_details.vue
index c959921cf5e..15420f4d844 100644
--- a/app/assets/javascripts/ci/runner/components/runner_details.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_details.vue
@@ -137,7 +137,7 @@ export default {
         </runner-detail>
 
         <runner-maintenance-note-detail
-          class="gl-border-t-1 gl-border-t-gray-100 gl-pt-4 gl-border-t-solid"
+          class="gl-border-t-1 gl-border-t-default gl-pt-4 gl-border-t-solid"
           :value="runner.maintenanceNoteHtml"
         />
 
diff --git a/app/assets/javascripts/ci/runner/components/runner_groups.vue b/app/assets/javascripts/ci/runner/components/runner_groups.vue
index 49c677c735d..c80507db9c2 100644
--- a/app/assets/javascripts/ci/runner/components/runner_groups.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_groups.vue
@@ -20,7 +20,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid">
+  <div class="gl-border-t-1 gl-border-t-default gl-border-t-solid">
     <h3 class="gl-mb-0 gl-mt-5 gl-text-lg">{{ s__('Runners|Assigned Group') }}</h3>
     <template v-if="groups.length">
       <runner-assigned-item
diff --git a/app/assets/javascripts/ci/runner/components/runner_projects.vue b/app/assets/javascripts/ci/runner/components/runner_projects.vue
index 44101f33596..a2f13fd60ec 100644
--- a/app/assets/javascripts/ci/runner/components/runner_projects.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_projects.vue
@@ -104,7 +104,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid">
+  <div class="gl-border-t-1 gl-border-t-default gl-border-t-solid">
     <h3 class="gl-mt-5 gl-text-lg">
       {{ heading }}
     </h3>
@@ -125,7 +125,7 @@ export default {
       <runner-assigned-item
         v-for="(project, i) in projects.items"
         :key="project.id"
-        :class="{ 'gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid': i !== 0 }"
+        :class="{ 'gl-border-t-1 gl-border-t-default gl-border-t-solid': i !== 0 }"
         :href="project.webUrl"
         :name="project.name"
         :full-name="project.nameWithNamespace"
diff --git a/app/assets/javascripts/ci/runner/constants.js b/app/assets/javascripts/ci/runner/constants.js
index 8962f7a19ce..f9e649ba942 100644
--- a/app/assets/javascripts/ci/runner/constants.js
+++ b/app/assets/javascripts/ci/runner/constants.js
@@ -15,7 +15,7 @@ export const I18N_CREATE_ERROR = s__(
 );
 
 export const FILTER_CSS_CLASSES =
-  'gl-bg-gray-10 gl-p-5 gl-border-solid gl-border-gray-100 gl-border-0 gl-border-t-1';
+  'gl-bg-gray-10 gl-p-5 gl-border-solid gl-border-default gl-border-0 gl-border-t-1';
 
 // Type
 
diff --git a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
index dab115376fc..8ee3586f08c 100644
--- a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
+++ b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
@@ -40,7 +40,7 @@ export default {
   emptyHelpLink: helpPagePath('user/clusters/agent/work_with_agent', {
     anchor: 'view-an-agents-activity-information',
   }),
-  borderClasses: 'gl-border-b-1 gl-border-b-solid gl-border-b-gray-100',
+  borderClasses: 'gl-border-b-1 gl-border-b-solid gl-border-b-default',
   apollo: {
     // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
     agentEvents: {
diff --git a/app/assets/javascripts/clusters/agents/components/show.vue b/app/assets/javascripts/clusters/agents/components/show.vue
index 7efa6e1120b..9355b9449dc 100644
--- a/app/assets/javascripts/clusters/agents/components/show.vue
+++ b/app/assets/javascripts/clusters/agents/components/show.vue
@@ -153,13 +153,13 @@ export default {
 
       <integration-status
         :tokens="tokens"
-        class="gl-border-t-1 gl-border-t-gray-100 gl-py-5 gl-border-t-solid"
+        class="gl-border-t-1 gl-border-t-default gl-py-5 gl-border-t-solid"
       />
 
       <gl-tabs
         sync-active-tab-with-query-params
         lazy
-        class="gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid"
+        class="gl-border-t-1 gl-border-t-default gl-border-t-solid"
       >
         <gl-tab :title="$options.i18n.activity" query-param-value="activity">
           <activity-events :agent-name="agentName" :project-path="projectPath" />
diff --git a/app/assets/javascripts/clusters/agents/components/token_table.vue b/app/assets/javascripts/clusters/agents/components/token_table.vue
index 70eb0bf08a2..8e182201459 100644
--- a/app/assets/javascripts/clusters/agents/components/token_table.vue
+++ b/app/assets/javascripts/clusters/agents/components/token_table.vue
@@ -104,7 +104,7 @@ export default {
         fixed
         stacked="md"
         head-variant="white"
-        thead-class="gl-border-b-solid gl-border-b-2 gl-border-b-gray-100"
+        thead-class="gl-border-b-solid gl-border-b-2 gl-border-b-default"
       >
         <template #cell(lastUsed)="{ item }">
           <time-ago-tooltip v-if="item.lastUsedAt" :time="item.lastUsedAt" />
diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue
index e29b491c0f6..984ef27f6dd 100644
--- a/app/assets/javascripts/content_editor/components/content_editor.vue
+++ b/app/assets/javascripts/content_editor/components/content_editor.vue
@@ -282,7 +282,7 @@ export default {
         <reference-bubble-menu />
       </div>
       <div
-        class="gl-border-t gl-flex gl-flex-row gl-items-center gl-justify-between gl-rounded-bl-base gl-rounded-br-base gl-border-gray-100 gl-px-2 gl-text-subtle"
+        class="gl-border-t gl-flex gl-flex-row gl-items-center gl-justify-between gl-rounded-bl-base gl-rounded-br-base gl-border-default gl-px-2 gl-text-subtle"
       >
         <editor-mode-switcher size="small" value="richText" @switch="handleEditorModeChanged" />
         <slot name="toolbar"></slot>
diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
index 085453fc223..7c00b3f77de 100644
--- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
+++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
@@ -78,7 +78,7 @@ export default {
 </script>
 <template>
   <div
-    class="gl-border-b gl-flex gl-w-full gl-flex-wrap gl-items-center gl-gap-y-2 gl-rounded-t-base gl-border-gray-100 gl-px-3 gl-py-3"
+    class="gl-border-b gl-flex gl-w-full gl-flex-wrap gl-items-center gl-gap-y-2 gl-rounded-t-base gl-border-default gl-px-3 gl-py-3"
     data-testid="formatting-toolbar"
   >
     <div class="gl-flex">
diff --git a/app/assets/javascripts/content_editor/components/wrappers/code_block.vue b/app/assets/javascripts/content_editor/components/wrappers/code_block.vue
index 91f7db00def..bc12ccedc55 100644
--- a/app/assets/javascripts/content_editor/components/wrappers/code_block.vue
+++ b/app/assets/javascripts/content_editor/components/wrappers/code_block.vue
@@ -175,7 +175,7 @@ export default {
         v-if="node.attrs.showPreview"
         :contenteditable="false"
         data-testid="sandbox-preview"
-        class="!-gl-ml-4 !-gl-mr-4 !-gl-mt-3 gl-mb-3 gl-border-b-1 gl-border-b-gray-100 !gl-bg-white gl-p-4 gl-border-b-solid"
+        class="!-gl-ml-4 !-gl-mr-4 !-gl-mt-3 gl-mb-3 gl-border-b-1 gl-border-b-default !gl-bg-white gl-p-4 gl-border-b-solid"
       >
         <sandboxed-mermaid v-if="node.attrs.language === 'mermaid'" :source="diagramSource" />
         <img v-else ref="diagramContainer" :src="diagramUrl" />
diff --git a/app/assets/javascripts/content_editor/components/wrappers/html_comment.vue b/app/assets/javascripts/content_editor/components/wrappers/html_comment.vue
index 46858268050..e109458c40a 100644
--- a/app/assets/javascripts/content_editor/components/wrappers/html_comment.vue
+++ b/app/assets/javascripts/content_editor/components/wrappers/html_comment.vue
@@ -25,7 +25,7 @@ export default {
     class="content-editor-placeholder-container gl-relative !gl-cursor-pointer gl-rounded-base gl-border-1 gl-p-3"
     :class="{
       'gl-border-solid gl-border-blue-400': selected,
-      'gl-border-dashed gl-border-gray-100': !selected,
+      'gl-border-dashed gl-border-default': !selected,
     }"
   >
     <span contenteditable="false" class="!gl-whitespace-pre-wrap gl-italic gl-text-subtle">{{
diff --git a/app/assets/javascripts/content_editor/components/wrappers/table_of_contents.vue b/app/assets/javascripts/content_editor/components/wrappers/table_of_contents.vue
index 2bb6c90e064..789469446f8 100644
--- a/app/assets/javascripts/content_editor/components/wrappers/table_of_contents.vue
+++ b/app/assets/javascripts/content_editor/components/wrappers/table_of_contents.vue
@@ -42,7 +42,7 @@ export default {
 <template>
   <node-view-wrapper
     as="ul"
-    class="table-of-contents gl-mb-5 gl-border-1 gl-border-solid gl-border-gray-100 !gl-p-4"
+    class="table-of-contents gl-mb-5 gl-border-1 gl-border-solid gl-border-default !gl-p-4"
     data-testid="table-of-contents"
   >
     {{ __('Table of contents') }}
diff --git a/app/assets/javascripts/content_editor/extensions/table_of_contents.js b/app/assets/javascripts/content_editor/extensions/table_of_contents.js
index 204426464ff..fb1e5a8ba89 100644
--- a/app/assets/javascripts/content_editor/extensions/table_of_contents.js
+++ b/app/assets/javascripts/content_editor/extensions/table_of_contents.js
@@ -25,7 +25,7 @@ export default Node.create({
       'div',
       {
         class:
-          'table-of-contents gl-border-1 gl-border-solid gl-text-center gl-border-gray-100 gl-mb-5',
+          'table-of-contents gl-border-1 gl-border-solid gl-text-center gl-border-default gl-mb-5',
       },
       __('Table of contents'),
     ];
diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue
index 77151cb0a1d..0cb76bc2022 100644
--- a/app/assets/javascripts/deploy_keys/components/key.vue
+++ b/app/assets/javascripts/deploy_keys/components/key.vue
@@ -115,7 +115,7 @@ export default {
 
 <template>
   <div
-    class="gl-responsive-table-row deploy-key gl-items-start !gl-border-gray-100 gl-bg-gray-10 md:gl-pl-5 md:gl-pr-5"
+    class="gl-responsive-table-row deploy-key gl-items-start !gl-border-default gl-bg-gray-10 md:gl-pl-5 md:gl-pr-5"
   >
     <div class="table-section section-40">
       <div role="rowheader" class="table-mobile-header gl-self-start gl-font-bold gl-text-gray-700">
diff --git a/app/assets/javascripts/deploy_keys/components/keys_panel.vue b/app/assets/javascripts/deploy_keys/components/keys_panel.vue
index f1cf03a5f79..e218b50bd1f 100644
--- a/app/assets/javascripts/deploy_keys/components/keys_panel.vue
+++ b/app/assets/javascripts/deploy_keys/components/keys_panel.vue
@@ -24,7 +24,7 @@ export default {
     <template v-if="keys.length > 0">
       <div
         role="row"
-        class="gl-responsive-table-row table-row-header !gl-border-gray-100 gl-bg-gray-10 gl-text-base gl-font-bold gl-text-strong md:gl-pl-5 md:gl-pr-5"
+        class="gl-responsive-table-row table-row-header !gl-border-default gl-bg-gray-10 gl-text-base gl-font-bold gl-text-strong md:gl-pl-5 md:gl-pr-5"
       >
         <div role="rowheader" class="table-section section-40">
           {{ s__('DeployKeys|Deploy key') }}
diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue
index 814b9025a7f..64cde31662e 100644
--- a/app/assets/javascripts/emoji/components/picker.vue
+++ b/app/assets/javascripts/emoji/components/picker.vue
@@ -189,7 +189,7 @@ export default {
       <div
         v-if="isVisible"
         v-show="!searchValue"
-        class="gl-flex gl-border-b-1 gl-border-gray-100 gl-border-b-solid"
+        class="gl-flex gl-border-b-1 gl-border-default gl-border-b-solid"
       >
         <gl-button
           v-for="(category, index) in categoryNames"
diff --git a/app/assets/javascripts/environments/components/environment_folder.vue b/app/assets/javascripts/environments/components/environment_folder.vue
index 00d1eaa2190..59e41c31132 100644
--- a/app/assets/javascripts/environments/components/environment_folder.vue
+++ b/app/assets/javascripts/environments/components/environment_folder.vue
@@ -104,7 +104,7 @@ export default {
 <template>
   <div
     :class="{ 'gl-pb-5': !visible }"
-    class="gl-border-1 gl-border-gray-100 gl-pt-3 gl-border-b-solid"
+    class="gl-border-1 gl-border-default gl-pt-3 gl-border-b-solid"
   >
     <div class="gl-flex gl-w-full gl-items-center gl-px-3">
       <gl-button
@@ -127,12 +127,12 @@ export default {
         :key="environment.name"
         :environment="environment"
         :class="{ 'gl-mt-5': isFirstEnvironment(index) }"
-        class="gl-border-1 gl-border-gray-100 gl-pt-3 gl-border-t-solid"
+        class="gl-border-1 gl-border-default gl-pt-3 gl-border-t-solid"
         in-folder
       />
       <div
         v-if="isMessageShowing"
-        class="gl-border-1 gl-border-gray-100 gl-bg-gray-10 gl-py-5 gl-text-center gl-border-t-solid"
+        class="gl-border-1 gl-border-default gl-bg-gray-10 gl-py-5 gl-text-center gl-border-t-solid"
         data-testid="environment-folder-message-element"
       >
         <gl-sprintf :message="$options.i18n.message">
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index d812d7735d8..4e5e9f25c07 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -328,7 +328,7 @@ export default {
       <environment-item
         v-for="environment in environments"
         :key="environment.name"
-        class="gl-mb-3 gl-border-1 gl-border-gray-100 gl-border-b-solid"
+        class="gl-mb-3 gl-border-1 gl-border-default gl-border-b-solid"
         :environment="environment.latest"
         @change="refetchEnvironments"
     /></template>
diff --git a/app/assets/javascripts/environments/components/new_environment_item.vue b/app/assets/javascripts/environments/components/new_environment_item.vue
index 9052963a849..c284329b4ec 100644
--- a/app/assets/javascripts/environments/components/new_environment_item.vue
+++ b/app/assets/javascripts/environments/components/new_environment_item.vue
@@ -169,7 +169,7 @@ export default {
     },
   },
   deploymentClasses: [
-    'gl-border-gray-100',
+    'gl-border-default',
     'gl-border-t-solid',
     'gl-border-1',
     'gl-py-5',
@@ -177,7 +177,7 @@ export default {
     'gl-bg-gray-10',
   ],
   deployBoardClasses: [
-    'gl-border-gray-100',
+    'gl-border-default',
     'gl-border-t-solid',
     'gl-border-1',
     'gl-py-4',
diff --git a/app/assets/javascripts/environments/folder/environments_folder_app.vue b/app/assets/javascripts/environments/folder/environments_folder_app.vue
index 5353b42f169..72985cd3cd2 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_app.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_app.vue
@@ -224,7 +224,7 @@ export default {
       <div
         v-for="n in lastRowCount"
         :key="`skeleton-box-${n}`"
-        class="gl-border-1 gl-border-gray-100 gl-py-5 gl-border-t-solid md:gl-pl-7"
+        class="gl-border-1 gl-border-default gl-py-5 gl-border-t-solid md:gl-pl-7"
       >
         <gl-skeleton-loader :lines="2" />
       </div>
@@ -243,7 +243,7 @@ export default {
         :id="environment.name"
         :key="index"
         :environment="environment"
-        class="gl-border-1 gl-border-gray-100 gl-pt-3 gl-border-t-solid"
+        class="gl-border-1 gl-border-default gl-pt-3 gl-border-t-solid"
         in-folder
       />
     </div>
diff --git a/app/assets/javascripts/feature_flags/components/strategy.vue b/app/assets/javascripts/feature_flags/components/strategy.vue
index 1b5234a03d8..48d4658d580 100644
--- a/app/assets/javascripts/feature_flags/components/strategy.vue
+++ b/app/assets/javascripts/feature_flags/components/strategy.vue
@@ -132,7 +132,7 @@ export default {
       {{ $options.i18n.considerFlexibleRollout }}
     </gl-alert>
 
-    <div class="gl-border-t-1 gl-border-t-gray-100 gl-py-6 gl-border-t-solid">
+    <div class="gl-border-t-1 gl-border-t-default gl-py-6 gl-border-t-solid">
       <div class="flex-md-wrap gl-flex gl-flex-col md:gl-flex-row">
         <div class="mr-5">
           <gl-form-group :label="$options.i18n.strategyTypeLabel" :label-for="strategyTypeId">
diff --git a/app/assets/javascripts/google_cloud/databases/cloudsql/create_instance_form.vue b/app/assets/javascripts/google_cloud/databases/cloudsql/create_instance_form.vue
index e7b65690750..4f2ad0d4f4c 100644
--- a/app/assets/javascripts/google_cloud/databases/cloudsql/create_instance_form.vue
+++ b/app/assets/javascripts/google_cloud/databases/cloudsql/create_instance_form.vue
@@ -44,7 +44,7 @@ export default {
 </script>
 <template>
   <div>
-    <header class="gl-my-5 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid">
+    <header class="gl-my-5 gl-border-b-1 gl-border-b-default gl-border-b-solid">
       <h2 class="gl-text-size-h1">{{ formTitle }}</h2>
       <p>{{ formDescription }}</p>
     </header>
diff --git a/app/assets/javascripts/google_cloud/gcp_regions/form.vue b/app/assets/javascripts/google_cloud/gcp_regions/form.vue
index 70aa91a4cf7..4e18286e1d2 100644
--- a/app/assets/javascripts/google_cloud/gcp_regions/form.vue
+++ b/app/assets/javascripts/google_cloud/gcp_regions/form.vue
@@ -24,7 +24,7 @@ export default {
 
 <template>
   <div>
-    <header class="gl-my-5 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid">
+    <header class="gl-my-5 gl-border-b-1 gl-border-b-default gl-border-b-solid">
       <h1 class="gl-text-size-h1">{{ $options.i18n.title }}</h1>
     </header>
 
diff --git a/app/assets/javascripts/google_cloud/service_accounts/form.vue b/app/assets/javascripts/google_cloud/service_accounts/form.vue
index 405ecf7ec38..e1f54ffbb96 100644
--- a/app/assets/javascripts/google_cloud/service_accounts/form.vue
+++ b/app/assets/javascripts/google_cloud/service_accounts/form.vue
@@ -32,7 +32,7 @@ export default {
 
 <template>
   <div>
-    <header class="gl-my-5 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid">
+    <header class="gl-my-5 gl-border-b-1 gl-border-b-default gl-border-b-solid">
       <h2 class="gl-text-size-h1">{{ $options.i18n.title }}</h2>
     </header>
     <gl-form-group
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index 1da41b39ed3..174f2f6b3a9 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -664,7 +664,7 @@ export default {
 <template>
   <div>
     <div
-      class="gl-flex gl-items-center gl-border-0 gl-border-b-1 gl-border-solid gl-border-gray-100"
+      class="gl-flex gl-items-center gl-border-0 gl-border-b-1 gl-border-solid gl-border-default"
     >
       <h1 class="gl-my-0 gl-flex gl-items-center gl-gap-3 gl-py-4 gl-text-size-h1">
         <img :src="$options.gitlabLogo" class="gl-h-6 gl-w-6" />
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_target_cell.vue b/app/assets/javascripts/import_entities/import_groups/components/import_target_cell.vue
index 3f7648f8ff6..d8924eb8c51 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_target_cell.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_target_cell.vue
@@ -71,7 +71,7 @@ export default {
       <div
         class="gl-flex gl-h-7 gl-items-center gl-border-0 gl-border-b-1 gl-border-t-1 gl-border-solid gl-bg-gray-10 gl-px-3"
         :class="{
-          'gl-border-gray-100 gl-text-gray-400': !isPathSelectionAvailable,
+          'gl-border-default gl-text-gray-400': !isPathSelectionAvailable,
           'gl-border-gray-200': isPathSelectionAvailable,
         }"
       >
diff --git a/app/assets/javascripts/import_entities/import_projects/components/github_status_table.vue b/app/assets/javascripts/import_entities/import_projects/components/github_status_table.vue
index a0378956a16..0d0ce89de0b 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/github_status_table.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/github_status_table.vue
@@ -68,7 +68,7 @@ export default {
       <gl-tabs v-model="selectedRelationTypeTabIdx" content-class="!gl-py-0 gl-mb-3">
         <gl-tab v-for="tab in $options.relationTypes" :key="tab.title" :title="tab.title">
           <div
-            class="gl-flex gl-flex-wrap gl-justify-between gl-gap-3 gl-border-0 gl-border-b-1 gl-border-solid gl-border-b-gray-100 gl-bg-gray-10 gl-p-5"
+            class="gl-flex gl-flex-wrap gl-justify-between gl-gap-3 gl-border-0 gl-border-b-1 gl-border-solid gl-border-b-default gl-bg-gray-10 gl-p-5"
           >
             <form class="gl-mr-3 gl-flex gl-grow" novalidate @submit.prevent>
               <github-organizations-box
diff --git a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
index 2dbc47a1849..bb7f2121802 100644
--- a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
+++ b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
@@ -67,7 +67,7 @@ export default {
 
 <template>
   <div
-    class="gl-mb-6 gl-mt-5 gl-flex gl-items-baseline gl-justify-between gl-border-b-1 gl-border-t-1 gl-border-gray-100 gl-py-4 gl-border-b-solid gl-border-t-solid"
+    class="gl-mb-6 gl-mt-5 gl-flex gl-items-baseline gl-justify-between gl-border-b-1 gl-border-t-1 gl-border-default gl-py-4 gl-border-b-solid gl-border-t-solid"
   >
     <span
       >{{ description }}
diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue
index 76add3ecbb9..aa5e0d05b8b 100644
--- a/app/assets/javascripts/issues/show/components/app.vue
+++ b/app/assets/javascripts/issues/show/components/app.vue
@@ -295,7 +295,7 @@ export default {
 
     pinnedLinkClasses() {
       return this.showTitleBorder
-        ? 'gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid gl-mb-6'
+        ? 'gl-border-b-1 gl-border-b-default gl-border-b-solid gl-mb-6'
         : '';
     },
 
diff --git a/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue b/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue
index 32887391eca..696e29caaa8 100644
--- a/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue
@@ -110,7 +110,7 @@ export default {
   <div class="create-timeline-event gl-relative gl-flex gl-items-start">
     <div
       v-if="hasTimelineEvents"
-      class="gl-z-1 gl-mt-2 gl-flex gl-h-8 gl-w-8 gl-shrink-0 gl-items-center gl-justify-center gl-self-start gl-rounded-full gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-white gl-p-3 gl-text-gray-200"
+      class="gl-z-1 gl-mt-2 gl-flex gl-h-8 gl-w-8 gl-shrink-0 gl-items-center gl-justify-center gl-self-start gl-rounded-full gl-border-1 gl-border-solid gl-border-default gl-bg-white gl-p-3 gl-text-gray-200"
     >
       <gl-icon name="comment" class="note-icon" />
     </div>
diff --git a/app/assets/javascripts/issues/show/components/incidents/edit_timeline_event.vue b/app/assets/javascripts/issues/show/components/incidents/edit_timeline_event.vue
index 91c24d35927..6c4aaea26b8 100644
--- a/app/assets/javascripts/issues/show/components/incidents/edit_timeline_event.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/edit_timeline_event.vue
@@ -30,7 +30,7 @@ export default {
 <template>
   <div class="edit-timeline-event gl-relative gl-flex gl-items-center">
     <div
-      class="gl-z-1 gl-mt-2 gl-flex gl-h-8 gl-w-8 gl-items-center gl-justify-center gl-self-start gl-rounded-full gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-white gl-text-gray-200"
+      class="gl-z-1 gl-mt-2 gl-flex gl-h-8 gl-w-8 gl-items-center gl-justify-center gl-self-start gl-rounded-full gl-border-1 gl-border-solid gl-border-default gl-bg-white gl-text-gray-200"
     >
       <gl-icon name="comment" class="note-icon" />
     </div>
diff --git a/app/assets/javascripts/issues/show/components/incidents/highlight_bar.vue b/app/assets/javascripts/issues/show/components/incidents/highlight_bar.vue
index 47b6032e876..1130b395b27 100644
--- a/app/assets/javascripts/issues/show/components/incidents/highlight_bar.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/highlight_bar.vue
@@ -39,7 +39,7 @@ export default {
 <template>
   <div
     v-show="showHighlightBar"
-    class="gl-mb-3 gl-flex gl-flex-col gl-justify-between gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-p-5 sm:gl-flex-row"
+    class="gl-mb-3 gl-flex gl-flex-col gl-justify-between gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-p-5 sm:gl-flex-row"
   >
     <div v-if="alert" class="gl-mr-3">
       <span class="gl-font-bold">{{ s__('HighlightBar|Original alert:') }}</span>
diff --git a/app/assets/javascripts/jira_connect/branches/pages/index.vue b/app/assets/javascripts/jira_connect/branches/pages/index.vue
index 218a73420e7..81bc6ff8819 100644
--- a/app/assets/javascripts/jira_connect/branches/pages/index.vue
+++ b/app/assets/javascripts/jira_connect/branches/pages/index.vue
@@ -46,7 +46,7 @@ export default {
 </script>
 <template>
   <div>
-    <div class="gl-mb-5 gl-mt-7 gl-border-1 gl-border-gray-100 gl-border-b-solid">
+    <div class="gl-mb-5 gl-mt-7 gl-border-1 gl-border-default gl-border-b-solid">
       <h1 data-testid="page-title" class="page-title gl-text-size-h-display">{{ pageTitle }}</h1>
     </div>
 
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
index 0f798d67964..ae2270252ae 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
@@ -133,7 +133,7 @@ export default {
     </div>
     <ul
       v-else
-      class="gl-list-none gl-border-t-1 gl-border-t-gray-100 gl-pl-0 gl-border-t-solid"
+      class="gl-list-none gl-border-t-1 gl-border-t-default gl-pl-0 gl-border-t-solid"
       :class="{ 'gl-opacity-5': isLoadingMore }"
       data-testid="groups-list"
     >
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list_item.vue b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list_item.vue
index d30bcdef2db..6fb343ee113 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list_item.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list_item.vue
@@ -50,7 +50,7 @@ export default {
 </script>
 
 <template>
-  <li class="gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid">
+  <li class="gl-border-b-1 gl-border-b-default gl-border-b-solid">
     <div class="gl-flex gl-items-center gl-py-3">
       <div class="gl-flex-shrink-1 gl-flex gl-min-w-0 gl-grow gl-items-center">
         <div class="gl-flex-shrink-1 gl-min-w-0 gl-grow">
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/app.vue b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue
index 59937aec3f3..b0e34d4cb14 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/app.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue
@@ -98,7 +98,7 @@ export default {
 <template>
   <div>
     <header
-      class="jira-connect-header gl-flex gl-items-center gl-justify-center gl-border-b-1 gl-border-b-gray-100 gl-bg-white gl-px-5 gl-border-b-solid"
+      class="jira-connect-header gl-flex gl-items-center gl-justify-center gl-border-b-1 gl-border-b-default gl-bg-white gl-px-5 gl-border-b-solid"
     >
       <gl-link :href="gitlabUrl" target="_blank">
         <img :src="gitlabLogo" class="gl-h-6" :alt="__('GitLab')" />
diff --git a/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue b/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue
index d05da4dfdce..49567c67a47 100644
--- a/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue
+++ b/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue
@@ -195,7 +195,7 @@ export default {
         :key="index"
         class="gl-flex gl-items-center gl-justify-between gl-px-5 gl-py-3"
         :class="{
-          'gl-border-t-1 gl-border-t-gray-100 gl-border-t-solid': index > 0,
+          'gl-border-t-1 gl-border-t-default gl-border-t-solid': index > 0,
         }"
       >
         {{ container.name }}
diff --git a/app/assets/javascripts/kubernetes_dashboard/components/workload_details_item.vue b/app/assets/javascripts/kubernetes_dashboard/components/workload_details_item.vue
index e8873dac9dc..e3b85f52602 100644
--- a/app/assets/javascripts/kubernetes_dashboard/components/workload_details_item.vue
+++ b/app/assets/javascripts/kubernetes_dashboard/components/workload_details_item.vue
@@ -44,7 +44,7 @@ export default {
 </script>
 
 <template>
-  <li class="gl-border-b-2 gl-border-b-gray-100 gl-py-3 gl-leading-20 gl-border-b-solid">
+  <li class="gl-border-b-2 gl-border-b-default gl-py-3 gl-leading-20 gl-border-b-solid">
     <div
       :class="{
         'gl-flex gl-flex-wrap gl-items-center gl-justify-between': collapsible,
diff --git a/app/assets/javascripts/language_switcher/components/app.vue b/app/assets/javascripts/language_switcher/components/app.vue
index 666673d625e..a5f233068b5 100644
--- a/app/assets/javascripts/language_switcher/components/app.vue
+++ b/app/assets/javascripts/language_switcher/components/app.vue
@@ -58,7 +58,7 @@ export default {
     </template>
     <template #footer>
       <div
-        class="gl-flex gl-justify-center gl-border-t-1 gl-border-t-gray-100 gl-p-3 gl-border-t-solid"
+        class="gl-flex gl-justify-center gl-border-t-1 gl-border-t-default gl-p-3 gl-border-t-solid"
         data-testid="footer"
       >
         <gl-link :href="$options.HELP_TRANSLATE_HREF">{{ $options.HELP_TRANSLATE_MSG }}</gl-link>
diff --git a/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue b/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue
index ef3f24abcc5..27346956a83 100644
--- a/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue
+++ b/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue
@@ -13,12 +13,14 @@ import getModelQuery from '~/ml/model_registry/graphql/queries/get_model.query.g
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
+import CandidateList from '~/ml/model_registry/components/candidate_list.vue';
 import DeleteModelDisclosureDropdownItem from '../components/delete_model_disclosure_dropdown_item.vue';
 import LoadOrErrorOrShow from '../components/load_or_error_or_show.vue';
 import DeleteModel from '../components/functional/delete_model.vue';
 
 const ROUTE_DETAILS = 'details';
 const ROUTE_VERSIONS = 'versions';
+const ROUTE_CANDIDATES = 'candidates';
 
 const deletionSuccessfulAlert = {
   id: 'ml-model-deleted-successfully',
@@ -37,6 +39,11 @@ const routes = [
     name: ROUTE_VERSIONS,
     component: ModelVersionList,
   },
+  {
+    path: '/candidates',
+    name: ROUTE_CANDIDATES,
+    component: CandidateList,
+  },
   { path: '*', redirect: { name: ROUTE_DETAILS } },
 ];
 
@@ -149,6 +156,9 @@ export default {
     versionCount() {
       return this.model?.versionCount || 0;
     },
+    candidateCount() {
+      return this.model?.candidateCount || 0;
+    },
     tabIndex() {
       return routes.findIndex(({ name }) => name === this.$route.name);
     },
@@ -213,6 +223,7 @@ export default {
   modelVersionEntity: MODEL_ENTITIES.modelVersion,
   ROUTE_DETAILS,
   ROUTE_VERSIONS,
+  ROUTE_CANDIDATES,
 };
 </script>
 
@@ -286,6 +297,12 @@ export default {
                     }}</gl-badge>
                   </template>
                 </gl-tab>
+                <gl-tab @click="goTo($options.ROUTE_CANDIDATES)">
+                  <template #title>
+                    {{ s__('MlModelRegistry|Version candidates') }}
+                    <gl-badge class="gl-tab-counter-badge">{{ candidateCount }}</gl-badge>
+                  </template>
+                </gl-tab>
 
                 <router-view :model-id="model.id" :model="model" />
               </gl-tabs>
diff --git a/app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue b/app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue
index 49ef23c9ebf..402cde2d1e6 100644
--- a/app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue
+++ b/app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue
@@ -21,7 +21,7 @@ export default {
         'li',
         {
           class:
-            'discussion-collapsible gl-border-solid gl-border-gray-100 gl-border-1 gl-rounded-base gl-border-t-0',
+            'discussion-collapsible gl-border-solid gl-border-default gl-border-1 gl-rounded-base gl-border-t-0',
         },
         [h('ul', { class: 'notes' }, children)],
       );
diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/components/manifests_list.vue b/app/assets/javascripts/packages_and_registries/dependency_proxy/components/manifests_list.vue
index fd06a2c9337..54cc5fe483f 100644
--- a/app/assets/javascripts/packages_and_registries/dependency_proxy/components/manifests_list.vue
+++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/components/manifests_list.vue
@@ -42,7 +42,7 @@ export default {
 
 <template>
   <div class="gl-mt-6">
-    <h3 class="gl-mb-0 gl-border-b-1 gl-border-gray-100 gl-pb-3 gl-text-base gl-border-b-solid">
+    <h3 class="gl-mb-0 gl-border-b-1 gl-border-default gl-pb-3 gl-text-base gl-border-b-solid">
       {{ $options.i18n.listTitle }}
     </h3>
 
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata_loader.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata_loader.vue
index ec4bb81dcb1..08fae62f0f4 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata_loader.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata_loader.vue
@@ -18,7 +18,7 @@ export default {
     <div
       v-for="index in $options.loader.repeat"
       :key="index"
-      class="gl-flex gl-items-center gl-border-b-1 gl-border-gray-100 gl-p-4"
+      class="gl-flex gl-items-center gl-border-b-1 gl-border-default gl-p-4"
     >
       <div class="md:gl-max-w-3/10">
         <gl-skeleton-loader :width="$options.loader.width" :height="$options.loader.height">
diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue
index 53b0f548929..36df3e93590 100644
--- a/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue
+++ b/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue
@@ -70,7 +70,7 @@ export default {
     },
     inputGroupTextClass() {
       return {
-        'gl-border-gray-100 gl-text-gray-400': this.disabled,
+        'gl-border-default gl-text-gray-400': this.disabled,
       };
     },
   },
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index 4ecf9922ab8..8b4e12b4339 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -623,7 +623,7 @@ export default {
 <template>
   <div>
     <div
-      class="project-visibility-setting gl-border-1 gl-border-solid gl-border-gray-100 gl-px-5 gl-py-3"
+      class="project-visibility-setting gl-border-1 gl-border-solid gl-border-default gl-px-5 gl-py-3"
     >
       <project-setting-row
         ref="project-visibility-settings"
@@ -705,7 +705,7 @@ export default {
       </project-setting-row>
     </div>
     <div
-      class="gl-mb-5 gl-flex gl-flex-col gl-gap-6 gl-border-1 gl-border-t-0 gl-border-solid gl-border-gray-100 gl-bg-gray-10 gl-px-5 gl-py-3"
+      class="gl-mb-5 gl-flex gl-flex-col gl-gap-6 gl-border-1 gl-border-t-0 gl-border-solid gl-border-default gl-bg-gray-10 gl-px-5 gl-py-3"
     >
       <project-setting-row
         ref="issues-settings"
diff --git a/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue b/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue
index 108c4202c7b..7b5028cedfe 100644
--- a/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue
+++ b/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue
@@ -16,7 +16,7 @@ export default {
 <template>
   <div
     ref="toc"
-    class="gl-m-3 gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-gray-10 gl-p-3"
+    class="gl-m-3 gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-bg-gray-10 gl-p-3"
   >
     <strong class="gl-py-3 gl-text-sm">{{ __('On this page') }}</strong>
     <ul class="wiki-pages gl-text-sm">
diff --git a/app/assets/javascripts/pipeline_wizard/components/wrapper.vue b/app/assets/javascripts/pipeline_wizard/components/wrapper.vue
index b36317847d4..e3938bbe82b 100644
--- a/app/assets/javascripts/pipeline_wizard/components/wrapper.vue
+++ b/app/assets/javascripts/pipeline_wizard/components/wrapper.vue
@@ -205,7 +205,7 @@ export default {
       </section>
     </main>
     <aside class="col-md-6 gl-pt-3">
-      <div class="gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-gray-10">
+      <div class="gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-bg-gray-10">
         <h6 class="text-secondary gl-p-2 gl-px-4" data-testid="editor-header">
           {{ sprintf($options.i18n.draft, { filename }) }}
         </h6>
diff --git a/app/assets/javascripts/profile/components/overview_tab.vue b/app/assets/javascripts/profile/components/overview_tab.vue
index 5b1fdfbb70b..005949b97a3 100644
--- a/app/assets/javascripts/profile/components/overview_tab.vue
+++ b/app/assets/javascripts/profile/components/overview_tab.vue
@@ -56,7 +56,7 @@ export default {
   <gl-tab :title="$options.i18n.title">
     <div class="gl-mt-5 gl-flex gl-flex-wrap">
       <div class="gl-w-full" data-testid="activity-section">
-        <div class="gl-flex gl-items-center gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid">
+        <div class="gl-flex gl-items-center gl-border-b-1 gl-border-b-default gl-border-b-solid">
           <h4 class="gl-grow">{{ $options.i18n.activity }}</h4>
           <gl-link href="">{{ $options.i18n.viewAll }}</gl-link>
         </div>
@@ -65,7 +65,7 @@ export default {
         <contribution-events v-else :events="events" />
       </div>
       <div class="gl-w-full" data-testid="personal-projects-section">
-        <div class="gl-flex gl-items-center gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid">
+        <div class="gl-flex gl-items-center gl-border-b-1 gl-border-b-default gl-border-b-solid">
           <h4 class="gl-grow">{{ $options.i18n.personalProjects }}</h4>
           <gl-link href="">{{ $options.i18n.viewAll }}</gl-link>
         </div>
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue
index 17b43fa2ec6..9772e14f5bb 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue
@@ -86,7 +86,7 @@ export default {
 
 <template>
   <div
-    class="gl-mb-4 gl-flex gl-items-center gl-gap-7 gl-border-t-1 gl-border-gray-100"
+    class="gl-mb-4 gl-flex gl-items-center gl-gap-7 gl-border-t-1 gl-border-default"
     :class="{ 'gl-pt-4 gl-border-t-solid': showDivider }"
   >
     <div class="gl-flex gl-w-full gl-items-center">
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue
index 3183434aa17..48fd16cf25e 100644
--- a/app/assets/javascripts/releases/components/release_block.vue
+++ b/app/assets/javascripts/releases/components/release_block.vue
@@ -139,7 +139,7 @@ export default {
     <div class="gl-flex gl-flex-col gl-gap-5">
       <div
         v-if="shouldRenderMilestoneInfo"
-        class="gl-border-b-1 gl-border-gray-100 gl-border-b-solid"
+        class="gl-border-b-1 gl-border-default gl-border-b-solid"
       >
         <!-- TODO: Switch open* links to opened* once fields have been updated in GraphQL -->
         <release-block-milestone-info
@@ -156,7 +156,7 @@ export default {
         v-if="shouldRenderAssets"
         :assets="assets"
         :class="{
-          'gl-border-b-1 gl-border-gray-100 gl-pb-5 gl-border-b-solid':
+          'gl-border-b-1 gl-border-default gl-pb-5 gl-border-b-solid':
             hasEvidence || release.descriptionHtml,
         }"
       />
diff --git a/app/assets/javascripts/repository/components/fork_suggestion.vue b/app/assets/javascripts/repository/components/fork_suggestion.vue
index 32fd87c8ece..cd1708664c8 100644
--- a/app/assets/javascripts/repository/components/fork_suggestion.vue
+++ b/app/assets/javascripts/repository/components/fork_suggestion.vue
@@ -24,7 +24,7 @@ export default {
 
 <template>
   <div
-    class="gl-flex gl-items-center gl-justify-end gl-border-1 gl-border-gray-100 gl-bg-gray-10 gl-px-5 gl-py-2 gl-border-b-solid"
+    class="gl-flex gl-items-center gl-justify-end gl-border-1 gl-border-default gl-bg-gray-10 gl-px-5 gl-py-2 gl-border-b-solid"
   >
     <span class="gl-mr-6" data-testid="message">{{ $options.i18n.message }}</span>
 
diff --git a/app/assets/javascripts/security_configuration/components/training_provider_list.vue b/app/assets/javascripts/security_configuration/components/training_provider_list.vue
index 0ea2937f93d..86d6b7be54d 100644
--- a/app/assets/javascripts/security_configuration/components/training_provider_list.vue
+++ b/app/assets/javascripts/security_configuration/components/training_provider_list.vue
@@ -231,7 +231,7 @@ export default {
     </gl-alert>
     <div
       v-if="isLoading"
-      class="gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-white gl-py-6"
+      class="gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-bg-white gl-py-6"
     >
       <gl-skeleton-loader :width="350" :height="44">
         <rect width="200" height="8" x="10" y="0" rx="4" />
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
index 6d77d17aa8d..f588c028da9 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
@@ -41,7 +41,7 @@ export default {
 <template>
   <div
     data-testid="helpPane"
-    class="sidebar-help-state gl-border-1 gl-border-gray-100 gl-bg-white gl-border-b-solid gl-border-t-solid"
+    class="sidebar-help-state gl-border-1 gl-border-default gl-bg-white gl-border-b-solid gl-border-t-solid"
   >
     <div class="time-tracking-info">
       <h4>{{ __('Track time with quick actions') }}</h4>
diff --git a/app/assets/javascripts/super_sidebar/components/counter.vue b/app/assets/javascripts/super_sidebar/components/counter.vue
index c6c421748e1..059c13b1cb4 100644
--- a/app/assets/javascripts/super_sidebar/components/counter.vue
+++ b/app/assets/javascripts/super_sidebar/components/counter.vue
@@ -48,7 +48,7 @@ export default {
     :is="component"
     :aria-label="ariaLabel"
     :href="href"
-    class="user-bar-button gl-block gl-grow gl-rounded-base gl-border-none gl-py-3 gl-text-center gl-text-sm gl-leading-1 hover:gl-no-underline"
+    class="user-bar-button gl-block gl-grow gl-rounded-base gl-py-3 gl-text-center gl-text-sm gl-leading-1 hover:gl-no-underline"
   >
     <gl-icon aria-hidden="true" :name="icon" />
     <span v-if="count" aria-hidden="true" class="gl-ml-1">{{ formattedCount }}</span>
diff --git a/app/assets/javascripts/super_sidebar/components/flyout_menu.vue b/app/assets/javascripts/super_sidebar/components/flyout_menu.vue
index cf27fa0dd84..de5647341a1 100644
--- a/app/assets/javascripts/super_sidebar/components/flyout_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/flyout_menu.vue
@@ -158,7 +158,7 @@ export default {
     @mouseleave="$emit('mouseleave')"
   >
     <ul
-      class="gl-min-w-20 gl-max-w-34 gl-list-none gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-white gl-p-2 gl-pb-1 gl-shadow-md"
+      class="gl-min-w-20 gl-max-w-34 gl-list-none gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-bg-white gl-p-2 gl-pb-1 gl-shadow-md"
       @mouseenter="showSVG = false"
     >
       <nav-item
diff --git a/app/assets/javascripts/todos/components/todos_app.vue b/app/assets/javascripts/todos/components/todos_app.vue
index 5eb557f7d72..6ad7f8d9a85 100644
--- a/app/assets/javascripts/todos/components/todos_app.vue
+++ b/app/assets/javascripts/todos/components/todos_app.vue
@@ -246,7 +246,7 @@ export default {
 
 <template>
   <div>
-    <div class="gl-flex gl-justify-between gl-border-b-1 gl-border-gray-100 gl-border-b-solid">
+    <div class="gl-flex gl-justify-between gl-border-b-1 gl-border-default gl-border-b-solid">
       <gl-tabs
         :value="currentTab"
         content-class="gl-p-0"
diff --git a/app/assets/javascripts/user_lists/components/edit_user_list.vue b/app/assets/javascripts/user_lists/components/edit_user_list.vue
index dd9e0b2c421..7c963d2b280 100644
--- a/app/assets/javascripts/user_lists/components/edit_user_list.vue
+++ b/app/assets/javascripts/user_lists/components/edit_user_list.vue
@@ -59,7 +59,7 @@ export default {
     <template v-else-if="hasUserList">
       <h3
         data-testid="user-list-title"
-        class="gl-border-1 gl-border-gray-100 gl-pb-5 gl-font-bold gl-border-b-solid"
+        class="gl-border-1 gl-border-default gl-pb-5 gl-font-bold gl-border-b-solid"
       >
         {{ title }}
       </h3>
diff --git a/app/assets/javascripts/user_lists/components/new_user_list.vue b/app/assets/javascripts/user_lists/components/new_user_list.vue
index 5e682318258..dbb1897e96f 100644
--- a/app/assets/javascripts/user_lists/components/new_user_list.vue
+++ b/app/assets/javascripts/user_lists/components/new_user_list.vue
@@ -36,7 +36,7 @@ export default {
       </ul>
     </gl-alert>
 
-    <h3 class="gl-border-1 gl-border-gray-100 gl-pb-5 gl-font-bold gl-border-b-solid">
+    <h3 class="gl-border-1 gl-border-default gl-pb-5 gl-font-bold gl-border-b-solid">
       {{ $options.translations.pageTitle }}
     </h3>
 
diff --git a/app/assets/javascripts/user_lists/components/user_list.vue b/app/assets/javascripts/user_lists/components/user_list.vue
index f1263339eb5..e42dd58efda 100644
--- a/app/assets/javascripts/user_lists/components/user_list.vue
+++ b/app/assets/javascripts/user_lists/components/user_list.vue
@@ -12,7 +12,7 @@ import { s__, __ } from '~/locale';
 import { states, ADD_USER_MODAL_ID } from '../constants/show';
 import AddUserModal from './add_user_modal.vue';
 
-const commonTableClasses = ['gl-py-5', 'gl-border-b-1', 'gl-border-b-solid', 'gl-border-gray-100'];
+const commonTableClasses = ['gl-py-5', 'gl-border-b-1', 'gl-border-b-solid', 'gl-border-default'];
 
 export default {
   components: {
@@ -49,7 +49,7 @@ export default {
       'gl-pb-5',
       'gl-border-b-1',
       'gl-border-b-solid',
-      'gl-border-gray-100',
+      'gl-border-default',
     ].join(' '),
     tableHeaderClasses: commonTableClasses.join(' '),
     tableRowClasses: [
diff --git a/app/assets/javascripts/user_lists/components/user_list_form.vue b/app/assets/javascripts/user_lists/components/user_list_form.vue
index bb1787805b2..0d5e1823e27 100644
--- a/app/assets/javascripts/user_lists/components/user_list_form.vue
+++ b/app/assets/javascripts/user_lists/components/user_list_form.vue
@@ -35,7 +35,7 @@ export default {
       'gl-justify-between',
       'gl-px-4',
       'gl-border-t-solid',
-      'gl-border-gray-100',
+      'gl-border-default',
       'gl-border-1',
       'gl-bg-gray-10',
     ],
diff --git a/app/assets/javascripts/user_lists/components/user_lists_table.vue b/app/assets/javascripts/user_lists/components/user_lists_table.vue
index 40bf09a7f6e..ab64bd806ec 100644
--- a/app/assets/javascripts/user_lists/components/user_lists_table.vue
+++ b/app/assets/javascripts/user_lists/components/user_lists_table.vue
@@ -77,7 +77,7 @@ export default {
       v-for="list in userLists"
       :key="list.id"
       data-testid="ffUserList"
-      class="gl-flex gl-w-full gl-justify-between gl-border-b-1 gl-border-gray-100 gl-py-4 gl-border-b-solid"
+      class="gl-flex gl-w-full gl-justify-between gl-border-b-1 gl-border-default gl-py-4 gl-border-b-solid"
     >
       <div class="gl-flex gl-grow gl-flex-col">
         <span data-testid="ffUserListName" class="gl-mb-2 gl-font-bold">
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_assignees.vue b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_assignees.vue
index 5635ece7a17..ae3abe4f65e 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_assignees.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_assignees.vue
@@ -196,7 +196,7 @@ export default {
 <template>
   <div
     class="alert-assignees gl-w-7/10 gl-py-5"
-    :class="{ 'gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid': !sidebarCollapsed }"
+    :class="{ 'gl-border-b-1 gl-border-b-default gl-border-b-solid': !sidebarCollapsed }"
   >
     <template v-if="sidebarCollapsed">
       <div
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_header.vue b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_header.vue
index 2e33d5a10f9..6158fa4cdce 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_header.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_header.vue
@@ -25,7 +25,7 @@ export default {
 </script>
 
 <template>
-  <div class="block gl-flex gl-justify-between !gl-border-b-gray-100">
+  <div class="block gl-flex gl-justify-between !gl-border-b-default">
     <sidebar-todo
       v-if="!sidebarCollapsed"
       :project-path="projectPath"
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_status.vue b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_status.vue
index 7bd4de11524..c317ef91fd0 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_status.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_status.vue
@@ -77,7 +77,7 @@ export default {
 <template>
   <div
     class="alert-status gl-py-5"
-    :class="{ 'gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid': !sidebarCollapsed }"
+    :class="{ 'gl-border-b-1 gl-border-b-default gl-border-b-solid': !sidebarCollapsed }"
   >
     <template v-if="sidebarCollapsed">
       <div ref="status" class="gl-ml-6" data-testid="status-icon" @click="$emit('toggle-sidebar')">
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue
index cbdca6fe1d9..4f143a30997 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue
@@ -40,7 +40,7 @@ export default {
   >
     <div class="gl-relative gl-inline-flex gl-items-center">
       <div
-        class="gl-box-sizing-content-box -gl-mt-2 gl-mr-6 gl-inline gl-rounded-full gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-white gl-p-3 gl-text-gray-200"
+        class="gl-box-sizing-content-box -gl-mt-2 gl-mr-6 gl-inline gl-rounded-full gl-border-1 gl-border-solid gl-border-default gl-bg-white gl-p-3 gl-text-gray-200"
       >
         <gl-icon :name="note.systemNoteIconName" />
       </div>
diff --git a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/constants.js b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/constants.js
index 96b3aeb66ee..30ccd45c8e0 100644
--- a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/constants.js
+++ b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/constants.js
@@ -1,6 +1,6 @@
 export const tdClass = 'table-col gl-flex d-md-table-cell gl-items-center gl-whitespace-nowrap';
 export const bodyTrClass =
-  'gl-border-1 gl-border-t-solid gl-border-gray-100 hover:gl-cursor-pointer hover:gl-bg-gray-50 hover:gl-border-b-solid';
+  'gl-border-1 gl-border-t-solid gl-border-default hover:gl-cursor-pointer hover:gl-bg-gray-50 hover:gl-border-b-solid';
 
 export const defaultPageSize = 20;
 
diff --git a/app/assets/javascripts/vue_shared/components/registry/details_row.vue b/app/assets/javascripts/vue_shared/components/registry/details_row.vue
index c1e61ee5b8f..4beeaa185ff 100644
--- a/app/assets/javascripts/vue_shared/components/registry/details_row.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/details_row.vue
@@ -24,7 +24,7 @@ export default {
   },
   computed: {
     borderClass() {
-      return this.dashed ? 'gl-border-b-solid gl-border-gray-100 gl-border-b-1' : '';
+      return this.dashed ? 'gl-border-b-solid gl-border-default gl-border-b-1' : '';
     },
   },
 };
diff --git a/app/assets/javascripts/vue_shared/components/registry/list_item.vue b/app/assets/javascripts/vue_shared/components/registry/list_item.vue
index 31461742104..4a8e20bd41d 100644
--- a/app/assets/javascripts/vue_shared/components/registry/list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/list_item.vue
@@ -35,8 +35,8 @@ export default {
     optionalClasses() {
       return {
         'gl-border-t-transparent': !this.first && !this.selected,
-        'gl-border-t-gray-100': this.first && !this.selected,
-        'gl-border-b-gray-100': !this.selected,
+        'gl-border-t-default': this.first && !this.selected,
+        'gl-border-b-default': !this.selected,
         '!gl-border-t-transparent': this.selected && !this.first,
         'gl-bg-blue-50 gl-border-blue-200': this.selected,
       };
@@ -150,7 +150,7 @@ export default {
           :key="detailIndex"
           class="gl-px-5 gl-py-2"
           :class="{
-            'gl-border-t-1 gl-border-gray-100 gl-border-t-solid': detailIndex !== 0,
+            'gl-border-t-1 gl-border-default gl-border-t-solid': detailIndex !== 0,
           }"
         >
           <slot :name="row"></slot>
diff --git a/app/assets/javascripts/vue_shared/components/settings/settings_block.vue b/app/assets/javascripts/vue_shared/components/settings/settings_block.vue
index 0d99b7a01c7..63f4ab00107 100644
--- a/app/assets/javascripts/vue_shared/components/settings/settings_block.vue
+++ b/app/assets/javascripts/vue_shared/components/settings/settings_block.vue
@@ -79,17 +79,19 @@ export default {
         </gl-button>
       </div>
       <div class="gl-grow">
-        <h2
-          role="button"
+        <button
+          class="gl-w-full gl-border-0 gl-bg-transparent gl-p-0 gl-text-left"
           tabindex="-1"
-          class="gl-heading-2 !gl-mb-2 gl-cursor-pointer"
+          type="button"
           :aria-expanded="ariaExpanded"
           :aria-controls="collapseId"
           data-testid="settings-block-title"
           @click="toggleExpanded"
         >
-          {{ title }}
-        </h2>
+          <h2 class="gl-heading-2 !gl-mb-2">
+            {{ title }}
+          </h2>
+        </button>
         <p class="gl-m-0 gl-text-subtle"><slot name="description"></slot></p>
       </div>
     </div>
diff --git a/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue b/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue
index 7015850dfc7..d4f3308982c 100644
--- a/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue
+++ b/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue
@@ -31,7 +31,7 @@ export default {
           :href="`#${panel.name}`"
           data-testid="panel-link"
           :data-qa-panel-name="panel.name"
-          class="new-namespace-panel gl-flex gl-w-full gl-shrink-0 gl-flex-col gl-items-center gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-px-3 gl-py-6 hover:!gl-no-underline lg:gl-flex-row"
+          class="new-namespace-panel gl-flex gl-w-full gl-shrink-0 gl-flex-col gl-items-center gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-px-3 gl-py-6 hover:!gl-no-underline lg:gl-flex-row"
           @click="track('click_tab', { label: panel.name })"
         >
           <div class="new-namespace-panel-illustration gl-flex gl-shrink-0 gl-justify-center">
diff --git a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue
index 2f0d2bfd46b..ca36b42ac14 100644
--- a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue
+++ b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue
@@ -138,7 +138,7 @@ export default {
   <div>
     <div class="top-bar-fixed container-fluid" data-testid="top-bar">
       <div
-        class="top-bar-container gl-flex gl-items-center gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid"
+        class="top-bar-container gl-flex gl-items-center gl-border-b-1 gl-border-b-default gl-border-b-solid"
       >
         <super-sidebar-toggle
           v-if="showSuperSidebarToggle"
diff --git a/app/assets/javascripts/whats_new/components/feature.vue b/app/assets/javascripts/whats_new/components/feature.vue
index e6f7a360b3b..08fb1cc7760 100644
--- a/app/assets/javascripts/whats_new/components/feature.vue
+++ b/app/assets/javascripts/whats_new/components/feature.vue
@@ -32,7 +32,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-border-b-1 gl-border-b-gray-100 gl-px-6 gl-py-6 gl-border-b-solid">
+  <div class="gl-border-b-1 gl-border-b-default gl-px-6 gl-py-6 gl-border-b-solid">
     <gl-link
       v-if="feature.image_url"
       :href="feature.documentation_link"
diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss
index c5ce5a88bc2..f1915453a02 100644
--- a/app/assets/stylesheets/framework/super_sidebar.scss
+++ b/app/assets/stylesheets/framework/super_sidebar.scss
@@ -30,7 +30,7 @@ $command-palette-spacing: px-to-rem(14px);
 
   --super-sidebar-user-bar-button-bg: var(--gl-background-color-subtle);
   --super-sidebar-user-bar-button-color: var(--gl-text-color-default);
-  --super-sidebar-user-bar-button-border-color: var(--gl-color-alpha-dark-8);
+  --super-sidebar-user-bar-button-border-color: var(--gl-color-alpha-dark-16);
   --super-sidebar-user-bar-button-hover-bg: var(--gl-color-alpha-dark-8);
   --super-sidebar-user-bar-button-hover-color: var(--gl-text-color-default);
   --super-sidebar-user-bar-button-active-bg: var(--gl-color-alpha-dark-16);
@@ -46,7 +46,7 @@ $command-palette-spacing: px-to-rem(14px);
     --super-sidebar-user-bar-bg: var(--gl-color-alpha-light-4);
 
     --super-sidebar-user-bar-button-bg: var(--gl-color-alpha-light-16);
-    --super-sidebar-user-bar-button-border-color: var(--gl-color-alpha-light-16);
+    --super-sidebar-user-bar-button-border-color: transparent;
     --super-sidebar-user-bar-button-hover-bg: var(--gl-color-alpha-light-24);
     --super-sidebar-user-bar-button-active-bg: var(--gl-color-alpha-light-36);
 
@@ -73,7 +73,7 @@ $command-palette-spacing: px-to-rem(14px);
 
     --super-sidebar-user-bar-button-bg: var(--gl-color-alpha-light-16);
     --super-sidebar-user-bar-button-color: #{$user-bar-button-color};
-    --super-sidebar-user-bar-button-border-color: var(--gl-color-alpha-light-16);
+    --super-sidebar-user-bar-button-border-color: transparent;
     --super-sidebar-user-bar-button-hover-bg: var(--gl-color-alpha-light-24);
     --super-sidebar-user-bar-button-hover-color: #{$user-bar-button-color};
     --super-sidebar-user-bar-button-active-bg: var(--gl-color-alpha-light-36);
@@ -294,6 +294,8 @@ $command-palette-spacing: px-to-rem(14px);
     }
 
     .organization-switcher-button {
+      border: 0 !important;
+
       &:not(:active),
       &:not(:hover),
       &:not(:focus) {
@@ -351,7 +353,7 @@ $command-palette-spacing: px-to-rem(14px);
 
     .user-bar-button {
       background-color: var(--super-sidebar-user-bar-button-bg);
-      border-color: var(--super-sidebar-user-bar-button-border-color);
+      border: 1px solid var(--super-sidebar-user-bar-button-border-color);
 
       &[aria-expanded='true'] {
         background-color: var(--super-sidebar-user-bar-button-hover-bg);
diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml
index 3abe1ad8ddf..6cb13f28060 100644
--- a/app/views/explore/projects/topic.html.haml
+++ b/app/views/explore/projects/topic.html.haml
@@ -20,7 +20,7 @@
         = markdown(@topic.description)
 
 %div{ class: container_class }
-  .gl-py-5.gl-border-gray-100.gl-border-b-solid.gl-border-b-1
+  .gl-py-5.gl-border-default.gl-border-b-solid.gl-border-b-1
     %h3.gl-m-0= _('Projects with this topic')
   .top-area.gl-pt-2.gl-pb-2.gl-justify-between
     .nav-controls
diff --git a/app/views/groups/_import_group_from_another_instance_panel.html.haml b/app/views/groups/_import_group_from_another_instance_panel.html.haml
index c3461572060..f45879b2c9a 100644
--- a/app/views/groups/_import_group_from_another_instance_panel.html.haml
+++ b/app/views/groups/_import_group_from_another_instance_panel.html.haml
@@ -1,7 +1,7 @@
 - bulk_imports_enabled = Gitlab::CurrentSettings.bulk_import_enabled? || Feature.enabled?(:override_bulk_import_disabled, current_user, type: :ops)
 
 = gitlab_ui_form_with url: configure_import_bulk_imports_path(namespace_id: params[:parent_id]), class: 'gl-show-field-errors' do |f|
-  .gl-border-l-solid.gl-border-r-solid.gl-border-t-solid.gl-border-gray-100.gl-border-1.gl-p-5.gl-mt-4
+  .gl-border-l-solid.gl-border-r-solid.gl-border-t-solid.gl-border-default.gl-border-1.gl-p-5.gl-mt-4
     .gl-flex.gl-items-center.gl-justify-between
       %h4.gl-flex
         = s_('GroupsNew|Import groups by direct transfer')
@@ -53,5 +53,5 @@
         title: s_('GroupsNew|Please fill in your personal access token.'),
         id: 'import_gitlab_token',
         data: { testid: 'import-gitlab-token' }
-  .gl-border-gray-100.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
+  .gl-border-default.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
     = f.submit s_('GroupsNew|Connect instance'), disabled: !bulk_imports_enabled, pajamas_button: true, data: { testid: 'connect-instance-button' }
diff --git a/app/views/groups/_import_group_from_file_panel.html.haml b/app/views/groups/_import_group_from_file_panel.html.haml
index 14c84f15299..f1c9f4550d1 100644
--- a/app/views/groups/_import_group_from_file_panel.html.haml
+++ b/app/views/groups/_import_group_from_file_panel.html.haml
@@ -3,7 +3,7 @@
 - group_path << parent.full_path + '/' if parent
 
 = gitlab_ui_form_for '', url: import_gitlab_group_path, namespace: 'import_group', class: 'group-form gl-show-field-errors', multipart: true do |f|
-  .gl-border-l-solid.gl-border-r-solid.gl-border-gray-100.gl-border-1.gl-p-5
+  .gl-border-l-solid.gl-border-r-solid.gl-border-default.gl-border-1.gl-p-5
     %h4
       = _('Import group from file')
     = render Pajamas::AlertComponent.new(variant: :warning,
@@ -21,5 +21,5 @@
         = s_('GroupsNew|To import a group, navigate to the group settings for the GitLab source instance, %{link_start}generate an export file%{link_end}, and upload it here.').html_safe % { link_start: import_export_link_start, link_end: '</a>'.html_safe }
       .gl-mt-3
         = render 'shared/file_picker_button', f: f, field: :file, help_text: nil
-  .gl-border-gray-100.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
+  .gl-border-default.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
     = f.submit _('Import'), pajamas_button: true
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 88cb8d989fa..bed49c96365 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -17,5 +17,5 @@
 
     #import-group-pane.tab-pane
       = render 'import_group_from_another_instance_panel'
-      .gl-mt-7.gl-border-b-solid.gl-border-gray-100.gl-border-1
+      .gl-mt-7.gl-border-b-solid.gl-border-default.gl-border-1
       = render 'import_group_from_file_panel'
diff --git a/app/views/groups/settings/_advanced.html.haml b/app/views/groups/settings/_advanced.html.haml
index 333bd269359..efbeaf9ea5b 100644
--- a/app/views/groups/settings/_advanced.html.haml
+++ b/app/views/groups/settings/_advanced.html.haml
@@ -3,7 +3,7 @@
 .gl-flex.gl-gap-5.gl-flex-col
   = render 'groups/settings/export', group: @group
 
-  = render Pajamas::CardComponent.new(header_options: { class: 'gl-px-5 gl-py-4 gl-border-b-1 gl-border-b-solid gl-border-gray-100' }, body_options: { class: 'gl-px-5 gl-py-4' }) do |c|
+  = render Pajamas::CardComponent.new(header_options: { class: 'gl-px-5 gl-py-4 gl-border-b-1 gl-border-b-solid gl-border-default' }, body_options: { class: 'gl-px-5 gl-py-4' }) do |c|
     - c.with_header do
       .gl-flex.gl-grow
         %h4.gl-text-base.gl-leading-24.gl-m-0= s_('GroupSettings|Change group URL')
diff --git a/app/views/groups/settings/_transfer.html.haml b/app/views/groups/settings/_transfer.html.haml
index 2a6f372acc9..94c1703d1b9 100644
--- a/app/views/groups/settings/_transfer.html.haml
+++ b/app/views/groups/settings/_transfer.html.haml
@@ -1,7 +1,7 @@
 - form_id = "transfer-group-form"
 - initial_data = { button_text: s_('GroupSettings|Transfer group'), group_full_path: @group.full_path, group_name: @group.name, group_id: @group.id, target_form_id: form_id, is_paid_group: group.paid?.to_s }
 
-= render Pajamas::CardComponent.new(card_options: { data: { testid: 'transfer-group-content' } }, header_options: { class: 'gl-px-5 gl-py-4 gl-border-b-1 gl-border-b-solid gl-border-gray-100' }, body_options: { class: 'gl-px-5 gl-py-4' }) do |c|
+= render Pajamas::CardComponent.new(card_options: { data: { testid: 'transfer-group-content' } }, header_options: { class: 'gl-px-5 gl-py-4 gl-border-b-1 gl-border-b-solid gl-border-default' }, body_options: { class: 'gl-px-5 gl-py-4' }) do |c|
   - c.with_header do
     .gl-flex.gl-grow
       %h4.gl-text-base.gl-leading-24.gl-m-0= s_('GroupSettings|Transfer group')
diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml
index 0d50633760e..e3d379c4f9f 100644
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -3,7 +3,7 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-.gl-border-solid.gl-border-gray-100.gl-border-0.gl-border-b-1
+.gl-border-solid.gl-border-default.gl-border-0.gl-border-b-1
   %h1.gl-text-size-h1.gl-my-0.gl-py-4.gl-flex.gl-items-center.gl-gap-3
     = sprite_icon('github', size: 24)
     %span= title
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index 2b3250d213c..cf46dde9753 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -1,7 +1,7 @@
 - title = has_ci_cd_only_params? ? _('Connect repositories from GitHub') : _('GitHub import')
 - page_title title
 
-.gl-border-solid.gl-border-gray-100.gl-border-0.gl-border-b-1
+.gl-border-solid.gl-border-default.gl-border-0.gl-border-b-1
   %h1.gl-text-size-h1.gl-my-0.gl-py-4.gl-flex.gl-items-center.gl-gap-3
     = sprite_icon('github', size: 24)
     %span= _('Import repositories from GitHub')
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 858073ed4f7..175b61e9117 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -42,7 +42,7 @@
           #blame-stream-container.blame-stream-container
 
     - if @blame_mode.pagination? && @blame_pagination.total_pages > 1
-      .gl-flex.gl-justify-center.gl-flex-col.gl-items-center.gl-p-3.gl-bg-gray-50.gl-border-t-solid.gl-border-t-1.gl-border-gray-100
+      .gl-flex.gl-justify-center.gl-flex-col.gl-items-center.gl-p-3.gl-bg-gray-50.gl-border-t-solid.gl-border-t-1.gl-border-default
         = render Pajamas::ButtonComponent.new(href: entire_blame_path(@id, @project), size: :small, button_options: { class: 'gl-mt-3' }) do |c|
           = _('Show full blame')
 
diff --git a/app/views/projects/issues/_design_management.html.haml b/app/views/projects/issues/_design_management.html.haml
index cce6c570441..82db797efee 100644
--- a/app/views/projects/issues/_design_management.html.haml
+++ b/app/views/projects/issues/_design_management.html.haml
@@ -15,5 +15,5 @@
     sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'),
     new_comment_template_paths: new_comment_template_paths(@project.group, @project).to_json } }
 - else
-  .gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center
+  .gl-border-solid.gl-border-1.gl-border-default.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center
     = enable_lfs_message
diff --git a/app/views/shared/_divider.html.haml b/app/views/shared/_divider.html.haml
index 0a2b5d85211..1b97e5d7f8c 100644
--- a/app/views/shared/_divider.html.haml
+++ b/app/views/shared/_divider.html.haml
@@ -1,4 +1,4 @@
 .gl-flex.gl-items-center.gl-gap-5{ data: { testid: 'divider' } }
-  %hr.gl-grow.gl-border-gray-100
+  %hr.gl-grow.gl-border-default
   = local_assigns[:text]
-  %hr.gl-grow.gl-border-gray-100
+  %hr.gl-grow.gl-border-default
diff --git a/app/views/shared/_md_preview.html.haml b/app/views/shared/_md_preview.html.haml
index 7360e6426df..e7feacc4a58 100644
--- a/app/views/shared/_md_preview.html.haml
+++ b/app/views/shared/_md_preview.html.haml
@@ -9,7 +9,7 @@
       = _('Only project members can comment.')
 
 .md-area.position-relative
-  .md-header.gl-px-3.gl-rounded-t-base.gl-border-b.gl-border-gray-100
+  .md-header.gl-px-3.gl-rounded-t-base.gl-border-b.gl-border-default
     .gl-flex.gl-items-top.gl-flex-nowrap.gl-justify-between
       .md-header-toolbar.gl-flex.gl-py-3.gl-flex-wrap.gl-gap-y-3
         = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, button_options: { class: 'js-md-preview-button', value: 'preview' }) do
diff --git a/doc/integration/index.md b/doc/integration/index.md
index 4bc9f713d75..1e6e723ce94 100644
--- a/doc/integration/index.md
+++ b/doc/integration/index.md
@@ -44,7 +44,7 @@ You can also integrate GitLab with the following security partners:
 - [Jscrambler](https://docs.jscrambler.com/code-integrity/documentation/gitlab-ci-integration)
 - [Mend](https://www.mend.io/gitlab/)
 - [Semgrep](https://semgrep.dev/for/gitlab/)
-- [StackHawk](https://docs.stackhawk.com/continuous-integration/gitlab.html)
+- [StackHawk](https://docs.stackhawk.com/continuous-integration/gitlab/)
 - [Tenable](https://docs.tenable.com/vulnerability-management/Content/ContainerSecurity/Dashboard.htm)
 - [Venafi](https://marketplace.venafi.com/xchange/620d2d6ed419fb06a5c5bd36/solution/6292c2ef7550f2ee553cf223)
 - [Veracode](https://docs.veracode.com/r/c_integration_buildservs#gitlab)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d82a4b51c76..5448786db88 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -35069,6 +35069,9 @@ msgstr ""
 msgid "MlModelRegistry|Version"
 msgstr ""
 
+msgid "MlModelRegistry|Version candidates"
+msgstr ""
+
 msgid "MlModelRegistry|Version card"
 msgstr ""
 
diff --git a/qa/knapsack/master_report.json b/qa/knapsack/master_report.json
index 48f5d5601a6..47678134d56 100644
--- a/qa/knapsack/master_report.json
+++ b/qa/knapsack/master_report.json
@@ -1,249 +1,258 @@
 {
-  "qa/specs/features/api/10_govern/group_access_token_spec.rb": 12.751388505000023,
-  "qa/specs/features/api/10_govern/project_access_token_spec.rb": 32.89926324599992,
-  "qa/specs/features/api/1_manage/rate_limits_spec.rb": 29.133628446999865,
-  "qa/specs/features/api/2_plan/closes_issue_via_pushing_a_commit_spec.rb": 13.026944022999942,
-  "qa/specs/features/api/3_create/merge_request/push_options_labels_spec.rb": 11.490352364000046,
-  "qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb": 6.069066840000005,
-  "qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb": 24.042001749000065,
-  "qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb": 24.645955939000032,
-  "qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb": 24.601507323999954,
-  "qa/specs/features/api/3_create/merge_request/view_merge_requests_spec.rb": 0.01137709700014966,
-  "qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb": 6.916183379000017,
-  "qa/specs/features/api/3_create/repository/commit_to_templated_project_spec.rb": 14.377443990999836,
-  "qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb": 5.819943247000083,
-  "qa/specs/features/api/3_create/repository/files_spec.rb": 5.173241866999888,
-  "qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb": 4.929177706000246,
-  "qa/specs/features/api/3_create/repository/push_postreceive_idempotent_spec.rb": 9.340088966999929,
-  "qa/specs/features/api/3_create/repository/storage_size_spec.rb": 11.24625387900005,
-  "qa/specs/features/api/3_create/repository/tag_revision_trigger_prereceive_hook_spec.rb": 4.532630837999932,
-  "qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb": 46.805881252999825,
-  "qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb": 8.743665168999996,
-  "qa/specs/features/api/4_verify/file_variable_spec.rb": 24.386426346999997,
-  "qa/specs/features/api/4_verify/job_downloads_artifacts_spec.rb": 16.590649373000133,
-  "qa/specs/features/api/9_data_stores/user_inherited_access_spec.rb": 71.2855975110001,
-  "qa/specs/features/api/9_data_stores/users_spec.rb": 0.4440915310001401,
-  "qa/specs/features/browser_ui/10_govern/group/group_access_token_spec.rb": 12.470258933999958,
-  "qa/specs/features/browser_ui/10_govern/login/2fa_recovery_spec.rb": 36.39139395800021,
-  "qa/specs/features/browser_ui/10_govern/login/2fa_ssh_recovery_spec.rb": 41.08415781800022,
-  "qa/specs/features/browser_ui/10_govern/login/log_in_spec.rb": 8.281860885000015,
-  "qa/specs/features/browser_ui/10_govern/login/log_in_with_2fa_spec.rb": 86.3487416539997,
-  "qa/specs/features/browser_ui/10_govern/login/login_via_oauth_and_oidc_with_gitlab_as_idp_spec.rb": 499.21237998800007,
-  "qa/specs/features/browser_ui/10_govern/login/register_spec.rb": 200.75919483400003,
-  "qa/specs/features/browser_ui/10_govern/project/project_access_token_spec.rb": 11.893035009999949,
-  "qa/specs/features/browser_ui/10_govern/user/impersonation_token_spec.rb": 29.84007964699981,
-  "qa/specs/features/browser_ui/10_govern/user/user_access_termination_spec.rb": 40.08391615200003,
-  "qa/specs/features/browser_ui/14_analytics/performance_bar_spec.rb": 21.119296476000272,
-  "qa/specs/features/browser_ui/14_analytics/service_ping_default_enabled_spec.rb": 10.500143610000123,
-  "qa/specs/features/browser_ui/1_manage/integrations/jenkins/jenkins_build_status_spec.rb": 65.06015029199989,
-  "qa/specs/features/browser_ui/2_plan/design_management/add_design_content_spec.rb": 17.374500398000237,
-  "qa/specs/features/browser_ui/2_plan/design_management/archive_design_content_spec.rb": 16.848764783999968,
-  "qa/specs/features/browser_ui/2_plan/design_management/modify_design_content_spec.rb": 15.021202979999998,
-  "qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb": 18.450994444000116,
-  "qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb": 17.622998689000042,
-  "qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb": 14.794653964999952,
-  "qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb": 41.69908395199991,
-  "qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb": 20.513510600000018,
-  "qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb": 18.107505599999968,
-  "qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb": 16.460536250999894,
-  "qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb": 15.750375492000103,
-  "qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb": 17.857268017000024,
-  "qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb": 13.975939827000275,
-  "qa/specs/features/browser_ui/2_plan/issue_boards/focus_mode_spec.rb": 10.05644193199987,
-  "qa/specs/features/browser_ui/2_plan/milestone/assign_milestone_spec.rb": 67.57972961699988,
-  "qa/specs/features/browser_ui/2_plan/milestone/create_group_milestone_spec.rb": 13.48369254499994,
-  "qa/specs/features/browser_ui/2_plan/milestone/create_project_milestone_spec.rb": 20.18888547100005,
-  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_content_creation_spec.rb": 71.71342247399991,
-  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_content_manipulation_spec.rb": 37.97556997300012,
-  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_directory_management_spec.rb": 13.762443853000036,
-  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_file_upload_spec.rb": 29.93055537700002,
-  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_list_spec.rb": 41.261750471999676,
-  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_page_deletion_spec.rb": 38.11781402800011,
-  "qa/specs/features/browser_ui/2_plan/related_issues/related_issues_spec.rb": 12.23750995599994,
-  "qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb": 133.01163271799987,
-  "qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_a_merge_spec.rb": 23.313274683000145,
-  "qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_commit_spec.rb": 14.570134598999857,
-  "qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb": 40.756809996000015,
-  "qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb": 29.887464119000015,
-  "qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb": 20.59689329899993,
-  "qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb": 62.44206307600007,
-  "qa/specs/features/browser_ui/3_create/merge_request/revert/revert_commit_spec.rb": 17.132142855999973,
-  "qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb": 36.95017465400019,
-  "qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb": 22.052299305999895,
-  "qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb": 49.84356878200015,
-  "qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb": 33.78413305000004,
-  "qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb": 44.768547936000004,
-  "qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb": 63.99649399300006,
-  "qa/specs/features/browser_ui/3_create/repository/add_new_branch_rule_spec.rb": 20.69057171999998,
-  "qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb": 25.212562218000016,
-  "qa/specs/features/browser_ui/3_create/repository/clone_spec.rb": 7.695580884999913,
-  "qa/specs/features/browser_ui/3_create/repository/file/create_file_via_web_spec.rb": 14.542094647999875,
-  "qa/specs/features/browser_ui/3_create/repository/file/delete_file_via_web_spec.rb": 16.766271739999866,
-  "qa/specs/features/browser_ui/3_create/repository/file/edit_file_via_web_spec.rb": 17.48617004699986,
-  "qa/specs/features/browser_ui/3_create/repository/file/file_with_unusual_name_spec.rb": 15.972208421000005,
-  "qa/specs/features/browser_ui/3_create/repository/license_detection_spec.rb": 32.49958670500018,
-  "qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb": 82.62286975099994,
-  "qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb": 11.582223320000026,
-  "qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb": 17.065084866000007,
-  "qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb": 12.421405112000002,
-  "qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb": 50.74149139600013,
-  "qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb": 56.192172966000044,
-  "qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb": 43.43877877099999,
-  "qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb": 12.306967781000026,
-  "qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb": 22.123440633999962,
-  "qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb": 11.930819230999987,
-  "qa/specs/features/browser_ui/3_create/repository/ssh_key_support_create_spec.rb": 14.466449840999985,
-  "qa/specs/features/browser_ui/3_create/repository/ssh_key_support_delete_spec.rb": 13.404772087999845,
-  "qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb": 28.492135840000174,
-  "qa/specs/features/browser_ui/3_create/snippet/add_comment_to_snippet_spec.rb": 40.902203811999925,
-  "qa/specs/features/browser_ui/3_create/snippet/add_file_to_snippet_spec.rb": 28.4565982299996,
-  "qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_personal_snippet_spec.rb": 44.05035067500012,
-  "qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_project_snippet_spec.rb": 52.8828863990002,
-  "qa/specs/features/browser_ui/3_create/snippet/copy_snippet_file_contents_spec.rb": 32.79950173500015,
-  "qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb": 10.373941559000059,
-  "qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_with_multiple_files_spec.rb": 9.907039061999967,
-  "qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_spec.rb": 14.810275069,
-  "qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_with_multiple_files_spec.rb": 18.689862891999837,
-  "qa/specs/features/browser_ui/3_create/snippet/delete_file_from_snippet_spec.rb": 25.652545791000193,
-  "qa/specs/features/browser_ui/3_create/snippet/share_snippet_spec.rb": 22.147358860000168,
-  "qa/specs/features/browser_ui/3_create/snippet/snippet_index_page_spec.rb": 48.514524907999885,
-  "qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb": 16.087555477000024,
-  "qa/specs/features/browser_ui/3_create/web_ide/add_first_file_in_web_ide_spec.rb": 40.66486228200006,
-  "qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb": 62.267841525999984,
-  "qa/specs/features/browser_ui/3_create/web_ide/closing_web_ide_with_unsaved_changes_spec.rb": 17.63566870900013,
-  "qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb": 133.5650063160001,
-  "qa/specs/features/browser_ui/4_verify/ci_components_catalog/ci_catalog_sorting_spec.rb": 68.8284702850001,
-  "qa/specs/features/browser_ui/4_verify/ci_components_catalog/run_component_in_project_pipeline_spec.rb": 40.266767914999946,
-  "qa/specs/features/browser_ui/4_verify/ci_job_artifacts/expose_job_artifacts_in_mr_spec.rb": 36.87972815300009,
-  "qa/specs/features/browser_ui/4_verify/ci_job_artifacts/job_artifacts_access_keyword_spec.rb": 154.66687935100026,
-  "qa/specs/features/browser_ui/4_verify/ci_job_artifacts/unlocking_job_artifacts_across_pipelines_spec.rb": 266.6912154249999,
-  "qa/specs/features/browser_ui/4_verify/ci_project_artifacts/user_can_bulk_delete_artifacts_spec.rb": 24.51923005200001,
-  "qa/specs/features/browser_ui/4_verify/ci_variable/custom_variable_spec.rb": 32.529648410999926,
-  "qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb": 47.52443747999996,
-  "qa/specs/features/browser_ui/4_verify/ci_variable/prefill_variables_spec.rb": 33.065717594000034,
-  "qa/specs/features/browser_ui/4_verify/ci_variable/raw_variables_defined_in_yaml_spec.rb": 20.569682358000136,
-  "qa/specs/features/browser_ui/4_verify/ci_variable/ui_variable_inheritable_when_forward_pipeline_variables_true_spec.rb": 49.354740160999995,
-  "qa/specs/features/browser_ui/4_verify/pipeline/include_local_config_file_paths_with_wildcard_spec.rb": 23.049214602999882,
-  "qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb": 46.987583461999975,
-  "qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_multiple_projects_spec.rb": 36.45673636599986,
-  "qa/specs/features/browser_ui/4_verify/pipeline/parent_child_pipelines_independent_relationship_spec.rb": 58.82185278499992,
-  "qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb": 42.403081290000046,
-  "qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb": 149.85470755100005,
-  "qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_with_manual_jobs_spec.rb": 50.89883141200016,
-  "qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb": 44.78671075300008,
-  "qa/specs/features/browser_ui/4_verify/pipeline/trigger_matrix_spec.rb": 32.12375235100001,
-  "qa/specs/features/browser_ui/4_verify/pipeline/update_ci_file_with_pipeline_editor_spec.rb": 20.63341818699996,
-  "qa/specs/features/browser_ui/4_verify/runner/fleet_management/group_runner_counts_spec.rb": 10.157025357999828,
-  "qa/specs/features/browser_ui/4_verify/runner/fleet_management/group_runner_status_counts_spec.rb": 14.983221184000058,
-  "qa/specs/features/browser_ui/4_verify/runner/register_group_runner_spec.rb": 10.514455229000077,
-  "qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb": 18.13358168099967,
-  "qa/specs/features/browser_ui/4_verify/testing/endpoint_coverage_spec.rb": 35.76304038599983,
-  "qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb": 42.05816078700013,
-  "qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb": 31.686695261000068,
-  "qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb": 49.87885218400004,
-  "qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb": 34.36321494200001,
-  "qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb": 144.980374235,
-  "qa/specs/features/browser_ui/5_package/package_registry/maven/maven_group_level_spec.rb": 360.92151482300005,
-  "qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb": 150.15723534799986,
-  "qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb": 136.13819214399996,
-  "qa/specs/features/browser_ui/5_package/package_registry/npm/npm_group_level_spec.rb": 192.52999090000003,
-  "qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb": 183.16166350100002,
-  "qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb": 50.5702839329997,
-  "qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb": 14.971665118000033,
-  "qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb": 110.33423504300026,
-  "qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb": 10.932732566999903,
-  "qa/specs/features/browser_ui/8_monitor/alert_management/alert_settings_create_new_alerts_spec.rb": 28.898326267000357,
-  "qa/specs/features/browser_ui/8_monitor/alert_management/automatically_creates_incident_for_alert_spec.rb": 32.88440417899983,
-  "qa/specs/features/browser_ui/8_monitor/alert_management/create_alert_using_authorization_key_spec.rb": 30.428553857000225,
-  "qa/specs/features/browser_ui/8_monitor/alert_management/recovery_alert_resolves_correct_alert_spec.rb": 40.65821105299983,
-  "qa/specs/features/browser_ui/9_data_stores/group/group_member_access_request_spec.rb": 69.0673923659997,
-  "qa/specs/features/browser_ui/9_data_stores/group/transfer_project_spec.rb": 22.13317842100014,
-  "qa/specs/features/browser_ui/9_data_stores/project/add_project_member_spec.rb": 14.512742338999942,
-  "qa/specs/features/browser_ui/9_data_stores/project/create_project_badge_spec.rb": 16.419005202000335,
-  "qa/specs/features/browser_ui/9_data_stores/project/create_project_spec.rb": 23.331705375999718,
-  "qa/specs/features/browser_ui/9_data_stores/project/dashboard_images_spec.rb": 16.30081602300004,
-  "qa/specs/features/browser_ui/9_data_stores/project/invite_group_to_project_spec.rb": 58.298898994999945,
-  "qa/specs/features/browser_ui/9_data_stores/project/project_owner_permissions_spec.rb": 51.102430441000024,
-  "qa/specs/features/browser_ui/9_data_stores/project/view_project_activity_spec.rb": 14.038119108000046,
-  "qa/specs/features/browser_ui/9_data_stores/user/follow_user_activity_spec.rb": 18.661561350000056,
-  "qa/specs/features/browser_ui/9_data_stores/user/parent_group_access_termination_spec.rb": 26.20017358599989,
-  "qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb": 23.727169318999586,
-  "qa/specs/features/ee/api/10_govern/compliance_pipeline_spec.rb": 14.230563544999768,
-  "qa/specs/features/ee/api/10_govern/instance_audit_event_streaming_spec.rb": 14.22414006200006,
-  "qa/specs/features/ee/api/10_govern/user/minimal_access_user_spec.rb": 48.28243208599997,
-  "qa/specs/features/ee/api/2_plan/epics_milestone_dates_spec.rb": 24.16354903199999,
-  "qa/specs/features/ee/api/3_create/code_suggestions_spec.rb": 12.572733440000036,
-  "qa/specs/features/ee/browser_ui/10_govern/change_vulnerability_status_spec.rb": 68.61389828400024,
-  "qa/specs/features/ee/browser_ui/10_govern/create_merge_request_with_secure_spec.rb": 50.011880293999866,
-  "qa/specs/features/ee/browser_ui/10_govern/export_vulnerability_report_spec.rb": 19.24138949500002,
-  "qa/specs/features/ee/browser_ui/10_govern/fix_vulnerability_workflow_spec.rb": 85.92190458799996,
-  "qa/specs/features/ee/browser_ui/10_govern/group/group_audit_event_streaming_spec.rb": 25.921691762000137,
-  "qa/specs/features/ee/browser_ui/10_govern/group/group_audit_logs_1_spec.rb": 109.84475951299999,
-  "qa/specs/features/ee/browser_ui/10_govern/group/restrict_by_ip_address_spec.rb": 209.49803926899995,
-  "qa/specs/features/ee/browser_ui/10_govern/group_pipeline_execution_policy_spec.rb": 127.72439350100012,
-  "qa/specs/features/ee/browser_ui/10_govern/instance/instance_audit_logs_spec.rb": 132.9845808350001,
-  "qa/specs/features/ee/browser_ui/10_govern/project/project_audit_logs_spec.rb": 124.79136410800015,
-  "qa/specs/features/ee/browser_ui/10_govern/project_security_dashboard_spec.rb": 32.404924101000006,
-  "qa/specs/features/ee/browser_ui/10_govern/scan_execution_policy_vulnerabilities_spec.rb": 90.34270750299993,
-  "qa/specs/features/ee/browser_ui/10_govern/scan_result_policy_vulnerabilities_spec.rb": 73.92341833399996,
-  "qa/specs/features/ee/browser_ui/10_govern/security_policies_spec.rb": 49.21381796800006,
-  "qa/specs/features/ee/browser_ui/10_govern/security_reports_spec.rb": 172.6255000389997,
-  "qa/specs/features/ee/browser_ui/10_govern/user/minimal_access_user_spec.rb": 20.043817780999916,
-  "qa/specs/features/ee/browser_ui/10_govern/vulnerability_management_spec.rb": 261.28464171700034,
-  "qa/specs/features/ee/browser_ui/11_fulfillment/license/license_spec.rb": 7.501284284999883,
-  "qa/specs/features/ee/browser_ui/11_fulfillment/utilization/user_registration_billing_spec.rb": 15.795260276999898,
-  "qa/specs/features/ee/browser_ui/13_secure/enable_advanced_sast_spec.rb": 74.9842102069997,
-  "qa/specs/features/ee/browser_ui/13_secure/enable_scanning_from_configuration_spec.rb": 50.713501423000025,
-  "qa/specs/features/ee/browser_ui/13_secure/on_demand_dast_spec.rb": 94.28897494800003,
-  "qa/specs/features/ee/browser_ui/2_plan/analytics/contribution_analytics_spec.rb": 28.131016550000027,
-  "qa/specs/features/ee/browser_ui/2_plan/analytics/mr_analytics_spec.rb": 43.30277173699983,
-  "qa/specs/features/ee/browser_ui/2_plan/analytics/value_stream_analytics_spec.rb": 33.68210793000026,
-  "qa/specs/features/ee/browser_ui/2_plan/burndown_chart/burndown_chart_spec.rb": 12.955446931000097,
-  "qa/specs/features/ee/browser_ui/2_plan/custom_email/custom_email_spec.rb": 12.208983900000021,
-  "qa/specs/features/ee/browser_ui/2_plan/epic/epics_management_spec.rb": 158.4215048420001,
-  "qa/specs/features/ee/browser_ui/2_plan/epic/promote_issue_to_epic_spec.rb": 33.01069102800011,
-  "qa/specs/features/ee/browser_ui/2_plan/epic/roadmap_spec.rb": 8.259949558000017,
-  "qa/specs/features/ee/browser_ui/2_plan/group_wiki/create_group_wiki_page_spec.rb": 25.861441487999855,
-  "qa/specs/features/ee/browser_ui/2_plan/group_wiki/delete_group_wiki_page_spec.rb": 10.608916837999914,
-  "qa/specs/features/ee/browser_ui/2_plan/group_wiki/file_upload_group_wiki_page_spec.rb": 28.67545881199976,
-  "qa/specs/features/ee/browser_ui/2_plan/insights/default_insights_spec.rb": 27.49661202900006,
-  "qa/specs/features/ee/browser_ui/2_plan/issue/default_issue_template_spec.rb": 17.888848881000058,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/configurable_issue_board_spec.rb": 11.857604426999842,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/configure_issue_board_by_label_spec.rb": 13.318511218000367,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/create_group_issue_board_spec.rb": 18.71652893999999,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/group_issue_boards_spec.rb": 19.94479222999962,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/project_issue_boards_spec.rb": 47.67097838999962,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/read_only_board_configuration_spec.rb": 20.099411936000024,
-  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/sum_of_issues_weights_spec.rb": 12.640246061000084,
-  "qa/specs/features/ee/browser_ui/2_plan/issues_analytics/issues_analytics_spec.rb": 30.00575052099998,
-  "qa/specs/features/ee/browser_ui/2_plan/issues_weight/issue_weight_visualization_spec.rb": 12.941392978000067,
-  "qa/specs/features/ee/browser_ui/2_plan/iterations/assign_group_iteration_spec.rb": 16.032257479000236,
-  "qa/specs/features/ee/browser_ui/2_plan/iterations/create_group_iteration_spec.rb": 38.549332582000034,
-  "qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/four_assignees_spec.rb": 14.220769124999833,
-  "qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb": 37.273302462999936,
-  "qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb": 12.753879795000103,
-  "qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb": 49.9373758429997,
-  "qa/specs/features/ee/browser_ui/3_create/merge_request/approval_rules_spec.rb": 83.34420719600007,
-  "qa/specs/features/ee/browser_ui/3_create/merge_request/default_merge_request_template_spec.rb": 35.74193098000001,
-  "qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb": 31.49351207000018,
-  "qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb": 20.113167300999976,
-  "qa/specs/features/ee/browser_ui/3_create/repository/code_owners_with_protected_branch_and_squashed_commits_spec.rb": 22.566818372999933,
-  "qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb": 148.86333409300005,
-  "qa/specs/features/ee/browser_ui/3_create/repository/group_file_template_spec.rb": 96.78819865899993,
-  "qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_root_group_spec.rb": 91.5671666899998,
-  "qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_subgroup_spec.rb": 126.88817487399979,
-  "qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb": 63.82498676599971,
-  "qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb": 30.712793918999978,
-  "qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb": 37.274831491999976,
-  "qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb": 305.9995597960001,
-  "qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb": 266.46528617599984,
-  "qa/specs/features/ee/browser_ui/3_create/web_ide/code_suggestions_in_web_ide_spec.rb": 57.34347684400018,
-  "qa/specs/features/ee/browser_ui/4_verify/multi-project_pipelines_spec.rb": 32.21118624199994,
-  "qa/specs/features/ee/browser_ui/4_verify/parent_child_pipelines_dependent_relationship_spec.rb": 75.41926421400012,
-  "qa/specs/features/ee/browser_ui/4_verify/pipeline_subscription_with_group_owned_project_spec.rb": 44.61706870600028,
-  "qa/specs/features/ee/browser_ui/4_verify/pipelines_for_merged_results_and_merge_trains_spec.rb": 73.5016436740002,
-  "qa/specs/features/ee/browser_ui/4_verify/transient/merge_trains_transient_bug_spec.rb": 93.12980337499994,
-  "qa/specs/features/ee/browser_ui/8_monitor/incident_management/incident_quick_action_spec.rb": 11.34621108899978,
-  "qa/specs/features/ee/browser_ui/9_data_stores/group/prevent_forking_outside_group_spec.rb": 32.30694202300003,
-  "qa/specs/features/ee/browser_ui/9_data_stores/group/share_group_with_group_spec.rb": 25.535255447000054
+  "qa/specs/features/api/10_govern/group_access_token_spec.rb": 15.425241971000105,
+  "qa/specs/features/api/10_govern/project_access_token_spec.rb": 28.911620068999923,
+  "qa/specs/features/api/1_manage/rate_limits_spec.rb": 12.08891531800009,
+  "qa/specs/features/api/2_plan/closes_issue_via_pushing_a_commit_spec.rb": 6.4455891180000435,
+  "qa/specs/features/api/3_create/merge_request/push_options_labels_spec.rb": 10.312491282999986,
+  "qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb": 21.331359243000065,
+  "qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb": 27.241382060999968,
+  "qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb": 14.500023344000056,
+  "qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb": 18.299927167000078,
+  "qa/specs/features/api/3_create/merge_request/view_merge_requests_spec.rb": 1.6573299970000335,
+  "qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb": 7.923013953999998,
+  "qa/specs/features/api/3_create/repository/commit_to_templated_project_spec.rb": 4.6597208210000645,
+  "qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb": 6.64623276999987,
+  "qa/specs/features/api/3_create/repository/files_spec.rb": 6.235417659000177,
+  "qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb": 5.524450885000078,
+  "qa/specs/features/api/3_create/repository/push_postreceive_idempotent_spec.rb": 15.903861686999903,
+  "qa/specs/features/api/3_create/repository/storage_size_spec.rb": 14.083023065000134,
+  "qa/specs/features/api/3_create/repository/tag_revision_trigger_prereceive_hook_spec.rb": 4.040831269999899,
+  "qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb": 32.80597708199991,
+  "qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb": 8.493835464000085,
+  "qa/specs/features/api/4_verify/file_variable_spec.rb": 29.481967012999917,
+  "qa/specs/features/api/4_verify/job_downloads_artifacts_spec.rb": 18.087888943000053,
+  "qa/specs/features/api/9_data_stores/user_inherited_access_spec.rb": 75.87421072699999,
+  "qa/specs/features/api/9_data_stores/users_spec.rb": 6.157319376000032,
+  "qa/specs/features/browser_ui/10_govern/group/group_access_token_spec.rb": 10.420833067999865,
+  "qa/specs/features/browser_ui/10_govern/login/2fa_recovery_spec.rb": 36.59264892099998,
+  "qa/specs/features/browser_ui/10_govern/login/2fa_ssh_recovery_spec.rb": 39.575658503999875,
+  "qa/specs/features/browser_ui/10_govern/login/log_in_spec.rb": 9.683900150000227,
+  "qa/specs/features/browser_ui/10_govern/login/log_in_with_2fa_spec.rb": 88.27080831300009,
+  "qa/specs/features/browser_ui/10_govern/login/login_via_oauth_and_oidc_with_gitlab_as_idp_spec.rb": 500.00038096599974,
+  "qa/specs/features/browser_ui/10_govern/login/register_spec.rb": 165.35724537700003,
+  "qa/specs/features/browser_ui/10_govern/project/project_access_token_spec.rb": 15.866092778999928,
+  "qa/specs/features/browser_ui/10_govern/user/impersonation_token_spec.rb": 30.553035852999983,
+  "qa/specs/features/browser_ui/10_govern/user/user_access_termination_spec.rb": 38.21410447799997,
+  "qa/specs/features/browser_ui/14_analytics/performance_bar_spec.rb": 22.633119883999825,
+  "qa/specs/features/browser_ui/14_analytics/service_ping_default_enabled_spec.rb": 9.224151141999982,
+  "qa/specs/features/browser_ui/1_manage/integrations/jenkins/jenkins_build_status_spec.rb": 68.4373554440001,
+  "qa/specs/features/browser_ui/2_plan/design_management/add_design_content_spec.rb": 14.918358538999883,
+  "qa/specs/features/browser_ui/2_plan/design_management/archive_design_content_spec.rb": 18.697007570999972,
+  "qa/specs/features/browser_ui/2_plan/design_management/modify_design_content_spec.rb": 21.970209801999772,
+  "qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb": 13.145640175999915,
+  "qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb": 15.599928299000112,
+  "qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb": 12.990415860000212,
+  "qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb": 38.29708552400007,
+  "qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb": 14.27186041899995,
+  "qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb": 15.433096964000015,
+  "qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb": 18.080824043000007,
+  "qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb": 15.59049726399985,
+  "qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb": 13.56799606300001,
+  "qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb": 16.583120894999865,
+  "qa/specs/features/browser_ui/2_plan/issue_boards/focus_mode_spec.rb": 12.510112232999745,
+  "qa/specs/features/browser_ui/2_plan/milestone/assign_milestone_spec.rb": 59.20723889100009,
+  "qa/specs/features/browser_ui/2_plan/milestone/create_group_milestone_spec.rb": 20.269890024999995,
+  "qa/specs/features/browser_ui/2_plan/milestone/create_project_milestone_spec.rb": 13.738146939999979,
+  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_content_creation_spec.rb": 56.27693195300003,
+  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_content_manipulation_spec.rb": 50.985899152,
+  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_directory_management_spec.rb": 12.208452825000222,
+  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_file_upload_spec.rb": 28.433104614000058,
+  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_list_spec.rb": 36.73259511800006,
+  "qa/specs/features/browser_ui/2_plan/project_wiki/project_based_page_deletion_spec.rb": 44.374364992999745,
+  "qa/specs/features/browser_ui/2_plan/related_issues/related_issues_spec.rb": 21.243798665999975,
+  "qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb": 170.97194661700007,
+  "qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_a_merge_spec.rb": 30.132673152000052,
+  "qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_commit_spec.rb": 17.00821341599999,
+  "qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb": 60.26460518700014,
+  "qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb": 36.59814307800002,
+  "qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb": 27.808095261999824,
+  "qa/specs/features/browser_ui/3_create/merge_request/merge_request_set_to_auto_merge_spec.rb": 58.769328663000124,
+  "qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb": 53.10056706499995,
+  "qa/specs/features/browser_ui/3_create/merge_request/revert/revert_commit_spec.rb": 17.47140780000018,
+  "qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb": 37.81267201399987,
+  "qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb": 19.261154968000028,
+  "qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb": 44.76700553300043,
+  "qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb": 36.663554702000056,
+  "qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb": 31.096152288999747,
+  "qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb": 64.932878071,
+  "qa/specs/features/browser_ui/3_create/repository/add_new_branch_rule_spec.rb": 19.81620413299993,
+  "qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb": 14.268388877000007,
+  "qa/specs/features/browser_ui/3_create/repository/clone_spec.rb": 11.163335635000067,
+  "qa/specs/features/browser_ui/3_create/repository/file/create_file_via_web_spec.rb": 13.077931468999964,
+  "qa/specs/features/browser_ui/3_create/repository/file/delete_file_via_web_spec.rb": 16.419978368999978,
+  "qa/specs/features/browser_ui/3_create/repository/file/edit_file_via_web_spec.rb": 13.351148745999808,
+  "qa/specs/features/browser_ui/3_create/repository/file/file_with_unusual_name_spec.rb": 15.171237282999755,
+  "qa/specs/features/browser_ui/3_create/repository/license_detection_spec.rb": 10.109008182999787,
+  "qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb": 88.46836561300006,
+  "qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb": 14.186355595999885,
+  "qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb": 14.019389108000041,
+  "qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb": 10.417132017999847,
+  "qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb": 28.010147877999998,
+  "qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb": 23.055913207000003,
+  "qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb": 44.4276202420001,
+  "qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb": 14.470907328000067,
+  "qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb": 22.410055795000062,
+  "qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb": 10.655095102999894,
+  "qa/specs/features/browser_ui/3_create/repository/push_to_canary_gitaly_spec.rb": 19.16348959900006,
+  "qa/specs/features/browser_ui/3_create/repository/ssh_key_support_create_spec.rb": 12.637896248999823,
+  "qa/specs/features/browser_ui/3_create/repository/ssh_key_support_delete_spec.rb": 12.06916886099998,
+  "qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb": 32.52989067600015,
+  "qa/specs/features/browser_ui/3_create/snippet/add_comment_to_snippet_spec.rb": 33.45310520199996,
+  "qa/specs/features/browser_ui/3_create/snippet/add_file_to_snippet_spec.rb": 30.126679453999714,
+  "qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_personal_snippet_spec.rb": 41.92563711599996,
+  "qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_project_snippet_spec.rb": 44.30942762500001,
+  "qa/specs/features/browser_ui/3_create/snippet/copy_snippet_file_contents_spec.rb": 45.93417747199999,
+  "qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb": 12.157557834999807,
+  "qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_with_multiple_files_spec.rb": 9.768244112999923,
+  "qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_spec.rb": 12.880597634999958,
+  "qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_with_multiple_files_spec.rb": 16.204747894000093,
+  "qa/specs/features/browser_ui/3_create/snippet/delete_file_from_snippet_spec.rb": 26.078842897999948,
+  "qa/specs/features/browser_ui/3_create/snippet/share_snippet_spec.rb": 28.16667222299975,
+  "qa/specs/features/browser_ui/3_create/snippet/snippet_index_page_spec.rb": 59.117412539999805,
+  "qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb": 15.14234975699992,
+  "qa/specs/features/browser_ui/3_create/web_ide/add_first_file_in_web_ide_spec.rb": 38.482433547999904,
+  "qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb": 62.56358468099984,
+  "qa/specs/features/browser_ui/3_create/web_ide/closing_web_ide_with_unsaved_changes_spec.rb": 16.518747809999923,
+  "qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb": 67.28606065399981,
+  "qa/specs/features/browser_ui/4_verify/ci_components_catalog/ci_catalog_sorting_spec.rb": 72.0671143489999,
+  "qa/specs/features/browser_ui/4_verify/ci_components_catalog/run_component_in_project_pipeline_spec.rb": 42.29229531399983,
+  "qa/specs/features/browser_ui/4_verify/ci_job_artifacts/expose_job_artifacts_in_mr_spec.rb": 28.91499562199988,
+  "qa/specs/features/browser_ui/4_verify/ci_job_artifacts/job_artifacts_access_keyword_spec.rb": 184.30315739900016,
+  "qa/specs/features/browser_ui/4_verify/ci_job_artifacts/unlocking_job_artifacts_across_pipelines_spec.rb": 220.9421917100001,
+  "qa/specs/features/browser_ui/4_verify/ci_project_artifacts/user_can_bulk_delete_artifacts_spec.rb": 25.117599974999848,
+  "qa/specs/features/browser_ui/4_verify/ci_variable/custom_variable_spec.rb": 32.053852044999985,
+  "qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb": 49.39451691799968,
+  "qa/specs/features/browser_ui/4_verify/ci_variable/prefill_variables_spec.rb": 34.17246401199964,
+  "qa/specs/features/browser_ui/4_verify/ci_variable/raw_variables_defined_in_yaml_spec.rb": 14.927786583999932,
+  "qa/specs/features/browser_ui/4_verify/ci_variable/ui_variable_inheritable_when_forward_pipeline_variables_true_spec.rb": 44.48199885800011,
+  "qa/specs/features/browser_ui/4_verify/pipeline/include_local_config_file_paths_with_wildcard_spec.rb": 20.276354085000094,
+  "qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb": 42.49206834400002,
+  "qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_multiple_projects_spec.rb": 37.114004585999965,
+  "qa/specs/features/browser_ui/4_verify/pipeline/parent_child_pipelines_independent_relationship_spec.rb": 54.705967097999974,
+  "qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb": 30.66671742099993,
+  "qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb": 162.0406272790001,
+  "qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_with_manual_jobs_spec.rb": 46.93902114100001,
+  "qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb": 37.96672088300011,
+  "qa/specs/features/browser_ui/4_verify/pipeline/trigger_matrix_spec.rb": 27.286383801000056,
+  "qa/specs/features/browser_ui/4_verify/pipeline/update_ci_file_with_pipeline_editor_spec.rb": 17.953723093000008,
+  "qa/specs/features/browser_ui/4_verify/runner/fleet_management/group_runner_counts_spec.rb": 10.501649467999869,
+  "qa/specs/features/browser_ui/4_verify/runner/fleet_management/group_runner_status_counts_spec.rb": 10.585564216999956,
+  "qa/specs/features/browser_ui/4_verify/runner/register_group_runner_spec.rb": 15.114181859999917,
+  "qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb": 14.94034092200036,
+  "qa/specs/features/browser_ui/4_verify/testing/endpoint_coverage_spec.rb": 37.515968992000126,
+  "qa/specs/features/browser_ui/5_package/container_registry/saas/container_registry_spec.rb": 161.929755257,
+  "qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb": 38.44790879499999,
+  "qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb": 30.780442516999983,
+  "qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb": 51.027441183000064,
+  "qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb": 34.785906141000055,
+  "qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb": 142.783813377,
+  "qa/specs/features/browser_ui/5_package/package_registry/maven/maven_group_level_spec.rb": 357.603752686,
+  "qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb": 129.91997316099992,
+  "qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb": 133.31030956899997,
+  "qa/specs/features/browser_ui/5_package/package_registry/npm/npm_group_level_spec.rb": 171.18959565399973,
+  "qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb": 153.06889392099993,
+  "qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb": 75.43211731699989,
+  "qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb": 14.799753331000147,
+  "qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb": 121.35513414000002,
+  "qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb": 8.036244611999791,
+  "qa/specs/features/browser_ui/8_monitor/alert_management/alert_settings_create_new_alerts_spec.rb": 27.378791085000103,
+  "qa/specs/features/browser_ui/8_monitor/alert_management/automatically_creates_incident_for_alert_spec.rb": 57.55833424599996,
+  "qa/specs/features/browser_ui/8_monitor/alert_management/create_alert_using_authorization_key_spec.rb": 25.886994342000435,
+  "qa/specs/features/browser_ui/8_monitor/alert_management/recovery_alert_resolves_correct_alert_spec.rb": 33.78736214700007,
+  "qa/specs/features/browser_ui/9_data_stores/group/group_member_access_request_spec.rb": 55.11882397499994,
+  "qa/specs/features/browser_ui/9_data_stores/group/transfer_project_spec.rb": 26.31985958200005,
+  "qa/specs/features/browser_ui/9_data_stores/project/add_project_member_spec.rb": 15.53842659799966,
+  "qa/specs/features/browser_ui/9_data_stores/project/create_project_badge_spec.rb": 16.006048744000054,
+  "qa/specs/features/browser_ui/9_data_stores/project/create_project_spec.rb": 30.656852196000045,
+  "qa/specs/features/browser_ui/9_data_stores/project/dashboard_images_spec.rb": 17.960968790999914,
+  "qa/specs/features/browser_ui/9_data_stores/project/invite_group_to_project_spec.rb": 47.56833079299986,
+  "qa/specs/features/browser_ui/9_data_stores/project/project_owner_permissions_spec.rb": 51.30201512699978,
+  "qa/specs/features/browser_ui/9_data_stores/project/view_project_activity_spec.rb": 13.049029904999998,
+  "qa/specs/features/browser_ui/9_data_stores/user/follow_user_activity_spec.rb": 26.164037661999828,
+  "qa/specs/features/browser_ui/9_data_stores/user/parent_group_access_termination_spec.rb": 29.325225401000353,
+  "qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb": 27.37847492700007,
+  "qa/specs/features/ee/api/10_govern/compliance_pipeline_spec.rb": 11.446925809000277,
+  "qa/specs/features/ee/api/10_govern/instance_audit_event_streaming_spec.rb": 19.528170649000003,
+  "qa/specs/features/ee/api/10_govern/user/minimal_access_user_spec.rb": 49.35228287199993,
+  "qa/specs/features/ee/api/2_plan/epics_milestone_dates_spec.rb": 27.65342108899995,
+  "qa/specs/features/ee/api/3_create/code_suggestions_spec.rb": 14.154004533999796,
+  "qa/specs/features/ee/browser_ui/10_govern/change_vulnerability_status_spec.rb": 53.64636296100002,
+  "qa/specs/features/ee/browser_ui/10_govern/create_merge_request_with_secure_spec.rb": 48.32760649800002,
+  "qa/specs/features/ee/browser_ui/10_govern/dismissed_vulnerabilities_in_security_widget_spec.rb": 72.59846131600011,
+  "qa/specs/features/ee/browser_ui/10_govern/export_vulnerability_report_spec.rb": 16.91001244899985,
+  "qa/specs/features/ee/browser_ui/10_govern/fix_vulnerability_workflow_spec.rb": 92.91337562700005,
+  "qa/specs/features/ee/browser_ui/10_govern/group/group_audit_event_streaming_spec.rb": 36.01038865999999,
+  "qa/specs/features/ee/browser_ui/10_govern/group/group_audit_logs_1_spec.rb": 103.6155932109998,
+  "qa/specs/features/ee/browser_ui/10_govern/group/restrict_by_ip_address_spec.rb": 135.06330376200003,
+  "qa/specs/features/ee/browser_ui/10_govern/group_pipeline_execution_policy_spec.rb": 102.21765843599997,
+  "qa/specs/features/ee/browser_ui/10_govern/instance/instance_audit_logs_spec.rb": 124.38350801700017,
+  "qa/specs/features/ee/browser_ui/10_govern/project/project_audit_logs_spec.rb": 136.77156860799994,
+  "qa/specs/features/ee/browser_ui/10_govern/project_security_dashboard_spec.rb": 32.37603405799996,
+  "qa/specs/features/ee/browser_ui/10_govern/scan_execution_policy_vulnerabilities_spec.rb": 54.88447414200027,
+  "qa/specs/features/ee/browser_ui/10_govern/scan_result_policy_vulnerabilities_spec.rb": 70.36499393500026,
+  "qa/specs/features/ee/browser_ui/10_govern/security_policies_spec.rb": 57.73944694699992,
+  "qa/specs/features/ee/browser_ui/10_govern/security_reports_spec.rb": 184.53598404700006,
+  "qa/specs/features/ee/browser_ui/10_govern/user/minimal_access_user_spec.rb": 13.689834766000104,
+  "qa/specs/features/ee/browser_ui/10_govern/vulnerability_management_spec.rb": 237.5684578759999,
+  "qa/specs/features/ee/browser_ui/10_govern/vulnerability_security_training_spec.rb": 95.67733030999989,
+  "qa/specs/features/ee/browser_ui/11_fulfillment/license/license_spec.rb": 6.4070160869998745,
+  "qa/specs/features/ee/browser_ui/11_fulfillment/utilization/user_registration_billing_spec.rb": 16.82448476000002,
+  "qa/specs/features/ee/browser_ui/13_secure/enable_advanced_sast_spec.rb": 71.40419379700006,
+  "qa/specs/features/ee/browser_ui/13_secure/enable_scanning_from_configuration_spec.rb": 93.69220874100029,
+  "qa/specs/features/ee/browser_ui/13_secure/on_demand_dast_spec.rb": 99.11383369600003,
+  "qa/specs/features/ee/browser_ui/13_secure/secret_push_protection_spec.rb": 36.55590918600001,
+  "qa/specs/features/ee/browser_ui/2_plan/analytics/contribution_analytics_spec.rb": 38.861460823000016,
+  "qa/specs/features/ee/browser_ui/2_plan/analytics/mr_analytics_spec.rb": 42.100793964999866,
+  "qa/specs/features/ee/browser_ui/2_plan/analytics/value_stream_analytics_spec.rb": 34.64903568099999,
+  "qa/specs/features/ee/browser_ui/2_plan/burndown_chart/burndown_chart_spec.rb": 11.08605167099995,
+  "qa/specs/features/ee/browser_ui/2_plan/custom_email/custom_email_spec.rb": 11.043028996999965,
+  "qa/specs/features/ee/browser_ui/2_plan/epic/epics_management_spec.rb": 158.38501607199987,
+  "qa/specs/features/ee/browser_ui/2_plan/epic/promote_issue_to_epic_spec.rb": 29.078233841999918,
+  "qa/specs/features/ee/browser_ui/2_plan/epic/roadmap_spec.rb": 8.639924599000096,
+  "qa/specs/features/ee/browser_ui/2_plan/group_wiki/create_group_wiki_page_spec.rb": 28.027906622000046,
+  "qa/specs/features/ee/browser_ui/2_plan/group_wiki/delete_group_wiki_page_spec.rb": 12.300748253999927,
+  "qa/specs/features/ee/browser_ui/2_plan/group_wiki/file_upload_group_wiki_page_spec.rb": 29.62340313200002,
+  "qa/specs/features/ee/browser_ui/2_plan/insights/default_insights_spec.rb": 18.283567156000004,
+  "qa/specs/features/ee/browser_ui/2_plan/issue/default_issue_template_spec.rb": 16.321950733999984,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/configurable_issue_board_spec.rb": 13.719650034000097,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/configure_issue_board_by_label_spec.rb": 13.145406395999998,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/create_group_issue_board_spec.rb": 17.587557800000013,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/group_issue_boards_spec.rb": 16.629420280000204,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/project_issue_boards_spec.rb": 37.547538146999614,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/read_only_board_configuration_spec.rb": 21.533178745999976,
+  "qa/specs/features/ee/browser_ui/2_plan/issue_boards/sum_of_issues_weights_spec.rb": 13.553936185000111,
+  "qa/specs/features/ee/browser_ui/2_plan/issues_analytics/issues_analytics_spec.rb": 17.290569968,
+  "qa/specs/features/ee/browser_ui/2_plan/issues_weight/issue_weight_visualization_spec.rb": 13.638428706000013,
+  "qa/specs/features/ee/browser_ui/2_plan/iterations/assign_group_iteration_spec.rb": 15.982846396000014,
+  "qa/specs/features/ee/browser_ui/2_plan/iterations/create_group_iteration_spec.rb": 26.423559993000026,
+  "qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/four_assignees_spec.rb": 12.564020601000038,
+  "qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb": 28.7701003599999,
+  "qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb": 15.469393948999937,
+  "qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb": 48.18718820699996,
+  "qa/specs/features/ee/browser_ui/3_create/merge_request/approval_rules_spec.rb": 73.81069494500002,
+  "qa/specs/features/ee/browser_ui/3_create/merge_request/default_merge_request_template_spec.rb": 39.37686660999998,
+  "qa/specs/features/ee/browser_ui/3_create/merge_request/generate_commit_message_spec.rb": 32.599853260000145,
+  "qa/specs/features/ee/browser_ui/3_create/remote_development/workspace_actions_spec.rb": 619.9602889590024,
+  "qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb": 27.409235652000007,
+  "qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb": 14.678348806000031,
+  "qa/specs/features/ee/browser_ui/3_create/repository/code_owners_with_protected_branch_and_squashed_commits_spec.rb": 25.79720430899988,
+  "qa/specs/features/ee/browser_ui/3_create/repository/duo_chat_explain_code_spec.rb": 22.85742775700055,
+  "qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb": 152.64467531300033,
+  "qa/specs/features/ee/browser_ui/3_create/repository/group_file_template_spec.rb": 104.870111641,
+  "qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_root_group_spec.rb": 78.48488789700014,
+  "qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_subgroup_spec.rb": 114.10849951900013,
+  "qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb": 61.332789723999895,
+  "qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb": 24.90695193700003,
+  "qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb": 37.411741556999914,
+  "qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb": 301.76254431899997,
+  "qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb": 191.0541494600002,
+  "qa/specs/features/ee/browser_ui/3_create/web_ide/code_suggestions_in_web_ide_spec.rb": 70.09894354400603,
+  "qa/specs/features/ee/browser_ui/3_create/web_ide/duo_chat_in_web_ide_spec.rb": 39.59394969900313,
+  "qa/specs/features/ee/browser_ui/4_verify/multi-project_pipelines_spec.rb": 27.946861486000216,
+  "qa/specs/features/ee/browser_ui/4_verify/parent_child_pipelines_dependent_relationship_spec.rb": 51.345765706000066,
+  "qa/specs/features/ee/browser_ui/4_verify/pipeline_for_merged_result_spec.rb": 39.79808591699998,
+  "qa/specs/features/ee/browser_ui/4_verify/pipeline_subscription_with_group_owned_project_spec.rb": 49.42561705999992,
+  "qa/specs/features/ee/browser_ui/8_monitor/incident_management/incident_quick_action_spec.rb": 12.953126879000138,
+  "qa/specs/features/ee/browser_ui/9_data_stores/group/prevent_forking_outside_group_spec.rb": 39.884931140999925,
+  "qa/specs/features/ee/browser_ui/9_data_stores/group/share_group_with_group_spec.rb": 24.70188353599997
 }
\ No newline at end of file
diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping
index c072040421b..561cea8f7f8 100755
--- a/scripts/verify-tff-mapping
+++ b/scripts/verify-tff-mapping
@@ -81,6 +81,14 @@ tests = [
     changed_file: 'tooling/danger/specs/project_factory_suggestion.rb',
     expected: ['spec/tooling/danger/specs/project_factory_suggestion_spec.rb']
   },
+  {
+    explanation: 'tests.yml map to related tooling specs',
+    changed_file: 'tests.yml',
+    expected: [
+      'spec/tooling/lib/tooling/find_tests_spec.rb',
+      'spec/tooling/lib/tooling/predictive_tests_spec.rb'
+    ]
+  },
 
   {
     explanation: 'Map RuboCop related files to respective specs',
@@ -203,13 +211,19 @@ tests = [
   {
     explanation: 'Spec for FOSS model',
     changed_file: 'app/models/uploads/base.rb',
-    expected: ['spec/models/every_model_spec.rb']
+    expected: [
+      'spec/models/every_model_spec.rb',
+      'spec/lib/gitlab/import_export/model_configuration_spec.rb'
+    ]
   },
 
   {
     explanation: 'Spec for EE model',
     changed_file: 'ee/app/models/geo/base_registry.rb',
-    expected: ['spec/models/every_model_spec.rb']
+    expected: [
+      'spec/models/every_model_spec.rb',
+      'spec/lib/gitlab/import_export/model_configuration_spec.rb'
+    ]
   },
 
   {
@@ -687,6 +701,11 @@ tests = [
       spec/lib/gitlab/database/no_new_tables_with_gitlab_main_schema_spec.rb
       spec/lib/gitlab/database/sharding_key_spec.rb
     ]
+  },
+  {
+    explanation: 'Verify attributes to be imported/exported',
+    changed_file: 'spec/lib/gitlab/import_export/all_models.yml',
+    expected: ['spec/lib/gitlab/import_export/model_configuration_spec.rb']
   }
 ]
 
diff --git a/spec/frontend/content_editor/components/wrappers/__snapshots__/table_of_contents_spec.js.snap b/spec/frontend/content_editor/components/wrappers/__snapshots__/table_of_contents_spec.js.snap
index 2f1ab4faafb..0996f9f072c 100644
--- a/spec/frontend/content_editor/components/wrappers/__snapshots__/table_of_contents_spec.js.snap
+++ b/spec/frontend/content_editor/components/wrappers/__snapshots__/table_of_contents_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`content/components/wrappers/table_of_contents collects all headings and renders a nested list of headings 1`] = `
 <div
-  class="!gl-p-4 gl-border-1 gl-border-gray-100 gl-border-solid gl-mb-5 table-of-contents"
+  class="!gl-p-4 gl-border-1 gl-border-default gl-border-solid gl-mb-5 table-of-contents"
   data-testid="table-of-contents"
 >
   Table of contents
diff --git a/spec/frontend/content_editor/components/wrappers/html_comment_spec.js b/spec/frontend/content_editor/components/wrappers/html_comment_spec.js
index c86fa27693e..310d310876f 100644
--- a/spec/frontend/content_editor/components/wrappers/html_comment_spec.js
+++ b/spec/frontend/content_editor/components/wrappers/html_comment_spec.js
@@ -26,7 +26,7 @@ describe('content/components/wrappers/html_comment', () => {
 
     const classList = wrapper.findComponent(NodeViewWrapper).attributes('class');
 
-    expect(classList).toContain('gl-border-dashed gl-border-gray-100');
+    expect(classList).toContain('gl-border-dashed gl-border-default');
     expect(classList).not.toContain('gl-border-solid gl-border-blue-400');
   });
 
@@ -36,6 +36,6 @@ describe('content/components/wrappers/html_comment', () => {
     const classList = wrapper.findComponent(NodeViewWrapper).attributes('class');
 
     expect(classList).toContain('gl-border-solid gl-border-blue-400');
-    expect(classList).not.toContain('gl-border-dashed gl-border-gray-100');
+    expect(classList).not.toContain('gl-border-dashed gl-border-default');
   });
 });
diff --git a/spec/frontend/deployments/components/deployment_aside_spec.js b/spec/frontend/deployments/components/deployment_aside_spec.js
index 24cedf710ed..be2e440121b 100644
--- a/spec/frontend/deployments/components/deployment_aside_spec.js
+++ b/spec/frontend/deployments/components/deployment_aside_spec.js
@@ -271,7 +271,7 @@ describe('~/deployments/components/deployment_header.vue', () => {
 
         expect(sidebarItems.classes()).not.toContain('gl-border-t-1');
         expect(sidebarItems.classes()).not.toContain('gl-mt-5');
-        expect(sidebarItems.classes()).not.toContain('gl-border-gray-100');
+        expect(sidebarItems.classes()).not.toContain('gl-border-default');
         expect(sidebarItems.classes()).not.toContain('gl-border-t-solid');
       });
     });
@@ -313,7 +313,7 @@ describe('~/deployments/components/deployment_header.vue', () => {
 
         expect(urlButtonWrapper.classes()).not.toContain('gl-mt-5');
         expect(urlButtonWrapper.classes()).not.toContain('gl-border-b-1');
-        expect(urlButtonWrapper.classes()).not.toContain('gl-border-gray-100');
+        expect(urlButtonWrapper.classes()).not.toContain('gl-border-default');
         expect(urlButtonWrapper.classes()).not.toContain('gl-pb-5');
         expect(urlButtonWrapper.classes()).not.toContain('gl-border-b-solid');
       });
diff --git a/spec/frontend/issues/show/components/app_spec.js b/spec/frontend/issues/show/components/app_spec.js
index 6b55a130c41..971214b9906 100644
--- a/spec/frontend/issues/show/components/app_spec.js
+++ b/spec/frontend/issues/show/components/app_spec.js
@@ -400,7 +400,7 @@ describe('Issuable output', () => {
     });
 
     const findIncidentTabs = () => wrapper.findComponent(IncidentTabs);
-    const borderClass = 'gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid gl-mb-6';
+    const borderClass = 'gl-border-b-1 gl-border-b-default gl-border-b-solid gl-mb-6';
 
     describe('when using description component', () => {
       it('renders the description component', () => {
diff --git a/spec/frontend/ml/model_registry/apps/show_ml_model_spec.js b/spec/frontend/ml/model_registry/apps/show_ml_model_spec.js
index 9ae7617a207..522a3733d2c 100644
--- a/spec/frontend/ml/model_registry/apps/show_ml_model_spec.js
+++ b/spec/frontend/ml/model_registry/apps/show_ml_model_spec.js
@@ -122,6 +122,8 @@ describe('ml/model_registry/apps/show_ml_model', () => {
   const findLoadOrErrorOrShow = () => wrapper.findComponent(LoadOrErrorOrShow);
   const findModelEditButton = () => wrapper.findByTestId('edit-model-button');
   const findTimeAgoTooltip = () => wrapper.findComponent(TimeAgoTooltip);
+  const findCandidateTab = () => wrapper.findAllComponents(GlTab).at(2);
+  const findCandidatesCountBadge = () => findCandidateTab().findComponent(GlBadge);
 
   describe('Title', () => {
     beforeEach(() => createWrapper());
@@ -227,6 +229,10 @@ describe('ml/model_registry/apps/show_ml_model', () => {
     it('shows model card', () => {
       expect(findDetailTab().exists()).toBe(true);
     });
+
+    it('shows the number of candidates in the tab', () => {
+      expect(findCandidatesCountBadge().text()).toBe(model.candidateCount.toString());
+    });
   });
 
   describe('Model loading', () => {
@@ -260,10 +266,10 @@ describe('ml/model_registry/apps/show_ml_model', () => {
       expect(findCandidateList().exists()).toBe(false);
     });
 
-    it('shows model version list when location hash is `#/versions`', async () => {
+    it('shows model version list when clicks versions tabs', async () => {
       await createWrapper({ mountFn: mountExtended });
 
-      await wrapper.vm.$router.push({ path: '/versions' });
+      await findVersionsTab().vm.$emit('click');
 
       expect(findTabs().props('value')).toBe(1);
       expect(findModelDetail().exists()).toBe(false);
@@ -271,12 +277,28 @@ describe('ml/model_registry/apps/show_ml_model', () => {
       expect(findCandidateList().exists()).toBe(false);
     });
 
+    it('shows candidate list when user clicks candidates tab', async () => {
+      await createWrapper({ mountFn: mountExtended });
+
+      await findCandidateTab().vm.$emit('click');
+
+      expect(findTabs().props('value')).toBe(2);
+      expect(findModelDetail().exists()).toBe(false);
+      expect(findModelVersionList().exists()).toBe(false);
+      expect(findCandidateList().props('modelId')).toBe(model.id);
+    });
+
     describe.each`
-      location        | tab                | navigatedTo
-      ${'#/'}         | ${findDetailTab}   | ${0}
-      ${'#/'}         | ${findVersionsTab} | ${1}
-      ${'#/versions'} | ${findDetailTab}   | ${0}
-      ${'#/versions'} | ${findVersionsTab} | ${1}
+      location          | tab                 | navigatedTo
+      ${'#/'}           | ${findDetailTab}    | ${0}
+      ${'#/'}           | ${findVersionsTab}  | ${1}
+      ${'#/'}           | ${findCandidateTab} | ${2}
+      ${'#/versions'}   | ${findDetailTab}    | ${0}
+      ${'#/versions'}   | ${findVersionsTab}  | ${1}
+      ${'#/versions'}   | ${findCandidateTab} | ${2}
+      ${'#/candidates'} | ${findDetailTab}    | ${0}
+      ${'#/candidates'} | ${findVersionsTab}  | ${1}
+      ${'#/candidates'} | ${findCandidateTab} | ${2}
     `('When at $location', ({ location, tab, navigatedTo }) => {
       beforeEach(async () => {
         setWindowLocation(location);
diff --git a/spec/frontend/packages_and_registries/infrastructure_registry/components/details/components/__snapshots__/file_sha_spec.js.snap b/spec/frontend/packages_and_registries/infrastructure_registry/components/details/components/__snapshots__/file_sha_spec.js.snap
index 961a4c48ad8..c5473dbee91 100644
--- a/spec/frontend/packages_and_registries/infrastructure_registry/components/details/components/__snapshots__/file_sha_spec.js.snap
+++ b/spec/frontend/packages_and_registries/infrastructure_registry/components/details/components/__snapshots__/file_sha_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`FileSha renders 1`] = `
 <div
-  class="gl-align-items-top gl-border-b-1 gl-border-b-solid gl-border-gray-100 gl-break-all gl-flex gl-font-monospace gl-py-2 gl-text-sm"
+  class="gl-align-items-top gl-border-b-1 gl-border-b-solid gl-border-default gl-break-all gl-flex gl-font-monospace gl-py-2 gl-text-sm"
 >
   <div>
     <div
diff --git a/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
index ddf79af2e54..619c5f3838a 100644
--- a/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`packages_list_row renders 1`] = `
 <div
-  class="gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid gl-border-t-1 gl-border-t-solid gl-border-t-transparent gl-flex gl-flex-col"
+  class="gl-border-b-1 gl-border-b-default gl-border-b-solid gl-border-t-1 gl-border-t-solid gl-border-t-transparent gl-flex gl-flex-col"
   data-testid="package-row"
 >
   <div
diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/__snapshots__/file_sha_spec.js.snap b/spec/frontend/packages_and_registries/package_registry/components/details/__snapshots__/file_sha_spec.js.snap
index 961a4c48ad8..c5473dbee91 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/details/__snapshots__/file_sha_spec.js.snap
+++ b/spec/frontend/packages_and_registries/package_registry/components/details/__snapshots__/file_sha_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`FileSha renders 1`] = `
 <div
-  class="gl-align-items-top gl-border-b-1 gl-border-b-solid gl-border-gray-100 gl-break-all gl-flex gl-font-monospace gl-py-2 gl-text-sm"
+  class="gl-align-items-top gl-border-b-1 gl-border-b-solid gl-border-default gl-break-all gl-flex gl-font-monospace gl-py-2 gl-text-sm"
 >
   <div>
     <div
diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
index d6a425e51d9..6f070d7d69d 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`packages_list_row renders 1`] = `
 <div
-  class="gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid gl-border-t-1 gl-border-t-solid gl-border-t-transparent gl-flex gl-flex-col"
+  class="gl-border-b-1 gl-border-b-default gl-border-b-solid gl-border-t-1 gl-border-t-solid gl-border-t-transparent gl-flex gl-flex-col"
   data-testid="package-row"
 >
   <div
diff --git a/spec/frontend/vue_shared/components/registry/details_row_spec.js b/spec/frontend/vue_shared/components/registry/details_row_spec.js
index 9ef1ce5647d..08e7aef7106 100644
--- a/spec/frontend/vue_shared/components/registry/details_row_spec.js
+++ b/spec/frontend/vue_shared/components/registry/details_row_spec.js
@@ -52,7 +52,7 @@ describe('DetailsRow', () => {
   });
 
   describe('dashed prop', () => {
-    const borderClasses = ['gl-border-b-solid', 'gl-border-gray-100', 'gl-border-b-1'];
+    const borderClasses = ['gl-border-b-solid', 'gl-border-default', 'gl-border-b-1'];
     it('by default component has no border', () => {
       mountComponent();
       expect(wrapper.classes).not.toEqual(expect.arrayContaining(borderClasses));
diff --git a/spec/frontend/vue_shared/components/registry/list_item_spec.js b/spec/frontend/vue_shared/components/registry/list_item_spec.js
index f2fe8eb8b48..f5a72599d4c 100644
--- a/spec/frontend/vue_shared/components/registry/list_item_spec.js
+++ b/spec/frontend/vue_shared/components/registry/list_item_spec.js
@@ -140,10 +140,10 @@ describe('list item', () => {
   describe('borders and selection', () => {
     it.each`
       first    | selected | shouldHave                                 | shouldNotHave
-      ${true}  | ${true}  | ${['gl-bg-blue-50', 'gl-border-blue-200']} | ${['gl-border-t-transparent', 'gl-border-t-gray-100']}
-      ${false} | ${true}  | ${['gl-bg-blue-50', 'gl-border-blue-200']} | ${['gl-border-t-transparent', 'gl-border-t-gray-100']}
-      ${true}  | ${false} | ${['gl-border-b-gray-100']}                | ${['gl-bg-blue-50', 'gl-border-blue-200']}
-      ${false} | ${false} | ${['gl-border-b-gray-100']}                | ${['gl-bg-blue-50', 'gl-border-blue-200']}
+      ${true}  | ${true}  | ${['gl-bg-blue-50', 'gl-border-blue-200']} | ${['gl-border-t-transparent', 'gl-border-t-default']}
+      ${false} | ${true}  | ${['gl-bg-blue-50', 'gl-border-blue-200']} | ${['gl-border-t-transparent', 'gl-border-t-default']}
+      ${true}  | ${false} | ${['gl-border-b-default']}                 | ${['gl-bg-blue-50', 'gl-border-blue-200']}
+      ${false} | ${false} | ${['gl-border-b-default']}                 | ${['gl-bg-blue-50', 'gl-border-blue-200']}
     `(
       'when first is $first and selected is $selected',
       ({ first, selected, shouldHave, shouldNotHave }) => {
diff --git a/spec/tooling/lib/tooling/predictive_tests_spec.rb b/spec/tooling/lib/tooling/predictive_tests_spec.rb
index e49daa70295..6371e128c09 100644
--- a/spec/tooling/lib/tooling/predictive_tests_spec.rb
+++ b/spec/tooling/lib/tooling/predictive_tests_spec.rb
@@ -106,8 +106,15 @@ RSpec.describe Tooling::PredictiveTests, feature_category: :tooling do
       context 'when some files used for frontend fixtures were changed' do
         let(:changed_files_content) { 'app/models/todo.rb' }
         let(:changed_files_matching_test) { 'spec/models/todo_spec.rb' }
-        let(:additional_matching_tests) { 'spec/models/every_model_spec.rb' }
         let(:matching_frontend_fixture) { 'tmp/tests/frontend/fixtures-ee/todos/todos.html' }
+
+        let(:additional_matching_tests) do
+          %w[
+            spec/models/every_model_spec.rb
+            spec/lib/gitlab/import_export/model_configuration_spec.rb
+          ].sort.join(' ')
+        end
+
         let(:fixtures_mapping_content) do
           JSON.dump(changed_files_matching_test => [matching_frontend_fixture]) # rubocop:disable Gitlab/Json
         end
diff --git a/tests.yml b/tests.yml
index f0188dbd280..57dbd2b02f9 100644
--- a/tests.yml
+++ b/tests.yml
@@ -37,6 +37,12 @@ mapping:
   - source: 'tooling/(?<rest>.+)\.rb'
     test: 'spec/tooling/%{rest}_spec.rb'
 
+  # Trigger tooling related specs when this file changes
+  - source: 'tests\.yml'
+    test:
+      - 'spec/tooling/lib/tooling/find_tests_spec.rb'
+      - 'spec/tooling/lib/tooling/predictive_tests_spec.rb'
+
   # RuboCop related specs
   - source: 'rubocop/(?<rest>.+)\.rb'
     test: 'spec/rubocop/%{rest}_spec.rb'
@@ -318,3 +324,9 @@ mapping:
   # duo enterprise trials
   - source: 'ee/app/controllers/gitlab_subscriptions/trials/duo_enterprise_controller\.rb'
     test: 'ee/spec/features/gitlab_subscriptions/trials/duo_enterprise/*_spec.rb'
+
+  # Import/Export checks
+  - source:
+      - 'spec/lib/gitlab/import_export/all_models\.yml'
+      - '(?<prefix>ee/)?app/models/.+\.rb'
+    test: 'spec/lib/gitlab/import_export/model_configuration_spec.rb'