From 11c99a1a7ac7ef3093f1c96aba6755b93ddb283f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 31 Jul 2024 18:11:27 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/style/string_concatenation.yml  |  1 -
 .../cycle_analytics/components/base.vue       |  4 +-
 .../cycle_analytics/components/filter_bar.vue |  2 +-
 .../components/path_navigation.vue            | 28 +++++------
 .../components/stage_table.vue                | 28 +++++------
 .../components/value_stream_filters.vue       |  8 ++--
 .../components/devops_score.vue               |  4 +-
 .../components/date_ranges_dropdown.vue       |  2 +-
 .../analytics/shared/components/daterange.vue | 10 ++--
 .../shared/components/metric_popover.vue      |  8 ++--
 .../shared/components/metric_tile.vue         |  2 +-
 .../components/projects_dropdown_filter.vue   | 10 ++--
 .../components/value_stream_metrics.vue       |  8 ++--
 .../value_streams_dashboard_link.vue          |  6 +--
 .../usage_trends/components/usage_counts.vue  |  6 +--
 .../components/error_tracking_form.vue        |  2 +-
 .../javascripts/issues/list/constants.js      | 48 +++++++++----------
 app/assets/javascripts/issues/list/utils.js   | 24 ++++------
 .../issues/service_desk/constants.js          | 42 ++++++++--------
 .../javascripts/issues/service_desk/utils.js  |  8 ++--
 .../components/mr_widget_pipeline.vue         |  2 +-
 .../components/alert_details.vue              | 15 +++---
 .../alert_details/components/alert_status.vue |  2 +-
 .../components/alert_summary_row.vue          |  4 +-
 .../components/sidebar/sidebar_assignees.vue  | 20 ++++----
 .../components/sidebar/sidebar_header.vue     |  2 +-
 .../components/sidebar/sidebar_status.vue     | 10 ++--
 .../components/sidebar/sidebar_todo.vue       |  2 +-
 .../components/system_notes/system_note.vue   |  6 +--
 .../components/alert_details_table.vue        |  4 +-
 .../vue_shared/components/awards_list.vue     |  2 +-
 .../components/badges/beta_badge.stories.js   |  2 +-
 .../badges/experiment_badge.stories.js        |  2 +-
 .../components/blob_viewers/simple_viewer.vue | 23 +++------
 .../ci_cd_analytics_charts.vue                |  2 +-
 .../code_dropdown/code_dropdown.vue           |  6 +--
 .../code_dropdown/code_dropdown_item.vue      |  2 +-
 .../code_dropdown/snippet_code_dropdown.vue   |  2 +-
 .../components/color_picker/color_picker.vue  | 10 ++--
 .../color_select_dropdown/dropdown_header.vue |  6 +--
 .../vue_shared/components/commit.vue          |  2 +-
 .../viewers/download_viewer.vue               |  2 +-
 .../vue_shared/components/crud_component.vue  | 14 +++---
 .../components/deployment_instance.vue        |  2 +-
 .../design_management/design_disclosure.vue   |  2 +-
 .../design_management/design_note_pin.vue     |  2 +-
 .../components/diff_stats_dropdown.vue        | 20 ++++----
 .../components/dismissible_container.vue      |  2 +-
 .../components/dropdown/dropdown_button.vue   |  2 +-
 .../dropdown_widget/dropdown_widget.vue       |  4 +-
 .../components/file_finder/index.vue          |  2 +-
 .../components/file_finder/item.vue           |  2 +-
 .../vue_shared/components/file_row_header.vue |  2 +-
 .../filtered_search_bar_root.vue              |  2 +-
 .../tokens/branch_token.vue                   |  4 +-
 .../tokens/crm_contact_token.vue              |  2 +-
 .../tokens/daterange_token.vue                |  2 +-
 .../tokens/emoji_token.vue                    |  2 +-
 .../tokens/label_token.vue                    |  6 +--
 .../filtered_search_bar/tokens/user_token.vue |  4 +-
 .../components/form/errors_alert.vue          |  2 +-
 .../components/form/form_footer_actions.vue   |  2 +-
 .../form/input_copy_toggle_visibility.vue     |  3 +-
 .../components/groups_list/groups_list.vue    |  2 +-
 .../groups_list/groups_list_item.vue          |  2 +-
 .../components/incubation/pagination.vue      |  2 +-
 .../issuable_blocked_icon.vue                 | 10 ++--
 .../components/list_selector/group_item.vue   |  2 +-
 .../components/logs_viewer/line_number.vue    |  2 +-
 .../components/logs_viewer/logs_viewer.vue    |  2 +-
 .../components/markdown/non_gfm_markdown.vue  |  4 +-
 .../metric_images/metric_images_table.vue     | 24 ++++------
 .../components/mr_more_dropdown.vue           | 14 +++---
 .../vue_shared/components/navigation_tabs.vue |  2 +-
 .../new_resource_dropdown.vue                 |  4 +-
 .../components/notes/placeholder_note.vue     |  2 +-
 .../components/notes/skeleton_note.vue        |  2 +-
 .../components/notes/system_note.vue          | 19 ++++----
 .../components/notes/timeline_icon.vue        |  2 +-
 .../number_to_human_size.stories.js           |  2 +-
 .../vue_shared/components/page_heading.vue    |  4 +-
 .../constants.js                              |  5 +-
 .../paginated_table_with_search_and_tabs.vue  |  6 +--
 .../pagination_bar/pagination_bar.vue         |  2 +-
 .../components/papa_parse_alert.vue           |  2 +-
 .../project_selector/project_list_item.vue    |  6 +--
 .../project_selector/project_selector.vue     |  8 ++--
 .../projects_list/projects_list.vue           |  2 +-
 .../projects_list/projects_list_item.vue      |  2 +-
 .../components/registry/details_row.vue       |  4 +-
 .../components/registry/history_item.vue      |  2 +-
 .../components/registry/list_item.vue         |  2 +-
 .../components/registry/metadata_item.vue     | 10 ++--
 .../components/registry/registry_search.vue   |  6 +--
 .../components/registry/title_area.vue        | 30 +++++-------
 .../components/settings/settings_block.vue    |  8 ++--
 .../components/settings/settings_section.vue  |  2 +-
 .../vue_shared/components/toggle_labels.vue   |  4 +-
 .../tooltip_on_truncate.stories.js            |  6 +--
 .../components/usage_quotas/usage_banner.vue  |  2 +-
 .../components/user_access_role_badge.vue     |  2 +-
 .../components/user_popover/user_popover.vue  | 10 ++--
 .../vue_shared/components/web_ide_link.vue    | 10 ++--
 .../list/components/issuable_list_root.vue    |  2 +-
 .../components/issuable_sidebar_root.vue      |  2 +-
 .../components/section_layout.vue             |  6 +--
 app/assets/stylesheets/framework/common.scss  |  5 --
 app/helpers/access_tokens_helper.rb           |  2 +
 app/helpers/application_settings_helper.rb    |  4 +-
 .../application_setting_implementation.rb     |  3 +-
 app/models/commit_status.rb                   |  2 +-
 app/models/container_repository.rb            |  1 -
 app/models/deploy_key.rb                      |  1 -
 app/models/epic.rb                            |  2 -
 app/models/personal_access_token.rb           |  2 +-
 app/models/project_pages_metadatum.rb         |  1 -
 app/models/sent_notification.rb               |  2 -
 .../bulk_imports/file_download_service.rb     |  2 +-
 .../personal_access_tokens/create_service.rb  |  6 ++-
 .../personal_access_tokens/rotate_service.rb  | 32 ++++++++-----
 .../resource_access_tokens/create_service.rb  |  8 +++-
 .../_account_and_limit.html.haml              |  1 +
 ...ire_personal_access_token_expiry.html.haml |  7 +++
 config/gitlab_loose_foreign_keys.yml          |  4 ++
 ...10216180441_issues_created_from_alerts.yml |  4 +-
 config/sidekiq_queues.yml                     |  2 +
 ...bility_occurrence_pipelines_project_id.yml |  9 ++++
 db/docs/vulnerability_flags.yml               |  4 +-
 .../vulnerability_occurrence_pipelines.yml    |  1 +
 ...uire_pat_expiry_to_application_settings.rb |  9 ++++
 ...d_to_vulnerability_occurrence_pipelines.rb |  9 ++++
 ...backfill_vulnerability_flags_project_id.rb |  4 +-
 ...jects_vulnerability_flags_project_id_fk.rb | 21 ++++++++
 ...lity_occurrence_pipelines_on_project_id.rb | 16 +++++++
 ...occurrence_pipelines_project_id_trigger.rb | 25 ++++++++++
 ...ability_occurrence_pipelines_project_id.rb | 40 ++++++++++++++++
 db/schema_migrations/20240702181131           |  1 +
 db/schema_migrations/20240715151939           |  1 +
 db/schema_migrations/20240730172815           |  1 +
 db/schema_migrations/20240730172816           |  1 +
 db/schema_migrations/20240730172817           |  1 +
 db/schema_migrations/20240730172818           |  1 +
 db/structure.sql                              | 25 ++++++++--
 .../integration/diagrams_net.md               |  2 +-
 doc/administration/lfs/index.md               |  4 +-
 .../operations/fast_ssh_key_lookup.md         | 12 ++---
 .../settings/account_and_limit_settings.md    | 38 ++++++++++++++-
 .../settings/instance_template_repository.md  |  2 +-
 .../settings/push_event_activities_limit.md   |  2 +-
 doc/api/commits.md                            |  2 +-
 doc/api/graphql/branch_rules.md               |  2 +-
 doc/api/graphql/reference/index.md            | 12 +++++
 doc/api/projects.md                           |  2 +
 doc/api/protected_branches.md                 |  2 +-
 doc/api/repository_submodules.md              |  2 +-
 doc/api/settings.md                           |  4 ++
 doc/api/tags.md                               |  2 +-
 doc/development/code_owners/index.md          |  2 +-
 doc/development/developing_with_solargraph.md |  2 +-
 .../styleguide/availability_details.md        | 20 +++++++-
 doc/development/fe_guide/source_editor.md     |  4 +-
 doc/development/fips_compliance.md            |  6 +--
 .../specification_guide/index.md              |  6 +--
 doc/development/gitlab_shell/features.md      |  4 +-
 doc/development/gitlab_shell/index.md         |  4 +-
 doc/development/internal_api/index.md         | 19 ++++----
 .../internal_api/internal_api_allowed.md      |  2 +-
 doc/development/lfs.md                        |  2 +-
 .../merge_request_concepts/rate_limits.md     |  4 +-
 doc/development/project_templates.md          |  6 +--
 doc/development/rails_endpoints/index.md      |  2 +-
 .../repository_storage_moves/index.md         |  8 ++--
 doc/development/workhorse/channel.md          |  2 +-
 doc/development/workhorse/configuration.md    | 12 ++---
 doc/development/workhorse/handlers.md         |  2 +-
 doc/raketasks/x509_signatures.md              |  2 +-
 doc/security/reset_user_password.md           |  2 +-
 doc/security/token_overview.md                |  2 +
 doc/topics/git/get_started.md                 |  6 +--
 doc/topics/git/troubleshooting_git.md         |  4 +-
 doc/user/asciidoc.md                          |  2 +-
 .../get_started/get_started_managing_code.md  |  8 ++--
 doc/user/gitlab_com/index.md                  |  8 ++--
 doc/user/gitlab_duo/index.md                  |  2 +-
 doc/user/group/ssh_certificates.md            |  4 +-
 doc/user/project/codeowners/reference.md      |  2 +-
 .../project/codeowners/troubleshooting.md     |  2 +-
 doc/user/project/file_lock.md                 |  4 +-
 doc/user/project/integrations/git_guardian.md |  9 ++--
 .../merge_requests/duo_in_merge_requests.md   |  2 +-
 doc/user/project/protected_branches.md        |  2 +-
 doc/user/project/repository/index.md          |  2 +-
 .../repository/mirror/bidirectional.md        |  4 +-
 doc/user/project/repository/mirror/pull.md    |  2 +-
 .../repository/mirror/troubleshooting.md      |  2 +-
 .../reducing_the_repo_size_using_git.md       |  2 +-
 .../repository/signed_commits/web_commits.md  |  2 +-
 .../project/repository/signed_commits/x509.md |  4 +-
 doc/user/snippets.md                          |  2 +-
 lib/api/entities/project_upload.rb            |  3 ++
 .../helpers/personal_access_tokens_helpers.rb |  2 +-
 lib/api/resource_access_tokens.rb             | 12 ++---
 lib/api/settings.rb                           |  1 +
 .../backfill_desired_sharding_key_job.rb      |  8 +++-
 ...ability_occurrence_pipelines_project_id.rb | 10 ++++
 .../fp/settings/env_var_override_processor.rb |  2 +
 .../issues_created_from_alerts_metric.rb      | 29 -----------
 ...ues_with_alert_management_alerts_metric.rb |  4 --
 .../issues_with_prometheus_alert_events.rb    | 24 ----------
 lib/gitlab/usage_data.rb                      |  7 ---
 locale/gitlab.pot                             |  6 +++
 package.json                                  |  1 +
 scripts/frontend/tailwind_equivalents.json    |  5 +-
 .../application_settings_controller_spec.rb   |  1 +
 spec/db/schema_spec.rb                        |  1 +
 spec/factories/usage_data.rb                  | 10 +---
 .../components/alert_management_table_spec.js |  4 +-
 spec/frontend/issues/list/mock_data.js        |  8 ++--
 spec/frontend/issues/list/utils_spec.js       | 26 +++++-----
 .../__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/mr_widget_pipeline_spec.js     |  8 ++--
 .../alert_details/alert_status_spec.js        |  4 +-
 .../vue_shared/components/awards_list_spec.js | 26 +++++-----
 .../__snapshots__/simple_viewer_spec.js.snap  | 14 +++---
 .../design_note_pin_spec.js.snap              |  8 ++--
 .../metric_images_table_spec.js.snap          |  8 ++--
 .../components/page_heading_spec.js           |  6 ++-
 .../settings/settings_section_spec.js         |  4 +-
 spec/helpers/access_tokens_helper_spec.rb     | 12 ++++-
 ...ty_occurrence_pipelines_project_id_spec.rb | 15 ++++++
 .../database/no_cross_db_foreign_keys_spec.rb |  3 +-
 .../env_var_override_processor_spec.rb        | 10 ++++
 ...ith_alert_management_alerts_metric_spec.rb | 17 +++++++
 spec/lib/gitlab/usage_data_spec.rb            |  1 -
 .../settings/settings_integration_spec.rb     | 11 +++++
 ...ill_vulnerability_flags_project_id_spec.rb |  2 +-
 ...ty_occurrence_pipelines_project_id_spec.rb | 33 +++++++++++++
 spec/models/personal_access_token_spec.rb     | 12 +++++
 spec/requests/api/markdown_uploads_spec.rb    |  1 +
 .../api/personal_access_tokens_spec.rb        | 16 +++++++
 spec/requests/api/settings_spec.rb            |  5 +-
 .../file_download_service_spec.rb             | 28 +++++++----
 .../create_service_spec.rb                    | 10 ++++
 .../create_service_spec.rb                    | 13 +++++
 .../value_streams_dashboard_helpers.rb        | 18 +++++++
 ...every_metric_definition_shared_examples.rb |  3 +-
 ...value_streams_dashboard_shared_examples.rb | 11 +----
 ...ll_desired_sharding_key_shared_examples.rb | 23 ++++++++-
 251 files changed, 1039 insertions(+), 695 deletions(-)
 create mode 100644 app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml
 create mode 100644 db/docs/batched_background_migrations/backfill_vulnerability_occurrence_pipelines_project_id.yml
 create mode 100644 db/migrate/20240702181131_add_require_pat_expiry_to_application_settings.rb
 create mode 100644 db/migrate/20240730172815_add_project_id_to_vulnerability_occurrence_pipelines.rb
 create mode 100644 db/post_migrate/20240715151939_remove_projects_vulnerability_flags_project_id_fk.rb
 create mode 100644 db/post_migrate/20240730172816_prepare_index_vulnerability_occurrence_pipelines_on_project_id.rb
 create mode 100644 db/post_migrate/20240730172817_add_vulnerability_occurrence_pipelines_project_id_trigger.rb
 create mode 100644 db/post_migrate/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id.rb
 create mode 100644 db/schema_migrations/20240702181131
 create mode 100644 db/schema_migrations/20240715151939
 create mode 100644 db/schema_migrations/20240730172815
 create mode 100644 db/schema_migrations/20240730172816
 create mode 100644 db/schema_migrations/20240730172817
 create mode 100644 db/schema_migrations/20240730172818
 create mode 100644 lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id.rb
 delete mode 100644 lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb
 delete mode 100644 lib/gitlab/usage/metrics/instrumentations/issues_with_prometheus_alert_events.rb
 create mode 100644 spec/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id_spec.rb
 create mode 100644 spec/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric_spec.rb
 create mode 100644 spec/migrations/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id_spec.rb

diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml
index 2722f70f81b..1f5d2c9f0c2 100644
--- a/.rubocop_todo/style/string_concatenation.yml
+++ b/.rubocop_todo/style/string_concatenation.yml
@@ -108,7 +108,6 @@ Style/StringConcatenation:
     - 'lib/gitlab/throttle.rb'
     - 'lib/gitlab/time_tracking_formatter.rb'
     - 'lib/gitlab/untrusted_regexp.rb'
