From dcf94a820d2e245bbaab3626a855e2f91a5db6df Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 Aug 2024 00:07:26 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 GITLAB_KAS_VERSION                            |   2 +-
 app/assets/javascripts/editor/schema/ci.json  |   5 +-
 .../javascripts/ide/init_gitlab_web_ide.js    |   2 +
 .../lib/gitlab_web_ide/handle_update_url.js   |  28 +++++
 .../ide/lib/gitlab_web_ide/index.js           |   1 +
 .../components/app.vue                        |   2 +-
 .../global_search_autocomplete_items.vue      |   2 +-
 .../components/create_work_item.vue           |   6 +-
 .../design_management/design_item.vue         |  16 +--
 .../design_management_widget.vue              |   4 +-
 .../design_notes/design_discussion.vue        |   6 +-
 .../design_notes/design_note.vue              |   6 +-
 .../design_notes/toggle_replies_widget.vue    |   4 +-
 .../design_preview/close_button.vue           |   2 +-
 .../design_preview/design_description.vue     |   4 +-
 .../design_preview/design_details.vue         |  10 +-
 .../design_preview/design_navigation.vue      |   4 +-
 .../design_preview/design_presentation.vue    |   4 +-
 .../design_preview/design_sidebar.vue         |   4 +-
 .../design_preview/design_toolbar.vue         |  18 +--
 .../design_preview/image.vue                  |   4 +-
 .../design_version_dropdown.vue               |   2 +-
 .../work_items/components/item_title.vue      |   6 +-
 .../components/notes/system_note.vue          |  12 +-
 .../notes/work_item_activity_sort_filter.vue  |   2 +-
 .../components/notes/work_item_add_note.vue   |   8 +-
 .../notes/work_item_comment_form.vue          |   6 +-
 .../notes/work_item_comment_locked.vue        |   2 +-
 .../work_item_history_only_filter_note.vue    |   2 +-
 .../components/notes/work_item_note.vue       |   2 +-
 .../notes/work_item_note_signed_out.vue       |   2 +-
 .../notes/work_item_notes_activity_header.vue |   8 +-
 .../shared/work_item_link_child_contents.vue  |  18 +--
 .../shared/work_item_link_child_metadata.vue  |   8 +-
 .../shared/work_item_more_actions.vue         |   7 +-
 .../work_item_sidebar_dropdown_widget.vue     |  12 +-
 .../shared/work_item_token_input.vue          |  12 +-
 .../work_items/components/widget_wrapper.vue  |   6 +-
 .../components/work_item_actions.vue          |   6 +-
 .../disclosure_hierarchy.vue                  |  12 +-
 .../disclosure_hierarchy_item.vue             |   8 +-
 .../components/work_item_assignees.vue        |  10 +-
 .../work_item_attributes_wrapper.vue          |  12 +-
 .../components/work_item_created_updated.vue  |   4 +-
 .../components/work_item_crm_contacts.vue     |   4 +-
 .../components/work_item_description.vue      |   2 +-
 .../work_item_description_rendered.vue        |   4 +-
 .../components/work_item_detail.vue           |   4 +-
 .../components/work_item_detail_modal.vue     |   4 +-
 .../work_item_development.vue                 |   8 +-
 .../work_item_development_mr_item.vue         |   4 +-
 ...ork_item_development_relationship_list.vue |   2 +-
 .../components/work_item_drawer.vue           |   6 +-
 .../components/work_item_due_date.vue         |  21 ++--
 .../components/work_item_labels.vue           |   8 +-
 .../work_item_children_wrapper.vue            |   2 +-
 .../work_item_links/work_item_link_child.vue  |   8 +-
 .../work_item_links/work_item_links_form.vue  |   6 +-
 .../work_item_projects_listbox.vue            |   2 +-
 .../work_item_links/work_item_tree.vue        |   4 +-
 .../components/work_item_milestone.vue        |   2 +-
 .../work_items/components/work_item_notes.vue |   2 +-
 .../components/work_item_parent.vue           |   2 +-
 .../work_item_add_relationship_form.vue       |   2 +-
 .../work_item_relationship_list.vue           |   4 +-
 .../work_item_relationships.vue               |   4 +-
 .../components/work_item_sticky_header.vue    |   6 +-
 .../components/work_item_time_tracking.vue    |  21 ++--
 .../work_items/components/work_item_title.vue |   2 +-
 .../stylesheets/page_bundles/work_items.scss  | 113 +-----------------
 app/graphql/types/project_type.rb             |   2 +-
 app/views/dashboard/merge_requests.html.haml  |   4 +-
 ...ion_policy_rule_schedules_namespace_id.yml |   9 ++
 ...ation_policy_rule_schedules_project_id.yml |   9 ++
 ...ty_orchestration_policy_rule_schedules.yml |   3 +
 ...ity_orchestration_policy_rule_schedules.rb |   9 ++
 ...ity_orchestration_policy_rule_schedules.rb |   9 ++
 ...ion_policy_rule_schedules_on_project_id.rb |  16 +++
 ...ion_policy_rule_schedules_project_id_fk.rb |  17 +++
 ...olicy_rule_schedules_project_id_trigger.rb |  25 ++++
 ...ration_policy_rule_schedules_project_id.rb |  40 +++++++
 ...n_policy_rule_schedules_on_namespace_id.rb |  16 +++
 ...n_policy_rule_schedules_namespace_id_fk.rb |  17 +++
 ...icy_rule_schedules_namespace_id_trigger.rb |  25 ++++
 ...tion_policy_rule_schedules_namespace_id.rb |  40 +++++++
 db/schema_migrations/20240816130535           |   1 +
 db/schema_migrations/20240816130536           |   1 +
 db/schema_migrations/20240816130537           |   1 +
 db/schema_migrations/20240816130538           |   1 +
 db/schema_migrations/20240816130539           |   1 +
 db/schema_migrations/20240816130540           |   1 +
 db/schema_migrations/20240816130541           |   1 +
 db/schema_migrations/20240816130542           |   1 +
 db/schema_migrations/20240816130543           |   1 +
 db/schema_migrations/20240816130544           |   1 +
 db/structure.sql                              |  48 ++++++++
 doc/api/graphql/reference/index.md            |   2 +-
 .../merge_requests/duo_in_merge_requests.md   |   1 +
 .../project/repository/monorepos/index.md     |  20 +++-
 ...tion_policy_rule_schedules_namespace_id.rb |  10 ++
 ...ration_policy_rule_schedules_project_id.rb |  10 ++
 locale/gitlab.pot                             |   4 +-
 package.json                                  |   2 +-
 ...ab+web-ide+0.0.1-dev-20240816130114.patch} |   0
 spec/frontend/ide/init_gitlab_web_ide_spec.js |   3 +-
 .../gitlab_web_ide/handle_update_url_spec.js  |  58 +++++++++
 .../global_search_autocomplete_items_spec.js  |   2 +-
 .../__snapshots__/design_item_spec.js.snap    |  12 +-
 .../work_item_relationship_list_spec.js.snap  |   4 +-
 ...policy_rule_schedules_namespace_id_spec.rb |  15 +++
 ...n_policy_rule_schedules_project_id_spec.rb |  15 +++
 ...n_policy_rule_schedules_project_id_spec.rb |  33 +++++
 ...policy_rule_schedules_namespace_id_spec.rb |  33 +++++
 yarn.lock                                     |   8 +-
 114 files changed, 746 insertions(+), 333 deletions(-)
 create mode 100644 app/assets/javascripts/ide/lib/gitlab_web_ide/handle_update_url.js
 create mode 100644 db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_namespace_id.yml
 create mode 100644 db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_project_id.yml
 create mode 100644 db/migrate/20240816130535_add_project_id_to_security_orchestration_policy_rule_schedules.rb
 create mode 100644 db/migrate/20240816130540_add_namespace_id_to_security_orchestration_policy_rule_schedules.rb
 create mode 100644 db/post_migrate/20240816130536_index_security_orchestration_policy_rule_schedules_on_project_id.rb
 create mode 100644 db/post_migrate/20240816130537_add_security_orchestration_policy_rule_schedules_project_id_fk.rb
 create mode 100644 db/post_migrate/20240816130538_add_security_orchestration_policy_rule_schedules_project_id_trigger.rb
 create mode 100644 db/post_migrate/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id.rb
 create mode 100644 db/post_migrate/20240816130541_index_security_orchestration_policy_rule_schedules_on_namespace_id.rb
 create mode 100644 db/post_migrate/20240816130542_add_security_orchestration_policy_rule_schedules_namespace_id_fk.rb
 create mode 100644 db/post_migrate/20240816130543_add_security_orchestration_policy_rule_schedules_namespace_id_trigger.rb
 create mode 100644 db/post_migrate/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id.rb
 create mode 100644 db/schema_migrations/20240816130535
 create mode 100644 db/schema_migrations/20240816130536
 create mode 100644 db/schema_migrations/20240816130537
 create mode 100644 db/schema_migrations/20240816130538
 create mode 100644 db/schema_migrations/20240816130539
 create mode 100644 db/schema_migrations/20240816130540
 create mode 100644 db/schema_migrations/20240816130541
 create mode 100644 db/schema_migrations/20240816130542
 create mode 100644 db/schema_migrations/20240816130543
 create mode 100644 db/schema_migrations/20240816130544
 create mode 100644 lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id.rb
 create mode 100644 lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id.rb
 rename patches/{@gitlab+web-ide+0.0.1-dev-20240813211849.patch => @gitlab+web-ide+0.0.1-dev-20240816130114.patch} (100%)
 create mode 100644 spec/frontend/ide/lib/gitlab_web_ide/handle_update_url_spec.js
 create mode 100644 spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb
 create mode 100644 spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb
 create mode 100644 spec/migrations/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb
 create mode 100644 spec/migrations/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb

diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index 30fcc89d48f..65a154b8d3a 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-27b3a74b0ac39329e049167a7a1d7109c344f441
+1a16fa05c2645a0abba4e2f028e1fdbe5d85be2f
diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json
index 676c9fc0824..78a47f46887 100644
--- a/app/assets/javascripts/editor/schema/ci.json
+++ b/app/assets/javascripts/editor/schema/ci.json
@@ -256,7 +256,7 @@
         },
         "reports": {
           "type": "object",
-          "markdownDescription": "Reports will be uploaded as artifacts, and often displayed in the Gitlab UI, such as in Merge Requests. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#artifactsreports).",
+          "markdownDescription": "Reports will be uploaded as artifacts, and often displayed in the Gitlab UI, such as in merge requests. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#artifactsreports).",
           "additionalProperties": false,
           "properties": {
             "junit": {
@@ -290,7 +290,8 @@
                 "coverage_format": {
                   "description": "Code coverage format used by the test framework.",
                   "enum": [
-                    "cobertura", "jacoco"
+                    "cobertura",
+                    "jacoco"
                   ]
                 },
                 "path": {
diff --git a/app/assets/javascripts/ide/init_gitlab_web_ide.js b/app/assets/javascripts/ide/init_gitlab_web_ide.js
index 1ade6433d63..5b99a6ecb3d 100644
--- a/app/assets/javascripts/ide/init_gitlab_web_ide.js
+++ b/app/assets/javascripts/ide/init_gitlab_web_ide.js
@@ -7,6 +7,7 @@ import {
   getOAuthConfig,
   setupRootElement,
   handleTracking,
+  handleUpdateUrl,
 } from './lib/gitlab_web_ide';
 import { GITLAB_WEB_IDE_FEEDBACK_ISSUE } from './constants';
 import { renderWebIdeError } from './render_web_ide_error';
@@ -84,6 +85,7 @@ export const initGitlabWebIDE = async (el) => {
       editorFont,
       extensionsGallerySettings,
       codeSuggestionsEnabled,
+      handleContextUpdate: handleUpdateUrl,
       handleTracking,
       // See https://gitlab.com/gitlab-org/gitlab-web-ide/-/blob/main/packages/web-ide-types/src/config.ts#L86
       telemetryEnabled: Tracking.enabled(),
diff --git a/app/assets/javascripts/ide/lib/gitlab_web_ide/handle_update_url.js b/app/assets/javascripts/ide/lib/gitlab_web_ide/handle_update_url.js
new file mode 100644
index 00000000000..c27d658ce92
--- /dev/null
+++ b/app/assets/javascripts/ide/lib/gitlab_web_ide/handle_update_url.js
@@ -0,0 +1,28 @@
+import { joinPaths, webIDEUrl } from '~/lib/utils/url_utility';
+
+function withPrevious(fn) {
+  let prev;
+
+  return (arg) => {
+    fn(arg, prev);
+    prev = arg;
+  };
+}
+
+function getWebIdeUrl(projectPath, branchName) {
+  return webIDEUrl(joinPaths('/', projectPath, 'edit', branchName, '-/'));
+}
+
+export const handleUpdateUrl = withPrevious(({ projectPath, ref }, previous) => {
+  if (!previous) {
+    return;
+  }
+
+  if (previous.ref === ref) {
+    return;
+  }
+
+  const newUrl = getWebIdeUrl(projectPath, ref);
+
+  window.history.replaceState(null, '', newUrl);
+});
diff --git a/app/assets/javascripts/ide/lib/gitlab_web_ide/index.js b/app/assets/javascripts/ide/lib/gitlab_web_ide/index.js
index 87e0002c8c8..bdf0a3d2db4 100644
--- a/app/assets/javascripts/ide/lib/gitlab_web_ide/index.js
+++ b/app/assets/javascripts/ide/lib/gitlab_web_ide/index.js
@@ -2,3 +2,4 @@ export * from './get_base_config';
 export * from './get_oauth_config';
 export * from './handle_tracking_event';
 export * from './setup_root_element';
+export * from './handle_update_url';
diff --git a/app/assets/javascripts/merge_request_dashboard/components/app.vue b/app/assets/javascripts/merge_request_dashboard/components/app.vue
index 9584300db8d..7e364856ed8 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/app.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/app.vue
@@ -25,7 +25,7 @@ export default {
 <template>
   <div>
     <div class="page-title-holder gl-flex">
-      <h1 class="page-title gl-font-size-h-display">{{ __('Merge Requests') }}</h1>
+      <h1 class="page-title gl-font-size-h-display">{{ __('Merge requests') }}</h1>
     </div>
     <merge-requests-query
       v-for="(list, i) in lists"
diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue
index a37c58dfded..ee9c1c6fac7 100644
--- a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue
+++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue
@@ -51,7 +51,7 @@ export default {
     ISSUES_GROUP_TITLE,
     PAGES_GROUP_TITLE,
     GROUPS_GROUP_TITLE,
-    MERGE_REQUESTS_GROUP_TITLE: s__('GlobalSearch|Merge Requests'),
+    MERGE_REQUESTS_GROUP_TITLE: s__('GlobalSearch|Merge requests'),
     RECENT_ISSUES_GROUP_TITLE: s__('GlobalSearch|Recent issues'),
     RECENT_EPICS_GROUP_TITLE: s__('GlobalSearch|Recent epics'),
     RECENT_MERGE_REQUESTS_GROUP_TITLE: s__('GlobalSearch|Recent merge requests'),
diff --git a/app/assets/javascripts/work_items/components/create_work_item.vue b/app/assets/javascripts/work_items/components/create_work_item.vue
index 28c4a20b65b..1e2940c16ee 100644
--- a/app/assets/javascripts/work_items/components/create_work_item.vue
+++ b/app/assets/javascripts/work_items/components/create_work_item.vue
@@ -507,7 +507,7 @@ export default {
           >
             <template v-if="workItemAssignees">
               <work-item-assignees
-                class="gl-mb-5 js-assignee"
+                class="js-assignee gl-mb-5"
                 :can-update="canUpdate"
                 :full-path="fullPath"
                 :work-item-id="workItemId"
@@ -532,7 +532,7 @@ export default {
             </template>
             <template v-if="workItemLabels">
               <work-item-labels
-                class="gl-mb-5 js-labels"
+                class="js-labels gl-mb-5"
                 :can-update="canUpdate"
                 :full-path="fullPath"
                 :work-item-id="workItemId"
@@ -576,7 +576,7 @@ export default {
               />
             </template>
           </aside>
-          <div class="gl-py-3 gl-flex gl-gap-3 gl-col-start-1">
+          <div class="gl-col-start-1 gl-flex gl-gap-3 gl-py-3">
             <gl-button
               variant="confirm"
               :loading="loading"
diff --git a/app/assets/javascripts/work_items/components/design_management/design_item.vue b/app/assets/javascripts/work_items/components/design_management/design_item.vue
index 294faec2424..b6e54dc9f42 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_item.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_item.vue
@@ -133,15 +133,15 @@ export default {
       params: { iid: workItemIid, id: filename },
       query: $route.query,
     }"
-    class="card gl-cursor-pointer gl-text-default hover:gl-text-default js-design-list-item design-list-item gl-mb-0"
+    class="card js-design-list-item design-list-item gl-mb-0 gl-cursor-pointer gl-text-default hover:gl-text-default"
   >
     <div
-      class="card-body gl-p-0 gl-flex gl-items-center gl-justify-content-center gl-overflow-hidden gl-relative gl-rounded-top-base"
+      class="card-body gl-relative gl-flex gl-items-center gl-justify-center gl-overflow-hidden gl-rounded-t-base gl-p-0"
     >
       <div
         v-if="icon.name"
         data-testid="design-event"
-        class="gl-absolute gl-top-3 gl-right-3 gl-mr-1"
+        class="gl-absolute gl-right-3 gl-top-3 gl-mr-1"
       >
         <span :title="icon.tooltip" :aria-label="icon.tooltip">
           <gl-icon
@@ -170,18 +170,18 @@ export default {
           v-show="showImage"
           :src="imageLink"
           :alt="filename"
-          class="gl-block gl-mx-auto gl-max-w-full gl-max-h-full gl-w-auto design-img"
+          class="design-img gl-mx-auto gl-block gl-max-h-full gl-w-auto gl-max-w-full"
           :data-testid="`design-img-${id}`"
           @load="onImageLoad"
           @error="onImageError"
         />
       </gl-intersection-observer>
     </div>
-    <div class="card-footer gl-flex gl-w-full gl-bg-white gl-py-3 gl-px-4">
-      <div class="gl-flex gl-flex-col str-truncated-100">
+    <div class="card-footer gl-flex gl-w-full gl-bg-white gl-px-4 gl-py-3">
+      <div class="str-truncated-100 gl-flex gl-flex-col">
         <span
           v-gl-tooltip
-          class="gl-font-sm str-truncated-100"
+          class="str-truncated-100 gl-text-sm"
           :data-testid="`design-img-filename-${id}`"
           :title="filename"
           >{{ filename }}</span
@@ -192,7 +192,7 @@ export default {
       </div>
       <div v-if="notesCount" class="gl-ml-auto gl-flex gl-items-center gl-text-gray-500">
         <gl-icon name="comments" class="gl-ml-2" />
-        <span :aria-label="notesLabel" class="gl-font-sm gl-ml-2">
+        <span :aria-label="notesLabel" class="gl-ml-2 gl-text-sm">
           {{ notesCount }}
         </span>
       </div>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_management_widget.vue b/app/assets/javascripts/work_items/components/design_management/design_management_widget.vue
index 9f35a6d2f26..802ed7bacc7 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_management_widget.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_management_widget.vue
@@ -97,7 +97,7 @@ export default {
 <template>
   <widget-wrapper v-if="hasDesigns" data-testid="designs-root" :error="error">
     <template #header>
-      <span class="gl-font-bold gl-mr-3">{{ s__('DesignManagement|Designs') }}</span>
+      <span class="gl-mr-3 gl-font-bold">{{ s__('DesignManagement|Designs') }}</span>
     </template>
     <template #header-suffix>
       <design-version-dropdown :all-versions="allVersions" />
@@ -107,7 +107,7 @@ export default {
         <li
           v-for="design in designs"
           :key="design.id"
-          class="col-md-6 col-lg-3 gl-mt-5 gl-px-3 gl-bg-transparent gl-shadow-none js-design-tile"
+          class="col-md-6 col-lg-3 js-design-tile gl-mt-5 gl-bg-transparent gl-px-3 gl-shadow-none"
         >
           <design
             v-bind="design"
diff --git a/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue b/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue
index 37ca92b13eb..c5ca6d88038 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue
@@ -59,7 +59,7 @@ export default {
 <template>
   <div class="design-discussion-wrapper" @click="$emit('update-active-discussion')">
     <design-note-pin :is-resolved="discussion.resolved" :label="discussion.index" />
-    <ul class="design-discussion bordered-box gl-relative gl-p-0 gl-list-none">
+    <ul class="design-discussion bordered-box gl-relative gl-list-none gl-p-0">
       <design-note :note="firstNote">
         <template v-if="isLoggedIn && discussion.resolvable" #resolve-discussion>
           <gl-button
@@ -73,10 +73,10 @@ export default {
           />
         </template>
         <template v-if="discussion.resolved" #resolved-status>
-          <p class="gl-text-gray-500 gl-text-sm gl-m-0 gl-mt-5" data-testid="resolved-message">
+          <p class="gl-m-0 gl-mt-5 gl-text-sm gl-text-gray-500" data-testid="resolved-message">
             {{ __('Resolved by') }}
             <gl-link
-              class="gl-text-gray-500 gl-no-underline gl-text-sm link-inherit-color"
+              class="link-inherit-color gl-text-sm gl-text-gray-500 gl-no-underline"
               :href="discussion.resolvedBy.webUrl"
               target="_blank"
               >{{ discussion.resolvedBy.name }}</gl-link
diff --git a/app/assets/javascripts/work_items/components/design_management/design_notes/design_note.vue b/app/assets/javascripts/work_items/components/design_management/design_notes/design_note.vue
index 9b9aa7b7110..56524e92bb0 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_notes/design_note.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_notes/design_note.vue
@@ -67,7 +67,7 @@ export default {
       :href="author.webUrl"
       :data-user-id="authorId"
       :data-username="author.username"
-      class="gl-float-left gl-mr-3 link-inherit-color js-user-link"
+      class="link-inherit-color js-user-link gl-float-left gl-mr-3"
     >
       <gl-avatar
         :size="32"
@@ -96,7 +96,7 @@ export default {
         <span class="note-headline-light note-headline-meta">
           <span class="system-note-message"> <slot></slot> </span>
           <gl-link
-            class="note-timestamp system-note-separator gl-inline-block gl-mb-2 gl-text-sm link-inherit-color"
+            class="note-timestamp system-note-separator link-inherit-color gl-mb-2 gl-inline-block gl-text-sm"
             :href="`#note_${noteAnchorId}`"
           >
             <time-ago-tooltip :time="note.createdAt" tooltip-placement="bottom" />
@@ -104,7 +104,7 @@ export default {
           <imported-badge v-if="isImported" :importable-type="$options.TYPE_COMMENT" size="sm" />
         </span>
       </div>
-      <div class="gl-flex gl-items-start -gl-mt-2 -gl-mr-2">
+      <div class="-gl-mr-2 -gl-mt-2 gl-flex gl-items-start">
         <slot name="resolve-discussion"></slot>
       </div>
     </div>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_notes/toggle_replies_widget.vue b/app/assets/javascripts/work_items/components/design_management/design_notes/toggle_replies_widget.vue
index 02cd02466eb..df203a676f0 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_notes/toggle_replies_widget.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_notes/toggle_replies_widget.vue
@@ -50,7 +50,7 @@ export default {
 
 <template>
   <li
-    class="toggle-comments gl-bg-gray-10 gl-flex gl-items-center gl-p-3 gl-min-h-8 gl-rounded-bl-base gl-rounded-br-base"
+    class="toggle-comments gl-flex gl-min-h-8 gl-items-center gl-rounded-bl-base gl-rounded-br-base gl-bg-gray-10 gl-p-3"
     :class="{ expanded: !collapsed }"
     data-testid="toggle-comments-wrapper"
   >
@@ -71,7 +71,7 @@ export default {
         :avatar-size="24"
         badge-tooltip-prop="name"
         :badge-sr-only-text="authorCollapsedTooltip"
-        class="gl-whitespace-nowrap gl-mr-3"
+        class="gl-mr-3 gl-whitespace-nowrap"
       >
         <template #avatar="{ avatar }">
           <gl-avatar-link v-gl-tooltip :href="avatar.webUrl" :title="avatar.name">
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/close_button.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/close_button.vue
index f58b3eaeee3..ec4e36db2ef 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/close_button.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/close_button.vue
@@ -18,7 +18,7 @@ export default {
         query: $route.query,
       }"
       :aria-label="s__('DesignManagement|Go back to designs')"
-      class="btn btn-icon gl-px-3 gl-mx-3 gl-border-0"
+      class="btn btn-icon gl-mx-3 gl-border-0 gl-px-3"
     >
       <gl-icon name="close" />
     </router-link>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue
index 876e607f36e..5e64694b162 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_description.vue
@@ -21,8 +21,8 @@ export default {
 <template>
   <div class="design-description-container">
     <div class="design-description-view">
-      <div class="design-description-header gl-flex gl-justify-between gl-mb-2">
-        <h3 class="!gl-leading-20 gl-font-lg gl-m-0">
+      <div class="design-description-header gl-mb-2 gl-flex gl-justify-between">
+        <h3 class="gl-m-0 gl-text-lg !gl-leading-20">
           {{ $options.i18n.descriptionLabel }}
         </h3>
       </div>
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue
index 10168c73959..eb2e8721fe5 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_details.vue
@@ -161,9 +161,9 @@ export default {
 
 <template>
   <div
-    class="design-detail js-design-detail fixed-top gl-w-full gl-flex gl-justify-content-center gl-flex-col gl-lg-flex-direction-row gl-bg-gray-10"
+    class="design-detail js-design-detail fixed-top gl-flex gl-w-full gl-flex-col gl-justify-center gl-bg-gray-10 lg:gl-flex-row"
   >
-    <div class="gl-flex gl-overflow-hidden gl-grow gl-flex-col gl-relative">
+    <div class="gl-relative gl-flex gl-grow gl-flex-col gl-overflow-hidden">
       <design-toolbar
         :work-item-title="workItemTitle"
         :design="design"
@@ -173,10 +173,8 @@ export default {
         :all-designs="allDesigns"
         @toggle-sidebar="toggleSidebar"
       />
-      <div
-        class="gl-flex gl-overflow-hidden gl-flex-col gl-lg-flex-direction-row gl-grow gl-relative"
-      >
-        <div class="gl-flex gl-overflow-hidden gl-flex-grow-2 gl-flex-col gl-relative">
+      <div class="gl-relative gl-flex gl-grow gl-flex-col gl-overflow-hidden lg:gl-flex-row">
+        <div class="gl-relative gl-flex gl-flex-grow-2 gl-flex-col gl-overflow-hidden">
           <div v-if="errorMessage" class="gl-p-5">
             <gl-alert variant="danger" @dismiss="errorMessage = null">
               {{ errorMessage }}
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_navigation.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_navigation.vue
index 93911b38ab5..b38d9f898ad 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_navigation.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_navigation.vue
@@ -80,8 +80,8 @@ export default {
 </script>
 
 <template>
-  <div v-if="designsCount" class="gl-display-flex gl-align-items-center gl-flex-shrink-0">
-    <div class="gl-w-5 gl-mr-2 gl-text-right">{{ currentIndex + 1 }}</div>
+  <div v-if="designsCount" class="gl-flex gl-shrink-0 gl-items-center">
+    <div class="gl-mr-2 gl-w-5 gl-text-right">{{ currentIndex + 1 }}</div>
     <div>{{ paginationText }}</div>
     <gl-button-group class="gl-ml-3">
       <gl-button
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_presentation.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_presentation.vue
index cbd6c2e1795..014295d42d7 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_presentation.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_presentation.vue
@@ -296,7 +296,7 @@ export default {
 <template>
   <div
     ref="presentationViewport"
-    class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
+    class="overflow-auto gl-relative gl-h-full gl-w-full gl-p-5"
     :style="presentationStyle"
     @mousedown="onPresentationMousedown"
     @mousemove="onPresentationMousemove"
@@ -308,7 +308,7 @@ export default {
     @touchcancel="onPresentationMouseup"
   >
     <gl-loading-icon v-if="isLoading" size="xl" class="gl-flex gl-h-full gl-items-center" />
-    <div v-else class="gl-h-full gl-w-full gl-flex gl-items-center gl-relative">
+    <div v-else class="gl-relative gl-flex gl-h-full gl-w-full gl-items-center">
       <design-image
         v-if="image"
         :image="image"
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue
index 4f6f3bc9041..df6ec917353 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_sidebar.vue
@@ -72,12 +72,12 @@ export default {
   <design-disclosure :open="isOpen">
     <template #default>
       <div class="image-notes gl-h-full gl-pt-0">
-        <design-description v-if="showDescription" :design="design" class="gl-my-5 gl-border-b" />
+        <design-description v-if="showDescription" :design="design" class="gl-border-b gl-my-5" />
         <div v-if="isLoading" class="gl-my-5">
           <gl-skeleton-loader />
         </div>
         <template v-else>
-          <h3 data-testid="unresolved-discussion-count" class="!gl-leading-20 gl-text-lg gl-my-5">
+          <h3 data-testid="unresolved-discussion-count" class="gl-my-5 gl-text-lg !gl-leading-20">
             {{ unresolvedDiscussionsCount }}
           </h3>
           <gl-empty-state
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
index 8684c930f38..d1caca840a6 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
@@ -63,17 +63,17 @@ export default {
 
 <template>
   <header
-    class="gl-flex gl-flex-col md:gl-flex-row md:gl-items-center gl-justify-between gl-max-w-full gl-bg-white gl-py-4 gl-pl-5 gl-border-b js-design-header"
+    class="js-design-header gl-border-b gl-flex gl-max-w-full gl-flex-col gl-justify-between gl-bg-white gl-py-4 gl-pl-5 md:gl-flex-row md:gl-items-center"
   >
-    <div class="gl-flex gl-flex-row gl-items-center gl-mb-3 md:gl-mb-0 gl-overflow-hidden">
-      <div class="gl-overflow-hidden gl-flex gl-mr-3">
+    <div class="gl-mb-3 gl-flex gl-flex-row gl-items-center gl-overflow-hidden md:gl-mb-0">
+      <div class="gl-mr-3 gl-flex gl-overflow-hidden">
         <gl-skeleton-loader v-if="isLoading" :lines="1" />
-        <h2 v-else class="gl-flex gl-items-center gl-overflow-hidden gl-m-0 gl-text-base">
-          <span class="gl-text-truncate gl-text-gray-900 gl-no-underline">
+        <h2 v-else class="gl-m-0 gl-flex gl-items-center gl-overflow-hidden gl-text-base">
+          <span class="gl-truncate gl-text-gray-900 gl-no-underline">
             {{ workItemTitle }}
           </span>
-          <gl-icon name="chevron-right" class="gl-text-gray-200 gl-flex-shrink-0" />
-          <span class="gl-text-truncate gl-font-normal">{{ design.filename }}</span>
+          <gl-icon name="chevron-right" class="gl-shrink-0 gl-text-gray-200" />
+          <span class="gl-truncate gl-font-normal">{{ design.filename }}</span>
           <imported-badge
             v-if="design.imported"
             :importable-type="$options.TYPE_DESIGN"
@@ -81,9 +81,9 @@ export default {
           />
         </h2>
       </div>
-      <close-button class="md:gl-hidden gl-ml-auto" />
+      <close-button class="gl-ml-auto md:gl-hidden" />
     </div>
-    <div class="gl-flex md:gl-flex-row gl-flex-shrink-0 gl-md-ml-auto gl-mr-5">
+    <div class="gl-mr-5 gl-flex gl-shrink-0 md:gl-ml-auto md:gl-flex-row">
       <gl-button
         v-gl-tooltip.bottom
         category="tertiary"
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/image.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/image.vue
index 329a278ca1e..ca5c60524c1 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/image.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/image.vue
@@ -140,12 +140,12 @@ export default {
 </script>
 
 <template>
-  <div class="gl-mx-auto gl-my-auto js-design-image">
+  <div class="js-design-image gl-mx-auto gl-my-auto">
     <gl-icon v-if="imageError" class="gl-text-gray-200" name="media-broken" :size="48" />
     <img
       v-show="!imageError"
       ref="contentImg"
-      class="gl-max-h-full gl-border"
+      class="gl-border gl-max-h-full"
       :src="image"
       :alt="name"
       :style="imageStyle"
diff --git a/app/assets/javascripts/work_items/components/design_management/design_version_dropdown.vue b/app/assets/javascripts/work_items/components/design_management/design_version_dropdown.vue
index 2191e41e1c4..1ed5b839190 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_version_dropdown.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_version_dropdown.vue
@@ -119,7 +119,7 @@ export default {
         <gl-avatar :alt="getAuthorName(item.author)" :size="32" :src="getAvatarUrl(item)" />
         <span class="gl-flex gl-flex-col">
           <span class="gl-font-bold">{{ versionText(item) }}</span>
-          <span v-if="item.author" class="gl-text-gray-600 gl-mt-1">
+          <span v-if="item.author" class="gl-mt-1 gl-text-gray-600">
             <span class="gl-block">{{ getAuthorName(item.author) }}</span>
             <time-ago
               v-if="item.createdAt"
diff --git a/app/assets/javascripts/work_items/components/item_title.vue b/app/assets/javascripts/work_items/components/item_title.vue
index dbb1ce7a074..1c9f9b225a0 100644
--- a/app/assets/javascripts/work_items/components/item_title.vue
+++ b/app/assets/javascripts/work_items/components/item_title.vue
@@ -27,7 +27,7 @@ export default {
   computed: {
     headerClasses() {
       return this.useH1
-        ? 'gl-w-full gl-font-size-h-display gl-m-0!'
+        ? 'gl-w-full gl-text-size-h-display !gl-m-0'
         : 'gl-font-normal sm:gl-font-bold gl-mb-1 gl-mt-0 gl-w-full';
     },
   },
@@ -65,8 +65,8 @@ export default {
       :aria-label="__('Title')"
       :data-placeholder="placeholder"
       :contenteditable="!disabled"
-      class="hide-unfocused-input-decoration gl-px-4 gl-py-3 -gl-ml-4 gl-border gl-rounded-base gl-block"
-      :class="{ 'gl-hover-border-gray-200 gl-pseudo-placeholder': !disabled }"
+      class="hide-unfocused-input-decoration gl-border -gl-ml-4 gl-block gl-rounded-base gl-px-4 gl-py-3"
+      :class="{ 'gl-pseudo-placeholder hover:gl-border-gray-200': !disabled }"
       @paste="handlePaste"
       @blur="handleBlur"
       @keyup="handleInput"
diff --git a/app/assets/javascripts/work_items/components/notes/system_note.vue b/app/assets/javascripts/work_items/components/notes/system_note.vue
index d7a4f2906fc..0cb6894e47d 100644
--- a/app/assets/javascripts/work_items/components/notes/system_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/system_note.vue
@@ -28,7 +28,7 @@ import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item
 
 const ALLOWED_ICONS = ['issue-close'];
 const ICON_COLORS = {
-  'issue-close': 'gl-bg-blue-100! gl-text-blue-700',
+  'issue-close': '!gl-bg-blue-100 gl-text-blue-700',
 };
 
 export default {
@@ -116,11 +116,11 @@ export default {
       :class="[
         getIconColor,
         {
-          'gl-bg-gray-50 gl-text-gray-600 system-note-icon': isAllowedIcon,
-          'system-note-tiny-dot gl-bg-gray-900!': !isAllowedIcon,
+          'system-note-icon gl-bg-gray-50 gl-text-gray-600': 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"
+      class="gl-relative gl-float-left gl-flex gl-items-center gl-justify-center gl-rounded-full"
     >
       <gl-icon v-if="isAllowedIcon" :size="12" :name="note.systemNoteIconName" />
     </div>
@@ -140,7 +140,7 @@ export default {
               variant="link"
               :icon="descriptionVersionToggleIcon"
               data-testid="compare-btn"
-              class="gl-vertical-align-text-bottom gl-font-sm!"
+              class="gl-align-text-bottom !gl-text-sm"
               @click="toggleDescriptionVersion"
               >{{ __('Compare with previous version') }}</gl-button
             >
@@ -148,7 +148,7 @@ export default {
         </note-header>
       </div>
       <div class="note-body">
-        <div v-if="shouldShowDescriptionVersion" class="description-version gl-pt-3! gl-pl-4">
+        <div v-if="shouldShowDescriptionVersion" class="description-version !gl-pt-3 gl-pl-4">
           <pre v-if="isLoadingDescriptionVersion" class="loading-state">
             <gl-skeleton-loader />
           </pre>
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue b/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue
index 3c687c6323b..5eee520d87c 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue
@@ -85,7 +85,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-inline-block gl-align-bottom">
+  <div class="gl-inline-block gl-align-bottom">
     <local-storage-sync
       :value="sortFilterProp"
       :storage-key="storageKey"
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
index f274007469b..b5fc13a3ba8 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
@@ -166,12 +166,12 @@ export default {
     timelineContentClass() {
       return {
         'timeline-content': true,
-        'gl-border-0! gl-pl-0!': !this.addPadding,
+        '!gl-border-0 !gl-pl-0': !this.addPadding,
       };
     },
     parentClass() {
       return {
-        'gl-relative gl-display-flex gl-align-items-flex-start gl-flex-nowrap': !this.isEditing,
+        'gl-relative gl-flex gl-items-start gl-flex-nowrap': !this.isEditing,
       };
     },
     isProjectArchived() {
@@ -190,9 +190,9 @@ export default {
       return {
         'timeline-entry note-form': this.isNewDiscussion,
         // eslint-disable-next-line @gitlab/require-i18n-strings
-        'note note-wrapper note-comment discussion-reply-holder gl-border-t-0! clearfix':
+        'note note-wrapper note-comment discussion-reply-holder !gl-border-t-0 clearfix':
           !this.isNewDiscussion,
-        'gl-pt-0! is-replying': this.isEditing,
+        '!gl-pt-0 is-replying': this.isEditing,
         'internal-note': this.isInternalThread,
       };
     },
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
index 3691ae83742..3b2fb785add 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
@@ -230,9 +230,9 @@ export default {
 </script>
 
 <template>
-  <div class="timeline-discussion-body gl-overflow-visible!">
-    <div class="note-body gl-p-0! gl-overflow-visible!">
-      <form class="common-note-form gfm-form js-main-target-form gl-flex-grow-1 new-note">
+  <div class="timeline-discussion-body !gl-overflow-visible">
+    <div class="note-body !gl-overflow-visible !gl-p-0">
+      <form class="common-note-form gfm-form js-main-target-form new-note gl-grow">
         <comment-field-layout
           :with-alert-container="isWorkItemConfidential"
           :noteable-data="getWorkItemData"
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue
index 9adeb3df8d8..cb98b1060c6 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue
@@ -48,7 +48,7 @@ export default {
 </script>
 
 <template>
-  <div class="issuable-note-warning gl-relative gl-py-4 gl-rounded-base">
+  <div class="issuable-note-warning gl-relative gl-rounded-base gl-py-4">
     <gl-icon name="lock" class="gl-mr-2" />
     <template v-if="isProjectArchived">
       {{ $options.constantOptions.projectArchivedWarning }}
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue
index 39ce15645cf..708b3026dc4 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue
@@ -31,7 +31,7 @@ export default {
 <template>
   <li class="timeline-entry note note-wrapper discussion-filter-note">
     <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"
     >
       <gl-icon name="comment" />
     </div>
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_note.vue
index 613ae6df2a6..9b5aff58a4b 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_note.vue
@@ -351,7 +351,7 @@ export default {
         :is-discussion-resolvable="isDiscussionResolvable"
         :has-replies="hasReplies"
         :full-path="fullPath"
-        class="gl-pl-3 gl-mt-3"
+        class="gl-mt-3 gl-pl-3"
         @cancelEditing="isEditing = false"
         @toggleResolveDiscussion="$emit('resolve')"
         @submitForm="updateNote"
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue b/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue
index e073fddeddb..bd7560a592c 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue
@@ -29,6 +29,6 @@ export default {
 <template>
   <div
     v-safe-html="signedOutText"
-    class="disabled-comment gl-text-center gl-text-secondary gl-relative"
+    class="disabled-comment gl-relative gl-text-center gl-text-secondary"
   ></div>
 </template>
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue b/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue
index 722ba898f80..b9bb1341dce 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue
@@ -44,7 +44,7 @@ export default {
   },
   computed: {
     headerClasses() {
-      return this.useH2 ? 'gl-font-size-h1 gl-m-0' : 'gl-font-base gl-m-0';
+      return this.useH2 ? 'gl-text-size-h1 gl-m-0' : 'gl-text-base gl-m-0';
     },
   },
   methods: {
@@ -65,13 +65,11 @@ export default {
 </script>
 
 <template>
-  <div
-    class="gl-display-flex gl-justify-content-space-between gl-flex-wrap gl-pb-3 gl-align-items-center"
-  >
+  <div class="gl-flex gl-flex-wrap gl-items-center gl-justify-between gl-pb-3">
     <component :is="useH2 ? 'h2' : 'h3'" :class="headerClasses">{{
       $options.i18n.activityLabel
     }}</component>
-    <div class="gl-display-flex gl-gap-3">
+    <div class="gl-flex gl-gap-3">
       <work-item-activity-sort-filter
         :work-item-type="workItemType"
         :loading="disableActivityFilterSort"
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
index 97e857df29d..84ede9f50b0 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
@@ -148,7 +148,7 @@ export default {
 
 <template>
   <div
-    class="item-body work-item-link-child gl-relative gl-display-flex gl-flex-grow-1 gl-break-words gl-hyphens-auto gl-min-w-0 gl-rounded-base gl-p-3 gl-gap-3"
+    class="item-body work-item-link-child gl-relative gl-flex gl-min-w-0 gl-grow gl-gap-3 gl-hyphens-auto gl-break-words gl-rounded-base gl-p-3"
     data-testid="links-child"
   >
     <div ref="stateIcon" class="gl-cursor-help">
@@ -157,8 +157,8 @@ export default {
         {{ childItemType }}
       </gl-tooltip>
     </div>
-    <div class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-flex-wrap gl-min-w-0">
-      <div class="gl-flex gl-justify-between gl-gap-3 gl-min-w-0 gl-mb-2">
+    <div class="gl-flex gl-min-w-0 gl-grow gl-flex-col gl-flex-wrap">
+      <div class="gl-mb-2 gl-flex gl-min-w-0 gl-justify-between gl-gap-3">
         <div class="item-title gl-min-w-0">
           <span v-if="childItem.confidential">
             <gl-icon
@@ -172,7 +172,7 @@ export default {
           </span>
           <gl-link
             :href="childItem.webUrl"
-            class="gl-break-words gl-hyphens-auto gl-font-semibold"
+            class="gl-hyphens-auto gl-break-words gl-font-semibold"
             @click.exact="$emit('click', $event)"
             @mouseover="$emit('mouseover')"
             @mouseout="$emit('mouseout')"
@@ -180,7 +180,7 @@ export default {
             {{ childItem.title }}
           </gl-link>
         </div>
-        <div class="gl-display-flex gl-justify-content-end">
+        <div class="gl-flex gl-justify-end">
           <gl-avatars-inline
             v-if="assignees.length"
             :avatars="assignees"
@@ -189,7 +189,7 @@ export default {
             :avatar-size="16"
             badge-tooltip-prop="name"
             :badge-sr-only-text="assigneesCollapsedTooltip"
-            class="gl-whitespace-nowrap gl-mr-3"
+            class="gl-mr-3 gl-whitespace-nowrap"
           >
             <template #avatar="{ avatar }">
               <gl-avatar-link v-gl-tooltip :href="avatar.webUrl" :title="avatar.name">
@@ -221,7 +221,7 @@ export default {
         :metadata-widgets="metadataWidgets"
         class="ml-xl-0"
       />
-      <div v-if="displayLabels" class="gl-display-flex gl-flex-wrap">
+      <div v-if="displayLabels" class="gl-flex gl-flex-wrap">
         <gl-label
           v-for="label in labels"
           :key="label.id"
@@ -229,7 +229,7 @@ export default {
           :background-color="label.color"
           :description="label.description"
           :scoped="showScopedLabel(label)"
-          class="gl-mt-2 gl-mr-2 gl-mb-auto"
+          class="gl-mb-auto gl-mr-2 gl-mt-2"
           tooltip-placement="top"
         />
       </div>
@@ -237,7 +237,7 @@ export default {
     <div v-if="canUpdate">
       <gl-button
         v-gl-tooltip
-        class="-gl-mt-2 -gl-mr-2"
+        class="-gl-mr-2 -gl-mt-2"
         category="tertiary"
         size="small"
         icon="close"
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_link_child_metadata.vue b/app/assets/javascripts/work_items/components/shared/work_item_link_child_metadata.vue
index 922f967e7f4..0044d0377d1 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_link_child_metadata.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_link_child_metadata.vue
@@ -36,13 +36,13 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-justify-content-space-between">
-    <div class="gl-display-flex gl-flex-wrap gl-gap-2 gl-align-items-center">
-      <span class="gl-text-secondary gl-font-sm">{{ reference }}</span>
+  <div class="gl-flex gl-justify-between">
+    <div class="gl-flex gl-flex-wrap gl-items-center gl-gap-2">
+      <span class="gl-text-sm gl-text-secondary">{{ reference }}</span>
       <item-milestone
         v-if="milestone"
         :milestone="milestone"
-        class="gl-display-flex gl-align-items-center gl-max-w-15 gl-font-sm gl-leading-normal gl-text-gray-900! gl-cursor-help! gl-text-decoration-none!"
+        class="gl-flex gl-max-w-15 !gl-cursor-help gl-items-center gl-text-sm gl-leading-normal !gl-text-gray-900 !gl-no-underline"
       />
       <slot name="left-metadata"></slot>
     </div>
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_more_actions.vue b/app/assets/javascripts/work_items/components/shared/work_item_more_actions.vue
index 71a6d99ac62..8bba13ef2c4 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_more_actions.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_more_actions.vue
@@ -104,7 +104,12 @@ export default {
         @action="$emit('toggle-show-labels')"
       >
         <template #list-item>
-          <gl-toggle :value="showLabels" :label="$options.i18n.showLabels" label-position="left" />
+          <gl-toggle
+            :value="showLabels"
+            :label="$options.i18n.showLabels"
+            class="gl-justify-between"
+            label-position="left"
+          />
         </template>
       </gl-disclosure-dropdown-item>
 
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue b/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue
index 4926934026e..01e0eb52303 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue
@@ -185,9 +185,9 @@ export default {
 
 <template>
   <div>
-    <div class="gl-display-flex gl-align-items-center gl-gap-3">
+    <div class="gl-flex gl-items-center gl-gap-3">
       <!-- hide header when editing, since we then have a form label. Keep it reachable for screenreader nav  -->
-      <h3 :class="{ 'gl-sr-only': isEditing }" class="gl-mb-0! gl-heading-5">
+      <h3 :class="{ 'gl-sr-only': isEditing }" class="gl-heading-5 !gl-mb-0">
         {{ dropdownLabel }}
       </h3>
       <gl-loading-icon v-if="updateInProgress" />
@@ -196,15 +196,15 @@ export default {
         data-testid="edit-button"
         category="tertiary"
         size="small"
-        class="gl-ml-auto shortcut-sidebar-dropdown-toggle"
+        class="shortcut-sidebar-dropdown-toggle gl-ml-auto"
         :disabled="updateInProgress"
         @click="isEditing = true"
         >{{ $options.i18n.editButtonLabel }}</gl-button
       >
     </div>
     <gl-form v-if="isEditing">
-      <div class="gl-display-flex gl-justify-content-space-between gl-align-items-center">
-        <label :for="inputId" class="gl-mb-0! gl-heading-5">{{ dropdownLabel }}</label>
+      <div class="gl-flex gl-items-center gl-justify-between">
+        <label :for="inputId" class="gl-heading-5 !gl-mb-0">{{ dropdownLabel }}</label>
         <gl-button
           data-testid="apply-button"
           category="tertiary"
@@ -245,7 +245,7 @@ export default {
             <slot name="list-item" :item="item">{{ item.text }}</slot>
           </template>
           <template v-if="showFooter" #footer>
-            <div class="gl-border-t-solid gl-border-t-1 gl-border-t-gray-200 gl-p-2!">
+            <div class="gl-border-t-1 gl-border-t-gray-200 !gl-p-2 gl-border-t-solid">
               <slot name="footer"></slot>
             </div>
           </template>
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_token_input.vue b/app/assets/javascripts/work_items/components/shared/work_item_token_input.vue
index b68a85df48c..e720f47aef1 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_token_input.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_token_input.vue
@@ -105,7 +105,7 @@ export default {
       searchStarted: false,
       error: '',
       textInputAttrs: {
-        class: 'gl-min-w-fit-content!',
+        class: '!gl-min-w-fit',
       },
     };
   },
@@ -190,7 +190,7 @@ export default {
         return input;
       }
 
-      return highlighter(`<span class="gl-text-black-normal">${input}</span>`, this.searchTerm);
+      return highlighter(`<span class="gl-text-default">${input}</span>`, this.searchTerm);
     },
     unsetError() {
       this.error = '';
@@ -220,7 +220,7 @@ export default {
       :dropdown-items="availableWorkItems"
       :loading="isLoading"
       :placeholder="$options.i18n.addInputPlaceholder"
-      menu-class="gl-dropdown-menu-wide dropdown-reduced-height gl-min-h-7!"
+      menu-class="gl-dropdown-menu-wide dropdown-reduced-height !gl-min-h-7"
       :container-class="tokenSelectorContainerClass"
       data-testid="work-item-token-select-input"
       :text-input-attrs="textInputAttrs"
@@ -234,12 +234,12 @@ export default {
     >
       <template #token-content="{ token }"> {{ token.iid }} {{ token.title }} </template>
       <template #dropdown-item-content="{ dropdownItem }">
-        <div class="gl-display-flex">
+        <div class="gl-flex">
           <div
             v-safe-html="formatResults(dropdownItem.iid)"
-            class="gl-text-secondary gl-font-sm gl-mr-4"
+            class="gl-mr-4 gl-text-sm gl-text-secondary"
           ></div>
-          <div v-safe-html="formatResults(dropdownItem.title)" class="gl-text-truncate"></div>
+          <div v-safe-html="formatResults(dropdownItem.title)" class="gl-truncate"></div>
         </div>
       </template>
       <template #no-results-content>
diff --git a/app/assets/javascripts/work_items/components/widget_wrapper.vue b/app/assets/javascripts/work_items/components/widget_wrapper.vue
index 90fa122569a..387f813bd15 100644
--- a/app/assets/javascripts/work_items/components/widget_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/widget_wrapper.vue
@@ -67,11 +67,7 @@ export default {
       <div class="gl-new-card-title-wrapper">
         <h2 class="gl-new-card-title">
           <div aria-hidden="true">
-            <gl-link
-              :id="anchorLinkId"
-              class="gl-text-decoration-none gl-hidden"
-              :href="anchorLink"
-            />
+            <gl-link :id="anchorLinkId" class="gl-hidden gl-no-underline" :href="anchorLink" />
           </div>
           <slot name="header"></slot>
         </h2>
diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue
index 8813b8e7fc8..575de918f9a 100644
--- a/app/assets/javascripts/work_items/components/work_item_actions.vue
+++ b/app/assets/javascripts/work_items/components/work_item_actions.vue
@@ -393,15 +393,15 @@ export default {
     >
       <template v-if="$options.isLoggedIn && !hideSubscribe">
         <gl-disclosure-dropdown-item
-          class="gl-display-flex gl-justify-content-end gl-w-full"
+          class="gl-flex gl-w-full gl-justify-end"
           :data-testid="$options.notificationsToggleFormTestId"
         >
           <template #list-item>
             <gl-toggle
               :value="subscribedToNotifications"
               :label="$options.i18n.notifications"
-              class="work-item-dropdown-toggle"
               label-position="left"
+              class="work-item-dropdown-toggle gl-justify-between"
               @change="toggleNotifications($event)"
             />
           </template>
@@ -483,7 +483,7 @@ export default {
           @action="handleDelete"
         >
           <template #list-item>
-            <span class="gl-text-danger gl-font-bold">{{ i18n.deleteWorkItem }}</span>
+            <span class="gl-font-bold gl-text-danger">{{ i18n.deleteWorkItem }}</span>
           </template>
         </gl-disclosure-dropdown-item>
       </template>
diff --git a/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy.vue b/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy.vue
index 1b2bf9f4494..a289a56c4fb 100644
--- a/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy.vue
+++ b/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy.vue
@@ -86,11 +86,9 @@ export default {
 <template>
   <div
     v-gl-resize-observer="handleResize"
-    class="disclosure-hierarchy gl-relative gl-display-flex gl-flex-grow-2 gl-min-w-0"
+    class="disclosure-hierarchy gl-relative gl-flex gl-min-w-0 gl-flex-grow-2"
   >
-    <ul
-      class="gl-p-0 gl-m-0 gl-relative gl-list-none gl-inline-flex gl-flex-direction-row gl-max-w-full"
-    >
+    <ul class="gl-relative gl-m-0 gl-inline-flex gl-max-w-full gl-list-none gl-flex-row gl-p-0">
       <template v-if="withEllipsis || isMobile">
         <disclosure-hierarchy-item v-if="!isMobile" :item="firstItem" :item-id="itemId(0)">
           <slot :item="firstItem" :item-id="itemId(0)"></slot>
@@ -103,15 +101,15 @@ export default {
                 class="disclosure-hierarchy-button"
                 :aria-label="ellipsisTooltipLabel"
               >
-                <gl-icon name="ellipsis_h" class="gl-ml-3 gl-text-gray-600 gl-z-200" />
+                <gl-icon name="ellipsis_h" class="gl-z-200 gl-ml-3 gl-text-gray-600" />
               </button>
             </template>
             <template #list-item="{ item }">
-              <span class="gl-display-flex">
+              <span class="gl-flex">
                 <gl-icon
                   v-if="item.icon"
                   :name="item.icon"
-                  class="gl-mr-3 gl-align-middle gl-text-gray-600 gl-flex-shrink-0"
+                  class="gl-mr-3 gl-shrink-0 gl-align-middle gl-text-gray-600"
                 />
                 {{ item.title }}
               </span>
diff --git a/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy_item.vue b/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy_item.vue
index 90af16efb20..309195192c5 100644
--- a/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy_item.vue
+++ b/app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy_item.vue
@@ -41,19 +41,19 @@ export default {
 </script>
 
 <template>
-  <li class="disclosure-hierarchy-item gl-display-flex gl-min-w-0">
+  <li class="disclosure-hierarchy-item gl-flex gl-min-w-0">
     <gl-link
       :id="itemId"
       :href="item.webUrl"
-      class="disclosure-hierarchy-button gl-text-gray-900 gl-hover-text-decoration-none gl-active-text-decoration-none!"
+      class="disclosure-hierarchy-button gl-text-gray-900 hover:gl-no-underline active:!gl-no-underline"
       :class="{ 'gl-cursor-help': item.ancestorNotAvailable }"
     >
       <gl-icon
         v-if="shouldDisplayIcon(item.icon)"
         :name="item.icon"
-        class="gl-mx-2 gl-text-gray-600 gl-flex-shrink-0"
+        class="gl-mx-2 gl-shrink-0 gl-text-gray-600"
       />
-      <span class="gl-z-200 gl-text-truncate">{{ item.title }}</span>
+      <span class="gl-z-200 gl-truncate">{{ item.title }}</span>
     </gl-link>
     <!--
       @slot Additional content to be displayed in an item.
diff --git a/app/assets/javascripts/work_items/components/work_item_assignees.vue b/app/assets/javascripts/work_items/components/work_item_assignees.vue
index d9083006a55..a0f6971bc65 100644
--- a/app/assets/javascripts/work_items/components/work_item_assignees.vue
+++ b/app/assets/javascripts/work_items/components/work_item_assignees.vue
@@ -338,23 +338,23 @@ export default {
       <sidebar-participant v-if="item" :user="item" />
     </template>
     <template v-if="canInviteMembers" #footer>
-      <gl-button category="tertiary" block class="gl-justify-content-start!">
+      <gl-button category="tertiary" block class="!gl-justify-start">
         <invite-members-trigger
           :display-text="__('Invite members')"
           trigger-element="side-nav"
           icon="plus"
           trigger-source="work-item-assignees"
-          classes="gl-hover-text-decoration-none! gl-pb-2"
+          classes="hover:!gl-no-underline gl-pb-2"
         />
       </gl-button>
     </template>
     <template #none>
-      <div class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-gap-2">
+      <div class="gl-flex gl-items-center gl-gap-2 gl-text-gray-500">
         <span>{{ __('None') }}</span>
         <template v-if="currentUser && canUpdate">
           <span>-</span>
           <gl-button variant="link" data-testid="assign-self" @click.stop="assignToCurrentUser"
-            ><span class="gl-text-gray-500 gl-hover-text-blue-800">{{
+            ><span class="gl-text-gray-500 hover:gl-text-blue-800">{{
               __('assign yourself')
             }}</span></gl-button
           >
@@ -364,7 +364,7 @@ export default {
     <template #readonly>
       <uncollapsed-assignee-list
         :users="localAssignees"
-        show-less-assignees-class="gl-hover-bg-transparent!"
+        show-less-assignees-class="hover:!gl-bg-transparent"
       />
     </template>
   </work-item-sidebar-dropdown-widget>
diff --git a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
index e2ba26b3f67..3744c23b7b9 100644
--- a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
@@ -182,7 +182,7 @@ export default {
   <div class="work-item-attributes-wrapper">
     <template v-if="workItemAssignees">
       <work-item-assignees
-        class="gl-mb-5 js-assignee"
+        class="js-assignee gl-mb-5"
         :can-update="canUpdate"
         :full-path="fullPath"
         :work-item-id="workItem.id"
@@ -209,7 +209,7 @@ export default {
     </template>
     <template v-if="workItemLabels">
       <work-item-labels
-        class="gl-mb-5 js-labels"
+        class="js-labels gl-mb-5"
         :can-update="canUpdate"
         :full-path="fullPath"
         :work-item-id="workItem.id"
@@ -247,7 +247,7 @@ export default {
     </template>
     <template v-if="workItemMilestone">
       <work-item-milestone
-        class="gl-mb-5 js-milestone"
+        class="js-milestone gl-mb-5"
         :full-path="fullPath"
         :work-item-id="workItem.id"
         :work-item-milestone="workItemMilestone.milestone"
@@ -316,7 +316,7 @@ export default {
     </template>
     <template v-if="workItemHierarchy && showParent">
       <work-item-parent
-        class="gl-mb-5 gl-pt-5 gl-border-t gl-border-gray-50"
+        class="gl-border-t gl-mb-5 gl-border-gray-50 gl-pt-5"
         :can-update="canUpdate"
         :work-item-id="workItem.id"
         :work-item-type="workItemType"
@@ -334,7 +334,7 @@ export default {
     />
     <work-item-time-tracking
       v-if="workItemTimeTracking"
-      class="gl-mb-5 gl-pt-5 gl-border-t gl-border-gray-50"
+      class="gl-border-t gl-mb-5 gl-border-gray-50 gl-pt-5"
       :can-update="canUpdate"
       :time-estimate="workItemTimeTracking.timeEstimate"
       :timelogs="workItemTimeTracking.timelogs.nodes"
@@ -345,7 +345,7 @@ export default {
     />
     <participants
       v-if="workItemParticipants.length"
-      class="gl-mb-5 gl-pt-5 gl-border-t gl-border-gray-50"
+      class="gl-border-t gl-mb-5 gl-border-gray-50 gl-pt-5"
       :participants="workItemParticipants"
     />
   </div>
diff --git a/app/assets/javascripts/work_items/components/work_item_created_updated.vue b/app/assets/javascripts/work_items/components/work_item_created_updated.vue
index 2e3ee5c115d..e94428e4e58 100644
--- a/app/assets/javascripts/work_items/components/work_item_created_updated.vue
+++ b/app/assets/javascripts/work_items/components/work_item_created_updated.vue
@@ -85,7 +85,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-mb-3 gl-text-gray-700 gl-mt-3">
+  <div class="gl-mb-3 gl-mt-3 gl-text-gray-700">
     <work-item-state-badge v-if="workItemState" :work-item-state="workItemState" />
     <gl-loading-icon v-if="updateInProgress" inline />
     <confidentiality-badge
@@ -109,7 +109,7 @@ export default {
         </template>
         <template #author>
           <gl-avatar-link
-            class="js-user-link gl-text-body gl-font-bold"
+            class="js-user-link gl-font-bold gl-text-primary"
             :title="author.name"
             :data-user-id="authorId"
             :href="author.webUrl"
diff --git a/app/assets/javascripts/work_items/components/work_item_crm_contacts.vue b/app/assets/javascripts/work_items/components/work_item_crm_contacts.vue
index d21b39bf05d..12147083388 100644
--- a/app/assets/javascripts/work_items/components/work_item_crm_contacts.vue
+++ b/app/assets/javascripts/work_items/components/work_item_crm_contacts.vue
@@ -269,13 +269,13 @@ export default {
     @updateValue="updateItems"
   >
     <template #readonly>
-      <div class="gl-gap-2 gl-mt-1">
+      <div class="gl-mt-1 gl-gap-2">
         <div
           v-for="[organizationName, contacts] in selectedOrganizations"
           :key="organizationName"
           data-testid="organization"
         >
-          <div class="gl-text-secondary gl-mt-3">{{ organizationName }}</div>
+          <div class="gl-mt-3 gl-text-secondary">{{ organizationName }}</div>
           <div
             v-for="contact in contacts"
             :id="`contact_container_${contact.id}`"
diff --git a/app/assets/javascripts/work_items/components/work_item_description.vue b/app/assets/javascripts/work_items/components/work_item_description.vue
index 66642f144f0..1ed17af881a 100644
--- a/app/assets/javascripts/work_items/components/work_item_description.vue
+++ b/app/assets/javascripts/work_items/components/work_item_description.vue
@@ -310,7 +310,7 @@ export default {
           @keydown.meta.enter="updateWorkItem"
           @keydown.ctrl.enter="updateWorkItem"
         />
-        <div class="gl-display-flex">
+        <div class="gl-flex">
           <gl-alert v-if="hasConflicts" :dismissible="false" variant="danger" class="gl-w-full">
             <p>
               {{
diff --git a/app/assets/javascripts/work_items/components/work_item_description_rendered.vue b/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
index 2466b06203a..0b45d5ed2c4 100644
--- a/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
+++ b/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
@@ -315,7 +315,7 @@ export default {
     <div
       v-else
       ref="description"
-      class="work-item-description description md gl-clearfix gl-relative"
+      class="work-item-description description md gl-relative gl-clearfix"
     >
       <div
         ref="gfm-content"
@@ -329,7 +329,7 @@ export default {
         class="description-more gl-block gl-w-full"
         data-test-id="description-read-more"
       >
-        <div class="show-all-btn gl-w-full gl-flex gl-justify-center gl-items-center">
+        <div class="show-all-btn gl-flex gl-w-full gl-items-center gl-justify-center">
           <gl-button
             variant="confirm"
             category="tertiary"
diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index aee24fdca29..1d1ba7cd1fd 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -568,7 +568,7 @@ export default {
           :svg-path="$options.noAccessSvg"
         />
         <div v-else data-testid="detail-wrapper">
-          <div class="gl-block sm:!gl-flex gl-items-start gl-flex-row gl-gap-3">
+          <div class="gl-block gl-flex-row gl-items-start gl-gap-3 sm:!gl-flex">
             <work-item-ancestors v-if="shouldShowAncestors" :work-item="workItem" class="gl-mb-1" />
             <div v-if="!error" :class="titleClassHeader" data-testid="work-item-type">
               <work-item-title
@@ -581,7 +581,7 @@ export default {
                 @error="updateError = $event"
               />
             </div>
-            <div class="gl-flex gl-self-start gl-ml-auto gl-gap-3 gl-mt-1">
+            <div class="gl-ml-auto gl-mt-1 gl-flex gl-gap-3 gl-self-start">
               <gl-button
                 v-if="shouldShowEditButton"
                 category="secondary"
diff --git a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue
index bfd10f27c7d..44835a0ec4e 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue
@@ -123,7 +123,7 @@ export default {
     hide-footer
     size="lg"
     :modal-id="$options.WORK_ITEM_DETAIL_MODAL_ID"
-    header-class="gl-p-0 gl-pb-2!"
+    header-class="gl-p-0 !gl-pb-2"
     scrollable
     :title="$options.i18n.modalTitle"
     :data-testid="$options.WORK_ITEM_DETAIL_MODAL_ID"
@@ -139,7 +139,7 @@ export default {
       :work-item-id="workItemId"
       :work-item-iid="displayedWorkItemIid"
       :modal-work-item-full-path="workItemFullPath"
-      class="gl-p-5 -gl-mt-3 gl-bg-inherit gl-isolate"
+      class="gl-isolate -gl-mt-3 gl-bg-inherit gl-p-5"
       @close="hide"
       @deleteWorkItem="deleteWorkItem"
       @update-modal="updateModal"
diff --git a/app/assets/javascripts/work_items/components/work_item_development/work_item_development.vue b/app/assets/javascripts/work_items/components/work_item_development/work_item_development.vue
index fa053faf147..ed6345f5809 100644
--- a/app/assets/javascripts/work_items/components/work_item_development/work_item_development.vue
+++ b/app/assets/javascripts/work_items/components/work_item_development/work_item_development.vue
@@ -140,17 +140,17 @@ export default {
 <template>
   <div>
     <gl-loading-icon v-if="isLoading" class="gl-my-2" />
-    <div v-if="shouldShowDevWidget" class="gl-border-t gl-border-gray-50 gl-mb-5 gl-pt-5">
-      <div class="gl-flex gl-items-center gl-gap-3 gl-justify-between">
+    <div v-if="shouldShowDevWidget" class="gl-border-t gl-mb-5 gl-border-gray-50 gl-pt-5">
+      <div class="gl-flex gl-items-center gl-justify-between gl-gap-3">
         <h3
-          class="!gl-mb-0 gl-heading-5 gl-flex gl-items-center gl-gap-2"
+          class="gl-heading-5 !gl-mb-0 gl-flex gl-items-center gl-gap-2"
           data-testid="dev-widget-label"
         >
           {{ $options.i18n.development }}
           <gl-button
             v-if="showAutoCloseInformation"
             v-gl-tooltip
-            class="hover:!gl-bg-transparent !gl-p-0"
+            class="!gl-p-0 hover:!gl-bg-transparent"
             category="tertiary"
             :title="tooltipText"
             :aria-label="tooltipText"
diff --git a/app/assets/javascripts/work_items/components/work_item_development/work_item_development_mr_item.vue b/app/assets/javascripts/work_items/components/work_item_development/work_item_development_mr_item.vue
index 1360122fbb1..658fe964c08 100644
--- a/app/assets/javascripts/work_items/components/work_item_development/work_item_development_mr_item.vue
+++ b/app/assets/javascripts/work_items/components/work_item_development/work_item_development_mr_item.vue
@@ -61,10 +61,10 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-flex gl-items-center gl-justify-between gl-gap-2 gl-mb-2">
+  <div class="gl-mb-2 gl-flex gl-items-center gl-justify-between gl-gap-2">
     <gl-link
       :href="mergeRequest.webUrl"
-      class="gfm-merge_request gl-text-gray-900 hover:gl-text-gray-900 hover:gl-underline gl-truncate"
+      class="gfm-merge_request gl-truncate gl-text-gray-900 hover:gl-text-gray-900 hover:gl-underline"
       data-reference-type="merge_request"
       :data-project-path="projectPath"
       :data-iid="mergeRequest.iid"
diff --git a/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue b/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue
index d2f479b4694..74b36e6884e 100644
--- a/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue
+++ b/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue
@@ -74,7 +74,7 @@ export default {
 </script>
 <template>
   <div>
-    <ul ref="list-body" class="gl-list-none gl-m-0 gl-p-0" data-testid="work-item-dev-items-list">
+    <ul ref="list-body" class="gl-m-0 gl-list-none gl-p-0" data-testid="work-item-dev-items-list">
       <li v-for="item in uncollapsedItems" :key="itemId(item)" class="gl-mr-3">
         <component :is="itemComponent(item)" :merge-request="itemObject(item)" />
       </li>
diff --git a/app/assets/javascripts/work_items/components/work_item_drawer.vue b/app/assets/javascripts/work_items/components/work_item_drawer.vue
index eb5599935e6..24121b2cbc7 100644
--- a/app/assets/javascripts/work_items/components/work_item_drawer.vue
+++ b/app/assets/javascripts/work_items/components/work_item_drawer.vue
@@ -73,12 +73,12 @@ export default {
     :open="open"
     data-testid="work-item-drawer"
     header-height="calc(var(--top-bar-height) + var(--performance-bar-height))"
-    class="gl-w-full gl-sm-w-40p gl-leading-reset"
+    class="gl-w-full gl-leading-reset sm:gl-w-4/10"
     @close="$emit('close')"
   >
     <template #title>
       <gl-link
-        class="gl-text-black-normal"
+        class="gl-text-default"
         :href="activeItem.webUrl"
         @click.prevent="redirectToWorkItem"
         >{{ __('Open full view') }}</gl-link
@@ -90,7 +90,7 @@ export default {
         :work-item-iid="activeItem.iid"
         :modal-work-item-full-path="activeItemFullPath"
         is-drawer
-        class="gl-pt-0! work-item-drawer"
+        class="work-item-drawer !gl-pt-0"
         @deleteWorkItem="deleteWorkItem"
         v-on="$listeners"
       />
diff --git a/app/assets/javascripts/work_items/components/work_item_due_date.vue b/app/assets/javascripts/work_items/components/work_item_due_date.vue
index 15d9fd6298b..27f80a5cafc 100644
--- a/app/assets/javascripts/work_items/components/work_item_due_date.vue
+++ b/app/assets/javascripts/work_items/components/work_item_due_date.vue
@@ -218,8 +218,8 @@ export default {
 
 <template>
   <section class="gl-pb-4" data-testid="work-item-start-due-dates">
-    <div class="gl-display-flex gl-align-items-center gl-gap-3">
-      <h3 :class="{ 'gl-sr-only': isEditing }" class="gl-mb-0! gl-heading-5">
+    <div class="gl-flex gl-items-center gl-gap-3">
+      <h3 :class="{ 'gl-sr-only': isEditing }" class="gl-heading-5 !gl-mb-0">
         {{ $options.i18n.dates }}
       </h3>
       <gl-button
@@ -234,8 +234,8 @@ export default {
       >
     </div>
     <fieldset v-if="isEditing" data-testid="datepicker-wrapper">
-      <div class="gl-display-flex gl-justify-content-space-between gl-align-items-center">
-        <legend class="gl-mb-0 gl-border-b-0 gl-font-bold gl-font-base">
+      <div class="gl-flex gl-items-center gl-justify-between">
+        <legend class="gl-mb-0 gl-border-b-0 gl-text-base gl-font-bold">
           {{ $options.i18n.dates }}
         </legend>
         <gl-button
@@ -247,12 +247,15 @@ export default {
           >{{ __('Apply') }}</gl-button
         >
       </div>
-      <div v-outside="collapseWidget" class="gl-display-flex gl-pt-2">
+      <div
+        v-outside="collapseWidget"
+        class="gl-flex gl-flex-wrap gl-gap-2 gl-pt-2 md:gl-flex-nowrap"
+      >
         <gl-form-group
           class="gl-m-0"
           :label="$options.i18n.startDate"
           :label-for="$options.startDateInputId"
-          label-class="!gl-font-normal gl-pb-2!"
+          label-class="!gl-font-normal !gl-pb-2"
         >
           <gl-datepicker
             ref="startDatePicker"
@@ -269,10 +272,10 @@ export default {
           />
         </gl-form-group>
         <gl-form-group
-          class="gl-m-0 gl-pl-3 gl-pr-2"
+          class="gl-m-0"
           :label="$options.i18n.dueDate"
           :label-for="$options.dueDateInputId"
-          label-class="!gl-font-normal gl-pb-2!"
+          label-class="!gl-font-normal !gl-pb-2"
         >
           <gl-datepicker
             v-model="dirtyDueDate"
@@ -297,7 +300,7 @@ export default {
           {{ startDateValue }}
         </span>
       </p>
-      <p class="gl-m-0 gl-pt-1 gl-pb-3">
+      <p class="gl-m-0 gl-pb-3 gl-pt-1">
         {{ $options.i18n.dueDate }}:
         <span data-testid="due-date-value" :class="{ 'gl-text-secondary': !dueDate }">
           {{ dueDateValue }}
diff --git a/app/assets/javascripts/work_items/components/work_item_labels.vue b/app/assets/javascripts/work_items/components/work_item_labels.vue
index 60839a0b753..d2efdcbc219 100644
--- a/app/assets/javascripts/work_items/components/work_item_labels.vue
+++ b/app/assets/javascripts/work_items/components/work_item_labels.vue
@@ -338,12 +338,12 @@ export default {
       <span
         :style="{ background: item.color }"
         :class="{ 'gl-border gl-border-white': isSelected(item.value) }"
-        class="gl-inline-block gl-rounded gl-mr-1 gl-w-5 gl-h-3 gl-align-middle -gl-mt-1"
+        class="gl-rounded -gl-mt-1 gl-mr-1 gl-inline-block gl-h-3 gl-w-5 gl-align-middle"
       ></span>
       {{ item.text }}
     </template>
     <template #readonly>
-      <div class="gl-flex gl-gap-2 gl-flex-wrap gl-mt-1">
+      <div class="gl-mt-1 gl-flex gl-flex-wrap gl-gap-2">
         <gl-label
           v-for="label in localLabels"
           :key="label.id"
@@ -369,7 +369,7 @@ export default {
         {{ createLabelText }}
       </gl-button>
       <gl-button
-        class="!gl-justify-start !gl-mt-2"
+        class="!gl-mt-2 !gl-justify-start"
         block
         category="tertiary"
         :href="labelsManagePath"
@@ -386,7 +386,7 @@ export default {
         :toggle-text="dropdownText"
       >
         <div
-          class="gl-text-sm gl-font-bold gl-leading-24 gl-border-b gl-pt-2 gl-pb-3 gl-pl-4 gl-mb-4"
+          class="gl-border-b gl-mb-4 gl-pb-3 gl-pl-4 gl-pt-2 gl-text-sm gl-font-bold gl-leading-24"
         >
           {{ __('Create label') }}
         </div>
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
index aab816f45f2..7b34dd85b1c 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
@@ -283,7 +283,7 @@ export default {
     v-bind="treeRootOptions"
     class="content-list"
     data-testid="child-items-container"
-    :class="{ 'gl-cursor-grab sortable-container': canReorder, 'disabled-content': disableList }"
+    :class="{ 'sortable-container gl-cursor-grab': canReorder, 'disabled-content': disableList }"
     @end="handleDragOnEnd"
   >
     <work-item-link-child
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
index ff0badcb1ad..f128a2cbabd 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
@@ -159,7 +159,7 @@ export default {
     childItemClass() {
       return {
         'gl-ml-5': !this.hasChildren,
-        'gl-ml-0!': this.hasChildren || (!this.hasIndirectChildren && this.isTopLevel),
+        '!gl-ml-0': this.hasChildren || (!this.hasIndirectChildren && this.isTopLevel),
       };
     },
   },
@@ -269,8 +269,8 @@ export default {
 </script>
 
 <template>
-  <li class="tree-item gl-p-0! gl-border-bottom-0!">
-    <div class="gl-display-flex gl-align-items-flex-start">
+  <li class="tree-item !gl-border-b-0 !gl-p-0">
+    <div class="gl-flex gl-items-start">
       <gl-button
         v-if="hasChildren"
         v-gl-tooltip.hover
@@ -280,7 +280,7 @@ export default {
         category="tertiary"
         size="small"
         :loading="isLoadingChildren && !fetchNextPageInProgress"
-        class="gl-px-0! gl-py-3!"
+        class="!gl-px-0 !gl-py-3"
         data-testid="expand-child"
         @click="toggleItem"
       />
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
index 8ae042c3d62..d218ea83d58 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
@@ -401,7 +401,7 @@ export default {
     @submit.prevent="addOrCreateMethod"
   >
     <template v-if="isCreateForm">
-      <div class="gl-display-flex gl-gap-x-3">
+      <div class="gl-flex gl-gap-x-3">
         <gl-form-group
           class="gl-w-full"
           :label="$options.i18n.titleInputLabel"
@@ -439,7 +439,7 @@ export default {
         ref="confidentialityCheckbox"
         v-model="confidential"
         name="isConfidential"
-        class="gl-mb-5 gl-md-mb-3!"
+        class="gl-mb-5 md:!gl-mb-3"
         :disabled="parentConfidential"
         >{{ confidentialityCheckboxLabel }}</gl-form-checkbox
       >
@@ -467,7 +467,7 @@ export default {
       >
         {{ workItemsToAddInvalidMessage }}
       </div>
-      <div v-if="error" class="gl-text-red-500 gl-mt-3" data-testid="work-items-error">
+      <div v-if="error" class="gl-mt-3 gl-text-red-500" data-testid="work-items-error">
         {{ error }}
       </div>
       <div
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_projects_listbox.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_projects_listbox.vue
index 6c452c8b1d4..3a137f5859d 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_projects_listbox.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_projects_listbox.vue
@@ -228,7 +228,7 @@ export default {
           :project-name="item.text"
         />
         <span>
-          <span class="gl-block gl-mr-2"> {{ item.text }} </span>
+          <span class="gl-mr-2 gl-block"> {{ item.text }} </span>
           <span class="gl-block gl-text-secondary"> {{ item.namespace }} </span>
         </span>
       </div>
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue
index 1a9f0212514..26901329f22 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue
@@ -258,10 +258,10 @@ export default {
         v-if="shouldRolledUpWeightBeVisible"
         ref="weightData"
         data-testid="rollup-weight"
-        class="gl-font-normal gl-ml-3 gl-display-flex gl-align-items-center gl-cursor-help gl-gap-2 gl-text-secondary"
+        class="gl-ml-3 gl-flex gl-cursor-help gl-items-center gl-gap-2 gl-font-normal gl-text-secondary"
       >
         <gl-icon name="weight" class="gl-text-secondary" />
-        <span data-testid="weight-value" class="gl-font-sm">{{ rolledUpWeight }}</span>
+        <span data-testid="weight-value" class="gl-text-sm">{{ rolledUpWeight }}</span>
         <gl-tooltip :target="() => $refs.weightData">
           <span class="gl-font-bold">
             {{ __('Weight') }}
diff --git a/app/assets/javascripts/work_items/components/work_item_milestone.vue b/app/assets/javascripts/work_items/components/work_item_milestone.vue
index 0523086e1d1..a2398b4ac1b 100644
--- a/app/assets/javascripts/work_items/components/work_item_milestone.vue
+++ b/app/assets/javascripts/work_items/components/work_item_milestone.vue
@@ -203,7 +203,7 @@ export default {
       <div v-if="item.title">{{ item.title }}</div>
     </template>
     <template #readonly>
-      <gl-link class="gl-text-gray-900!" :href="localMilestone.webPath">
+      <gl-link class="!gl-text-gray-900" :href="localMilestone.webPath">
         {{ localMilestone.title }}{{ expired }}
       </gl-link>
     </template>
diff --git a/app/assets/javascripts/work_items/components/work_item_notes.vue b/app/assets/javascripts/work_items/components/work_item_notes.vue
index d1fb034c135..fc486cada6b 100644
--- a/app/assets/javascripts/work_items/components/work_item_notes.vue
+++ b/app/assets/javascripts/work_items/components/work_item_notes.vue
@@ -355,7 +355,7 @@ export default {
       @changeFilter="filterDiscussions"
     />
     <work-item-notes-loading v-if="initialLoading" class="gl-mt-5" />
-    <div v-else class="issuable-discussion gl-mb-5 gl-clearfix!">
+    <div v-else class="issuable-discussion gl-mb-5 !gl-clearfix">
       <template v-if="!initialLoading">
         <div v-if="formAtTop && !commentsDisabled" class="js-comment-form">
           <ul class="notes notes-form timeline">
diff --git a/app/assets/javascripts/work_items/components/work_item_parent.vue b/app/assets/javascripts/work_items/components/work_item_parent.vue
index 397d18e8641..00718cc8b06 100644
--- a/app/assets/javascripts/work_items/components/work_item_parent.vue
+++ b/app/assets/javascripts/work_items/components/work_item_parent.vue
@@ -261,7 +261,7 @@ export default {
       <gl-link
         v-if="localSelectedItem"
         data-testid="work-item-parent-link"
-        class="gl-inline-block gl-align-top gl-text-gray-900 gl-max-w-full gl-whitespace-nowrap gl-text-overflow-ellipsis gl-overflow-hidden"
+        class="gl-inline-block gl-max-w-full gl-overflow-hidden gl-text-ellipsis gl-whitespace-nowrap gl-align-top gl-text-gray-900"
         :href="parentWebUrl"
         >{{ listboxText }}</gl-link
       >
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_add_relationship_form.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_add_relationship_form.vue
index 626b89fbc5d..263edbd237d 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_add_relationship_form.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_add_relationship_form.vue
@@ -202,7 +202,7 @@ export default {
         :checked="linkedItemType"
       />
     </gl-form-group>
-    <p class="gl-font-bold gl-mb-2">
+    <p class="gl-mb-2 gl-font-bold">
       {{ $options.i18n.linkItemInputLabel }}
     </p>
     <div class="gl-mb-5">
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
index 66c794ee023..447fbf7428d 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
@@ -36,7 +36,7 @@ export default {
     <h4
       v-if="heading"
       data-testid="work-items-list-heading"
-      class="gl-font-sm gl-font-semibold gl-text-gray-700 gl-mt-3 gl-mb-2 gl-ml-3"
+      class="gl-mb-2 gl-ml-3 gl-mt-3 gl-text-sm gl-font-semibold gl-text-gray-700"
     >
       {{ heading }}
     </h4>
@@ -45,7 +45,7 @@ export default {
         <li
           v-for="linkedItem in linkedItems"
           :key="linkedItem.workItem.id"
-          class="gl-pt-0! gl-pb-0! gl-border-b-0!"
+          class="!gl-border-b-0 !gl-pb-0 !gl-pt-0"
         >
           <work-item-link-child-contents
             :child-item="linkedItem.workItem"
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
index 1a10b90843d..b39071e02e1 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
@@ -266,7 +266,7 @@ export default {
             <work-item-relationship-list
               v-if="linksBlocks.length"
               :class="{
-                'gl-pb-3 gl-mb-5 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100':
+                'gl-mb-5 gl-border-b-1 gl-border-b-gray-100 gl-pb-3 gl-border-b-solid':
                   linksIsBlockedBy.length,
               }"
               :linked-items="linksBlocks"
@@ -286,7 +286,7 @@ export default {
             <work-item-relationship-list
               v-if="linksIsBlockedBy.length"
               :class="{
-                'gl-pb-3 gl-mb-5 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100':
+                'gl-mb-5 gl-border-b-1 gl-border-b-gray-100 gl-pb-3 gl-border-b-solid':
                   linksRelatesTo.length,
               }"
               :linked-items="linksIsBlockedBy"
diff --git a/app/assets/javascripts/work_items/components/work_item_sticky_header.vue b/app/assets/javascripts/work_items/components/work_item_sticky_header.vue
index 1f379433554..05734ca16a6 100644
--- a/app/assets/javascripts/work_items/components/work_item_sticky_header.vue
+++ b/app/assets/javascripts/work_items/components/work_item_sticky_header.vue
@@ -103,11 +103,11 @@ export default {
     <transition name="issuable-header-slide">
       <div
         v-if="isStickyHeaderShowing"
-        class="issue-sticky-header gl-fixed gl-bg-default gl-border-b gl-z-3 gl-py-2"
+        class="issue-sticky-header gl-border-b gl-fixed gl-z-3 gl-bg-default gl-py-2"
         data-testid="work-item-sticky-header"
       >
         <div
-          class="work-item-sticky-header-text gl-items-center gl-mx-auto gl-px-5 xl:gl-px-6 gl-flex gl-gap-3"
+          class="work-item-sticky-header-text gl-mx-auto gl-flex gl-items-center gl-gap-3 gl-px-5 xl:gl-px-6"
         >
           <work-item-state-badge v-if="workItemState" :work-item-state="workItemState" />
           <gl-loading-icon v-if="updateInProgress" />
@@ -119,7 +119,7 @@ export default {
           />
           <locked-badge v-if="isDiscussionLocked" :issuable-type="workItemType" />
           <gl-link
-            class="gl-truncate gl-block gl-font-bold gl-pr-3 gl-mr-auto gl-text-black"
+            class="gl-mr-auto gl-block gl-truncate gl-pr-3 gl-font-bold gl-text-black"
             href="#top"
             :title="workItem.title"
           >
diff --git a/app/assets/javascripts/work_items/components/work_item_time_tracking.vue b/app/assets/javascripts/work_items/components/work_item_time_tracking.vue
index 488d177493f..3d0b708a29f 100644
--- a/app/assets/javascripts/work_items/components/work_item_time_tracking.vue
+++ b/app/assets/javascripts/work_items/components/work_item_time_tracking.vue
@@ -107,8 +107,8 @@ export default {
 
 <template>
   <div data-testid="work-item-time-tracking">
-    <div class="gl-display-flex gl-align-items-center gl-justify-content-space-between">
-      <h3 class="gl-heading-5 gl-mb-2!">
+    <div class="gl-flex gl-items-center gl-justify-between">
+      <h3 class="gl-heading-5 !gl-mb-2">
         {{ __('Time tracking') }}
       </h3>
       <gl-button
@@ -123,17 +123,14 @@ export default {
       />
     </div>
 
-    <div
-      class="gl-display-flex gl-align-items-center gl-gap-2 gl-font-sm"
-      data-testid="time-tracking-body"
-    >
+    <div class="gl-flex gl-items-center gl-gap-2 gl-text-sm" data-testid="time-tracking-body">
       <template v-if="totalTimeSpent || timeEstimate">
         <span class="gl-text-secondary">{{ s__('TimeTracking|Spent') }}</span>
         <gl-button
           v-if="canUpdate"
           v-gl-modal="'time-tracking-report'"
           v-gl-tooltip="s__('TimeTracking|View time tracking report')"
-          class="gl-font-sm!"
+          class="!gl-text-sm"
           variant="link"
         >
           {{ humanTotalTimeSpent }}
@@ -144,7 +141,7 @@ export default {
         <template v-if="timeEstimate">
           <gl-progress-bar
             v-gl-tooltip="progressBarTooltipText"
-            class="gl-flex-grow-1 gl-mx-2"
+            class="gl-mx-2 gl-grow"
             :value="timeRemainingPercent"
             :variant="progressBarVariant"
           />
@@ -153,7 +150,7 @@ export default {
             v-if="canUpdate"
             v-gl-modal="$options.setTimeEstimateModalId"
             v-gl-tooltip="s__('TimeTracking|Set estimate')"
-            class="gl-font-sm!"
+            class="!gl-text-sm"
             variant="link"
           >
             {{ humanTimeEstimate }}
@@ -165,7 +162,7 @@ export default {
         <gl-button
           v-else-if="canUpdate"
           v-gl-modal="$options.setTimeEstimateModalId"
-          class="gl-font-sm! gl-ml-auto"
+          class="gl-ml-auto !gl-text-sm"
           variant="link"
         >
           {{ s__('TimeTracking|Add estimate') }}
@@ -176,7 +173,7 @@ export default {
           <template #estimate="{ content }">
             <gl-button
               v-gl-modal="$options.setTimeEstimateModalId"
-              class="gl-font-sm! gl-align-baseline"
+              class="gl-align-baseline !gl-text-sm"
               variant="link"
             >
               {{ content }}
@@ -185,7 +182,7 @@ export default {
           <template #timeSpent="{ content }">
             <gl-button
               v-gl-modal="$options.createTimelogModalId"
-              class="gl-font-sm! gl-align-baseline"
+              class="gl-align-baseline !gl-text-sm"
               variant="link"
             >
               {{ content }}
diff --git a/app/assets/javascripts/work_items/components/work_item_title.vue b/app/assets/javascripts/work_items/components/work_item_title.vue
index 48462ecb5da..ab1a033a051 100644
--- a/app/assets/javascripts/work_items/components/work_item_title.vue
+++ b/app/assets/javascripts/work_items/components/work_item_title.vue
@@ -56,7 +56,7 @@ export default {
       @input="$emit('updateDraft', $event)"
     />
   </gl-form-group>
-  <h1 v-else data-testid="work-item-title" class="gl-w-full gl-heading-1 !gl-m-0">
+  <h1 v-else data-testid="work-item-title" class="gl-heading-1 !gl-m-0 gl-w-full">
     {{ title }}
   </h1>
 </template>
diff --git a/app/assets/stylesheets/page_bundles/work_items.scss b/app/assets/stylesheets/page_bundles/work_items.scss
index 89ed68414ce..ec872b68425 100644
--- a/app/assets/stylesheets/page_bundles/work_items.scss
+++ b/app/assets/stylesheets/page_bundles/work_items.scss
@@ -6,12 +6,6 @@ $work-item-overview-right-sidebar-width: 20rem;
 $work-item-sticky-header-height: 52px;
 $work-item-overview-gap-width: 2rem;
 
-// stylelint-disable-next-line gitlab/no-gl-class
-.gl-token-selector-token-container {
-  display: flex;
-  align-items: center;
-}
-
 .hide-unfocused-input-decoration:not(:focus, :hover),
 .hide-unfocused-input-decoration:disabled {
   background-color: transparent;
@@ -20,84 +14,14 @@ $work-item-overview-gap-width: 2rem;
   box-shadow: none;
 }
 
-.work-item-assignees {
-  .assign-myself {
-    display: none;
-  }
-
-  @include media-breakpoint-up(sm) {
-    .assignees-selector:hover .assign-myself {
-      display: block;
-    }
-  }
-}
-
-.work-item-due-date {
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-datepicker-input.gl-form-input.form-control {
-    width: 10rem;
-
-    &:not(:focus, :hover) {
-      box-shadow: none;
-
-      // stylelint-disable-next-line gitlab/no-gl-class
-      ~ .gl-datepicker-actions {
-        display: none;
-      }
-    }
-
-    &[disabled] {
-      background-color: var(--white, $white);
-      box-shadow: none;
-
-      // stylelint-disable-next-line gitlab/no-gl-class
-      ~ .gl-datepicker-actions {
-        display: none;
-      }
-    }
-  }
-
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-datepicker-actions:focus,
-  .gl-datepicker-actions:hover {
-    display: flex !important;
-  }
-}
-
-.work-item-labels {
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-token {
-    padding-left: $gl-spacing-scale-1;
-  }
-
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-token-close {
-    display: none;
-  }
-}
-
-// sticky error placement for errors in modals , by default it is 83px for full view
+// sticky error placement for errors in modals, by default it is 83px for full view
 #work-item-detail-modal {
   .flash-container.flash-container-page.sticky {
     top: -8px;
   }
 }
 
-
-.work-item-notifications-form {
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-toggle {
-    margin-left: auto;
-  }
-
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-toggle-label {
-    font-weight: $gl-font-weight-normal;
-  }
-}
-
-// stylelint-disable-next-line gitlab/no-gl-class
-.gl-modal .work-item-view,
+.work-item-view,
 .work-item-drawer .work-item-view:not(:has(.design-detail)) {
   container-name: work-item-view;
   container-type: inline-size;
@@ -170,13 +94,6 @@ $work-item-overview-gap-width: 2rem;
   }
 }
 
-.work-item-field-label {
-  .work-item-overview & {
-    max-width: 30%;
-    flex: none;
-  }
-}
-
 .work-item-field-value {
   .work-item-overview & {
     max-width: 65%;
@@ -191,29 +108,9 @@ $work-item-overview-gap-width: 2rem;
   }
 }
 
-.work-item-parent-field-value {
-  .work-item-overview & {
-    max-width: 75%;
-  }
-}
-
-.token-selector-menu-class {
-  .work-item-overview & {
-    width: 100%;
-    min-width: 100%;
-  }
-}
-
-// There is no props to set label class in GlToggle
-// and the font weight is bold in the component
-// Here, we are overriding the margin and the font weight
-
+// There is no props to set the font weight class in GlToggle
+// Here, we are overriding the font weight
 .work-item-dropdown-toggle {
-  // stylelint-disable-next-line gitlab/no-gl-class
-  .gl-toggle {
-    margin-left: auto;
-  }
-
   // stylelint-disable-next-line gitlab/no-gl-class
   .gl-toggle-label {
     font-weight: normal;
@@ -374,7 +271,7 @@ $disclosure-hierarchy-chevron-dimension: 1.2rem;
   }
 }
 
-.work-item-description .truncated{
+.work-item-description .truncated {
   max-height: clamp(16rem, 40vh, 32rem);
   overflow: hidden;
 }
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index 8540373608b..244d0d5ddd1 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -758,7 +758,7 @@ module Types
 
     {
       issues: "Issues are",
-      merge_requests: "Merge Requests are",
+      merge_requests: "Merge requests are",
       wiki: 'Wikis are',
       snippets: 'Snippets are',
       container_registry: 'Container Registry is'
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 6975b8f903b..a3c1791a409 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,6 +1,7 @@
 :ruby
+  # rubocop: disable Lint/DuplicateBranch -- The feature enabled needs to take precedence
   title = if merge_request_dashboard_enabled?(current_user)
-            _('Merge Requests')
+            _('Merge requests')
           elsif params[:reviewer_username] == current_user.username
             _("Review requests")
           elsif params[:assignee_username] == current_user.username
@@ -8,6 +9,7 @@
           else
             _("Merge requests")
           end
+  # rubocop: enable Lint/DuplicateBranch
   page_title title
   @breadcrumb_link = merge_requests_dashboard_path(assignee_username: current_user.username)
   add_page_specific_style 'page_bundles/issuable_list'
diff --git a/db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_namespace_id.yml b/db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_namespace_id.yml
new file mode 100644
index 00000000000..3f134a0a262
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_namespace_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId
+description: Backfills sharding key `security_orchestration_policy_rule_schedules.namespace_id` from `security_orchestration_policy_configurations`.
+feature_category: security_policy_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163017
+milestone: '17.4'
+queued_migration_version: 20240816130544
+finalize_after: '2024-09-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_project_id.yml b/db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_project_id.yml
new file mode 100644
index 00000000000..9c8240d69a0
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_security_orchestration_policy_rule_schedules_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillSecurityOrchestrationPolicyRuleSchedulesProjectId
+description: Backfills sharding key `security_orchestration_policy_rule_schedules.project_id` from `security_orchestration_policy_configurations`.
+feature_category: security_policy_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163017
+milestone: '17.4'
+queued_migration_version: 20240816130539
+finalize_after: '2024-09-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/security_orchestration_policy_rule_schedules.yml b/db/docs/security_orchestration_policy_rule_schedules.yml
index 2299a981e4e..1ffddae70b5 100644
--- a/db/docs/security_orchestration_policy_rule_schedules.yml
+++ b/db/docs/security_orchestration_policy_rule_schedules.yml
@@ -27,3 +27,6 @@ desired_sharding_key:
         table: security_orchestration_policy_configurations
         sharding_key: namespace_id
         belongs_to: security_orchestration_policy_configuration
+desired_sharding_key_migration_job_name:
+- BackfillSecurityOrchestrationPolicyRuleSchedulesProjectId
+- BackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId
diff --git a/db/migrate/20240816130535_add_project_id_to_security_orchestration_policy_rule_schedules.rb b/db/migrate/20240816130535_add_project_id_to_security_orchestration_policy_rule_schedules.rb
new file mode 100644
index 00000000000..5548224b356
--- /dev/null
+++ b/db/migrate/20240816130535_add_project_id_to_security_orchestration_policy_rule_schedules.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToSecurityOrchestrationPolicyRuleSchedules < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+
+  def change
+    add_column :security_orchestration_policy_rule_schedules, :project_id, :bigint
+  end
+end
diff --git a/db/migrate/20240816130540_add_namespace_id_to_security_orchestration_policy_rule_schedules.rb b/db/migrate/20240816130540_add_namespace_id_to_security_orchestration_policy_rule_schedules.rb
new file mode 100644
index 00000000000..12bf84a1103
--- /dev/null
+++ b/db/migrate/20240816130540_add_namespace_id_to_security_orchestration_policy_rule_schedules.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddNamespaceIdToSecurityOrchestrationPolicyRuleSchedules < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+
+  def change
+    add_column :security_orchestration_policy_rule_schedules, :namespace_id, :bigint
+  end
+end
diff --git a/db/post_migrate/20240816130536_index_security_orchestration_policy_rule_schedules_on_project_id.rb b/db/post_migrate/20240816130536_index_security_orchestration_policy_rule_schedules_on_project_id.rb
new file mode 100644
index 00000000000..cd5ffaa13bc
--- /dev/null
+++ b/db/post_migrate/20240816130536_index_security_orchestration_policy_rule_schedules_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexSecurityOrchestrationPolicyRuleSchedulesOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_security_orchestration_policy_rule_schedules_on_project_i'
+
+  def up
+    add_concurrent_index :security_orchestration_policy_rule_schedules, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :security_orchestration_policy_rule_schedules, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240816130537_add_security_orchestration_policy_rule_schedules_project_id_fk.rb b/db/post_migrate/20240816130537_add_security_orchestration_policy_rule_schedules_project_id_fk.rb
new file mode 100644
index 00000000000..8cd76203d91
--- /dev/null
+++ b/db/post_migrate/20240816130537_add_security_orchestration_policy_rule_schedules_project_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddSecurityOrchestrationPolicyRuleSchedulesProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :security_orchestration_policy_rule_schedules, :projects, column: :project_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :security_orchestration_policy_rule_schedules, column: :project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240816130538_add_security_orchestration_policy_rule_schedules_project_id_trigger.rb b/db/post_migrate/20240816130538_add_security_orchestration_policy_rule_schedules_project_id_trigger.rb
new file mode 100644
index 00000000000..9ab3809fb2e
--- /dev/null
+++ b/db/post_migrate/20240816130538_add_security_orchestration_policy_rule_schedules_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddSecurityOrchestrationPolicyRuleSchedulesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :security_orchestration_policy_rule_schedules,
+      sharding_key: :project_id,
+      parent_table: :security_orchestration_policy_configurations,
+      parent_sharding_key: :project_id,
+      foreign_key: :security_orchestration_policy_configuration_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :security_orchestration_policy_rule_schedules,
+      sharding_key: :project_id,
+      parent_table: :security_orchestration_policy_configurations,
+      parent_sharding_key: :project_id,
+      foreign_key: :security_orchestration_policy_configuration_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id.rb b/db/post_migrate/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id.rb
new file mode 100644
index 00000000000..c471b04093b
--- /dev/null
+++ b/db/post_migrate/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillSecurityOrchestrationPolicyRuleSchedulesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillSecurityOrchestrationPolicyRuleSchedulesProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :security_orchestration_policy_rule_schedules,
+      :id,
+      :project_id,
+      :security_orchestration_policy_configurations,
+      :project_id,
+      :security_orchestration_policy_configuration_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :security_orchestration_policy_rule_schedules,
+      :id,
+      [
+        :project_id,
+        :security_orchestration_policy_configurations,
+        :project_id,
+        :security_orchestration_policy_configuration_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20240816130541_index_security_orchestration_policy_rule_schedules_on_namespace_id.rb b/db/post_migrate/20240816130541_index_security_orchestration_policy_rule_schedules_on_namespace_id.rb
new file mode 100644
index 00000000000..48beb9b7f15
--- /dev/null
+++ b/db/post_migrate/20240816130541_index_security_orchestration_policy_rule_schedules_on_namespace_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexSecurityOrchestrationPolicyRuleSchedulesOnNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_security_orchestration_policy_rule_schedules_on_namespace'
+
+  def up
+    add_concurrent_index :security_orchestration_policy_rule_schedules, :namespace_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :security_orchestration_policy_rule_schedules, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240816130542_add_security_orchestration_policy_rule_schedules_namespace_id_fk.rb b/db/post_migrate/20240816130542_add_security_orchestration_policy_rule_schedules_namespace_id_fk.rb
new file mode 100644
index 00000000000..7d52237247e
--- /dev/null
+++ b/db/post_migrate/20240816130542_add_security_orchestration_policy_rule_schedules_namespace_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddSecurityOrchestrationPolicyRuleSchedulesNamespaceIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :security_orchestration_policy_rule_schedules, :namespaces, column: :namespace_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :security_orchestration_policy_rule_schedules, column: :namespace_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240816130543_add_security_orchestration_policy_rule_schedules_namespace_id_trigger.rb b/db/post_migrate/20240816130543_add_security_orchestration_policy_rule_schedules_namespace_id_trigger.rb
new file mode 100644
index 00000000000..278566f4c50
--- /dev/null
+++ b/db/post_migrate/20240816130543_add_security_orchestration_policy_rule_schedules_namespace_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddSecurityOrchestrationPolicyRuleSchedulesNamespaceIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :security_orchestration_policy_rule_schedules,
+      sharding_key: :namespace_id,
+      parent_table: :security_orchestration_policy_configurations,
+      parent_sharding_key: :namespace_id,
+      foreign_key: :security_orchestration_policy_configuration_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :security_orchestration_policy_rule_schedules,
+      sharding_key: :namespace_id,
+      parent_table: :security_orchestration_policy_configurations,
+      parent_sharding_key: :namespace_id,
+      foreign_key: :security_orchestration_policy_configuration_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id.rb b/db/post_migrate/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id.rb
new file mode 100644
index 00000000000..08fcf867fc8
--- /dev/null
+++ b/db/post_migrate/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.4'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :security_orchestration_policy_rule_schedules,
+      :id,
+      :namespace_id,
+      :security_orchestration_policy_configurations,
+      :namespace_id,
+      :security_orchestration_policy_configuration_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :security_orchestration_policy_rule_schedules,
+      :id,
+      [
+        :namespace_id,
+        :security_orchestration_policy_configurations,
+        :namespace_id,
+        :security_orchestration_policy_configuration_id
+      ]
+    )
+  end
+end
diff --git a/db/schema_migrations/20240816130535 b/db/schema_migrations/20240816130535
new file mode 100644
index 00000000000..1b651717998
--- /dev/null
+++ b/db/schema_migrations/20240816130535
@@ -0,0 +1 @@
+698591914a287c7e1adc5d1a8e14ec9031b83a6303a9350eb717c877e2e35a25
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130536 b/db/schema_migrations/20240816130536
new file mode 100644
index 00000000000..54e0ec65cd5
--- /dev/null
+++ b/db/schema_migrations/20240816130536
@@ -0,0 +1 @@
+0f0d86c9f51479f1965925e44562c3c9f9fca03b9f54ae8e41a0e293c7c40bc4
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130537 b/db/schema_migrations/20240816130537
new file mode 100644
index 00000000000..79e6dcf3a64
--- /dev/null
+++ b/db/schema_migrations/20240816130537
@@ -0,0 +1 @@
+be42be622fea41feb5af424406863d9b1eb4589dcb0ae1e5053899ca77c3d10e
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130538 b/db/schema_migrations/20240816130538
new file mode 100644
index 00000000000..3437330557e
--- /dev/null
+++ b/db/schema_migrations/20240816130538
@@ -0,0 +1 @@
+ba6ac80d4fed53f434c78c9dafb1c611d4ec2066702db8bbf52ec521a6add5e9
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130539 b/db/schema_migrations/20240816130539
new file mode 100644
index 00000000000..5cc8c8f124d
--- /dev/null
+++ b/db/schema_migrations/20240816130539
@@ -0,0 +1 @@
+cc1e8f00f4575739f6069beb99f337eb25a102f7f8076a29b2112420f1d854db
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130540 b/db/schema_migrations/20240816130540
new file mode 100644
index 00000000000..db79e9a02f1
--- /dev/null
+++ b/db/schema_migrations/20240816130540
@@ -0,0 +1 @@
+ccb1ef219032a7a5becfdd60ab6589c41f272b3df71fa34ae7492a0f442316dc
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130541 b/db/schema_migrations/20240816130541
new file mode 100644
index 00000000000..373621c328a
--- /dev/null
+++ b/db/schema_migrations/20240816130541
@@ -0,0 +1 @@
+fc9ea3f83a625c49721f783e99e430e0254af2c509647b5a98fe6589afa74430
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130542 b/db/schema_migrations/20240816130542
new file mode 100644
index 00000000000..c804c1b5253
--- /dev/null
+++ b/db/schema_migrations/20240816130542
@@ -0,0 +1 @@
+10cbb42b0fe55922f8c5aa833452c86361500e741f0278ae83e59dd580314039
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130543 b/db/schema_migrations/20240816130543
new file mode 100644
index 00000000000..1ed9794ebe7
--- /dev/null
+++ b/db/schema_migrations/20240816130543
@@ -0,0 +1 @@
+215432d95d3ecfee7afb128a01f12219b2410de12b0f30ad5f5554c66bacb442
\ No newline at end of file
diff --git a/db/schema_migrations/20240816130544 b/db/schema_migrations/20240816130544
new file mode 100644
index 00000000000..16ef6b50f92
--- /dev/null
+++ b/db/schema_migrations/20240816130544
@@ -0,0 +1 @@
+2ba6ff4456a2c2093880f0d746466763acd674eb9c61b1d30c689da9740a1434
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index fb07ebe9739..2b6506cf2f3 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1250,6 +1250,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_54707c384ad7() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."project_id"
+  FROM "security_orchestration_policy_configurations"
+  WHERE "security_orchestration_policy_configurations"."id" = NEW."security_orchestration_policy_configuration_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_56d49f4ed623() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -1858,6 +1874,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_c59fe6f31e71() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."namespace_id" IS NULL THEN
+  SELECT "namespace_id"
+  INTO NEW."namespace_id"
+  FROM "security_orchestration_policy_configurations"
+  WHERE "security_orchestration_policy_configurations"."id" = NEW."security_orchestration_policy_configuration_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_c5eec113ea76() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -17760,6 +17792,8 @@ CREATE TABLE security_orchestration_policy_rule_schedules (
     policy_index integer NOT NULL,
     cron text NOT NULL,
     rule_index integer DEFAULT 0 NOT NULL,
+    project_id bigint,
+    namespace_id bigint,
     CONSTRAINT check_915825a76e CHECK ((char_length(cron) <= 255))
 );
 
@@ -29759,6 +29793,10 @@ CREATE INDEX p_ci_builds_name_id_idx ON ONLY p_ci_builds USING btree (name, id)
 
 CREATE INDEX index_security_ci_builds_on_name_and_id_parser_features ON ci_builds USING btree (name, id) WHERE (((name)::text = ANY (ARRAY[('container_scanning'::character varying)::text, ('dast'::character varying)::text, ('dependency_scanning'::character varying)::text, ('license_management'::character varying)::text, ('sast'::character varying)::text, ('secret_detection'::character varying)::text, ('coverage_fuzzing'::character varying)::text, ('license_scanning'::character varying)::text, ('apifuzzer_fuzz'::character varying)::text, ('apifuzzer_fuzz_dnd'::character varying)::text])) AND ((type)::text = 'Ci::Build'::text));
 
+CREATE INDEX index_security_orchestration_policy_rule_schedules_on_namespace ON security_orchestration_policy_rule_schedules USING btree (namespace_id);
+
+CREATE INDEX index_security_orchestration_policy_rule_schedules_on_project_i ON security_orchestration_policy_rule_schedules USING btree (project_id);
+
 CREATE INDEX index_security_policies_on_policy_management_project_id ON security_policies USING btree (security_policy_management_project_id);
 
 CREATE UNIQUE INDEX index_security_policies_on_unique_config_type_policy_index ON security_policies USING btree (security_orchestration_policy_configuration_id, type, policy_index);
@@ -32437,6 +32475,8 @@ CREATE TRIGGER trigger_4ad9a52a6614 BEFORE INSERT OR UPDATE ON sbom_occurrences_
 
 CREATE TRIGGER trigger_4b43790d717f BEFORE INSERT OR UPDATE ON protected_environment_approval_rules FOR EACH ROW EXECUTE FUNCTION trigger_4b43790d717f();
 
+CREATE TRIGGER trigger_54707c384ad7 BEFORE INSERT OR UPDATE ON security_orchestration_policy_rule_schedules FOR EACH ROW EXECUTE FUNCTION trigger_54707c384ad7();
+
 CREATE TRIGGER trigger_56d49f4ed623 BEFORE INSERT OR UPDATE ON workspace_variables FOR EACH ROW EXECUTE FUNCTION trigger_56d49f4ed623();
 
 CREATE TRIGGER trigger_57ad2742ac16 BEFORE INSERT OR UPDATE ON user_achievements FOR EACH ROW EXECUTE FUNCTION trigger_57ad2742ac16();
@@ -32511,6 +32551,8 @@ CREATE TRIGGER trigger_b4520c29ea74 BEFORE INSERT OR UPDATE ON approval_merge_re
 
 CREATE TRIGGER trigger_c17a166692a2 BEFORE INSERT OR UPDATE ON audit_events_streaming_headers FOR EACH ROW EXECUTE FUNCTION trigger_c17a166692a2();
 
+CREATE TRIGGER trigger_c59fe6f31e71 BEFORE INSERT OR UPDATE ON security_orchestration_policy_rule_schedules FOR EACH ROW EXECUTE FUNCTION trigger_c59fe6f31e71();
+
 CREATE TRIGGER trigger_c5eec113ea76 BEFORE INSERT OR UPDATE ON dast_pre_scan_verifications FOR EACH ROW EXECUTE FUNCTION trigger_c5eec113ea76();
 
 CREATE TRIGGER trigger_c8bc8646bce9 BEFORE INSERT OR UPDATE ON vulnerability_state_transitions FOR EACH ROW EXECUTE FUNCTION trigger_c8bc8646bce9();
@@ -32988,6 +33030,9 @@ ALTER TABLE ONLY scan_result_policy_violations
 ALTER TABLE ONLY wiki_page_slugs
     ADD CONSTRAINT fk_3d71295ac9 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY security_orchestration_policy_rule_schedules
+    ADD CONSTRAINT fk_3e78b9a150 FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY compliance_checks
     ADD CONSTRAINT fk_3fbfa4295c FOREIGN KEY (requirement_id) REFERENCES compliance_requirements(id) ON DELETE CASCADE;
 
@@ -33684,6 +33729,9 @@ ALTER TABLE ONLY project_compliance_standards_adherence
 ALTER TABLE p_ci_runner_machine_builds
     ADD CONSTRAINT fk_bb490f12fe_p FOREIGN KEY (partition_id, build_id) REFERENCES p_ci_builds(partition_id, id) ON UPDATE CASCADE ON DELETE CASCADE;
 
+ALTER TABLE ONLY security_orchestration_policy_rule_schedules
+    ADD CONSTRAINT fk_bcbb90477f FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY namespace_bans
     ADD CONSTRAINT fk_bcc024eef2 FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 88710c3c0fa..ef825bde250 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -28781,7 +28781,7 @@ Project-level settings for product analytics provider.
 | <a id="projectmergecommittemplate"></a>`mergeCommitTemplate` | [`String`](#string) | Template used to create merge commit message in merge requests. |
 | <a id="projectmergerequestsaccesslevel"></a>`mergeRequestsAccessLevel` | [`ProjectFeatureAccess`](#projectfeatureaccess) | Access level required for merge requests access. |
 | <a id="projectmergerequestsdisablecommittersapproval"></a>`mergeRequestsDisableCommittersApproval` | [`Boolean!`](#boolean) | Indicates that committers of the given merge request cannot approve. |
-| <a id="projectmergerequestsenabled"></a>`mergeRequestsEnabled` | [`Boolean`](#boolean) | Indicates if Merge Requests are enabled for the current user. |
+| <a id="projectmergerequestsenabled"></a>`mergeRequestsEnabled` | [`Boolean`](#boolean) | Indicates if Merge requests are enabled for the current user. |
 | <a id="projectmergerequestsffonlyenabled"></a>`mergeRequestsFfOnlyEnabled` | [`Boolean`](#boolean) | Indicates if no merge commits should be created and all merges should instead be fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. |
 | <a id="projectname"></a>`name` | [`String!`](#string) | Name of the project (without namespace). |
 | <a id="projectnamewithnamespace"></a>`nameWithNamespace` | [`String!`](#string) | Full name of the project with its namespace. |
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 fc9bd9d9bc4..688be4d6c51 100644
--- a/doc/user/project/merge_requests/duo_in_merge_requests.md
+++ b/doc/user/project/merge_requests/duo_in_merge_requests.md
@@ -21,6 +21,7 @@ DETAILS:
 **Status:** Beta
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10401) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment).
+> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/429882) to beta in GitLab 16.10.
 
 Use GitLab Duo Merge request summary to create a merge request description when you
 create or edit a merge request.
diff --git a/doc/user/project/repository/monorepos/index.md b/doc/user/project/repository/monorepos/index.md
index 6262ec368f3..fb604d5573b 100644
--- a/doc/user/project/repository/monorepos/index.md
+++ b/doc/user/project/repository/monorepos/index.md
@@ -240,7 +240,25 @@ performance problems.
 You can use [`git-sizer`](https://github.com/github/git-sizer) to get a snapshot
 of repository characteristics and discover problem aspects of your monorepo.
 
-For example:
+To get a _full_ clone of your repository, you need a full Git mirror or bare clone to
+ensure all Git references are present. To profile your repository:
+
+1. [Install `git-sizer`](https://github.com/github/git-sizer?tab=readme-ov-file#getting-started).
+1. Get a full clone of your repository:
+
+   ```shell
+   git clone --mirror <git_repo_url>
+   ```
+    
+   After cloning, the repository will be in the bare Git format that is compatible with `git-sizer`.
+1. Run `git-sizer` with all statistics in the directory of your Git repository:
+
+   ```shell
+   git-sizer -v
+   ```
+
+After processing, the output of `git-sizer` should look like the following with a level of concern
+on each aspect of the repository:
 
 ```shell
 Processing blobs: 1652370
diff --git a/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id.rb b/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id.rb
new file mode 100644
index 00000000000..cf30625ecff
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_security_orchestration_policy_rule_schedules_namespace_id
+      feature_category :security_policy_management
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id.rb b/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id.rb
new file mode 100644
index 00000000000..8d88327d92c
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillSecurityOrchestrationPolicyRuleSchedulesProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_security_orchestration_policy_rule_schedules_project_id
+      feature_category :security_policy_management
+    end
+  end
+end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9c4f52f81d6..1edc9bb59aa 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24704,10 +24704,10 @@ msgstr ""
 msgid "GlobalSearch|List of filtered labels."
 msgstr ""
 
-msgid "GlobalSearch|Merge Requests"
+msgid "GlobalSearch|Merge request"
 msgstr ""
 
-msgid "GlobalSearch|Merge request"
+msgid "GlobalSearch|Merge requests"
 msgstr ""
 
 msgid "GlobalSearch|Merge requests I've created"
diff --git a/package.json b/package.json
index e64604dc4b9..b07878eec69 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "@gitlab/query-language": "^0.0.5-a-20240809",
     "@gitlab/svgs": "3.112.0",
     "@gitlab/ui": "89.0.0",
-    "@gitlab/web-ide": "^0.0.1-dev-20240813211849",
+    "@gitlab/web-ide": "^0.0.1-dev-20240816130114",
     "@mattiasbuelens/web-streams-adapter": "^0.1.0",
     "@rails/actioncable": "7.0.8-4",
     "@rails/ujs": "7.0.8-4",
diff --git a/patches/@gitlab+web-ide+0.0.1-dev-20240813211849.patch b/patches/@gitlab+web-ide+0.0.1-dev-20240816130114.patch
similarity index 100%
rename from patches/@gitlab+web-ide+0.0.1-dev-20240813211849.patch
rename to patches/@gitlab+web-ide+0.0.1-dev-20240816130114.patch
diff --git a/spec/frontend/ide/init_gitlab_web_ide_spec.js b/spec/frontend/ide/init_gitlab_web_ide_spec.js
index 05a7ce8bfe9..07a539fe198 100644
--- a/spec/frontend/ide/init_gitlab_web_ide_spec.js
+++ b/spec/frontend/ide/init_gitlab_web_ide_spec.js
@@ -1,7 +1,7 @@
 import { start } from '@gitlab/web-ide';
 import { GITLAB_WEB_IDE_FEEDBACK_ISSUE } from '~/ide/constants';
 import { initGitlabWebIDE } from '~/ide/init_gitlab_web_ide';
-import { handleTracking } from '~/ide/lib/gitlab_web_ide/handle_tracking_event';
+import { handleTracking, handleUpdateUrl } from '~/ide/lib/gitlab_web_ide';
 import Tracking from '~/tracking';
 import { TEST_HOST } from 'helpers/test_constants';
 import setWindowLocation from 'helpers/set_window_location_helper';
@@ -140,6 +140,7 @@ describe('ide/init_gitlab_web_ide', () => {
         },
         handleTracking,
         telemetryEnabled,
+        handleContextUpdate: handleUpdateUrl,
       });
     });
 
diff --git a/spec/frontend/ide/lib/gitlab_web_ide/handle_update_url_spec.js b/spec/frontend/ide/lib/gitlab_web_ide/handle_update_url_spec.js
new file mode 100644
index 00000000000..de2369ec619
--- /dev/null
+++ b/spec/frontend/ide/lib/gitlab_web_ide/handle_update_url_spec.js
@@ -0,0 +1,58 @@
+import { handleUpdateUrl } from '~/ide/lib/gitlab_web_ide/handle_update_url';
+
+const MOCK_PROJECT_NAME = 'project-path';
+const MOCK_BRANCH_NAME = 'branch';
+const RELATIVE_URL_ROOT = '/gitlab';
+
+describe('ide/handle_update_url', () => {
+  beforeEach(() => {
+    window.gon.relative_url_root = '';
+  });
+
+  it('does not update the url if no previous state stored', () => {
+    const historySpy = jest.spyOn(window.history, 'replaceState');
+    handleUpdateUrl({ projectPath: MOCK_PROJECT_NAME, ref: MOCK_BRANCH_NAME });
+
+    expect(historySpy).toHaveBeenCalledTimes(0);
+  });
+
+  it('does not update the url if ref did not change', () => {
+    window.history.replaceState({ previousRef: MOCK_BRANCH_NAME }, '');
+
+    const historySpy = jest.spyOn(window.history, 'replaceState');
+    handleUpdateUrl({ projectPath: MOCK_PROJECT_NAME, ref: MOCK_BRANCH_NAME });
+
+    expect(historySpy).toHaveBeenCalledTimes(0);
+  });
+
+  describe('when the ref changes', () => {
+    beforeEach(() => {
+      handleUpdateUrl({ projectPath: MOCK_PROJECT_NAME, ref: 'some-ref' });
+    });
+
+    it('updates the url', () => {
+      const historySpy = jest.spyOn(window.history, 'replaceState');
+      handleUpdateUrl({ projectPath: MOCK_PROJECT_NAME, ref: MOCK_BRANCH_NAME });
+
+      expect(historySpy).toHaveBeenCalledTimes(1);
+      expect(historySpy).toHaveBeenCalledWith(
+        null,
+        '',
+        `/-/ide/project/${MOCK_PROJECT_NAME}/edit/${MOCK_BRANCH_NAME}/-/`,
+      );
+    });
+
+    it('includes the relative url root if it exists', () => {
+      window.gon.relative_url_root = RELATIVE_URL_ROOT;
+      const historySpy = jest.spyOn(window.history, 'replaceState');
+      handleUpdateUrl({ projectPath: MOCK_PROJECT_NAME, ref: MOCK_BRANCH_NAME });
+
+      expect(historySpy).toHaveBeenCalledTimes(1);
+      expect(historySpy).toHaveBeenCalledWith(
+        null,
+        '',
+        `${RELATIVE_URL_ROOT}/-/ide/project/${MOCK_PROJECT_NAME}/edit/${MOCK_BRANCH_NAME}/-/`,
+      );
+    });
+  });
+});
diff --git a/spec/frontend/super_sidebar/components/global_search/components/global_search_autocomplete_items_spec.js b/spec/frontend/super_sidebar/components/global_search/components/global_search_autocomplete_items_spec.js
index 5dca7744246..34c6b70418b 100644
--- a/spec/frontend/super_sidebar/components/global_search/components/global_search_autocomplete_items_spec.js
+++ b/spec/frontend/super_sidebar/components/global_search/components/global_search_autocomplete_items_spec.js
@@ -192,7 +192,7 @@ describe('GlobalSearchAutocompleteItems', () => {
           action                     | event
           ${'Projects'}              | ${EVENT_CLICK_PROJECT_RESULT_IN_COMMAND_PALETTE}
           ${'Groups'}                | ${EVENT_CLICK_GROUP_RESULT_IN_COMMAND_PALETTE}
-          ${'Merge Requests'}        | ${EVENT_CLICK_MERGE_REQUEST_RESULT_IN_COMMAND_PALETTE}
+          ${'Merge requests'}        | ${EVENT_CLICK_MERGE_REQUEST_RESULT_IN_COMMAND_PALETTE}
           ${'Issues'}                | ${EVENT_CLICK_ISSUE_RESULT_IN_COMMAND_PALETTE}
           ${'Recent issues'}         | ${EVENT_CLICK_RECENT_ISSUE_RESULT_IN_COMMAND_PALETTE}
           ${'Recent epics'}          | ${EVENT_CLICK_RECENT_EPIC_RESULT_IN_COMMAND_PALETTE}
diff --git a/spec/frontend/work_items/components/design_management/__snapshots__/design_item_spec.js.snap b/spec/frontend/work_items/components/design_management/__snapshots__/design_item_spec.js.snap
index c928fac4bed..570a1f6822b 100644
--- a/spec/frontend/work_items/components/design_management/__snapshots__/design_item_spec.js.snap
+++ b/spec/frontend/work_items/components/design_management/__snapshots__/design_item_spec.js.snap
@@ -14,7 +14,7 @@ exports[`Design item component with notes renders item with multiple comments 1`
   class="card design-list-item gl-cursor-pointer gl-mb-0 gl-text-default hover:gl-text-default js-design-list-item"
 >
   <div
-    class="card-body gl-flex gl-items-center gl-justify-content-center gl-overflow-hidden gl-p-0 gl-relative gl-rounded-top-base"
+    class="card-body gl-flex gl-items-center gl-justify-center gl-overflow-hidden gl-p-0 gl-relative gl-rounded-t-base"
   >
     <gl-intersection-observer-stub
       class="gl-grow"
@@ -36,7 +36,7 @@ exports[`Design item component with notes renders item with multiple comments 1`
       class="gl-flex gl-flex-col str-truncated-100"
     >
       <span
-        class="gl-font-sm str-truncated-100"
+        class="gl-text-sm str-truncated-100"
         data-testid="design-img-filename-1"
         title="test"
       >
@@ -65,7 +65,7 @@ exports[`Design item component with notes renders item with multiple comments 1`
       />
       <span
         aria-label="2 comments"
-        class="gl-font-sm gl-ml-2"
+        class="gl-ml-2 gl-text-sm"
       >
         2
       </span>
@@ -79,7 +79,7 @@ exports[`Design item component with notes renders item with single comment 1`] =
   class="card design-list-item gl-cursor-pointer gl-mb-0 gl-text-default hover:gl-text-default js-design-list-item"
 >
   <div
-    class="card-body gl-flex gl-items-center gl-justify-content-center gl-overflow-hidden gl-p-0 gl-relative gl-rounded-top-base"
+    class="card-body gl-flex gl-items-center gl-justify-center gl-overflow-hidden gl-p-0 gl-relative gl-rounded-t-base"
   >
     <gl-intersection-observer-stub
       class="gl-grow"
@@ -101,7 +101,7 @@ exports[`Design item component with notes renders item with single comment 1`] =
       class="gl-flex gl-flex-col str-truncated-100"
     >
       <span
-        class="gl-font-sm str-truncated-100"
+        class="gl-text-sm str-truncated-100"
         data-testid="design-img-filename-1"
         title="test"
       >
@@ -130,7 +130,7 @@ exports[`Design item component with notes renders item with single comment 1`] =
       />
       <span
         aria-label="1 comment"
-        class="gl-font-sm gl-ml-2"
+        class="gl-ml-2 gl-text-sm"
       >
         1
       </span>
diff --git a/spec/frontend/work_items/components/work_item_relationships/__snapshots__/work_item_relationship_list_spec.js.snap b/spec/frontend/work_items/components/work_item_relationships/__snapshots__/work_item_relationship_list_spec.js.snap
index 42c24daeb4f..ed846b83174 100644
--- a/spec/frontend/work_items/components/work_item_relationships/__snapshots__/work_item_relationship_list_spec.js.snap
+++ b/spec/frontend/work_items/components/work_item_relationships/__snapshots__/work_item_relationship_list_spec.js.snap
@@ -5,7 +5,7 @@ exports[`WorkItemRelationshipList renders linked item list 1`] = `
   data-testid="work-item-linked-items-list"
 >
   <h4
-    class="gl-font-semibold gl-font-sm gl-mb-2 gl-ml-3 gl-mt-3 gl-text-gray-700"
+    class="gl-font-semibold gl-mb-2 gl-ml-3 gl-mt-3 gl-text-gray-700 gl-text-sm"
     data-testid="work-items-list-heading"
   >
     Blocking
@@ -17,7 +17,7 @@ exports[`WorkItemRelationshipList renders linked item list 1`] = `
       class="content-list work-items-list"
     >
       <li
-        class="gl-border-b-0! gl-pb-0! gl-pt-0!"
+        class="!gl-border-b-0 !gl-pb-0 !gl-pt-0"
       >
         <work-item-link-child-contents-stub
           canupdate="true"
diff --git a/spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb
new file mode 100644
index 00000000000..1c3e0c2ee21
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId,
+  feature_category: :security_policy_management,
+  schema: 20240816130540 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :security_orchestration_policy_rule_schedules }
+    let(:backfill_column) { :namespace_id }
+    let(:backfill_via_table) { :security_orchestration_policy_configurations }
+    let(:backfill_via_column) { :namespace_id }
+    let(:backfill_via_foreign_key) { :security_orchestration_policy_configuration_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb
new file mode 100644
index 00000000000..c2767000eae
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillSecurityOrchestrationPolicyRuleSchedulesProjectId,
+  feature_category: :security_policy_management,
+  schema: 20240816130535 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :security_orchestration_policy_rule_schedules }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :security_orchestration_policy_configurations }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :security_orchestration_policy_configuration_id }
+  end
+end
diff --git a/spec/migrations/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb b/spec/migrations/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb
new file mode 100644
index 00000000000..2c65fd25a41
--- /dev/null
+++ b/spec/migrations/20240816130539_queue_backfill_security_orchestration_policy_rule_schedules_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillSecurityOrchestrationPolicyRuleSchedulesProjectId, feature_category: :security_policy_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: :security_orchestration_policy_rule_schedules,
+          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,
+            :security_orchestration_policy_configurations,
+            :project_id,
+            :security_orchestration_policy_configuration_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb b/spec/migrations/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb
new file mode 100644
index 00000000000..76f43118fec
--- /dev/null
+++ b/spec/migrations/20240816130544_queue_backfill_security_orchestration_policy_rule_schedules_namespace_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillSecurityOrchestrationPolicyRuleSchedulesNamespaceId, feature_category: :security_policy_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: :security_orchestration_policy_rule_schedules,
+          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: [
+            :namespace_id,
+            :security_orchestration_policy_configurations,
+            :namespace_id,
+            :security_orchestration_policy_configuration_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/yarn.lock b/yarn.lock
index 1ceeed43fe2..af17ae89980 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1378,10 +1378,10 @@
     vue-functional-data-merge "^3.1.0"
     vue-runtime-helpers "^1.1.2"
 
-"@gitlab/web-ide@^0.0.1-dev-20240813211849":
-  version "0.0.1-dev-20240813211849"
-  resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20240813211849.tgz#da0e6c8ce1137ac7983dd743e0372d6fc8554155"
-  integrity sha512-JrTgCh+PiWe4pQzdy7KuvIaZjPazoQdBOVzlPzYr7e9tP95w9l5Wy+4I2et4vva0NKRmYYllaqGxxbRTyCCfcA==
+"@gitlab/web-ide@^0.0.1-dev-20240816130114":
+  version "0.0.1-dev-20240816130114"
+  resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20240816130114.tgz#25a88d945095ea10bab9fbed5de1daea205b0bf1"
+  integrity sha512-Uv3n+l3oS5ywBWxzXhriFvxYUYw4KBHxlQJEIN3w0gzEiFgV7sYwQmJjCjhukN0PNCIX0akHZYwMm+ow/vD9IA==
 
 "@graphql-eslint/eslint-plugin@3.20.1":
   version "3.20.1"