From c0e21fd75eeac758353b603172b14383f4c4626c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 15 Aug 2024 18:10:49 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/gitlab/rails/safe_format.yml    |   1 -
 .rubocop_todo/layout/line_length.yml          |   1 -
 .rubocop_todo/rails/output_safety.yml         |   1 -
 .rubocop_todo/style/format_string.yml         |   1 -
 .rubocop_todo/style/if_unless_modifier.yml    |   1 -
 .../components/pipeline_operations.vue        |   6 +-
 .../components/pipeline_stop_modal.vue        |   1 +
 .../javascripts/groups/group_name_rules.js    |  13 ++
 .../components/topics_token_selector.vue      |   2 +-
 .../super_sidebar/super_sidebar_bundle.js     |   9 +-
 .../vue_shared/components/markdown/field.vue  |   2 +-
 app/helpers/reminder_emails_helper.rb         |  77 ----------
 app/mailers/emails/members.rb                 |  23 ---
 app/mailers/members/invite_reminder_mailer.rb | 132 ++++++++++++++++
 app/mailers/notify.rb                         |   2 -
 .../members/invite_reminder_mailer_preview.rb |  23 +++
 app/mailers/previews/notify_preview.rb        |   2 +-
 app/models/member.rb                          |   5 +-
 app/models/repository.rb                      |   8 -
 .../ci/list_config_variables_service.rb       |  15 +-
 app/services/notification_service.rb          |   4 -
 app/views/groups/edit.html.haml               |   2 +-
 app/views/groups/settings/_general.html.haml  |  33 ++--
 .../invite_reminder_mailer/email.html.haml    |  12 ++
 .../invite_reminder_mailer/email.text.erb     |  13 ++
 .../member_invited_reminder_email.html.haml   |   9 --
 .../member_invited_reminder_email.text.erb    |   6 -
 app/views/projects/edit.html.haml             |   6 +-
 .../projects/settings/_general.html.haml      |  44 +++---
 .../shared/_auto_devops_callout.html.haml     |   2 +-
 app/views/shared/_captcha_check.html.haml     |   2 +-
 app/views/shared/_divider.html.haml           |   6 +-
 app/views/shared/_event_filter.html.haml      |   2 +-
 app/views/shared/_file_highlight.html.haml    |   2 +-
 app/views/shared/_ide_root.html.haml          |   2 +-
 .../shared/_issuable_meta_data.html.haml      |   8 +-
 app/views/shared/_label.html.haml             |   6 +-
 app/views/shared/_label_full_path.html.haml   |   2 +-
 app/views/shared/_label_row.html.haml         |   2 +-
 app/views/shared/_md_preview.html.haml        |   6 +-
 .../_merge_request_pipeline_status.html.haml  |   4 +-
 app/views/shared/_milestones_filter.html.haml |   2 +-
 .../shared/_silent_mode_banner.html.haml      |   2 +-
 app/views/shared/_web_ide_button.html.haml    |   2 +-
 .../deploy_keys/_project_group_form.html.haml |   2 +-
 .../doorkeeper/applications/_form.html.haml   |   2 +-
 .../doorkeeper/applications/_show.html.haml   |   2 +-
 .../form_elements/_description.html.haml      |   2 +-
 app/views/shared/groups/_group.html.haml      |  12 +-
 app/views/shared/hook_logs/_content.html.haml |   4 +-
 app/views/shared/integrations/edit.html.haml  |   2 +-
 .../_slack_integration_form.html.haml         |  10 +-
 .../_installation_info.html.haml              |   2 +-
 .../shared/integrations/overrides.html.haml   |   2 +-
 app/views/shared/issuable/_nav.html.haml      |   2 +-
 .../shared/issuable/_search_bar.html.haml     |  10 +-
 app/views/shared/issuable/_sidebar.html.haml  |   8 +-
 .../issuable/_sidebar_assignees.html.haml     |   2 +-
 .../issuable/_sidebar_reviewers.html.haml     |   2 +-
 .../_metadata_issuable_assignee.html.haml     |   2 +-
 app/views/shared/labels/_form.html.haml       |   4 +-
 app/views/shared/labels/_nav.html.haml        |   2 +-
 app/views/shared/members/_member.html.haml    |   4 +-
 .../members/tab_pane/_form_item.html.haml     |   2 +-
 .../shared/members/tab_pane/_header.html.haml |   2 +-
 .../shared/members/tab_pane/_title.html.haml  |   2 +-
 app/views/shared/milestones/_header.html.haml |   2 +-
 .../shared/milestones/_issuables.html.haml    |   4 +-
 .../shared/milestones/_labels_tab.html.haml   |   6 +-
 .../shared/milestones/_milestone.html.haml    |   2 +-
 .../milestones/_participants_tab.html.haml    |   4 +-
 .../shared/milestones/_sidebar.html.haml      |   4 +-
 .../shared/notes/_comment_button.html.haml    |   2 +-
 app/views/shared/notes/_form.html.haml        |   4 +-
 app/views/shared/notes/_hints.html.haml       |  12 +-
 app/views/shared/notes/_note.html.haml        |   6 +-
 app/views/shared/projects/_dropdown.html.haml |   2 +-
 app/views/shared/projects/_list.html.haml     |   2 +-
 app/views/shared/projects/_project.html.haml  |  32 ++--
 .../shared/projects/_project_card.html.haml   |   8 +-
 .../shared/projects/_search_form.html.haml    |   2 +-
 app/views/shared/projects/_topics.html.haml   |   2 +-
 .../shared/runners/_runner_details.html.haml  |   2 +-
 app/views/shared/snippets/_snippet.html.haml  |  18 +--
 app/views/shared/topics/_topic.html.haml      |   2 +-
 .../shared/usage_quotas/_index.html.haml      |   2 +-
 app/views/shared/web_hooks/_hook.html.haml    |   2 +-
 app/views/shared/wikis/diff.html.haml         |   2 +-
 app/views/shared/wikis/git_error.html.haml    |   4 +-
 .../prompt_migration_refactor_code.yml}       |  14 +-
 data/whats_new/202408150001_17_03.yml         | 100 ++++++++++++
 db/docs/ci_cost_settings.yml                  |   2 +-
 .../dedicated/configure_instance.md           |  27 +++-
 doc/administration/internal_users.md          |  13 +-
 doc/api/lint.md                               |   2 +-
 doc/ci/pipelines/cicd_minutes.md              |  11 --
 .../documentation/styleguide/word_list.md     |   2 +-
 doc/editor_extensions/visual_studio/index.md  |   4 +-
 doc/integration/ding_talk.md                  |  11 --
 doc/topics/gitlab_flow.md                     |  11 --
 .../api_security/api_discovery/index.md       |   2 +-
 .../api_security/index.md                     |   2 +-
 doc/user/application_security/dast/index.md   |   4 +-
 .../application_security/dast/proxy-based.md  |   6 +-
 .../checks/application_information_check.md   |  11 --
 .../checks/authentication_token_check.md      |  11 --
 .../checks/cleartext_authentication_check.md  |  11 --
 .../dast_api/checks/cors_check.md             |  11 --
 .../dast_api/checks/dns_rebinding_check.md    |  11 --
 .../checks/framework_debug_mode_check.md      |  11 --
 .../checks/heartbleed_open_ssl_check.md       |  11 --
 .../dast_api/checks/html_injection_check.md   |  11 --
 .../dast_api/checks/index.md                  |  11 --
 .../checks/insecure_http_methods_check.md     |  11 --
 .../dast_api/checks/json_hijacking_check.md   |  11 --
 .../dast_api/checks/json_injection_check.md   |  11 --
 .../dast_api/checks/open_redirect_check.md    |  11 --
 .../checks/os_command_injection_check.md      |  11 --
 .../dast_api/checks/path_traversal_check.md   |  11 --
 .../checks/sensitive_file_disclosure_check.md |  11 --
 .../sensitive_information_disclosure_check.md |  11 --
 .../dast_api/checks/session_cookie_check.md   |  11 --
 .../dast_api/checks/shellshock_check.md       |  11 --
 .../dast_api/checks/sql_injection_check.md    |  11 --
 .../checks/tls_server_configuration_check.md  |  11 --
 .../dast_api/checks/xml_external_entity.md    |  11 --
 .../dast_api/checks/xml_injection_check.md    |  11 --
 .../customizing_analyzer_settings.md          |  11 --
 .../configuration/enabling_the_analyzer.md    |  11 --
 .../dast_api/configuration/index.md           |  11 --
 .../configuration/offline_configuration.md    |  11 --
 .../configuration/overriding_analyzer_jobs.md |  11 --
 .../dast_api/configuration/requirements.md    |  11 --
 .../dast_api/configuration/variables.md       |  11 --
 .../application_security/dast_api/index.md    |  11 --
 .../dast_api/performance.md                   |  11 --
 .../dast_api/troubleshooting.md               |  11 --
 doc/user/application_security/index.md        |   2 +-
 .../vulnerabilities/severities.md             |   2 +-
 .../repository/code_suggestions/data.md       |  11 --
 .../ci/build/rules/rule/clause/exists.rb      |  32 +---
 lib/gitlab/git.rb                             |   4 +-
 lib/search/group_settings.rb                  |   2 +-
 lib/search/project_settings.rb                |   2 +-
 locale/gitlab.pot                             |  34 ++++-
 public/robots.txt                             |  72 ++++++---
 spec/factories/group_members.rb               |   4 +
 .../projects/pipelines/pipelines_spec.rb      |  37 ++++-
 .../components/markdown/field_spec.js         | 142 +++++++++---------
 .../ci/build/rules/rule/clause/exists_spec.rb |   8 -
 .../database/no_cross_db_foreign_keys_spec.rb |  53 ++++++-
 spec/lib/gitlab/git_spec.rb                   |  27 +---
 .../members/invite_reminder_mailer_spec.rb    |  98 ++++++++++++
 spec/mailers/notify_spec.rb                   |  82 ----------
 spec/mailers/previews_spec.rb                 |   6 +-
 spec/models/member_spec.rb                    |  27 +++-
 spec/models/repository_spec.rb                |  46 ------
 .../ci/create_pipeline_service/rules_spec.rb  |  13 +-
 .../ci/list_config_variables_service_spec.rb  |   4 +-
 spec/services/notification_service_spec.rb    |  19 ---
 .../helpers/database/duplicate_indexes.yml    |   3 -
 161 files changed, 914 insertions(+), 1102 deletions(-)
 create mode 100644 app/assets/javascripts/groups/group_name_rules.js
 delete mode 100644 app/helpers/reminder_emails_helper.rb
 create mode 100644 app/mailers/members/invite_reminder_mailer.rb
 create mode 100644 app/mailers/previews/members/invite_reminder_mailer_preview.rb
 create mode 100644 app/views/members/invite_reminder_mailer/email.html.haml
 create mode 100644 app/views/members/invite_reminder_mailer/email.text.erb
 delete mode 100644 app/views/notify/member_invited_reminder_email.html.haml
 delete mode 100644 app/views/notify/member_invited_reminder_email.text.erb
 rename config/feature_flags/{gitlab_com_derisk/rules_exist_expand_globs_early.yml => experiment/prompt_migration_refactor_code.yml} (60%)
 create mode 100644 data/whats_new/202408150001_17_03.yml
 delete mode 100644 doc/ci/pipelines/cicd_minutes.md
 delete mode 100644 doc/integration/ding_talk.md
 delete mode 100644 doc/topics/gitlab_flow.md
 delete mode 100644 doc/user/application_security/dast_api/checks/application_information_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/authentication_token_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/cleartext_authentication_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/cors_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/dns_rebinding_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/framework_debug_mode_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/heartbleed_open_ssl_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/html_injection_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/index.md
 delete mode 100644 doc/user/application_security/dast_api/checks/insecure_http_methods_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/json_hijacking_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/json_injection_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/open_redirect_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/os_command_injection_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/path_traversal_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/sensitive_file_disclosure_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/sensitive_information_disclosure_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/session_cookie_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/shellshock_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/sql_injection_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/tls_server_configuration_check.md
 delete mode 100644 doc/user/application_security/dast_api/checks/xml_external_entity.md
 delete mode 100644 doc/user/application_security/dast_api/checks/xml_injection_check.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/customizing_analyzer_settings.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/enabling_the_analyzer.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/index.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/offline_configuration.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/overriding_analyzer_jobs.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/requirements.md
 delete mode 100644 doc/user/application_security/dast_api/configuration/variables.md
 delete mode 100644 doc/user/application_security/dast_api/index.md
 delete mode 100644 doc/user/application_security/dast_api/performance.md
 delete mode 100644 doc/user/application_security/dast_api/troubleshooting.md
 delete mode 100644 doc/user/project/repository/code_suggestions/data.md
 create mode 100644 spec/mailers/members/invite_reminder_mailer_spec.rb

diff --git a/.rubocop_todo/gitlab/rails/safe_format.yml b/.rubocop_todo/gitlab/rails/safe_format.yml
index 52b45e351a7..91893f755a6 100644
--- a/.rubocop_todo/gitlab/rails/safe_format.yml
+++ b/.rubocop_todo/gitlab/rails/safe_format.yml
@@ -13,7 +13,6 @@ Gitlab/Rails/SafeFormat:
     - 'app/helpers/merge_requests_helper.rb'
     - 'app/helpers/profiles_helper.rb'
     - 'app/helpers/projects_helper.rb'
-    - 'app/helpers/reminder_emails_helper.rb'
     - 'app/helpers/search_helper.rb'
     - 'app/helpers/sourcegraph_helper.rb'
     - 'app/helpers/whats_new_helper.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 0b9f56bc415..3cb145b0b6b 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -218,7 +218,6 @@ Layout/LineLength:
     - 'app/helpers/projects/security/configuration_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/registrations_helper.rb'
-    - 'app/helpers/reminder_emails_helper.rb'
     - 'app/helpers/repository_languages_helper.rb'
     - 'app/helpers/routing/pseudonymization_helper.rb'
     - 'app/helpers/search_helper.rb'
diff --git a/.rubocop_todo/rails/output_safety.yml b/.rubocop_todo/rails/output_safety.yml
index def4e0d249d..55028aa9d7c 100644
--- a/.rubocop_todo/rails/output_safety.yml
+++ b/.rubocop_todo/rails/output_safety.yml
@@ -31,7 +31,6 @@ Rails/OutputSafety:
     - 'app/helpers/page_layout_helper.rb'
     - 'app/helpers/profiles_helper.rb'
     - 'app/helpers/projects_helper.rb'
-    - 'app/helpers/reminder_emails_helper.rb'
     - 'app/helpers/safe_format_helper.rb'
     - 'app/helpers/search_helper.rb'
     - 'app/helpers/sidebars_helper.rb'
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml
index 422f8c1951d..b42d44002be 100644
--- a/.rubocop_todo/style/format_string.yml
+++ b/.rubocop_todo/style/format_string.yml
@@ -44,7 +44,6 @@ Style/FormatString:
     - 'app/helpers/projects/project_members_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/registrations_helper.rb'
-    - 'app/helpers/reminder_emails_helper.rb'
     - 'app/helpers/search_helper.rb'
     - 'app/helpers/ssh_keys_helper.rb'
     - 'app/helpers/tags_helper.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 79ebcc59ad2..751851f8cd5 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -21,7 +21,6 @@ Style/IfUnlessModifier:
     - 'app/helpers/preferences_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/releases_helper.rb'
-    - 'app/helpers/reminder_emails_helper.rb'
     - 'app/helpers/routing/artifacts_helper.rb'
     - 'app/helpers/search_helper.rb'
     - 'app/helpers/snippets_helper.rb'