-    - 'lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb'
     - 'lib/gitlab/usage_data_queries.rb'
     - 'lib/google_api/cloud_platform/client.rb'
     - 'lib/kramdown/converter/commonmark.rb'
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
index 44dbe46ed10..d54193bd6a3 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
@@ -177,11 +177,11 @@ export default {
       @setDateRange="onSetDateRange"
       @setPredefinedDateRange="setPredefinedDateRange"
     />
-    <div class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row">
+    <div class="gl-flex gl-flex-col md:gl-flex-row">
       <path-navigation
         v-if="displayPathNavigation"
         data-testid="vsa-path-navigation"
-        class="gl-w-full gl-mt-4"
+        class="gl-mt-4 gl-w-full"
         :loading="isLoading || isLoadingStage"
         :stages="pathNavigationData"
         :selected-stage="selectedStage"
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue b/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
index a613b6e007c..d074591502b 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/filter_bar.vue
@@ -145,7 +145,7 @@ export default {
 <template>
   <div>
     <filtered-search-bar
-      class="gl-flex-grow-1"
+      class="gl-grow"
       :namespace="namespacePath"
       recent-searches-storage-key="value-stream-analytics"
       :search-input-placeholder="__('Filter results')"
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue b/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue
index 0991fa8abfa..2d666f5a35f 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue
@@ -65,16 +65,16 @@ export default {
       >
         <template #title>{{ pathItem.title }}</template>
         <div class="gl-px-4">
-          <div class="gl-display-flex gl-justify-content-space-between">
-            <div class="gl-pr-4 gl-pb-3">
+          <div class="gl-flex gl-justify-between">
+            <div class="gl-pb-3 gl-pr-4">
               {{ s__('ValueStreamEvent|Stage time (median)') }}
             </div>
             <div class="gl-pb-3 gl-font-bold">{{ pathItem.metric }}</div>
           </div>
         </div>
         <div class="gl-px-4">
-          <div class="gl-display-flex gl-justify-content-space-between">
-            <div class="gl-pr-4 gl-pb-3">
+          <div class="gl-flex gl-justify-between">
+            <div class="gl-pb-3 gl-pr-4">
               {{ s__('ValueStreamEvent|Items in stage') }}
             </div>
             <div class="gl-pb-3 gl-font-bold">
@@ -87,29 +87,23 @@ export default {
             {{ s__('ValueStreamEvent|Only items that reached their stop event.') }}
           </div>
         </div>
-        <div class="gl-px-4 gl-pt-4 gl-border-t-1 gl-border-t-solid gl-border-gray-50">
-          <div
-            v-if="pathItem.startEventHtmlDescription"
-            class="gl-display-flex gl-flex-direction-row"
-          >
-            <div class="gl-display-flex gl-flex-direction-column gl-pr-4 gl-pb-3 metric-label">
+        <div class="gl-border-t-1 gl-border-gray-50 gl-px-4 gl-pt-4 gl-border-t-solid">
+          <div v-if="pathItem.startEventHtmlDescription" class="gl-flex gl-flex-row">
+            <div class="metric-label gl-flex gl-flex-col gl-pb-3 gl-pr-4">
               {{ s__('ValueStreamEvent|Start') }}
             </div>
             <div
               v-safe-html="pathItem.startEventHtmlDescription"
-              class="gl-display-flex gl-flex-direction-column gl-pb-3 stage-event-description"
+              class="stage-event-description gl-flex gl-flex-col gl-pb-3"
             ></div>
           </div>
-          <div
-            v-if="pathItem.endEventHtmlDescription"
-            class="gl-display-flex gl-flex-direction-row"
-          >
-            <div class="gl-display-flex gl-flex-direction-column gl-pr-4 metric-label">
+          <div v-if="pathItem.endEventHtmlDescription" class="gl-flex gl-flex-row">
+            <div class="metric-label gl-flex gl-flex-col gl-pr-4">
               {{ s__('ValueStreamEvent|Stop') }}
             </div>
             <div
               v-safe-html="pathItem.endEventHtmlDescription"
-              class="gl-display-flex gl-flex-direction-column stage-event-description"
+              class="stage-event-description gl-flex gl-flex-col"
             ></div>
           </div>
         </div>
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
index 498fbf792f9..3c6f3ce1df2 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
@@ -225,7 +225,7 @@ export default {
             <p class="gl-m-0">
               <gl-link
                 data-testid="vsa-stage-event-link"
-                class="gl-text-black-normal"
+                class="gl-text-default"
                 :href="item.url"
                 >{{ itemId(item.id, '#') }}</gl-link
               >
@@ -233,7 +233,7 @@ export default {
               <gl-link
                 v-if="item.branch"
                 :href="item.branch.url"
-                class="gl-text-black-normal ref-name"
+                class="ref-name gl-text-default"
                 >{{ item.branch.name }}</gl-link
               >
               <span class="icon-branch gl-text-gray-400">
@@ -243,37 +243,33 @@ export default {
             </p>
             <p class="gl-m-0">
               <span>
-                <gl-link class="gl-text-black-normal" :href="item.url">{{ item.date }}</gl-link>
+                <gl-link class="gl-text-default" :href="item.url">{{ item.date }}</gl-link>
                 {{ s__('ByAuthor|by') }}
-                <gl-link
-                  class="gl-text-black-normal issue-author-link"
-                  :href="item.author.webUrl"
-                  >{{ item.author.name }}</gl-link
-                >
+                <gl-link class="issue-author-link gl-text-default" :href="item.author.webUrl">{{
+                  item.author.name
+                }}</gl-link>
               </span>
             </p>
           </div>
           <div v-else>
-            <h5 class="gl-font-bold gl-my-1" data-testid="vsa-stage-event-title">
-              <gl-link class="gl-text-black-normal" :href="item.url">{{ itemTitle(item) }}</gl-link>
+            <h5 class="gl-my-1 gl-font-bold" data-testid="vsa-stage-event-title">
+              <gl-link class="gl-text-default" :href="item.url">{{ itemTitle(item) }}</gl-link>
             </h5>
             <p class="gl-m-0">
               <gl-link
                 data-testid="vsa-stage-event-link"
-                class="gl-text-black-normal"
+                class="gl-text-default"
                 :href="item.url"
                 >{{ itemDisplayName(item) }}</gl-link
               >
-              <span class="gl-font-lg">&middot;</span>
+              <span class="gl-text-lg">&middot;</span>
               <span data-testid="vsa-stage-event-date">
                 {{ s__('OpenedNDaysAgo|Created') }}
-                <gl-link class="gl-text-black-normal" :href="item.url">{{
-                  item.createdAt
-                }}</gl-link>
+                <gl-link class="gl-text-default" :href="item.url">{{ item.createdAt }}</gl-link>
               </span>
               <span data-testid="vsa-stage-event-author">
                 {{ s__('ByAuthor|by') }}
-                <gl-link class="gl-text-black-normal" :href="item.author.webUrl">{{
+                <gl-link class="gl-text-default" :href="item.author.webUrl">{{
                   item.author.name
                 }}</gl-link>
               </span>
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 8798cbbfabe..f0e8a6babb7 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,17 +130,17 @@ export default {
 </script>
 <template>
   <div
-    class="gl-mt-3 gl-py-5 gl-px-3 gl-bg-gray-10 gl-border-b-1 gl-border-b-solid gl-border-t-1 gl-border-t-solid gl-border-gray-100"
+    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"
   >
     <filter-bar
       data-testid="vsa-filter-bar"
-      class="filtered-search-box gl-display-flex gl-border-none"
+      class="filtered-search-box gl-flex gl-border-none"
       :namespace-path="namespacePath"
     />
     <hr v-if="shouldShowFilterDropdowns" class="gl-my-5" />
     <div
       v-if="shouldShowFilterDropdowns"
-      class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-gap-5"
+      class="gl-flex gl-flex-col gl-gap-5 lg:gl-flex-row"
       data-testid="vsa-filter-dropdowns-container"
     >
       <projects-dropdown-filter
@@ -155,7 +155,7 @@ export default {
       />
       <div
         v-if="shouldShowDateRangeFilters"
-        class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-gap-3"
+        class="gl-flex gl-flex-col gl-gap-3 lg:gl-flex-row"
         data-testid="vsa-date-range-filter-container"
       >
         <date-ranges-dropdown
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 a841555000e..86701f57381 100644
--- a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
+++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
@@ -6,7 +6,7 @@ import { sprintf, s__ } from '~/locale';
 import DevopsScoreCallout from './devops_score_callout.vue';
 
 const defaultHeaderAttrs = {
-  thClass: 'gl-bg-white!',
+  thClass: '!gl-bg-white',
   thAttr: { 'data-testid': 'header' },
 };
 
@@ -81,7 +81,7 @@ export default {
       </template>
     </gl-empty-state>
     <div v-else data-testid="devops-score-app">
-      <div class="gl-text-gray-400 gl-my-4" data-testid="devops-score-note-text">
+      <div class="gl-my-4 gl-text-gray-400" data-testid="devops-score-note-text">
         {{ titleHelperText }}
       </div>
       <gl-single-stat
diff --git a/app/assets/javascripts/analytics/shared/components/date_ranges_dropdown.vue b/app/assets/javascripts/analytics/shared/components/date_ranges_dropdown.vue
index 4c7b0ce5200..a5cf31cd126 100644
--- a/app/assets/javascripts/analytics/shared/components/date_ranges_dropdown.vue
+++ b/app/assets/javascripts/analytics/shared/components/date_ranges_dropdown.vue
@@ -130,7 +130,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-align-items-center gl-gap-3">
+  <div class="gl-flex gl-items-center gl-gap-3">
     <gl-collapsible-listbox v-model="selectedValue" :items="items" @select="onSelect" />
     <div v-if="showDateRangeString || showTooltip" class="gl-text-gray-500">
       <span v-if="showDateRangeString" data-testid="predefined-date-range-string">{{
diff --git a/app/assets/javascripts/analytics/shared/components/daterange.vue b/app/assets/javascripts/analytics/shared/components/daterange.vue
index 2126359cfe4..f49ab2e14d9 100644
--- a/app/assets/javascripts/analytics/shared/components/daterange.vue
+++ b/app/assets/javascripts/analytics/shared/components/daterange.vue
@@ -73,11 +73,11 @@ export default {
 <template>
   <div
     v-if="show"
-    class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row align-items-lg-center justify-content-lg-end"
+    class="align-items-lg-center justify-content-lg-end gl-flex gl-flex-col lg:gl-flex-row"
   >
     <gl-daterange-picker
       v-model="dateRange"
-      class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row"
+      class="gl-flex gl-flex-col lg:gl-flex-row"
       :default-start-date="startDate"
       :default-end-date="endDate"
       :default-min-date="minDate"
@@ -88,9 +88,9 @@ export default {
       :from-label="__('From')"
       :to-label="__('To')"
       theme="animate-picker"
-      start-picker-class="js-daterange-picker-from gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-lg-align-items-center gl-lg-mr-3 gl-mb-2 gl-lg-mb-0"
-      end-picker-class="js-daterange-picker-to gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-lg-align-items-center gl-mb-2 gl-lg-mb-0"
-      label-class="gl-mb-2 gl-lg-mb-0"
+      start-picker-class="js-daterange-picker-from gl-flex gl-flex-col lg:gl-flex-row lg:gl-items-center lg:gl-mr-3 gl-mb-2 lg:gl-mb-0"
+      end-picker-class="js-daterange-picker-to gl-flex gl-flex-col lg:gl-flex-row lg:gl-items-center gl-mb-2 lg:gl-mb-0"
+      label-class="gl-mb-2 lg:gl-mb-0"
     >
       <template #default="{ daysSelected }">
         {{ numberOfDays(daysSelected) }}
diff --git a/app/assets/javascripts/analytics/shared/components/metric_popover.vue b/app/assets/javascripts/analytics/shared/components/metric_popover.vue
index ed6d43e29d6..93989e5c520 100644
--- a/app/assets/javascripts/analytics/shared/components/metric_popover.vue
+++ b/app/assets/javascripts/analytics/shared/components/metric_popover.vue
@@ -34,14 +34,12 @@ export default {
 <template>
   <gl-popover :target="target" placement="top">
     <template #title>
-      <div
-        class="gl-display-flex gl-justify-content-space-between gl-text-right gl-py-1 gl-align-items-center"
-      >
+      <div class="gl-flex gl-items-center gl-justify-between gl-py-1 gl-text-right">
         <span data-testid="metric-label">{{ metric.label }}</span>
         <gl-link
           v-if="metricLink"
           :href="metricLink.url"
-          class="gl-font-sm gl-font-normal"
+          class="gl-text-sm gl-font-normal"
           data-testid="metric-link"
           >{{ $options.metricPopoverLabel }}
           <gl-icon name="chart" />
@@ -52,7 +50,7 @@ export default {
     <gl-link
       v-if="docsLink"
       :href="docsLink.url"
-      class="gl-font-sm"
+      class="gl-text-sm"
       target="_blank"
       data-testid="metric-docs-link"
       >{{ docsLink.label }}
diff --git a/app/assets/javascripts/analytics/shared/components/metric_tile.vue b/app/assets/javascripts/analytics/shared/components/metric_tile.vue
index cf97c81d544..f3b36433aa9 100644
--- a/app/assets/javascripts/analytics/shared/components/metric_tile.vue
+++ b/app/assets/javascripts/analytics/shared/components/metric_tile.vue
@@ -42,7 +42,7 @@ export default {
       :unit="metric.unit || ''"
       :should-animate="true"
       :animation-decimal-places="decimalPlaces"
-      :class="{ 'gl-hover-cursor-pointer': hasLinks }"
+      :class="{ 'hover:gl-cursor-pointer': hasLinks }"
       tabindex="0"
       use-delimiters
       @click="clickHandler(metric)"
diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
index 66f04e3e48b..1ddc805434b 100644
--- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
+++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
@@ -252,7 +252,7 @@ export default {
   >
     <template #toggle>
       <gl-button
-        button-text-classes="gl-w-full gl-justify-content-space-between gl-display-flex gl-shadow-none gl-mb-0"
+        button-text-classes="gl-w-full gl-justify-between gl-flex gl-shadow-none gl-mb-0"
         :class="['dropdown-projects', toggleClasses]"
       >
         <gl-avatar
@@ -263,14 +263,14 @@ export default {
           :size="16"
           :shape="$options.AVATAR_SHAPE_OPTION_RECT"
           :alt="selectedProjects[0].name"
-          class="gl-inline-flex gl-align-middle gl-mr-2 gl-flex-shrink-0"
+          class="gl-mr-2 gl-inline-flex gl-shrink-0 gl-align-middle"
         />
-        <gl-truncate :text="selectedProjectsLabel" class="gl-min-w-0 gl-flex-grow-1" />
-        <gl-icon class="gl-ml-2 gl-flex-shrink-0" name="chevron-down" />
+        <gl-truncate :text="selectedProjectsLabel" class="gl-min-w-0 gl-grow" />
+        <gl-icon class="gl-ml-2 gl-shrink-0" name="chevron-down" />
       </gl-button>
     </template>
     <template #list-item="{ item }">
-      <div class="gl-display-flex">
+      <div class="gl-flex">
         <gl-avatar
           class="gl-mr-2 gl-align-middle"
           :alt="item.name"
diff --git a/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue b/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue
index 3082897af76..c0d644caf31 100644
--- a/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue
+++ b/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue
@@ -116,10 +116,10 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-display-flex" data-testid="vsa-metrics" :class="isLoading ? 'gl-my-6' : 'gl-mt-6'">
+  <div class="gl-flex" data-testid="vsa-metrics" :class="isLoading ? 'gl-my-6' : 'gl-mt-6'">
     <gl-skeleton-loader v-if="isLoading" />
     <template v-else>
-      <div v-if="hasGroupedMetrics" class="gl-flex-direction-column">
+      <div v-if="hasGroupedMetrics" class="gl-flex-col">
         <div
           v-for="(group, groupIndex) in groupedMetrics"
           :key="group.key"
@@ -127,7 +127,7 @@ export default {
           data-testid="vsa-metrics-group"
         >
           <h4 class="gl-my-0">{{ group.title }}</h4>
-          <div class="gl-display-flex gl-flex-wrap">
+          <div class="gl-flex gl-flex-wrap">
             <metric-tile
               v-for="metric in group.data"
               :key="metric.identifier"
@@ -142,7 +142,7 @@ export default {
           </div>
         </div>
       </div>
-      <div v-else class="gl-display-flex gl-flex-wrap gl-mb-7">
+      <div v-else class="gl-mb-7 gl-flex gl-flex-wrap">
         <metric-tile
           v-for="metric in metrics"
           :key="metric.identifier"
diff --git a/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue b/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
index 6c79c8af54a..d430f3780b0 100644
--- a/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
+++ b/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
@@ -19,11 +19,11 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-display-flex gl-flex-direction-column" data-testid="vsd-link">
-    <div class="gl-display-flex gl-mb-2">
+  <div class="gl-flex gl-flex-col" data-testid="vsd-link">
+    <div class="gl-mb-2 gl-flex">
       <span>{{ $options.i18n.title }}</span>
     </div>
-    <div class="gl-display-flex gl-align-items-baseline">
+    <div class="gl-flex gl-items-baseline">
       <gl-link :href="requestPath">{{ $options.i18n.linkText }}</gl-link
       >&nbsp;<gl-icon name="dashboard" />
     </div>
diff --git a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue
index 57e92165ec1..e640c68f691 100644
--- a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue
+++ b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue
@@ -63,15 +63,13 @@ export default {
 <template>
   <div>
     <page-heading :heading="$options.i18n.pageTitle" />
-    <div
-      class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-my-6 gl-align-items-flex-start"
-    >
+    <div class="gl-my-6 gl-flex gl-flex-col gl-items-start md:gl-flex-row">
       <gl-skeleton-loader v-if="$apollo.queries.counts.loading" />
       <template v-else>
         <gl-single-stat
           v-for="count in counts"
           :key="count.key"
-          class="gl-pr-9 gl-my-4 gl-md-mt-0 gl-md-mb-0"
+          class="gl-my-4 gl-pr-9 md:gl-mb-0 md:gl-mt-0"
           :value="`${count.value}`"
           :title="count.label"
           :should-animate="true"
diff --git a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
index f98b5c94043..3ed41b5a3cc 100644
--- a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
+++ b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue
@@ -69,7 +69,7 @@ export default {
 
           <gl-icon
             v-show="connectSuccessful"
-            class="js-error-tracking-connect-success gl-ml-2 text-success align-middle"
+            class="js-error-tracking-connect-success gl-ml-2 gl-text-success align-middle"
             :aria-label="__('Projects Successfully Retrieved')"
             name="check"
           />
diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 7c739698f62..6b273dbb6a0 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -81,7 +81,7 @@ export const WEIGHT_DESC = 'WEIGHT_DESC';
 export const API_PARAM = 'apiParam';
 export const URL_PARAM = 'urlParam';
 export const NORMAL_FILTER = 'normalFilter';
-export const SPECIAL_FILTER = 'specialFilter';
+export const WILDCARD_FILTER = 'wildcardFilter';
 export const ALTERNATIVE_FILTER = 'alternativeFilter';
 
 export const ISSUES_VIEW_TYPE_KEY = 'issuesViewType';
@@ -136,7 +136,7 @@ export const urlSortParams = {
   [BLOCKING_ISSUES_DESC]: 'blocking_issues_desc',
 };
 
-export const specialFilterValues = [
+export const wildcardFilterValues = [
   FILTER_NONE,
   FILTER_ANY,
   FILTER_CURRENT,
@@ -219,13 +219,13 @@ export const filtersMap = {
   [TOKEN_TYPE_ASSIGNEE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'assigneeUsernames',
-      [SPECIAL_FILTER]: 'assigneeWildcardId',
+      [WILDCARD_FILTER]: 'assigneeWildcardId',
       [ALTERNATIVE_FILTER]: 'assigneeId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'assignee_username[]',
-        [SPECIAL_FILTER]: 'assignee_id',
+        [WILDCARD_FILTER]: 'assignee_id',
         [ALTERNATIVE_FILTER]: 'assignee_username',
       },
       [OPERATOR_NOT]: {
@@ -250,13 +250,13 @@ export const filtersMap = {
   [TOKEN_TYPE_REVIEWER]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'reviewerUsername',
-      [SPECIAL_FILTER]: 'reviewerWildcardId',
+      [WILDCARD_FILTER]: 'reviewerWildcardId',
       [ALTERNATIVE_FILTER]: 'reviewerId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'reviewer_username',
-        [SPECIAL_FILTER]: 'reviewer_id',
+        [WILDCARD_FILTER]: 'reviewer_id',
         [ALTERNATIVE_FILTER]: 'reviewer_username',
       },
       [OPERATOR_NOT]: {
@@ -267,29 +267,29 @@ export const filtersMap = {
   [TOKEN_TYPE_MILESTONE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'milestoneTitle',
-      [SPECIAL_FILTER]: 'milestoneWildcardId',
+      [WILDCARD_FILTER]: 'milestoneWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'milestone_title',
-        [SPECIAL_FILTER]: 'milestone_title',
+        [WILDCARD_FILTER]: 'milestone_title',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[milestone_title]',
-        [SPECIAL_FILTER]: 'not[milestone_title]',
+        [WILDCARD_FILTER]: 'not[milestone_title]',
       },
     },
   },
   [TOKEN_TYPE_LABEL]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'labelName',
-      [SPECIAL_FILTER]: 'labelName',
+      [WILDCARD_FILTER]: 'labelName',
       [ALTERNATIVE_FILTER]: 'labelNames',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'label_name[]',
-        [SPECIAL_FILTER]: 'label_name[]',
+        [WILDCARD_FILTER]: 'label_name[]',
         [ALTERNATIVE_FILTER]: 'label_name',
       },
       [OPERATOR_NOT]: {
@@ -336,12 +336,12 @@ export const filtersMap = {
   [TOKEN_TYPE_RELEASE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'releaseTag',
-      [SPECIAL_FILTER]: 'releaseTagWildcardId',
+      [WILDCARD_FILTER]: 'releaseTagWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'release_tag',
-        [SPECIAL_FILTER]: 'release_tag',
+        [WILDCARD_FILTER]: 'release_tag',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[release_tag]',
@@ -351,12 +351,12 @@ export const filtersMap = {
   [TOKEN_TYPE_MY_REACTION]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'myReactionEmoji',
-      [SPECIAL_FILTER]: 'myReactionEmoji',
+      [WILDCARD_FILTER]: 'myReactionEmoji',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'my_reaction_emoji',
-        [SPECIAL_FILTER]: 'my_reaction_emoji',
+        [WILDCARD_FILTER]: 'my_reaction_emoji',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[my_reaction_emoji]',
@@ -386,30 +386,30 @@ export const filtersMap = {
   [TOKEN_TYPE_ITERATION]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'iterationId',
-      [SPECIAL_FILTER]: 'iterationWildcardId',
+      [WILDCARD_FILTER]: 'iterationWildcardId',
       [ALTERNATIVE_FILTER]: 'iterationCadenceId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'iteration_id',
-        [SPECIAL_FILTER]: 'iteration_id',
+        [WILDCARD_FILTER]: 'iteration_id',
         [ALTERNATIVE_FILTER]: 'iteration_cadence_id',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[iteration_id]',
-        [SPECIAL_FILTER]: 'not[iteration_id]',
+        [WILDCARD_FILTER]: 'not[iteration_id]',
       },
     },
   },
   [TOKEN_TYPE_EPIC]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'epicId',
-      [SPECIAL_FILTER]: 'epicWildcardId',
+      [WILDCARD_FILTER]: 'epicWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'epic_id',
-        [SPECIAL_FILTER]: 'epic_id',
+        [WILDCARD_FILTER]: 'epic_id',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[epic_id]',
@@ -419,12 +419,12 @@ export const filtersMap = {
   [TOKEN_TYPE_WEIGHT]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'weight',
-      [SPECIAL_FILTER]: 'weightWildcardId',
+      [WILDCARD_FILTER]: 'weightWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'weight',
-        [SPECIAL_FILTER]: 'weight',
+        [WILDCARD_FILTER]: 'weight',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[weight]',
@@ -434,12 +434,12 @@ export const filtersMap = {
   [TOKEN_TYPE_HEALTH]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'healthStatusFilter',
-      [SPECIAL_FILTER]: 'healthStatusFilter',
+      [WILDCARD_FILTER]: 'healthStatusFilter',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'health_status',
-        [SPECIAL_FILTER]: 'health_status',
+        [WILDCARD_FILTER]: 'health_status',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[health_status]',
diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js
index 38c3f181f78..795ce1f26a1 100644
--- a/app/assets/javascripts/issues/list/utils.js
+++ b/app/assets/javascripts/issues/list/utils.js
@@ -60,8 +60,8 @@ import {
   PRIORITY_ASC,
   PRIORITY_DESC,
   RELATIVE_POSITION_ASC,
-  SPECIAL_FILTER,
-  specialFilterValues,
+  WILDCARD_FILTER,
+  wildcardFilterValues,
   TITLE_ASC,
   TITLE_DESC,
   UPDATED_ASC,
@@ -314,33 +314,29 @@ const getFilterType = ({ type, value: { data, operator } }) => {
   ) {
     return ALTERNATIVE_FILTER;
   }
-  if (specialFilterValues.includes(data)) {
-    return SPECIAL_FILTER;
+  if (wildcardFilterValues.includes(data)) {
+    return WILDCARD_FILTER;
   }
 
   return NORMAL_FILTER;
 };
 
 const wildcardTokens = [
+  TOKEN_TYPE_ASSIGNEE,
+  TOKEN_TYPE_EPIC,
+  TOKEN_TYPE_HEALTH,
   TOKEN_TYPE_ITERATION,
   TOKEN_TYPE_MILESTONE,
   TOKEN_TYPE_RELEASE,
-  TOKEN_TYPE_EPIC,
-  TOKEN_TYPE_ASSIGNEE,
   TOKEN_TYPE_REVIEWER,
   TOKEN_TYPE_WEIGHT,
 ];
 
 const isWildcardValue = (tokenType, value) =>
-  wildcardTokens.includes(tokenType) && specialFilterValues.includes(value);
-
-const isHealthStatusSpecialFilter = (tokenType, value) =>
-  tokenType === TOKEN_TYPE_HEALTH && specialFilterValues.includes(value);
+  wildcardTokens.includes(tokenType) && wildcardFilterValues.includes(value);
 
 const requiresUpperCaseValue = (tokenType, value) =>
-  tokenType === TOKEN_TYPE_TYPE ||
-  isWildcardValue(tokenType, value) ||
-  isHealthStatusSpecialFilter(tokenType, value);
+  tokenType === TOKEN_TYPE_TYPE || isWildcardValue(tokenType, value);
 
 const formatData = (token) => {
   if (requiresUpperCaseValue(token.type, token.value.data)) {
@@ -383,7 +379,7 @@ export const convertToApiParams = (filterTokens) => {
       const cadenceId = fullIterationCadenceId(cadence);
       const iterationWildCardId = iteration.toUpperCase();
       obj.set(apiField, obj.has(apiField) ? [obj.get(apiField), cadenceId].flat() : cadenceId);
-      const secondApiField = filtersMap[token.type][API_PARAM][SPECIAL_FILTER];
+      const secondApiField = filtersMap[token.type][API_PARAM][WILDCARD_FILTER];
       obj.set(
         secondApiField,
         obj.has(secondApiField)
diff --git a/app/assets/javascripts/issues/service_desk/constants.js b/app/assets/javascripts/issues/service_desk/constants.js
index e498a4f39a1..34f3d4b198e 100644
--- a/app/assets/javascripts/issues/service_desk/constants.js
+++ b/app/assets/javascripts/issues/service_desk/constants.js
@@ -21,7 +21,7 @@ import {
   ALTERNATIVE_FILTER,
   API_PARAM,
   NORMAL_FILTER,
-  SPECIAL_FILTER,
+  WILDCARD_FILTER,
   URL_PARAM,
 } from '~/issues/list/constants';
 
@@ -58,12 +58,12 @@ export const filtersMap = {
   [TOKEN_TYPE_ASSIGNEE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'assigneeUsernames',
-      [SPECIAL_FILTER]: 'assigneeId',
+      [WILDCARD_FILTER]: 'assigneeId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'assignee_username[]',
-        [SPECIAL_FILTER]: 'assignee_id',
+        [WILDCARD_FILTER]: 'assignee_id',
         [ALTERNATIVE_FILTER]: 'assignee_username',
       },
       [OPERATOR_NOT]: {
@@ -77,29 +77,29 @@ export const filtersMap = {
   [TOKEN_TYPE_MILESTONE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'milestoneTitle',
-      [SPECIAL_FILTER]: 'milestoneWildcardId',
+      [WILDCARD_FILTER]: 'milestoneWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'milestone_title',
-        [SPECIAL_FILTER]: 'milestone_title',
+        [WILDCARD_FILTER]: 'milestone_title',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[milestone_title]',
-        [SPECIAL_FILTER]: 'not[milestone_title]',
+        [WILDCARD_FILTER]: 'not[milestone_title]',
       },
     },
   },
   [TOKEN_TYPE_LABEL]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'labelName',
-      [SPECIAL_FILTER]: 'labelName',
+      [WILDCARD_FILTER]: 'labelName',
       [ALTERNATIVE_FILTER]: 'labelNames',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'label_name[]',
-        [SPECIAL_FILTER]: 'label_name[]',
+        [WILDCARD_FILTER]: 'label_name[]',
         [ALTERNATIVE_FILTER]: 'label_name',
       },
       [OPERATOR_NOT]: {
@@ -126,12 +126,12 @@ export const filtersMap = {
   [TOKEN_TYPE_RELEASE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'releaseTag',
-      [SPECIAL_FILTER]: 'releaseTagWildcardId',
+      [WILDCARD_FILTER]: 'releaseTagWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'release_tag',
-        [SPECIAL_FILTER]: 'release_tag',
+        [WILDCARD_FILTER]: 'release_tag',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[release_tag]',
@@ -141,12 +141,12 @@ export const filtersMap = {
   [TOKEN_TYPE_MY_REACTION]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'myReactionEmoji',
-      [SPECIAL_FILTER]: 'myReactionEmoji',
+      [WILDCARD_FILTER]: 'myReactionEmoji',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'my_reaction_emoji',
-        [SPECIAL_FILTER]: 'my_reaction_emoji',
+        [WILDCARD_FILTER]: 'my_reaction_emoji',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[my_reaction_emoji]',
@@ -166,28 +166,28 @@ export const filtersMap = {
   [TOKEN_TYPE_ITERATION]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'iterationId',
-      [SPECIAL_FILTER]: 'iterationWildcardId',
+      [WILDCARD_FILTER]: 'iterationWildcardId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'iteration_id',
-        [SPECIAL_FILTER]: 'iteration_id',
+        [WILDCARD_FILTER]: 'iteration_id',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[iteration_id]',
-        [SPECIAL_FILTER]: 'not[iteration_id]',
+        [WILDCARD_FILTER]: 'not[iteration_id]',
       },
     },
   },
   [TOKEN_TYPE_EPIC]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'epicId',
-      [SPECIAL_FILTER]: 'epicId',
+      [WILDCARD_FILTER]: 'epicId',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'epic_id',
-        [SPECIAL_FILTER]: 'epic_id',
+        [WILDCARD_FILTER]: 'epic_id',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[epic_id]',
@@ -197,12 +197,12 @@ export const filtersMap = {
   [TOKEN_TYPE_WEIGHT]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'weight',
-      [SPECIAL_FILTER]: 'weight',
+      [WILDCARD_FILTER]: 'weight',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'weight',
-        [SPECIAL_FILTER]: 'weight',
+        [WILDCARD_FILTER]: 'weight',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[weight]',
@@ -212,12 +212,12 @@ export const filtersMap = {
   [TOKEN_TYPE_HEALTH]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'healthStatusFilter',
-      [SPECIAL_FILTER]: 'healthStatusFilter',
+      [WILDCARD_FILTER]: 'healthStatusFilter',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'health_status',
-        [SPECIAL_FILTER]: 'health_status',
+        [WILDCARD_FILTER]: 'health_status',
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[health_status]',
diff --git a/app/assets/javascripts/issues/service_desk/utils.js b/app/assets/javascripts/issues/service_desk/utils.js
index a2666116824..3cc3aff8090 100644
--- a/app/assets/javascripts/issues/service_desk/utils.js
+++ b/app/assets/javascripts/issues/service_desk/utils.js
@@ -6,9 +6,9 @@ import { isAssigneeIdParam, isNotEmptySearchToken } from '~/issues/list/utils';
 import {
   ALTERNATIVE_FILTER,
   NORMAL_FILTER,
-  SPECIAL_FILTER,
   URL_PARAM,
-  specialFilterValues,
+  WILDCARD_FILTER,
+  wildcardFilterValues,
 } from '~/issues/list/constants';
 import { filtersMap } from './constants';
 
@@ -18,8 +18,8 @@ const getFilterType = ({ type, value: { data, operator } }) => {
   if (isUnionedLabel || isAssigneeIdParam(type, data)) {
     return ALTERNATIVE_FILTER;
   }
-  if (specialFilterValues.includes(data)) {
-    return SPECIAL_FILTER;
+  if (wildcardFilterValues.includes(data)) {
+    return WILDCARD_FILTER;
   }
   return NORMAL_FILTER;
 };
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
index 07b4568b7fd..435c98a5fe0 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
@@ -157,7 +157,7 @@ export default {
     coverageDeltaClass() {
       const delta = this.pipelineCoverageDelta;
       if (delta && parseFloat(delta) > 0) {
-        return 'text-success';
+        return 'gl-text-success';
       }
       if (delta && parseFloat(delta) < 0) {
         return 'gl-text-danger';
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
index fb8e5c23a54..279d60e8d3d 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
@@ -253,7 +253,7 @@ export default {
       :class="{ 'pr-sm-8': sidebarStatus }"
     >
       <div
-        class="gl-display-flex gl-justify-content-space-between gl-align-items-center gl-px-1 py-3 py-md-4 gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid gl-flex-direction-column gl-sm-flex-direction-row"
+        class="py-3 py-md-4 gl-flex gl-flex-col gl-items-center gl-justify-between gl-border-b-1 gl-border-b-gray-100 gl-px-1 gl-border-b-solid sm:gl-flex-row"
       >
         <div data-testid="alert-header">
           <gl-badge class="gl-mr-3">
@@ -270,7 +270,7 @@ export default {
         </div>
         <gl-button
           v-if="alert.issue"
-          class="gl-mt-3 mt-sm-0 align-self-center align-self-sm-baseline alert-details-incident-button"
+          class="mt-sm-0 align-self-center align-self-sm-baseline alert-details-incident-button gl-mt-3"
           data-testid="viewIncidentBtn"
           :href="incidentPath(alert.issue.iid)"
           category="primary"
@@ -280,7 +280,7 @@ export default {
         </gl-button>
         <gl-button
           v-else
-          class="gl-mt-3 mt-sm-0 align-self-center align-self-sm-baseline alert-details-incident-button"
+          class="mt-sm-0 align-self-center align-self-sm-baseline alert-details-incident-button gl-mt-3"
           data-testid="createIncidentBtn"
           :loading="incidentCreationInProgress"
           category="primary"
@@ -293,16 +293,13 @@ export default {
           :aria-label="__('Toggle sidebar')"
           category="primary"
           variant="default"
-          class="d-sm-none gl-absolute toggle-sidebar-mobile-button"
+          class="d-sm-none toggle-sidebar-mobile-button gl-absolute"
           type="button"
           icon="chevron-double-lg-left"
           @click="toggleSidebar"
         />
       </div>
-      <div
-        v-if="alert"
-        class="gl-display-flex gl-justify-content-space-between gl-align-items-center"
-      >
+      <div v-if="alert" class="gl-flex gl-items-center gl-justify-between">
         <h2 data-testid="title">{{ alert.title }}</h2>
       </div>
       <gl-tabs v-if="alert" v-model="currentTabIndex" data-testid="alertDetailsTabs">
@@ -324,7 +321,7 @@ export default {
           >
             <gl-link
               v-if="environmentPath"
-              class="gl-display-inline-block"
+              class="gl-inline-block"
               data-testid="environmentPath"
               :href="environmentPath"
             >
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue
index f297f394550..3a3fcf664ef 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue
@@ -51,7 +51,7 @@ export default {
   },
   computed: {
     dropdownClass() {
-      return this.isSidebar && !this.isDropdownShowing ? 'gl-display-none' : '';
+      return this.isSidebar && !this.isDropdownShowing ? 'gl-hidden' : '';
     },
     items() {
       return Object.entries(this.statuses).map(([value, text]) => ({ value, text }));
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_summary_row.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_summary_row.vue
index f8bced257a8..41b2d4af534 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/alert_summary_row.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_summary_row.vue
@@ -9,8 +9,8 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-my-5 gl-display-flex">
-    <div class="gl-font-bold gl-w-13 gl-text-right gl-pr-3">{{ label }}</div>
+  <div class="gl-my-5 gl-flex">
+    <div class="gl-w-13 gl-pr-3 gl-text-right gl-font-bold">{{ label }}</div>
     <div class="gl-pl-2">
       <slot></slot>
     </div>
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 4a88741a433..0bf84661b10 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
@@ -96,7 +96,7 @@ export default {
         .sort((a, b) => (a.active === b.active ? 0 : a.active ? -1 : 1)); // eslint-disable-line no-nested-ternary
     },
     dropdownClass() {
-      return this.isDropdownShowing ? 'dropdown-menu-selectable show' : 'gl-display-none';
+      return this.isDropdownShowing ? 'dropdown-menu-selectable show' : 'gl-hidden';
     },
     dropDownTitle() {
       return this.userName ?? __('Select assignee');
@@ -193,8 +193,8 @@ export default {
 
 <template>
   <div
-    class="alert-assignees gl-py-5 gl-w-7/10"
-    :class="{ 'gl-border-b-1 gl-border-b-solid gl-border-b-gray-100': !sidebarCollapsed }"
+    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 }"
   >
     <template v-if="sidebarCollapsed">
       <div
@@ -216,16 +216,14 @@ export default {
     </template>
 
     <div v-else>
-      <p
-        class="gl-text-gray-900 gl-mb-2 gl-leading-20 gl-display-flex gl-justify-content-space-between"
-      >
+      <p class="gl-mb-2 gl-flex gl-justify-between gl-leading-20 gl-text-default">
         {{ __('Assignee') }}
         <gl-button
           v-if="isEditable"
           ref="editButton"
           category="tertiary"
           size="small"
-          class="gl-text-black-normal!"
+          class="!gl-text-default"
           @click="toggleFormDropdown"
           @keydown.esc="hideDropdown"
         >
@@ -282,18 +280,18 @@ export default {
       class="hide-collapsed value gl-m-0"
       :class="{ 'no-value': !userName }"
     >
-      <div v-if="userName" class="gl-inline-flex gl-mt-2" data-testid="assigned-users">
+      <div v-if="userName" class="gl-mt-2 gl-inline-flex" data-testid="assigned-users">
         <span class="gl-relative gl-mr-4">
-          <img :alt="userName" :src="userImg" :width="32" class="avatar avatar-inline gl-m-0 s32" />
+          <img :alt="userName" :src="userImg" :width="32" class="avatar avatar-inline s32 gl-m-0" />
         </span>
-        <span class="gl-display-flex gl-flex-direction-column gl-overflow-hidden">
+        <span class="gl-flex gl-flex-col gl-overflow-hidden">
           <strong class="dropdown-menu-user-full-name">
             {{ userFullName }}
           </strong>
           <span class="dropdown-menu-user-username">@{{ userName }}</span>
         </span>
       </div>
-      <span v-else class="gl-display-flex gl-align-items-center gl-leading-normal">
+      <span v-else class="gl-flex gl-items-center gl-leading-normal">
         {{ __('None') }} -
         <gl-button
           class="gl-ml-2 !gl-text-inherit"
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 ae5682fc2dd..2e33d5a10f9 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-display-flex gl-justify-content-space-between gl-border-b-gray-100!">
+  <div class="block gl-flex gl-justify-between !gl-border-b-gray-100">
     <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 ee8b5d6568b..7bd4de11524 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
@@ -49,7 +49,7 @@ export default {
   },
   computed: {
     dropdownClass() {
-      return this.isDropdownShowing ? 'show' : 'gl-display-none';
+      return this.isDropdownShowing ? 'show' : 'gl-hidden';
     },
   },
   methods: {
@@ -77,7 +77,7 @@ export default {
 <template>
   <div
     class="alert-status gl-py-5"
-    :class="{ 'gl-border-b-1 gl-border-b-solid gl-border-b-gray-100': !sidebarCollapsed }"
+    :class="{ 'gl-border-b-1 gl-border-b-gray-100 gl-border-b-solid': !sidebarCollapsed }"
   >
     <template v-if="sidebarCollapsed">
       <div ref="status" class="gl-ml-6" data-testid="status-icon" @click="$emit('toggle-sidebar')">
@@ -94,13 +94,11 @@ export default {
     </template>
 
     <div v-else>
-      <p
-        class="gl-text-gray-900 gl-mb-2 gl-leading-20 gl-display-flex gl-justify-content-space-between"
-      >
+      <p class="gl-mb-2 gl-flex gl-justify-between gl-leading-20 gl-text-default">
         {{ s__('AlertManagement|Status') }}
         <gl-button
           v-if="isEditable"
-          class="gl-text-black-normal!"
+          class="!gl-text-default"
           category="tertiary"
           size="small"
           @click="toggleFormDropdown"
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue
index c5cc5d10cd6..dfb40862029 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue
@@ -129,7 +129,7 @@ export default {
   <div
     :class="{
       block: sidebarCollapsed,
-      'gl-inline-flex gl-flex-basis-full': !sidebarCollapsed,
+      'gl-inline-flex gl-basis-full': !sidebarCollapsed,
     }"
   >
     <todo
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 7124d7e79ab..cbdca6fe1d9 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
@@ -35,12 +35,12 @@ export default {
 <template>
   <li
     :id="noteAnchorId"
-    class="timeline-entry note system-note note-wrapper gl-p-0!"
+    class="timeline-entry note system-note note-wrapper !gl-p-0"
     data-testid="alert-system-note-container"
   >
-    <div class="gl-inline-flex gl-align-items-center gl-relative">
+    <div class="gl-relative gl-inline-flex gl-items-center">
       <div
-        class="gl-display-inline gl-bg-white gl-text-gray-200 gl-border-gray-100 gl-border-1 gl-border-solid gl-rounded-full gl-box-sizing-content-box gl-p-3 -gl-mt-2 gl-mr-6"
+        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"
       >
         <gl-icon :name="note.systemNoteIconName" />
       </div>
diff --git a/app/assets/javascripts/vue_shared/components/alert_details_table.vue b/app/assets/javascripts/vue_shared/components/alert_details_table.vue
index bdb222ae184..69c770e679f 100644
--- a/app/assets/javascripts/vue_shared/components/alert_details_table.vue
+++ b/app/assets/javascripts/vue_shared/components/alert_details_table.vue
@@ -10,8 +10,8 @@ import { isValidURL } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
 import { PAGE_CONFIG } from '~/vue_shared/alert_details/constants';
 
-const thClass = 'gl-bg-transparent! gl-border-1! gl-border-b-solid! gl-border-gray-200!';
-const tdClass = 'gl-border-gray-100! gl-p-5!';
+const thClass = '!gl-bg-transparent !gl-border-1 !gl-border-b-solid !gl-border-gray-200';
+const tdClass = '!gl-border-gray-100 !gl-p-5';
 
 const allowedFields = [
   'iid',
diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue
index 114ec9bab12..b1475988892 100644
--- a/app/assets/javascripts/vue_shared/components/awards_list.vue
+++ b/app/assets/javascripts/vue_shared/components/awards_list.vue
@@ -179,7 +179,7 @@ export default {
       v-for="awardList in groupedAwards"
       :key="awardList.name"
       v-gl-tooltip.viewport
-      class="gl-mr-3 gl-my-2"
+      class="gl-my-2 gl-mr-3"
       :class="awardList.classes"
       :title="awardList.title"
       :data-emoji-name="awardList.name"
diff --git a/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js b/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js
index a2cd10f9d56..9ef369a2340 100644
--- a/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js
+++ b/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js
@@ -6,7 +6,7 @@ export default {
 };
 
 const template = `
-    <div style="height:600px;" class="gl-display-flex gl-justify-content-center gl-align-items-center">
+    <div style="height:600px;" class="gl-flex gl-justify-center gl-items-center">
       <beta-badge />
     </div>
   `;
diff --git a/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js b/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js
index b136ec0b828..96c1c128393 100644
--- a/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js
+++ b/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js
@@ -6,7 +6,7 @@ export default {
 };
 
 const template = `
-    <div style="height:600px;" class="gl-display-flex gl-justify-content-center gl-align-items-center">
+    <div style="height:600px;" class="gl-flex gl-justify-center gl-items-center">
       <experiment-badge />
     </div>
   `;
diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue
index 68c1d5e92d4..251231c34ad 100644
--- a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue
@@ -145,26 +145,19 @@ export default {
 </script>
 <template>
   <div>
-    <div
-      class="file-content code js-syntax-highlight gl-display-flex"
-      :class="$options.userColorScheme"
-    >
+    <div class="file-content code js-syntax-highlight gl-flex" :class="$options.userColorScheme">
       <blame v-if="showBlame && blameInfoForRange.length" :blame-info="blameInfoForRange" />
-      <div class="line-numbers gl-px-0!">
-        <div
-          v-for="line in lineNumbers"
-          :key="line"
-          class="gl-display-flex diff-line-num line-links"
-        >
+      <div class="line-numbers !gl-px-0">
+        <div v-for="line in lineNumbers" :key="line" class="diff-line-num line-links gl-flex">
           <a
             v-if="showBlameLink"
-            class="gl-select-none !gl-shadow-none file-line-blame -gl-mx-2"
+            class="file-line-blame -gl-mx-2 gl-select-none !gl-shadow-none"
             :href="`${blamePath}#L${line}`"
           ></a>
           <a
             :id="`L${line}`"
             :key="line"
-            class="gl-select-none !gl-shadow-none file-line-num"
+            class="file-line-num gl-select-none !gl-shadow-none"
             :href="`#L${line}`"
             :data-line-number="line"
             @click="scrollToLine(`#LC${line}`)"
@@ -173,11 +166,9 @@ export default {
           </a>
         </div>
       </div>
-      <div
-        class="blob-content gl-display-flex gl-flex-direction-column gl-overflow-y-auto gl-w-full"
-      >
+      <div class="blob-content gl-flex gl-w-full gl-flex-col gl-overflow-y-auto">
         <pre
-          class="code highlight gl-p-0!"
+          class="code highlight !gl-p-0"
         ><code v-safe-html="content" :data-blob-hash="blobHash" ></code></pre>
       </div>
     </div>
diff --git a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue b/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue
index d1e1fe162f4..058b91c074d 100644
--- a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue
@@ -50,7 +50,7 @@ export default {
 </script>
 <template>
   <div>
-    <div class="gl-display-flex gl-flex-wrap gl-gap-5">
+    <div class="gl-flex gl-flex-wrap gl-gap-5">
       <segmented-control-button-group
         :options="chartRanges"
         :value="selectedChart"
diff --git a/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown.vue b/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown.vue
index 0563db11855..14d3ed049e8 100644
--- a/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown.vue
@@ -149,7 +149,7 @@ export default {
     <gl-disclosure-dropdown-group v-if="sshUrl">
       <code-dropdown-item
         :label="$options.i18n.cloneWithSsh"
-        label-class="gl-font-sm! gl-pt-2!"
+        label-class="!gl-text-sm !gl-pt-2"
         :link="sshUrl"
         name="ssh_project_clone"
         input-id="copy-ssh-url-input"
@@ -159,7 +159,7 @@ export default {
     <gl-disclosure-dropdown-group v-if="httpUrl">
       <code-dropdown-item
         :label="httpLabel"
-        label-class="gl-font-sm! gl-pt-2!"
+        label-class="!gl-text-sm !gl-pt-2"
         :link="httpUrl"
         name="http_project_clone"
         input-id="copy-http-url-input"
@@ -169,7 +169,7 @@ export default {
     <gl-disclosure-dropdown-group v-if="kerberosUrl">
       <code-dropdown-item
         :label="$options.i18n.cloneWithKerberos"
-        label-class="gl-font-sm! gl-pt-2!"
+        label-class="!gl-text-sm !gl-pt-2"
         :link="kerberosUrl"
         name="kerberos_project_clone"
         input-id="copy-http-url-input"
diff --git a/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown_item.vue b/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown_item.vue
index a0a81ef912c..dc18d4effb3 100644
--- a/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown_item.vue
+++ b/app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown_item.vue
@@ -56,7 +56,7 @@ export default {
       :label="label"
       :label-class="labelClass"
       :label-for="inputId"
-      class="gl-px-3 gl-mb-3 gl-text-left"
+      class="gl-mb-3 gl-px-3 gl-text-left"
     >
       <gl-form-input-group
         :id="inputId"
diff --git a/app/assets/javascripts/vue_shared/components/code_dropdown/snippet_code_dropdown.vue b/app/assets/javascripts/vue_shared/components/code_dropdown/snippet_code_dropdown.vue
index a3ef47f9cff..e3bb9e553a4 100644
--- a/app/assets/javascripts/vue_shared/components/code_dropdown/snippet_code_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/code_dropdown/snippet_code_dropdown.vue
@@ -78,7 +78,7 @@ export default {
       :link="link"
       :test-id="`${testId}-button`"
       :data-testid="testId"
-      label-class="gl-font-sm! gl-pt-2!"
+      label-class="!gl-text-sm !gl-pt-2"
     />
   </gl-disclosure-dropdown>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/color_picker/color_picker.vue b/app/assets/javascripts/vue_shared/components/color_picker/color_picker.vue
index a9adf7e8f92..a81a0161eef 100644
--- a/app/assets/javascripts/vue_shared/components/color_picker/color_picker.vue
+++ b/app/assets/javascripts/vue_shared/components/color_picker/color_picker.vue
@@ -17,7 +17,7 @@ import { uniqueId } from 'lodash';
 import { __ } from '~/locale';
 
 const PREVIEW_COLOR_DEFAULT_CLASSES =
-  'gl-relative gl-w-7 gl-bg-gray-10 gl-rounded-top-left-base gl-rounded-bottom-left-base';
+  'gl-relative gl-w-7 gl-bg-gray-10 gl-rounded-tl-base gl-rounded-bl-base';
 
 export default {
   name: 'ColorPicker',
@@ -105,12 +105,12 @@ export default {
       :description="description"
       :invalid-feedback="invalidFeedback"
       :state="state"
-      :class="{ 'gl-mb-3!': hasSuggestedColors }"
+      :class="{ '!gl-mb-3': hasSuggestedColors }"
     >
       <gl-form-input-group
         max-length="7"
         type="text"
-        class="gl-align-center gl-rounded-0 gl-rounded-top-right-base gl-rounded-bottom-right-base gl-max-w-26"
+        class="gl-align-center gl-max-w-26 gl-rounded-none gl-rounded-br-base gl-rounded-tr-base"
         :value="value"
         :state="state"
         @input="handleColorChange"
@@ -120,7 +120,7 @@ export default {
             <gl-form-input
               :id="id"
               type="color"
-              class="gl-absolute gl-top-0 gl-left-0 gl-h-full! gl-p-0! gl-m-0! gl-opacity-0"
+              class="gl-absolute gl-left-0 gl-top-0 !gl-m-0 !gl-h-full !gl-p-0 gl-opacity-0"
               tabindex="-1"
               :value="value"
               @input="handleColorChange"
@@ -137,7 +137,7 @@ export default {
         v-gl-tooltip
         :title="name"
         :style="{ backgroundColor: hex }"
-        class="gl-rounded-base gl-w-7 gl-h-7 gl-display-inline-block gl-mr-3 gl-mb-3 gl-text-decoration-none"
+        class="gl-mb-3 gl-mr-3 gl-inline-block gl-h-7 gl-w-7 gl-rounded-base gl-no-underline"
         @click.prevent="handleColorChange(hex)"
       />
     </div>
diff --git a/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_header.vue b/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_header.vue
index a32b1570f5f..ac1c7feed3c 100644
--- a/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_header.vue
+++ b/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_header.vue
@@ -16,13 +16,13 @@ export default {
 
 <template>
   <div>
-    <div class="dropdown-title gl-display-flex gl-align-items-center gl-pt-0 gl-pb-3!">
-      <span class="gl-flex-grow-1">{{ dropdownTitle }}</span>
+    <div class="dropdown-title gl-flex gl-items-center !gl-pb-3 gl-pt-0">
+      <span class="gl-grow">{{ dropdownTitle }}</span>
       <gl-button
         :aria-label="__('Close')"
         variant="link"
         size="small"
-        class="dropdown-header-button gl-p-0!"
+        class="dropdown-header-button !gl-p-0"
         icon="close"
         @click="$emit('closeDropdown')"
       />
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue
index 15dbd2e2995..01a05bae630 100644
--- a/app/assets/javascripts/vue_shared/components/commit.vue
+++ b/app/assets/javascripts/vue_shared/components/commit.vue
@@ -146,7 +146,7 @@ export default {
 <template>
   <div class="branch-commit gl-text-primary">
     <template v-if="shouldShowRefInfo">
-      <div class="icon-container gl-display-inline-block">
+      <div class="icon-container gl-inline-block">
         <gl-icon v-if="tag" name="tag" />
         <gl-icon v-else-if="mergeRequestRef" name="merge-request" />
         <gl-icon v-else name="branch" />
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue
index 332424c70ac..44b4af1bb6d 100644
--- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue
@@ -37,7 +37,7 @@ export default {
 <template>
   <div class="file-container">
     <div class="file-content">
-      <p class="gl-mt-3 file-info">
+      <p class="file-info gl-mt-3">
         {{ fileName }}
         <template v-if="fileSize > 0"> ({{ fileSizeReadable }}) </template>
       </p>
diff --git a/app/assets/javascripts/vue_shared/components/crud_component.vue b/app/assets/javascripts/vue_shared/components/crud_component.vue
index 42d63bb1640..7eda459cf5a 100644
--- a/app/assets/javascripts/vue_shared/components/crud_component.vue
+++ b/app/assets/javascripts/vue_shared/components/crud_component.vue
@@ -58,13 +58,13 @@ export default {
 
 <template>
   <section>
-    <div ref="crudComponent" class="crud gl-bg-subtle gl-border gl-border-default gl-rounded-base">
+    <div ref="crudComponent" class="crud gl-border gl-rounded-base gl-border-default gl-bg-subtle">
       <header
-        class="gl-flex gl-flex-wrap gl-justify-between gl-gap-x-5 gl-gap-y-2 gl-px-5 gl-py-4 gl-bg-default gl-border-b gl-border-default gl-rounded-t-base"
+        class="gl-border-b gl-flex gl-flex-wrap gl-justify-between gl-gap-x-5 gl-gap-y-2 gl-rounded-t-base gl-border-default gl-bg-default gl-px-5 gl-py-4"
       >
         <div class="gl-flex gl-flex-col gl-self-center">
           <h2
-            class="gl-text-base gl-font-bold gl-leading-24 gl-inline-flex gl-gap-3 gl-m-0"
+            class="gl-m-0 gl-inline-flex gl-gap-3 gl-text-base gl-font-bold gl-leading-24"
             data-testid="crud-title"
           >
             {{ title }}
@@ -79,14 +79,14 @@ export default {
           </h2>
           <p
             v-if="description || $scopedSlots.description"
-            class="gl-text-sm gl-text-subtle gl-mt-1 gl-mb-0"
+            class="gl-mb-0 gl-mt-1 gl-text-sm gl-text-subtle"
             data-testid="crud-description"
           >
             <slot v-if="$scopedSlots.description" name="description"></slot>
             <template v-else>{{ description }}</template>
           </p>
         </div>
-        <div class="gl-flex gl-gap-3 gl-items-baseline" data-testid="crud-actions">
+        <div class="gl-flex gl-items-baseline gl-gap-3" data-testid="crud-actions">
           <gl-button
             v-if="toggleText"
             size="small"
@@ -100,7 +100,7 @@ export default {
 
       <div
         v-if="$scopedSlots.form && isFormVisible"
-        class="gl-p-5 gl-pt-4 gl-bg-default gl-border-b gl-border-default"
+        class="gl-border-b gl-border-default gl-bg-default gl-p-5 gl-pt-4"
         data-testid="crud-form"
       >
         <slot name="form"></slot>
@@ -116,7 +116,7 @@ export default {
 
       <footer
         v-if="$scopedSlots.footer"
-        class="gl-px-5 gl-py-4 gl-bg-default gl-border-t gl-border-default gl-rounded-b-base"
+        class="gl-border-t gl-rounded-b-base gl-border-default gl-bg-default gl-px-5 gl-py-4"
         data-testid="crud-footer"
       >
         <slot name="footer"></slot>
diff --git a/app/assets/javascripts/vue_shared/components/deployment_instance.vue b/app/assets/javascripts/vue_shared/components/deployment_instance.vue
index a1016b6b869..5e25e6529b2 100644
--- a/app/assets/javascripts/vue_shared/components/deployment_instance.vue
+++ b/app/assets/javascripts/vue_shared/components/deployment_instance.vue
@@ -73,6 +73,6 @@ export default {
     v-gl-tooltip
     :class="cssClass"
     :title="tooltipText"
-    class="deployment-instance gl-flex justify-content-center gl-items-center"
+    class="deployment-instance justify-content-center gl-flex gl-items-center"
   />
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue b/app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue
index a7803ed7d61..d69f5c0ddc6 100644
--- a/app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue
+++ b/app/assets/javascripts/vue_shared/components/design_management/design_disclosure.vue
@@ -13,7 +13,7 @@ export default {
   <transition name="design-disclosure">
     <aside
       v-if="open"
-      class="design-disclosure gl-w-full gl-flex gl-flex-col gl-relative gl-border-l gl-z-0 gl-bg-white gl-top-0 gl-right-0 gl-h-full gl-overflow-y-auto"
+      class="design-disclosure gl-border-l gl-relative gl-right-0 gl-top-0 gl-z-0 gl-flex gl-h-full gl-w-full gl-flex-col gl-overflow-y-auto gl-bg-white"
     >
       <slot></slot>
     </aside>
diff --git a/app/assets/javascripts/vue_shared/components/design_management/design_note_pin.vue b/app/assets/javascripts/vue_shared/components/design_management/design_note_pin.vue
index c411496fad1..176f97bd840 100644
--- a/app/assets/javascripts/vue_shared/components/design_management/design_note_pin.vue
+++ b/app/assets/javascripts/vue_shared/components/design_management/design_note_pin.vue
@@ -81,7 +81,7 @@ export default {
       'gl-absolute': position,
       small: size === 'sm',
     }"
-    class="gl-display-flex gl-align-items-center gl-justify-content-center gl-font-sm"
+    class="gl-flex gl-items-center gl-justify-center gl-text-sm"
     type="button"
     @mousedown="$emit('mousedown', $event)"
     @mouseup="$emit('mouseup', $event)"
diff --git a/app/assets/javascripts/vue_shared/components/diff_stats_dropdown.vue b/app/assets/javascripts/vue_shared/components/diff_stats_dropdown.vue
index 0749bd1d403..d4d635c0be5 100644
--- a/app/assets/javascripts/vue_shared/components/diff_stats_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_stats_dropdown.vue
@@ -101,7 +101,7 @@ export default {
           variant="confirm"
           data-testid="diff-stats-dropdown"
           class="gl-align-baseline"
-          toggle-class="gl-px-0! !gl-font-bold"
+          toggle-class="!gl-px-0 !gl-font-bold"
           fluid-width
           @shown="focusInput"
         >
@@ -118,13 +118,13 @@ export default {
             </span>
           </template>
           <template #list-item="{ item }">
-            <div class="gl-display-flex gl-gap-3 gl-align-items-center gl-overflow-hidden">
-              <gl-icon :name="item.icon" :class="item.iconColor" class="gl-flex-shrink-0" />
-              <div class="gl-flex-grow-1 gl-overflow-hidden">
-                <div class="gl-display-flex">
+            <div class="gl-flex gl-items-center gl-gap-3 gl-overflow-hidden">
+              <gl-icon :name="item.icon" :class="item.iconColor" class="gl-shrink-0" />
+              <div class="gl-grow gl-overflow-hidden">
+                <div class="gl-flex">
                   <span
-                    class="gl-font-bold gl-mr-3 gl-flex-grow-1"
-                    :class="item.name ? 'gl-text-truncate' : 'gl-italic gl-gray-400'"
+                    class="gl-mr-3 gl-grow gl-font-bold"
+                    :class="item.name ? 'gl-truncate' : 'gl-gray-400 gl-italic'"
                     >{{ item.text }}</span
                   >
                   <span class="gl-ml-auto gl-whitespace-nowrap" aria-hidden="true">
@@ -135,7 +135,7 @@ export default {
                     >{{ additionsText(item.added) }}, {{ deletionsText(item.removed) }}</span
                   >
                 </div>
-                <div class="gl-text-gray-700 gl-overflow-hidden gl-text-overflow-ellipsis">
+                <div class="gl-overflow-hidden gl-text-ellipsis gl-text-gray-700">
                   {{ item.path }}
                 </div>
               </div>
@@ -150,10 +150,10 @@ export default {
     >
       <gl-sprintf :message="$options.i18n.messageAdditionsDeletions">
         <template #additions>
-          <span class="gl-text-green-600 gl-font-bold">{{ additionsText() }}</span>
+          <span class="gl-font-bold gl-text-green-600">{{ additionsText() }}</span>
         </template>
         <template #deletions>
-          <span class="gl-text-red-500 gl-font-bold">{{ deletionsText() }}</span>
+          <span class="gl-font-bold gl-text-red-500">{{ deletionsText() }}</span>
         </template>
       </gl-sprintf>
     </span>
diff --git a/app/assets/javascripts/vue_shared/components/dismissible_container.vue b/app/assets/javascripts/vue_shared/components/dismissible_container.vue
index 2eaf833a6be..6cc357ddde0 100644
--- a/app/assets/javascripts/vue_shared/components/dismissible_container.vue
+++ b/app/assets/javascripts/vue_shared/components/dismissible_container.vue
@@ -35,7 +35,7 @@ export default {
 
 <template>
   <div>
-    <div class="gl-display-flex gl-align-items-center">
+    <div class="gl-flex gl-items-center">
       <slot name="title"></slot>
       <div class="ml-auto">
         <button
diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
index a246eadb790..d0712a383bd 100644
--- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
+++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
@@ -42,7 +42,7 @@ export default {
     <span v-else class="dropdown-toggle-text"> {{ toggleText }} </span>
     <gl-icon
       v-show="!isLoading"
-      class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
+      class="gl-absolute gl-right-3 gl-top-3 gl-text-gray-500"
       name="chevron-down"
     />
   </button>
diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_widget/dropdown_widget.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_widget/dropdown_widget.vue
index 0cba6113fd2..60e2ea15d15 100644
--- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_widget/dropdown_widget.vue
+++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_widget/dropdown_widget.vue
@@ -148,7 +148,7 @@ export default {
         <gl-loading-icon
           v-if="isLoading"
           size="lg"
-          class="gl-absolute gl-left-0 gl-top-0 gl-right-0"
+          class="gl-absolute gl-left-0 gl-right-0 gl-top-0"
         />
         <template v-else>
           <template v-if="isSearchEmpty && presetOptions.length > 0">
@@ -182,7 +182,7 @@ export default {
             </slot>
           </gl-dropdown-item>
           <slot v-bind="{ isSelected }" name="grouped-options"></slot>
-          <gl-dropdown-item v-if="noOptionsFound" class="gl-pl-6!">
+          <gl-dropdown-item v-if="noOptionsFound" class="!gl-pl-6">
             {{ $options.i18n.noMatchingResults }}
           </gl-dropdown-item>
           <gl-dropdown-item v-if="noOptions">
diff --git a/app/assets/javascripts/vue_shared/components/file_finder/index.vue b/app/assets/javascripts/vue_shared/components/file_finder/index.vue
index 226f44a1541..28f0a81e8dd 100644
--- a/app/assets/javascripts/vue_shared/components/file_finder/index.vue
+++ b/app/assets/javascripts/vue_shared/components/file_finder/index.vue
@@ -272,7 +272,7 @@ export default {
             </li>
           </template>
           <li v-else class="dropdown-menu-empty-item">
-            <div class="gl-mr-3 gl-ml-3 gl-mt-5 gl-mb-3">
+            <div class="gl-mb-3 gl-ml-3 gl-mr-3 gl-mt-5">
               <template v-if="loading">
                 <gl-loading-icon />
               </template>
diff --git a/app/assets/javascripts/vue_shared/components/file_finder/item.vue b/app/assets/javascripts/vue_shared/components/file_finder/item.vue
index b12c027d4f8..ab809fdd86d 100644
--- a/app/assets/javascripts/vue_shared/components/file_finder/item.vue
+++ b/app/assets/javascripts/vue_shared/components/file_finder/item.vue
@@ -106,7 +106,7 @@ export default {
         <span class="cgreen gl-font-bold">
           <gl-icon name="file-addition" class="align-text-top" /> {{ file.addedLines }}
         </span>
-        <span class="gl-text-red-500 gl-font-bold ml-1">
+        <span class="ml-1 gl-font-bold gl-text-red-500">
           <gl-icon name="file-deletion" class="align-text-top" /> {{ file.removedLines }}
         </span>
       </span>
diff --git a/app/assets/javascripts/vue_shared/components/file_row_header.vue b/app/assets/javascripts/vue_shared/components/file_row_header.vue
index 3d38ca49c18..fa975db7448 100644
--- a/app/assets/javascripts/vue_shared/components/file_row_header.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row_header.vue
@@ -15,7 +15,7 @@ export default {
 </script>
 
 <template>
-  <div class="file-row-header bg-white sticky-top gl-px-2 js-file-row-header" :title="path">
+  <div class="file-row-header bg-white sticky-top js-file-row-header gl-px-2" :title="path">
     <gl-truncate :text="path" position="middle" class="gl-font-bold" />
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
index 49b0f5efbc4..3f3e28e83d0 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
@@ -403,7 +403,7 @@ export default {
       :sort-options="transformedSortOptions"
       :sort-by="sortById"
       :is-ascending="sortDirectionAscending"
-      class="sort-dropdown-container gl-w-full sm:gl-w-auto sm:!gl-m-0"
+      class="sort-dropdown-container gl-w-full sm:!gl-m-0 sm:gl-w-auto"
       dropdown-class="gl-grow"
       dropdown-toggle-class="gl-grow"
       sort-direction-toggle-class="!gl-shrink !gl-grow-0"
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue
index fff8a95c193..7ec43bb5c82 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue
@@ -78,8 +78,8 @@ export default {
         :key="branch.id"
         :value="branch.name"
       >
-        <div class="gl-display-flex">
-          <span class="gl-display-inline-block gl-mr-3 gl-p-3"></span>
+        <div class="gl-flex">
+          <span class="gl-mr-3 gl-inline-block gl-p-3"></span>
           {{ branch.name }}
         </div>
       </gl-filtered-search-suggestion>
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
index 63ffded9e8e..40cd4b9789b 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
@@ -124,7 +124,7 @@ export default {
       >
         <div>
           <div>{{ getContactName(contact) }}</div>
-          <div class="gl-font-sm">{{ contact.email }}</div>
+          <div class="gl-text-sm">{{ contact.email }}</div>
         </div>
       </gl-filtered-search-suggestion>
     </template>
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/daterange_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/daterange_token.vue
index 83d26657394..597f324c0be 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/daterange_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/daterange_token.vue
@@ -133,7 +133,7 @@ export default {
       <div
         v-if="datePickerShown"
         v-outside="handleClickOutside"
-        class="gl-absolute gl-z-1 gl-bg-white gl-border-1 gl-border-gray-200 gl-my-2 gl-p-4 gl-rounded-base gl-shadow-x0-y2-b4-s0 gl-top-full"
+        class="gl-absolute gl-top-full gl-z-1 gl-my-2 gl-rounded-base gl-border-1 gl-border-gray-200 gl-bg-white gl-p-4 gl-shadow-x0-y2-b4-s0"
       >
         <gl-daterange-picker
           :max-date-range="computedConfig.maxDateRange"
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
index dd45ff3b6d9..9805c285a91 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
@@ -87,7 +87,7 @@ export default {
         :key="getEmojiName(emoji)"
         :value="getEmojiName(emoji)"
       >
-        <div class="gl-display-flex">
+        <div class="gl-flex">
           <gl-emoji class="gl-mr-3" :data-name="getEmojiName(emoji)" />
           {{ getEmojiName(emoji) }}
         </div>
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
index b83d9838fca..81e34adbe9c 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
@@ -171,17 +171,17 @@ export default {
         :value="getLabelName(label)"
       >
         <div
-          class="gl-display-flex gl-align-items-center"
+          class="gl-flex gl-items-center"
           :class="{ 'gl-pl-6': !selections.includes(label.title) }"
         >
           <gl-icon
             v-if="selections.includes(label.title)"
             name="check"
-            class="gl-mr-3 gl-text-secondary gl-flex-shrink-0"
+            class="gl-mr-3 gl-shrink-0 gl-text-secondary"
           />
           <span
             :style="{ backgroundColor: label.color }"
-            class="gl-display-inline-block gl-mr-3 gl-p-3"
+            class="gl-mr-3 gl-inline-block gl-p-3"
           ></span>
           <div>{{ getLabelName(label) }}</div>
         </div>
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue
index 097fefa64b9..70f3b02fee8 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue
@@ -151,13 +151,13 @@ export default {
         :value="getUsername(user)"
       >
         <div
-          class="gl-display-flex gl-align-items-center"
+          class="gl-flex gl-items-center"
           :class="{ 'gl-pl-6': !selections.includes(getUsername(user)) }"
         >
           <gl-icon
             v-if="selections.includes(getUsername(user))"
             name="check"
-            class="gl-mr-3 gl-text-secondary gl-flex-shrink-0"
+            class="gl-mr-3 gl-shrink-0 gl-text-secondary"
           />
           <gl-avatar :size="32" :src="getAvatarUrl(user)" />
           <div>
diff --git a/app/assets/javascripts/vue_shared/components/form/errors_alert.vue b/app/assets/javascripts/vue_shared/components/form/errors_alert.vue
index 5eda4337f83..790b9487e9d 100644
--- a/app/assets/javascripts/vue_shared/components/form/errors_alert.vue
+++ b/app/assets/javascripts/vue_shared/components/form/errors_alert.vue
@@ -53,7 +53,7 @@ export default {
     variant="danger"
     @dismiss="$emit('input', [])"
   >
-    <ul class="gl-pl-5 gl-mb-0">
+    <ul class="gl-mb-0 gl-pl-5">
       <li v-for="error in errors" :key="error">
         {{ error }}
       </li>
diff --git a/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue b/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue
index f22a17b4603..1d70eac8952 100644
--- a/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue
+++ b/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue
@@ -1,5 +1,5 @@
 <template>
-  <footer class="gl-mt-5 footer-block">
+  <footer class="footer-block gl-mt-5">
     <slot name="prepend"></slot>
     <slot></slot>
     <slot name="append"></slot>
diff --git a/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue b/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue
index 2f64757dbf2..22099ef307c 100644
--- a/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue
+++ b/app/assets/javascripts/vue_shared/components/form/input_copy_toggle_visibility.vue
@@ -96,8 +96,7 @@ export default {
     },
     formInputClass() {
       return [
-        // eslint-disable-next-line @gitlab/require-i18n-strings
-        '!gl-font-monospace gl-cursor-default!',
+        '!gl-font-monospace !gl-cursor-default',
         { 'input-copy-show-disc': !this.computedValueIsVisible },
         this.formInputGroupProps.class,
       ];
diff --git a/app/assets/javascripts/vue_shared/components/groups_list/groups_list.vue b/app/assets/javascripts/vue_shared/components/groups_list/groups_list.vue
index b2589f498b5..4dceb3a907d 100644
--- a/app/assets/javascripts/vue_shared/components/groups_list/groups_list.vue
+++ b/app/assets/javascripts/vue_shared/components/groups_list/groups_list.vue
@@ -35,7 +35,7 @@ export default {
 </script>
 
 <template>
-  <ul class="gl-p-0 gl-list-none">
+  <ul class="gl-list-none gl-p-0">
     <groups-list-item
       v-for="group in groups"
       :key="group.id"
diff --git a/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue b/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue
index 5f50b2d9440..df1592110ac 100644
--- a/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue
@@ -144,7 +144,7 @@ export default {
   <li class="groups-list-item gl-border-b gl-flex gl-py-5">
     <div class="gl-grow md:gl-flex">
       <div class="gl-flex gl-grow gl-items-start">
-        <div v-if="showGroupIcon" class="gl-mr-3 gl-flex gl-h-9 gl-flex-shrink-0 gl-items-center">
+        <div v-if="showGroupIcon" class="gl-mr-3 gl-flex gl-h-9 gl-shrink-0 gl-items-center">
           <gl-icon class="gl-text-secondary" :name="groupIconName" />
         </div>
         <gl-avatar-labeled
diff --git a/app/assets/javascripts/vue_shared/components/incubation/pagination.vue b/app/assets/javascripts/vue_shared/components/incubation/pagination.vue
index a002cf31a23..e40cc2b6feb 100644
--- a/app/assets/javascripts/vue_shared/components/incubation/pagination.vue
+++ b/app/assets/javascripts/vue_shared/components/incubation/pagination.vue
@@ -42,7 +42,7 @@ export default {
 </script>
 
 <template>
-  <div v-if="isPaginationVisible" class="gl-flex gl-justify-center gl-items-center">
+  <div v-if="isPaginationVisible" class="gl-flex gl-items-center gl-justify-center">
     <gl-keyset-pagination
       :start-cursor="startCursor"
       :end-cursor="endCursor"
diff --git a/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue b/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue
index 6f7a7f2bc53..ef3d2b8ebb7 100644
--- a/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue
@@ -164,7 +164,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-display-inline">
+  <div class="gl-inline">
     <gl-icon
       :id="glIconId"
       ref="icon"
@@ -179,12 +179,12 @@ export default {
       >
       <template v-if="loading">
         <gl-loading-icon size="sm" />
-        <p class="gl-mt-4 gl-mb-0 gl-font-small">{{ loadingMessage }}</p>
+        <p class="gl-mb-0 gl-mt-4">{{ loadingMessage }}</p>
       </template>
       <template v-else>
-        <ul class="gl-list-none gl-p-0 gl-mb-0">
+        <ul class="gl-mb-0 gl-list-none gl-p-0">
           <li v-for="(issuable, index) in displayedIssuables" :key="issuable.id">
-            <gl-link :href="issuable.webUrl" class="gl-text-blue-500! gl-font-sm">{{
+            <gl-link :href="issuable.webUrl" class="gl-text-sm !gl-text-blue-500">{{
               issuable.reference
             }}</gl-link>
             <p
@@ -204,7 +204,7 @@ export default {
           <gl-link
             data-testid="view-all-issues"
             :href="`${item.webUrl}#related-issues`"
-            class="gl-text-blue-500! gl-font-sm"
+            class="gl-text-sm !gl-text-blue-500"
             >{{ viewAllIssuablesText }}</gl-link
           >
         </div>
diff --git a/app/assets/javascripts/vue_shared/components/list_selector/group_item.vue b/app/assets/javascripts/vue_shared/components/list_selector/group_item.vue
index d17606003bf..622b97b4ad0 100644
--- a/app/assets/javascripts/vue_shared/components/list_selector/group_item.vue
+++ b/app/assets/javascripts/vue_shared/components/list_selector/group_item.vue
@@ -46,7 +46,7 @@ export default {
 <template>
   <div class="gl-flex gl-items-center gl-gap-3">
     <hidden-groups-item v-if="isHiddenGroups" class="gl-grow" />
-    <div v-else class="gl-flex gl-items-center gl-gap-3 gl-grow">
+    <div v-else class="gl-flex gl-grow gl-items-center gl-gap-3">
       <gl-avatar
         :alt="fullName"
         :entity-name="fullName"
diff --git a/app/assets/javascripts/vue_shared/components/logs_viewer/line_number.vue b/app/assets/javascripts/vue_shared/components/logs_viewer/line_number.vue
index 4e57c513ebe..fde32ca614b 100644
--- a/app/assets/javascripts/vue_shared/components/logs_viewer/line_number.vue
+++ b/app/assets/javascripts/vue_shared/components/logs_viewer/line_number.vue
@@ -20,7 +20,7 @@ export default {
 <template>
   <a
     :id="lineId"
-    class="gl-inline-block gl-w-9 gl-pr-2 -gl-ml-9 gl-select-none gl-text-right"
+    class="-gl-ml-9 gl-inline-block gl-w-9 gl-select-none gl-pr-2 gl-text-right"
     :href="lineHref"
   >
     {{ lineNumber }}
diff --git a/app/assets/javascripts/vue_shared/components/logs_viewer/logs_viewer.vue b/app/assets/javascripts/vue_shared/components/logs_viewer/logs_viewer.vue
index 274b6c287f3..a221cf2ab74 100644
--- a/app/assets/javascripts/vue_shared/components/logs_viewer/logs_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/logs_viewer/logs_viewer.vue
@@ -115,7 +115,7 @@ export default {
       @scrollToBottom="onScrollToBottom"
       ><slot name="header-details"></slot>
     </logs-top-bar>
-    <code class="gl-block gl-bg-black gl-text-base gl-pt-3">
+    <code class="gl-block gl-bg-black gl-pt-3 gl-text-base">
       <log-line
         v-for="logLine in logLines"
         :key="logLine.lineId"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/non_gfm_markdown.vue b/app/assets/javascripts/vue_shared/components/markdown/non_gfm_markdown.vue
index f6aa54a17a9..ab905c9f5aa 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/non_gfm_markdown.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/non_gfm_markdown.vue
@@ -100,10 +100,10 @@ export default {
           v-if="hoverMap[`code-${index}`]"
           :title="$options.i18n.copyCodeTitle"
           :text="block.text"
-          class="gl-absolute gl-top-3 gl-right-3 gl-z-1 gl-duration-medium"
+          class="gl-absolute gl-right-3 gl-top-3 gl-z-1 gl-duration-medium"
         />
         <code-block-highlighted
-          class="gl-border gl-rounded-0! gl-p-4 gl-mb-0 gl-overflow-y-auto"
+          class="gl-border gl-mb-0 gl-overflow-y-auto !gl-rounded-none gl-p-4"
           :language="block.lang || $options.fallbackLanguage"
           :code="block.text"
         />
diff --git a/app/assets/javascripts/vue_shared/components/metric_images/metric_images_table.vue b/app/assets/javascripts/vue_shared/components/metric_images/metric_images_table.vue
index c8460f4c342..d70eef3d7b0 100644
--- a/app/assets/javascripts/vue_shared/components/metric_images/metric_images_table.vue
+++ b/app/assets/javascripts/vue_shared/components/metric_images/metric_images_table.vue
@@ -88,7 +88,7 @@ export default {
         'gl-border-1',
         'gl-border-t-solid',
         'gl-border-gray-100',
-        { 'gl-display-none': this.isCollapsed },
+        { 'gl-hidden': this.isCollapsed },
       ];
     },
   },
@@ -112,12 +112,12 @@ export default {
 
 <template>
   <gl-card
-    class="collapsible-card border gl-p-0 gl-mb-5"
-    header-class="gl-display-flex gl-align-items-center gl-border-b-0 gl-py-3"
+    class="collapsible-card border gl-mb-5 gl-p-0"
+    header-class="gl-flex gl-items-center gl-border-b-0 gl-py-3"
     :body-class="bodyClass"
   >
     <gl-modal
-      body-class="gl-pb-0! gl-min-h-6!"
+      body-class="!gl-pb-0 !gl-min-h-6"
       modal-id="delete-metric-modal"
       size="sm"
       :visible="modalVisible"
@@ -149,10 +149,10 @@ export default {
     />
 
     <template #header>
-      <div class="gl-w-full gl-display-flex gl-flex-direction-row gl-justify-content-space-between">
-        <div class="gl-display-flex gl-flex-direction-row gl-align-items-center gl-w-full">
+      <div class="gl-flex gl-w-full gl-flex-row gl-justify-between">
+        <div class="gl-flex gl-w-full gl-flex-row gl-items-center">
           <gl-button
-            class="collapsible-card-btn gl-display-flex gl-text-decoration-none !gl-text-inherit gl-hover-text-blue-800! !gl-shadow-none"
+            class="collapsible-card-btn gl-flex !gl-text-inherit gl-no-underline !gl-shadow-none hover:!gl-text-blue-800"
             :aria-label="filename"
             variant="link"
             category="tertiary"
@@ -168,7 +168,7 @@ export default {
           <span v-else data-testid="metric-image-label-span">{{
             urlText == null || urlText == '' ? filename : urlText
           }}</span>
-          <div class="gl-ml-auto btn-group">
+          <div class="btn-group gl-ml-auto">
             <gl-button
               v-if="canUpdate"
               v-gl-tooltip.bottom
@@ -191,12 +191,8 @@ export default {
         </div>
       </div>
     </template>
-    <div
-      v-show="!isCollapsed"
-      class="gl-display-flex gl-flex-direction-column"
-      data-testid="metric-image-body"
-    >
-      <img class="gl-max-w-full gl-align-self-center" :src="filePath" />
+    <div v-show="!isCollapsed" class="gl-flex gl-flex-col" data-testid="metric-image-body">
+      <img class="gl-max-w-full gl-self-center" :src="filePath" />
     </div>
   </gl-card>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
index 52e6d1b32a8..279f31b6980 100644
--- a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
@@ -222,7 +222,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-justify-content-end gl-w-full" data-testid="merge-request-actions">
+  <div class="gl-flex gl-w-full gl-justify-end" data-testid="merge-request-actions">
     <gl-disclosure-dropdown
       id="new-actions-header-dropdown"
       ref="mrMoreActionsDropdown"
@@ -237,10 +237,10 @@ export default {
       @hidden="hideDropdown"
     >
       <template #toggle>
-        <div class="gl-min-h-7 gl-mb-2 gl-sm-mb-0!">
+        <div class="gl-mb-2 gl-min-h-7 sm:!gl-mb-0">
           <gl-button
-            class="sm:!gl-hidden gl-new-dropdown-toggle gl-w-full"
-            button-text-classes="gl-display-flex gl-justify-content-space-between gl-w-full"
+            class="gl-new-dropdown-toggle gl-w-full sm:!gl-hidden"
+            button-text-classes="gl-flex gl-justify-between gl-w-full"
             category="secondary"
             tabindex="0"
             :aria-label="$options.i18n.mergeRequestActions"
@@ -249,7 +249,7 @@ export default {
             <gl-icon class="dropdown-chevron" name="chevron-down" />
           </gl-button>
           <gl-button
-            class="gl-hidden sm:!gl-flex gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret"
+            class="gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret gl-hidden sm:!gl-flex"
             category="tertiary"
             icon="ellipsis_v"
             tabindex="0"
@@ -270,7 +270,7 @@ export default {
       <gl-disclosure-dropdown-group
         bordered
         :class="{
-          'gl-mt-0! gl-pt-0! gl-border-t-0!': !isLoggedIn || isNotificationsTodosButtons,
+          '!gl-mt-0 !gl-border-t-0 !gl-pt-0': !isLoggedIn || isNotificationsTodosButtons,
         }"
       >
         <gl-disclosure-dropdown-item
@@ -351,7 +351,7 @@ export default {
       <gl-disclosure-dropdown-group
         v-if="!isCurrentUser"
         bordered
-        :class="{ 'gl-mt-0! gl-pt-0! gl-border-t-0!': !canUpdateMergeRequest }"
+        :class="{ '!gl-mt-0 !gl-border-t-0 !gl-pt-0': !canUpdateMergeRequest }"
       >
         <gl-disclosure-dropdown-item
           class="js-report-abuse-dropdown-item"
diff --git a/app/assets/javascripts/vue_shared/components/navigation_tabs.vue b/app/assets/javascripts/vue_shared/components/navigation_tabs.vue
index fc422d28b52..04c6b871c12 100644
--- a/app/assets/javascripts/vue_shared/components/navigation_tabs.vue
+++ b/app/assets/javascripts/vue_shared/components/navigation_tabs.vue
@@ -56,7 +56,7 @@ export default {
 };
 </script>
 <template>
-  <gl-tabs class="gl-display-flex gl-w-full" nav-class="gl-border-0!">
+  <gl-tabs class="gl-flex gl-w-full" nav-class="!gl-border-0">
     <gl-tab
       v-for="(tab, i) in tabs"
       :key="i"
diff --git a/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue b/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue
index 20f23db9901..cc814e9691c 100644
--- a/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue
@@ -186,8 +186,8 @@ export default {
       :toggle-text="$options.i18n.toggleButtonLabel"
       variant="confirm"
       data-testid="new-resource-dropdown"
-      class="gl-display-flex! !gl-w-auto"
-      toggle-class="gl-m-0! !gl-w-auto gl-flex-grow-0!"
+      class="!gl-flex !gl-w-auto"
+      toggle-class="!gl-m-0 !gl-w-auto !gl-grow-0"
       @click="handleDropdownClick"
       @shown="handleDropdownShown"
     >
diff --git a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
index 0e12edd69c5..b9bc86cdde6 100644
--- a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
@@ -85,7 +85,7 @@ export default {
       <div class="note-header">
         <div class="note-header-info">
           <a :href="getUserData.path">
-            <span class="gl-hidden sm:gl-inline-block gl-font-bold">{{ getUserData.name }}</span>
+            <span class="gl-hidden gl-font-bold sm:gl-inline-block">{{ getUserData.name }}</span>
             <span class="note-headline-light">@{{ getUserData.username }}</span>
           </a>
         </div>
diff --git a/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue b/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
index a2a3cc6f09e..d97390f2cb3 100644
--- a/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
@@ -14,7 +14,7 @@ export default {
 <template>
   <timeline-entry-item class="note note-wrapper">
     <div
-      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
+      class="gl-float-left -gl-mt-1 gl-ml-2 gl-flex gl-h-6 gl-w-6 gl-items-center gl-justify-center gl-rounded-full gl-bg-gray-50 gl-text-gray-600"
     ></div>
     <div class="timeline-content">
       <div class="note-header"></div>
diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
index 2553fe6501b..9e2fc1cc145 100644
--- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
@@ -149,10 +149,10 @@ export default {
         iconBgClass,
         {
           'system-note-icon': isAllowedIcon,
-          'system-note-tiny-dot gl-bg-gray-900!': !isAllowedIcon,
+          'system-note-tiny-dot !gl-bg-gray-900': !isAllowedIcon,
         },
       ]"
-      class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full gl-relative timeline-icon"
+      class="timeline-icon gl-relative gl-float-left gl-flex gl-items-center gl-justify-center gl-rounded-full"
     >
       <gl-icon
         v-if="isAllowedIcon"
@@ -180,7 +180,7 @@ export default {
               variant="link"
               :icon="descriptionVersionToggleIcon"
               data-testid="compare-btn"
-              class="gl-vertical-align-text-bottom gl-font-sm! gl-ml-3"
+              class="gl-ml-3 gl-align-text-bottom !gl-text-sm"
               @click="toggleDescriptionVersion"
               >{{ __('Compare with previous version') }}</gl-button
             >
@@ -189,7 +189,7 @@ export default {
               :icon="showLines ? 'chevron-up' : 'chevron-down'"
               variant="link"
               data-testid="outdated-lines-change-btn"
-              class="gl-vertical-align-text-bottom gl-font-sm!"
+              class="gl-align-text-bottom !gl-text-sm"
               @click="toggleDiff"
             >
               {{ __('Compare changes') }}
@@ -232,7 +232,7 @@ export default {
         </div>
         <div
           v-if="lines.length && showLines"
-          class="diff-content outdated-lines-wrapper gl-border-solid gl-border-1 gl-border-gray-200 gl-mt-4 gl-rounded-small gl-overflow-hidden"
+          class="diff-content outdated-lines-wrapper gl-mt-4 gl-overflow-hidden gl-rounded-small gl-border-1 gl-border-solid gl-border-gray-200"
         >
           <table
             :class="$options.userColorSchemeClass"
@@ -242,19 +242,16 @@ export default {
             <tr v-for="line in lines" v-once :key="line.line_code" class="line_holder">
               <td
                 :class="line.type"
-                class="diff-line-num old_line gl-border-bottom-0! gl-border-top-0! gl-border-0! gl-rounded-0!"
+                class="diff-line-num old_line !gl-rounded-none !gl-border-0 !gl-border-b-0 !gl-border-t-0"
               >
                 {{ line.old_line }}
               </td>
-              <td
-                :class="line.type"
-                class="diff-line-num new_line gl-border-bottom-0! gl-border-top-0!"
-              >
+              <td :class="line.type" class="diff-line-num new_line !gl-border-b-0 !gl-border-t-0">
                 {{ line.new_line }}
               </td>
               <td
                 :class="line.type"
-                class="line_content gl-display-table-cell! gl-border-0! gl-rounded-0!"
+                class="line_content !gl-table-cell !gl-rounded-none !gl-border-0"
                 v-html="line.rich_text /* eslint-disable-line vue/no-v-html */"
               ></td>
             </tr>
diff --git a/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue b/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue
index 01eb29b8c48..1507902b48f 100644
--- a/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/timeline_icon.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="gl-float-left gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
+    class="gl-float-left -gl-mt-1 gl-ml-2 gl-flex gl-h-6 gl-w-6 gl-items-center gl-justify-center gl-rounded-full gl-bg-gray-50 gl-text-gray-600"
   >
     <slot></slot>
   </div>
diff --git a/app/assets/javascripts/vue_shared/components/number_to_human_size/number_to_human_size.stories.js b/app/assets/javascripts/vue_shared/components/number_to_human_size/number_to_human_size.stories.js
index 9039d187d57..593cef68f50 100644
--- a/app/assets/javascripts/vue_shared/components/number_to_human_size/number_to_human_size.stories.js
+++ b/app/assets/javascripts/vue_shared/components/number_to_human_size/number_to_human_size.stories.js
@@ -30,5 +30,5 @@ export const CustomStyles = Template.bind({});
 CustomStyles.args = {
   ...Default.args,
   class: 'gl-font-bold',
-  labelClass: 'gl-font-sm gl-text-gray-500',
+  labelClass: 'gl-text-sm gl-text-gray-500',
 };
diff --git a/app/assets/javascripts/vue_shared/components/page_heading.vue b/app/assets/javascripts/vue_shared/components/page_heading.vue
index a2408f67887..c8ccde1cf4b 100644
--- a/app/assets/javascripts/vue_shared/components/page_heading.vue
+++ b/app/assets/javascripts/vue_shared/components/page_heading.vue
@@ -13,7 +13,7 @@ export default {
 <template>
   <div>
     <div
-      class="gl-flex gl-flex-wrap gl-items-center gl-justify-between gl-gap-y-2 gl-gap-x-5 gl-my-5"
+      class="gl-my-5 gl-flex gl-flex-wrap gl-items-center gl-justify-between gl-gap-x-5 gl-gap-y-2"
     >
       <h1 class="gl-heading-1 !gl-m-0" data-testid="page-heading">
         <slot name="heading"></slot>
@@ -28,7 +28,7 @@ export default {
       </div>
       <div
         v-if="$scopedSlots.description"
-        class="gl-w-full gl-mt-2 gl-text-secondary"
+        class="gl-mt-2 gl-w-full gl-text-secondary"
         data-testid="page-heading-description"
       >
         <slot name="description"></slot>
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 8d0bb028141..96b3aeb66ee 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,7 +1,6 @@
-export const tdClass =
-  'table-col gl-display-flex d-md-table-cell gl-align-items-center gl-whitespace-nowrap';
+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 gl-hover-cursor-pointer gl-hover-bg-gray-50 gl-hover-border-b-solid';
+  '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';
 
 export const defaultPageSize = 20;
 
diff --git a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
index 57d6b8f240b..849e16d48e3 100644
--- a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
+++ b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
@@ -279,7 +279,7 @@ export default {
       <span v-safe-html="serverErrorMessage || i18n.errorMsg"></span>
     </gl-alert>
 
-    <div class="list-header gl-display-flex gl-justify-content-space-between">
+    <div class="list-header gl-flex gl-justify-between">
       <gl-tabs content-class="gl-p-0" @input="filterItemsByStatus">
         <gl-tab v-for="tab in statusTabs" :key="tab.status" :data-testid="tab.status">
           <template #title>
@@ -301,13 +301,13 @@ export default {
         :initial-filter-value="filteredSearchValue"
         initial-sortby="created_desc"
         :recent-searches-storage-key="filterSearchKey"
-        :class="{ 'gl-border-bottom-0': showItems }"
+        :class="{ 'gl-border-b-0': showItems }"
         class="row-content-block"
         @onFilter="handleFilterItems"
       />
     </div>
 
-    <h4 class="gl-block md:gl-hidden my-3">
+    <h4 class="my-3 gl-block md:gl-hidden">
       <slot name="title"></slot>
     </h4>
 
diff --git a/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue b/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue
index 6efde938374..2a12e21d2e5 100644
--- a/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue
+++ b/app/assets/javascripts/vue_shared/components/pagination_bar/pagination_bar.vue
@@ -79,7 +79,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-align-items-center">
+  <div class="gl-flex gl-items-center">
     <local-storage-sync
       v-if="storageKey"
       :storage-key="storageKey"
diff --git a/app/assets/javascripts/vue_shared/components/papa_parse_alert.vue b/app/assets/javascripts/vue_shared/components/papa_parse_alert.vue
index fa11661255f..925780fe0e8 100644
--- a/app/assets/javascripts/vue_shared/components/papa_parse_alert.vue
+++ b/app/assets/javascripts/vue_shared/components/papa_parse_alert.vue
@@ -35,7 +35,7 @@ export default {
 <template>
   <gl-alert variant="danger" :dismissible="false">
     {{ $options.i18n.genericErrorMessage }}
-    <ul class="gl-mb-0!">
+    <ul class="!gl-mb-0">
       <li v-for="error in errorMessages" :key="error">
         {{ error }}
       </li>
diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue
index bdc8ffee90a..06c86a38457 100644
--- a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue
@@ -46,12 +46,10 @@ export default {
 <template>
   <gl-button
     category="tertiary"
-    class="gl-display-flex gl-align-items-center gl-justify-content-start! gl-mb-2 gl-w-full"
+    class="gl-mb-2 gl-flex gl-w-full gl-items-center !gl-justify-start"
     @click="onClick"
   >
-    <div
-      class="gl-display-flex gl-align-items-center gl-flex-wrap project-namespace-name-container"
-    >
+    <div class="project-namespace-name-container gl-flex gl-flex-wrap gl-items-center">
       <gl-icon v-if="selected" data-testid="selected-icon" name="mobile-issue-close" />
       <project-avatar
         :project-id="project.id"
diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue
index dc900faa71b..c413fa90638 100644
--- a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue
+++ b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue
@@ -103,7 +103,7 @@ export default {
       data-testid="project-search-field"
       @input="onInput"
     />
-    <div class="gl-flex flex-column">
+    <div class="flex-column gl-flex">
       <gl-loading-icon v-if="showLoadingIndicator" size="sm" class="py-2 px-4" />
       <gl-infinite-scroll
         :max-list-height="maxListHeight"
@@ -130,18 +130,18 @@ export default {
           <span data-testid="legend-text">{{ legendText }}</span>
         </template>
       </gl-infinite-scroll>
-      <div v-if="showNoResultsMessage" class="gl-text-gray-600 gl-ml-3 js-no-results-message">
+      <div v-if="showNoResultsMessage" class="js-no-results-message gl-ml-3 gl-text-gray-600">
         {{ __('Sorry, no projects matched your search') }}
       </div>
       <div
         v-if="showMinimumSearchQueryMessage"
-        class="gl-text-gray-600 gl-ml-3 js-minimum-search-query-message"
+        class="js-minimum-search-query-message gl-ml-3 gl-text-gray-600"
       >
         {{ __('Enter at least three characters to search') }}
       </div>
       <div
         v-if="showSearchErrorMessage"
-        class="gl-text-red-500 gl-font-bold gl-ml-3 js-search-error-message"
+        class="js-search-error-message gl-ml-3 gl-font-bold gl-text-red-500"
       >
         {{ __('Something went wrong, unable to search projects') }}
       </div>
diff --git a/app/assets/javascripts/vue_shared/components/projects_list/projects_list.vue b/app/assets/javascripts/vue_shared/components/projects_list/projects_list.vue
index d928e76227e..dcaceec58df 100644
--- a/app/assets/javascripts/vue_shared/components/projects_list/projects_list.vue
+++ b/app/assets/javascripts/vue_shared/components/projects_list/projects_list.vue
@@ -58,7 +58,7 @@ export default {
 </script>
 
 <template>
-  <ul class="gl-p-0 gl-list-none">
+  <ul class="gl-list-none gl-p-0">
     <projects-list-item
       v-for="project in projects"
       :key="project.id"
diff --git a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
index aa12580f6d5..f8c697881cd 100644
--- a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
@@ -252,7 +252,7 @@ export default {
   <li class="projects-list-item gl-border-b gl-flex gl-py-5">
     <div class="gl-grow md:gl-flex">
       <div class="gl-flex gl-grow gl-items-start">
-        <div v-if="showProjectIcon" class="gl-mr-3 gl-flex gl-h-9 gl-flex-shrink-0 gl-items-center">
+        <div v-if="showProjectIcon" class="gl-mr-3 gl-flex gl-h-9 gl-shrink-0 gl-items-center">
           <gl-icon class="gl-text-secondary" name="project" />
         </div>
         <gl-avatar-labeled
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 8e0c8408d5c..c1e61ee5b8f 100644
--- a/app/assets/javascripts/vue_shared/components/registry/details_row.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/details_row.vue
@@ -32,10 +32,10 @@ export default {
 
 <template>
   <div
-    class="gl-display-flex gl-align-items-top gl-font-monospace gl-font-sm gl-break-all"
+    class="gl-align-items-top gl-flex gl-break-all gl-text-sm gl-font-monospace"
     :class="[padding, borderClass]"
   >
-    <div v-if="icon" class="gl-w-5 gl-mr-4">
+    <div v-if="icon" class="gl-mr-4 gl-w-5">
       <gl-icon :name="icon" />
     </div>
     <div>
diff --git a/app/assets/javascripts/vue_shared/components/registry/history_item.vue b/app/assets/javascripts/vue_shared/components/registry/history_item.vue
index 991e06d0ad4..c36f686d01a 100644
--- a/app/assets/javascripts/vue_shared/components/registry/history_item.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/history_item.vue
@@ -20,7 +20,7 @@ export default {
 <template>
   <timeline-entry-item class="system-note note-wrapper">
     <div
-      class="gl-flex gl-justify-center gl-items-center gl-rounded-full -gl-mt-1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600 gl-float-left"
+      class="gl-float-left -gl-mt-1 gl-ml-2 gl-flex gl-h-6 gl-w-6 gl-items-center gl-justify-center gl-rounded-full gl-bg-gray-50 gl-text-gray-600"
     >
       <gl-icon :name="icon" />
     </div>
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 8bcd1574ba3..ff25ec8f01e 100644
--- a/app/assets/javascripts/vue_shared/components/registry/list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/list_item.vue
@@ -104,7 +104,7 @@ export default {
           </div>
         </div>
         <div
-          class="gl-flex gl-flex-shrink-0 gl-flex-col gl-justify-between gl-text-secondary sm:gl-items-end"
+          class="gl-flex gl-shrink-0 gl-flex-col gl-justify-between gl-text-secondary sm:gl-items-end"
         >
           <div
             v-if="
diff --git a/app/assets/javascripts/vue_shared/components/registry/metadata_item.vue b/app/assets/javascripts/vue_shared/components/registry/metadata_item.vue
index 4a0d33dbbd2..b0996e7bbec 100644
--- a/app/assets/javascripts/vue_shared/components/registry/metadata_item.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/metadata_item.vue
@@ -50,9 +50,9 @@ export default {
 </script>
 
 <template>
-  <div class="gl-inline-flex gl-align-items-center">
-    <gl-icon v-if="icon" :name="icon" class="gl-text-gray-500 gl-min-w-5 gl-mr-3" />
-    <tooltip-on-truncate v-if="link" :title="text" class="gl-text-truncate" :class="sizeClass">
+  <div class="gl-inline-flex gl-items-center">
+    <gl-icon v-if="icon" :name="icon" class="gl-mr-3 gl-min-w-5 gl-text-gray-500" />
+    <tooltip-on-truncate v-if="link" :title="text" class="gl-truncate" :class="sizeClass">
       <gl-link :href="link" class="gl-font-bold">
         {{ text }}
       </gl-link>
@@ -60,10 +60,10 @@ export default {
     <div
       v-else
       data-testid="metadata-item-text"
-      class="gl-font-bold gl-inline-flex"
+      class="gl-inline-flex gl-font-bold"
       :class="sizeClass"
     >
-      <tooltip-on-truncate v-if="!textTooltip" :title="text" class="gl-text-truncate">
+      <tooltip-on-truncate v-if="!textTooltip" :title="text" class="gl-truncate">
         {{ text }}
       </tooltip-on-truncate>
       <span v-else v-gl-tooltip="{ title: textTooltip }" data-testid="text-tooltip-container">
diff --git a/app/assets/javascripts/vue_shared/components/registry/registry_search.vue b/app/assets/javascripts/vue_shared/components/registry/registry_search.vue
index 1d1cfaffd84..c331f4a838b 100644
--- a/app/assets/javascripts/vue_shared/components/registry/registry_search.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/registry_search.vue
@@ -126,12 +126,10 @@ export default {
 </script>
 
 <template>
-  <div
-    class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-gap-3 row-content-block"
-  >
+  <div class="row-content-block gl-flex gl-flex-col gl-gap-3 md:gl-flex-row">
     <gl-filtered-search
       v-model="internalFilter"
-      class="gl-flex-grow-1 gl-min-w-0"
+      class="gl-min-w-0 gl-grow"
       :placeholder="__('Filter results')"
       :available-tokens="tokens"
       @submit="submitSearch"
diff --git a/app/assets/javascripts/vue_shared/components/registry/title_area.vue b/app/assets/javascripts/vue_shared/components/registry/title_area.vue
index 29d1822d935..b32ab099a43 100644
--- a/app/assets/javascripts/vue_shared/components/registry/title_area.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/title_area.vue
@@ -61,42 +61,37 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-flex-direction-column">
-    <div
-      class="gl-display-flex gl-flex-wrap gl-sm-flex-nowrap gl-justify-content-space-between gl-py-3"
-    >
-      <div class="gl-flex-direction-column gl-flex-grow-1 gl-min-w-0">
-        <div class="gl-display-flex">
+  <div class="gl-flex gl-flex-col">
+    <div class="gl-flex gl-flex-wrap gl-justify-between gl-py-3 sm:gl-flex-nowrap">
+      <div class="gl-min-w-0 gl-grow gl-flex-col">
+        <div class="gl-flex">
           <gl-avatar
             v-if="avatar"
             :src="avatar"
             :shape="$options.AVATAR_SHAPE_OPTION_RECT"
-            class="gl-align-self-center gl-mr-4"
+            class="gl-mr-4 gl-self-center"
           />
 
-          <div class="gl-display-flex gl-flex-direction-column gl-min-w-0">
-            <h2 class="gl-font-size-h1 gl-mt-3 gl-mb-0" data-testid="title">
+          <div class="gl-flex gl-min-w-0 gl-flex-col">
+            <h2 class="gl-mb-0 gl-mt-3 gl-text-size-h1" data-testid="title">
               <slot name="title">{{ title }}</slot>
             </h2>
 
             <div
               v-if="$scopedSlots['sub-header']"
-              class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-mt-3"
+              class="gl-mt-3 gl-flex gl-items-center gl-text-gray-500"
             >
               <slot name="sub-header"></slot>
             </div>
           </div>
         </div>
 
-        <div
-          v-if="metadataSlots.length > 0"
-          class="gl-display-flex gl-flex-wrap gl-align-items-center gl-mt-3"
-        >
+        <div v-if="metadataSlots.length > 0" class="gl-mt-3 gl-flex gl-flex-wrap gl-items-center">
           <template v-if="!metadataLoading">
             <div
               v-for="(row, metadataIndex) in metadataSlots"
               :key="metadataIndex"
-              class="gl-display-flex gl-align-items-center gl-mr-5"
+              class="gl-mr-5 gl-flex gl-items-center"
             >
               <slot :name="row"></slot>
             </div>
@@ -111,10 +106,7 @@ export default {
           </template>
         </div>
       </div>
-      <div
-        v-if="$scopedSlots['right-actions']"
-        class="gl-display-flex gl-align-items-flex-start gl-gap-3 gl-mt-3"
-      >
+      <div v-if="$scopedSlots['right-actions']" class="gl-mt-3 gl-flex gl-items-start gl-gap-3">
         <slot name="right-actions"></slot>
       </div>
     </div>
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 1f50597edd3..5b7a12e80fd 100644
--- a/app/assets/javascripts/vue_shared/components/settings/settings_block.vue
+++ b/app/assets/javascripts/vue_shared/components/settings/settings_block.vue
@@ -55,12 +55,12 @@ export default {
 
 <template>
   <section class="vue-settings-block">
-    <div class="gl-flex gl-justify-between gl-items-start">
+    <div class="gl-flex gl-items-start gl-justify-between">
       <div class="gl-grow">
         <h2
           role="button"
           tabindex="-1"
-          class="gl-heading-2 gl-cursor-pointer !gl-mb-2"
+          class="gl-heading-2 !gl-mb-2 gl-cursor-pointer"
           :aria-expanded="ariaExpanded"
           :aria-controls="collapseId"
           @click="toggleExpanded"
@@ -68,9 +68,9 @@ export default {
           <slot v-if="$scopedSlots.title" name="title"></slot>
           <template v-else>{{ title }}</template>
         </h2>
-        <p class="gl-text-subtle gl-m-0"><slot name="description"></slot></p>
+        <p class="gl-m-0 gl-text-subtle"><slot name="description"></slot></p>
       </div>
-      <div class="gl-flex-shrink-0 gl-px-2">
+      <div class="gl-shrink-0 gl-px-2">
         <gl-button
           class="gl-min-w-12 gl-shrink-0"
           :aria-expanded="ariaExpanded"
diff --git a/app/assets/javascripts/vue_shared/components/settings/settings_section.vue b/app/assets/javascripts/vue_shared/components/settings/settings_section.vue
index e27e3361447..48e3d7893a4 100644
--- a/app/assets/javascripts/vue_shared/components/settings/settings_section.vue
+++ b/app/assets/javascripts/vue_shared/components/settings/settings_section.vue
@@ -25,7 +25,7 @@ export default {
         </h2>
         <p
           v-if="$scopedSlots.description || description"
-          class="gl-text-subtle gl-mb-3"
+          class="gl-mb-3 gl-text-subtle"
           data-testid="settings-section-description"
         >
           <slot v-if="$scopedSlots.description" name="description"></slot>
diff --git a/app/assets/javascripts/vue_shared/components/toggle_labels.vue b/app/assets/javascripts/vue_shared/components/toggle_labels.vue
index 1f06ca84eaf..191b8f440ef 100644
--- a/app/assets/javascripts/vue_shared/components/toggle_labels.vue
+++ b/app/assets/javascripts/vue_shared/components/toggle_labels.vue
@@ -46,7 +46,7 @@ export default {
 </script>
 
 <template>
-  <div class="board-labels-toggle-wrapper gl-display-flex gl-align-items-center gl-md-ml-3 gl-h-7">
+  <div class="board-labels-toggle-wrapper gl-flex gl-h-7 gl-items-center md:gl-ml-3">
     <local-storage-sync :value="isShowingLabels" :storage-key="storageKey" @input="setShowLabels" />
     <gl-toggle
       :value="isShowingLabels"
@@ -57,7 +57,7 @@ export default {
       label-position="left"
       aria-describedby="board-labels-toggle-text"
       data-testid="show-labels-toggle"
-      class="gl-flex-direction-row"
+      class="gl-flex-row"
       @change="setShowLabels"
     />
   </div>
diff --git a/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.stories.js b/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.stories.js
index 4cbab90932d..1e279c888a5 100644
--- a/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.stories.js
+++ b/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.stories.js
@@ -14,7 +14,7 @@ const createStory = ({ ...options }) => {
       props: Object.keys(argTypes),
       template: `
         <div class="gl-bg-blue-50" :style="{ width }">
-          <tooltip-on-truncate :title="title" :placement="placement" class="gl-block gl-text-truncate">
+          <tooltip-on-truncate :title="title" :placement="placement" class="gl-block gl-truncate">
             {{title}}
           </tooltip-on-truncate>
         </div>
@@ -72,8 +72,8 @@ LiveUpdates.argTypes = {
 export const TruncateTarget = createStory({
   template: `
     <div class="gl-bg-black" :style="{ width }">
-      <tooltip-on-truncate class="gl-display-flex" :truncate-target="truncateTarget" :title="title">
-        <div class="gl-m-5 gl-bg-blue-50 gl-text-truncate">
+      <tooltip-on-truncate class="gl-flex" :truncate-target="truncateTarget" :title="title">
+        <div class="gl-m-5 gl-bg-blue-50 gl-truncate">
           {{ title }}
         </div>
       </tooltip-on-truncate>
diff --git a/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue b/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue
index b8379f66cd7..e8666d49fc2 100644
--- a/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue
+++ b/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue
@@ -44,7 +44,7 @@ export default {
           </div>
         </div>
         <div
-          class="gl-flex gl-flex-shrink-0 gl-flex-col gl-justify-between gl-text-gray-500 sm:gl-items-end"
+          class="gl-flex gl-shrink-0 gl-flex-col gl-justify-between gl-text-gray-500 sm:gl-items-end"
         >
           <div
             v-if="
diff --git a/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue b/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue
index 0569e4d61cf..8e15776248e 100644
--- a/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue
@@ -16,7 +16,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge class="gl-bg-transparent! !gl-shadow-inner-1-gray-100">
+  <gl-badge class="!gl-bg-transparent !gl-shadow-inner-1-gray-100">
     <slot></slot>
   </gl-badge>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index fd288ebebf0..b1dd81f09ca 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -268,19 +268,19 @@ export default {
         <template v-if="!isBlocked">
           <div class="gl-text-gray-500">
             <div v-if="user.email" class="gl-mb-2 gl-flex">
-              <gl-icon name="mail" class="gl-flex-shrink-0" />
+              <gl-icon name="mail" class="gl-shrink-0" />
               <span ref="email" class="gl-ml-2">{{ user.email }}</span>
             </div>
             <div v-if="user.bio" class="gl-mb-2 gl-flex">
-              <gl-icon name="profile" class="gl-flex-shrink-0" />
+              <gl-icon name="profile" class="gl-shrink-0" />
               <span ref="bio" class="gl-ml-2">{{ user.bio }}</span>
             </div>
             <div v-if="user.workInformation" class="gl-mb-2 gl-flex">
-              <gl-icon name="work" class="gl-flex-shrink-0" />
+              <gl-icon name="work" class="gl-shrink-0" />
               <span ref="workInformation" class="gl-ml-2">{{ user.workInformation }}</span>
             </div>
             <div v-if="user.location" class="gl-mb-2 gl-flex">
-              <gl-icon name="location" class="gl-flex-shrink-0" />
+              <gl-icon name="location" class="gl-shrink-0" />
               <span class="gl-ml-2">{{ user.location }}</span>
             </div>
             <div
@@ -288,7 +288,7 @@ export default {
               class="gl-mb-2 gl-flex"
               data-testid="user-popover-local-time"
             >
-              <gl-icon name="clock" class="gl-flex-shrink-0" />
+              <gl-icon name="clock" class="gl-shrink-0" />
               <span class="gl-ml-2">{{ user.localTime }}</span>
             </div>
           </div>
diff --git a/app/assets/javascripts/vue_shared/components/web_ide_link.vue b/app/assets/javascripts/vue_shared/components/web_ide_link.vue
index 555e9f83e69..66aa490495f 100644
--- a/app/assets/javascripts/vue_shared/components/web_ide_link.vue
+++ b/app/assets/javascripts/vue_shared/components/web_ide_link.vue
@@ -126,7 +126,7 @@ export default {
     cssClasses: {
       type: String,
       required: false,
-      default: 'gl-sm-ml-3',
+      default: 'sm:gl-ml-3',
     },
   },
   data() {
@@ -312,10 +312,8 @@ export default {
           @action="executeAction(action)"
         >
           <template #list-item>
-            <div class="gl-display-flex gl-flex-direction-column">
-              <span
-                class="gl-display-flex gl-justify-content-space-between gl-align-items-center gl-mb-2"
-              >
+            <div class="gl-flex gl-flex-col">
+              <span class="gl-mb-2 gl-flex gl-items-center gl-justify-between">
                 <span data-testid="action-primary-text" class="gl-font-bold">{{
                   action.text
                 }}</span>
@@ -323,7 +321,7 @@ export default {
                   action.shortcut
                 }}</kbd>
               </span>
-              <span data-testid="action-secondary-text" class="gl-font-sm gl-text-secondary">
+              <span data-testid="action-secondary-text" class="gl-text-sm gl-text-secondary">
                 {{ action.secondaryText }}
               </span>
             </div>
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
index 47de72837ea..70506770af6 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
@@ -330,7 +330,7 @@ export default {
       :checkbox-checked="allIssuablesChecked"
       :show-friendly-text="showFilteredSearchFriendlyText"
       terms-as-tokens
-      class="row-content-block gl-grow sm:gl-flex gl-border-t-none"
+      class="row-content-block gl-grow gl-border-t-0 sm:gl-flex"
       data-testid="issuable-search-container"
       @checked-input="handleAllIssuablesCheckedInput"
       @onFilter="$emit('filter', $event)"
diff --git a/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue b/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue
index e7569dc14c1..148f9f268d2 100644
--- a/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue
+++ b/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue
@@ -82,7 +82,7 @@ export default {
         v-gl-tooltip.hover.left
         category="tertiary"
         size="small"
-        class="gl-float-right gutter-toggle toggle-right-sidebar-button js-toggle-right-sidebar-button !gl-shadow-none"
+        class="gutter-toggle toggle-right-sidebar-button js-toggle-right-sidebar-button gl-float-right !gl-shadow-none"
         :class="collapsedToggleClass"
         data-testid="toggle-right-sidebar-button"
         :icon="toggleIcon"
diff --git a/app/assets/javascripts/vue_shared/security_configuration/components/section_layout.vue b/app/assets/javascripts/vue_shared/security_configuration/components/section_layout.vue
index 32470172bf8..1509cadd559 100644
--- a/app/assets/javascripts/vue_shared/security_configuration/components/section_layout.vue
+++ b/app/assets/javascripts/vue_shared/security_configuration/components/section_layout.vue
@@ -21,12 +21,12 @@ export default {
 </script>
 
 <template>
-  <div class="row gl-m-0 gl-border-b gl-leading-20 gl-py-6">
+  <div class="row gl-border-b gl-m-0 gl-py-6 gl-leading-20">
     <div class="col-lg-4 gl-pl-0 gl-pr-9">
-      <h2 class="gl-font-size-h2 gl-mt-0">{{ heading }}</h2>
+      <h2 class="gl-mt-0 gl-text-size-h2">{{ heading }}</h2>
       <slot name="description"></slot>
     </div>
-    <div class="col-lg-8 gl-pr-0 gl-pl-0">
+    <div class="col-lg-8 gl-pl-0 gl-pr-0">
       <section-loader v-if="isLoading" />
       <slot v-else name="features"></slot>
     </div>
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 871ee78ce18..c4c43e3782d 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -81,11 +81,6 @@
   color: $gl-text-color-tertiary;
 }
 
-.text-success,
-.text-success:hover {
-  color: $brand-success;
-}
-
 .text-warning,
 .text-warning:hover {
   color: $brand-warning;
diff --git a/app/helpers/access_tokens_helper.rb b/app/helpers/access_tokens_helper.rb
index f05c764bfb4..66b5256a18b 100644
--- a/app/helpers/access_tokens_helper.rb
+++ b/app/helpers/access_tokens_helper.rb
@@ -36,6 +36,8 @@ module AccessTokensHelper
   end
 
   def expires_at_field_data
+    return {} unless Gitlab::CurrentSettings.require_personal_access_token_expiry?
+
     {
       min_date: 1.day.from_now.iso8601
     }
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 5ba028a3b03..e14186b6929 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -8,6 +8,7 @@ module ApplicationSettingsHelper
     :password_authentication_enabled_for_web?,
     :akismet_enabled?,
     :spam_check_endpoint_enabled?,
+    :require_personal_access_token_expiry?,
     to: :'Gitlab::CurrentSettings.current_application_settings'
 
   def user_oauth_applications?
@@ -526,7 +527,8 @@ module ApplicationSettingsHelper
       :downstream_pipeline_trigger_limit_per_project_user_sha,
       :asciidoc_max_includes,
       :ai_action_api_rate_limit,
-      :code_suggestions_api_rate_limit
+      :code_suggestions_api_rate_limit,
+      :require_personal_access_token_expiry
     ].tap do |settings|
       unless Gitlab.com?
         settings << :deactivate_dormant_users
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index 4fc890f8476..ef97bd40ef7 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -289,7 +289,8 @@ module ApplicationSettingImplementation
         user_starred_projects_api_limit: 100,
         nuget_skip_metadata_url_validation: false,
         ai_action_api_rate_limit: 160,
-        code_suggestions_api_rate_limit: 60
+        code_suggestions_api_rate_limit: 60,
+        require_personal_access_token_expiry: true
       }.tap do |hsh|
         hsh.merge!(non_production_defaults) unless Rails.env.production?
       end
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 4edb403514f..fa498aeb355 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -19,7 +19,7 @@ class CommitStatus < Ci::ApplicationRecord
     trigger_request_id_convert_to_bigint
     upstream_pipeline_id_convert_to_bigint
     user_id_convert_to_bigint
-  ], remove_with: '17.0', remove_after: '2024-04-22'
+  ], remove_with: '17.4', remove_after: '2024-08-12'
 
   self.table_name = :p_ci_builds
   self.sequence_name = :ci_builds_id_seq
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index d0587303b1b..a9cc405f57c 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -7,7 +7,6 @@ class ContainerRepository < ApplicationRecord
   include Sortable
   include AfterCommitQueue
   include Packages::Destructible
-  include IgnorableColumns
 
   WAITING_CLEANUP_STATUSES = %i[cleanup_scheduled cleanup_unfinished].freeze
   REQUIRING_CLEANUP_STATUSES = %i[cleanup_unscheduled cleanup_scheduled].freeze
diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index 4a53a0db711..1a111561c06 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -2,7 +2,6 @@
 
 class DeployKey < Key
   include FromUnion
-  include IgnorableColumns
   include PolicyActor
   include Presentable
   include Gitlab::SQL::Pattern
diff --git a/app/models/epic.rb b/app/models/epic.rb
index 81cd342576f..555e2b2e423 100644
--- a/app/models/epic.rb
+++ b/app/models/epic.rb
@@ -3,8 +3,6 @@
 # Placeholder class for model that is implemented in EE
 # It reserves '&' as a reference prefix, but the table does not exist in FOSS
 class Epic < ApplicationRecord
-  include IgnorableColumns
-
   def self.link_reference_pattern
     nil
   end
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb
index 4135b398b09..9c98ac21b7b 100644
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -104,7 +104,7 @@ class PersonalAccessToken < ApplicationRecord
   end
 
   def allow_expires_at_to_be_empty?
-    false
+    !Gitlab::CurrentSettings.require_personal_access_token_expiry?
   end
 
   def expires_at_before_instance_max_expiry_date
diff --git a/app/models/project_pages_metadatum.rb b/app/models/project_pages_metadatum.rb
index 87cff4f2715..d40bfba23b0 100644
--- a/app/models/project_pages_metadatum.rb
+++ b/app/models/project_pages_metadatum.rb
@@ -4,7 +4,6 @@ class ProjectPagesMetadatum < ApplicationRecord
   extend SuppressCompositePrimaryKeyWarning
 
   include EachBatch
-  include IgnorableColumns
 
   self.primary_key = :project_id
 
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 9ce06d01214..10765f82697 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class SentNotification < ApplicationRecord
-  include IgnorableColumns
-
   belongs_to :project
   belongs_to :noteable, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
   belongs_to :recipient, class_name: "User"
diff --git a/app/services/bulk_imports/file_download_service.rb b/app/services/bulk_imports/file_download_service.rb
index d0f3652fe65..56e81733225 100644
--- a/app/services/bulk_imports/file_download_service.rb
+++ b/app/services/bulk_imports/file_download_service.rb
@@ -145,7 +145,7 @@ module BulkImports
     # Before logging, we truncate the context to a reasonable length and scrub
     # any non-printable characters.
     def last_chunk_context
-      @last_chunk_context.to_s.truncate(LAST_CHUNK_CONTEXT_CHAR_LIMIT).scrub
+      @last_chunk_context.to_s.truncate(LAST_CHUNK_CONTEXT_CHAR_LIMIT).force_encoding('utf-8').scrub
     end
   end
 end
diff --git a/app/services/personal_access_tokens/create_service.rb b/app/services/personal_access_tokens/create_service.rb
index 095cfadf02c..a8bc922e8a2 100644
--- a/app/services/personal_access_tokens/create_service.rb
+++ b/app/services/personal_access_tokens/create_service.rb
@@ -41,7 +41,11 @@ module PersonalAccessTokens
     end
 
     def pat_expiration
-      params[:expires_at].presence || max_expiry_date
+      return params[:expires_at] if params[:expires_at].present?
+
+      return max_expiry_date if Gitlab::CurrentSettings.require_personal_access_token_expiry?
+
+      nil
     end
 
     def max_expiry_date
diff --git a/app/services/personal_access_tokens/rotate_service.rb b/app/services/personal_access_tokens/rotate_service.rb
index 396cd6bc2a2..fe79d422582 100644
--- a/app/services/personal_access_tokens/rotate_service.rb
+++ b/app/services/personal_access_tokens/rotate_service.rb
@@ -4,13 +4,15 @@ module PersonalAccessTokens
   class RotateService
     EXPIRATION_PERIOD = 1.week
 
-    def initialize(current_user, token, resource = nil)
+    def initialize(current_user, token, resource = nil, params = {})
       @current_user = current_user
       @token = token
       @resource = resource
+      @params = params.dup
+      @target_user = token.user
     end
 
-    def execute(params = {})
+    def execute
       return error_response(_('token already revoked')) if token.revoked?
 
       response = ServiceResponse.success
@@ -21,7 +23,7 @@ module PersonalAccessTokens
           raise ActiveRecord::Rollback
         end
 
-        response = create_access_token(params)
+        response = create_access_token
 
         raise ActiveRecord::Rollback unless response.success?
       end
@@ -31,16 +33,14 @@ module PersonalAccessTokens
 
     private
 
-    attr_reader :current_user, :token, :resource
-
-    def create_access_token(params)
-      target_user = token.user
+    attr_reader :current_user, :token, :resource, :params, :target_user
 
+    def create_access_token
       unless valid_access_level?
         return error_response(_('Not eligible to rotate token with access level higher than the user'))
       end
 
-      new_token = target_user.personal_access_tokens.create(create_token_params(token, params))
+      new_token = target_user.personal_access_tokens.create(create_token_params)
 
       if new_token.persisted?
         update_bot_membership(target_user, new_token.expires_at)
@@ -73,10 +73,12 @@ module PersonalAccessTokens
       target_user.members.update(expires_at: expires_at)
     end
 
-    def expires_at(params)
-      return params[:expires_at] if params[:expires_at]
+    def expires_at
+      return params[:expires_at] if params[:expires_at].present?
 
-      params[:expires_at] || EXPIRATION_PERIOD.from_now.to_date
+      return default_expiration_date if Gitlab::CurrentSettings.require_personal_access_token_expiry?
+
+      nil
     end
 
     def success_response(new_token)
@@ -87,12 +89,16 @@ module PersonalAccessTokens
       ServiceResponse.error(message: message)
     end
 
-    def create_token_params(token, params)
+    def create_token_params
       { name: token.name,
         previous_personal_access_token_id: token.id,
         impersonation: token.impersonation,
         scopes: token.scopes,
-        expires_at: expires_at(params) }
+        expires_at: expires_at }
+    end
+
+    def default_expiration_date
+      EXPIRATION_PERIOD.from_now.to_date
     end
   end
 end
diff --git a/app/services/resource_access_tokens/create_service.rb b/app/services/resource_access_tokens/create_service.rb
index 9e195184f47..d6931d997ce 100644
--- a/app/services/resource_access_tokens/create_service.rb
+++ b/app/services/resource_access_tokens/create_service.rb
@@ -117,7 +117,13 @@ module ResourceAccessTokens
     end
 
     def pat_expiration
-      params[:expires_at].presence || PersonalAccessToken::MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS.days.from_now
+      return params[:expires_at] if params[:expires_at].present?
+
+      if Gitlab::CurrentSettings.require_personal_access_token_expiry?
+        return PersonalAccessToken::MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS.days.from_now
+      end
+
+      nil
     end
 
     def log_event(token)
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index 8708d2afc0e..c30ea2403be 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -29,6 +29,7 @@
       = f.gitlab_ui_checkbox_component :remember_me_enabled, _('Allow users to extend their session'), help_text: _("Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more%{link_end}.").html_safe % { link_start: remember_me_help_link_start, link_end: '</a>'.html_safe }
 
     = render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f
+    = render 'admin/application_settings/require_personal_access_token_expiry', form: f
     = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
     = render_if_exists 'admin/application_settings/service_access_tokens_expiration_enforced', form: f
     = render_if_exists 'admin/application_settings/ssh_key_expiration_policy', form: f
diff --git a/app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml b/app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml
new file mode 100644
index 00000000000..ffaf1907384
--- /dev/null
+++ b/app/views/admin/application_settings/_require_personal_access_token_expiry.html.haml
@@ -0,0 +1,7 @@
+- help_link = help_page_path('user/profile/personal_access_tokens', anchor: 'create-a-service-account-personal-access-token-with-no-expiry-date')
+- help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_link }
+- help_text = s_('AccessTokens|When enabled, a user will be required to enter in an expiration date when creating an access token. Changes will not affect existing token expiration dates. This setting overrides the group-level %{link_start}service account token expiration%{link_end} setting.').html_safe % { link_start: help_link_start, link_end: '</a>'.html_safe }
+
+.form-group
+  = form.label :require_personal_access_token_expiry, s_('AccessTokens|Personal / project / group access token expiration'), class: 'label-light'
+  = form.gitlab_ui_checkbox_component :require_personal_access_token_expiry, _('Require expiration date'), help_text: help_text
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index 1037ff5c288..5a458b5425f 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -423,6 +423,10 @@ vulnerability_feedback:
   - table: ci_pipelines
     column: pipeline_id
     on_delete: async_nullify
+vulnerability_flags:
+  - table: projects
+    column: project_id
+    on_delete: async_delete
 vulnerability_historical_statistics:
   - table: projects
     column: project_id
diff --git a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index 4fe72f0c8e8..cda95961f68 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -1,13 +1,13 @@
 ---
 data_category: optional
 key_path: counts.issues_created_from_alerts
-description: Count of issues created automatically on alerts from GitLab-Managed Prometheus
+description: Count of issues created automatically on alerts. This count may drop with 17.3 due to the removal of GitLab-Managed Prometheus
 product_group: respond
 value_type: number
 status: active
 time_frame: all
 data_source: database
-instrumentation_class: IssuesCreatedFromAlertsMetric
+instrumentation_class: IssuesWithAlertManagementAlertsMetric
 distribution:
 - ce
 - ee
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 158f28de8ab..804279c7e53 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -695,6 +695,8 @@
   - 1
 - - sbom_process_transfer_events
   - 1
+- - sbom_process_vulnerabilities
+  - 1
 - - sbom_reports
   - 1
 - - sbom_sync_archived_status
diff --git a/db/docs/batched_background_migrations/backfill_vulnerability_occurrence_pipelines_project_id.yml b/db/docs/batched_background_migrations/backfill_vulnerability_occurrence_pipelines_project_id.yml
new file mode 100644
index 00000000000..b40b2ef3c03
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_vulnerability_occurrence_pipelines_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillVulnerabilityOccurrencePipelinesProjectId
+description: Backfills sharding key `vulnerability_occurrence_pipelines.project_id` from `vulnerability_occurrences`.
+feature_category: vulnerability_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161221
+milestone: '17.3'
+queued_migration_version: 20240730172818
+finalize_after: '2024-08-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/vulnerability_flags.yml b/db/docs/vulnerability_flags.yml
index bc1a8e4a445..2f9f70b926f 100644
--- a/db/docs/vulnerability_flags.yml
+++ b/db/docs/vulnerability_flags.yml
@@ -8,9 +8,7 @@ description: Stores additional information for vulnerabilities, for example if a
   is identified as a false positive
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65573
 milestone: '14.1'
-gitlab_schema: gitlab_main_cell
-allow_cross_foreign_keys:
-- gitlab_main_clusterwide
+gitlab_schema: gitlab_sec
 desired_sharding_key:
   project_id:
     references: projects
diff --git a/db/docs/vulnerability_occurrence_pipelines.yml b/db/docs/vulnerability_occurrence_pipelines.yml
index 8421ca8e0dd..770c80baa95 100644
--- a/db/docs/vulnerability_occurrence_pipelines.yml
+++ b/db/docs/vulnerability_occurrence_pipelines.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: vulnerability_occurrences
         sharding_key: project_id
         belongs_to: finding
+desired_sharding_key_migration_job_name: BackfillVulnerabilityOccurrencePipelinesProjectId
diff --git a/db/migrate/20240702181131_add_require_pat_expiry_to_application_settings.rb b/db/migrate/20240702181131_add_require_pat_expiry_to_application_settings.rb
new file mode 100644
index 00000000000..5ecc89fa217
--- /dev/null
+++ b/db/migrate/20240702181131_add_require_pat_expiry_to_application_settings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddRequirePatExpiryToApplicationSettings < Gitlab::Database::Migration[2.2]
+  milestone '17.2'
+
+  def change
+    add_column :application_settings, :require_personal_access_token_expiry, :boolean, default: true, null: false
+  end
+end
diff --git a/db/migrate/20240730172815_add_project_id_to_vulnerability_occurrence_pipelines.rb b/db/migrate/20240730172815_add_project_id_to_vulnerability_occurrence_pipelines.rb
new file mode 100644
index 00000000000..5b54c0fc3a2
--- /dev/null
+++ b/db/migrate/20240730172815_add_project_id_to_vulnerability_occurrence_pipelines.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToVulnerabilityOccurrencePipelines < Gitlab::Database::Migration[2.2]
+  milestone '17.3'
+
+  def change
+    add_column :vulnerability_occurrence_pipelines, :project_id, :bigint
+  end
+end
diff --git a/db/post_migrate/20240613154933_queue_backfill_vulnerability_flags_project_id.rb b/db/post_migrate/20240613154933_queue_backfill_vulnerability_flags_project_id.rb
index ee6ae872b81..3b1334fd981 100644
--- a/db/post_migrate/20240613154933_queue_backfill_vulnerability_flags_project_id.rb
+++ b/db/post_migrate/20240613154933_queue_backfill_vulnerability_flags_project_id.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class QueueBackfillVulnerabilityFlagsProjectId < Gitlab::Database::Migration[2.2]
-  milestone '17.2'
-  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+  milestone '17.3'
+  restrict_gitlab_migration gitlab_schema: :gitlab_sec
 
   MIGRATION = "BackfillVulnerabilityFlagsProjectId"
   DELAY_INTERVAL = 2.minutes
diff --git a/db/post_migrate/20240715151939_remove_projects_vulnerability_flags_project_id_fk.rb b/db/post_migrate/20240715151939_remove_projects_vulnerability_flags_project_id_fk.rb
new file mode 100644
index 00000000000..cd99ec08b61
--- /dev/null
+++ b/db/post_migrate/20240715151939_remove_projects_vulnerability_flags_project_id_fk.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveProjectsVulnerabilityFlagsProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.3'
+  disable_ddl_transaction!
+
+  FOREIGN_KEY_NAME = "fk_cc3b7b4548"
+
+  def up
+    with_lock_retries do
+      remove_foreign_key_if_exists(:vulnerability_flags, :projects,
+        name: FOREIGN_KEY_NAME, reverse_lock_order: true)
+    end
+  end
+
+  def down
+    add_concurrent_foreign_key(:vulnerability_flags, :projects,
+      name: FOREIGN_KEY_NAME, column: :project_id,
+      target_column: :id, on_delete: :cascade)
+  end
+end
diff --git a/db/post_migrate/20240730172816_prepare_index_vulnerability_occurrence_pipelines_on_project_id.rb b/db/post_migrate/20240730172816_prepare_index_vulnerability_occurrence_pipelines_on_project_id.rb
new file mode 100644
index 00000000000..36ed40b29f4
--- /dev/null
+++ b/db/post_migrate/20240730172816_prepare_index_vulnerability_occurrence_pipelines_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class PrepareIndexVulnerabilityOccurrencePipelinesOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.3'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_vulnerability_occurrence_pipelines_on_project_id'
+
+  def up
+    prepare_async_index :vulnerability_occurrence_pipelines, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    unprepare_async_index :vulnerability_occurrence_pipelines, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240730172817_add_vulnerability_occurrence_pipelines_project_id_trigger.rb b/db/post_migrate/20240730172817_add_vulnerability_occurrence_pipelines_project_id_trigger.rb
new file mode 100644
index 00000000000..ebf7894fa8b
--- /dev/null
+++ b/db/post_migrate/20240730172817_add_vulnerability_occurrence_pipelines_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddVulnerabilityOccurrencePipelinesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.3'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :vulnerability_occurrence_pipelines,
+      sharding_key: :project_id,
+      parent_table: :vulnerability_occurrences,
+      parent_sharding_key: :project_id,
+      foreign_key: :occurrence_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :vulnerability_occurrence_pipelines,
+      sharding_key: :project_id,
+      parent_table: :vulnerability_occurrences,
+      parent_sharding_key: :project_id,
+      foreign_key: :occurrence_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id.rb b/db/post_migrate/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id.rb
new file mode 100644
index 00000000000..2df876a97aa
--- /dev/null
+++ b/db/post_migrate/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillVulnerabilityOccurrencePipelinesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.3'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillVulnerabilityOccurrencePipelinesProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :vulnerability_occurrence_pipelines,
+      :id,
+      :project_id,
+      :vulnerability_occurrences,
+      :project_id,
+      :occurrence_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :vulnerability_occurrence_pipelines,
+      :id,
+      [
+        :project_id,
+        :vulnerability_occurrences,
+        :project_id,
+        :occurrence_id
+      ]
+    )
+  end
+end
diff --git a/db/schema_migrations/20240702181131 b/db/schema_migrations/20240702181131
new file mode 100644
index 00000000000..4b8ba284bd5
--- /dev/null
+++ b/db/schema_migrations/20240702181131
@@ -0,0 +1 @@
+ce07813b40454e38bdcc467c3c313573f1944848974f39d4ceea2c299714c6ac
\ No newline at end of file
diff --git a/db/schema_migrations/20240715151939 b/db/schema_migrations/20240715151939
new file mode 100644
index 00000000000..86a8af67453
--- /dev/null
+++ b/db/schema_migrations/20240715151939
@@ -0,0 +1 @@
+c5dbf947f2cb0926a3a4e4d2ed051c0a0999742020a6dca7f8e48434fc96fbb8
\ No newline at end of file
diff --git a/db/schema_migrations/20240730172815 b/db/schema_migrations/20240730172815
new file mode 100644
index 00000000000..0515b314426
--- /dev/null
+++ b/db/schema_migrations/20240730172815
@@ -0,0 +1 @@
+8f94999d6db53a0b064a39805a09813f800e70cabf22dd272dd36c7a7c4acaf1
\ No newline at end of file
diff --git a/db/schema_migrations/20240730172816 b/db/schema_migrations/20240730172816
new file mode 100644
index 00000000000..dae591599de
--- /dev/null
+++ b/db/schema_migrations/20240730172816
@@ -0,0 +1 @@
+b214daad187d74e4bf763dbf0efab19d7ad4f840f4d3aa41a0aee58d1408ba75
\ No newline at end of file
diff --git a/db/schema_migrations/20240730172817 b/db/schema_migrations/20240730172817
new file mode 100644
index 00000000000..2d19f4ce92d
--- /dev/null
+++ b/db/schema_migrations/20240730172817
@@ -0,0 +1 @@
+ffe9b2e947c41a8760428c52432e995831f285e6bc99804de874693d80e1791c
\ No newline at end of file
diff --git a/db/schema_migrations/20240730172818 b/db/schema_migrations/20240730172818
new file mode 100644
index 00000000000..81aea080b54
--- /dev/null
+++ b/db/schema_migrations/20240730172818
@@ -0,0 +1 @@
+5c61c5b3a8aeadbb97d2487b8416e1b533fd03cd2168c9eb1aa57ca5cd252a67
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 1462fd4af1a..14f0ff39b85 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1442,6 +1442,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_8ba31bddd655() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."project_id"
+  FROM "vulnerability_occurrences"
+  WHERE "vulnerability_occurrences"."id" = NEW."occurrence_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_8d002f38bdef() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -5849,6 +5865,7 @@ CREATE TABLE application_settings (
     code_creation jsonb DEFAULT '{}'::jsonb NOT NULL,
     code_suggestions_api_rate_limit integer DEFAULT 60 NOT NULL,
     ai_action_api_rate_limit integer DEFAULT 160 NOT NULL,
+    require_personal_access_token_expiry boolean DEFAULT true NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
     CONSTRAINT app_settings_ext_pipeline_validation_service_url_text_limit CHECK ((char_length(external_pipeline_validation_service_url) <= 255)),
@@ -19479,7 +19496,8 @@ CREATE TABLE vulnerability_occurrence_pipelines (
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     occurrence_id bigint NOT NULL,
-    pipeline_id bigint NOT NULL
+    pipeline_id bigint NOT NULL,
+    project_id bigint
 );
 
 CREATE SEQUENCE vulnerability_occurrence_pipelines_id_seq
@@ -32045,6 +32063,8 @@ CREATE TRIGGER trigger_8a38ce2327de BEFORE INSERT OR UPDATE ON boards_epic_user_
 
 CREATE TRIGGER trigger_8ac78f164b2d BEFORE INSERT OR UPDATE ON design_management_repositories FOR EACH ROW EXECUTE FUNCTION trigger_8ac78f164b2d();
 
+CREATE TRIGGER trigger_8ba31bddd655 BEFORE INSERT OR UPDATE ON vulnerability_occurrence_pipelines FOR EACH ROW EXECUTE FUNCTION trigger_8ba31bddd655();
+
 CREATE TRIGGER trigger_8d002f38bdef BEFORE INSERT OR UPDATE ON packages_debian_group_components FOR EACH ROW EXECUTE FUNCTION trigger_8d002f38bdef();
 
 CREATE TRIGGER trigger_8d17725116fe BEFORE INSERT OR UPDATE ON merge_request_reviewers FOR EACH ROW EXECUTE FUNCTION trigger_8d17725116fe();
@@ -33342,9 +33362,6 @@ ALTER TABLE ONLY external_status_checks_protected_branches
 ALTER TABLE ONLY dast_profiles_pipelines
     ADD CONSTRAINT fk_cc206a8c13 FOREIGN KEY (dast_profile_id) REFERENCES dast_profiles(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY vulnerability_flags
-    ADD CONSTRAINT fk_cc3b7b4548 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY todos
     ADD CONSTRAINT fk_ccf0373936 FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE CASCADE;
 
diff --git a/doc/administration/integration/diagrams_net.md b/doc/administration/integration/diagrams_net.md
index 855c51455b1..d15d2e09dc8 100644
--- a/doc/administration/integration/diagrams_net.md
+++ b/doc/administration/integration/diagrams_net.md
@@ -34,7 +34,7 @@ After completing the integration, the diagrams.net editor opens with the URL you
 
 You can set up your own diagrams.net server to generate the diagrams.
 
-This is a required step for users on offline (or "air-gapped") self-managed GitLab installations.
+It's a required step for users on an offline environment self-managed GitLab installations.
 
 For example, to run a diagrams.net container in Docker, run the following command:
 
diff --git a/doc/administration/lfs/index.md b/doc/administration/lfs/index.md
index 07d7c45a391..84d40bad57a 100644
--- a/doc/administration/lfs/index.md
+++ b/doc/administration/lfs/index.md
@@ -490,7 +490,7 @@ To delete these references:
    ls -al /var/opt/gitlab/gitlab-rails/shared/lfs-objects/00/66/22269c61b41bf14a22bbe0e43be3acf86a4a446afb4250c3794ea47541a7
    ```
 
-1. If the file is not present, remove the database records via the rails console:
+1. If the file is not present, remove the database records with the Rails console:
 
    ```ruby
    # First delete the parent records and then destroy the record itself
@@ -512,7 +512,7 @@ error: failed to fetch some objects from 'https://username:[MASKED]@gitlab.examp
 
 When using GitLab CI over a TLS v1.3 configured GitLab server, you must
 [upgrade to GitLab Runner](https://docs.gitlab.com/runner/install/index.html) 13.2.0
-or later to receive an updated Git LFS client version via
+or later to receive an updated Git LFS client version with
 the included [GitLab Runner Helper image](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#helper-image).
 
 To check an installed Git LFS client's version, run this command:
diff --git a/doc/administration/operations/fast_ssh_key_lookup.md b/doc/administration/operations/fast_ssh_key_lookup.md
index cd1647878cd..3927c3555dc 100644
--- a/doc/administration/operations/fast_ssh_key_lookup.md
+++ b/doc/administration/operations/fast_ssh_key_lookup.md
@@ -18,7 +18,7 @@ This document describes a drop-in replacement for the
 drop-in replacement.
 
 Regular SSH operations become slow as the number of users grows because OpenSSH
-searches for a key to authorize a user via a linear search. In the worst case,
+searches for a key to authorize a user with a linear search. In the worst case,
 such as when the user is not authorized to access GitLab, OpenSSH scans the
 entire file to search for a key. This can take significant time and disk I/O,
 which delays users attempting to push or pull to a repository. Making
@@ -26,7 +26,7 @@ matters worse, if users add or remove keys frequently, the operating system may
 not be able to cache the `authorized_keys` file, which causes the disk to be
 accessed repeatedly.
 
-GitLab Shell solves this by providing a way to authorize SSH users via a fast,
+GitLab Shell solves this by providing a way to authorize SSH users with a fast,
 indexed lookup in the GitLab database. This page describes how to enable the fast
 lookup of authorized SSH keys.
 
@@ -48,7 +48,7 @@ getent passwd git | cut -d: -f6 | awk '{print $1"/.ssh/authorized_keys"}'
 
 The `authorized_keys` file contains all the public SSH keys for users allowed to access GitLab. However, to maintain a
 single source of truth, [Geo](../geo/index.md) must be configured to perform SSH fingerprint
-lookups via database lookup.
+lookups with database lookup.
 
 As part of [setting up Geo](../geo/index.md#setup-instructions),
 you are required to follow the steps outlined below for both the primary and
@@ -58,7 +58,7 @@ automatically on the secondary if database replication is working.
 
 ## Set up fast lookup
 
-GitLab Shell provides a way to authorize SSH users via a fast, indexed lookup
+GitLab Shell provides a way to authorize SSH users with a fast, indexed lookup
 to the GitLab database. GitLab Shell uses the fingerprint of the SSH key to
 check whether the user is authorized to access GitLab.
 
@@ -136,7 +136,7 @@ To disable writes to the `authorized_keys` file:
 1. Clear the **Use authorized_keys file to authenticate SSH keys** checkbox.
 1. Select **Save changes**.
 
-Again, confirm that SSH is working by removing your user's SSH key in the UI,
+Confirm that SSH is working by removing your user's SSH key in the UI,
 adding a new one, and attempting to pull a repository.
 
 Then you can back up and delete your `authorized_keys` file for best performance.
@@ -162,7 +162,7 @@ This overview is brief. Refer to the above instructions for more context.
 GitLab supports `authorized_keys` database lookups with [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux).
 
 Because the SELinux policy is static, GitLab doesn't support the ability to change
-internal webserver ports at the moment. Administrators would have to create a special `.te`
+internal web server ports at the moment. Administrators would have to create a special `.te`
 file for the environment, as it isn't generated dynamically.
 
 ### Additional documentation
diff --git a/doc/administration/settings/account_and_limit_settings.md b/doc/administration/settings/account_and_limit_settings.md
index a3f7652e16d..38f132c4adf 100644
--- a/doc/administration/settings/account_and_limit_settings.md
+++ b/doc/administration/settings/account_and_limit_settings.md
@@ -111,7 +111,7 @@ To prevent this from happening, you can set a hard limit for your repositories'
 This limit can be set globally, per group, or per project, with per project limits
 taking the highest priority.
 
-There are numerous use cases where you might set up a limit for repository size.
+Numerous use cases exist where you might set up a limit for repository size.
 For instance, consider the following workflow:
 
 1. Your team develops apps which require large files to be stored in
@@ -178,7 +178,7 @@ For details, see [cookies used for sign-in](../../user/profile/index.md#cookies-
 
 > - Ability to turn the **Remember me** setting on and off [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/369133) in GitLab 16.0.
 
-Users can select the **Remember me** checkbox on sign-in, and their session will remain active for an indefinite period of time when accessed from that specific browser. You can turn off this setting if you need sessions to expire for security or compliance purposes. Turning off this setting will ensure users' sessions expire after the number of minutes of inactivity set when you [customize your session duration](#customize-the-default-session-duration).
+Users can select the **Remember me** checkbox on sign-in, and their session remains active for an indefinite period of time when accessed from that specific browser. You can turn off this setting if you need sessions to expire for security or compliance purposes. Turning off this setting ensures users' sessions expire after the number of minutes of inactivity set when you [customize your session duration](#customize-the-default-session-duration).
 
 1. On the left sidebar, at the bottom, select **Admin**.
 1. Select **Settings > General**.
@@ -204,6 +204,40 @@ To set a limit on how long these sessions are valid:
 1. Fill in the **Session duration for Git operations when 2FA is enabled (minutes)** field.
 1. Select **Save changes**.
 
+## Require expiration dates for new access tokens
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/470192) in GitLab 17.3.
+
+Prerequisites:
+
+- You must be an administrator.
+
+You can require all new access tokens to have an expiration date.
+This setting is turned on by default and applies to:
+
+- Project access tokens.
+- Group access tokens.
+- Personal access tokens for non-service account users.
+
+For personal access tokens for service accounts, use the `service_access_tokens_expiration_enforced` setting in the [Application Settings API](../../api/settings.md).
+
+To require expiration dates for new access tokens:
+
+1. On the left sidebar, at the bottom, select **Admin**.
+1. Select **Settings > General**.
+1. Expand **Account and limit**.
+1. Select the **Personal / Project / Group access token expiration** checkbox.
+1. Select **Save changes**.
+
+When you require expiration dates for new access tokens:
+
+- Users must set an expiration date that does not exceed the allowed lifetime for new access tokens.
+- To control the maximum access token lifetime, use the [**Limit the lifetime of access tokens** setting](#limit-the-lifetime-of-access-tokens).
+
 ## Limit the lifetime of SSH keys
 
 DETAILS:
diff --git a/doc/administration/settings/instance_template_repository.md b/doc/administration/settings/instance_template_repository.md
index 150c8865834..5d6ad85f224 100644
--- a/doc/administration/settings/instance_template_repository.md
+++ b/doc/administration/settings/instance_template_repository.md
@@ -72,7 +72,7 @@ Your custom templates are displayed on the dropdown list when a new file is adde
 ![Custom template dropdown list](img/file_template_user_dropdown.png)
 
 If this feature is disabled or no templates are present,
-no **Custom** section displays in the selection dropdown.
+no **Custom** section displays in the selection dropdown list.
 
 <!-- ## Troubleshooting
 
diff --git a/doc/administration/settings/push_event_activities_limit.md b/doc/administration/settings/push_event_activities_limit.md
index 8d89a57659e..eb5be85e355 100644
--- a/doc/administration/settings/push_event_activities_limit.md
+++ b/doc/administration/settings/push_event_activities_limit.md
@@ -15,7 +15,7 @@ Set the number of branches or tags to limit the number of single push events
 allowed at once. If the number of events is greater than this, GitLab creates
 bulk push event instead.
 
-For example, if 4 branches are pushed and the limit is currently set to 3,
+For example, if 4 branches are pushed and the limit is set to 3,
 the activity feed displays:
 
 ![Bulk push event](img/bulk_push_event_v12_4.png)
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 4d0796336e3..0f582288bc1 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -692,7 +692,7 @@ Example response:
 
 ## Commit status
 
-This is the commit status API for use with GitLab.
+The commit status API for use with GitLab.
 
 ### List the statuses of a commit
 
diff --git a/doc/api/graphql/branch_rules.md b/doc/api/graphql/branch_rules.md
index 202ac797571..b474f98e745 100644
--- a/doc/api/graphql/branch_rules.md
+++ b/doc/api/graphql/branch_rules.md
@@ -20,7 +20,7 @@ GitLab instance either by its full path for example `gitlab-org/gitlab-docs`.
 In the query we request all configured branch rules for a project.
 
 NOTE:
-You can run the same query directly via a HTTP endpoint, using `cURL`. For more
+You can run the same query directly with an HTTP endpoint, using `cURL`. For more
 information, see our guidance on getting started from the
 [command line](getting_started.md#command-line).
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index cc0dd1aa272..74356de3090 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -22372,6 +22372,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="groupapprovalpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="groupapprovalpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Group.autocompleteUsers`
@@ -23155,6 +23156,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="grouppipelineexecutionpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="grouppipelineexecutionpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Group.projectComplianceStandardsAdherence`
@@ -23328,6 +23330,7 @@ four standard [pagination arguments](#pagination-arguments):
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="groupscanexecutionpoliciesactionscantypes"></a>`actionScanTypes` | [`[SecurityReportTypeEnum!]`](#securityreporttypeenum) | Filters policies by the action scan type. Only these scan types are supported: `dast`, `secret_detection`, `cluster_image_scanning`, `container_scanning`, `sast`, `sast_iac`, `dependency_scanning`. |
+| <a id="groupscanexecutionpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="groupscanexecutionpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Group.scanResultPolicies`
@@ -23348,6 +23351,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="groupscanresultpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="groupscanresultpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Group.securityPolicyProjectSuggestions`
@@ -26836,6 +26840,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="namespaceapprovalpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="namespaceapprovalpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Namespace.complianceFrameworks`
@@ -26910,6 +26915,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="namespacepipelineexecutionpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="namespacepipelineexecutionpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Namespace.projects`
@@ -26971,6 +26977,7 @@ four standard [pagination arguments](#pagination-arguments):
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="namespacescanexecutionpoliciesactionscantypes"></a>`actionScanTypes` | [`[SecurityReportTypeEnum!]`](#securityreporttypeenum) | Filters policies by the action scan type. Only these scan types are supported: `dast`, `secret_detection`, `cluster_image_scanning`, `container_scanning`, `sast`, `sast_iac`, `dependency_scanning`. |
+| <a id="namespacescanexecutionpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="namespacescanexecutionpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Namespace.scanResultPolicies`
@@ -26991,6 +26998,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="namespacescanresultpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="namespacescanresultpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Namespace.workItem`
@@ -28527,6 +28535,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="projectapprovalpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="projectapprovalpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Project.autocompleteUsers`
@@ -29534,6 +29543,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="projectpipelineexecutionpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="projectpipelineexecutionpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Project.pipelineSchedules`
@@ -29757,6 +29767,7 @@ four standard [pagination arguments](#pagination-arguments):
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="projectscanexecutionpoliciesactionscantypes"></a>`actionScanTypes` | [`[SecurityReportTypeEnum!]`](#securityreporttypeenum) | Filters policies by the action scan type. Only these scan types are supported: `dast`, `secret_detection`, `cluster_image_scanning`, `container_scanning`, `sast`, `sast_iac`, `dependency_scanning`. |
+| <a id="projectscanexecutionpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="projectscanexecutionpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Project.scanResultPolicies`
@@ -29777,6 +29788,7 @@ four standard [pagination arguments](#pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="projectscanresultpoliciesincludeunscoped"></a>`includeUnscoped` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.3. **Status**: Experiment. Filter policies that are scoped to the project. |
 | <a id="projectscanresultpoliciesrelationship"></a>`relationship` | [`SecurityPolicyRelationType`](#securitypolicyrelationtype) | Filter policies by the given policy relationship. |
 
 ##### `Project.securityPolicyProjectSuggestions`
diff --git a/doc/api/projects.md b/doc/api/projects.md
index be466215578..9c644ae6b63 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -2606,6 +2606,7 @@ Markdown uploads are files uploaded to a project that can be referenced in Markd
 ### Upload a file
 
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112450) in GitLab 15.10. Feature flag `enforce_max_attachment_size_upload_api` removed.
+> - `id` attribute [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161160) in GitLab 17.3.
 
 Uploads a file to the specified project to be used in an issue or merge request
 description, or a comment.
@@ -2633,6 +2634,7 @@ Returned object:
 
 ```json
 {
+  "id": 5,
   "alt": "dk",
   "url": "/uploads/66dbcd21ec5d24ed6ea225176098d52b/dk.png",
   "full_path": "/namespace1/project1/uploads/66dbcd21ec5d24ed6ea225176098d52b/dk.png",
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index 35fb3b39600..026af10815f 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -12,7 +12,7 @@ DETAILS:
 
 ## Valid access levels
 
-The access levels are defined in the `ProtectedRefAccess.allowed_access_levels` method. Currently, these levels are recognized:
+The access levels are defined in the `ProtectedRefAccess.allowed_access_levels` method. The following levels are recognized:
 
 ```plaintext
 0  => No access
diff --git a/doc/api/repository_submodules.md b/doc/api/repository_submodules.md
index 5fb0e2104f3..2f9bd6d19c6 100644
--- a/doc/api/repository_submodules.md
+++ b/doc/api/repository_submodules.md
@@ -12,7 +12,7 @@ DETAILS:
 
 ## Update existing submodule reference in repository
 
-In some workflows, especially automated ones, it can be useful to update a
+In some workflows, especially automated ones, you can update a
 submodule's reference to keep up to date other projects that use it.
 This endpoint allows you to update a [Git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules) reference in a
 specific branch.
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 6820f10ac57..7b4fe72aad6 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -129,6 +129,7 @@ Example response:
   "raw_blob_request_limit": 300,
   "wiki_page_max_content_bytes": 52428800,
   "require_admin_approval_after_user_signup": false,
+  "require_personal_access_token_expiry": true,
   "personal_access_token_prefix": "glpat-",
   "rate_limiting_response_text": null,
   "keep_latest_artifact": true,
@@ -298,6 +299,7 @@ Example response:
   "raw_blob_request_limit": 300,
   "wiki_page_max_content_bytes": 52428800,
   "require_admin_approval_after_user_signup": false,
+  "require_personal_access_token_expiry": true,
   "personal_access_token_prefix": "glpat-",
   "rate_limiting_response_text": null,
   "keep_latest_artifact": true,
@@ -360,6 +362,7 @@ Example responses:
 > - `allow_account_deletion` [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/412411) in GitLab 16.1.
 > - `allow_project_creation_for_guest_and_below` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134625) in GitLab 16.8.
 > - `silent_admin_exports_enabled` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/148918) in GitLab 17.0.
+> - `require_personal_access_token_expiry` [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/470192) in GitLab 17.3.
 
 In general, all settings are optional. Certain settings though, if enabled,
 require other settings to be set to function properly. These requirements are
@@ -608,6 +611,7 @@ listed in the descriptions of the relevant settings.
 | `repository_size_limit`                  | integer          | no                                   | Size limit per repository (MB). Premium and Ultimate only. |
 | `repository_storages_weighted`           | hash of strings to integers | no                        | Hash of names of taken from `gitlab.yml` to [weights](../administration/repository_storage_paths.md#configure-where-new-repositories-are-stored). New projects are created in one of these stores, chosen by a weighted random selection. |
 | `require_admin_approval_after_user_signup` | boolean        | no                                   | When enabled, any user that signs up for an account using the registration form is placed under a **Pending approval** state and has to be explicitly [approved](../administration/moderate_users.md) by an administrator. |
+| `require_personal_access_token_expiry`   | boolean          | no                                   | When enabled, users must set an expiration date when creating a group or project access token, or a personal access token owned by a non-service account. |
 | `require_two_factor_authentication`      | boolean          | no                                   | (**If enabled, requires:** `two_factor_grace_period`) Require all users to set up two-factor authentication. |
 | `restricted_visibility_levels`           | array of strings | no                                   | Selected levels cannot be used by non-Administrator users for groups, projects or snippets. Can take `private`, `internal` and `public` as a parameter. Default is `null` which means there is no restriction.[Changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131203) in GitLab 16.4: cannot select levels that are set as `default_project_visibility` and `default_group_visibility`. |
 | `rsa_key_restriction`                    | integer          | no                                   | The minimum allowed bit length of an uploaded RSA key. Default is `0` (no restriction). `-1` disables RSA keys. |
diff --git a/doc/api/tags.md b/doc/api/tags.md
index 2080567f24a..66733459a94 100644
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -34,7 +34,7 @@ Parameters:
 | `id`       | integer or string | yes      | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) owned by the authenticated user. |
 | `order_by` | string            | no       | Return tags ordered by `name`, `updated`, or `version`. Default is `updated`. |
 | `sort`     | string            | no       | Return tags sorted in `asc` or `desc` order. Default is `desc`. |
-| `search`   | string            | no       | Return a list of tags matching the search criteria. You can use `^term` and `term$` to find tags that begin and end with `term` respectively. No other regular expressions are supported. |
+| `search`   | string            | no       | Return a list of tags matching the search criteria. You can use `^term` and `term$` to find tags that begin and end with `term`. No other regular expressions are supported. |
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" \
diff --git a/doc/development/code_owners/index.md b/doc/development/code_owners/index.md
index b1e6dbc36fb..823413cf216 100644
--- a/doc/development/code_owners/index.md
+++ b/doc/development/code_owners/index.md
@@ -123,7 +123,7 @@ This service is defined in `services/merge_requests/sync_code_owner_approval_rul
 These flowcharts should help explain the flow from the controllers down to the
 models for different features.
 
-Note that many of the Code Owners implementations exist in the `EE` variants of the classes.
+A lot of the Code Owners implementations exist in the `EE` variants of the classes.
 
 ### Push changes to a protected branch with `require_code_owner_approval` enabled, over SSH
 
diff --git a/doc/development/developing_with_solargraph.md b/doc/development/developing_with_solargraph.md
index 61e4d3b124a..0b787ada44f 100644
--- a/doc/development/developing_with_solargraph.md
+++ b/doc/development/developing_with_solargraph.md
@@ -8,7 +8,7 @@ info: Any user with at least the Maintainer role can merge updates to this conte
 
 Gemfile packages [Solargraph](https://github.com/castwide/solargraph) language server for additional IntelliSense and code formatting capabilities with editors that support it.
 
-Example configuration for Solargraph can be found in [`.solargraph.yml.example`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.solargraph.yml.example) file. Copy the contents of this file to `.solargraph.yml` file for language server to pick this configuration up. Since `.solargraph.yml` configuration file is ignored by Git, it's possible to adjust configuration according to your needs.
+Example configuration for Solargraph can be found in [`.solargraph.yml.example`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.solargraph.yml.example) file. Copy the contents of this file to `.solargraph.yml` file for language server to pick this configuration up. As the `.solargraph.yml` configuration file is ignored by Git, it's possible to adjust configuration according to your needs.
 
 Refer to particular IDE plugin documentation on how to integrate it with Solargraph language server:
 
diff --git a/doc/development/documentation/styleguide/availability_details.md b/doc/development/documentation/styleguide/availability_details.md
index 0dc958f2d4e..c7f3cf964d5 100644
--- a/doc/development/documentation/styleguide/availability_details.md
+++ b/doc/development/documentation/styleguide/availability_details.md
@@ -65,12 +65,28 @@ Generally available features should not have a status.
 
 The add-ons belong with other subscription tiers. Document them by using the phrase `with` and the add-on.
 For example, `with GitLab Duo Pro`.
-For example:
+
+The possibilities are:
 
 ```markdown
-**Tier:** Premium or Ultimate with GitLab Duo Pro
+**Tier:** Premium with GitLab Duo Pro
+**Tier:** Premium with GitLab Duo Pro or Ultimate with GitLab Duo Pro or Enterprise
+**Tier:** Ultimate with GitLab Duo Pro
+**Tier:** Ultimate with GitLab Duo Pro or Enterprise
+**Tier:** Ultimate with GitLab Duo Enterprise
 ```
 
+Do not use a period at the end of the phrase.
+
+You might have to differentiate which add-on applies for each offering (GitLab.com, Dedicated, self-managed). If you have to differentiate, use this format:
+
+```markdown
+**Tier: GitLab.com and Self-managed:** Premium with GitLab Duo Pro or Ultimate with [GitLab Duo Pro or Enterprise](../../subscriptions/subscription-add-ons.md) **GitLab Dedicated:** GitLab Duo Pro or Enterprise
+```
+
+NOTE:
+GitLab Dedicated always includes an Ultimate subscription.
+
 ## When to add availability details
 
 Assign availability details under:
diff --git a/doc/development/fe_guide/source_editor.md b/doc/development/fe_guide/source_editor.md
index b3e3a44cf41..bd2933bc86f 100644
--- a/doc/development/fe_guide/source_editor.md
+++ b/doc/development/fe_guide/source_editor.md
@@ -114,8 +114,8 @@ with additional functions on the instance level:
 
    Even though Source Editor itself is extremely slim, it still depends on Monaco editor,
    which adds weight. Every time you add Source Editor to a view, the JavaScript bundle's
-   size significantly increases, affecting your view's loading performance. We recommend
-   you import the editor on demand if either:
+   size significantly increases, affecting your view's loading performance. You should
+   import the editor on demand if either:
 
    - You're uncertain if the view needs the editor.
    - The editor is a secondary element of the view.
diff --git a/doc/development/fips_compliance.md b/doc/development/fips_compliance.md
index 34384908921..4dac7742477 100644
--- a/doc/development/fips_compliance.md
+++ b/doc/development/fips_compliance.md
@@ -16,7 +16,7 @@ You can build a FIPS-compliant instance of GitLab, but [not all features are inc
 A FIPS-compliant instance must be configured following the [FIPS install instructions](#install-gitlab-with-fips-compliance)
 exactly.
 
-There are two current FIPS standards: [140-2](https://en.wikipedia.org/wiki/FIPS_140-2)
+The two current FIPS standards: [140-2](https://en.wikipedia.org/wiki/FIPS_140-2)
 and [140-3](https://en.wikipedia.org/wiki/FIPS_140-3). At GitLab we usually
 mean FIPS 140-2.
 
@@ -78,9 +78,9 @@ Additionally, these package repositories are disabled in FIPS mode:
 ## FIPS compliance vs FIPS validation at GitLab
 
 GitLab does not fork or modify cryptographic binaries (for example OpenSSL) in its FIPS-compliant
-software releases but instead uses existing, FIPS-validated crytographic software (modules).
+software releases but instead uses existing, FIPS-validated cryptographic software (modules).
 GitLab therefore does not need to submit its software through the
-[NIST Cryptographic Module Valiation Program (CMVP)](https://csrc.nist.gov/projects/cryptographic-module-validation-program/)
+[NIST Cryptographic Module Validation Program (CMVP)](https://csrc.nist.gov/projects/cryptographic-module-validation-program/)
 independent laboratory testing.
 Instead, GitLab must use FIPS-validated software (listed in
 [Cryptographic Module Validation Program](https://csrc.nist.gov/projects/cryptographic-module-validation-program/validated-modules))
diff --git a/doc/development/gitlab_flavored_markdown/specification_guide/index.md b/doc/development/gitlab_flavored_markdown/specification_guide/index.md
index 640de92e2bc..272b3174f1a 100644
--- a/doc/development/gitlab_flavored_markdown/specification_guide/index.md
+++ b/doc/development/gitlab_flavored_markdown/specification_guide/index.md
@@ -1099,11 +1099,11 @@ allows control over other aspects of the snapshot example generation process.
 ```yaml
 ---
 08_01_00__examples_using_internal_extensions__markdown_preview_api_request_overrides__001:
-  api_request_override_path: /groups/glfm_group/preview_markdown
+  api_request_override_path: /groups/glfm_group/-/preview_markdown
 08_01_00__examples_using_internal_extensions__markdown_preview_api_request_overrides__002:
-  api_request_override_path: /glfm_group/glfm_project/preview_markdown
+  api_request_override_path: /glfm_group/glfm_project/-/preview_markdown
 08_01_00__examples_using_internal_extensions__markdown_preview_api_request_overrides__003:
-  api_request_override_path: /glfm_group/glfm_project/preview_markdown
+  api_request_override_path: /glfm_group/glfm_project/-/preview_markdown
 08_01_00__examples_using_internal_extensions__markdown_preview_api_request_overrides__004:
   api_request_override_path: /-/snippets/preview_markdown
 08_01_00__examples_using_internal_extensions__markdown_preview_api_request_overrides__005:
diff --git a/doc/development/gitlab_shell/features.md b/doc/development/gitlab_shell/features.md
index ef8db35491c..f63373ae15c 100644
--- a/doc/development/gitlab_shell/features.md
+++ b/doc/development/gitlab_shell/features.md
@@ -8,7 +8,7 @@ info: Any user with at least the Maintainer role can merge updates to this conte
 
 ## Discover
 
-Allows users to identify themselves on an instance via SSH. The command helps to
+Allows users to identify themselves on an instance with SSH. The command helps to
 confirm quickly whether a user has SSH access to the instance:
 
 ```shell
@@ -78,7 +78,7 @@ $ ssh git@<hostname> git-lfs-authenticate <project-path> <upload/download>
 
 ## Personal access token
 
-Enables users to use personal access tokens via SSH:
+Enables users to use personal access tokens with SSH:
 
 ```shell
 $ ssh git@<hostname> personal_access_token <name> <scope1[,scope2,...]> [ttl_days]
diff --git a/doc/development/gitlab_shell/index.md b/doc/development/gitlab_shell/index.md
index 1507015b533..fbe94d5429e 100644
--- a/doc/development/gitlab_shell/index.md
+++ b/doc/development/gitlab_shell/index.md
@@ -30,7 +30,7 @@ and support:
 
 ### Versions
 
-There are two version files relevant to GitLab Shell:
+The two version files relevant to GitLab Shell:
 
 - [Stable version](https://gitlab.com/gitlab-org/gitlab-shell/-/blob/main/VERSION)
 - [Version deployed in GitLab SaaS](https://gitlab.com/gitlab-org/gitlab/-/blob/master/GITLAB_SHELL_VERSION)
@@ -84,7 +84,7 @@ GitLab Shell modifies the `authorized_keys` file on the client machine.
 
 To contribute to GitLab Shell:
 
-1. Check if GitLab API access, and Redis via the internal API, can be reached: `make check`
+1. Check if GitLab API access, and Redis with the internal API, can be reached: `make check`
 1. Compile the `gitlab-shell` binaries, placing them into `bin/`: `make compile`
 1. Run `make install` to build the `gitlab-shell` binaries and install. them onto the file system.
    The default location is `/usr/local`. To change it, set the `PREFIX` and `DESTDIR` environment variables.
diff --git a/doc/development/internal_api/index.md b/doc/development/internal_api/index.md
index 43b8da76b6f..8706004e7f5 100644
--- a/doc/development/internal_api/index.md
+++ b/doc/development/internal_api/index.md
@@ -16,8 +16,7 @@ GitLab Pages.
 ## Add new endpoints
 
 API endpoints should be externally accessible by default, with proper authentication and authorization.
-Before adding a new internal endpoint, consider if the API would potentially be
-useful to the wider GitLab community and can be made externally accessible.
+Before adding a new internal endpoint, consider if the API would benefit the wider GitLab community and can be made externally accessible.
 
 One reason we might favor internal API endpoints sometimes is when using such an endpoint requires
 internal data that external actors cannot have. For example, in the internal Pages API we might use
@@ -44,7 +43,7 @@ To authenticate using that token, clients:
 
 ## Git Authentication
 
-This is called by [Gitaly](https://gitlab.com/gitlab-org/gitaly) and
+Called by [Gitaly](https://gitlab.com/gitlab-org/gitaly) and
 [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell) to check access to a
 repository.
 
@@ -247,7 +246,7 @@ Example response:
 
 ## Instance information
 
-This gets some generic information about the instance. This is used
+This gets some generic information about the instance. It's used
 by Geo nodes to get information about each other.
 
 ```plaintext
@@ -324,7 +323,7 @@ Example response:
 
 ## Get new personal access-token
 
-This is called from GitLab Shell and allows users to generate a new
+Called from GitLab Shell and allows users to generate a new
 personal access token.
 
 | Attribute | Type   | Required | Description |
@@ -536,8 +535,8 @@ metric counters.
 | `unique_counters["k8s_api_proxy_requests_unique_agents_via_ci_access"]`   | integer array | no       | The set of unique agent ids that have interacted a CI Tunnel via `ci_access` to track the `k8s_api_proxy_requests_unique_agents_via_ci_access` metric event     |
 | `unique_counters["k8s_api_proxy_requests_unique_users_via_user_access"]`  | integer array | no       | The set of unique user ids that have interacted a CI Tunnel via `user_access` to track the `k8s_api_proxy_requests_unique_users_via_user_access` metric event   |
 | `unique_counters["k8s_api_proxy_requests_unique_agents_via_user_access"]` | integer array | no       | The set of unique agent ids that have interacted a CI Tunnel via `user_access` to track the `k8s_api_proxy_requests_unique_agents_via_user_access` metric event |
-| `unique_counters["k8s_api_proxy_requests_unique_users_via_pat_access"]`   | integer array | no       | The set of unique user ids that have used the KAS Kubernetes API proxy via PAT to track the `k8s_api_proxy_requests_unique_users_via_pat_access` metric event   |
-| `unique_counters["k8s_api_proxy_requests_unique_agents_via_pat_access"]`  | integer array | no       | The set of unique agent ids that have used the KAS Kubernetes API proxy via PAT to track the `k8s_api_proxy_requests_unique_agents_via_pat_access` metric event |
+| `unique_counters["k8s_api_proxy_requests_unique_users_via_pat_access"]`   | integer array | no       | The set of unique user ids that have used the KAS Kubernetes API proxy with PAT to track the `k8s_api_proxy_requests_unique_users_via_pat_access` metric event   |
+| `unique_counters["k8s_api_proxy_requests_unique_agents_via_pat_access"]`  | integer array | no       | The set of unique agent ids that have used the KAS Kubernetes API proxy with PAT to track the `k8s_api_proxy_requests_unique_agents_via_pat_access` metric event |
 | `unique_counters["flux_git_push_notified_unique_projects"]`               | integer array | no       | The set of unique projects ids that have been notified to reconcile their Flux workloads to track the `flux_git_push_notified_unique_projects` metric event     |
 
 ```plaintext
@@ -741,7 +740,7 @@ Example response:
 
 ## Subscriptions
 
-The subscriptions endpoint is used by [CustomersDot](https://gitlab.com/gitlab-org/customers-gitlab-com) (`customers.gitlab.com`) to apply subscriptions including trials, and add-on purchases, for personal namespaces or top-level groups within GitLab.com.
+The subscriptions endpoint is used by [CustomersDot](https://gitlab.com/gitlab-org/customers-gitlab-com) (`customers.gitlab.com`) to apply subscriptions including trials, and add-on purchases, for personal namespaces, or top-level groups in GitLab.com.
 
 ### Create a subscription
 
@@ -969,7 +968,7 @@ Example response:
 
 ## Subscription add-on purchases (excluding storage and compute packs)
 
-The subscription add-on purchase endpoint is used by [CustomersDot](https://gitlab.com/gitlab-org/customers-gitlab-com) (`customers.gitlab.com`) to apply subscription add-on purchases like Code Suggestions for personal namespaces, or top-level groups within GitLab.com. It is not used to apply storage and compute pack purchases.
+The subscription add-on purchase endpoint is used by [CustomersDot](https://gitlab.com/gitlab-org/customers-gitlab-com) (`customers.gitlab.com`) to apply subscription add-on purchases like Code Suggestions for personal namespaces, or top-level groups in GitLab.com. It is not used to apply storage and compute pack purchases.
 
 ### Create a subscription add-on purchase
 
@@ -1451,7 +1450,7 @@ This group SCIM API is different to the [SCIM API](../../api/scim.md). The SCIM
 
 - Is not an internal API.
 - Does not implement the [RFC7644 protocol](https://www.rfc-editor.org/rfc/rfc7644).
-- Gets, checks, updates, and deletes SCIM identities within groups.
+- Gets, checks, updates, and deletes SCIM identities in groups.
 
 NOTE:
 This API does not require the `Gitlab-Shell-Api-Request` header.
diff --git a/doc/development/internal_api/internal_api_allowed.md b/doc/development/internal_api/internal_api_allowed.md
index 166a382326b..2689ccc666d 100644
--- a/doc/development/internal_api/internal_api_allowed.md
+++ b/doc/development/internal_api/internal_api_allowed.md
@@ -105,5 +105,5 @@ Without it, those projects routinely time out requests to the endpoint. When thi
 feature was deployed to all of GitLab.com, some pushes failed, presumably due to
 exhausting resources like database connection pools.
 
-We recommend you enable this feature flag only if you are experiencing timeouts, and
+You should enable this feature flag only if you are experiencing timeouts, and
 only enable it for that specific project.
diff --git a/doc/development/lfs.md b/doc/development/lfs.md
index dc71ead49f3..fa3c1f0af5e 100644
--- a/doc/development/lfs.md
+++ b/doc/development/lfs.md
@@ -233,7 +233,7 @@ sequenceDiagram
 1. Workhorse forwards this request to Rails. If the LFS object exists
    and is associated with the project, Rails sends `ArchivePath` either
    with a path where the LFS object resides (for local disk) or a
-   pre-signed URL (when object storage is enabled) via the
+   pre-signed URL (when object storage is enabled) with the
    `Gitlab-Workhorse-Send-Data` HTTP header with a payload prefaced with
    `send-url`.
 1. Workhorse retrieves the file and send it to the `gitaly-lfs-smudge`
diff --git a/doc/development/merge_request_concepts/rate_limits.md b/doc/development/merge_request_concepts/rate_limits.md
index dd699a0223f..a18da5732bd 100644
--- a/doc/development/merge_request_concepts/rate_limits.md
+++ b/doc/development/merge_request_concepts/rate_limits.md
@@ -6,7 +6,7 @@ info: Any user with at least the Maintainer role can merge updates to this conte
 
 # Application and rate limit guidelines
 
-GitLab, like most large applications, enforces limits within certain features.
+GitLab, like most large applications, enforces limits in certain features.
 The absences of limits can affect security, performance, data, or could even
 exhaust the allocated resources for the application.
 
@@ -25,4 +25,4 @@ Limits are applicable for:
 
 - Existing [GitLab application limits](../../administration/instance_limits.md)
 - Product processes: [introducing application limits](https://handbook.gitlab.com/handbook/product/product-processes/#introducing-application-limits)
-- Development docs: [guide for adding application limits](../application_limits.md)
+- Development documentation: [guide for adding application limits](../application_limits.md)
diff --git a/doc/development/project_templates.md b/doc/development/project_templates.md
index 8b2a0160021..90eccbbf8f9 100644
--- a/doc/development/project_templates.md
+++ b/doc/development/project_templates.md
@@ -29,7 +29,7 @@ with GitLab, there are a few steps to follow.
 ### Create the project
 
 1. Create a new public project with the project content you'd like to contribute in a namespace of your choosing. You can view a [working example](https://gitlab.com/gitlab-org/project-templates/dotnetcore).
-   - Projects should be as simple as possible and free of any unnecessary assets or dependencies.
+   - Projects should be free of any unnecessary assets or dependencies.
 1. When the project is ready for review, [create a new issue](https://gitlab.com/gitlab-org/gitlab/issues/new) with a link to your project.
    - In your issue, `@` mention the relevant Backend Engineering Manager and Product Manager for the [Create:Source Code group](https://handbook.gitlab.com/handbook/product/categories/#source-code-group).
 
@@ -42,13 +42,13 @@ icon of the template you add is not present, you have to submit one.
 See how to add a [third-party logo](https://gitlab.com/gitlab-org/gitlab-svgs/-/tree/main#adding-third-party-logos-or-trademarks).
 
 After the logo is added to the `main` branch,
-[the bot](https://gitlab.com/gitlab-org/frontend/renovate-gitlab-bot/) will pick the
+[the bot](https://gitlab.com/gitlab-org/frontend/renovate-gitlab-bot/) picks the
 new release up and create an MR in `gitlab-org/gitlab`. You can now proceed to
 the next step.
 
 ### Add the template details
 
-Two types of built-in templates are available within GitLab:
+Two types of built-in templates are available in GitLab:
 
 - **Standard templates**: Available in all GitLab tiers.
 - **Enterprise templates**: Available only in GitLab Premium and Ultimate.
diff --git a/doc/development/rails_endpoints/index.md b/doc/development/rails_endpoints/index.md
index adc17fde1d0..6afc824b9c3 100644
--- a/doc/development/rails_endpoints/index.md
+++ b/doc/development/rails_endpoints/index.md
@@ -19,7 +19,7 @@ These Rails Endpoints:
 
 ## Proof of concept period: Feedback Request
 
-We are currently evaluating a new approach for documenting Rails endpoints. [Check out the Feedback Issue](https://gitlab.com/gitlab-org/gitlab/-/issues/411605) and feel free to share your thoughts, suggestions, or concerns. We appreciate your participation in helping us improve the documentation!
+We are evaluating a new approach for documenting Rails endpoints. [Check out the Feedback Issue](https://gitlab.com/gitlab-org/gitlab/-/issues/411605) and feel free to share your thoughts, suggestions, or concerns. We appreciate your participation in helping us improve the documentation!
 
 ## SAST Scanners
 
diff --git a/doc/development/repository_storage_moves/index.md b/doc/development/repository_storage_moves/index.md
index 3a34e3c10cc..62df490b4e9 100644
--- a/doc/development/repository_storage_moves/index.md
+++ b/doc/development/repository_storage_moves/index.md
@@ -51,13 +51,13 @@ document are updated, removed, or new parts are added.
   - Defined in `app/services/projects/update_service.rb`.
 - `PoolRepository`: Ruby object representing Gitaly `ObjectPool`.
   - Defined in `app/models/pool_repository.rb`.
-- `ObjectPool::CreateWorker`: Worker to create an `ObjectPool` via `Gitaly`.
+- `ObjectPool::CreateWorker`: Worker to create an `ObjectPool` with `Gitaly`.
   - Defined in `app/workers/object_pool/create_worker.rb`.
-- `ObjectPool::JoinWorker`: Worker to join an `ObjectPool` via `Gitaly`.
+- `ObjectPool::JoinWorker`: Worker to join an `ObjectPool` with `Gitaly`.
   - Defined in `app/workers/object_pool/join_worker.rb`.
 - `ObjectPool::ScheduleJoinWorker`: Worker to schedule an `ObjectPool::JoinWorker`.
   - Defined in `app/workers/object_pool/schedule_join_worker.rb`.
-- `ObjectPool::DestroyWorker`: Worker to destroy an `ObjectPool` via `Gitaly`.
+- `ObjectPool::DestroyWorker`: Worker to destroy an `ObjectPool` with `Gitaly`.
   - Defined in `app/workers/object_pool/destroy_worker.rb`.
 - `ObjectPoolQueue`: Module to configure `ObjectPool` workers.
   - Defined in `app/workers/concerns/object_pool_queue.rb`.
@@ -69,7 +69,7 @@ document are updated, removed, or new parts are added.
 These flowcharts should help explain the flow from the endpoints down to the
 models for different features.
 
-### Schedule a repository storage move via the API
+### Schedule a repository storage move with the API
 
 ```mermaid
 %%{init: { "fontFamily": "GitLab Sans" }}%%
diff --git a/doc/development/workhorse/channel.md b/doc/development/workhorse/channel.md
index 667040e20c9..c34bf7f320a 100644
--- a/doc/development/workhorse/channel.md
+++ b/doc/development/workhorse/channel.md
@@ -172,7 +172,7 @@ Supporting new deployment services requires new sub-protocols to be supported.
 
 ### `channel.k8s.io`
 
-Used by Kubernetes, this sub-protocol defines a simple multiplexed channel.
+Used by Kubernetes, this sub-protocol defines a multiplexed channel.
 
 Control frames have their usual meanings. `TextMessage` frames are
 invalid. `BinaryMessage` frames represent I/O to a specific file
diff --git a/doc/development/workhorse/configuration.md b/doc/development/workhorse/configuration.md
index 956eb9aeef5..01304869ce9 100644
--- a/doc/development/workhorse/configuration.md
+++ b/doc/development/workhorse/configuration.md
@@ -254,25 +254,25 @@ initial request is routed through Workhorse to another service, which
 may in turn, make other requests. To help trace the request as it flows
 across services, Workhorse generates a random value called a
 [correlation ID](../../administration/logs/tracing_correlation_id.md).
-Workhorse sends this correlation ID via the `X-Request-Id` HTTP header.
+Workhorse sends this correlation ID with the `X-Request-Id` HTTP header.
 
 Some GitLab services, such as GitLab Shell, generate their own
 correlation IDs. In addition, other services, such as Gitaly, make
 internal API calls that pass along a correlation ID from the original
-request. In either case, the correlation ID is also passed via the
+request. In either case, the correlation ID is also passed with the
 `X-Request-Id` HTTP header.
 
 By default, Workhorse ignores this header and always generates a new
 correlation ID. This makes debugging harder and prevents distributed
-tracing from working properly, since the new correlation ID is
+tracing from working properly, because the new correlation ID is
 completely unrelated to the original one.
 
-Workhorse can be configured to propagate an incoming correlation ID via
+Workhorse can be configured to propagate an incoming correlation ID with
 the `-propagateCorrelationID` command-line flag. It is highly
 recommended that this option be used with an IP allow list to ensure
 arbitrary values cannot be generated by untrusted clients.
 
-An IP allow list is specified via the `trusted_cidrs_for_propagation`
+An IP allow list is specified with the `trusted_cidrs_for_propagation`
 option in the Workhorse configuration file. Specify a list of CIDR blocks
 that can be trusted. For example:
 
@@ -288,7 +288,7 @@ The `-propagateCorrelationID` flag must be used for the `trusted_cidrs_for_propa
 If Workhorse is behind a reverse proxy such as NGINX, the
 `trusted_cidrs_for_x_forwarded_for` option is needed to specify which
 CIDR blocks can be used to trust to provide the originating IP address
-via the `X-Forwarded-For` HTTP header. For example:
+with the `X-Forwarded-For` HTTP header. For example:
 
 ```toml
 trusted_cidrs_for_x_forwarded_for = ["10.0.0.0/8", "127.0.0.1/32"]
diff --git a/doc/development/workhorse/handlers.md b/doc/development/workhorse/handlers.md
index 02f1a011da6..9317f23e9d5 100644
--- a/doc/development/workhorse/handlers.md
+++ b/doc/development/workhorse/handlers.md
@@ -102,7 +102,7 @@ sequenceDiagram
 
 ## Git over HTTP(S)
 
-Workhorse accelerates Git over HTTP(S) by handling [Git HTTP protocol](https://www.git-scm.com/docs/http-protocol) requests. For example, Git push/pull may require serving large amounts of data and in order to avoid transferring it through GitLab Rails, Workhorse only performs authorization checks against GitLab Rails, then performs Gitaly gRPC request directly and streams the data from Gitaly to the Git client.
+Workhorse accelerates Git over HTTP(S) by handling [Git HTTP protocol](https://www.git-scm.com/docs/http-protocol) requests. For example, Git push/pull may require serving large amounts of data. To avoid transferring it through GitLab Rails, Workhorse only performs authorization checks against GitLab Rails, then performs a Gitaly gRPC request directly, and streams the data from Gitaly to the Git client.
 
 ### Git pull
 
diff --git a/doc/raketasks/x509_signatures.md b/doc/raketasks/x509_signatures.md
index 80c9b162613..0c1ed28bd73 100644
--- a/doc/raketasks/x509_signatures.md
+++ b/doc/raketasks/x509_signatures.md
@@ -11,7 +11,7 @@ DETAILS:
 **Offering:** Self-managed
 
 When [signing commits with X.509](../user/project/repository/signed_commits/x509.md),
-the trust anchor might change and the signatures stored within the database must be updated.
+the trust anchor might change and the signatures stored in the database must be updated.
 
 ## Update all X.509 signatures
 
diff --git a/doc/security/reset_user_password.md b/doc/security/reset_user_password.md
index ed291566cac..5f7549f69b7 100644
--- a/doc/security/reset_user_password.md
+++ b/doc/security/reset_user_password.md
@@ -171,4 +171,4 @@ requirements. Ensure the password you are attempting to set meets all
 
 ### Expired password
 
-You might not be able to reset a user's expired password due to the [Password Expired error on Git Fetch via SSH for LDAP users](../topics/git/troubleshooting_git.md#password-expired-error-on-git-fetch-via-ssh-for-ldap-user).
+You might not be able to reset a user's expired password due to the [Password Expired error on Git Fetch via SSH for LDAP users](../topics/git/troubleshooting_git.md#password-expired-error-on-git-fetch-with-ssh-for-ldap-user).
diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md
index 4da3836f38a..fb98953ee09 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -378,6 +378,8 @@ To manage this risk, when you upgrade to GitLab 16.0 and later, any
 token that does not have an expiration date automatically has an expiration
 date set at one year from the date of upgrade.
 
+In GitLab 17.3 and later, this automatic setting of expiry on existing tokens has been reverted, and you can [disable expiration date enforcement for new access tokens](../administration/settings/account_and_limit_settings.md#require-expiration-dates-for-new-access-tokens).
+
 If you are not aware of when your tokens expire because the dates have changed,
 you might have unexpected authentication failures when trying to sign into GitLab
 on that date.
diff --git a/doc/topics/git/get_started.md b/doc/topics/git/get_started.md
index b92c4643792..bb9f57d7fb9 100644
--- a/doc/topics/git/get_started.md
+++ b/doc/topics/git/get_started.md
@@ -10,8 +10,8 @@ Git is a version control system you use to track changes to your code
 and collaborate with others. GitLab is a web-based Git repository manager
 that provides CI/CD and other features to help you manage your software development lifecycle.
 
-To use GitLab, you don't need to know how to use Git. However, if you're going to
-use GitLab for source control, it can be useful to understand how to use Git.
+To use GitLab, you don't need to know how to use Git. However, if you
+use GitLab for source control, it's beneficial to understand it.
 
 Learning Git is part of a larger workflow:
 
@@ -85,7 +85,7 @@ For more information, see:
 
 ## Step 4: Familiarize yourself with Git commands
 
-To work with Git from the command line, you'll need to use various Git commands.
+To work with Git from the command line, you need to use various Git commands.
 Some of the most commonly used commands include:
 
 - `git clone`: Clone a repository to your local machine
diff --git a/doc/topics/git/troubleshooting_git.md b/doc/topics/git/troubleshooting_git.md
index 2cc78a4d288..2f3b3a0e7bb 100644
--- a/doc/topics/git/troubleshooting_git.md
+++ b/doc/topics/git/troubleshooting_git.md
@@ -317,7 +317,7 @@ too small, the error persists.
 Modifying the server is not always an option, and introduces more potential risk.
 Attempt local changes first.
 
-## Password expired error on Git fetch via SSH for LDAP user
+## Password expired error on Git fetch with SSH for LDAP user
 
 If `git fetch` returns this `HTTP 403 Forbidden` error on a self-managed instance of
 GitLab, the password expiration date (`users.password_expires_at`) for this user in the
@@ -359,7 +359,7 @@ refer to the [two-factor authentication troubleshooting guide](../../user/profil
 
 ## `401` errors logged during successful `git clone`
 
-When cloning a repository via HTTP, the
+When cloning a repository with HTTP, the
 [`production_json.log`](../../administration/logs/index.md#production_jsonlog) file
 may show an initial status of `401` (unauthorized), quickly followed by a `200`.
 
diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md
index 7ef9e79b9cb..093e198f1b4 100644
--- a/doc/user/asciidoc.md
+++ b/doc/user/asciidoc.md
@@ -449,7 +449,7 @@ It's possible to generate diagrams and flowcharts from text in GitLab using
 Visit the [official page](https://mermaidjs.github.io/) for more details.
 If you're new to using Mermaid or need help identifying issues in your Mermaid code,
 the [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/) is a helpful tool
-for creating and resolving issues within Mermaid diagrams.
+for creating and resolving issues in Mermaid diagrams.
 
 To generate a diagram or flowchart, enter your text in a `mermaid` block:
 
diff --git a/doc/user/get_started/get_started_managing_code.md b/doc/user/get_started/get_started_managing_code.md
index 9f70a1e92a5..d765b55fdec 100644
--- a/doc/user/get_started/get_started_managing_code.md
+++ b/doc/user/get_started/get_started_managing_code.md
@@ -36,7 +36,7 @@ For details, see:
 
 ## Step 2: Write your code
 
-You have many options for how and where you'll write your code.
+You have many options for how and where you write your code.
 
 You can use the GitLab UI and develop right in your browser.
 You have two options:
@@ -68,14 +68,14 @@ For details, see:
 When your changes are ready, you should commit them to GitLab,
 where you can share them with others on your team.
 
-To commit your changes, you'll copy them:
+To commit your changes, first copy them:
 
 - From your local computer, in your own branch
 - To GitLab, on a remote computer, to the default branch, usually called `main` or `master`.
 
 To copy files between branches, you create a merge request.
-There are many different ways to create a merge request. It largely
-depends on where you authored the code and the tools you'll use to create it.
+There are different ways to create a merge request. It depends on
+where you authored the code and the tools you use to create it.
 But the idea is to create a merge request that takes the contents of your source branch
 and proposes combining it into the target branch.
 
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index ad6e4a112ed..934f84615e2 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -435,17 +435,17 @@ with details, such as the affected IP address.
 
 #### Git and container registry failed authentication ban
 
-GitLab.com responds with HTTP status code `403` for 1 hour, if 30 failed
-authentication requests were received in a 3-minute period from a single IP address.
+GitLab.com responds with HTTP status code `403` for 15 minutes, if 300 failed
+authentication requests were received in a 1-minute period from a single IP address.
 
 This applies only to Git requests and container registry (`/jwt/auth`) requests
 (combined).
 
 This limit:
 
-- Is reset by requests that authenticate successfully. For example, 29
+- Is reset by requests that authenticate successfully. For example, 299
   failed authentication requests followed by 1 successful request, followed by
-  29 more failed authentication requests would not trigger a ban.
+  299 more failed authentication requests would not trigger a ban.
 - Does not apply to JWT requests authenticated by `gitlab-ci-token`.
 
 No response headers are provided.
diff --git a/doc/user/gitlab_duo/index.md b/doc/user/gitlab_duo/index.md
index 9613b4655c5..53aed37c903 100644
--- a/doc/user/gitlab_duo/index.md
+++ b/doc/user/gitlab_duo/index.md
@@ -103,7 +103,7 @@ DETAILS:
 ### Merge commit message generation
 
 DETAILS:
-**Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../subscriptions/subscription-add-ons.md).
+**Tier:** Ultimate with [GitLab Duo Enterprise](../../subscriptions/subscription-add-ons.md)
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
 - Helps you merge more quickly by generating meaningful commit messages.
diff --git a/doc/user/group/ssh_certificates.md b/doc/user/group/ssh_certificates.md
index b66a2b80f76..0d1939598e7 100644
--- a/doc/user/group/ssh_certificates.md
+++ b/doc/user/group/ssh_certificates.md
@@ -46,7 +46,7 @@ To add a CA certificate to a group:
 Prerequisites:
 
 - You must have the Owner role for the group.
-- The user certificates can only be used to access the projects within the top-level group and its subgroups.
+- The user certificates can only be used to access the projects in the top-level group and its subgroups.
 - A user's username or primary email (`user` or `user@example.com`) must be specified to associate a
   GitLab user with the user certificate.
 - The user must be an [Enterprise User](../enterprise_user/index.md).
@@ -62,7 +62,7 @@ The SSH key pair is either generated by a user or provisioned by the group owner
 
 The expiration date (`+1d`) identifies how long the SSH certificate can be used to access the group projects.
 
-The user certificates can only be used to access the projects within the top-level group.
+The user certificates can only be used to access the projects in the top-level group.
 
 ## Enforce SSH certificates
 
diff --git a/doc/user/project/codeowners/reference.md b/doc/user/project/codeowners/reference.md
index a9aeb389148..fc739764a2b 100644
--- a/doc/user/project/codeowners/reference.md
+++ b/doc/user/project/codeowners/reference.md
@@ -36,7 +36,7 @@ Sections are groups of entries. A section begins with a section heading in squar
 #### Section headings
 
 Section headings must always have a name. They can also be made optional, or
-require a number of approvals. A list of default owners can be added to the section heading line.
+require a specific number of approvals. A list of default owners can be added to the section heading line.
 
 ```plaintext
 # Required section
diff --git a/doc/user/project/codeowners/troubleshooting.md b/doc/user/project/codeowners/troubleshooting.md
index 1a7e1a2b807..ca4968a391c 100644
--- a/doc/user/project/codeowners/troubleshooting.md
+++ b/doc/user/project/codeowners/troubleshooting.md
@@ -68,7 +68,7 @@ For example:
 docs/ @tech-writer-team
 ```
 
-All files beneath the `docs/` directory show `@tech-writer-team` as Code Owners, but the directory itself will show `@dev-team`.
+All files beneath the `docs/` directory show `@tech-writer-team` as Code Owners, but the directory itself shows `@dev-team`.
 
 This behavior occurs when viewing a directory because the [syntax rule](../../project/codeowners/reference.md#directory-paths)
 applies to all files beneath the directory, which does not include the directory itself. To resolve this, update the `CODEOWNERS` file to include the
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md
index 74f05439563..c37994bfcec 100644
--- a/doc/user/project/file_lock.md
+++ b/doc/user/project/file_lock.md
@@ -21,7 +21,7 @@ for binary files.
 When file locking is setup, lockable files are **read-only** by default.
 
 When a file is locked, only the user who locked the file may modify it. This
-user is said to "hold the lock" or have "taken the lock", since only one user
+user is said to "hold the lock" or have "taken the lock", because only one user
 can lock a file at a time. When a file or directory is unlocked, the user is
 said to have "released the lock".
 
@@ -182,7 +182,7 @@ lock it again to keep it locked.
 
 ### Edit lockable files
 
-Once the file is [configured as lockable](#configure-exclusive-file-locks), it is set to read-only.
+After the file is [configured as lockable](#configure-exclusive-file-locks), it is set to read-only.
 Therefore, you need to lock it before editing it.
 
 Suggested workflow for shared projects:
diff --git a/doc/user/project/integrations/git_guardian.md b/doc/user/project/integrations/git_guardian.md
index 2ac3106cb8c..2d6eea77ad6 100644
--- a/doc/user/project/integrations/git_guardian.md
+++ b/doc/user/project/integrations/git_guardian.md
@@ -111,10 +111,9 @@ them one by one.
 
 You might get a HTTP `400` error that states `Filename: ensure this value has at most 256 characters`.
 
-This issue occurs when some of the changed files you are pushing in that commit have the file name
-(not the path) longer then 256 characters.
+This issue occurs when some of the changed files you are pushing in that commit have the filename (not the path) longer then 256 characters.
 
-The workaround is to shorten the file name if possible.
-In case the file name cannot be shortened, for example, because it was automatically generated by a framework,
-disable the integration and try to push again.
+The workaround is to shorten the filename if possible.
+For example, if the filename cannot be shortened because it was automatically
+generated by a framework, disable the integration and try to push again.
 Don't forget to re-enable the integration afterwards if needed.
diff --git a/doc/user/project/merge_requests/duo_in_merge_requests.md b/doc/user/project/merge_requests/duo_in_merge_requests.md
index 70dc60b94d9..a4326099050 100644
--- a/doc/user/project/merge_requests/duo_in_merge_requests.md
+++ b/doc/user/project/merge_requests/duo_in_merge_requests.md
@@ -64,7 +64,7 @@ Provide feedback on this experimental feature in [issue 408991](https://gitlab.c
 ## Generate a merge commit message
 
 DETAILS:
-**Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md).
+**Tier:** Ultimate with [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md)
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment) [with a flag](../../../administration/feature_flags.md) named `generate_commit_message_flag`. Disabled by default.
diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md
index 3fb6c715d06..4694e36672b 100644
--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -23,7 +23,7 @@ A protected branch controls:
 - If changes to files listed in the CODEOWNERS file can be pushed directly to the branch.
 - Which users, groups, or access levels can unprotect the branch using the
   [Protected branches API](../../api/protected_branches.md#update-a-protected-branch).
-- Which users can modify the branch via the [Commits API](../../api/commits.md).
+- Which users can modify the branch with the [Commits API](../../api/commits.md).
 
 The [default branch](repository/branches/default.md) for your repository is protected by default.
 
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index 5d50ddd8489..9ec7e662d9f 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -148,7 +148,7 @@ You can download the source code that's stored in a repository.
      Download the artifacts from the latest CI job.
 
 The checksums of generated archives can change even if the repository itself doesn't
-change. This can occur, for example, if Git or a third-party library that GitLab uses changes.
+change. For example, this occurs if Git or a third-party library that GitLab uses changes.
 
 ## Repository languages
 
diff --git a/doc/user/project/repository/mirror/bidirectional.md b/doc/user/project/repository/mirror/bidirectional.md
index d6f62a19d6d..ad94efccfaf 100644
--- a/doc/user/project/repository/mirror/bidirectional.md
+++ b/doc/user/project/repository/mirror/bidirectional.md
@@ -164,8 +164,8 @@ If you mirror with Perforce Helix, mirror only protected branches. Perforce Heli
 rejects any pushes that rewrite history. Only the fewest number of branches should be mirrored
 due to the performance limitations of Git Fusion.
 
-When you configure mirroring with Perforce Helix by using Git Fusion, we recommend these Git Fusion
-settings:
+When you configure mirroring with Perforce Helix by using Git Fusion, you should use
+these Git Fusion settings:
 
 - Disable `change-pusher`. Otherwise, every commit is rewritten as being committed
   by the mirroring account, rather than mapping to existing Perforce Helix users or the `unknown_git` user.
diff --git a/doc/user/project/repository/mirror/pull.md b/doc/user/project/repository/mirror/pull.md
index f1a36b27f70..74f604f10bb 100644
--- a/doc/user/project/repository/mirror/pull.md
+++ b/doc/user/project/repository/mirror/pull.md
@@ -132,7 +132,7 @@ and mirroring attempts stop. This failure is visible in either the:
 
 To resume project mirroring, [force an update](index.md#force-an-update).
 
-If many projects are affected by this problem, such as after a long network or
+If multiple projects are affected by this problem, such as after a long network or
 server outage, you can use the [Rails console](../../../../administration/operations/rails_console.md)
 to identify and update all affected projects with this command:
 
diff --git a/doc/user/project/repository/mirror/troubleshooting.md b/doc/user/project/repository/mirror/troubleshooting.md
index dcb81832c08..4cdf3c0507c 100644
--- a/doc/user/project/repository/mirror/troubleshooting.md
+++ b/doc/user/project/repository/mirror/troubleshooting.md
@@ -39,7 +39,7 @@ One of these issues might be occurring:
 
 ## Deadline Exceeded
 
-When upgrading GitLab, a change in how usernames are represented means that you
+When you upgrade GitLab, a change in how usernames are represented means that you
 must update your mirroring username and password to ensure that `%40` characters are replaced with `@`.
 
 ## Connection blocked: server only allows public key authentication
diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md
index d00d23f543c..7c452ec853f 100644
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
@@ -340,7 +340,7 @@ If these actions are insufficient, you can also:
 
 Unfortunately, this workflow doesn't work. Deleting files in a commit doesn't actually reduce the
 size of the repository, because the earlier commits and blobs still exist. Instead, you must rewrite
-history. We recommend the open-source community-maintained tool
+history. You should use the open-source community-maintained tool
 [`git filter-repo`](https://github.com/newren/git-filter-repo).
 
 NOTE:
diff --git a/doc/user/project/repository/signed_commits/web_commits.md b/doc/user/project/repository/signed_commits/web_commits.md
index f6d5a431593..f78a5d69e29 100644
--- a/doc/user/project/repository/signed_commits/web_commits.md
+++ b/doc/user/project/repository/signed_commits/web_commits.md
@@ -49,7 +49,7 @@ To avoid confusion, when the commit is signed, the signature should belong to th
 
 This is why you should [configure](../../../../administration/gitaly/configure_gitaly.md#configure-commit-signing-for-gitlab-ui-commits)
 the `Committer` field to point to the instance itself.
-For example, when this feature becomes enabled on GitLab.com, the `Committer` field will be: `GitLab <noreply@gitlab.com>`.
+For example, when this feature becomes enabled on GitLab.com, the `Committer` field is: `GitLab <noreply@gitlab.com>`.
 
 GitLab provides multiple security features that rely on the `Committer` field to be set to the user who creates the commit.
 For example:
diff --git a/doc/user/project/repository/signed_commits/x509.md b/doc/user/project/repository/signed_commits/x509.md
index 975a2a41997..744a70ed6ba 100644
--- a/doc/user/project/repository/signed_commits/x509.md
+++ b/doc/user/project/repository/signed_commits/x509.md
@@ -501,7 +501,7 @@ This data can now be investigated on the Linux command line using OpenSSL:
 
    This should get the same result as the previous step, using the extracted certificate.
 
-   If the message is missing the certificate, the error will include `signer certificate not found`.
+   If the message is missing the certificate, the error includes `signer certificate not found`.
 
 1. Fully verify the commit:
 
@@ -510,7 +510,7 @@ This data can now be investigated on the Linux command line using OpenSSL:
        -in /tmp/signature_text.pk7.pem -content /tmp/signed_text.txt
    ```
 
-   If this step fails, verification will also fail in GitLab.
+   If this step fails, verification also fails in GitLab.
 
    Resolve any errors, for example:
 
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index 52208d650cd..2406f93fbdb 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -249,7 +249,7 @@ GitLab forwards the spam to Akismet.
 
 ### Snippet limitations
 
-- There are no limits as to how many snippets you can create.
+- No limits exist as to how many snippets you can create.
 - Binary files are not supported.
 - Creating or deleting branches is not supported. Only the default branch is used.
 - Git tags are not supported in snippet repositories.
diff --git a/lib/api/entities/project_upload.rb b/lib/api/entities/project_upload.rb
index d4c6c6c0b9d..bdc6e1b0413 100644
--- a/lib/api/entities/project_upload.rb
+++ b/lib/api/entities/project_upload.rb
@@ -5,6 +5,9 @@ module API
     class ProjectUpload < Grape::Entity
       include Gitlab::Routing
 
+      expose :id do |uploader|
+        uploader.upload.id
+      end
       expose :markdown_name, as: :alt
       expose :secure_url, as: :url
       expose :full_path do |uploader|
diff --git a/lib/api/helpers/personal_access_tokens_helpers.rb b/lib/api/helpers/personal_access_tokens_helpers.rb
index 99ff4825160..250192aedf8 100644
--- a/lib/api/helpers/personal_access_tokens_helpers.rb
+++ b/lib/api/helpers/personal_access_tokens_helpers.rb
@@ -35,7 +35,7 @@ module API
       end
 
       def rotate_token(token, params)
-        service = ::PersonalAccessTokens::RotateService.new(current_user, token).execute(params)
+        service = ::PersonalAccessTokens::RotateService.new(current_user, token, nil, params).execute
 
         if service.success?
           status :ok
diff --git a/lib/api/resource_access_tokens.rb b/lib/api/resource_access_tokens.rb
index 04f01608dd6..eabf7c9fd5e 100644
--- a/lib/api/resource_access_tokens.rb
+++ b/lib/api/resource_access_tokens.rb
@@ -156,14 +156,14 @@ module API
 
           if token
             response = if source_type == "project"
-                         ::ProjectAccessTokens::RotateService.new(current_user, token, resource)
-                                   .execute(declared_params)
+                         ::ProjectAccessTokens::RotateService.new(
+                           current_user, token, resource, declared_params).execute
                        elsif source_type == "group"
-                         ::GroupAccessTokens::RotateService.new(current_user, token, resource)
-                                   .execute(declared_params)
+                         ::GroupAccessTokens::RotateService.new(
+                           current_user, token, resource, declared_params).execute
                        else
-                         ::PersonalAccessTokens::RotateService.new(current_user, token)
-                                     .execute(declared_params)
+                         ::PersonalAccessTokens::RotateService.new(
+                           current_user, token, nil, declared_params).execute
                        end
 
             if response.success?
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index e92fa195baa..c65369c76cc 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -130,6 +130,7 @@ module API
       optional :performance_bar_allowed_group_path, type: String, desc: 'Path of the group that is allowed to toggle the performance bar.'
       optional :performance_bar_enabled, type: String, desc: 'Deprecated: Pass `performance_bar_allowed_group_path: nil` instead. Allow enabling the performance.' # support legacy names, can be removed in v6
       optional :personal_access_token_prefix, type: String, desc: 'Prefix to prepend to all personal access tokens'
+      optional :require_personal_access_token_expiry, type: Boolean, desc: 'Flag indicating if Personal / Group / Project access token expiry is required'
       optional :kroki_enabled, type: Boolean, desc: 'Enable Kroki'
       given kroki_enabled: ->(val) { val } do
         requires :kroki_url, type: String, desc: 'The Kroki server URL'
diff --git a/lib/gitlab/background_migration/backfill_desired_sharding_key_job.rb b/lib/gitlab/background_migration/backfill_desired_sharding_key_job.rb
index 4552d03b211..9e1dbf7f0fe 100644
--- a/lib/gitlab/background_migration/backfill_desired_sharding_key_job.rb
+++ b/lib/gitlab/background_migration/backfill_desired_sharding_key_job.rb
@@ -9,8 +9,12 @@ module Gitlab
       scope_to ->(relation) { relation.where(backfill_column => nil) }
 
       def perform
-        each_sub_batch do |sub_batch|
-          sub_batch.connection.execute(construct_query(sub_batch: sub_batch))
+        ::Gitlab::Database.allow_cross_joins_across_databases(
+          url: 'https://gitlab.com/groups/gitlab-org/-/epics/14116#identified-cross-joins'
+        ) do
+          each_sub_batch do |sub_batch|
+            sub_batch.connection.execute(construct_query(sub_batch: sub_batch))
+          end
         end
       end
 
diff --git a/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id.rb b/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id.rb
new file mode 100644
index 00000000000..8dfcfedc209
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillVulnerabilityOccurrencePipelinesProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_vulnerability_occurrence_pipelines_project_id
+      feature_category :vulnerability_management
+    end
+  end
+end
diff --git a/lib/gitlab/fp/settings/env_var_override_processor.rb b/lib/gitlab/fp/settings/env_var_override_processor.rb
index 89faa223457..f68af657db7 100644
--- a/lib/gitlab/fp/settings/env_var_override_processor.rb
+++ b/lib/gitlab/fp/settings/env_var_override_processor.rb
@@ -9,6 +9,8 @@ module Gitlab
         # @param [Hash] context
         # @return [Gitlab::Fp::Result]
         def self.process(context)
+          return Gitlab::Fp::Result.ok(context) if Rails.env.production?
+
           context => {
             env_var_prefix: String => env_var_prefix,
             env_var_failed_message_class: Class => env_var_failed_message_class,
diff --git a/lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb b/lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb
deleted file mode 100644
index d88128216d6..00000000000
--- a/lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Usage
-    module Metrics
-      module Instrumentations
-        class IssuesCreatedFromAlertsMetric < NumbersMetric
-          ISSUES_FROM_ALERTS_METRICS = [
-            IssuesWithAlertManagementAlertsMetric,
-            IssuesWithPrometheusAlertEvents
-          ].freeze
-
-          operation :add
-
-          data do |time_frame|
-            ISSUES_FROM_ALERTS_METRICS.map { |metric| metric.new(time_frame: time_frame).value }
-          end
-
-          # overwriting instrumentation to generate the appropriate sql query
-          def instrumentation
-            'SELECT ' + ISSUES_FROM_ALERTS_METRICS.map do |metric|
-              "(#{metric.new(time_frame: time_frame).instrumentation})"
-            end.join(' + ')
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric.rb b/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric.rb
index 62b91e50e07..73329292634 100644
--- a/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric.rb
@@ -5,10 +5,6 @@ module Gitlab
     module Metrics
       module Instrumentations
         class IssuesWithAlertManagementAlertsMetric < DatabaseMetric
-          # this metric is used in IssuesCreatedFromAlertsMetric
-          # do not report metric directly in service ping
-          available? { false }
-
           operation :count
 
           start { Issue.minimum(:id) }
diff --git a/lib/gitlab/usage/metrics/instrumentations/issues_with_prometheus_alert_events.rb b/lib/gitlab/usage/metrics/instrumentations/issues_with_prometheus_alert_events.rb
deleted file mode 100644
index 2befec65ac2..00000000000
--- a/lib/gitlab/usage/metrics/instrumentations/issues_with_prometheus_alert_events.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Usage
-    module Metrics
-      module Instrumentations
-        class IssuesWithPrometheusAlertEvents < DatabaseMetric
-          # this metric is used in IssuesCreatedFromAlertsMetric
-          # do not report metric directly in service ping
-          available? { false }
-
-          operation :count
-
-          start { Issue.minimum(:id) }
-          finish { Issue.maximum(:id) }
-
-          relation { Issue.with_prometheus_alert_events }
-
-          cache_start_and_finish_as :issue
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 8a58b6f8d92..f976245966a 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -94,7 +94,6 @@ module Gitlab
             issues_with_associated_zoom_link: count(ZoomMeeting.added_to_issue),
             issues_using_zoom_quick_actions: distinct_count(ZoomMeeting, :issue_id),
             issues_with_embedded_grafana_charts_approx: grafana_embed_usage_data,
-            issues_created_from_alerts: total_alert_issues,
             incident_issues: count(::Issue.with_issue_type(:incident), start: minimum_id(Issue), finish: maximum_id(Issue)),
             alert_bot_incident_issues: count(::Issue.authored(::Users::Internal.alert_bot), start: minimum_id(Issue), finish: maximum_id(Issue)),
             keys: count(Key),
@@ -501,12 +500,6 @@ module Gitlab
       end
       # rubocop: enable CodeReuse/ActiveRecord
 
-      def total_alert_issues
-        # Remove prometheus table queries once they are deprecated
-        # To be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/217407.
-        add_metric('IssuesCreatedFromAlertsMetric')
-      end
-
       def clear_memoized
         CE_MEMOIZED_VALUES.each { |v| clear_memoization(v) }
       end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d8225a755d2..d0ddfd88b4d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2782,6 +2782,9 @@ msgstr ""
 msgid "AccessTokens|Keep this token secret. Anyone who has it can read activity and issue RSS feeds or your calendar feed as if they were you. If that happens, %{linkStart}reset this token%{linkEnd}."
 msgstr ""
 
+msgid "AccessTokens|Personal / project / group access token expiration"
+msgstr ""
+
 msgid "AccessTokens|Personal Access Tokens"
 msgstr ""
 
@@ -2806,6 +2809,9 @@ msgstr ""
 msgid "AccessTokens|Token name"
 msgstr ""
 
+msgid "AccessTokens|When enabled, a user will be required to enter in an expiration date when creating an access token. Changes will not affect existing token expiration dates. This setting overrides the group-level %{link_start}service account token expiration%{link_end} setting."
+msgstr ""
+
 msgid "AccessTokens|You can also use personal access tokens to authenticate against Git over HTTP."
 msgstr ""
 
diff --git a/package.json b/package.json
index 637391c617f..ebc0d88e023 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "lint:stylelint:staged": "scripts/frontend/execute-on-staged-files.sh stylelint '(css|scss)' -q",
     "lint:stylelint:staged:fix": "yarn run lint:stylelint:staged --fix",
     "lint:tailwind-utils": "REDIRECT_TO_STDOUT=true node scripts/frontend/compare_css_util_classes.mjs",
+    "prelint:tailwind-utils": "rm -f config/helpers/tailwind/css_in_js.js",
     "markdownlint": "markdownlint-cli2",
     "preinstall": "node ./scripts/frontend/preinstall.mjs",
     "postinstall": "node ./scripts/frontend/postinstall.js",
diff --git a/scripts/frontend/tailwind_equivalents.json b/scripts/frontend/tailwind_equivalents.json
index 1de7e11d90f..f707c1f3bec 100644
--- a/scripts/frontend/tailwind_equivalents.json
+++ b/scripts/frontend/tailwind_equivalents.json
@@ -99,8 +99,8 @@
   "gl-text-body!": "!gl-text-primary",
   "gl-text-secondary!": "!gl-text-secondary",
   "gl-sm-text-body": "sm:gl-text-primary",
-  "gl-text-black-normal": "gl-text-gray-900",
-  "gl-text-black-normal!": "!gl-text-gray-900",
+  "gl-text-black-normal": "gl-text-default",
+  "gl-text-black-normal!": "!gl-text-default",
   "gl-text-gray-300!": "!gl-text-gray-300",
   "gl-text-gray-400!": "!gl-text-gray-400",
   "gl-text-gray-500!": "!gl-text-gray-500",
@@ -213,6 +213,7 @@
   "gl-md-flex-direction-row-reverse": "md:gl-flex-row-reverse",
   "gl-flex-grow-0!": "!gl-grow-0",
   "gl-flex-grow-1": "gl-grow",
+  "gl-flex-shrink-0": "gl-shrink-0",
   "gl-md-flex-grow-0": "md:gl-grow-0",
   "gl-flex-basis-0": "gl-basis-0",
   "gl-flex-basis-quarter": "gl-basis-1/4",
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index 2fa6dcc8544..2291330edd7 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -276,6 +276,7 @@ RSpec.describe Admin::ApplicationSettingsController, :do_not_mock_admin_mode_set
       it_behaves_like 'updates boolean attribute', :admin_mode
       it_behaves_like 'updates boolean attribute', :require_admin_approval_after_user_signup
       it_behaves_like 'updates boolean attribute', :remember_me_enabled
+      it_behaves_like 'updates boolean attribute', :require_personal_access_token_expiry
     end
 
     context "personal access token prefix settings" do
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index beebe77f1f2..bf7f52a914e 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -165,6 +165,7 @@ RSpec.describe 'Database schema', feature_category: :database do
     user_agent_details: %w[subject_id],
     users: %w[color_mode_id color_scheme_id created_by_id theme_id managing_group_id],
     users_star_projects: %w[user_id],
+    vulnerability_occurrence_pipelines: %w[project_id],
     vulnerability_finding_links: %w[project_id],
     vulnerability_identifiers: %w[external_id],
     vulnerability_occurrence_identifiers: %w[project_id],
diff --git a/spec/factories/usage_data.rb b/spec/factories/usage_data.rb
index 2efb239d02c..4a39d3c0ec2 100644
--- a/spec/factories/usage_data.rb
+++ b/spec/factories/usage_data.rb
@@ -35,11 +35,9 @@ FactoryBot.define do
       create(:custom_issue_tracker_integration, project: projects[2], active: true)
       create(:project_error_tracking_setting, project: projects[0])
       create(:project_error_tracking_setting, project: projects[1], enabled: false)
-      alert_bot_issues = create_list(:incident, 2, project: projects[0], author: Users::Internal.alert_bot)
+      create_list(:incident, 2, project: projects[0], author: Users::Internal.alert_bot)
       create_list(:incident, 2, project: projects[1], author: Users::Internal.alert_bot)
-      issues = create_list(:issue, 4, project: projects[0])
-      create_list(:prometheus_alert, 2, project: projects[0])
-      create(:prometheus_alert, project: projects[1])
+      create_list(:issue, 4, project: projects[0])
       create(:merge_request, :simple, :with_terraform_reports, source_project: projects[0])
       create(:merge_request, :rebased, :with_terraform_reports, source_project: projects[0])
       create(:merge_request, :simple, :with_terraform_reports, source_project: projects[1])
@@ -59,10 +57,6 @@ FactoryBot.define do
       create(:alert_management_http_integration, project: projects[0], name: 'DataCat')
       create(:alert_management_http_integration, :inactive, project: projects[1], name: 'DataFox')
 
-      # Alert Issues
-      create(:alert_management_alert, issue: issues[0], project: projects[0])
-      create(:alert_management_alert, issue: alert_bot_issues[0], project: projects[0])
-
       # Kubernetes agents
       create(:cluster_agent, project: projects[0])
       create(:cluster_agent_token, agent: create(:cluster_agent, project: projects[1]))
diff --git a/spec/frontend/alert_management/components/alert_management_table_spec.js b/spec/frontend/alert_management/components/alert_management_table_spec.js
index cb051f2b1e7..4bd9d761240 100644
--- a/spec/frontend/alert_management/components/alert_management_table_spec.js
+++ b/spec/frontend/alert_management/components/alert_management_table_spec.js
@@ -140,8 +140,8 @@ describe('AlertManagementTable', () => {
       expect(findLoader().exists()).toBe(false);
       expect(findAlertsTable().exists()).toBe(true);
       expect(findAlerts()).toHaveLength(mockAlerts.length);
-      expect(findAlerts().at(0).classes()).toContain('gl-hover-bg-gray-50');
-      expect(findAlerts().at(0).classes()).not.toContain('gl-hover-border-blue-200');
+      expect(findAlerts().at(0).classes()).toContain('hover:gl-bg-gray-50');
+      expect(findAlerts().at(0).classes()).not.toContain('hover:gl-border-blue-200');
     });
 
     it('displays the alert ID and title as a link', () => {
diff --git a/spec/frontend/issues/list/mock_data.js b/spec/frontend/issues/list/mock_data.js
index 54dd808c0ae..6f5aff0410f 100644
--- a/spec/frontend/issues/list/mock_data.js
+++ b/spec/frontend/issues/list/mock_data.js
@@ -220,7 +220,7 @@ export const locationSearch = [
   'not[health_status]=onTrack',
 ].join('&');
 
-export const locationSearchWithSpecialValues = [
+export const locationSearchWithWildcardValues = [
   'assignee_id=Any',
   'assignee_username=bart',
   'my_reaction_emoji=None',
@@ -311,7 +311,7 @@ const makeFilteredTokens = ({ grouped }) => [
 export const filteredTokens = makeFilteredTokens({ grouped: false });
 export const groupedFilteredTokens = makeFilteredTokens({ grouped: true });
 
-export const filteredTokensWithSpecialValues = [
+export const filteredTokensWithWildcardValues = [
   { type: TOKEN_TYPE_ASSIGNEE, value: { data: 'Any', operator: OPERATOR_IS } },
   { type: TOKEN_TYPE_ASSIGNEE, value: { data: 'bart', operator: OPERATOR_IS } },
   { type: TOKEN_TYPE_MY_REACTION, value: { data: 'None', operator: OPERATOR_IS } },
@@ -360,7 +360,7 @@ export const apiParams = {
   },
 };
 
-export const apiParamsWithSpecialValues = {
+export const apiParamsWithWildcardValues = {
   assigneeWildcardId: 'ANY',
   assigneeUsernames: 'bart',
   labelName: 'None',
@@ -405,7 +405,7 @@ export const urlParams = {
   'not[health_status]': 'onTrack',
 };
 
-export const urlParamsWithSpecialValues = {
+export const urlParamsWithWildcardValues = {
   assignee_id: 'Any',
   'assignee_username[]': 'bart',
   'label_name[]': 'None',
diff --git a/spec/frontend/issues/list/utils_spec.js b/spec/frontend/issues/list/utils_spec.js
index 0b8ef2cf28e..c239fc5e56a 100644
--- a/spec/frontend/issues/list/utils_spec.js
+++ b/spec/frontend/issues/list/utils_spec.js
@@ -2,14 +2,14 @@ import setWindowLocation from 'helpers/set_window_location_helper';
 import { TEST_HOST } from 'helpers/test_constants';
 import {
   apiParams,
-  apiParamsWithSpecialValues,
+  apiParamsWithWildcardValues,
   filteredTokens,
-  filteredTokensWithSpecialValues,
+  filteredTokensWithWildcardValues,
   groupedFilteredTokens,
   locationSearch,
-  locationSearchWithSpecialValues,
+  locationSearchWithWildcardValues,
   urlParams,
-  urlParamsWithSpecialValues,
+  urlParamsWithWildcardValues,
 } from 'jest/issues/list/mock_data';
 import { STATUS_CLOSED } from '~/issues/constants';
 import { CREATED_DESC, UPDATED_DESC, urlSortParams } from '~/issues/list/constants';
@@ -132,9 +132,9 @@ describe('getFilterTokens', () => {
     expect(getFilterTokens(locationSearch)).toEqual(filteredTokens);
   });
 
-  it('returns filtered tokens given "window.location.search" with special values', () => {
-    expect(getFilterTokens(locationSearchWithSpecialValues)).toEqual(
-      filteredTokensWithSpecialValues,
+  it('returns filtered tokens given "window.location.search" with wildcard values', () => {
+    expect(getFilterTokens(locationSearchWithWildcardValues)).toEqual(
+      filteredTokensWithWildcardValues,
     );
   });
 });
@@ -148,8 +148,10 @@ describe('convertToApiParams', () => {
     expect(convertToApiParams(filteredTokens)).toEqual(apiParams);
   });
 
-  it('returns api params given filtered tokens with special values', () => {
-    expect(convertToApiParams(filteredTokensWithSpecialValues)).toEqual(apiParamsWithSpecialValues);
+  it('returns api params given filtered tokens with wildcard values', () => {
+    expect(convertToApiParams(filteredTokensWithWildcardValues)).toEqual(
+      apiParamsWithWildcardValues,
+    );
   });
 });
 
@@ -162,10 +164,12 @@ describe('convertToUrlParams', () => {
     expect(convertToUrlParams(filteredTokens)).toEqual(urlParams);
   });
 
-  it('returns url params given filtered tokens with special values', () => {
+  it('returns url params given filtered tokens with wildcard values', () => {
     setWindowLocation('?assignee_id=123');
 
-    expect(convertToUrlParams(filteredTokensWithSpecialValues)).toEqual(urlParamsWithSpecialValues);
+    expect(convertToUrlParams(filteredTokensWithWildcardValues)).toEqual(
+      urlParamsWithWildcardValues,
+    );
   });
 });
 
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 eb71b81ab17..961a4c48ad8 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-display-flex gl-font-monospace gl-font-sm gl-py-2"
+  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"
 >
   <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 53f0198756c..b31d6d783dd 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
@@ -49,7 +49,7 @@ exports[`packages_list_row renders 1`] = `
         </div>
       </div>
       <div
-        class="gl-flex gl-flex-col gl-flex-shrink-0 gl-justify-between gl-text-secondary sm:gl-items-end"
+        class="gl-flex gl-flex-col gl-justify-between gl-shrink-0 gl-text-secondary sm:gl-items-end"
       >
         <div
           class="gl-flex gl-items-center gl-min-h-6 sm:gl-text-primary"
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 eb71b81ab17..961a4c48ad8 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-display-flex gl-font-monospace gl-font-sm gl-py-2"
+  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"
 >
   <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 0b8cf00250d..03042eaf745 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
@@ -60,7 +60,7 @@ exports[`packages_list_row renders 1`] = `
         </div>
       </div>
       <div
-        class="gl-flex gl-flex-col gl-flex-shrink-0 gl-justify-between gl-text-secondary sm:gl-items-end"
+        class="gl-flex gl-flex-col gl-justify-between gl-shrink-0 gl-text-secondary sm:gl-items-end"
       >
         <div
           class="gl-flex gl-items-center gl-min-h-6 sm:gl-text-primary"
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js
index 9380240290c..710d9ffe9c2 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js
@@ -170,10 +170,10 @@ describe('MRWidgetPipeline', () => {
       );
 
       describe.each`
-        style           | coverageState  | coverageChangeText | styleClass          | pipelineCoverageDelta
-        ${'no special'} | ${'the same'}  | ${'not change'}    | ${''}               | ${'0'}
-        ${'success'}    | ${'increased'} | ${'increase'}      | ${'text-success'}   | ${'10'}
-        ${'danger'}     | ${'decreased'} | ${'decrease'}      | ${'gl-text-danger'} | ${'-10'}
+        style           | coverageState  | coverageChangeText | styleClass           | pipelineCoverageDelta
+        ${'no special'} | ${'the same'}  | ${'not change'}    | ${''}                | ${'0'}
+        ${'success'}    | ${'increased'} | ${'increase'}      | ${'gl-text-success'} | ${'10'}
+        ${'danger'}     | ${'decreased'} | ${'decrease'}      | ${'gl-text-danger'}  | ${'-10'}
       `(
         'if test coverage is $coverageState',
         ({ style, styleClass, coverageChangeText, pipelineCoverageDelta }) => {
diff --git a/spec/frontend/vue_shared/alert_details/alert_status_spec.js b/spec/frontend/vue_shared/alert_details/alert_status_spec.js
index 478df81a966..97b5d10fa47 100644
--- a/spec/frontend/vue_shared/alert_details/alert_status_spec.js
+++ b/spec/frontend/vue_shared/alert_details/alert_status_spec.js
@@ -77,12 +77,12 @@ describe('AlertManagementStatus', () => {
 
     it('hides the dropdown by default', () => {
       mountComponent({ props: { isSidebar: true } });
-      expect(wrapper.classes()).toContain('gl-display-none');
+      expect(wrapper.classes()).toContain('gl-hidden');
     });
 
     it('shows the dropdown', () => {
       mountComponent({ props: { isSidebar: true, isDropdownShowing: true } });
-      expect(wrapper.classes()).not.toContain('gl-display-none');
+      expect(wrapper.classes()).not.toContain('gl-hidden');
     });
   });
 
diff --git a/spec/frontend/vue_shared/components/awards_list_spec.js b/spec/frontend/vue_shared/components/awards_list_spec.js
index 87eb43c5cfd..62259760643 100644
--- a/spec/frontend/vue_shared/components/awards_list_spec.js
+++ b/spec/frontend/vue_shared/components/awards_list_spec.js
@@ -123,63 +123,63 @@ describe('vue_shared/components/awards_list', () => {
     it('shows awards in correct order', () => {
       expect(findAwardsData()).toEqual([
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 3,
           html: matchingEmojiTag(EMOJI_THUMBSUP),
           title: `Ada, Leonardo, and Marie reacted with :${EMOJI_THUMBSUP}:`,
           emojiName: EMOJI_THUMBSUP,
         },
         {
-          classes: [...REACTION_CONTROL_CLASSES, 'selected'],
+          classes: expect.arrayContaining([...REACTION_CONTROL_CLASSES, 'selected']),
           count: 4,
           html: matchingEmojiTag(EMOJI_THUMBSDOWN),
           title: `Ada, Marie, you, and Donatello reacted with :${EMOJI_THUMBSDOWN}:`,
           emojiName: EMOJI_THUMBSDOWN,
         },
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 1,
           html: matchingEmojiTag(EMOJI_100),
           title: `Ada reacted with :${EMOJI_100}:`,
           emojiName: EMOJI_100,
         },
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 2,
           html: matchingEmojiTag(EMOJI_SMILE),
           title: `Ada and Jane reacted with :${EMOJI_SMILE}:`,
           emojiName: EMOJI_SMILE,
         },
         {
-          classes: [...REACTION_CONTROL_CLASSES, 'selected'],
+          classes: expect.arrayContaining([...REACTION_CONTROL_CLASSES, 'selected']),
           count: 4,
           html: matchingEmojiTag(EMOJI_OK),
           title: `Ada, Jane, Leonardo, and you reacted with :${EMOJI_OK}:`,
           emojiName: EMOJI_OK,
         },
         {
-          classes: [...REACTION_CONTROL_CLASSES, 'selected'],
+          classes: expect.arrayContaining([...REACTION_CONTROL_CLASSES, 'selected']),
           count: 1,
           html: matchingEmojiTag(EMOJI_CACTUS),
           title: `You reacted with :${EMOJI_CACTUS}:`,
           emojiName: EMOJI_CACTUS,
         },
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 1,
           html: matchingEmojiTag(EMOJI_A),
           title: `Marie reacted with :${EMOJI_A}:`,
           emojiName: EMOJI_A,
         },
         {
-          classes: [...REACTION_CONTROL_CLASSES, 'selected'],
+          classes: expect.arrayContaining([...REACTION_CONTROL_CLASSES, 'selected']),
           count: 1,
           html: matchingEmojiTag(EMOJI_B),
           title: `You reacted with :${EMOJI_B}:`,
           emojiName: EMOJI_B,
         },
         {
-          classes: [...REACTION_CONTROL_CLASSES, 'selected'],
+          classes: expect.arrayContaining([...REACTION_CONTROL_CLASSES, 'selected']),
           count: 14,
           html: matchingEmojiTag(EMOJI_RACEHORSE),
           title: `Donatello, Michelangelo, Raphael, Homer, Marge, Bart, Lisa, Maggie, Bort, you, and 4 more reacted with :${EMOJI_RACEHORSE}:`,
@@ -268,14 +268,14 @@ describe('vue_shared/components/awards_list', () => {
     it('shows awards in correct order', () => {
       expect(findAwardsData()).toEqual([
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 0,
           html: matchingEmojiTag(EMOJI_THUMBSUP),
           title: '',
           emojiName: EMOJI_THUMBSUP,
         },
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 0,
           html: matchingEmojiTag(EMOJI_THUMBSDOWN),
           title: '',
@@ -283,14 +283,14 @@ describe('vue_shared/components/awards_list', () => {
         },
         // We expect the EMOJI_100 before the EMOJI_SMILE because it was given as a defaultAward
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 1,
           html: matchingEmojiTag(EMOJI_100),
           title: `Marie reacted with :${EMOJI_100}:`,
           emojiName: EMOJI_100,
         },
         {
-          classes: REACTION_CONTROL_CLASSES,
+          classes: expect.arrayContaining(REACTION_CONTROL_CLASSES),
           count: 1,
           html: matchingEmojiTag(EMOJI_SMILE),
           title: `Marie reacted with :${EMOJI_SMILE}:`,
diff --git a/spec/frontend/vue_shared/components/blob_viewers/__snapshots__/simple_viewer_spec.js.snap b/spec/frontend/vue_shared/components/blob_viewers/__snapshots__/simple_viewer_spec.js.snap
index e28876a8b14..593127da33c 100644
--- a/spec/frontend/vue_shared/components/blob_viewers/__snapshots__/simple_viewer_spec.js.snap
+++ b/spec/frontend/vue_shared/components/blob_viewers/__snapshots__/simple_viewer_spec.js.snap
@@ -3,13 +3,13 @@
 exports[`Blob Simple Viewer component rendering matches the snapshot 1`] = `
 <div>
   <div
-    class="code file-content gl-display-flex js-syntax-highlight"
+    class="code file-content gl-flex js-syntax-highlight"
   >
     <div
-      class="gl-px-0! line-numbers"
+      class="!gl-px-0 line-numbers"
     >
       <div
-        class="diff-line-num gl-display-flex line-links"
+        class="diff-line-num gl-flex line-links"
       >
         <a
           class="!gl-shadow-none -gl-mx-2 file-line-blame gl-select-none"
@@ -25,7 +25,7 @@ exports[`Blob Simple Viewer component rendering matches the snapshot 1`] = `
         </a>
       </div>
       <div
-        class="diff-line-num gl-display-flex line-links"
+        class="diff-line-num gl-flex line-links"
       >
         <a
           class="!gl-shadow-none -gl-mx-2 file-line-blame gl-select-none"
@@ -41,7 +41,7 @@ exports[`Blob Simple Viewer component rendering matches the snapshot 1`] = `
         </a>
       </div>
       <div
-        class="diff-line-num gl-display-flex line-links"
+        class="diff-line-num gl-flex line-links"
       >
         <a
           class="!gl-shadow-none -gl-mx-2 file-line-blame gl-select-none"
@@ -58,10 +58,10 @@ exports[`Blob Simple Viewer component rendering matches the snapshot 1`] = `
       </div>
     </div>
     <div
-      class="blob-content gl-display-flex gl-flex-direction-column gl-overflow-y-auto gl-w-full"
+      class="blob-content gl-flex gl-flex-col gl-overflow-y-auto gl-w-full"
     >
       <pre
-        class="code gl-p-0! highlight"
+        class="!gl-p-0 code highlight"
       >
         <code
           data-blob-hash="foo-bar"
diff --git a/spec/frontend/vue_shared/components/design_management/__snapshots__/design_note_pin_spec.js.snap b/spec/frontend/vue_shared/components/design_management/__snapshots__/design_note_pin_spec.js.snap
index 21b885800eb..2d2a1565cc7 100644
--- a/spec/frontend/vue_shared/components/design_management/__snapshots__/design_note_pin_spec.js.snap
+++ b/spec/frontend/vue_shared/components/design_management/__snapshots__/design_note_pin_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`Design note pin component should match the snapshot of note with index 1`] = `
 <button
   aria-label="Comment '1' position"
-  class="design-note-pin gl-absolute gl-align-items-center gl-display-flex gl-font-sm gl-justify-content-center js-image-badge"
+  class="design-note-pin gl-absolute gl-flex gl-items-center gl-justify-center gl-text-sm js-image-badge"
   style="left: 10px; top: 10px;"
   type="button"
 >
@@ -14,7 +14,7 @@ exports[`Design note pin component should match the snapshot of note with index
 exports[`Design note pin component should match the snapshot of note without index 1`] = `
 <button
   aria-label="Comment form position"
-  class="btn-transparent comment-indicator gl-absolute gl-align-items-center gl-display-flex gl-font-sm gl-justify-content-center"
+  class="btn-transparent comment-indicator gl-absolute gl-flex gl-items-center gl-justify-center gl-text-sm"
   style="left: 10px; top: 10px;"
   type="button"
 >
@@ -29,7 +29,7 @@ exports[`Design note pin component should match the snapshot of note without ind
 exports[`Design note pin component should match the snapshot when pin is resolved 1`] = `
 <button
   aria-label="Comment form position"
-  class="btn-transparent comment-indicator gl-absolute gl-align-items-center gl-display-flex gl-font-sm gl-justify-content-center resolved"
+  class="btn-transparent comment-indicator gl-absolute gl-flex gl-items-center gl-justify-center gl-text-sm resolved"
   style="left: 10px; top: 10px;"
   type="button"
 >
@@ -44,7 +44,7 @@ exports[`Design note pin component should match the snapshot when pin is resolve
 exports[`Design note pin component should match the snapshot when position is absent 1`] = `
 <button
   aria-label="Comment form position"
-  class="btn-transparent comment-indicator gl-align-items-center gl-display-flex gl-font-sm gl-justify-content-center"
+  class="btn-transparent comment-indicator gl-flex gl-items-center gl-justify-center gl-text-sm"
   type="button"
 >
   <gl-icon-stub
diff --git a/spec/frontend/vue_shared/components/metric_images/__snapshots__/metric_images_table_spec.js.snap b/spec/frontend/vue_shared/components/metric_images/__snapshots__/metric_images_table_spec.js.snap
index a63b21847cb..1b704bcff96 100644
--- a/spec/frontend/vue_shared/components/metric_images/__snapshots__/metric_images_table_spec.js.snap
+++ b/spec/frontend/vue_shared/components/metric_images/__snapshots__/metric_images_table_spec.js.snap
@@ -5,13 +5,13 @@ exports[`Metrics upload item render the metrics image component 1`] = `
   bodyclass="gl-border-1,gl-border-t-solid,gl-border-gray-100,[object Object]"
   class="border collapsible-card gl-mb-5 gl-p-0"
   footerclass=""
-  headerclass="gl-display-flex gl-align-items-center gl-border-b-0 gl-py-3"
+  headerclass="gl-flex gl-items-center gl-border-b-0 gl-py-3"
 >
   <gl-modal-stub
     actioncancel="[object Object]"
     actionprimary="[object Object]"
     arialabel=""
-    body-class="gl-pb-0! gl-min-h-6!"
+    body-class="!gl-pb-0 !gl-min-h-6"
     dismisslabel="Close"
     modalclass=""
     modalid="delete-metric-modal"
@@ -29,11 +29,11 @@ exports[`Metrics upload item render the metrics image component 1`] = `
     imageid="1"
   />
   <div
-    class="gl-display-flex gl-flex-direction-column"
+    class="gl-flex gl-flex-col"
     data-testid="metric-image-body"
   >
     <img
-      class="gl-align-self-center gl-max-w-full"
+      class="gl-max-w-full gl-self-center"
       src="test_file_path"
     />
   </div>
diff --git a/spec/frontend/vue_shared/components/page_heading_spec.js b/spec/frontend/vue_shared/components/page_heading_spec.js
index ddea94bde5f..c81fe8ed3b8 100644
--- a/spec/frontend/vue_shared/components/page_heading_spec.js
+++ b/spec/frontend/vue_shared/components/page_heading_spec.js
@@ -47,7 +47,7 @@ describe('Pagination links component', () => {
     describe('rendering', () => {
       it('renders the correct heading', () => {
         expect(heading().text()).toBe('Page heading');
-        expect(heading().classes()).toEqual(['gl-heading-1', '!gl-m-0']);
+        expect(heading().classes()).toEqual(expect.arrayContaining(['gl-heading-1', '!gl-m-0']));
         expect(heading().element.tagName.toLowerCase()).toBe('h1');
       });
 
@@ -57,7 +57,9 @@ describe('Pagination links component', () => {
 
       it('renders its description slot content', () => {
         expect(description().text()).toBe('Description go here');
-        expect(description().classes()).toEqual(['gl-w-full', 'gl-mt-2', 'gl-text-secondary']);
+        expect(description().classes()).toEqual(
+          expect.arrayContaining(['gl-w-full', 'gl-mt-2', 'gl-text-secondary']),
+        );
       });
 
       it('renders the heading slot if provided', () => {
diff --git a/spec/frontend/vue_shared/components/settings/settings_section_spec.js b/spec/frontend/vue_shared/components/settings/settings_section_spec.js
index e62b2b604a5..d71659bca08 100644
--- a/spec/frontend/vue_shared/components/settings/settings_section_spec.js
+++ b/spec/frontend/vue_shared/components/settings/settings_section_spec.js
@@ -50,6 +50,8 @@ describe('Settings Block', () => {
     mountComponent();
 
     expect(findDescription().text()).toBe('Description');
-    expect(findDescription().classes()).toEqual(['gl-text-subtle', 'gl-mb-3']);
+    expect(findDescription().classes()).toEqual(
+      expect.arrayContaining(['gl-text-subtle', 'gl-mb-3']),
+    );
   });
 });
diff --git a/spec/helpers/access_tokens_helper_spec.rb b/spec/helpers/access_tokens_helper_spec.rb
index 576045b22d4..a013521d543 100644
--- a/spec/helpers/access_tokens_helper_spec.rb
+++ b/spec/helpers/access_tokens_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe AccessTokensHelper do
+RSpec.describe AccessTokensHelper, feature_category: :system_access do
   describe "#scope_description" do
     using RSpec::Parameterized::TableSyntax
 
@@ -72,6 +72,16 @@ RSpec.describe AccessTokensHelper do
         min_date: 1.day.from_now.iso8601
       })
     end
+
+    context 'when require_personal_access_token_expiry is true' do
+      before do
+        stub_application_setting(require_personal_access_token_expiry: false)
+      end
+
+      it 'returns an empty hash' do
+        expect(helper.expires_at_field_data).to eq({})
+      end
+    end
   end
 
   describe '#show_token_expiration_banner?' do
diff --git a/spec/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id_spec.rb
new file mode 100644
index 00000000000..e79b373fca1
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_vulnerability_occurrence_pipelines_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillVulnerabilityOccurrencePipelinesProjectId,
+  feature_category: :vulnerability_management,
+  schema: 20240730172815 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :vulnerability_occurrence_pipelines }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :vulnerability_occurrences }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :occurrence_id }
+  end
+end
diff --git a/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb b/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
index d29bb4e2f78..206a3492a81 100644
--- a/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
+++ b/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
@@ -35,7 +35,8 @@ RSpec.describe 'cross-database foreign keys' do
       'sbom_occurrences.component_id',                        # https://gitlab.com/gitlab-org/gitlab/-/issues/469535
       'sbom_occurrences.source_id',                           # https://gitlab.com/groups/gitlab-org/-/epics/14116#identified-cross-joins
       'sbom_occurrences.source_package_id',                   # https://gitlab.com/groups/gitlab-org/-/epics/14116#identified-cross-joins
-      'vulnerability_export_parts.vulnerability_export_id'    # https://gitlab.com/groups/gitlab-org/-/epics/14197#cross-db-issues-to-be-resolved
+      'vulnerability_export_parts.vulnerability_export_id',   # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
+      'vulnerability_flags.vulnerability_occurrence_id'       # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
     ]
   end
 
diff --git a/spec/lib/gitlab/fp/settings/env_var_override_processor_spec.rb b/spec/lib/gitlab/fp/settings/env_var_override_processor_spec.rb
index 0a66bd61651..38f957ee1fd 100644
--- a/spec/lib/gitlab/fp/settings/env_var_override_processor_spec.rb
+++ b/spec/lib/gitlab/fp/settings/env_var_override_processor_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe Gitlab::Fp::Settings::EnvVarOverrideProcessor, feature_category:
   let(:env_var_prefix) { "THE_PREFIX" }
   let(:env_var_failed_message_class) { Class.new(Gitlab::Fp::Message) }
   let(:env_var_name) { "#{env_var_prefix}_#{setting_name.upcase}" }
+  let(:rails_env_is_production) { false }
   let(:context) do
     {
       settings: {
@@ -32,6 +33,7 @@ RSpec.describe Gitlab::Fp::Settings::EnvVarOverrideProcessor, feature_category:
   before do
     allow(ENV).to receive(:[]).and_call_original
     allow(ENV).to receive(:[]).with(env_var_name) { env_var_value }
+    allow(Rails).to receive_message_chain(:env, :production?) { rails_env_is_production }
   end
 
   context "when an ENV var overrides a default setting" do
@@ -204,4 +206,12 @@ RSpec.describe Gitlab::Fp::Settings::EnvVarOverrideProcessor, feature_category:
       )
     end
   end
+
+  context "when Rails env is production" do
+    let(:rails_env_is_production) { true }
+
+    it 'does not change any context' do
+      expect(result).to eq Gitlab::Fp::Result.ok(context)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric_spec.rb
new file mode 100644
index 00000000000..1d90302ad06
--- /dev/null
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/issues_with_alert_management_alerts_metric_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::Metrics::Instrumentations::IssuesWithAlertManagementAlertsMetric, feature_category: :incident_management do
+  let_it_be(:issue) { create(:issue) }
+  let_it_be(:alert_issue) { create(:alert_management_alert, :with_incident) }
+
+  let(:expected_value) { 1 }
+  let(:expected_query) do
+    'SELECT COUNT("issues"."id") FROM "issues" ' \
+      'INNER JOIN "alert_management_alerts" ' \
+      'ON "alert_management_alerts"."issue_id" = "issues"."id"'
+  end
+
+  it_behaves_like 'a correct instrumented metric value and query', { time_frame: 'all' }
+end
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index f43e49bd616..afd459a95e5 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -496,7 +496,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures, feature_category: :servic
       expect(count_data[:issues_using_zoom_quick_actions]).to eq(3)
       expect(count_data[:issues_with_embedded_grafana_charts_approx]).to eq(2)
       expect(count_data[:incident_issues]).to eq(4)
-      expect(count_data[:issues_created_from_alerts]).to eq(2)
       expect(count_data[:alert_bot_incident_issues]).to eq(4)
       expect(count_data[:clusters_enabled]).to eq(6)
       expect(count_data[:project_clusters_enabled]).to eq(4)
diff --git a/spec/lib/remote_development/settings/settings_integration_spec.rb b/spec/lib/remote_development/settings/settings_integration_spec.rb
index 32ecd22a1bc..f2a31add21d 100644
--- a/spec/lib/remote_development/settings/settings_integration_spec.rb
+++ b/spec/lib/remote_development/settings/settings_integration_spec.rb
@@ -27,6 +27,17 @@ RSpec.describe ::RemoteDevelopment::Settings, feature_category: :remote_developm
     end
   end
 
+  context "when there is an env var override and production env" do
+    before do
+      stub_env("GITLAB_REMOTE_DEVELOPMENT_MAX_HOURS_BEFORE_TERMINATION_LIMIT", "42")
+      allow(Rails).to receive_message_chain(:env, :production?) { true }
+    end
+
+    it "does not use the env var override value and use default value" do
+      expect(settings_module.get_single_setting(:max_hours_before_termination_limit)).to eq(120)
+    end
+  end
+
   context "when there is and ENV var override and also a ::Gitlab::CurrentSettings override" do
     let(:override_value_from_env) { "value_from_env" }
     let(:override_value_from_current_settings) { "value_from_current_settings" }
diff --git a/spec/migrations/20240613154933_queue_backfill_vulnerability_flags_project_id_spec.rb b/spec/migrations/20240613154933_queue_backfill_vulnerability_flags_project_id_spec.rb
index 2600dabf78b..927d58e9bfa 100644
--- a/spec/migrations/20240613154933_queue_backfill_vulnerability_flags_project_id_spec.rb
+++ b/spec/migrations/20240613154933_queue_backfill_vulnerability_flags_project_id_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe QueueBackfillVulnerabilityFlagsProjectId, feature_category: :vuln
           interval: described_class::DELAY_INTERVAL,
           batch_size: described_class::BATCH_SIZE,
           sub_batch_size: described_class::SUB_BATCH_SIZE,
-          gitlab_schema: :gitlab_main_cell,
+          gitlab_schema: :gitlab_sec,
           job_arguments: [
             :project_id,
             :vulnerability_occurrences,
diff --git a/spec/migrations/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id_spec.rb b/spec/migrations/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id_spec.rb
new file mode 100644
index 00000000000..66e354321aa
--- /dev/null
+++ b/spec/migrations/20240730172818_queue_backfill_vulnerability_occurrence_pipelines_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillVulnerabilityOccurrencePipelinesProjectId, feature_category: :vulnerability_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :vulnerability_occurrence_pipelines,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :project_id,
+            :vulnerability_occurrences,
+            :project_id,
+            :occurrence_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/models/personal_access_token_spec.rb b/spec/models/personal_access_token_spec.rb
index 384bf40b0be..5243fa09473 100644
--- a/spec/models/personal_access_token_spec.rb
+++ b/spec/models/personal_access_token_spec.rb
@@ -290,6 +290,18 @@ RSpec.describe PersonalAccessToken, feature_category: :system_access do
           )
         end
       end
+
+      context 'when application settings does not enforce expiry' do
+        before do
+          stub_application_setting(require_personal_access_token_expiry: false)
+        end
+
+        it 'is valid' do
+          personal_access_token.expires_at = nil
+
+          expect(personal_access_token).to be_valid
+        end
+      end
     end
   end
 
diff --git a/spec/requests/api/markdown_uploads_spec.rb b/spec/requests/api/markdown_uploads_spec.rb
index 0f373ca60fa..ce49a9a7c42 100644
--- a/spec/requests/api/markdown_uploads_spec.rb
+++ b/spec/requests/api/markdown_uploads_spec.rb
@@ -57,6 +57,7 @@ RSpec.describe API::MarkdownUploads, feature_category: :team_planning do
       post api(path, user), params: { file: file }
 
       expect(response).to have_gitlab_http_status(:created)
+      expect(json_response['id']).to eq(Upload.last.id)
       expect(json_response['alt']).to eq("dk")
       expect(json_response['url']).to start_with("/uploads/")
       expect(json_response['url']).to end_with("/dk.png")
diff --git a/spec/requests/api/personal_access_tokens_spec.rb b/spec/requests/api/personal_access_tokens_spec.rb
index 944529fd6c1..52001ef0dea 100644
--- a/spec/requests/api/personal_access_tokens_spec.rb
+++ b/spec/requests/api/personal_access_tokens_spec.rb
@@ -473,6 +473,22 @@ RSpec.describe API::PersonalAccessTokens, :aggregate_failures, feature_category:
       end
     end
 
+    context 'when require_token_expiry is false' do
+      before do
+        stub_application_setting(require_personal_access_token_expiry: false)
+      end
+
+      context 'when expiry is not defined' do
+        it "rotates user's own token with no expiration", :freeze_time do
+          post(api(path, token.user))
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['token']).not_to eq(token.token)
+          expect(json_response['expires_at']).to be_nil
+        end
+      end
+    end
+
     context 'without permission' do
       it 'returns an error message' do
         another_user = create(:user)
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 7e45dfa57da..f5b08c4438d 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -99,6 +99,7 @@ RSpec.describe API::Settings, 'Settings', :do_not_mock_admin_mode_setting, featu
       expect(json_response['concurrent_github_import_jobs_limit']).to eq(1000)
       expect(json_response['concurrent_bitbucket_import_jobs_limit']).to eq(100)
       expect(json_response['concurrent_bitbucket_server_import_jobs_limit']).to eq(100)
+      expect(json_response['require_personal_access_token_expiry']).to eq(true)
     end
   end
 
@@ -224,7 +225,8 @@ RSpec.describe API::Settings, 'Settings', :do_not_mock_admin_mode_setting, featu
             downstream_pipeline_trigger_limit_per_project_user_sha: 300,
             concurrent_github_import_jobs_limit: 2,
             concurrent_bitbucket_import_jobs_limit: 2,
-            concurrent_bitbucket_server_import_jobs_limit: 2
+            concurrent_bitbucket_server_import_jobs_limit: 2,
+            require_personal_access_token_expiry: false
           }
 
         expect(response).to have_gitlab_http_status(:ok)
@@ -314,6 +316,7 @@ RSpec.describe API::Settings, 'Settings', :do_not_mock_admin_mode_setting, featu
         expect(json_response['concurrent_github_import_jobs_limit']).to be(2)
         expect(json_response['concurrent_bitbucket_import_jobs_limit']).to be(2)
         expect(json_response['concurrent_bitbucket_server_import_jobs_limit']).to be(2)
+        expect(json_response['require_personal_access_token_expiry']).to be(false)
       end
     end
 
diff --git a/spec/services/bulk_imports/file_download_service_spec.rb b/spec/services/bulk_imports/file_download_service_spec.rb
index d5f4d90d1df..854b9aa43a2 100644
--- a/spec/services/bulk_imports/file_download_service_spec.rb
+++ b/spec/services/bulk_imports/file_download_service_spec.rb
@@ -356,24 +356,34 @@ RSpec.describe BulkImports::FileDownloadService, feature_category: :importers do
     end
 
     context 'when logging a chunk context' do
+      using RSpec::Parameterized::TableSyntax
+
       let(:file_size_limit) { 1 }
       let(:import_logger) { instance_double(BulkImports::Logger) }
-      let(:chunk_content) { "\x8d\x21\x3f\xad\x76" }
 
       before do
         allow(BulkImports::Logger).to receive(:build).and_return(import_logger)
         allow(import_logger).to receive(:warn)
       end
 
-      it 'scrubs non-utf characters from the chunk' do
-        expect(import_logger).to receive(:warn).once.with(
-          a_hash_including(last_chunk_context: "�!?�v")
-        )
+      where(:input, :output) do
+        String.new("\x8d\x21\x3f\xad\x76", encoding: 'UTF-8') | "�!?�v"
+        String.new("\x1F\x8B\b\x00\x1F", encoding: 'ASCII-8BIT') | "\u001F�\b\u0000\u001F"
+      end
 
-        expect { service.execute }.to raise_error(
-          described_class::ServiceError,
-          'File size 100 B exceeds limit of 1 B'
-        )
+      with_them do
+        let(:chunk_content) { input }
+
+        it 'scrubs non-printable characters from the chunk' do
+          expect(import_logger).to receive(:warn).once.with(
+            a_hash_including(last_chunk_context: output)
+          )
+
+          expect { service.execute }.to raise_error(
+            described_class::ServiceError,
+            'File size 100 B exceeds limit of 1 B'
+          )
+        end
       end
     end
   end
diff --git a/spec/services/personal_access_tokens/create_service_spec.rb b/spec/services/personal_access_tokens/create_service_spec.rb
index 621211bc883..e2699db7862 100644
--- a/spec/services/personal_access_tokens/create_service_spec.rb
+++ b/spec/services/personal_access_tokens/create_service_spec.rb
@@ -72,6 +72,16 @@ RSpec.describe PersonalAccessTokens::CreateService, feature_category: :system_ac
       let(:service) { described_class.new(current_user: user, target_user: user, params: params) }
 
       it { expect(subject.payload[:personal_access_token].expires_at).to eq PersonalAccessToken::MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS.days.from_now.to_date }
+
+      context 'when require_personal_access_token_expiry is set to false' do
+        before do
+          stub_application_setting(require_personal_access_token_expiry: false)
+        end
+
+        it 'returns a nil expiration date' do
+          expect(subject.payload[:personal_access_token].expires_at).to be_nil
+        end
+      end
     end
 
     context 'when invalid scope' do
diff --git a/spec/services/resource_access_tokens/create_service_spec.rb b/spec/services/resource_access_tokens/create_service_spec.rb
index a8857f0dfbf..35323d8ef46 100644
--- a/spec/services/resource_access_tokens/create_service_spec.rb
+++ b/spec/services/resource_access_tokens/create_service_spec.rb
@@ -224,6 +224,19 @@ RSpec.describe ResourceAccessTokens::CreateService, feature_category: :system_ac
                 )
               end
             end
+
+            context 'when require_personal_access_token_expiry is set to false' do
+              before do
+                stub_application_setting(require_personal_access_token_expiry: false)
+              end
+
+              it 'returns a nil expiration date' do
+                response = subject
+                access_token = response.payload[:access_token]
+
+                expect(access_token.expires_at).to be_nil
+              end
+            end
           end
 
           context 'when user provides expiration value' do
diff --git a/spec/support/helpers/value_streams_dashboard_helpers.rb b/spec/support/helpers/value_streams_dashboard_helpers.rb
index 1e25de922b4..6b050de1d99 100644
--- a/spec/support/helpers/value_streams_dashboard_helpers.rb
+++ b/spec/support/helpers/value_streams_dashboard_helpers.rb
@@ -62,6 +62,24 @@ module ValueStreamsDashboardHelpers
     end
   end
 
+  def expected_usage_overview_metrics(is_project: false)
+    supported_project_usage_metrics = [
+      ['issues', _('Issues'), '1,500'],
+      ['merge_requests', _('Merge requests'), '1,000'],
+      ['pipelines', _('Pipelines'), '2,000']
+    ]
+
+    if is_project
+      supported_project_usage_metrics
+    else
+      [
+        ['groups', _('Groups'), '5'],
+        ['projects', _('Projects'), '10'],
+        ['users', _('Users'), '100']
+      ].concat(supported_project_usage_metrics)
+    end
+  end
+
   def create_mock_dora_performers_score_metrics(group)
     [
       [nil, 'high', 'high', 'high'],
diff --git a/spec/support/shared_examples/config/metrics/every_metric_definition_shared_examples.rb b/spec/support/shared_examples/config/metrics/every_metric_definition_shared_examples.rb
index 811c31cdd7d..5242d2bc2be 100644
--- a/spec/support/shared_examples/config/metrics/every_metric_definition_shared_examples.rb
+++ b/spec/support/shared_examples/config/metrics/every_metric_definition_shared_examples.rb
@@ -127,8 +127,7 @@ RSpec.shared_examples 'every metric definition' do
     end
 
     let(:ignored_classes) do
-      Gitlab::Usage::Metrics::Instrumentations::IssuesCreatedFromAlertsMetric::ISSUES_FROM_ALERTS_METRICS +
-        Gitlab::Usage::Metrics::Instrumentations::UniqueUsersAllImportsMetric::IMPORTS_METRICS
+      Gitlab::Usage::Metrics::Instrumentations::UniqueUsersAllImportsMetric::IMPORTS_METRICS
     end
 
     def assert_uses_all_nested_classes(parent_module)
diff --git a/spec/support/shared_examples/features/value_streams_dashboard_shared_examples.rb b/spec/support/shared_examples/features/value_streams_dashboard_shared_examples.rb
index 0464cc291b3..fc47c4fb97a 100644
--- a/spec/support/shared_examples/features/value_streams_dashboard_shared_examples.rb
+++ b/spec/support/shared_examples/features/value_streams_dashboard_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples 'renders usage overview metrics' do |has_data: true|
+RSpec.shared_examples 'renders usage overview metrics' do
   let(:usage_overview) { find_by_testid('panel-usage-overview') }
 
   it 'renders the metrics panel' do
@@ -10,14 +10,7 @@ RSpec.shared_examples 'renders usage overview metrics' do |has_data: true|
 
   it 'renders each of the available metrics' do
     within usage_overview do
-      [
-        ['groups', _('Groups'), has_data ? '5' : '-'],
-        ['projects', _('Projects'), has_data ? '10' : '-'],
-        ['users', _('Users'), has_data ? '100' : '-'],
-        ['issues', _('Issues'), has_data ? '1,500' : '-'],
-        ['merge_requests', _('Merge requests'), has_data ? '1,000' : '-'],
-        ['pipelines', _('Pipelines'), has_data ? '2,000' : '-']
-      ].each do |id, name, value|
+      usage_overview_metrics.each do |id, name, value|
         stat = find_by_testid("usage-overview-metric-#{id}")
         expect(stat).to be_visible
         expect(stat).to have_content name
diff --git a/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb
index 17d71de4730..5ebdcf6d605 100644
--- a/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/background_migration/backfill_desired_sharding_key_shared_examples.rb
@@ -5,6 +5,17 @@ RSpec.shared_examples 'desired sharding key backfill job' do
   let!(:starting_id) { table(batch_table).pluck(:id).min }
   let!(:end_id) { table(batch_table).pluck(:id).max }
 
+  # https://gitlab.com/groups/gitlab-org/-/epics/14116#identified-cross-joins
+  # https://gitlab.com/groups/gitlab-org/-/epics/14197#cross-db-issues-to-be-resolved
+  let(:known_crossjoins) do
+    %i[
+      sbom_occurrences_vulnerabilities
+      vulnerability_finding_signatures
+      vulnerability_finding_evidences
+      vulnerability_flags
+    ]
+  end
+
   let!(:migration) do
     described_class.new(
       start_id: starting_id,
@@ -30,6 +41,16 @@ RSpec.shared_examples 'desired sharding key backfill job' do
   it 'constructs a valid query' do
     query = migration.construct_query(sub_batch: table(batch_table).all)
 
-    expect { connection.execute(query) }.not_to raise_error
+    expect do
+      if known_crossjoins.include?(batch_table)
+        ::Gitlab::Database.allow_cross_joins_across_databases(
+          url: 'https://gitlab.com/groups/gitlab-org/-/epics/14197#cross-db-issues-to-be-resolved'
+        ) do
+          connection.execute(query)
+        end
+      else
+        connection.execute(query)
+      end
+    end.not_to raise_error
   end
 end