diff --git a/app/assets/javascripts/ci/pipelines_page/components/pipeline_operations.vue b/app/assets/javascripts/ci/pipelines_page/components/pipeline_operations.vue
index 8945bb06862..82ba602ae32 100644
--- a/app/assets/javascripts/ci/pipelines_page/components/pipeline_operations.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/pipeline_operations.vue
@@ -30,6 +30,7 @@ export default {
       isCanceling: false,
       isRetrying: false,
       showConfirmationModal: false,
+      pipelineToCancel: this.pipeline,
     };
   },
   computed: {
@@ -55,10 +56,11 @@ export default {
       this.isCanceling = true;
       this.showConfirmationModal = false;
 
-      this.$emit('cancel-pipeline', this.pipeline);
+      this.$emit('cancel-pipeline', this.pipelineToCancel);
     },
     handleCancelClick() {
       this.showConfirmationModal = true;
+      this.pipelineToCancel = this.pipeline;
 
       this.trackClick('click_cancel_button');
     },
@@ -79,7 +81,7 @@ export default {
 <template>
   <div class="gl-text-right">
     <pipeline-stop-modal
-      :pipeline="pipeline"
+      :pipeline="pipelineToCancel"
       :show-confirmation-modal="showConfirmationModal"
       @submit="onConfirmCancelPipeline"
       @close-modal="onCloseModal"
diff --git a/app/assets/javascripts/ci/pipelines_page/components/pipeline_stop_modal.vue b/app/assets/javascripts/ci/pipelines_page/components/pipeline_stop_modal.vue
index 9ccb7012897..88e22e6ad24 100644
--- a/app/assets/javascripts/ci/pipelines_page/components/pipeline_stop_modal.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/pipeline_stop_modal.vue
@@ -73,6 +73,7 @@ export default {
     :title="modalTitle"
     :action-primary="primaryProps"
     :action-cancel="$options.cancelProps"
+    data-testid="pipeline-stop-modal"
     @primary="emitSubmit($event)"
   >
     <p>
diff --git a/app/assets/javascripts/groups/group_name_rules.js b/app/assets/javascripts/groups/group_name_rules.js
new file mode 100644
index 00000000000..6ff2d68c653
--- /dev/null
+++ b/app/assets/javascripts/groups/group_name_rules.js
@@ -0,0 +1,13 @@
+import { __ } from '~/locale';
+
+export const START_RULE = {
+  regex: /^[a-zA-Z0-9\u{00A9}-\u{1f9ff}_]/u,
+  message: __('Group name must start with a letter, digit, emoji, or underscore.'),
+};
+
+export const CONTAINS_RULE = {
+  regex: /^[a-zA-Z0-9\p{Pd}\u{00A9}-\u{1f9ff}_. ()]+$/u,
+  message: __(
+    'Group name can contain only letters, digits, dashes, spaces, dots, underscores, parenthesis, and emojis.',
+  ),
+};
diff --git a/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue b/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue
index 6dac93b29d6..15c43435e01 100644
--- a/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue
+++ b/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue
@@ -14,7 +14,7 @@ export default {
     GlSprintf,
   },
   i18n: {
-    topicsTitle: s__('ProjectSettings|Topics'),
+    topicsTitle: s__('ProjectSettings|Project topics'),
     topicsHelpText: s__(
       'ProjectSettings|Topics are publicly visible even on private projects. Do not include sensitive information in topic names. %{linkStart}Learn more%{linkEnd}.',
     ),
diff --git a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
index fe7fc9bac06..d07ccc15969 100644
--- a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
+++ b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
@@ -55,15 +55,13 @@ const getTrialStatusWidgetData = (sidebarData) => {
       trialDaysUsed,
       trialDuration,
       percentageComplete,
-      widgetUrl,
       groupId,
       featureId,
       dismissEndpoint,
     } = convertObjectPropsToCamelCase(sidebarData.duo_pro_trial_status_widget_data_attrs);
 
-    const { daysRemaining, trialEndDate, purchaseNowUrl } = convertObjectPropsToCamelCase(
-      sidebarData.duo_pro_trial_status_popover_data_attrs,
-    );
+    const { daysRemaining, trialEndDate, purchaseNowUrl, learnAboutButtonUrl } =
+      convertObjectPropsToCamelCase(sidebarData.duo_pro_trial_status_popover_data_attrs);
 
     return {
       showDuoProTrialStatusWidget: true,
@@ -71,14 +69,13 @@ const getTrialStatusWidgetData = (sidebarData) => {
       trialDaysUsed: Number(trialDaysUsed),
       trialDuration: Number(trialDuration),
       percentageComplete: Number(percentageComplete),
-      widgetUrl,
       groupId,
       featureId,
       dismissEndpoint,
       daysRemaining,
       trialEndDate: new Date(trialEndDate),
       purchaseNowUrl,
-      learnAboutButtonUrl: widgetUrl,
+      learnAboutButtonUrl,
     };
   }
 
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index 3556b362ebf..a7ca30f0452 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -351,7 +351,7 @@ export default {
       }
 
       this.markdownPreviewLoading = false;
-      this.markdownPreview = data.body || __('Nothing to preview.');
+      this.markdownPreview = data.body || data.html || __('Nothing to preview.');
 
       this.$nextTick()
         .then(() => {
diff --git a/app/helpers/reminder_emails_helper.rb b/app/helpers/reminder_emails_helper.rb
deleted file mode 100644
index f53ebd51380..00000000000
--- a/app/helpers/reminder_emails_helper.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-module ReminderEmailsHelper
-  def invitation_reminder_salutation(reminder_index, format: nil)
-    case reminder_index
-    when 0
-      s_('InviteReminderEmail|Invitation pending')
-    when 1
-      if format == :html
-        wave_emoji_tag = Gitlab::Emoji.gl_emoji_tag(TanukiEmoji.find_by_alpha_code('wave'))
-        s_('InviteReminderEmail|Hey there %{wave_emoji}').html_safe % { wave_emoji: wave_emoji_tag }
-      else
-        s_('InviteReminderEmail|Hey there!')
-      end
-    when 2
-      s_('InviteReminderEmail|In case you missed it...')
-    end
-  end
-
-  def invitation_reminder_body(member, reminder_index, format: nil)
-    options = {
-      inviter: sanitize_name(member.created_by.name),
-      strong_start: '',
-      strong_end: '',
-      project_or_group_name: member_source.human_name,
-      project_or_group: member_source.model_name.singular,
-      role: member.human_access.downcase
-    }
-
-    if format == :html
-      options.merge!(
-        inviter: (link_to member.created_by.name, user_url(member.created_by)).html_safe,
-        strong_start: '<strong>'.html_safe,
-        strong_end: '</strong>'.html_safe
-      )
-    end
-
-    if reminder_index == 2
-      options[:invitation_age] = (Date.current - member.created_at.to_date).to_i
-    end
-
-    body = invitation_reminder_body_text(reminder_index)
-
-    (format == :html ? ERB::Util.html_escape(body) : body) % options
-  end
-
-  def invitation_reminder_accept_link(token, format: nil)
-    case format
-    when :html
-      link_to s_('InviteReminderEmail|Accept invitation'), invite_url(token), class: 'invite-btn-join'
-    else
-      s_('InviteReminderEmail|Accept invitation: %{invite_url}') % { invite_url: invite_url(token) }
-    end
-  end
-
-  def invitation_reminder_decline_link(token, format: nil)
-    case format
-    when :html
-      link_to s_('InviteReminderEmail|Decline invitation'), decline_invite_url(token), class: 'invite-btn-decline'
-    else
-      s_('InviteReminderEmail|Decline invitation: %{decline_url}') % { decline_url: decline_invite_url(token) }
-    end
-  end
-
-  private
-
-  def invitation_reminder_body_text(reminder_index)
-    case reminder_index
-    when 0
-      s_('InviteReminderEmail|%{inviter} is waiting for you to join the %{strong_start}%{project_or_group_name}%{strong_end} %{project_or_group} as a %{role}.')
-    when 1
-      s_('InviteReminderEmail|This is a friendly reminder that %{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end} %{project_or_group} as a %{role}.')
-    when 2
-      s_("InviteReminderEmail|It's been %{invitation_age} days since %{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end} %{project_or_group} as a %{role}. What would you like to do?")
-    end
-  end
-end
diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb
index 8bdc1c0a706..7743a3dd7f8 100644
--- a/app/mailers/emails/members.rb
+++ b/app/mailers/emails/members.rb
@@ -50,29 +50,6 @@ module Emails
         subject: subject("Access to the #{human_name} #{member_source.model_name.singular} was denied"))
     end
 
-    def member_invited_reminder_email(member_source_type, member_id, token, reminder_index)
-      @member_source_type = member_source_type
-      @member_id = member_id
-      @token = token
-      @reminder_index = reminder_index
-
-      return unless member_exists? && member.created_by && member.invite_to_unknown_user?
-
-      subjects = {
-        0 => s_("InviteReminderEmail|%{inviter}'s invitation to GitLab is pending"),
-        1 => s_('InviteReminderEmail|%{inviter} is waiting for you to join GitLab'),
-        2 => s_('InviteReminderEmail|%{inviter} is still waiting for you to join GitLab')
-      }
-
-      subject_line = subjects[reminder_index] % { inviter: member.created_by.name }
-
-      email_with_layout(
-        layout: 'unknown_user_mailer',
-        to: member.invite_email,
-        subject: subject(subject_line)
-      )
-    end
-
     def member_invite_accepted_email(member_source_type, member_id)
       @member_source_type = member_source_type
       @member_id = member_id
diff --git a/app/mailers/members/invite_reminder_mailer.rb b/app/mailers/members/invite_reminder_mailer.rb
new file mode 100644
index 00000000000..dc7b0de73fc
--- /dev/null
+++ b/app/mailers/members/invite_reminder_mailer.rb
@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+module Members
+  class InviteReminderMailer < ApplicationMailer
+    include SafeFormatHelper
+
+    helper EmailsHelper
+
+    helper_method :reminder_common_body_options
+
+    layout 'unknown_user_mailer'
+
+    def email(member, token, reminder_index)
+      @member = member
+      @token = token
+      @reminder_index = reminder_index
+
+      return unless valid_to_email?
+
+      @email_instance = email_klass[reminder_index].new
+
+      subject_line = format(email_instance.subject, inviter: member.created_by.name)
+
+      mail_with_locale(to: member.invite_email, subject: EmailsHelper.subject_with_suffix([subject_line]))
+    end
+
+    private
+
+    attr_reader :token, :member, :reminder_index, :email_instance
+
+    def email_klass
+      {
+        0 => FirstEmail,
+        1 => SecondEmail,
+        2 => LastEmail
+      }
+    end
+
+    def valid_to_email?
+      return true if member.present? && member.created_by && member.invite_to_unknown_user?
+
+      Gitlab::AppLogger.info('Tried to send an email invitation for an invalid member.') if member.blank?
+
+      false
+    end
+
+    def reminder_common_body_options(member)
+      {
+        project_or_group_name: member.source.human_name,
+        project_or_group: member.source.model_name.singular,
+        role: member.human_access.downcase
+      }
+    end
+
+    class FirstEmail
+      def subject
+        s_("InviteReminderEmail|%{inviter}'s invitation to GitLab is pending")
+      end
+
+      def salutation
+        s_('InviteReminderEmail|Invitation pending')
+      end
+
+      alias_method :salutation_html, :salutation
+
+      def body_text
+        s_(
+          'InviteReminderEmail|%{inviter} is waiting for you to join the ' \
+            '%{strong_start}%{project_or_group_name}%{strong_end} %{project_or_group} as a %{role}.'
+        )
+      end
+
+      def extra_body_options(_)
+        {}
+      end
+    end
+
+    class SecondEmail
+      include SafeFormatHelper
+
+      def subject
+        s_('InviteReminderEmail|%{inviter} is waiting for you to join GitLab')
+      end
+
+      def salutation
+        s_('InviteReminderEmail|Hey there!')
+      end
+
+      def salutation_html
+        wave_emoji_tag = Gitlab::Emoji.gl_emoji_tag(TanukiEmoji.find_by_alpha_code('wave'))
+        safe_format(s_('InviteReminderEmail|Hey there %{wave_emoji}'), wave_emoji: wave_emoji_tag)
+      end
+
+      def body_text
+        s_(
+          'InviteReminderEmail|This is a friendly reminder that %{inviter} invited you to join the ' \
+            '%{strong_start}%{project_or_group_name}%{strong_end} %{project_or_group} as a %{role}.'
+        )
+      end
+
+      def extra_body_options(_)
+        {}
+      end
+    end
+
+    class LastEmail
+      def subject
+        s_('InviteReminderEmail|%{inviter} is still waiting for you to join GitLab')
+      end
+
+      def salutation
+        s_('InviteReminderEmail|In case you missed it...')
+      end
+
+      alias_method :salutation_html, :salutation
+
+      def body_text
+        s_(
+          "InviteReminderEmail|It's been %{invitation_age} days since %{inviter} invited you to join the " \
+            "%{strong_start}%{project_or_group_name}%{strong_end} %{project_or_group} as a %{role}. " \
+            "What would you like to do?"
+        )
+      end
+
+      def extra_body_options(created_at_date)
+        {
+          invitation_age: (Date.current - created_at_date).to_i
+        }
+      end
+    end
+  end
+end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index b77f305e1e7..87bd5f563a2 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -4,7 +4,6 @@ class Notify < ApplicationMailer
   include ActionDispatch::Routing::PolymorphicRoutes
   include GitlabRoutingHelper
   include EmailsHelper
-  include ReminderEmailsHelper
   include IssuablesHelper
 
   mattr_accessor :override_layout_lookup_table, default: {}
@@ -34,7 +33,6 @@ class Notify < ApplicationMailer
   helper DiffHelper
   helper BlobHelper
   helper EmailsHelper
-  helper ReminderEmailsHelper
   helper MembersHelper
   helper AvatarsHelper
   helper GitlabRoutingHelper
diff --git a/app/mailers/previews/members/invite_reminder_mailer_preview.rb b/app/mailers/previews/members/invite_reminder_mailer_preview.rb
new file mode 100644
index 00000000000..59ce1432044
--- /dev/null
+++ b/app/mailers/previews/members/invite_reminder_mailer_preview.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Members
+  class InviteReminderMailerPreview < ActionMailer::Preview
+    def first_reminder_email
+      Members::InviteReminderMailer.email(member, '1234', 0).message
+    end
+
+    def second_reminder_email
+      Members::InviteReminderMailer.email(member, '1234', 1).message
+    end
+
+    def last_reminder_email
+      Members::InviteReminderMailer.email(member, '1234', 2).message
+    end
+
+    private
+
+    def member
+      Member.not_accepted_invitations.with_created_by.last
+    end
+  end
+end
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index 33800c6ccc0..73ed87a5c25 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -461,7 +461,7 @@ class NotifyPreview < ActionMailer::Preview
   end
 
   def member
-    @member ||= Member.last
+    @member ||= Member.non_invite.last
   end
 
   def key
diff --git a/app/models/member.rb b/app/models/member.rb
index b2164f307f4..04039e2724c 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -154,6 +154,7 @@ class Member < ApplicationRecord
   scope :not_accepted_invitations_by_user, ->(user) { not_accepted_invitations.where(created_by: user) }
   scope :not_expired, ->(today = Date.current) { where(arel_table[:expires_at].gt(today).or(arel_table[:expires_at].eq(nil))) }
   scope :expiring_and_not_notified, ->(date) { where("expiry_notified_at is null AND expires_at >= ? AND expires_at <= ?", Date.current, date) }
+  scope :with_created_by, -> { where.associated(:created_by) }
 
   scope :created_today, -> do
     now = Date.current
@@ -526,7 +527,9 @@ class Member < ApplicationRecord
 
     generate_invite_token! unless @raw_invite_token
 
-    run_after_commit_or_now { notification_service.invite_member_reminder(self, @raw_invite_token, reminder_index) }
+    run_after_commit_or_now do
+      Members::InviteReminderMailer.email(self, @raw_invite_token, reminder_index).deliver_later
+    end
   end
 
   def create_notification_setting
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 2b18ae98915..3678a41e108 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -315,14 +315,6 @@ class Repository
     false
   end
 
-  def branch_or_tag?(ref)
-    return false unless exists?
-
-    ref = Gitlab::Git.ref_name(ref, types: 'heads|tags')
-
-    branch_exists?(ref) || tag_exists?(ref)
-  end
-
   def search_branch_names(pattern)
     redis_set_cache.search('branch_names', pattern) { branch_names }
   end
diff --git a/app/services/ci/list_config_variables_service.rb b/app/services/ci/list_config_variables_service.rb
index 462af2afe05..35b59eb63b7 100644
--- a/app/services/ci/list_config_variables_service.rb
+++ b/app/services/ci/list_config_variables_service.rb
@@ -18,28 +18,25 @@ module Ci
     end
 
     def execute(ref)
-      # "ref" is not a enough for a cache key because the name is static but that branch can be changed any time.
       sha = project.commit(ref).try(:sha)
-      with_reactive_cache(ref, sha) { |result| result }
+
+      with_reactive_cache(sha) { |result| result }
     end
 
-    def calculate_reactive_cache(ref, sha)
+    def calculate_reactive_cache(sha)
       config = ::Gitlab::Ci::ProjectConfig.new(project: project, sha: sha)
 
       return {} unless config.exists?
 
-      # The `ref` parameter should be branch or tag name. However, the API also accepts a commit SHA and we can't
-      # change it to not introduce breaking changes. Instead, here we're checking if a commit SHA is passed
-      # as `ref`. If so, we should verify the sha whether it belongs to the project in YamlProcessor.
-      sha_passed_as_ref_parameter = !project.repository.branch_or_tag?(ref)
+      ref_name = Gitlab::Ci::RefFinder.new(project).find_by_sha(sha)
 
       result = Gitlab::Ci::YamlProcessor.new(
         config.content,
         project: project,
         user: current_user,
         sha: sha,
-        ref: ref,
-        verify_project_sha: sha_passed_as_ref_parameter
+        ref: ref_name,
+        verify_project_sha: true
       ).execute
 
       result.valid? ? result.root_variables_with_prefill_data : {}
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index bd75cc2474a..4d3bf1efedc 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -568,10 +568,6 @@ class NotificationService
     mailer.member_about_to_expire_email(member.real_source_type, member.id).deliver_later
   end
 
-  def invite_member_reminder(group_member, token, reminder_index)
-    mailer.member_invited_reminder_email(group_member.real_source_type, group_member.id, token, reminder_index).deliver_later
-  end
-
   def project_was_moved(project, old_path_with_namespace)
     recipients = project_moved_recipients(project)
     recipients = notifiable_users(recipients, :custom, custom_action: :moved_project, project: project)
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index f8bce65a394..9e726048e43 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -8,7 +8,7 @@
 %h1.gl-sr-only= @breadcrumb_title
 
 - if can?(current_user, :admin_group, @group)
-  = render ::Layouts::SettingsBlockComponent.new(_('Naming, visibility'),
+  = render ::Layouts::SettingsBlockComponent.new(_('Naming, description, visibility'),
     id: 'js-general-settings',
     testid: 'general-settings',
     expanded: true) do |c|
diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml
index 5880b0157eb..478204553dc 100644
--- a/app/views/groups/settings/_general.html.haml
+++ b/app/views/groups/settings/_general.html.haml
@@ -7,33 +7,34 @@
       .form-group.col-md-5
         = f.label :name, s_('Groups|Group name'), class: 'label-bold'
         = f.text_field :name, class: 'form-control', data: { testid: 'group-name-field' }
-        .text-muted
+        %span.form-text.text-muted
           = s_('Groups|Must start with letter, digit, emoji, or underscore. Can also contain periods, dashes, spaces, and parentheses.')
 
-      .form-group.col-md-7
+      .form-group.col-md-4
         = f.label :id, s_('Groups|Group ID'), class: 'label-bold'
-        = f.text_field :id, class: 'form-control w-auto', readonly: true
+        = f.text_field :id, class: 'form-control gl-form-input', readonly: true
 
-    .row.gl-mt-3
+    .form-group.gl-mt-4.gl-mb-9
+      = render Pajamas::AvatarComponent.new(@group, size: 96, alt: '', class: 'gl-float-left gl-mr-5')
+      = f.label :avatar, s_('Groups|Group avatar'), class: 'label-bold gl-block'
+      = render 'shared/choose_avatar_button', f: f
+      - if @group.avatar?
+        %hr
+        = link_button_to s_('Groups|Remove avatar'), group_avatar_path(@group.to_param), aria: { label: s_('Groups|Remove avatar') }, data: { confirm: s_('Groups|Avatar will be removed. Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :delete, variant: :danger, category: :secondary
+
+    .row
       .form-group.col-md-9
         = f.label :description, s_('Groups|Group description (optional)'), class: 'label-bold'
-        = f.text_area :description, class: 'form-control', rows: 3, maxlength: 500
+        = f.text_area :description, class: 'form-control', rows: 4, maxlength: 500
 
-    .row.gl-mt-3
+    = render 'shared/repository_size_limit_setting_registration_features_cta', form: f
+    = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
+
+    .row
       .form-group.col-md-5
         = f.label :description, s_('Groups|Group README'), class: 'label-bold'
         #js-group-settings-readme{ data: group_settings_readme_app_data(@group) }
 
-  = render 'shared/repository_size_limit_setting_registration_features_cta', form: f
-  = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
-
-  .form-group.gl-mt-3.gl-mb-6
-    = render Pajamas::AvatarComponent.new(@group, size: 96, alt: '', class: 'gl-float-left gl-mr-5')
-    = f.label :avatar, s_('Groups|Group avatar'), class: 'label-bold gl-block'
-    = render 'shared/choose_avatar_button', f: f
-    - if @group.avatar?
-      %hr
-      = link_button_to s_('Groups|Remove avatar'), group_avatar_path(@group.to_param), aria: { label: s_('Groups|Remove avatar') }, data: { confirm: s_('Groups|Avatar will be removed. Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :delete, variant: :danger, category: :secondary
   .form-group.gl-form-group
     = render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
   = f.submit s_('Groups|Save changes'), pajamas_button: true, class: 'js-dirty-submit', data: { testid: 'save-name-visibility-settings-button' }
diff --git a/app/views/members/invite_reminder_mailer/email.html.haml b/app/views/members/invite_reminder_mailer/email.html.haml
new file mode 100644
index 00000000000..f95ed0f652c
--- /dev/null
+++ b/app/views/members/invite_reminder_mailer/email.html.haml
@@ -0,0 +1,12 @@
+%tr
+  %td.text-content
+    %h2.invite-header
+      = @email_instance.salutation_html
+    %p.invite-body
+      - options = { inviter: link_to(@member.created_by.name, user_url(@member.created_by)) }.merge(reminder_common_body_options(@member))
+      = safe_format(@email_instance.body_text,
+        options.merge(tag_pair(tag.strong,
+        :strong_start, :strong_end)).merge(@email_instance.extra_body_options(@member.created_at.to_date)))
+    %p.invite-actions
+      = link_to s_('InviteReminderEmail|Accept invitation'), invite_url(@token), class: 'invite-btn-join'
+      = link_to s_('InviteReminderEmail|Decline invitation'), decline_invite_url(@token), class: 'invite-btn-decline'
diff --git a/app/views/members/invite_reminder_mailer/email.text.erb b/app/views/members/invite_reminder_mailer/email.text.erb
new file mode 100644
index 00000000000..06991a65de4
--- /dev/null
+++ b/app/views/members/invite_reminder_mailer/email.text.erb
@@ -0,0 +1,13 @@
+<%= @email_instance.salutation %>
+
+<% options = {
+    inviter: sanitize_name(@member.created_by.name),
+    strong_start: '',
+    strong_end: ''
+  }.merge(reminder_common_body_options(@member))
+%>
+
+<%= format(@email_instance.body_text, options.merge(@email_instance.extra_body_options(@member.created_at.to_date))) %>
+
+<%= s_('InviteReminderEmail|Accept invitation: %{invite_url}') % { invite_url: invite_url(@token) } %>
+<%= s_('InviteReminderEmail|Decline invitation: %{decline_url}') % { decline_url: decline_invite_url(@token) } %>
diff --git a/app/views/notify/member_invited_reminder_email.html.haml b/app/views/notify/member_invited_reminder_email.html.haml
deleted file mode 100644
index 720f3510722..00000000000
--- a/app/views/notify/member_invited_reminder_email.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-%tr
-  %td.text-content
-    %h2.invite-header
-      = invitation_reminder_salutation(@reminder_index, format: :html)
-    %p.invite-body
-      = invitation_reminder_body(member, @reminder_index, format: :html)
-    %p.invite-actions
-      = invitation_reminder_accept_link(@token, format: :html)
-      = invitation_reminder_decline_link(@token, format: :html)
diff --git a/app/views/notify/member_invited_reminder_email.text.erb b/app/views/notify/member_invited_reminder_email.text.erb
deleted file mode 100644
index 97f34f01385..00000000000
--- a/app/views/notify/member_invited_reminder_email.text.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= invitation_reminder_salutation(@reminder_index) %>
-
-<%= invitation_reminder_body(member, @reminder_index) %>
-
-<%= invitation_reminder_accept_link(@token) %>
-<%= invitation_reminder_decline_link(@token) %>
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 416a83baead..6ccceaf693f 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -3,16 +3,18 @@
 - add_page_specific_style 'page_bundles/projects_edit'
 - reduce_visibility_form_id = 'reduce-visibility-form'
 - @force_desktop_expanded_sidebar = true
+- project_docs_path = help_page_path('user/project/working_with_projects')
+- project_docs_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: project_docs_path }
 
 %h1.gl-sr-only= @breadcrumb_title
 
 - if can?(current_user, :admin_project, @project)
-  = render ::Layouts::SettingsBlockComponent.new(_('Naming, topics, avatar'),
+  = render ::Layouts::SettingsBlockComponent.new(_('Naming, description, topics'),
     id: 'js-general-settings',
     testid: 'general-settings-content',
     expanded: true) do |c|
     - c.with_description do
-      = _('Update your project name, topics, description, and avatar.')
+      = html_escape(_('Update your project name, description, avatar, and topics. %{link_start}Learn more about projects%{link_end}.')) % { link_start: project_docs_link_start, link_end: '</a>'.html_safe }
     - c.with_body do
       = render 'projects/settings/general'
 
diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml
index 2d15805b88e..5ec5969e82d 100644
--- a/app/views/projects/settings/_general.html.haml
+++ b/app/views/projects/settings/_general.html.haml
@@ -8,33 +8,35 @@
         = f.label :name, class: 'label-bold', for: 'project_name_edit' do
           = _('Project name')
         = f.text_field :name, class: 'form-control gl-form-input', id: "project_name_edit", data: { testid: 'project-name-field' }
+        %span.form-text.text-muted
+          = _('Must start with letter, digit, emoji, or underscore. Can also contain periods, dashes, spaces, and parentheses.')
 
-      .form-group.col-md-7
+      .form-group.col-md-4
         = f.label :id, class: 'label-bold' do
           = _('Project ID')
-        = f.text_field :id, class: 'form-control gl-form-input w-auto', readonly: true
+        = f.text_field :id, class: 'form-control gl-form-input', readonly: true
+
+    .form-group.gl-mt-2.gl-mb-8
+      = render Pajamas::AvatarComponent.new(@project, size: 96, alt: '', class: 'gl-float-left gl-mr-5')
+      = f.label :avatar, _('Project avatar'), class: 'label-bold gl-block'
+      = render 'shared/choose_avatar_button', f: f
+      - if @project.avatar?
+        %hr
+        = link_button_to _('Remove avatar'), project_avatar_path(@project), aria: { label: _('Remove avatar') }, data: { confirm: _('Avatar will be removed. Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :delete, variant: :danger, category: :secondary
+
+    .row
+      .form-group.col-md-9
+        = f.label :description, _('Project description (optional)'), class: 'label-bold'
+        = f.text_area :description, class: 'form-control gl-form-input', rows: 4
+
+    .row= render_if_exists 'projects/classification_policy_settings', f: f
+
+    = render 'shared/repository_size_limit_setting_registration_features_cta', form: f
+    = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project
 
     .row
       .form-group.col-md-9
         .js-topics-selector{ data: { hidden_input_id: hidden_topics_field_id } }
         = f.hidden_field :topics, value: @project.topic_list.join(', '), id: hidden_topics_field_id
 
-    .row
-      .form-group.col-md-9
-        = f.label :description, _('Project description (optional)'), class: 'label-bold'
-        = f.text_area :description, class: 'form-control gl-form-input', rows: 3
-
-  .row= render_if_exists 'projects/classification_policy_settings', f: f
-
-  = render 'shared/repository_size_limit_setting_registration_features_cta', form: f
-  = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project
-
-  .form-group.gl-mt-3.gl-mb-3
-    = render Pajamas::AvatarComponent.new(@project, size: 96, alt: '', class: 'gl-float-left gl-mr-5')
-    = f.label :avatar, _('Project avatar'), class: 'label-bold gl-block'
-    = render 'shared/choose_avatar_button', f: f
-    - if @project.avatar?
-      %hr
-      = link_button_to _('Remove avatar'), project_avatar_path(@project), aria: { label: _('Remove avatar') }, data: { confirm: _('Avatar will be removed. Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :delete, variant: :danger, category: :secondary
-
-  = f.submit _('Save changes'), pajamas_button: true, class: "gl-mt-6", data: { testid: 'save-naming-topics-avatar-button' }
+  = f.submit _('Save changes'), pajamas_button: true, data: { testid: 'save-naming-topics-avatar-button' }
diff --git a/app/views/shared/_auto_devops_callout.html.haml b/app/views/shared/_auto_devops_callout.html.haml
index 4b084f1e759..c117c5d651d 100644
--- a/app/views/shared/_auto_devops_callout.html.haml
+++ b/app/views/shared/_auto_devops_callout.html.haml
@@ -1,4 +1,4 @@
-%div{ class: [container_class, @content_class, 'gl-pt-5!'] }
+%div{ class: [container_class, @content_class, '!gl-pt-5'] }
   = render Pajamas::BannerComponent.new(button_text: s_('AutoDevOps|Enable in settings'),
     button_link: project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'),
     svg_path: 'illustrations/devops-sm.svg',
diff --git a/app/views/shared/_captcha_check.html.haml b/app/views/shared/_captcha_check.html.haml
index b3b2ae0d969..785eb8e7ccd 100644
--- a/app/views/shared/_captcha_check.html.haml
+++ b/app/views/shared/_captcha_check.html.haml
@@ -3,7 +3,7 @@
 - script = local_assigns.fetch(:script, true)
 - method = params[:action] == 'create' ? :post : :put
 
-%h1.page-title.gl-font-size-h-display
+%h1.page-title.gl-text-size-h-display
   = _('Anti-spam verification')
 %hr
 
diff --git a/app/views/shared/_divider.html.haml b/app/views/shared/_divider.html.haml
index 1967163b6ae..0a2b5d85211 100644
--- a/app/views/shared/_divider.html.haml
+++ b/app/views/shared/_divider.html.haml
@@ -1,4 +1,4 @@
-.gl-display-flex.gl-align-items-center.gl-gap-5{ data: { testid: 'divider' } }
-  %hr.gl-flex-grow-1.gl-border-gray-100
+.gl-flex.gl-items-center.gl-gap-5{ data: { testid: 'divider' } }
+  %hr.gl-grow.gl-border-gray-100
   = local_assigns[:text]
-  %hr.gl-flex-grow-1.gl-border-gray-100
+  %hr.gl-grow.gl-border-gray-100
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index 9d55db102f9..6d6313e276c 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -1,6 +1,6 @@
 - show_group_events = local_assigns.fetch(:show_group_events, false)
 
-.scrolling-tabs-container.inner-page-scroll-tabs.gl-flex-grow-1.gl-min-w-0.gl-w-full
+.scrolling-tabs-container.inner-page-scroll-tabs.gl-grow.gl-min-w-0.gl-w-full
   %button.fade-left{ type: 'button', title: _('Scroll left'), 'aria-label': _('Scroll left') }
     = sprite_icon('chevron-lg-left', size: 12)
   %button.fade-right{ type: 'button', title: _('Scroll right'), 'aria-label': _('Scroll right') }
diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml
index a789592e792..df7216af3df 100644
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
@@ -7,6 +7,6 @@
 
 #blob-content.file-content.code.js-syntax-highlight
   .blob-content{ data: { blob_id: blob.id, path: blob.path, highlight_line: highlight } }
-    %pre{ class: "code highlight gl-border-none!" }
+    %pre{ class: "code highlight !gl-border-none" }
       %code.gl-border-none
         = highlighted_blob
diff --git a/app/views/shared/_ide_root.html.haml b/app/views/shared/_ide_root.html.haml
index 173b081d693..4731adfcd8a 100644
--- a/app/views/shared/_ide_root.html.haml
+++ b/app/views/shared/_ide_root.html.haml
@@ -5,6 +5,6 @@
 -# 100vh because of the presence of the bottom bar
 
 #ide.gl-h-full{ data: data }
-  .web-ide-loader.gl-display-flex.gl-justify-content-center.gl-align-items-center.gl-flex-direction-column.gl-h-full.gl-mx-auto
+  .web-ide-loader.gl-flex.gl-justify-center.gl-items-center.gl-flex-col.gl-h-full.gl-mx-auto
     = brand_header_logo
     %h3.clblack.gl-mt-6= loading_text
diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml
index 9b741e82a21..d784a98ca7a 100644
--- a/app/views/shared/_issuable_meta_data.html.haml
+++ b/app/views/shared/_issuable_meta_data.html.haml
@@ -5,22 +5,22 @@
 - issuable_mr        = @issuable_meta_data[issuable.id].merge_requests_count
 
 - if issuable_mr > 0
-  %li.gl-block.has-tooltip{ title: _('Related merge requests'), data: { testid: 'merge-requests' }, class: 'gl-mr-0!' }
+  %li.gl-block.has-tooltip{ title: _('Related merge requests'), data: { testid: 'merge-requests' }, class: '!gl-mr-0' }
     = sprite_icon('merge-request', css_class: "gl-align-middle")
     = issuable_mr
 
 - if note_count > 0
-  %li.gl-block.has-tooltip{ title: _('Comments'), data: { testid: 'issuable-comments' }, class: 'gl-mr-0!' }
+  %li.gl-block.has-tooltip{ title: _('Comments'), data: { testid: 'issuable-comments' }, class: '!gl-mr-0' }
     = sprite_icon('comments', css_class: "gl-align-middle")
     = note_count
 
 - if upvotes > 0
-  %li.gl-block.has-tooltip{ title: _('Upvotes'), data: { testid: 'issuable-upvotes' }, class: 'gl-mr-0!' }
+  %li.gl-block.has-tooltip{ title: _('Upvotes'), data: { testid: 'issuable-upvotes' }, class: '!gl-mr-0' }
     = sprite_icon('thumb-up', css_class: "gl-align-middle")
     = upvotes
 
 - if downvotes > 0
-  %li.gl-block.has-tooltip{ title: _('Downvotes'), data: { testid: 'issuable-downvotes' }, class: 'gl-mr-0!' }
+  %li.gl-block.has-tooltip{ title: _('Downvotes'), data: { testid: 'issuable-downvotes' }, class: '!gl-mr-0' }
     = sprite_icon('thumb-down', css_class: "gl-align-middle")
     = downvotes
 
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml
index 4c2966c35cc..6d6daa758a5 100644
--- a/app/views/shared/_label.html.haml
+++ b/app/views/shared/_label.html.haml
@@ -11,7 +11,7 @@
     = render "shared/label_row", label: label, force_priority: force_priority
     %ul.label-actions-list
       - if can?(current_user, :admin_label, @project)
-        %li.gl-display-inline-block.js-toggle-priority.gl-ml-3{ data: { url: remove_priority_project_label_path(@project, label),
+        %li.gl-inline-block.js-toggle-priority.gl-ml-3{ data: { url: remove_priority_project_label_path(@project, label),
           dom_id: dom_id(label), type: label.type } }
           = render Pajamas::ButtonComponent.new(category: :tertiary,
             size: :small,
@@ -22,7 +22,7 @@
             icon: 'star-o',
             button_options: { class: 'add-priority has-tooltip', title: _('Prioritize'), aria_label: _('Prioritize label'), data: { placement: 'bottom' } })
       - if current_user
-        %li.gl-display-inline-block.label-subscription.js-label-subscription.gl-ml-3.gl-mt-1
+        %li.gl-inline-block.label-subscription.js-label-subscription.gl-ml-3.gl-mt-1
           - if label.can_subscribe_to_label_in_different_levels?
             = render Pajamas::ButtonComponent.new(size: :small, button_options: { class: "js-unsubscribe-button gl-w-full #{'hidden' if status.unsubscribed?}", data: { url: toggle_subscription_path, toggle: 'tooltip', container: 'body' }, title: tooltip_title }) do
               = _('Unsubscribe')
@@ -42,7 +42,7 @@
             = render Pajamas::ButtonComponent.new(size: :small, button_options: { class: 'js-subscribe-button gl-w-full', data: { status: status, url: toggle_subscription_path, toggle: 'tooltip', container: 'body' }, title: tooltip_title }) do
               = label_subscription_toggle_button_text(label, @project)
       - if can?(current_user, :admin_label, label)
-        %li.gl-display-inline-block
+        %li.gl-inline-block
           - can_promote = label.project_label? && label.project.group && can?(current_user, :admin_label, label.project.group)
           .js-vue-label-actions{ data: {
             label_id: label.id,
diff --git a/app/views/shared/_label_full_path.html.haml b/app/views/shared/_label_full_path.html.haml
index 9176e96ba4a..1127f086627 100644
--- a/app/views/shared/_label_full_path.html.haml
+++ b/app/views/shared/_label_full_path.html.haml
@@ -1,6 +1,6 @@
 - full_path = label.subject_full_name
 
-.gl-font-sm.gl-font-semibold.gl-text-secondary
+.gl-text-sm.gl-font-semibold.gl-text-secondary
   - if label.project_label?
     = sprite_icon('project', size: 12, css_class: 'gl-text-gray-600')
   - else
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index 77367c224f9..2c83fa2207c 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -2,7 +2,7 @@
 - show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues)
 - show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests)
 
-.label-name.gl-flex-shrink-0.gl-mr-5
+.label-name.gl-shrink-0.gl-mr-5
   = render_label(label, link: '#', tooltip: true, tooltip_shows_title: true)
   - if show_labels_full_path?(@project, @group)
     .gl-mt-2
diff --git a/app/views/shared/_md_preview.html.haml b/app/views/shared/_md_preview.html.haml
index 6f3655e69d3..10d1b676774 100644
--- a/app/views/shared/_md_preview.html.haml
+++ b/app/views/shared/_md_preview.html.haml
@@ -9,9 +9,9 @@
       = _('Only project members can comment.')
 
 .md-area.position-relative
-  .md-header.gl-px-3.gl-rounded-top-base.gl-border-b.gl-border-gray-100
-    .gl-display-flex.gl-align-items-center.gl-flex-wrap.gl-justify-content-space-between
-      .md-header-toolbar.gl-display-flex.gl-py-3.gl-flex-wrap.gl-gap-y-3
+  .md-header.gl-px-3.gl-rounded-t-base.gl-border-b.gl-border-gray-100
+    .gl-flex.gl-items-center.gl-flex-wrap.gl-justify-between
+      .md-header-toolbar.gl-flex.gl-py-3.gl-flex-wrap.gl-gap-y-3
         = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, button_options: { class: 'js-md-preview-button', value: 'preview' }) do
           = _('Preview')
         = render 'shared/blob/markdown_buttons', supports_quick_actions: supports_quick_actions
diff --git a/app/views/shared/_merge_request_pipeline_status.html.haml b/app/views/shared/_merge_request_pipeline_status.html.haml
index 6ae188f91f7..926f151d4e9 100644
--- a/app/views/shared/_merge_request_pipeline_status.html.haml
+++ b/app/views/shared/_merge_request_pipeline_status.html.haml
@@ -1,3 +1,3 @@
 - if can?(current_user, :read_pipeline, merge_request.head_pipeline)
-  %li.issuable-pipeline-status.gl-display-flex
-    = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'gl-display-flex'
+  %li.issuable-pipeline-status.gl-flex
+    = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'gl-flex'
diff --git a/app/views/shared/_milestones_filter.html.haml b/app/views/shared/_milestones_filter.html.haml
index 810954bc880..e792e4df1fe 100644
--- a/app/views/shared/_milestones_filter.html.haml
+++ b/app/views/shared/_milestones_filter.html.haml
@@ -1,6 +1,6 @@
 -  count_badge_classes = 'gl-hidden sm:gl-inline-flex'
 
-= gl_tabs_nav({class: 'gl-border-b-0 gl-flex-grow-1', data: { testid: 'milestones-filter' } }) do
+= gl_tabs_nav({class: 'gl-border-b-0 gl-grow', data: { testid: 'milestones-filter' } }) do
   = gl_tab_link_to milestones_filter_path(state: 'opened'), { item_active: params[:state].blank? || params[:state] == 'opened' } do
     = _('Open')
     = gl_tab_counter_badge counts[:opened], { class: count_badge_classes }
diff --git a/app/views/shared/_silent_mode_banner.html.haml b/app/views/shared/_silent_mode_banner.html.haml
index 10e5d05fad2..6b0eb7b6d27 100644
--- a/app/views/shared/_silent_mode_banner.html.haml
+++ b/app/views/shared/_silent_mode_banner.html.haml
@@ -1,7 +1,7 @@
 - return unless ::Gitlab::SilentMode.enabled?
 
 = content_for :page_level_alert do
-  %div{ class: [container_class, @content_class, 'gl-pt-5!'] }
+  %div{ class: [container_class, @content_class, '!gl-pt-5'] }
     = render Pajamas::AlertComponent.new(title: s_('SilentMode|Silent mode is enabled'),
       dismissible: false,
       variant: :warning) do |c|
diff --git a/app/views/shared/_web_ide_button.html.haml b/app/views/shared/_web_ide_button.html.haml
index 5f281946d3c..c06571d14b2 100644
--- a/app/views/shared/_web_ide_button.html.haml
+++ b/app/views/shared/_web_ide_button.html.haml
@@ -3,4 +3,4 @@
 - fork_options = fork_modal_options(@project, blob)
 - css_classes = false unless local_assigns[:css_classes]
 
-.gl-display-inline-block{ data: { options: button_data.merge(fork_options).to_json, web_ide_promo_popover_img: image_path('web-ide-promo-popover.svg'), css_classes: css_classes }, id: "js-#{type}-web-ide-link" }
+.gl-inline-block{ data: { options: button_data.merge(fork_options).to_json, web_ide_promo_popover_img: image_path('web-ide-promo-popover.svg'), css_classes: css_classes }, id: "js-#{type}-web-ide-link" }
diff --git a/app/views/shared/deploy_keys/_project_group_form.html.haml b/app/views/shared/deploy_keys/_project_group_form.html.haml
index c79f21bbefe..3a764d87240 100644
--- a/app/views/shared/deploy_keys/_project_group_form.html.haml
+++ b/app/views/shared/deploy_keys/_project_group_form.html.haml
@@ -9,7 +9,7 @@
     = f.text_field :title, class: 'form-control gl-form-input gl-form-input-xl', required: true, data: { testid: 'deploy-key-title-field' }
   .form-group
     = f.label :key, class: "label-bold"
-    = f.text_area :key, class: 'form-control gl-form-input gl-form-input-xl gl-h-auto!', rows: 5, required: true, data: { testid: 'deploy-key-field' }
+    = f.text_area :key, class: 'form-control gl-form-input gl-form-input-xl !gl-h-auto', rows: 5, required: true, data: { testid: 'deploy-key-field' }
     .form-text.text-muted
       = _('Paste a public key here.')
       = link_to _('How do I generate it?'), help_page_path("user/ssh")
diff --git a/app/views/shared/doorkeeper/applications/_form.html.haml b/app/views/shared/doorkeeper/applications/_form.html.haml
index 5f1571fa166..5d85210bc90 100644
--- a/app/views/shared/doorkeeper/applications/_form.html.haml
+++ b/app/views/shared/doorkeeper/applications/_form.html.haml
@@ -1,6 +1,6 @@
 - show_cancel_button = local_assigns.fetch(:cancel, false)
 
-= gitlab_ui_form_for @application, url: url, html: { role: 'form', class: 'doorkeeper-app-form gl-max-w-80 gl-display-inline-block' } do |f|
+= gitlab_ui_form_for @application, url: url, html: { role: 'form', class: 'doorkeeper-app-form gl-max-w-80 gl-inline-block' } do |f|
   = form_errors(@application)
 
   .form-group
diff --git a/app/views/shared/doorkeeper/applications/_show.html.haml b/app/views/shared/doorkeeper/applications/_show.html.haml
index 9be3e86ca51..52f32b8f85b 100644
--- a/app/views/shared/doorkeeper/applications/_show.html.haml
+++ b/app/views/shared/doorkeeper/applications/_show.html.haml
@@ -40,7 +40,7 @@
 
     = render "shared/tokens/scopes_list", token: @application
 
-.gl-display-flex.gl-justify-content-space-between
+.gl-flex.gl-justify-between
   %div
     - if @created
       = link_button_to _('Continue'), index_path, class: 'gl-mr-3', variant: :confirm
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml
index 9bd562b3592..6c5480b40c5 100644
--- a/app/views/shared/form_elements/_description.html.haml
+++ b/app/views/shared/form_elements/_description.html.haml
@@ -7,7 +7,7 @@
 - preview_url = preview_markdown_path(project, target_type: model.class.name)
 
 .form-group
-  .gl-display-flex
+  .gl-flex
     = form.label :description, _('Description'), class: 'gl-block'
     - if model.is_a?(MergeRequest)
       = render_if_exists "/shared/form_elements/summarize_merge_request"
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index 14175fb177e..a0a7d883b80 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -1,27 +1,27 @@
 - user = local_assigns.fetch(:user, current_user)
 - access = user&.max_member_access_for_group(group.id)
 
-%li.group-row.py-3.gl-align-items-center{ class: "gl-display-flex!" }
+%li.group-row.py-3.gl-items-center{ class: "!gl-flex" }
   = link_to group do
     = render Pajamas::AvatarComponent.new(group, alt: group.name, size: 48, class: 'gl-mr-5')
-  .gl-min-w-0.gl-flex-grow-1
+  .gl-min-w-0.gl-grow
     .title
       = link_to group.full_name, group, class: 'group-name'
 
       - if access&.nonzero?
-        = render Pajamas::BadgeComponent.new(Gitlab::Access.human_access(access), variant: 'neutral', class: 'gl-bg-transparent! !gl-shadow-inner-1-gray-100')
+        = render Pajamas::BadgeComponent.new(Gitlab::Access.human_access(access), variant: 'neutral', class: '!gl-bg-transparent !gl-shadow-inner-1-gray-100')
 
     - if group.description.present?
       .description
         = markdown_field(group, :description)
 
-  .stats.gl-text-gray-500.gl-flex-shrink-0
+  .stats.gl-text-gray-500.gl-shrink-0
     %span.gl-ml-5.has-tooltip{ title: _('Projects') }
-      = sprite_icon('project', css_class: 'gl-vertical-align-text-bottom')
+      = sprite_icon('project', css_class: 'gl-align-text-bottom')
       = number_with_delimiter(group.non_archived_projects.size)
 
     %span.gl-ml-5.has-tooltip{ title: _('Users') }
-      = sprite_icon('users', css_class: 'gl-vertical-align-text-bottom')
+      = sprite_icon('users', css_class: 'gl-align-text-bottom')
       = number_with_delimiter(group.non_invite_group_members.size)
 
     %span.gl-ml-5.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) }
diff --git a/app/views/shared/hook_logs/_content.html.haml b/app/views/shared/hook_logs/_content.html.haml
index 3152399f2d4..0ec89b30b8a 100644
--- a/app/views/shared/hook_logs/_content.html.haml
+++ b/app/views/shared/hook_logs/_content.html.haml
@@ -1,4 +1,4 @@
-%span.gl-display-flex.gl-align-items-center
+%span.gl-flex.gl-items-center
   %h5
     = gl_badge_tag "POST", { variant: :info }
     = hook_log.url
@@ -16,7 +16,7 @@
     - c.with_body do
       = _('Error: %{error}') % { error: hook_log.internal_error_message }
 
-%span.gl-display-flex.gl-align-items-center
+%span.gl-flex.gl-items-center
   %h3
     = _('Response')
     = render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log }
diff --git a/app/views/shared/integrations/edit.html.haml b/app/views/shared/integrations/edit.html.haml
index 3361dfba5d2..27801461119 100644
--- a/app/views/shared/integrations/edit.html.haml
+++ b/app/views/shared/integrations/edit.html.haml
@@ -2,7 +2,7 @@
 - breadcrumb_title @integration.title
 - page_title @integration.title, _('Integrations')
 
-.gl-display-flex.gl-align-items-center.gl-gap-3.gl-mt-5
+.gl-flex.gl-items-center.gl-gap-3.gl-mt-5
   = render Pajamas::AvatarComponent.new(@integration, size: 64, alt: '')
   %h2.gl-m-0
     = @integration.title
diff --git a/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml b/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml
index dea16c3683d..e90f386a569 100644
--- a/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml
+++ b/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml
@@ -12,15 +12,15 @@
         %th= _('Created')
         %th
     %tr
-      %td{ class: 'gl-py-3!' }
+      %td{ class: '!gl-py-3' }
         = slack_integration.team_name
       - if integration.project_level?
-        %td{ class: 'gl-py-3!' }
+        %td{ class: '!gl-py-3' }
           = slack_integration.alias
-      %td{ class: 'gl-py-3!' }
+      %td{ class: '!gl-py-3' }
         = time_ago_with_tooltip(slack_integration.created_at)
-      %td{ class: 'gl-py-3!' }
-        .controls.gl-display-flex.gl-justify-content-end.gl-gap-3
+      %td{ class: '!gl-py-3' }
+        .controls.gl-flex.gl-justify-end.gl-gap-3
           - if integration.project_level?
             = render Pajamas::ButtonComponent.new(href: edit_project_settings_slack_path(integration.parent)) do
               = _('Edit')
diff --git a/app/views/shared/integrations/mattermost_slash_commands/_installation_info.html.haml b/app/views/shared/integrations/mattermost_slash_commands/_installation_info.html.haml
index ac14e1a6cd7..e8f2144943a 100644
--- a/app/views/shared/integrations/mattermost_slash_commands/_installation_info.html.haml
+++ b/app/views/shared/integrations/mattermost_slash_commands/_installation_info.html.haml
@@ -1,5 +1,5 @@
 .services-installation-info
   - unless integration.activated?
-    = render Pajamas::ButtonComponent.new(href: new_project_mattermost_path(@project), button_text_classes: 'gl-display-flex gl-gap-2') do
+    = render Pajamas::ButtonComponent.new(href: new_project_mattermost_path(@project), button_text_classes: 'gl-flex gl-gap-2') do
       = custom_icon('mattermost_logo')
       = s_("MattermostService|Add to Mattermost")
diff --git a/app/views/shared/integrations/overrides.html.haml b/app/views/shared/integrations/overrides.html.haml
index 5d67f63bb2a..f5e7948cc31 100644
--- a/app/views/shared/integrations/overrides.html.haml
+++ b/app/views/shared/integrations/overrides.html.haml
@@ -2,7 +2,7 @@
 - breadcrumb_title @integration.title
 - page_title @integration.title, _('Integrations')
 
-%h1.page-title.gl-font-size-h-display
+%h1.page-title.gl-text-size-h-display
   = @integration.title
 
 - if @integration.title == 'Beyond Identity' && Feature.enabled?(:beyond_identity_exclusions)
diff --git a/app/views/shared/issuable/_nav.html.haml b/app/views/shared/issuable/_nav.html.haml
index c48f51dc9bc..95a04a78c94 100644
--- a/app/views/shared/issuable/_nav.html.haml
+++ b/app/views/shared/issuable/_nav.html.haml
@@ -2,7 +2,7 @@
 - page_context_word = type.to_s.humanize(capitalize: false)
 - display_count = local_assigns.fetch(:display_count, true)
 
-= gl_tabs_nav({ class: 'issues-state-filters gl-border-b-0 gl-flex-grow-1' }) do
+= gl_tabs_nav({ class: 'issues-state-filters gl-border-b-0 gl-grow' }) do
   = gl_tab_link_to page_filter_path(state: 'opened'), { item_active: params[:state] == 'opened', id: 'state-opened', title: _("Filter by %{page_context_word} that are currently open.") % { page_context_word: page_context_word }, data: { state: 'opened' } } do
     #{issuables_state_counter_text(type, :opened, display_count)}
   - if type == :merge_requests
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index 81f583a116e..b66a454f097 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -7,8 +7,8 @@
 - block_css_class = type != :productivity_analytics ? 'row-content-block second-block' : ''
 
 .issues-filters
-  .issues-details-filters.filtered-search-block.gl-flex.gl-flex-direction-column.gl-lg-flex-direction-row.gl-gap-3{ class: block_css_class }
-    .gl-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-grow-1.gl-w-full
+  .issues-details-filters.filtered-search-block.gl-flex.gl-flex-col.lg:gl-flex-row.gl-gap-3{ class: block_css_class }
+    .gl-flex.gl-flex-col.md:gl-flex-row.gl-grow.gl-w-full
       = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form gl-w-full' do
         - if params[:search].present?
           = hidden_field_tag :search, params[:search]
@@ -18,7 +18,7 @@
               - c.with_label do
                 %span.gl-sr-only
                   = _('Select all')
-        .issues-other-filters.filtered-search-wrapper.gl-flex.gl-flex-direction-column.gl-md-flex-direction-row
+        .issues-other-filters.filtered-search-wrapper.gl-flex.gl-flex-col.md:gl-flex-row
           .filtered-search-box
             - if type != :boards
               - text = tag.span(sprite_icon('history')) + tag.span(_('Recent searches'), class: "gl-sr-only")
@@ -205,7 +205,7 @@
               = render_if_exists 'shared/issuable/filter_weight', type: type
               = render_if_exists 'shared/issuable/filter_epic', type: type
 
-            = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, icon: 'clear', icon_classes: "clear-search-icon", button_options: { class: 'clear-search hidden gl-align-self-center gl-mr-1 has-tooltip', title: _('Clear') })
-    .filter-dropdown-container.gl-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-align-items-flex-start
+            = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, icon: 'clear', icon_classes: "clear-search-icon", button_options: { class: 'clear-search hidden gl-self-center gl-mr-1 has-tooltip', title: _('Clear') })
+    .filter-dropdown-container.gl-flex.gl-flex-col.md:gl-flex-row.gl-items-start
       - if type != :productivity_analytics && show_sorting_dropdown
         = render 'shared/issuable/sort_dropdown'
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 546d8088115..277a444da96 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -9,12 +9,12 @@
 - in_group_context_with_iterations = @project.group.present? && issuable_sidebar[:supports_iterations]
 - is_merge_request = issuable_type === 'merge_request'
 - add_page_specific_style 'page_bundles/labels'
-- sidebar_header_classes = 'md:gl-flex lg:!gl-hidden gl-justify-content-end' if is_merge_request
+- sidebar_header_classes = 'md:gl-flex lg:!gl-hidden gl-justify-end' if is_merge_request
 
 %aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { auto_collapse: true, always_show_toggle: true, signed: { in: signed_in }, issuable_type: issuable_type }, class: "#{sidebar_gutter_collapsed_class(is_merge_request)} #{'right-sidebar-merge-requests' if is_merge_request}", 'aria-live' => 'polite', 'aria-label': issuable_type }
   .issuable-sidebar{ class: "#{'is-merge-request' if is_merge_request}" }
     .issuable-sidebar-header{ class: sidebar_header_classes }
-      = render Pajamas::ButtonComponent.new(button_options: { class: "gutter-toggle gl-float-right js-sidebar-toggle has-tooltip !gl-shadow-none gl-display-block #{'gl-mt-2' if notifications_todos_buttons_enabled?}" , type: 'button', 'aria-label' => _('Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }) do
+      = render Pajamas::ButtonComponent.new(button_options: { class: "gutter-toggle gl-float-right js-sidebar-toggle has-tooltip !gl-shadow-none gl-block #{'gl-mt-2' if notifications_todos_buttons_enabled?}" , type: 'button', 'aria-label' => _('Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }) do
         = sidebar_gutter_toggle_icon
       - if signed_in
         - if !is_merge_request
@@ -22,7 +22,7 @@
         - if notifications_todos_buttons_enabled?
           .js-sidebar-subscriptions-widget-root
 
-    = form_for issuable_type, url: issuable_sidebar[:issuable_json_path], remote: true, html: { class: "issuable-context-form inline-update js-issuable-update #{'gl-pr-2!' if is_merge_request}" } do |f|
+    = form_for issuable_type, url: issuable_sidebar[:issuable_json_path], remote: true, html: { class: "issuable-context-form inline-update js-issuable-update #{'!gl-pr-2' if is_merge_request}" } do |f|
       .block.assignee{ class: "#{'gl-mt-3' if !signed_in}", data: { testid: 'assignee-block-container' } }
         = render "shared/issuable/sidebar_assignees", issuable_sidebar: issuable_sidebar, assignees: assignees, signed_in: signed_in
 
@@ -63,7 +63,7 @@
       - if issuable_sidebar[:supports_time_tracking]
         .js-sidebar-time-tracking-root.block
           // Fallback while content is loading
-          .title.hide-collapsed.gl-display-flex.gl-justify-content-space-between.gl-align-items-center{ class: 'gl-mb-0!' }
+          .title.hide-collapsed.gl-flex.gl-justify-between.gl-items-center{ class: '!gl-mb-0' }
             %span.gl-font-bold= _('Time tracking')
             = gl_loading_icon(inline: true)
 
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml
index 166fdc92b6b..4a1356b120d 100644
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
@@ -4,6 +4,6 @@
 .js-sidebar-assignees-root{ data: { field: issuable_type,
   max_assignees: dropdown_options[:data][:"max-select"],
   directly_invite_members: can_admin_project_member?(@project) } }
-  .title.hide-collapsed.gl-display-flex.gl-justify-content-space-between.gl-align-items-center{ class: 'gl-mb-0!' }
+  .title.hide-collapsed.gl-flex.gl-justify-between.gl-items-center{ class: '!gl-mb-0' }
     %span.gl-font-bold= s_('Label|Assignee')
     = gl_loading_icon(inline: true)
diff --git a/app/views/shared/issuable/_sidebar_reviewers.html.haml b/app/views/shared/issuable/_sidebar_reviewers.html.haml
index f98c7ae599a..2d82be89e39 100644
--- a/app/views/shared/issuable/_sidebar_reviewers.html.haml
+++ b/app/views/shared/issuable/_sidebar_reviewers.html.haml
@@ -1,7 +1,7 @@
 - issuable_type = issuable_sidebar[:type]
 
 .js-sidebar-reviewers-root{ data: { field: issuable_type, signed_in: signed_in } }
-  .title.hide-collapsed.gl-display-flex.gl-justify-content-space-between.gl-align-items-center{ class: 'gl-mb-0!' }
+  .title.hide-collapsed.gl-flex.gl-justify-between.gl-items-center{ class: '!gl-mb-0' }
     %span.gl-font-bold= _('Reviewers')
     = gl_loading_icon(inline: true)
 
diff --git a/app/views/shared/issuable/form/_metadata_issuable_assignee.html.haml b/app/views/shared/issuable/form/_metadata_issuable_assignee.html.haml
index 94bd0676049..e58bf26637f 100644
--- a/app/views/shared/issuable/form/_metadata_issuable_assignee.html.haml
+++ b/app/views/shared/issuable/form/_metadata_issuable_assignee.html.haml
@@ -8,4 +8,4 @@
       = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", 0, id: nil, data: { meta: '' }
 
     = dropdown_tag(users_dropdown_label(issuable.assignees), options: assignees_dropdown_options(issuable.to_ability_name))
-  = link_to _('Assign to me'), '#', class: "assign-to-me-link gl-whitespace-nowrap gl-md-pl-3 #{'hide' if issuable.assignees.include?(current_user)}", data: { testid: 'assign-to-me-link' }
+  = link_to _('Assign to me'), '#', class: "assign-to-me-link gl-whitespace-nowrap md:gl-pl-3 #{'hide' if issuable.assignees.include?(current_user)}", data: { testid: 'assign-to-me-link' }
diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml
index 90e124e7f90..60fca903861 100644
--- a/app/views/shared/labels/_form.html.haml
+++ b/app/views/shared/labels/_form.html.haml
@@ -19,7 +19,7 @@
       = f.label :color, _("Background color")
       .input-group
         .input-group-prepend
-          %input.label-color-preview.gl-w-7.gl-h-full.gl-border-1.gl-border-solid.gl-border-gray-500.gl-border-r-0.gl-rounded-top-right-none.gl-rounded-bottom-right-none{ type: "color", placeholder: _('Select color') }
+          %input.label-color-preview.gl-w-7.gl-h-full.gl-border-1.gl-border-solid.gl-border-gray-500.gl-border-r-0.gl-rounded-tr-none.gl-rounded-br-none{ type: "color", placeholder: _('Select color') }
         = f.text_field :color, class: "gl-form-input form-control", data: { testid: 'label-color-field' }
       .form-text.text-muted
         = _('Select a color from the color picker or from the presets below.')
@@ -31,7 +31,7 @@
           _('Lock label after a merge request is merged'),
           help_text: label_lock_on_merge_help_text,
           checkbox_options: { disabled: @label.lock_on_merge }
-  .gl-display-flex.gl-justify-content-space-between
+  .gl-flex.gl-justify-between
     %div
       - if @label.persisted?
         = f.submit _('Save changes'), class: 'js-save-button gl-mr-2', pajamas_button: true
diff --git a/app/views/shared/labels/_nav.html.haml b/app/views/shared/labels/_nav.html.haml
index 20838cedc8d..ea6e5c6fa6f 100644
--- a/app/views/shared/labels/_nav.html.haml
+++ b/app/views/shared/labels/_nav.html.haml
@@ -1,7 +1,7 @@
 - subscribed = params[:subscribed]
 
 .top-area.adjust
-  = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do
+  = gl_tabs_nav({ class: 'gl-grow gl-border-0' }) do
     = gl_tab_link_to _('All'), labels_filter_path, { item_active: subscribed != 'true' }
     - if current_user
       = gl_tab_link_to _('Subscribed'), labels_filter_path(subscribed: 'true'), { item_active: subscribed == 'true' }
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index ff1e72b17e2..7d0693eab07 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -34,7 +34,7 @@
 
         - if source.instance_of?(Group) && source != membership_source
           &middot;
-          = link_to source.full_name, source, class: "gl-display-inline-block inline-link"
+          = link_to source.full_name, source, class: "gl-inline-block inline-link"
 
         .gl-text-secondary.gl-text-sm
           - if member.request?
@@ -61,4 +61,4 @@
   - if show_roles
     .controls.member-controls.gl-items-center.gl-self-end
       = render_if_exists 'shared/members/ee/ldap_tag', can_override: member.can_override?
-      = render Pajamas::BadgeComponent.new(member.human_access, variant: 'neutral', class: 'gl-bg-transparent! !gl-shadow-inner-1-gray-100')
+      = render Pajamas::BadgeComponent.new(member.human_access, variant: 'neutral', class: '!gl-bg-transparent !gl-shadow-inner-1-gray-100')
diff --git a/app/views/shared/members/tab_pane/_form_item.html.haml b/app/views/shared/members/tab_pane/_form_item.html.haml
index 9e57d3329d7..0cbfabe8541 100644
--- a/app/views/shared/members/tab_pane/_form_item.html.haml
+++ b/app/views/shared/members/tab_pane/_form_item.html.haml
@@ -1,2 +1,2 @@
-.gl-px-3.gl-py-3.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row
+.gl-px-3.gl-py-3.gl-flex.gl-flex-col.md:gl-flex-row
   = yield
diff --git a/app/views/shared/members/tab_pane/_header.html.haml b/app/views/shared/members/tab_pane/_header.html.haml
index a02bf90eddf..2834daf3e61 100644
--- a/app/views/shared/members/tab_pane/_header.html.haml
+++ b/app/views/shared/members/tab_pane/_header.html.haml
@@ -1,2 +1,2 @@
-.gl-display-flex.gl-md-align-items-center.gl-flex-direction-column.gl-md-flex-direction-row.row-content-block.second-block
+.gl-flex.md:gl-items-center.gl-flex-col.md:gl-flex-row.row-content-block.second-block
   = yield
diff --git a/app/views/shared/members/tab_pane/_title.html.haml b/app/views/shared/members/tab_pane/_title.html.haml
index c1418a5f7c8..a2ce0006cde 100644
--- a/app/views/shared/members/tab_pane/_title.html.haml
+++ b/app/views/shared/members/tab_pane/_title.html.haml
@@ -1,2 +1,2 @@
-%span.gl-flex-grow-1.gl-py-3.gl-pr-3
+%span.gl-grow.gl-py-3.gl-pr-3
   = yield
diff --git a/app/views/shared/milestones/_header.html.haml b/app/views/shared/milestones/_header.html.haml
index 7fff665817a..95a31909043 100644
--- a/app/views/shared/milestones/_header.html.haml
+++ b/app/views/shared/milestones/_header.html.haml
@@ -14,7 +14,7 @@
     - can_promote = @project && can_admin_group_milestones? && milestone.project
     - can_read_milestone = can?(current_user, :read_milestone, @milestone)
 
-    .milestone-buttons.detail-page-header-actions.gl-display-flex.gl-align-self-start.gl-gap-3
+    .milestone-buttons.detail-page-header-actions.gl-flex.gl-self-start.gl-gap-3
       - if milestone.active?
         = render Pajamas::ButtonComponent.new(href: update_milestone_path(milestone, { state_event: :close }), method: :put, button_options: { class: 'btn-close gl-hidden md:gl-inline-block' }) do
           = _('Close milestone')
diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml
index ca9e79ec007..8217e7b00c7 100644
--- a/app/views/shared/milestones/_issuables.html.haml
+++ b/app/views/shared/milestones/_issuables.html.haml
@@ -5,10 +5,10 @@
   - c.with_header do
     .gl-flex-grow-2
       = title
-    .gl-ml-3.gl-flex-shrink-0.gl-font-bold.gl-whitespace-nowrap{ class: milestone_counter_class(primary) }
+    .gl-ml-3.gl-shrink-0.gl-font-bold.gl-whitespace-nowrap{ class: milestone_counter_class(primary) }
       - if show_counter
         %span
-          = sprite_icon('issues', css_class: 'gl-vertical-align-text-bottom')
+          = sprite_icon('issues', css_class: 'gl-align-text-bottom')
           = number_with_delimiter(issuables.length)
       = render_if_exists "shared/milestones/issuables_weight", issuables: issuables
   - c.with_body do
diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml
index 86eb9e093dc..54e8d59cc44 100644
--- a/app/views/shared/milestones/_labels_tab.html.haml
+++ b/app/views/shared/milestones/_labels_tab.html.haml
@@ -11,11 +11,11 @@
           - open_issues = milestone_issues_by_label_count(@milestone, label, state: :opened)
           - closed_issues = milestone_issues_by_label_count(@milestone, label, state: :closed)
 
-          %li.gl-list-style-none.gl-border-b.gl-last-of-type-border-b-0.md:gl-flex.gl-px-5.gl-py-4.gl-gap-5.gl-align-items-baseline
-            .gl-md-w-20.gl-flex-shrink-0.gl-flex-grow-1.gl-mb-4.gl-md-mb-0
+          %li.gl-list-none.gl-border-b.gl-last-of-type-border-b-0.md:gl-flex.gl-px-5.gl-py-4.gl-gap-5.gl-items-baseline
+            .md:gl-w-20.gl-shrink-0.gl-grow.gl-mb-4.md:gl-mb-0
               = render_label(label, tooltip: false, link: milestones_issues_path(options))
             - if markdown_field(label, :description).present?
-              .gl-w-full.gl-mb-4.gl-md-mb-0
+              .gl-w-full.gl-mb-4.md:gl-mb-0
                 = markdown_field(label, :description)
             = render Pajamas::ButtonComponent.new(variant: :link, disabled: open_issues == 0, href: milestones_issues_path(options.merge(state: 'opened'))) do
               = open_issues
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index a499ae1af62..3f6cb31e38b 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -50,7 +50,7 @@
     - if can_admin_milestone
       - show_delete = @project.present? || @group.present?
       .col-1.order-2.order-md-3
-        .gl-flex.gl-justify-content-end
+        .gl-flex.gl-justify-end
           .js-vue-milestone-actions{ data: { id: milestone.id,
             title: milestone.title,
             is_active: milestone.active?.to_s,
diff --git a/app/views/shared/milestones/_participants_tab.html.haml b/app/views/shared/milestones/_participants_tab.html.haml
index ea62f35ad2c..d09a100f21f 100644
--- a/app/views/shared/milestones/_participants_tab.html.haml
+++ b/app/views/shared/milestones/_participants_tab.html.haml
@@ -1,8 +1,8 @@
 %ul.bordered-list
   - users.each do |user|
     %li
-      = link_to user, title: user.name, class: "gl-display-flex" do
+      = link_to user, title: user.name, class: "gl-flex" do
         = render Pajamas::AvatarComponent.new(user, size: 32, class: "gl-mr-3")
-        .gl-display-flex.gl-flex-direction-column
+        .gl-flex.gl-flex-col
           %strong= truncate(user.name, length: 40)
           %small.gl-text-primary= user.username
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml
index ae2f7e586d5..f2bf17ad7ad 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -165,8 +165,8 @@
     - if milestone_ref.present?
       .block.reference
         = clipboard_button(text: milestone_ref, title: s_('MilestoneSidebar|Copy reference'), placement: "left", boundary: 'viewport', class: 'sidebar-collapsed-icon js-dont-change-state')
-        .gl-display-flex.gl-align-items-center.gl-justify-content-space-between.gl-mb-2.hide-collapsed
-          %span.gl-overflow-hidden.gl-text-overflow-ellipsis.gl-whitespace-nowrap
+        .gl-flex.gl-items-center.gl-justify-between.gl-mb-2.hide-collapsed
+          %span.gl-overflow-hidden.gl-text-ellipsis.gl-whitespace-nowrap
             = s_('MilestoneSidebar|Reference:')
             %span{ title: milestone_ref }
               = milestone_ref
diff --git a/app/views/shared/notes/_comment_button.html.haml b/app/views/shared/notes/_comment_button.html.haml
index 53205301ec7..c8227cc2642 100644
--- a/app/views/shared/notes/_comment_button.html.haml
+++ b/app/views/shared/notes/_comment_button.html.haml
@@ -1,5 +1,5 @@
 - noteable_name = @note.noteable.human_class_name
 
-.js-comment-type-dropdown.float-left.gl-sm-mr-3{ data: { noteable_name: noteable_name } }
+.js-comment-type-dropdown.float-left.sm:gl-mr-3{ data: { noteable_name: noteable_name } }
   = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, button_options: { class: 'js-comment-button js-comment-submit-button', value: _('Comment'), data: { testid: 'comment-button' }}) do
     = _('Comment')
diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml
index d37d707e935..6f3bc7bfdca 100644
--- a/app/views/shared/notes/_form.html.haml
+++ b/app/views/shared/notes/_form.html.haml
@@ -5,7 +5,7 @@
 - else
   - preview_url = preview_markdown_path(@project)
 
-= form_for form_resources, url: new_form_url, remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form discussion-reply-holder gl-border-top-0!", "data-noteable-iid" => @note.noteable.try(:iid), }, authenticity_token: true do |f|
+= form_for form_resources, url: new_form_url, remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form discussion-reply-holder !gl-border-t-0", "data-noteable-iid" => @note.noteable.try(:iid), }, authenticity_token: true do |f|
   = hidden_field_tag :view, diff_view
   = hidden_field_tag :line_type
   = hidden_field_tag :merge_request_diff_head_sha, @note.noteable.try(:diff_head_sha)
@@ -35,7 +35,7 @@
       = render 'shared/notes/hints'
       .error-alert
 
-    .note-form-actions.clearfix.gl-display-flex.gl-flex-wrap
+    .note-form-actions.clearfix.gl-flex.gl-flex-wrap
       = render partial: 'shared/notes/comment_button'
 
       = render Pajamas::ButtonComponent.new(button_options: { class: 'js-close-discussion-note-form hide' }) do
diff --git a/app/views/shared/notes/_hints.html.haml b/app/views/shared/notes/_hints.html.haml
index f358f251a24..69743cfa14b 100644
--- a/app/views/shared/notes/_hints.html.haml
+++ b/app/views/shared/notes/_hints.html.haml
@@ -1,11 +1,11 @@
 - supports_file_upload = local_assigns.fetch(:supports_file_upload, true)
-.comment-toolbar.gl-px-2.gl-display-flex.gl-justify-content-end.gl-rounded-bottom-left-base.gl-rounded-bottom-right-base.clearfix
-  .content-editor-switcher.gl-inline-flex.gl-align-items-center
-    = render Pajamas::ButtonComponent.new(category: :tertiary, icon: 'markdown-mark', size: :small, href: help_page_path('user/markdown'), target: '_blank', button_options: { class: 'gl-px-3!' })
+.comment-toolbar.gl-px-2.gl-flex.gl-justify-end.gl-rounded-bl-base.gl-rounded-br-base.clearfix
+  .content-editor-switcher.gl-inline-flex.gl-items-center
+    = render Pajamas::ButtonComponent.new(category: :tertiary, icon: 'markdown-mark', size: :small, href: help_page_path('user/markdown'), target: '_blank', button_options: { class: '!gl-px-3' })
   - if supports_file_upload
-    %span.uploading-container.gl-leading-32.gl-font-sm
+    %span.uploading-container.gl-leading-32.gl-text-sm
       %span.uploading-progress-container.hide
-        = sprite_icon('paperclip', css_class: 'gl-icon gl-vertical-align-text-bottom')
+        = sprite_icon('paperclip', css_class: 'gl-icon gl-align-text-bottom')
         %span.attaching-file-message
           -# Populated by app/assets/javascripts/dropzone_input.js
         %span.uploading-progress 0%
@@ -13,7 +13,7 @@
 
       %span.uploading-error-container.hide
         %span.uploading-error-icon
-          = sprite_icon('paperclip', css_class: 'gl-icon gl-vertical-align-text-bottom')
+          = sprite_icon('paperclip', css_class: 'gl-icon gl-align-text-bottom')
         %span.uploading-error-message
           -# Populated by app/assets/javascripts/dropzone_input.js
         = render Pajamas::ButtonComponent.new(variant: :link, button_options: { class: 'retry-uploading-link' }) do
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml
index 01a270e6f22..bd8e10bc875 100644
--- a/app/views/shared/notes/_note.html.haml
+++ b/app/views/shared/notes/_note.html.haml
@@ -26,7 +26,7 @@
             - elsif note_counter == 0
               - counter = badge_counter if local_assigns[:badge_counter]
               - badge_class = "hidden" if @fresh_discussion || counter.nil?
-              %span.gl-display-flex.gl-align-items-center.gl-justify-content-center.gl-font-sm.design-note-pin.small.user-avatar{ class: badge_class }
+              %span.gl-flex.gl-items-center.gl-justify-center.gl-text-sm.design-note-pin.small.user-avatar{ class: badge_class }
                 = counter
     .timeline-content
       .note-header
@@ -67,8 +67,8 @@
           - if note.system
             .system-note-commit-list-toggler.hide
               = _("Toggle commit list")
-              = sprite_icon('chevron-down', css_class: 'js-chevron-down gl-ml-1 gl-vertical-align-text-bottom')
-              = sprite_icon('chevron-up', css_class: 'js-chevron-up gl-ml-1 gl-vertical-align-text-bottom gl-hidden')
+              = sprite_icon('chevron-down', css_class: 'js-chevron-down gl-ml-1 gl-align-text-bottom')
+              = sprite_icon('chevron-up', css_class: 'js-chevron-up gl-ml-1 gl-align-text-bottom gl-hidden')
         - if note.attachment.url
           .note-attachment
             - if note.attachment.image?
diff --git a/app/views/shared/projects/_dropdown.html.haml b/app/views/shared/projects/_dropdown.html.haml
index 48da690b089..28e9e14ef20 100644
--- a/app/views/shared/projects/_dropdown.html.haml
+++ b/app/views/shared/projects/_dropdown.html.haml
@@ -1,5 +1,5 @@
 - @sort ||= sort_value_latest_activity
-.dropdown.js-project-filter-dropdown-wrap.gl-inline{ class: 'gl-m-0!' }
+.dropdown.js-project-filter-dropdown-wrap.gl-inline{ class: '!gl-m-0' }
   = dropdown_toggle(projects_sort_options_hash[@sort], { toggle: 'dropdown', display: 'static' }, { id: 'sort-projects-dropdown' })
   %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
     %li.dropdown-header
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index ba616c45f89..4bcc4e777f8 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -37,7 +37,7 @@
     - load_max_project_member_accesses(projects) # Prime cache used in shared/projects/project view rendered below
     - load_catalog_resources(projects)
     - if card_mode
-      .projects-list.gl-text-secondary.gl-w-full.gl-display-flex.gl-flex-direction-column.gl-lg-flex-direction-row.gl-gap-4.gl-overflow-x-auto{ class: css_classes }
+      .projects-list.gl-text-secondary.gl-w-full.gl-flex.gl-flex-col.lg:gl-flex-row.gl-gap-4.gl-overflow-x-auto{ class: css_classes }
         - projects.take(projects_limit).each_with_index do |project, i| # rubocop: disable CodeReuse/ActiveRecord -- it's Enumerable#take
 
           = render "shared/projects/project_card", project: project, skip_namespace: skip_namespace,
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 5310690c71a..d8258f98c32 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -9,12 +9,12 @@
 - use_creator_avatar = local_assigns[:use_creator_avatar]
 - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && can_show_last_commit_in_list?(project)
 - access = max_project_member_access(project)
-- css_class = "sm:gl-flex gl-align-items-center !gl-align-middle" if project.description.blank? && !show_last_commit_as_description
+- css_class = "sm:gl-flex gl-items-center !gl-align-middle" if project.description.blank? && !show_last_commit_as_description
 - updated_tooltip = time_ago_with_tooltip(project.last_activity_at || project.updated_at)
 - show_pipeline_status_icon = pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project)
 - last_pipeline = last_pipeline_from_status_cache(project) if show_pipeline_status_icon
 - css_controls_class = "with-pipeline-status" if show_pipeline_status_icon && last_pipeline.present?
-- css_metadata_classes = "gl-display-flex gl-align-items-center !gl-text-inherit icon-wrapper has-tooltip"
+- css_metadata_classes = "gl-flex gl-items-center !gl-text-inherit icon-wrapper has-tooltip"
 
 %li.project-row
   - if avatar
@@ -26,9 +26,9 @@
           = render Pajamas::AvatarComponent.new(project, size: 48, alt: '')
 
   .project-cell{ class: css_class }
-    .project-details.gl-pr-9.gl-sm-pr-0.gl-w-full.gl-display-flex.gl-flex-direction-column{ data: { testid: 'project-content', qa_project_name: project.name } }
-      .gl-display-flex.gl-align-items-baseline.gl-flex-wrap
-        %h2.gl-font-base.gl-leading-20.gl-my-0.gl-wrap-anywhere
+    .project-details.gl-pr-9.gl-sm-pr-0.gl-w-full.gl-flex.gl-flex-col{ data: { testid: 'project-content', qa_project_name: project.name } }
+      .gl-flex.gl-items-baseline.gl-flex-wrap
+        %h2.gl-text-base.gl-leading-20.gl-my-0.gl-wrap-anywhere
           = link_to project_path(project), class: 'gl-text-default hover:gl-text-default gl-mr-3 js-prefetch-document', title: project.name do
             %span.namespace-name.gl-font-normal
               - if project.namespace && !skip_namespace
@@ -43,26 +43,26 @@
         = visibility_level_content(project, css_class: 'gl-mr-2')
 
         - if project.catalog_resource
-          = render partial: 'shared/ci_catalog_badge', locals: { href: explore_catalog_path(project.catalog_resource), css_class: 'gl-align-self-center gl-mr-2' }
+          = render partial: 'shared/ci_catalog_badge', locals: { href: explore_catalog_path(project.catalog_resource), css_class: 'gl-self-center gl-mr-2' }
 
         - if explore_projects_tab? && project_license_name(project)
-          %span.gl-inline-flex.gl-align-items-center.gl-mr-3
+          %span.gl-inline-flex.gl-items-center.gl-mr-3
             = sprite_icon('scale', size: 14, css_class: 'gl-mr-2')
             = project_license_name(project)
 
         - if !explore_projects_tab? && access&.nonzero?
           -# haml-lint:disable UnnecessaryStringOutput
           = ' ' # prevent haml from eating the space between elements
-          = render Pajamas::BadgeComponent.new(localized_project_human_access(access), variant: 'neutral', class: 'gl-bg-transparent! !gl-shadow-inner-1-gray-100', data: { testid: 'user-access-role' })
+          = render Pajamas::BadgeComponent.new(localized_project_human_access(access), variant: 'neutral', class: '!gl-bg-transparent !gl-shadow-inner-1-gray-100', data: { testid: 'user-access-role' })
 
         - if !explore_projects_tab?
-          = render_if_exists 'compliance_management/compliance_framework/compliance_framework_badge', project: project, additional_classes: 'gl-ml-2!'
+          = render_if_exists 'compliance_management/compliance_framework/compliance_framework_badge', project: project, additional_classes: '!gl-ml-2'
 
       - if show_last_commit_as_description
-        .description.gl-hidden.sm:gl-block.gl-overflow-hidden.gl-mr-3.gl-mt-2.gl-font-sm
+        .description.gl-hidden.sm:gl-block.gl-overflow-hidden.gl-mr-3.gl-mt-2.gl-text-sm
           = link_to_markdown(project.commit.title, project_commit_path(project, project.commit), class: "commit-row-message")
       - elsif project.description.present?
-        .description.gl-hidden.sm:gl-block.gl-overflow-hidden.gl-mr-3.gl-mt-2.gl-font-sm
+        .description.gl-hidden.sm:gl-block.gl-overflow-hidden.gl-mr-3.gl-mt-2.gl-text-sm
           = markdown_field(project, :description)
 
       - if project.topics.any?
@@ -71,8 +71,8 @@
 
       = render_if_exists 'shared/projects/removed', project: project
 
-      .gl-display-flex.gl-align-items-center.gl-mt-3{ class: "#{css_class} sm:!gl-hidden" }
-        .controls.gl-display-flex.gl-align-items-center
+      .gl-flex.gl-items-center.gl-mt-3{ class: "#{css_class} sm:!gl-hidden" }
+        .controls.gl-flex.gl-items-center
           - if show_pipeline_status_icon && last_pipeline.present?
             - pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref)
             %span.icon-wrapper.pipeline-status
@@ -83,14 +83,14 @@
             = link_to project_starrers_path(project), class: "#{css_metadata_classes} stars", title: _('Stars'), data: { container: 'body', placement: 'top' } do
               = sprite_icon('star-o', size: 14, css_class: 'gl-mr-2')
               = badge_count(project.star_count)
-        .updated-note.gl-font-sm.gl-ml-3.gl-sm-ml-0
+        .updated-note.gl-text-sm.gl-ml-3.gl-sm-ml-0
           %span
             = _('Updated')
             = updated_tooltip
         = render_if_exists 'shared/projects/actions', project: project
 
   .project-cell.project-controls{ class: "#{css_class} !gl-hidden sm:!gl-table-cell", data: { testid: 'project_controls'} }
-    .controls.gl-display-flex.gl-align-items-center.gl-mb-2.gl-gap-4{ class: "#{css_controls_class} gl-pr-0! gl-justify-content-end!" }
+    .controls.gl-flex.gl-items-center.gl-mb-2.gl-gap-4{ class: "#{css_controls_class} !gl-pr-0 !gl-justify-end" }
       - if show_pipeline_status_icon && last_pipeline.present?
         - pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref)
         %span.icon-wrapper.pipeline-status
@@ -114,7 +114,7 @@
           = sprite_icon('issues', size: 14, css_class: 'gl-mr-2')
           = badge_count(project.open_issues_count)
       = render_if_exists 'shared/projects/actions', project: project
-    .updated-note.gl-font-sm.gl-whitespace-nowrap.gl-justify-content-end
+    .updated-note.gl-text-sm.gl-whitespace-nowrap.gl-justify-end
       %span
         = _('Updated')
         = updated_tooltip
diff --git a/app/views/shared/projects/_project_card.html.haml b/app/views/shared/projects/_project_card.html.haml
index 0d28846bdcb..583ebf64eca 100644
--- a/app/views/shared/projects/_project_card.html.haml
+++ b/app/views/shared/projects/_project_card.html.haml
@@ -26,7 +26,7 @@
 
     .gl-w-full.gl-pt-2.gl-break-anywhere
       .gl-flex.gl-items-center.gl-flex-wrap
-        %h2.gl-font-base.gl-leading-20.gl-my-0
+        %h2.gl-text-base.gl-leading-20.gl-my-0
           = link_to project_path(project), class: 'gl-text-default hover:gl-text-default gl-mr-3 js-prefetch-document', title: project.name do
             %span.namespace-name.gl-font-normal
               - if project.namespace && !skip_namespace
@@ -38,10 +38,10 @@
         = visibility_level_content(project)
 
       - if show_last_commit_as_description
-        .description.gl-hidden.sm:gl-block.gl-mt-2.gl-font-sm
+        .description.gl-hidden.sm:gl-block.gl-mt-2.gl-text-sm
           = link_to_markdown(project.commit.title, project_commit_path(project, project.commit), class: "commit-row-message")
       - elsif project.description.present?
-        .description.gl-hidden.sm:gl-block.gl-mt-2.gl-font-sm
+        .description.gl-hidden.sm:gl-block.gl-mt-2.gl-text-sm
           = markdown_field(project, :description)
 
       - if project.topics.any?
@@ -83,7 +83,7 @@
               = render 'ci/status/icon', status: last_pipeline.detailed_status(current_user), tooltip_placement: 'top', path: pipeline_path
 
           = render_if_exists 'shared/projects/badges', project: project
-      .updated-note.gl-font-sm.gl-whitespace-nowrap.gl-justify-content-start
+      .updated-note.gl-text-sm.gl-whitespace-nowrap.gl-justify-start
         %span
           = _('Updated')
           = updated_tooltip
diff --git a/app/views/shared/projects/_search_form.html.haml b/app/views/shared/projects/_search_form.html.haml
index ee0b9139ec5..da3787bfddb 100644
--- a/app/views/shared/projects/_search_form.html.haml
+++ b/app/views/shared/projects/_search_form.html.haml
@@ -47,5 +47,5 @@
     - if params[:namespace_id].present?
       - namespace = Namespace.find(params[:namespace_id])
     - selected_text = "#{namespace.kind}: #{namespace.full_path}" if namespace
-    .gl-flex.gl-w-full.gl-md-w-auto{ class: '!gl-m-0' }
+    .gl-flex.gl-w-full.md:gl-w-auto{ class: '!gl-m-0' }
       .js-namespace-select{ data: { field_name: 'namespace_id', selected_id: namespace&.id, selected_text: selected_text, update_location: 'true' } }
diff --git a/app/views/shared/projects/_topics.html.haml b/app/views/shared/projects/_topics.html.haml
index b22e7cc85d4..87de4bc2600 100644
--- a/app/views/shared/projects/_topics.html.haml
+++ b/app/views/shared/projects/_topics.html.haml
@@ -1,7 +1,7 @@
 - max_project_topic_length = 15
 
 - if project.topics.present?
-  .gl-w-full.gl-inline-flex.gl-flex-wrap.gl-font-base.gl-font-normal.gl-align-items-center.-gl-mx-2.-gl-my-2{ 'data-testid': 'project_topic_list' }
+  .gl-w-full.gl-inline-flex.gl-flex-wrap.gl-text-base.gl-font-normal.gl-items-center.-gl-mx-2.-gl-my-2{ 'data-testid': 'project_topic_list' }
     - project.topics_to_show.each do |topic|
       - explore_project_topic_path = topic_explore_projects_cleaned_path(topic_name: topic[:name])
       - if topic[:title].length > max_project_topic_length
diff --git a/app/views/shared/runners/_runner_details.html.haml b/app/views/shared/runners/_runner_details.html.haml
index bce84f65666..cbb5419c66b 100644
--- a/app/views/shared/runners/_runner_details.html.haml
+++ b/app/views/shared/runners/_runner_details.html.haml
@@ -1,4 +1,4 @@
-%h1.page-title.gl-font-size-h-display.gl-display-flex.gl-align-items-center
+%h1.page-title.gl-text-size-h-display.gl-flex.gl-items-center
   = s_('Runners|Runner #%{runner_id}') % { runner_id: runner.id }
   = render 'shared/runners/runner_type_badge', runner: runner
 
diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml
index 20028964052..2b2c6cb6e57 100644
--- a/app/views/shared/snippets/_snippet.html.haml
+++ b/app/views/shared/snippets/_snippet.html.haml
@@ -1,23 +1,23 @@
 - link_project = local_assigns.fetch(:link_project, false)
 - notes_count = @noteable_meta_data[snippet.id].user_notes_count
 
-%li.gl-py-4.sm:gl-flex.gl-align-items-center.gl-justify-content-space-between.gl-border-b{ data: { testid: 'snippet-link', qa_snippet_title: snippet.title } }
+%li.gl-py-4.sm:gl-flex.gl-items-center.gl-justify-between.gl-border-b{ data: { testid: 'snippet-link', qa_snippet_title: snippet.title } }
   - unless current_path?('users#snippets')
-    .gl-hidden.sm:gl-block.gl-sm-mr-3
+    .gl-hidden.sm:gl-block.sm:gl-mr-3
       = render Pajamas::AvatarComponent.new(snippet.author, size: 32, alt: "")
 
-  .sm:gl-flex.gl-justify-content-space-between.gl-align-items-center.gl-flex-grow-1
+  .sm:gl-flex.gl-justify-between.gl-items-center.gl-grow
     %div
-      = link_to gitlab_snippet_path(snippet), class: "title gl-text-black-normal gl-font-bold" do
+      = link_to gitlab_snippet_path(snippet), class: "title gl-text-default gl-font-bold" do
         = snippet.title
       - if snippet.hidden_due_to_author_ban?
         %span{ class: 'has-tooltip gl-bg-orange-50 gl-text-orange-600 border-radius-default gl-p-2', title: s_("Snippets|This snippet is hidden because its author has been banned") }
           = sprite_icon('spam', size: '16')
 
-      .snippet-info.gl-font-sm.gl-text-gray-500!
+      .snippet-info.gl-text-sm{ class: '!gl-text-gray-500' }
         .gl-inline{ data: { testid: 'snippet-created-at'} }
           - created_at = time_ago_with_tooltip(snippet.created_at, placement: 'bottom')
-          - author = link_to(snippet.author_name, user_snippets_path(snippet.author), data: { user_id: snippet.author.id }, class: 'gl-text-black-normal')
+          - author = link_to(snippet.author_name, user_snippets_path(snippet.author), data: { user_id: snippet.author.id }, class: 'gl-text-default')
           #{snippet.to_reference} &middot;
           - if link_project && snippet.project_id?
             - project_link = link_to(snippet.project.full_name, project_path(snippet.project))
@@ -25,8 +25,8 @@
           - else
             = _('created %{timeAgo} by %{author}').html_safe % { timeAgo: created_at, author: author }
 
-    .sm:gl-flex.gl-flex-direction-column.gl-align-items-flex-end{ data: { testid: 'snippet-file-count-content', qa_snippet_files: snippet.statistics&.file_count } }
-      .gl-display-flex.gl-gap-4.gl-align-items-center
+    .sm:gl-flex.gl-flex-col.gl-items-end{ data: { testid: 'snippet-file-count-content', qa_snippet_files: snippet.statistics&.file_count } }
+      .gl-flex.gl-gap-4.gl-items-center
         - if notes_count > 0
           %span.has-tooltip{ title: _('Comments') }
             = sprite_icon('comments')
@@ -34,4 +34,4 @@
         = snippet_file_count(snippet)
         %span.has-tooltip{ title: visibility_level_label(snippet.visibility_level), data: { testid: 'snippet-visibility-content', qa_snippet_visibility: visibility_level_label(snippet.visibility_level) } }
           = visibility_level_icon(snippet.visibility_level)
-      .gl-whitespace-nowrap.gl-font-sm.gl-text-secondary= _('updated %{timeAgo}').html_safe % { timeAgo: time_ago_with_tooltip(snippet.updated_at, placement: 'bottom') }
+      .gl-whitespace-nowrap.gl-text-sm.gl-text-secondary= _('updated %{timeAgo}').html_safe % { timeAgo: time_ago_with_tooltip(snippet.updated_at, placement: 'bottom') }
diff --git a/app/views/shared/topics/_topic.html.haml b/app/views/shared/topics/_topic.html.haml
index de2682d9d40..c0473ddb61d 100644
--- a/app/views/shared/topics/_topic.html.haml
+++ b/app/views/shared/topics/_topic.html.haml
@@ -3,7 +3,7 @@
 
 .col-lg-3.col-md-4.col-sm-12
   = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' },
-                                      body_options: { class: 'gl-display-flex gl-align-items-center' }) do |c|
+                                      body_options: { class: 'gl-flex gl-items-center' }) do |c|
     - c.with_body do
       = link_to detail_page_link do
         = render Pajamas::AvatarComponent.new(topic, size: 48, alt: '', class: 'gl-mr-3')
diff --git a/app/views/shared/usage_quotas/_index.html.haml b/app/views/shared/usage_quotas/_index.html.haml
index 50d69cc4498..6ee65d57815 100644
--- a/app/views/shared/usage_quotas/_index.html.haml
+++ b/app/views/shared/usage_quotas/_index.html.haml
@@ -12,7 +12,7 @@
     = yield :usage_quotas_subtitle
 
 #js-usage-quotas-view
-  .gl-font-lg.text-center
+  .gl-text-lg.text-center
     %span.gl-mr-1= s_('UsageQuota|Loading Usage Quotas tabs')
     = render Pajamas::SpinnerComponent.new(inline: true, size: :md)
   = yield :usage_quotas_tabs
diff --git a/app/views/shared/web_hooks/_hook.html.haml b/app/views/shared/web_hooks/_hook.html.haml
index e763f2dc3a6..b0f255d687e 100644
--- a/app/views/shared/web_hooks/_hook.html.haml
+++ b/app/views/shared/web_hooks/_hook.html.haml
@@ -23,7 +23,7 @@
             = gl_badge_tag(integration_webhook_event_human_name(trigger), variant: :neutral)
         = gl_badge_tag(sslBadgeText, variant: :neutral)
 
-    .gl-font-sm
+    .gl-text-sm
       = truncate(hook.description, length: 200)
 
     .gl-flex.gl-items-baseline.gl-gap-3
diff --git a/app/views/shared/wikis/diff.html.haml b/app/views/shared/wikis/diff.html.haml
index 784c12386f7..c13688b6c54 100644
--- a/app/views/shared/wikis/diff.html.haml
+++ b/app/views/shared/wikis/diff.html.haml
@@ -32,7 +32,7 @@
         %strong
           = commit_author_link(commit, avatar: true, size: 24)
         - if commit.description.present?
-          %pre.commit-description.gl-whitespace-pre-wrap.gl-line-height-normal
+          %pre.commit-description.gl-whitespace-pre-wrap.gl-leading-normal
             = preserve(markdown_field(commit, :description))
 
 = render 'projects/diffs/diffs', diffs: @diffs, diff_page_context: "is-wiki"
diff --git a/app/views/shared/wikis/git_error.html.haml b/app/views/shared/wikis/git_error.html.haml
index c1a7cd23eb3..6fec85b2ad5 100644
--- a/app/views/shared/wikis/git_error.html.haml
+++ b/app/views/shared/wikis/git_error.html.haml
@@ -5,9 +5,9 @@
 
 - git_access_url = wiki_path(@wiki, action: :git_access)
 
-.wiki-page-header.top-area.gl-flex-direction-column.gl-lg-flex-direction-row
+.wiki-page-header.top-area.gl-flex-col.lg:gl-flex-row
   .gl-mt-5.gl-mb-3
-    .gl-display-flex.gl-justify-content-space-between
+    .gl-flex.gl-justify-between
       %h2.gl-mt-0.gl-mb-5{ data: { testid: 'page-heading' } }= @page ? @page.human_title : _('Failed to retrieve page')
     .js-wiki-page-content.md.gl-pt-2{ data: { testid: 'wiki-page-content' } }
       = _('The page could not be displayed because it timed out.')
diff --git a/config/feature_flags/gitlab_com_derisk/rules_exist_expand_globs_early.yml b/config/feature_flags/experiment/prompt_migration_refactor_code.yml
similarity index 60%
rename from config/feature_flags/gitlab_com_derisk/rules_exist_expand_globs_early.yml
rename to config/feature_flags/experiment/prompt_migration_refactor_code.yml
index b095891640c..bc999ad6d4a 100644
--- a/config/feature_flags/gitlab_com_derisk/rules_exist_expand_globs_early.yml
+++ b/config/feature_flags/experiment/prompt_migration_refactor_code.yml
@@ -1,9 +1,9 @@
 ---
-name: rules_exist_expand_globs_early
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386595
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160446
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/477245
-milestone: '17.3'
-group: group::pipeline authoring
-type: gitlab_com_derisk
+name: prompt_migration_refactor_code
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/475050
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162716
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/479117
+milestone: '17.4'
+group: group::custom models
+type: experiment
 default_enabled: false
diff --git a/data/whats_new/202408150001_17_03.yml b/data/whats_new/202408150001_17_03.yml
new file mode 100644
index 00000000000..2b3f4898c67
--- /dev/null
+++ b/data/whats_new/202408150001_17_03.yml
@@ -0,0 +1,100 @@
+- name: Troubleshoot failed jobs with root cause analysis
+  description: |
+    Root cause analysis is now generally available. With root cause analysis, you can troubleshoot failed jobs in CI/CD pipelines faster. This AI-powered feature analyzes the failed job log, quickly determines the root cause of the job failure, and suggests a fix for you.
+  stage: verify
+  self-managed: true
+  gitlab-com: true
+  available_in: [Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/gitlab_duo_chat/examples.html#troubleshoot-failed-cicd-jobs-with-root-cause-analysis
+  image_url: https://img.youtube.com/vi/Yf7Iidf2GW8/hqdefault.jpg
+  published_at: 2024-08-15
+  release: 17.3
+
+- name: Resolve a vulnerability with AI
+  description: |
+    Vulnerability resolution uses AI to give specific code suggestions for users to fix vulnerabilities. With the click of a button you can open a merge request to get started resolving any SAST vulnerability from the [list of supported CWE identifiers](https://docs.gitlab.com/ee/user/application_security/vulnerabilities/#availability).
+  stage: govern
+  self-managed: true
+  gitlab-com: true
+  available_in: [Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/application_security/vulnerabilities/#vulnerability-resolution
+  image_url: https://about.gitlab.com/images/17_3/vulnerability_resolution.png
+  published_at: 2024-08-15
+  release: 17.3
+
+- name: Add multiple compliance frameworks to a single project
+  description: |
+    You can create a compliance framework to identify that your project has certain compliance requirements or needs additional oversight.
+    The compliance framework can optionally enforce compliance pipeline configuration to the projects on which it is applied.
+
+    Previously, you could apply only one compliance framework to a project, which limited how many compliance requirements could be set on a project.
+    We have now provided the ability for a user to apply multiple different compliance frameworks per project. The project is then set with the compliance requirements of each framework.
+  stage: govern
+  self-managed: true
+  gitlab-com: true
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/group/compliance_frameworks.html#add-a-compliance-framework-to-a-project
+  image_url: https://about.gitlab.com/images/17_3/multiple-compliance-frameworks.png
+  published_at: 2024-08-15
+  release: 17.3
+
+- name: Delete a pod from the GitLab UI
+  description: |
+    Have you ever needed to restart or delete a failing pod in Kubernetes? Until now, you had to leave GitLab, use another tool to connect to the cluster, stop the pod, and wait for a new pod to start. GitLab now has built-in support for deleting pods, so you can smoothly troubleshoot your Kubernetes clusters.
+
+     You can stop a pod from a [dashboard for Kubernetes](https://docs.gitlab.com/ee/ci/environments/kubernetes_dashboard.html), which lists all the pods across your cluster or namespace.
+  stage: deploy
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/ci/environments/kubernetes_dashboard.html#delete-a-pod
+  image_url: https://about.gitlab.com/images/17_3/delete-pod.png
+  published_at: 2024-08-15
+  release: 17.3
+
+- name: Easily connect to a cluster from your local terminal
+  description: |
+    Do you want to connect to a Kubernetes cluster from your local terminal or using one of the desktop Kubernetes GUI tools?
+    GitLab allows you to connect to a terminal using the [user access feature of the agent for Kubernetes](https://docs.gitlab.com/ee/user/clusters/agent/user_access.html). Previously, finding commands required navigating out of GitLab to browse the documentation. Now, GitLab provides the **connect** command from the UI. GitLab can even help you configure user access!
+
+    To retrieve the connection command, either go to a [Kubernetes dashboard](https://docs.gitlab.com/ee/ci/environments/kubernetes_dashboard.html), or to the [agent list](https://docs.gitlab.com/ee/user/clusters/agent/work_with_agent.html#view-your-agents).
+  stage: deploy
+  self-managed: true
+  gitlab-com: true
+  available_in: [Free, Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/clusters/agent/user_access.html
+  image_url: https://about.gitlab.com/images/17_3/17-3-connect-agent.png
+  published_at: 2024-08-15
+  release: 17.3
+
+- name: Health check for GitLab Duo in beta
+  description: |
+    You can now troubleshoot the setup for GitLab Duo on your self-managed instance. In the **Admin** area, on the GitLab Duo page, select **Run health check**. This health check performs a series of validations and suggests appropriate corrective actions to ensure GitLab Duo is operational.
+
+    The health check for GitLab Duo is available on Self-managed and GitLab Dedicated as a beta feature.
+  stage: data_store
+  self-managed: true
+  gitlab-com: false
+  available_in: [Premium, Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/gitlab_duo/turn_on_off.html#run-a-health-check-for-gitlab-duo
+  image_url: https://about.gitlab.com/images/17_3/Failed_GitLab_Duo_health_check.png
+  published_at: 2024-08-15
+  release: 17.3
+
+- name: "AI Impact analytics: Code Suggestions acceptance rate and GitLab Duo seats usage"
+  description: |
+    These two new metrics highlight the effectiveness and utilization of GitLab Duo, and are now included in the [AI Impact analytics in the Value Streams Dashboard](https://about.gitlab.com/blog/2024/05/15/developing-gitlab-duo-ai-impact-analytics-dashboard-measures-the-roi-of-ai/), which helps organizations understand the impact of GitLab Duo on delivering business value.
+
+    The **Code Suggestions acceptance rate** metric indicates how frequently developers accept code suggestions made by GitLab Duo. This metric reflects both the effectiveness of these suggestions and the level of trust contributors have in AI capabilities. Specifically, the metric represents the percentage of code suggestions provided by GitLab Duo that have been accepted by code contributors in the last 30 days.
+
+    The **GitLab Duo seats assigned and used** metric shows the percentage of consumed licensed seats, helping organizations plan effectively for license utilization, resource allocation, and understanding of usage patterns. This metric tracks the ratio of assigned seats that have used at least one AI feature in the last 30 days.
+
+    With the addition of these new metrics, we have also introduced new overview tiles — a new visualization which provides a clear summary of the metrics, helping you quickly assess the current state of your AI features.
+  stage: data_store
+  self-managed: true
+  gitlab-com: false
+  available_in: [Ultimate]
+  documentation_link: https://docs.gitlab.com/ee/user/analytics/value_streams_dashboard.html#ai-impact-analytics
+  image_url: https://about.gitlab.com/images/17_3/173_ai_tiles.png
+  published_at: 2024-08-15
+  release: 17.3
diff --git a/db/docs/ci_cost_settings.yml b/db/docs/ci_cost_settings.yml
index 0eb3d94b980..6c87f83afb5 100644
--- a/db/docs/ci_cost_settings.yml
+++ b/db/docs/ci_cost_settings.yml
@@ -8,4 +8,4 @@ description: A set of cost factors per runner which are applied to ci job durati
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111977
 milestone: '15.10'
 gitlab_schema: gitlab_ci
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/460076
+exempt_from_sharding: true  # Cell-local table storing cost information for instance runners
diff --git a/doc/administration/dedicated/configure_instance.md b/doc/administration/dedicated/configure_instance.md
index 2d327a96bd7..feda577bc2d 100644
--- a/doc/administration/dedicated/configure_instance.md
+++ b/doc/administration/dedicated/configure_instance.md
@@ -182,15 +182,32 @@ To enable an Outbound Private Link:
      required validation, and let GitLab know in the support ticket that you are using this option. If `Acceptance Required` is set to Yes on your
      Endpoint Service, also note this on the support ticket because Dedicated will need to initiate the connection without Private DNS, wait for you
      to confirm it has been accepted, and then update the connection to enable the use of Private DNS.
-   - Dedicated can manage a Private Hosted Zone (PHZ) within the Dedicated AWS Account and alias any arbitrary DNS names to the Endpoint, directing
-     requests for those names to your Endpoint Service. This may be useful if you have multiple DNS names/aliases that will be accessed using a
-     single Endpoint (for example, if you are running a reverse proxy to connect to more than one service in your environment), or if the domain you
-     want to use is not public and cannot be validated for use by Private DNS. Let GitLab know on the support ticket if you are using this option and
-     provide a list of DNS names that should resolve to the Private Link Endpoint. This list can be updated as needed in future.
+   - Dedicated can manage a private hosted zone (PHZ) within the Dedicated AWS account and alias DNS names to the endpoint, directing requests for those names to your endpoint service. These aliases are often referred to as PHZ entries. For more information, see [Private hosted zones](#private-hosted-zones).
 
 GitLab then configures the tenant instance to create the necessary Endpoint Interfaces based on the service names you provided. Any matching outbound
 connections made from the tenant instance are directed through the PrivateLink into your VPC.
 
+#### Private hosted zones
+
+You can use a private hosted zone (PHZ) if:
+
+- You have multiple DNS names or aliases that will be accessed using a single endpoint. For example, if you are running a reverse proxy to connect to more than one service in your environment.
+- The domain you want to use is not public and cannot be validated for use by private DNS.
+
+To use private hosted zones, submit a [support ticket](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=4414917877650). In the support ticket, provide a list of DNS names that should resolve to the endpoint service for the outbound private link. The list can be updated as needed.
+
+When using your Dedicated instance's domain as part of an alias, you must include two subdomains before the main domain. This is because:
+
+1. The first subdomain becomes the name of the PHZ.
+1. The second subdomain becomes the record entry for the alias.
+
+For example:
+
+- This is a valid PHZ entry: `subdomain2.subdomain1.<your-tenant-id>.gitlab-dedicated.com`.
+- This is an invalid PHZ entry: `subdomain1.<your-tenant-id>.gitlab-dedicated.com`.
+
+If you don't use the Dedicated instance domain, the PHZ name and a PHZ entry in the format `phz-entry.phz-name.com` is still required.
+
 ### Custom certificates
 
 In some cases, the GitLab Dedicated instance can't reach an internal service you own because it exposes a certificate that can't be validated using a public Certification Authority (CA). In these cases, custom certificates are required.
diff --git a/doc/administration/internal_users.md b/doc/administration/internal_users.md
index 625df5410a4..e7c440bfbf5 100644
--- a/doc/administration/internal_users.md
+++ b/doc/administration/internal_users.md
@@ -27,7 +27,6 @@ when a snippet's original author wasn't available. For example, when the user wa
 
 Other examples of internal users:
 
-- [GitLab Admin Bot](https://gitlab.com/gitlab-org/gitlab/-/blob/278bc9018dd1515a10cbf15b6c6cd55cb5431407/app/models/user.rb#L950-960)
 - [GitLab Automation Bot](../user/group/iterations/index.md#gitlab-automation-bot-user)
 - [Alert Bot](../operations/incident_management/alerts.md#trigger-actions-from-alerts)
 - [Ghost User](../user/profile/account/delete_account.md#associated-records)
@@ -36,3 +35,15 @@ Other examples of internal users:
 - Resource access tokens, including [project access tokens](../user/project/settings/project_access_tokens.md)
   and [group access tokens](../user/group/settings/group_access_tokens.md), which are
   `project_{project_id}_bot_{random_string}` and `group_{group_id}_bot_{random_string}` users with a `PersonalAccessToken`.
+
+## GitLab Admin Bot
+
+[GitLab Admin Bot](https://gitlab.com/gitlab-org/gitlab/-/blob/1d38cfdbed081f8b3fa14b69dd743440fe85081b/lib/users/internal.rb#L104)
+is an internal user that cannot be accessed or modified by regular users and is responsible for many tasks including:
+
+- Applying [default compliance frameworks](../user/group/compliance_frameworks.md#default-compliance-frameworks) to
+  projects.
+- [Automatically deactivating dormant users](moderate_users.md#automatically-deactivate-dormant-users).
+- [Automatically deleting unconfirmed users](moderate_users.md#automatically-delete-unconfirmed-users).
+- [Deleting inactive projects](inactive_project_deletion.md).
+- [Locking users](../security/unlock_user.md).
diff --git a/doc/api/lint.md b/doc/api/lint.md
index 12f97247626..60c56cef885 100644
--- a/doc/api/lint.md
+++ b/doc/api/lint.md
@@ -32,7 +32,7 @@ POST /projects/:id/ci/lint
 Example request:
 
 ```shell
-curl --header "Content-Type: application/json" "https://gitlab.example.com/api/v4/projects/:id/ci/lint" --data '{"content": "{ \"image\": \"ruby:2.6\", \"services\": [\"postgres\"], \"before_script\": [\"bundle install\", \"bundle exec rake db:create\"], \"variables\": {\"DB_NAME\": \"postgres\"}, \"types\": [\"test\", \"deploy\", \"notify\"], \"rspec\": { \"script\": \"rake spec\", \"tags\": [\"ruby\", \"postgres\"], \"only\": [\"branches\"]}}"}'
+curl --header "Content-Type: application/json" "https://gitlab.example.com/api/v4/projects/:id/ci/lint" --data '{"content": "{ \"image\": \"ruby:2.6\", \"services\": [\"postgres\"], \"before_script\": [\"bundle install\", \"bundle exec rake db:create\"], \"variables\": {\"DB_NAME\": \"postgres\"}, \"stages\": [\"test\", \"deploy\", \"notify\"], \"rspec\": { \"script\": \"rake spec\", \"tags\": [\"ruby\", \"postgres\"], \"only\": [\"branches\"]}}"}'
 ```
 
 Example responses:
diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
deleted file mode 100644
index fc8deebab1b..00000000000
--- a/doc/ci/pipelines/cicd_minutes.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'compute_minutes.md'
-remove_date: '2024-08-13'
----
-
-This document was moved to [another location](compute_minutes.md).
-
-<!-- This redirect file can be deleted after <2024-08-13>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index c254835009e..fd4c813f165 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -435,7 +435,7 @@ Use sentence case for **Code explanation**.
 On first mention on a page, use **GitLab Duo Code explanation**.
 Thereafter, use **Code explanation** by itself.
 
-## Code Generation
+## code generation
 
 Code Suggestions has evolved to include two primary features:
 
diff --git a/doc/editor_extensions/visual_studio/index.md b/doc/editor_extensions/visual_studio/index.md
index d9a74fe8781..09ca90ff3f1 100644
--- a/doc/editor_extensions/visual_studio/index.md
+++ b/doc/editor_extensions/visual_studio/index.md
@@ -32,8 +32,8 @@ Report any issues, bugs, or feature requests in the
 
 ## Related topics
 
-- [Download the plugin](https://marketplace.visualstudio.com/items?itemName=GitLab.GitLabExtensionForVisualStudio)
-- [Plugin documentation](https://gitlab.com/gitlab-org/editor-extensions/gitlab-visual-studio-extension/-/blob/main/README.md)
+- [Download the extension](https://marketplace.visualstudio.com/items?itemName=GitLab.GitLabExtensionForVisualStudio)
+- [Extension documentation](https://gitlab.com/gitlab-org/editor-extensions/gitlab-visual-studio-extension/-/blob/main/README.md)
 - [View source code](https://gitlab.com/gitlab-org/editor-extensions/gitlab-visual-studio-extension)
 
 ## Troubleshooting
diff --git a/doc/integration/ding_talk.md b/doc/integration/ding_talk.md
deleted file mode 100644
index 8d5b87d5de2..00000000000
--- a/doc/integration/ding_talk.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'index.md'
-remove_date: '2024-08-06'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after <2024-08-06>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/topics/gitlab_flow.md b/doc/topics/gitlab_flow.md
deleted file mode 100644
index 5eba213cbd4..00000000000
--- a/doc/topics/gitlab_flow.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'https://about.gitlab.com/blog/2023/07/27/gitlab-flow-duo/'
-remove_date: '2024-07-27'
----
-
-This document was moved to [another location](https://about.gitlab.com/blog/2023/07/27/gitlab-flow-duo/).
-
-<!-- This redirect file can be deleted after <2024-07-27>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/api_security/api_discovery/index.md b/doc/user/application_security/api_security/api_discovery/index.md
index 7f44d57c8e0..d0c4cc1c5a0 100644
--- a/doc/user/application_security/api_security/api_discovery/index.md
+++ b/doc/user/application_security/api_security/api_discovery/index.md
@@ -12,7 +12,7 @@ DETAILS:
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/9302) in GitLab 15.9. The API Discovery feature is in [beta](../../../../policy/experiment-beta-support.md).
 
-API Discovery analyzes your application and produces an OpenAPI document describing the web APIs it exposes. This schema document can then be used by [DAST API](../../dast_api/index.md) or [API Fuzzing](../../api_fuzzing/index.md) to perform security scans of the web API.
+API Discovery analyzes your application and produces an OpenAPI document describing the web APIs it exposes. This schema document can then be used by the [API security testing analyzer](../../api_security_testing/index.md) or [API Fuzzing](../../api_fuzzing/index.md) to perform security scans of the web API.
 
 ## Supported frameworks
 
diff --git a/doc/user/application_security/api_security/index.md b/doc/user/application_security/api_security/index.md
index c1144c5032f..e75d46cdeec 100644
--- a/doc/user/application_security/api_security/index.md
+++ b/doc/user/application_security/api_security/index.md
@@ -20,5 +20,5 @@ Some of the features discussed are specific to web APIs and others are more gene
 - [Dependency Scanning](../dependency_scanning/index.md) reviews a project 3rd party dependencies for known vulnerabilities (for example CVEs).
 - [Container Scanning](../container_scanning/index.md) analyzes container images to identify known OS package vulnerabilities and installed language dependencies.
 - [API Discovery](api_discovery/index.md) examines an application containing a REST API and intuits an OpenAPI specification for that API. OpenAPI specification documents are used by other GitLab security tools.
-- [DAST API](../dast_api/index.md) performs dynamic analysis security testing of web APIs. It can identify various security vulnerabilities in your application, including the OWASP Top 10.
+- [API security testing analyzer](../api_security_testing/index.md) performs dynamic analysis security testing of web APIs. It can identify various security vulnerabilities in your application, including the OWASP Top 10.
 - [API Fuzzing](../api_fuzzing/index.md) performs fuzz testing of a web API. Fuzz testing looks for issues in an application that are not previously known and don't map to classic vulnerability types such as SQL Injection.
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index f4e6594649e..a8e8567b39d 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -48,7 +48,7 @@ For scanning websites, use one of:
 
 For scanning APIs, use:
 
-- The [DAST API analyzer](../dast_api/index.md) for scanning web APIs. Web API technologies such as GraphQL, REST, and SOAP are supported.
+- The [API security testing analyzer](../api_security_testing/index.md) for scanning web APIs. Web API technologies such as GraphQL, REST, and SOAP are supported.
 
 Analyzers follow the architectural patterns described in [Secure your application](../index.md).
 Each analyzer can be configured in the pipeline using a CI template and runs the scan in a Docker container. Scans output a [DAST report artifact](../../../ci/yaml/artifacts_reports.md#artifactsreportsdast)
@@ -89,7 +89,7 @@ which GitLab uses to determine discovered vulnerabilities based on differences b
 
 #### Analyzer configuration
 
-See [DAST proxy-based analyzer](proxy-based.md), [DAST browser-based analyzer](browser/index.md) or [DAST API analyzer](../dast_api/index.md) for
+See [DAST proxy-based analyzer](proxy-based.md), [DAST browser-based analyzer](browser/index.md) or [API security testing analyzer](../api_security_testing/index.md) for
 analyzer-specific configuration instructions.
 
 ### View scan results
diff --git a/doc/user/application_security/dast/proxy-based.md b/doc/user/application_security/dast/proxy-based.md
index 05201cd11cf..f065011c9d2 100644
--- a/doc/user/application_security/dast/proxy-based.md
+++ b/doc/user/application_security/dast/proxy-based.md
@@ -193,7 +193,7 @@ Pipelines now include a DAST job.
 
 ### API scan
 
-- The [DAST API analyzer](../dast_api/index.md) is used for scanning web APIs. Web API technologies such as GraphQL, REST, and SOAP are supported.
+- The [API security testing analyzer](../api_security_testing/index.md) is used for scanning web APIs. Web API technologies such as GraphQL, REST, and SOAP are supported.
 
 ### URL scan
 
@@ -358,8 +358,8 @@ including a large number of false positives.
 | `DAST_ADVERTISE_SCAN`                           | boolean       | Set to `true` to add a `Via` header to every request sent, advertising that the request was sent as part of a GitLab DAST scan. |
 | `DAST_AGGREGATE_VULNERABILITIES`                | boolean       | Vulnerability aggregation is set to `true` by default. To disable this feature and see each vulnerability individually set to `false`. |
 | `DAST_ALLOWED_HOSTS`                            | Comma-separated list of strings | Hostnames included in this variable are considered in scope when crawled. By default the `DAST_WEBSITE` hostname is included in the allowed hosts list. Headers set using `DAST_REQUEST_HEADERS` are added to every request made to these hostnames. Example, `site.com,another.com`. |
-| `DAST_API_HOST_OVERRIDE` <sup>1</sup>           | string        | **{warning}** **[Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/383467)** in GitLab 16.0. Replaced by [DAST API scan](../dast_api/configuration/variables.md). |
-| `DAST_API_SPECIFICATION` <sup>1</sup>           | URL or string | **{warning}** **[Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/383467)** in GitLab 16.0. Replaced by [DAST API scan](../dast_api/configuration/variables.md). |
+| `DAST_API_HOST_OVERRIDE` <sup>1</sup>           | string        | **{warning}** **[Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/383467)** in GitLab 16.0. Replaced by [API security testing scan](../api_security_testing/configuration/variables.md). |
+| `DAST_API_SPECIFICATION` <sup>1</sup>           | URL or string | **{warning}** **[Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/383467)** in GitLab 16.0. Replaced by [API security testing scan](../api_security_testing/configuration/variables.md). |
 | `DAST_AUTO_UPDATE_ADDONS`                       | boolean       | ZAP add-ons are pinned to specific versions in the DAST Docker image. Set to `true` to download the latest versions when the scan starts. Default: `false`. |
 | `DAST_DEBUG` <sup>1</sup>                       | boolean       | Enable debug message output. Default: `false`. |
 | `DAST_EXCLUDE_RULES`                            | string        | Set to a comma-separated list of Vulnerability Rule IDs to exclude them from running during the scan. Rule IDs are numbers and can be found from the DAST log or on the [ZAP project](https://www.zaproxy.org/docs/alerts/). For example, `HTTP Parameter Override` has a rule ID of `10026`. Cannot be used when `DAST_ONLY_INCLUDE_RULES` is set. **Note:** In earlier versions of GitLab the excluded rules were executed but vulnerabilities they generated were suppressed. |
diff --git a/doc/user/application_security/dast_api/checks/application_information_check.md b/doc/user/application_security/dast_api/checks/application_information_check.md
deleted file mode 100644
index 75b73caa2c7..00000000000
--- a/doc/user/application_security/dast_api/checks/application_information_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/application_information_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/application_information_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/authentication_token_check.md b/doc/user/application_security/dast_api/checks/authentication_token_check.md
deleted file mode 100644
index 707e3e11359..00000000000
--- a/doc/user/application_security/dast_api/checks/authentication_token_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/authentication_token_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/authentication_token_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/cleartext_authentication_check.md b/doc/user/application_security/dast_api/checks/cleartext_authentication_check.md
deleted file mode 100644
index e21e32fa97e..00000000000
--- a/doc/user/application_security/dast_api/checks/cleartext_authentication_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/cleartext_authentication_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/cleartext_authentication_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/cors_check.md b/doc/user/application_security/dast_api/checks/cors_check.md
deleted file mode 100644
index b568c872974..00000000000
--- a/doc/user/application_security/dast_api/checks/cors_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/cors_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/cors_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/dns_rebinding_check.md b/doc/user/application_security/dast_api/checks/dns_rebinding_check.md
deleted file mode 100644
index c3b9cbb89c7..00000000000
--- a/doc/user/application_security/dast_api/checks/dns_rebinding_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/dns_rebinding_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/dns_rebinding_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/framework_debug_mode_check.md b/doc/user/application_security/dast_api/checks/framework_debug_mode_check.md
deleted file mode 100644
index 5f4c13bed54..00000000000
--- a/doc/user/application_security/dast_api/checks/framework_debug_mode_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/framework_debug_mode_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/framework_debug_mode_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/heartbleed_open_ssl_check.md b/doc/user/application_security/dast_api/checks/heartbleed_open_ssl_check.md
deleted file mode 100644
index 3a95dfbc9a3..00000000000
--- a/doc/user/application_security/dast_api/checks/heartbleed_open_ssl_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/heartbleed_open_ssl_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/heartbleed_open_ssl_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/html_injection_check.md b/doc/user/application_security/dast_api/checks/html_injection_check.md
deleted file mode 100644
index 60cc49fd7c3..00000000000
--- a/doc/user/application_security/dast_api/checks/html_injection_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/html_injection_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/html_injection_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/index.md b/doc/user/application_security/dast_api/checks/index.md
deleted file mode 100644
index 76387970e0c..00000000000
--- a/doc/user/application_security/dast_api/checks/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/index.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/index.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/dast_api/checks/insecure_http_methods_check.md b/doc/user/application_security/dast_api/checks/insecure_http_methods_check.md
deleted file mode 100644
index 7b8bf8e3104..00000000000
--- a/doc/user/application_security/dast_api/checks/insecure_http_methods_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/insecure_http_methods_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/insecure_http_methods_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/dast_api/checks/json_hijacking_check.md b/doc/user/application_security/dast_api/checks/json_hijacking_check.md
deleted file mode 100644
index e8b7ec487a4..00000000000
--- a/doc/user/application_security/dast_api/checks/json_hijacking_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/json_hijacking_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/json_hijacking_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/json_injection_check.md b/doc/user/application_security/dast_api/checks/json_injection_check.md
deleted file mode 100644
index f2959f31eb6..00000000000
--- a/doc/user/application_security/dast_api/checks/json_injection_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/json_injection_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/json_injection_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/open_redirect_check.md b/doc/user/application_security/dast_api/checks/open_redirect_check.md
deleted file mode 100644
index b0ffea59687..00000000000
--- a/doc/user/application_security/dast_api/checks/open_redirect_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/open_redirect_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/open_redirect_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/os_command_injection_check.md b/doc/user/application_security/dast_api/checks/os_command_injection_check.md
deleted file mode 100644
index f26cba3e303..00000000000
--- a/doc/user/application_security/dast_api/checks/os_command_injection_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/os_command_injection_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/os_command_injection_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/path_traversal_check.md b/doc/user/application_security/dast_api/checks/path_traversal_check.md
deleted file mode 100644
index 4e81ece2bca..00000000000
--- a/doc/user/application_security/dast_api/checks/path_traversal_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/path_traversal_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/path_traversal_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/sensitive_file_disclosure_check.md b/doc/user/application_security/dast_api/checks/sensitive_file_disclosure_check.md
deleted file mode 100644
index b48f02771ea..00000000000
--- a/doc/user/application_security/dast_api/checks/sensitive_file_disclosure_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/sensitive_file_disclosure_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/sensitive_file_disclosure_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/sensitive_information_disclosure_check.md b/doc/user/application_security/dast_api/checks/sensitive_information_disclosure_check.md
deleted file mode 100644
index 34fca008f35..00000000000
--- a/doc/user/application_security/dast_api/checks/sensitive_information_disclosure_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/sensitive_information_disclosure_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/sensitive_information_disclosure_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/dast_api/checks/session_cookie_check.md b/doc/user/application_security/dast_api/checks/session_cookie_check.md
deleted file mode 100644
index 084243a4979..00000000000
--- a/doc/user/application_security/dast_api/checks/session_cookie_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/session_cookie_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/session_cookie_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/shellshock_check.md b/doc/user/application_security/dast_api/checks/shellshock_check.md
deleted file mode 100644
index 3ee4d8ef25d..00000000000
--- a/doc/user/application_security/dast_api/checks/shellshock_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/shellshock_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/shellshock_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/sql_injection_check.md b/doc/user/application_security/dast_api/checks/sql_injection_check.md
deleted file mode 100644
index 5bc88d3e267..00000000000
--- a/doc/user/application_security/dast_api/checks/sql_injection_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/sql_injection_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/sql_injection_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/tls_server_configuration_check.md b/doc/user/application_security/dast_api/checks/tls_server_configuration_check.md
deleted file mode 100644
index 16fb92b79c7..00000000000
--- a/doc/user/application_security/dast_api/checks/tls_server_configuration_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/tls_server_configuration_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/tls_server_configuration_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/xml_external_entity.md b/doc/user/application_security/dast_api/checks/xml_external_entity.md
deleted file mode 100644
index 21299fa9414..00000000000
--- a/doc/user/application_security/dast_api/checks/xml_external_entity.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/xml_external_entity_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/xml_external_entity_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/checks/xml_injection_check.md b/doc/user/application_security/dast_api/checks/xml_injection_check.md
deleted file mode 100644
index 8c8fd66c778..00000000000
--- a/doc/user/application_security/dast_api/checks/xml_injection_check.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/checks/xml_injection_check.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/checks/xml_injection_check.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/configuration/customizing_analyzer_settings.md b/doc/user/application_security/dast_api/configuration/customizing_analyzer_settings.md
deleted file mode 100644
index 913ec0856ae..00000000000
--- a/doc/user/application_security/dast_api/configuration/customizing_analyzer_settings.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/customizing_analyzer_settings.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/customizing_analyzer_settings.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/dast_api/configuration/enabling_the_analyzer.md b/doc/user/application_security/dast_api/configuration/enabling_the_analyzer.md
deleted file mode 100644
index f8f92af549e..00000000000
--- a/doc/user/application_security/dast_api/configuration/enabling_the_analyzer.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/enabling_the_analyzer.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/enabling_the_analyzer.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/dast_api/configuration/index.md b/doc/user/application_security/dast_api/configuration/index.md
deleted file mode 100644
index f28350f03d1..00000000000
--- a/doc/user/application_security/dast_api/configuration/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/index.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/index.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/configuration/offline_configuration.md b/doc/user/application_security/dast_api/configuration/offline_configuration.md
deleted file mode 100644
index 497e96d4c6a..00000000000
--- a/doc/user/application_security/dast_api/configuration/offline_configuration.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/offline_configuration.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/offline_configuration.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/configuration/overriding_analyzer_jobs.md b/doc/user/application_security/dast_api/configuration/overriding_analyzer_jobs.md
deleted file mode 100644
index 755fa262ba5..00000000000
--- a/doc/user/application_security/dast_api/configuration/overriding_analyzer_jobs.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/overriding_analyzer_jobs.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/overriding_analyzer_jobs.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/configuration/requirements.md b/doc/user/application_security/dast_api/configuration/requirements.md
deleted file mode 100644
index 8096a6e0bcd..00000000000
--- a/doc/user/application_security/dast_api/configuration/requirements.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/requirements.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/requirements.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/configuration/variables.md b/doc/user/application_security/dast_api/configuration/variables.md
deleted file mode 100644
index abde4312722..00000000000
--- a/doc/user/application_security/dast_api/configuration/variables.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../api_security_testing/configuration/variables.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../../api_security_testing/configuration/variables.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/index.md b/doc/user/application_security/dast_api/index.md
deleted file mode 100644
index b152a65374f..00000000000
--- a/doc/user/application_security/dast_api/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../api_security_testing/index.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../api_security_testing/index.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/performance.md b/doc/user/application_security/dast_api/performance.md
deleted file mode 100644
index a2763938022..00000000000
--- a/doc/user/application_security/dast_api/performance.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../api_security_testing/performance.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../api_security_testing/performance.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/dast_api/troubleshooting.md b/doc/user/application_security/dast_api/troubleshooting.md
deleted file mode 100644
index d85a4344038..00000000000
--- a/doc/user/application_security/dast_api/troubleshooting.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../api_security_testing/troubleshooting.md'
-remove_date: '2024-07-30'
----
-
-This document was moved to [another location](../api_security_testing/troubleshooting.md).
-
-<!-- This redirect file can be deleted after <2024-07-30>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index f076059c5ed..f44dfdc28ac 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -73,7 +73,7 @@ Analysis of the web application occurs on every code commit. As part of the CI/C
 application is built, deployed to a test environment, and subjected to the following tests:
 
 - Test application for known attack vectors - [Dynamic Application Security Testing (DAST)](dast/index.md).
-- Analysis of APIs for known attack vectors - [API Security](dast_api/index.md).
+- Analysis of APIs for known attack vectors - [API Security](api_security_testing/index.md).
 - Analysis of web APIs for unknown bugs and vulnerabilities - [API fuzzing](api_fuzzing/index.md).
 
 ### Dependency analysis
diff --git a/doc/user/application_security/vulnerabilities/severities.md b/doc/user/application_security/vulnerabilities/severities.md
index c2183baa05c..f00ff636a62 100644
--- a/doc/user/application_security/vulnerabilities/severities.md
+++ b/doc/user/application_security/vulnerabilities/severities.md
@@ -80,7 +80,7 @@ When available, the vendor severity level takes precedence and is used by the an
 
 | GitLab analyzer                                                                          | Outputs severity levels?     | Native severity level type | Native severity level example       |
 |------------------------------------------------------------------------------------------|------------------------------|----------------------------|-------------------------------------|
-| [`API security testing`](../dast_api/index.md)         | **{check-circle}** Yes       | String | `HIGH`, `MEDIUM`, `LOW` |
+| [`API security testing`](../api_security_testing/index.md)         | **{check-circle}** Yes       | String | `HIGH`, `MEDIUM`, `LOW` |
 
 ## Dependency Scanning
 
diff --git a/doc/user/project/repository/code_suggestions/data.md b/doc/user/project/repository/code_suggestions/data.md
deleted file mode 100644
index 23ad418cd40..00000000000
--- a/doc/user/project/repository/code_suggestions/data.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../../../ai_data_usage.md'
-remove_date: '2024-08-08'
----
-
-This document was moved to [another location](../../../ai_data_usage.md).
-
-<!-- This redirect file can be deleted after <2024-08-08>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/lib/gitlab/ci/build/rules/rule/clause/exists.rb b/lib/gitlab/ci/build/rules/rule/clause/exists.rb
index 083c5f5f4d0..dcb368e145e 100644
--- a/lib/gitlab/ci/build/rules/rule/clause/exists.rb
+++ b/lib/gitlab/ci/build/rules/rule/clause/exists.rb
@@ -16,8 +16,6 @@ module Gitlab
           @globs = Array(clause[:paths])
           @project_path = clause[:project]
           @ref = clause[:ref]
-
-          @top_level_only = @globs.all?(&method(:top_level_glob?))
         end
 
         def satisfied_by?(_pipeline, context)
@@ -26,16 +24,11 @@ module Gitlab
 
           context = change_context(context) if @project_path
 
-          if Feature.enabled?(:rules_exist_expand_globs_early, context.project)
-            expanded_globs = expand_globs(context)
-            top_level_only = expanded_globs.all?(&method(:top_level_glob?))
+          expanded_globs = expand_globs(context)
+          top_level_only = expanded_globs.all?(&method(:top_level_glob?))
 
-            paths = worktree_paths(context, top_level_only)
-            exact_globs, extension_globs, pattern_globs = separate_globs(expanded_globs)
-          else
-            paths = worktree_paths_old(context)
-            exact_globs, extension_globs, pattern_globs = separate_globs_old(context)
-          end
+          paths = worktree_paths(context, top_level_only)
+          exact_globs, extension_globs, pattern_globs = separate_globs(expanded_globs)
 
           exact_matches?(paths, exact_globs) ||
             matches_extension?(paths, extension_globs) ||
@@ -49,13 +42,6 @@ module Gitlab
           grouped.values_at(:exact, :extension, :pattern).map { |globs| Array(globs) }
         end
 
-        def separate_globs_old(context)
-          expanded_globs = expand_globs(context)
-
-          grouped = expanded_globs.group_by { |glob| glob_type(glob) }
-          grouped.values_at(:exact, :extension, :pattern).map { |globs| Array(globs) }
-        end
-
         def expand_globs(context)
           @globs.map do |glob|
             expand_value(glob, context)
@@ -72,16 +58,6 @@ module Gitlab
           end
         end
 
-        def worktree_paths_old(context)
-          return [] unless context.project
-
-          if @top_level_only
-            context.top_level_worktree_paths
-          else
-            context.all_worktree_paths
-          end
-        end
-
         def glob_type(glob)
           if exact_glob?(glob)
             :exact
diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index 9c8ab084028..db05abaacee 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -59,8 +59,8 @@ module Gitlab
     class << self
       include Gitlab::EncodingHelper
 
-      def ref_name(ref, types: 'tags|heads|remotes')
-        encode_utf8_with_escaping!(ref).sub(%r{\Arefs/(#{types})/}, '')
+      def ref_name(ref)
+        encode_utf8_with_escaping!(ref).sub(%r{\Arefs/(tags|heads|remotes)/}, '')
       end
 
       def branch_name(ref)
diff --git a/lib/search/group_settings.rb b/lib/search/group_settings.rb
index 96c3fb8878b..1d3e2a84df9 100644
--- a/lib/search/group_settings.rb
+++ b/lib/search/group_settings.rb
@@ -22,7 +22,7 @@ module Search
 
     def general_settings
       [
-        { text: _('Naming, visibility'), href: edit_group_path(group, anchor: 'js-general-settings') },
+        { text: _('Naming, description, visibility'), href: edit_group_path(group, anchor: 'js-general-settings') },
         { text: _('Permissions and group features'), href: edit_group_path(group, anchor: 'js-permissions-settings') },
         { text: _('Badges'), href: edit_group_path(group, anchor: 'js-badge-settings') },
         { text: _('Advanced'), href: edit_group_path(group, anchor: 'js-advanced-settings') }
diff --git a/lib/search/project_settings.rb b/lib/search/project_settings.rb
index 645783c83b9..f1bf00037ca 100644
--- a/lib/search/project_settings.rb
+++ b/lib/search/project_settings.rb
@@ -23,7 +23,7 @@ module Search
 
     def general_settings
       [
-        { text: _("Naming, topics, avatar"), href: edit_project_path(project, anchor: 'js-general-settings') },
+        { text: _("Naming, description, topics"), href: edit_project_path(project, anchor: 'js-general-settings') },
         { text: _("Visibility, project features, permissions"),
           href: edit_project_path(project, anchor: 'js-shared-permissions') },
         { text: _("Badges"), href: edit_project_path(project, anchor: 'js-badges-settings') },
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c9d68e77cfe..384973c6b88 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -25489,6 +25489,12 @@ msgstr ""
 msgid "Group name (your organization)"
 msgstr ""
 
+msgid "Group name can contain only letters, digits, dashes, spaces, dots, underscores, parenthesis, and emojis."
+msgstr ""
+
+msgid "Group name must start with a letter, digit, emoji, or underscore."
+msgstr ""
+
 msgid "Group navigation"
 msgstr ""
 
@@ -32293,6 +32299,18 @@ msgstr ""
 msgid "Max session time"
 msgstr ""
 
+msgid "Max size for repositories within this group, including LFS files. %{repository_size_limit_link}."
+msgstr ""
+
+msgid "Max size for repositories within this group. %{repository_size_limit_link}."
+msgstr ""
+
+msgid "Max size of this project's repository, including LFS files. %{repository_size_limit_link}."
+msgstr ""
+
+msgid "Max size of this project's repository. %{repository_size_limit_link}."
+msgstr ""
+
 msgid "Maximum 20 characters"
 msgstr ""
 
@@ -34457,6 +34475,9 @@ msgstr ""
 msgid "Must be 90 days or more."
 msgstr ""
 
+msgid "Must start with letter, digit, emoji, or underscore. Can also contain periods, dashes, spaces, and parentheses."
+msgstr ""
+
 msgid "My awesome group"
 msgstr ""
 
@@ -34762,7 +34783,10 @@ msgstr ""
 msgid "Naming"
 msgstr ""
 
-msgid "Naming, topics, avatar"
+msgid "Naming, description, topics"
+msgstr ""
+
+msgid "Naming, description, visibility"
 msgstr ""
 
 msgid "Naming, visibility"
@@ -42282,6 +42306,9 @@ msgstr ""
 msgid "ProjectSettings|Product analytics"
 msgstr ""
 
+msgid "ProjectSettings|Project topics"
+msgstr ""
+
 msgid "ProjectSettings|Project visibility"
 msgstr ""
 
@@ -42420,9 +42447,6 @@ msgstr ""
 msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin."
 msgstr ""
 
-msgid "ProjectSettings|Topics"
-msgstr ""
-
 msgid "ProjectSettings|Topics are publicly visible even on private projects. Do not include sensitive information in topic names. %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
@@ -57190,7 +57214,7 @@ msgstr ""
 msgid "Update your project name and description."
 msgstr ""
 
-msgid "Update your project name, topics, description, and avatar."
+msgid "Update your project name, description, avatar, and topics. %{link_start}Learn more about projects%{link_end}."
 msgstr ""
 
 msgid "UpdateProject|Are you sure you want to prune unreachable objects?"
diff --git a/public/robots.txt b/public/robots.txt
index 2e3d9d6cc96..0095e5258a8 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -24,7 +24,8 @@ Disallow: /api/v*
 Disallow: /help
 Disallow: /s/
 Disallow: /-/profile
-Disallow: /-/user_settings/profile
+Disallow: /-/profile/
+Disallow: /-/user_settings/
 Disallow: /-/ide/
 Disallow: /-/experiment
 # Restrict allowed routes to avoid very ugly search results
@@ -44,10 +45,18 @@ Disallow: /*/realtime_changes
 
 # Group details
 User-Agent: *
-Disallow: /groups/*/analytics
-Disallow: /groups/*/contribution_analytics
-Disallow: /groups/*/group_members
-Disallow: /groups/*/-/saml/sso
+Disallow: /groups/*/-/analytics
+Disallow: /groups/*/-/analytics/
+Disallow: /groups/*/-/insights/
+Disallow: /groups/*/-/issues_analytics
+Disallow: /groups/*/-/contribution_analytics
+Disallow: /groups/*/-/group_members
+Disallow: /groups/*/-/saml/
+Disallow: /groups/*/-/saml_group_links
+Disallow: /groups/*/-/settings/
+Disallow: /groups/*/-/billings
+Disallow: /groups/*/-/hooks
+Disallow: /groups/*/-/projects
 
 # Project details
 User-Agent: *
@@ -55,34 +64,53 @@ Disallow: /*/*.git$
 Disallow: /*/archive/
 Disallow: /*/repository/archive*
 Disallow: /*/activity
-Disallow: /*/blame
-Disallow: /*/commits
-Disallow: /*/commit
+Disallow: /*/-/project_members
+Disallow: /*/-/blame/
+Disallow: /*/-/branches
+Disallow: /*/-/commits/
+Disallow: /*/-/commit
 Disallow: /*/commit/*.patch
 Disallow: /*/commit/*.diff
-Disallow: /*/compare
-Disallow: /*/network
-Disallow: /*/graphs
+Disallow: /*/-/compare/
+Disallow: /*/-/network/
+Disallow: /*/path_locks
 Disallow: /*/merge_requests/*.patch
 Disallow: /*/merge_requests/*.diff
 Disallow: /*/merge_requests/*/diffs
-Disallow: /*/deploy_keys
-Disallow: /*/hooks
 Disallow: /*/services
-Disallow: /*/protected_branches
 Disallow: /*/uploads/
-Disallow: /*/project_members
-Disallow: /*/settings
 Disallow: /*/-/import
-Disallow: /*/-/environments
-Disallow: /*/-/jobs
-Disallow: /*/-/requirements_management
+Disallow: /*/-/requirements_management/
 Disallow: /*/-/pipelines
 Disallow: /*/-/pipeline_schedules
-Disallow: /*/-/dependencies
+Disallow: /*/-/jobs
+Disallow: /*/-/ci/
+Disallow: /*/-/quality/
 Disallow: /*/-/licenses
+Disallow: /*/-/security/
+Disallow: /*/-/dependencies
+Disallow: /*/-/audit_events
+Disallow: /*/-/on_demand_scans
+Disallow: /*/-/feature_flags
+Disallow: /*/-/ml/
+Disallow: /*/-/environments
+Disallow: /*/-/clusters
+Disallow: /*/-/terraform
+Disallow: /*/-/terraform_module_registry
+Disallow: /*/-/*/configuration
+Disallow: /*/-/error_tracking
 Disallow: /*/-/metrics
+Disallow: /*/-/alert_management
 Disallow: /*/-/incidents
-Disallow: /*/-/value_stream_analytics
+Disallow: /*/-/oncall_schedules
+Disallow: /*/-/escalation_policies
+Disallow: /*/-/*/service_desk
 Disallow: /*/-/analytics
-Disallow: /*/insights
+Disallow: /*/-/analytics/
+Disallow: /*/-/value_stream_analytics
+Disallow: /*/-/graphs/
+Disallow: /*/insights/
+Disallow: /*/-/pipelines/
+Disallow: /*/-/settings/
+Disallow: /*/-/hooks
+Disallow: /*/-/usage_quotas
diff --git a/spec/factories/group_members.rb b/spec/factories/group_members.rb
index d9bca85fba6..f7df04b2fd7 100644
--- a/spec/factories/group_members.rb
+++ b/spec/factories/group_members.rb
@@ -22,6 +22,10 @@ FactoryBot.define do
       end
     end
 
+    trait(:created_by) do
+      created_by { association(:user) }
+    end
+
     trait(:ldap) do
       ldap { true }
     end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 568d5320d0f..8054d083572 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -105,6 +105,7 @@ RSpec.describe 'Pipelines', :js, feature_category: :continuous_integration do
         end
 
         before do
+          stub_const("::Projects::PipelinesController::POLLING_INTERVAL", 1)
           job.run
           visit_project_pipelines
         end
@@ -116,16 +117,44 @@ RSpec.describe 'Pipelines', :js, feature_category: :continuous_integration do
           end
 
           context 'when canceling' do
-            before do
+            it 'indicates that pipelines was canceled', :sidekiq_inline do
               find('.js-pipelines-cancel-button').click
               click_button 'Stop pipeline'
-              wait_for_requests
-            end
 
-            it 'indicates that pipelines was canceled', :sidekiq_inline do
+              wait_for_requests
+
               expect(page).not_to have_selector('.js-pipelines-cancel-button')
               expect(page).to have_selector('[data-testid="ci-icon"]', text: 'Canceled')
             end
+
+            it 'targets the pipeline the cancel action was invoked on' do
+              allow_next_instance_of(Gitlab::EtagCaching::Store) do |instance|
+                allow(instance).to receive(:get).and_return(nil)
+              end
+
+              expect(page).to have_selector('[data-testid="pipeline-table-row"]', count: 1)
+
+              find('.js-pipelines-cancel-button').click
+
+              within_testid 'pipeline-stop-modal' do
+                expect(page).to have_content("Stop pipeline ##{pipeline.id}?")
+              end
+
+              create(
+                :ci_pipeline,
+                :running,
+                project: project,
+                source: Enums::Ci::Pipeline.sources[:push],
+                ref: 'master',
+                sha: 'sha'
+              )
+
+              expect(page).to have_selector('[data-testid="pipeline-table-row"]', count: 2)
+
+              within_testid 'pipeline-stop-modal' do
+                expect(page).to have_content("Stop pipeline ##{pipeline.id}?")
+              end
+            end
           end
         end
 
diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js
index c7c82f8c05c..c72ce5bfe91 100644
--- a/spec/frontend/vue_shared/components/markdown/field_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/field_spec.js
@@ -165,75 +165,83 @@ describe('Markdown field component', () => {
     });
 
     describe('markdown preview', () => {
-      beforeEach(() => {
-        axiosMock.onPost(markdownPreviewPath).reply(HTTP_STATUS_OK, { body: previewHTML });
-      });
-
-      it('sets preview toggle as active', async () => {
-        previewToggle = getPreviewToggle();
-
-        expect(previewToggle.text()).toBe('Preview');
-
-        previewToggle.vm.$emit('click', true);
-
-        await nextTick();
-        expect(previewToggle.text()).toBe('Continue editing');
-      });
-
-      it('shows preview loading text', async () => {
-        previewToggle = getPreviewToggle();
-        previewToggle.vm.$emit('click', true);
-
-        await nextTick();
-        expect(subject.find('.md-preview-holder').element.textContent.trim()).toContain('Loading…');
-      });
-
-      it('renders markdown preview and GFM', async () => {
-        previewToggle = getPreviewToggle();
-
-        previewToggle.vm.$emit('click', true);
-
-        await axios.waitFor(markdownPreviewPath);
-        expect(subject.find('.md-preview-holder').element.innerHTML).toContain(previewHTML);
-        expect(renderGFM).toHaveBeenCalled();
-      });
-
-      it('calls video.pause() on comment input when isSubmitting is changed to true', async () => {
-        previewToggle = getPreviewToggle();
-        previewToggle.vm.$emit('click', true);
-
-        await axios.waitFor(markdownPreviewPath);
-        const video = getVideo();
-        const callPause = jest.spyOn(video.element, 'pause').mockImplementation(() => true);
-
-        subject.setProps({ isSubmitting: true });
-
-        await nextTick();
-        expect(callPause).toHaveBeenCalled();
-      });
-
-      it('switches between preview/write on toggle', async () => {
-        previewToggle = getPreviewToggle();
-
-        previewToggle.vm.$emit('click', true);
-        await nextTick();
-        expect(subject.find('.md-preview-holder').element.style.display).toBe(''); // visible
-
-        previewToggle.vm.$emit('click', false);
-        await nextTick();
-        expect(subject.find('.md-preview-holder').element.style.display).toBe('none');
-      });
-
-      it('passes correct props to MarkdownHeader and MarkdownToolbar', () => {
-        expect(findMarkdownToolbar().props()).toEqual({
-          canAttachFile: true,
-          markdownDocsPath,
-          showCommentToolBar: true,
-          showContentEditorSwitcher: false,
+      describe.each`
+        data
+        ${{ body: previewHTML }}
+        ${{ html: previewHTML }}
+      `('when api returns $data', ({ data }) => {
+        beforeEach(() => {
+          axiosMock.onPost(markdownPreviewPath).reply(HTTP_STATUS_OK, data);
         });
 
-        expect(findMarkdownHeader().props()).toMatchObject({
-          supportsQuickActions: true,
+        it('sets preview toggle as active', async () => {
+          previewToggle = getPreviewToggle();
+
+          expect(previewToggle.text()).toBe('Preview');
+
+          previewToggle.vm.$emit('click', true);
+
+          await nextTick();
+          expect(previewToggle.text()).toBe('Continue editing');
+        });
+
+        it('shows preview loading text', async () => {
+          previewToggle = getPreviewToggle();
+          previewToggle.vm.$emit('click', true);
+
+          await nextTick();
+          expect(subject.find('.md-preview-holder').element.textContent.trim()).toContain(
+            'Loading…',
+          );
+        });
+
+        it('renders markdown preview and GFM', async () => {
+          previewToggle = getPreviewToggle();
+
+          previewToggle.vm.$emit('click', true);
+
+          await axios.waitFor(markdownPreviewPath);
+          expect(subject.find('.md-preview-holder').element.innerHTML).toContain(previewHTML);
+          expect(renderGFM).toHaveBeenCalled();
+        });
+
+        it('calls video.pause() on comment input when isSubmitting is changed to true', async () => {
+          previewToggle = getPreviewToggle();
+          previewToggle.vm.$emit('click', true);
+
+          await axios.waitFor(markdownPreviewPath);
+          const video = getVideo();
+          const callPause = jest.spyOn(video.element, 'pause').mockImplementation(() => true);
+
+          subject.setProps({ isSubmitting: true });
+
+          await nextTick();
+          expect(callPause).toHaveBeenCalled();
+        });
+
+        it('switches between preview/write on toggle', async () => {
+          previewToggle = getPreviewToggle();
+
+          previewToggle.vm.$emit('click', true);
+          await nextTick();
+          expect(subject.find('.md-preview-holder').element.style.display).toBe(''); // visible
+
+          previewToggle.vm.$emit('click', false);
+          await nextTick();
+          expect(subject.find('.md-preview-holder').element.style.display).toBe('none');
+        });
+
+        it('passes correct props to MarkdownHeader and MarkdownToolbar', () => {
+          expect(findMarkdownToolbar().props()).toEqual({
+            canAttachFile: true,
+            markdownDocsPath,
+            showCommentToolBar: true,
+            showContentEditorSwitcher: false,
+          });
+
+          expect(findMarkdownHeader().props()).toMatchObject({
+            supportsQuickActions: true,
+          });
         });
       });
     });
diff --git a/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb b/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb
index c10298578db..039c506a44a 100644
--- a/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb
+++ b/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb
@@ -60,14 +60,6 @@ RSpec.describe Gitlab::Ci::Build::Rules::Rule::Clause::Exists, feature_category:
           it { is_expected.to be_truthy }
         end
 
-        context 'when the variable matches and rules_exist_expand_globs_early is disabled' do
-          before do
-            stub_feature_flags(rules_exist_expand_globs_early: false)
-          end
-
-          it { is_expected.to be_falsey }
-        end
-
         context 'when the variable does not match' do
           let(:globs) { ['$FULL_PATH_INVALID'] }
 
diff --git a/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb b/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
index 16ae9a3809d..a3bb82e764a 100644
--- a/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
+++ b/spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
@@ -34,14 +34,51 @@ RSpec.describe 'cross-database foreign keys' do
       'user_group_callouts.user_id',                             # https://gitlab.com/gitlab-org/gitlab/-/issues/421287
       'subscription_user_add_on_assignments.user_id',            # https://gitlab.com/gitlab-org/gitlab/-/issues/444666
       'subscription_add_on_purchases.subscription_add_on_id',    # https://gitlab.com/gitlab-org/gitlab/-/issues/444666
-      'sbom_component_versions.component_id',                    # https://gitlab.com/gitlab-org/gitlab/-/issues/469535
-      'sbom_occurrences_vulnerabilities.sbom_occurrence_id',     # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
-      'vulnerability_export_parts.vulnerability_export_id',      # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
-      'vulnerability_finding_signatures.finding_id',             # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
-      'vulnerability_finding_links.vulnerability_occurrence_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
-      'vulnerability_flags.vulnerability_occurrence_id',         # https://gitlab.com/gitlab-org/gitlab/-/issues/473014
-      'dast_site_validations.dast_site_token_id',                # https://gitlab.com/gitlab-org/gitlab/-/issues/474985
-      'dast_sites.dast_site_validation_id'                       # https://gitlab.com/gitlab-org/gitlab/-/issues/476657
+
+      'sbom_component_versions.component_id',                    # https://gitlab.com/gitlab-org/gitlab/-/issues/479140
+      'sbom_occurrences.component_id',
+      'sbom_occurrences.component_version_id',
+      'sbom_occurrences.source_id',
+      'sbom_occurrences.source_package_id',
+      'sbom_occurrences_vulnerabilities.sbom_occurrence_id',
+      'sbom_occurrences_vulnerabilities.vulnerability_id',
+
+      'security_findings.scanner_id',                            # https://gitlab.com/gitlab-org/gitlab/-/issues/479141
+      'security_findings.scan_id',
+
+      'vulnerabilities.finding_id',                              # https://gitlab.com/gitlab-org/gitlab/-/issues/479142
+      'vulnerability_export_parts.vulnerability_export_id',
+      'vulnerability_external_issue_links.vulnerability_id',
+      'vulnerability_finding_evidences.vulnerability_occurrence_id',
+      'vulnerability_finding_links.vulnerability_occurrence_id',
+      'vulnerability_finding_signatures.finding_id',
+      'vulnerability_findings_remediations.vulnerability_occurrence_id',
+      'vulnerability_findings_remediations.vulnerability_remediation_id',
+      'vulnerability_flags.vulnerability_occurrence_id',
+      'vulnerability_issue_links.vulnerability_id',
+      'vulnerability_merge_request_links.vulnerability_id',
+      'vulnerability_occurrence_identifiers.occurrence_id',
+      'vulnerability_occurrence_identifiers.identifier_id',
+      'vulnerability_occurrence_pipelines.occurrence_id',
+      'vulnerability_occurrences.scanner_id',
+      'vulnerability_occurrences.primary_identifier_id',
+      'vulnerability_occurrences.vulnerability_id',
+      'vulnerability_occurrences.vulnerability_id',
+      'vulnerability_reads.vulnerability_id',
+      'vulnerability_reads.scanner_id',
+      'vulnerability_state_transitions.vulnerability_id',
+      'vulnerability_user_mentions.vulnerability_id',
+
+      'dast_profile_schedules.dast_profile_id',                  # https://gitlab.com/gitlab-org/gitlab/-/issues/479141
+      'dast_profiles.dast_scanner_profile_id',
+      'dast_profiles.dast_site_profile_id',
+      'dast_profiles_pipelines.dast_profile_id',
+      'dast_scanner_profiles_builds.dast_scanner_profile_id',
+      'dast_site_profile_secret_variables.dast_site_profile_id',
+      'dast_site_profiles.dast_site_id',
+      'dast_site_profiles_builds.dast_site_profile_id',
+      'dast_site_validations.dast_site_token_id',
+      'dast_sites.dast_site_validation_id'
     ]
   end
 
diff --git a/spec/lib/gitlab/git_spec.rb b/spec/lib/gitlab/git_spec.rb
index 11461132c05..354ef377c94 100644
--- a/spec/lib/gitlab/git_spec.rb
+++ b/spec/lib/gitlab/git_spec.rb
@@ -9,38 +9,15 @@ RSpec.describe Gitlab::Git do
   describe '.ref_name' do
     let(:ref) { Gitlab::Git::BRANCH_REF_PREFIX + "an_invalid_ref_\xE5" }
 
-    subject(:ref_name) { described_class.ref_name(ref) }
-
     it 'ensure ref is a valid UTF-8 string' do
-      expect(ref_name).to eq("an_invalid_ref_%E5")
+      expect(described_class.ref_name(ref)).to eq("an_invalid_ref_%E5")
     end
 
     context 'when ref contains characters \x80 - \xFF' do
       let(:ref) { Gitlab::Git::BRANCH_REF_PREFIX + "\x90" }
 
       it 'correctly converts it' do
-        expect(ref_name).to eq("%90")
-      end
-    end
-
-    context 'with different types' do
-      using RSpec::Parameterized::TableSyntax
-
-      where(:ref, :types, :result) do
-        'refs/heads/master'          | 'tags|heads|remotes' | 'master'
-        'refs/tags/v1.0'             | 'tags|heads|remotes' | 'v1.0'
-        'refs/heads/master'          | 'heads'              | 'master'
-        'refs/tags/v1.0'             | 'tags'               | 'v1.0'
-        'refs/heads/master'          | 'tags'               | 'refs/heads/master'
-        'refs/tags/v1.0'             | 'heads'              | 'refs/tags/v1.0'
-        'refs/remotes/origin/master' | 'tags|heads|remotes' | 'origin/master'
-        'refs/remotes/origin/master' | 'tags|heads'         | 'refs/remotes/origin/master'
-      end
-
-      with_them do
-        subject(:ref_name) { described_class.ref_name(ref, types: types) }
-
-        it { is_expected.to eq(result) }
+        expect(described_class.ref_name(ref)).to eq("%90")
       end
     end
   end
diff --git a/spec/mailers/members/invite_reminder_mailer_spec.rb b/spec/mailers/members/invite_reminder_mailer_spec.rb
new file mode 100644
index 00000000000..b34e5e2b17b
--- /dev/null
+++ b/spec/mailers/members/invite_reminder_mailer_spec.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Members::InviteReminderMailer, feature_category: :groups_and_projects do
+  include EmailSpec::Matchers
+
+  describe '#email' do
+    let(:group) { build(:group, id: non_existing_record_id) }
+    let(:inviter) { build(:user) }
+    let(:group_member) { invite_to_group(group, inviter: inviter) }
+    let(:reminder_index) { 0 }
+    let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
+    let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
+    let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
+
+    subject(:email) { described_class.email(group_member, group_member.invite_token, reminder_index) }
+
+    context 'for first reminder email' do
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'contains all the useful information' do
+        is_expected.to have_subject "#{inviter.name}'s invitation to GitLab is pending"
+        is_expected.to have_body_text group.human_name
+        is_expected.to have_body_text group_member.human_access.downcase
+        is_expected.to have_body_text invite_url(group_member.invite_token)
+        is_expected.to have_body_text decline_invite_url(group_member.invite_token)
+      end
+    end
+
+    context 'for second reminder email' do
+      let(:reminder_index) { 1 }
+
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'contains all the useful information' do
+        is_expected.to have_subject "#{inviter.name} is waiting for you to join GitLab"
+        is_expected.to have_body_text group.human_name
+        is_expected.to have_body_text group_member.human_access.downcase
+        is_expected.to have_body_text invite_url(group_member.invite_token)
+        is_expected.to have_body_text decline_invite_url(group_member.invite_token)
+      end
+    end
+
+    context 'for last reminder email' do
+      let(:reminder_index) { 2 }
+
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'contains all the useful information' do
+        is_expected.to have_subject "#{inviter.name} is still waiting for you to join GitLab"
+        is_expected.to have_body_text group.human_name
+        is_expected.to have_body_text group_member.human_access.downcase
+        is_expected.to have_body_text invite_url(group_member.invite_token)
+        is_expected.to have_body_text decline_invite_url(group_member.invite_token)
+      end
+    end
+
+    context 'without a reminder' do
+      context 'when member does not exist' do
+        let(:group_member) { build(:group_member, id: nil, invite_token: nil) }
+
+        it_behaves_like 'no email is sent'
+      end
+
+      context 'when member is not created by a user' do
+        let(:inviter) { nil }
+
+        it_behaves_like 'no email is sent'
+      end
+
+      context 'when member is a known user' do
+        let(:group_member) { invite_to_group(group, inviter: inviter, user: build(:user, id: non_existing_record_id)) }
+
+        it_behaves_like 'no email is sent'
+      end
+    end
+
+    def invite_to_group(group, inviter:, user: nil)
+      build(
+        :group_member,
+        :developer,
+        source: group,
+        invite_token: '1234',
+        invite_email: 'group_toto@example.com',
+        user: user,
+        created_by: inviter,
+        created_at: Time.current
+      )
+    end
+  end
+end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 44d18ca97fb..ead5a7495ae 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1712,88 +1712,6 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
       )
     end
 
-    describe 'group invitation reminders' do
-      let_it_be(:inviter) { create(:user, owner_of: group) }
-
-      let(:group_member) { invite_to_group(group, inviter: inviter) }
-
-      subject { described_class.member_invited_reminder_email('Group', group_member.id, group_member.invite_token, reminder_index) }
-
-      describe 'not sending a reminder' do
-        let(:reminder_index) { 0 }
-
-        context 'member does not exist' do
-          let(:group_member) { double(id: nil, invite_token: nil) }
-
-          it_behaves_like 'no email is sent'
-        end
-
-        context 'member is not created by a user' do
-          before do
-            group_member.update!(created_by: nil)
-          end
-
-          it_behaves_like 'no email is sent'
-        end
-
-        context 'member is a known user' do
-          before do
-            group_member.update!(user: create(:user))
-          end
-
-          it_behaves_like 'no email is sent'
-        end
-      end
-
-      describe 'the first reminder' do
-        let(:reminder_index) { 0 }
-
-        it_behaves_like 'an email sent from GitLab'
-        it_behaves_like 'it should not have Gmail Actions links'
-        it_behaves_like 'a user cannot unsubscribe through footer link'
-
-        it 'contains all the useful information' do
-          is_expected.to have_subject "#{inviter.name}'s invitation to GitLab is pending"
-          is_expected.to have_body_text group.human_name
-          is_expected.to have_body_text group_member.human_access.downcase
-          is_expected.to have_body_text invite_url(group_member.invite_token)
-          is_expected.to have_body_text decline_invite_url(group_member.invite_token)
-        end
-      end
-
-      describe 'the second reminder' do
-        let(:reminder_index) { 1 }
-
-        it_behaves_like 'an email sent from GitLab'
-        it_behaves_like 'it should not have Gmail Actions links'
-        it_behaves_like 'a user cannot unsubscribe through footer link'
-
-        it 'contains all the useful information' do
-          is_expected.to have_subject "#{inviter.name} is waiting for you to join GitLab"
-          is_expected.to have_body_text group.human_name
-          is_expected.to have_body_text group_member.human_access.downcase
-          is_expected.to have_body_text invite_url(group_member.invite_token)
-          is_expected.to have_body_text decline_invite_url(group_member.invite_token)
-        end
-      end
-
-      describe 'the third reminder' do
-        let(:reminder_index) { 2 }
-
-        it_behaves_like 'an email sent from GitLab'
-        it_behaves_like 'it should not have Gmail Actions links'
-        it_behaves_like 'a user cannot unsubscribe through footer link'
-
-        it 'contains all the useful information' do
-          is_expected.to have_subject "#{inviter.name} is still waiting for you to join GitLab"
-          is_expected.to have_body_text group.human_name
-          is_expected.to have_body_text group_member.human_access.downcase
-          is_expected.to have_body_text invite_url(group_member.invite_token)
-          is_expected.to have_body_text decline_invite_url(group_member.invite_token)
-        end
-      end
-    end
-
     describe 'group invitation accepted' do
       let(:invited_user) { create(:user, name: 'invited user') }
       let(:owner) { create(:user, owner_of: group) }
diff --git a/spec/mailers/previews_spec.rb b/spec/mailers/previews_spec.rb
index a8865536a28..2080253d1ad 100644
--- a/spec/mailers/previews_spec.rb
+++ b/spec/mailers/previews_spec.rb
@@ -12,7 +12,6 @@ RSpec.describe 'Mailer previews', feature_category: :shared do
   let_it_be(:milestone) { create(:milestone, project: project) }
   let_it_be(:issue) { create(:issue, project: project, milestone: milestone) }
   let_it_be(:remote_mirror) { create(:remote_mirror, project: project) }
-  let_it_be(:member) { create(:project_member, :maintainer, project: project, created_by: user) }
   let_it_be(:review) { create(:review, project: project, merge_request: merge_request, author: user) }
   let_it_be(:key) { create(:key, user: user) }
   let_it_be(:bulk_import) { create(:bulk_import, :finished, :with_configuration) }
@@ -33,6 +32,11 @@ RSpec.describe 'Mailer previews', feature_category: :shared do
     }
   end
 
+  before_all do
+    create(:project_member, :maintainer, source: project, created_by: user)
+    create(:project_member, :invited, source: project, created_by: user)
+  end
+
   subject { preview.call(email) }
 
   where(:preview, :email) do
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 2ad1bd23181..91a24e7f63d 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -861,6 +861,16 @@ RSpec.describe Member, feature_category: :groups_and_projects do
     end
   end
 
+  describe '.with_created_by' do
+    it 'only returns members that are created_by a user' do
+      invited_member_by_user = create(:group_member, :created_by)
+      another_member_by_user = create(:group_member, :created_by, source: invited_member_by_user.group)
+      create(:group_member)
+
+      expect(described_class.with_created_by).to contain_exactly(invited_member_by_user, another_member_by_user)
+    end
+  end
+
   describe '.valid_email?' do
     it 'is a valid email format' do
       expect(described_class.valid_email?('foo')).to eq(false)
@@ -1218,15 +1228,16 @@ RSpec.describe Member, feature_category: :groups_and_projects do
   end
 
   describe '#send_invitation_reminder' do
-    subject { member.send_invitation_reminder(0) }
+    subject(:send_invitation_reminder) { member.send_invitation_reminder(0) }
 
     context 'an invited group member' do
       let!(:member) { create(:group_member, :invited) }
 
-      it 'sends a reminder' do
-        expect_any_instance_of(NotificationService).to receive(:invite_member_reminder).with(member, member.raw_invite_token, 0)
+      it 'enqueues a reminder email' do
+        expect(Members::InviteReminderMailer)
+          .to receive(:email).with(member, member.raw_invite_token, 0).and_call_original
 
-        subject
+        expect { send_invitation_reminder }.to have_enqueued_mail(Members::InviteReminderMailer, :email)
       end
     end
 
@@ -1235,13 +1246,13 @@ RSpec.describe Member, feature_category: :groups_and_projects do
 
       before do
         member.instance_variable_set(:@raw_invite_token, nil)
-        allow_any_instance_of(NotificationService).to receive(:invite_member_reminder)
+        allow(Members::InviteReminderMailer).to receive(:email).and_call_original
       end
 
       it 'generates a new token' do
         expect(member).to receive(:generate_invite_token!)
 
-        subject
+        send_invitation_reminder
       end
     end
 
@@ -1249,9 +1260,9 @@ RSpec.describe Member, feature_category: :groups_and_projects do
       let!(:member) { create(:group_member) }
 
       it 'does not send a reminder' do
-        expect_any_instance_of(NotificationService).not_to receive(:invite_member_reminder)
+        expect(Members::InviteReminderMailer).not_to receive(:email)
 
-        subject
+        send_invitation_reminder
       end
     end
   end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 384e2345bc6..b682c96ad63 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -254,52 +254,6 @@ RSpec.describe Repository, feature_category: :source_code_management do
     end
   end
 
-  describe '#branch_or_tag?' do
-    using RSpec::Parameterized::TableSyntax
-
-    where(:ref, :result) do
-      'markdown'                   | true
-      'v1.1.1'                     | true
-      'xyz-invalid'                | false
-      'refs/heads/master'          | true
-      'refs/heads/invalid-xyz'     | false
-      'refs/tags/v1.0.0'           | true
-      'refs/tags/v9.8.7'           | false
-    end
-
-    subject(:branch_or_tag?) { repository.branch_or_tag?(ref) }
-
-    with_them do
-      it { is_expected.to eq(result) }
-    end
-
-    context 'when a refs/remotes ref is passed' do
-      let(:ref) { 'refs/remotes/origin/master' }
-
-      it { is_expected.to be_falsey }
-
-      context 'when the ref is a branch' do
-        let_it_be(:project) { create(:project, :repository) }
-
-        before do
-          repository.add_branch(user, 'refs/remotes/origin/master', 'master')
-        end
-
-        it { is_expected.to be_truthy }
-      end
-
-      context 'when the naked ref is a branch' do
-        let_it_be(:project) { create(:project, :repository) }
-
-        before do
-          repository.add_branch(user, 'origin/master', 'master')
-        end
-
-        it { is_expected.to be_falsey }
-      end
-    end
-  end
-
   describe '#search_branch_names' do
     subject(:search_branch_names) { repository.search_branch_names('conflict-*') }
 
diff --git a/spec/services/ci/create_pipeline_service/rules_spec.rb b/spec/services/ci/create_pipeline_service/rules_spec.rb
index d235063b600..5cad33a40bd 100644
--- a/spec/services/ci/create_pipeline_service/rules_spec.rb
+++ b/spec/services/ci/create_pipeline_service/rules_spec.rb
@@ -213,7 +213,7 @@ RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, f
           script: echo Hello, World!
           rules:
             - exists:
-              - $VAR_COMBINED # matches with FF rules_exist_expand_globs_early enabled
+              - $VAR_COMBINED # matches
 
         job3:
           script: echo Hello, World!
@@ -247,17 +247,6 @@ RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, f
           expect(pipeline).to be_persisted
           expect(build_names).to contain_exactly('job1', 'job2')
         end
-
-        context 'when rules_exist_expand_globs_early is disabled' do
-          before do
-            stub_feature_flags(rules_exist_expand_globs_early: false)
-          end
-
-          it 'creates all relevant jobs' do
-            expect(pipeline).to be_persisted
-            expect(build_names).to contain_exactly('job1')
-          end
-        end
       end
     end
 
diff --git a/spec/services/ci/list_config_variables_service_spec.rb b/spec/services/ci/list_config_variables_service_spec.rb
index a2188eec63b..3e04286bab8 100644
--- a/spec/services/ci/list_config_variables_service_spec.rb
+++ b/spec/services/ci/list_config_variables_service_spec.rb
@@ -284,7 +284,7 @@ RSpec.describe Ci::ListConfigVariablesService,
   end
 
   context 'when reading from cache' do
-    let(:reactive_cache_params) { [ref, sha] }
+    let(:reactive_cache_params) { [sha] }
     let(:return_value) { { 'KEY1' => { value: 'val 1', description: 'description 1' } } }
 
     before do
@@ -297,7 +297,7 @@ RSpec.describe Ci::ListConfigVariablesService,
   end
 
   context 'when the cache is empty' do
-    let(:reactive_cache_params) { [ref, sha] }
+    let(:reactive_cache_params) { [sha] }
 
     it 'returns nil and enquques the worker to fill cache' do
       expect(ExternalServiceReactiveCachingWorker)
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 3af943a8bf4..e1a77582aba 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -3331,25 +3331,6 @@ RSpec.describe NotificationService, :mailer, feature_category: :team_planning do
     end
   end
 
-  describe '#invite_member_reminder' do
-    let_it_be(:group_member) { create(:group_member) }
-
-    subject { notification.invite_member_reminder(group_member, 'token', 0) }
-
-    it 'calls the Notify.invite_member_reminder method with the right params' do
-      expect(Notify).to receive(:member_invited_reminder_email).with('Group', group_member.id, 'token', 0).at_least(:once).and_call_original
-
-      subject
-    end
-
-    it 'sends exactly one email' do
-      subject
-
-      expect_delivery_jobs_count(1)
-      expect_enqueud_email('Group', group_member.id, 'token', 0, mail: 'member_invited_reminder_email')
-    end
-  end
-
   describe '#new_instance_access_request', :deliver_mails_inline do
     let_it_be(:user) { create(:user, :blocked_pending_approval) }
     let_it_be(:admins) { create_list(:admin, 12, :with_sign_ins) }
diff --git a/spec/support/helpers/database/duplicate_indexes.yml b/spec/support/helpers/database/duplicate_indexes.yml
index 248bb2d38a5..eae4b97d6d7 100644
--- a/spec/support/helpers/database/duplicate_indexes.yml
+++ b/spec/support/helpers/database/duplicate_indexes.yml
@@ -85,9 +85,6 @@ requirements_management_test_reports:
 sbom_component_versions:
   index_sbom_component_versions_on_component_id_and_version:
   - index_sbom_component_versions_on_component_id
-sbom_occurrences:
-  index_unarchived_occurrences_on_version_id_and_traversal_ids:
-  - index_sbom_occurrences_on_component_version_id
 search_namespace_index_assignments:
   index_search_namespace_index_assignments_uniqueness_index_type:
   - index_search_namespace_index_assignments_on_namespace_id