From be4b3134a282f7a8812306777abd2d3150deecdc Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 4 May 2021 15:10:36 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo.yml                             |   8 --
 GITALY_SERVER_VERSION                         |   2 +-
 .../sidebar/board_sidebar_labels_select.vue   |   7 +-
 .../frequent_items/components/app.vue         |   2 +-
 .../components/frequent_items_list.vue        |   6 +-
 .../components/issuable_item.vue              |  13 +-
 .../components/issues_list_app.vue            |  30 ++++-
 .../javascripts/issues_list/constants.js      |  83 ------------
 app/assets/javascripts/issues_list/utils.js   | 119 +++++++++++++++++-
 .../jobs/components/table/index.js            |  10 +-
 .../jobs/components/table/jobs_table.vue      |   7 +-
 .../jobs/components/table/jobs_table_app.vue  |  10 ++
 .../table/jobs_table_empty_state.vue          |  35 ++++++
 .../javascripts/lib/utils/datetime_utility.js |   2 +
 .../components/diff_file_editor.vue           |  34 ++---
 .../components/inline_conflict_lines.vue      |   2 +-
 .../components/parallel_conflict_lines.vue    |   2 +-
 .../merge_conflict_resolver_app.vue           | 111 +++++++---------
 .../components/date/sidebar_date_widget.vue   |   2 +-
 app/assets/stylesheets/framework/diffs.scss   |   4 -
 .../stylesheets/framework/dropdowns.scss      |   3 +-
 .../stylesheets/framework/issue_box.scss      |  11 +-
 .../page_bundles/merge_conflicts.scss         |  17 ---
 .../stylesheets/page_bundles/milestone.scss   |  17 ---
 app/controllers/concerns/page_limiter.rb      |   2 +-
 app/finders/packages/go/version_finder.rb     |   2 +-
 app/helpers/time_zone_helper.rb               |   2 +-
 app/models/bulk_imports/tracker.rb            |   2 +-
 app/models/concerns/cache_markdown_field.rb   |   4 +-
 app/models/concerns/group_descendant.rb       |   4 +-
 .../concerns/has_wiki_page_meta_attributes.rb |   2 +-
 app/models/concerns/reactive_caching.rb       |   2 +-
 app/models/concerns/sha256_attribute.rb       |   2 +-
 app/models/concerns/sha_attribute.rb          |   2 +-
 .../concerns/storage/legacy_namespace.rb      |   4 +-
 app/models/concerns/token_authenticatable.rb  |   2 +-
 .../concerns/x509_serial_number_attribute.rb  |   2 +-
 app/models/namespace/traversal_hierarchy.rb   |   2 +-
 app/models/namespaces/traversal/linear.rb     |   2 +-
 app/models/packages/go/module.rb              |   4 +-
 app/models/packages/go/module_version.rb      |  12 +-
 app/models/project.rb                         |   2 +-
 app/models/releases/evidence.rb               |   2 +-
 app/models/releases/link.rb                   |   2 +-
 app/models/ssh_host_key.rb                    |   4 +-
 .../process_prometheus_alert_service.rb       |   7 --
 .../clusters/aws/fetch_credentials_service.rb |   2 +-
 .../alert_management/alert_processing.rb      |  20 +--
 .../groups/import_export/export_service.rb    |   2 +-
 .../groups/import_export/import_service.rb    |   2 +-
 .../dashboard/grafana_metric_embed_service.rb |   6 +-
 .../dashboard/transient_embed_service.rb      |   2 +-
 .../statistics_refresher_service.rb           |   2 +-
 .../notification_recipients/builder/base.rb   |  24 ++++
 .../extract_changes_metadata_service.rb       |  20 +--
 .../debian/extract_metadata_service.rb        |   2 +-
 .../nuget/metadata_extraction_service.rb      |   6 +-
 .../update_package_from_metadata_service.rb   |   4 +-
 .../packages/pypi/create_package_service.rb   |   2 +-
 .../packages/rubygems/process_gem_service.rb  |   2 +-
 app/services/projects/after_rename_service.rb |   6 +-
 app/services/projects/destroy_service.rb      |   2 +-
 .../projects/import_export/export_service.rb  |   2 +-
 app/services/projects/transfer_service.rb     |   8 +-
 app/services/projects/update_service.rb       |   6 +-
 .../static_site_editor/config_service.rb      |   2 +-
 app/services/submit_usage_ping_service.rb     |   6 +-
 .../terraform/remote_state_handler.rb         |   2 +-
 .../todos/destroy/entity_leave_service.rb     |   2 +-
 ...pdate_assigned_open_issue_count_service.rb |   2 +-
 .../users/update_canonical_email_service.rb   |   2 +-
 app/services/users/update_service.rb          |   2 +-
 app/uploaders/object_storage.rb               |   2 +-
 app/validators/cron_validator.rb              |   2 +-
 app/views/projects/jobs/index.html.haml       |   2 +-
 .../_shared_runners_description.html.haml     |   9 +-
 .../concerns/git_garbage_collect_methods.rb   |   4 +-
 .../object_storage/migrate_uploads_worker.rb  |   2 +-
 .../packages/maven/metadata/sync_worker.rb    |   4 +-
 .../users/update_open_issue_count_worker.rb   |   4 +-
 .../unreleased/321090-leipert-gitlab-ui.yml   |   5 +
 ...ification-recipients-builder-for-watch.yml |   5 +
 ...ue-due-date-changes-without-user-input.yml |   5 +
 .../mrincon-fix-xss-shared-runners-text.yml   |   5 +
 .../unreleased/pl-rubocop-todo-raise-args.yml |   5 +
 .../sy-consistently-auto-resolve-alerts.yml   |   5 +
 .../development/api_caching_releases.yml      |   8 ++
 ...190402150158_backport_enterprise_schema.rb |   2 +-
 .../geo/disaster_recovery/index.md            |  22 ++--
 doc/administration/geo/index.md               |   2 +-
 .../packages/container_registry.md            |   4 +-
 doc/api/events.md                             |  18 +--
 .../index.md                                  |   4 +-
 .../blueprints/image_resizing/index.md        |   4 +-
 doc/development/feature_flags/controls.md     |   2 +-
 .../multi_version_compatibility.md            |   2 +-
 doc/development/packages.md                   |   4 +-
 doc/integration/jira/connect-app.md           |  34 ++---
 doc/integration/jira/development_panel.md     |   2 +-
 .../prometheus_library/cloudwatch.md          |   2 +-
 .../repository/repository_mirroring.md        |   5 +-
 lib/api/helpers/caching.rb                    |   7 +-
 lib/api/helpers/headers_helpers.rb            |   2 +-
 lib/api/internal/base.rb                      |   2 +-
 lib/api/releases.rb                           |  16 ++-
 lib/bulk_imports/clients/http.rb              |   2 +-
 lib/declarative_enum.rb                       |   2 +-
 lib/flowdock/git.rb                           |   2 +-
 lib/gitlab/alert_management/payload/base.rb   |   2 +-
 lib/gitlab/auth/auth_finders.rb               |   2 +-
 lib/gitlab/auth/ldap/config.rb                |   2 +-
 lib/gitlab/bare_repository_import/importer.rb |   2 +-
 lib/gitlab/changelog/committer.rb             |   2 +-
 lib/gitlab/changelog/parser.rb                |   2 +-
 lib/gitlab/ci/parsers/test/junit.rb           |   2 +-
 lib/gitlab/ci/yaml_processor.rb               |   2 +-
 lib/gitlab/cycle_analytics/summary/base.rb    |   4 +-
 .../loose_index_scan_distinct_count.rb        |   2 +-
 lib/gitlab/encrypted_configuration.rb         |   4 +-
 lib/gitlab/experimentation.rb                 |   2 +-
 lib/gitlab/external_authorization/client.rb   |   2 +-
 lib/gitlab/git/conflict/resolver.rb           |   4 +-
 lib/gitlab/git/repository.rb                  |  10 +-
 lib/gitlab/git/rugged_impl/repository.rb      |   2 +-
 lib/gitlab/git/wraps_gitaly_errors.rb         |   8 +-
 lib/gitlab/gitaly_client/operation_service.rb |   4 +-
 lib/gitlab/gitaly_client/ref_service.rb       |   2 +-
 .../gitaly_client/repository_service.rb       |   2 +-
 lib/gitlab/golang.rb                          |   6 +-
 .../graphql/pagination/keyset/connection.rb   |   4 +-
 .../graphql/pagination/keyset/order_info.rb   |   8 +-
 .../pagination/keyset/query_builder.rb        |   4 +-
 lib/gitlab/graphql/variables.rb               |   2 +-
 .../web_upload_strategy.rb                    |   2 +-
 .../after_export_strategy_builder.rb          |   2 +-
 lib/gitlab/import_export/file_importer.rb     |   4 +-
 lib/gitlab/import_export/importer.rb          |   4 +-
 .../import_export/json/legacy_reader.rb       |   2 +-
 lib/gitlab/import_export/lfs_restorer.rb      |   2 +-
 lib/gitlab/import_export/shared.rb            |   2 +-
 lib/gitlab/import_export/version_checker.rb   |   4 +-
 .../redis_cluster_validator.rb                |   2 +-
 lib/gitlab/jira/http_client.rb                |   2 +-
 lib/gitlab/json.rb                            |   2 +-
 .../legacy_github_import/label_formatter.rb   |   2 +-
 lib/gitlab/lfs/client.rb                      |   2 +-
 lib/gitlab/metrics/dashboard/errors.rb        |   2 +-
 .../metrics/dashboard/stages/base_stage.rb    |   6 +-
 .../stages/cluster_endpoint_inserter.rb       |   8 +-
 .../stages/metric_endpoint_inserter.rb        |   4 +-
 .../stages/variable_endpoint_inserter.rb      |   2 +-
 lib/gitlab/multi_collection_paginator.rb      |   2 +-
 lib/gitlab/object_hierarchy.rb                |   2 +-
 lib/gitlab/otp_key_rotator.rb                 |   4 +-
 lib/gitlab/patch/draw_route.rb                |   2 +-
 .../phabricator_import/conduit/client.rb      |   2 +-
 .../phabricator_import/conduit/response.rb    |   2 +-
 .../prometheus/additional_metrics_parser.rb   |   2 +-
 lib/gitlab/redis/boolean.rb                   |   8 +-
 lib/gitlab/redis/hll.rb                       |   2 +-
 lib/gitlab/repository_url_builder.rb          |   2 +-
 lib/gitlab/routing.rb                         |   2 +-
 lib/gitlab/runtime.rb                         |   8 +-
 lib/gitlab/search/parsed_query.rb             |   2 +-
 lib/gitlab/sidekiq_config/worker_matcher.rb   |   6 +-
 lib/gitlab/task_helpers.rb                    |   2 +-
 lib/gitlab/untrusted_regexp.rb                |   2 +-
 lib/gitlab/url_builder.rb                     |   2 +-
 .../usage_data_counters/hll_redis_counter.rb  |   4 +-
 lib/gitlab/utils.rb                           |   2 +-
 lib/gitlab/utils/override.rb                  |   4 +-
 lib/gitlab/verify/batch_verifier.rb           |  14 +--
 lib/gitlab/view/presenter/delegated.rb        |   2 +-
 lib/grafana/time_window.rb                    |   2 +-
 lib/mattermost/client.rb                      |   4 +-
 lib/mattermost/session.rb                     |   4 +-
 qa/qa/page/base.rb                            |   2 +-
 .../graceful_timeout_handling_spec.rb         |   2 +-
 .../projects/labels_controller_spec.rb        |   2 +-
 .../user_resolves_conflicts_spec.rb           |   2 +-
 spec/features/runners_spec.rb                 |  67 ++++++++--
 .../components/issuable_item_spec.js          |  26 ++++
 .../components/issues_list_app_spec.js        |  44 ++++---
 spec/frontend/issues_list/utils_spec.js       |  34 +++++
 .../components/table/job_table_app_spec.js    |  32 ++++-
 .../table/jobs_table_empty_state_spec.js      |  37 ++++++
 spec/frontend/jobs/mock_data.js               |   8 ++
 .../merge_conflict_resolver_app_spec.js       |  12 +-
 .../date/sidebar_date_widget_spec.js          |   8 ++
 .../alert_management/payload/base_spec.rb     |   6 +
 spec/lib/gitlab/database_spec.rb              |   2 +-
 .../external_authorization/access_spec.rb     |   2 +-
 .../external_authorization/client_spec.rb     |   2 +-
 .../gitlab/git/wraps_gitaly_errors_spec.rb    |   2 +-
 spec/models/ci/pipeline_schedule_spec.rb      |   2 +-
 .../namespace/traversal_hierarchy_spec.rb     |   2 +-
 .../api_guard/admin_mode_middleware_spec.rb   |   2 +-
 spec/requests/api/helpers_spec.rb             |   2 +-
 spec/requests/api/releases_spec.rb            |  70 ++++++++++-
 .../process_prometheus_alert_service_spec.rb  |   2 +-
 spec/services/auto_merge/base_service_spec.rb |   8 +-
 spec/services/branches/delete_service_spec.rb |   2 +-
 .../ci/parse_dotenv_artifact_service_spec.rb  |   2 +-
 .../merge_to_ref_service_spec.rb              |   2 +-
 spec/support/helpers/board_helpers.rb         |   1 +
 spec/support/helpers/dns_helpers.rb           |   2 +-
 .../support/helpers/next_found_instance_of.rb |   2 +-
 spec/support/helpers/redis_without_keys.rb    |   4 +-
 spec/support/helpers/require_migration.rb     |   2 +-
 .../alert_recovery_shared_examples.rb         |  64 ----------
 .../alert_management_shared_examples.rb       |  20 ++-
 spec/support/stored_repositories.rb           |   2 +-
 212 files changed, 1002 insertions(+), 658 deletions(-)
 create mode 100644 app/assets/javascripts/jobs/components/table/jobs_table_empty_state.vue
 create mode 100644 changelogs/unreleased/321090-leipert-gitlab-ui.yml
 create mode 100644 changelogs/unreleased/326045-refactor-notification-recipients-builder-for-watch.yml
 create mode 100644 changelogs/unreleased/329614-issue-due-date-changes-without-user-input.yml
 create mode 100644 changelogs/unreleased/mrincon-fix-xss-shared-runners-text.yml
 create mode 100644 changelogs/unreleased/pl-rubocop-todo-raise-args.yml
 create mode 100644 changelogs/unreleased/sy-consistently-auto-resolve-alerts.yml
 create mode 100644 config/feature_flags/development/api_caching_releases.yml
 create mode 100644 spec/frontend/jobs/components/table/jobs_table_empty_state_spec.js

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 64332dfc0ce..0f2f3bc44a4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -820,14 +820,6 @@ Style/NumericLiteralPrefix:
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 247
-# Cop supports --auto-correct.
-# Configuration parameters: .
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Enabled: false
-  EnforcedStyle: exploded
-
 # Offense count: 26
 # Cop supports --auto-correct.
 # Configuration parameters: SafeForConstants.
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 83823ce4036..94c23ab5110 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-bb763fb573555a0f9714002c2755bdd396cab3dd
+9523fe6434ea464a6a16c895222a4b001a5c0bca
diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue
index f78be83cd82..aedd695d07b 100644
--- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue
+++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue
@@ -77,7 +77,12 @@ export default {
 </script>
 
 <template>
-  <board-editable-item ref="sidebarItem" :title="__('Labels')" :loading="loading">
+  <board-editable-item
+    ref="sidebarItem"
+    :title="__('Labels')"
+    :loading="loading"
+    data-testid="sidebar-labels"
+  >
     <template #collapsed>
       <gl-label
         v-for="label in issueLabels"
diff --git a/app/assets/javascripts/frequent_items/components/app.vue b/app/assets/javascripts/frequent_items/components/app.vue
index 69f89aa3857..00d32727ad0 100644
--- a/app/assets/javascripts/frequent_items/components/app.vue
+++ b/app/assets/javascripts/frequent_items/components/app.vue
@@ -100,7 +100,7 @@ export default {
 </script>
 
 <template>
-  <div>
+  <div class="gl-display-flex gl-flex-direction-column gl-flex-align-items-stretch gl-h-full">
     <frequent-items-search-input :namespace="namespace" />
     <gl-loading-icon
       v-if="isLoadingItems"
diff --git a/app/assets/javascripts/frequent_items/components/frequent_items_list.vue b/app/assets/javascripts/frequent_items/components/frequent_items_list.vue
index 6feeb5f03ad..1da0b88c9e9 100644
--- a/app/assets/javascripts/frequent_items/components/frequent_items_list.vue
+++ b/app/assets/javascripts/frequent_items/components/frequent_items_list.vue
@@ -59,7 +59,11 @@ export default {
 <template>
   <div class="frequent-items-list-container">
     <ul ref="frequentItemsList" class="list-unstyled">
-      <li v-if="isListEmpty" :class="{ 'section-failure': isFetchFailed }" class="section-empty">
+      <li
+        v-if="isListEmpty"
+        :class="{ 'section-failure': isFetchFailed }"
+        class="section-empty gl-mb-3"
+      >
         {{ listEmptyMessage }}
       </li>
       <frequent-items-list-item
diff --git a/app/assets/javascripts/issuable_list/components/issuable_item.vue b/app/assets/javascripts/issuable_list/components/issuable_item.vue
index 5d497369f5a..92935efa6bc 100644
--- a/app/assets/javascripts/issuable_list/components/issuable_item.vue
+++ b/app/assets/javascripts/issuable_list/components/issuable_item.vue
@@ -3,7 +3,7 @@ import { GlLink, GlIcon, GlLabel, GlFormCheckbox, GlTooltipDirective } from '@gi
 
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { isScopedLabel } from '~/lib/utils/common_utils';
-import { getTimeago } from '~/lib/utils/datetime_utility';
+import { differenceInSeconds, getTimeago, SECONDS_IN_DAY } from '~/lib/utils/datetime_utility';
 import { isExternal, setUrlFragment } from '~/lib/utils/url_utility';
 import { __, n__, sprintf } from '~/locale';
 import IssuableAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
@@ -50,6 +50,10 @@ export default {
     },
   },
   computed: {
+    createdInPastDay() {
+      const createdSecondsAgo = differenceInSeconds(new Date(this.issuable.createdAt), new Date());
+      return createdSecondsAgo < SECONDS_IN_DAY;
+    },
     author() {
       return this.issuable.author;
     },
@@ -152,7 +156,12 @@ export default {
 </script>
 
 <template>
-  <li :id="`issuable_${issuable.id}`" class="issue gl-px-5!" :data-labels="labelIdsString">
+  <li
+    :id="`issuable_${issuable.id}`"
+    class="issue gl-px-5!"
+    :class="{ closed: issuable.closedAt, today: createdInPastDay }"
+    :data-labels="labelIdsString"
+  >
     <div class="issuable-info-container">
       <div v-if="showCheckbox" class="issue-check">
         <gl-form-checkbox
diff --git a/app/assets/javascripts/issues_list/components/issues_list_app.vue b/app/assets/javascripts/issues_list/components/issues_list_app.vue
index 621e08e9bfc..372c15be931 100644
--- a/app/assets/javascripts/issues_list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues_list/components/issues_list_app.vue
@@ -21,7 +21,6 @@ import {
   MAX_LIST_SIZE,
   PAGE_SIZE,
   RELATIVE_POSITION_ASC,
-  sortOptions,
   sortParams,
 } from '~/issues_list/constants';
 import {
@@ -30,6 +29,7 @@ import {
   convertToUrlParams,
   getFilterTokens,
   getSortKey,
+  getSortOptions,
 } from '~/issues_list/utils';
 import axios from '~/lib/utils/axios_utils';
 import { convertObjectPropsToCamelCase, getParameterByName } from '~/lib/utils/common_utils';
@@ -48,7 +48,6 @@ export default {
   i18n,
   IssuableListTabs,
   PAGE_SIZE,
-  sortOptions,
   sortParams,
   components: {
     CsvImportExportButtons,
@@ -87,6 +86,9 @@ export default {
     exportCsvPath: {
       default: '',
     },
+    hasBlockedIssuesFeature: {
+      default: false,
+    },
     hasIssues: {
       default: false,
     },
@@ -147,6 +149,9 @@ export default {
     };
   },
   computed: {
+    isBulkEditButtonDisabled() {
+      return this.showBulkEditSidebar || !this.issues.length;
+    },
     isManualOrdering() {
       return this.sortKey === RELATIVE_POSITION_ASC;
     },
@@ -252,6 +257,9 @@ export default {
     showPaginationControls() {
       return this.issues.length > 0;
     },
+    sortOptions() {
+      return getSortOptions(this.hasIssueWeightsFeature, this.hasBlockedIssuesFeature);
+    },
     tabCounts() {
       return Object.values(IssuableStates).reduce(
         (acc, state) => ({
@@ -346,6 +354,15 @@ export default {
     getExportCsvPathWithQuery() {
       return `${this.exportCsvPath}${window.location.search}`;
     },
+    getStatus(issue) {
+      if (issue.closedAt && issue.movedToId) {
+        return __('CLOSED (MOVED)');
+      }
+      if (issue.closedAt) {
+        return __('CLOSED');
+      }
+      return undefined;
+    },
     handleUpdateLegacyBulkEdit() {
       // If "select all" checkbox was checked, wait for all checkboxes
       // to be checked before updating IssuableBulkUpdateSidebar class
@@ -434,7 +451,7 @@ export default {
       :search-input-placeholder="__('Search or filter results…')"
       :search-tokens="searchTokens"
       :initial-filter-value="filterTokens"
-      :sort-options="$options.sortOptions"
+      :sort-options="sortOptions"
       :initial-sort-by="sortKey"
       :issuables="issues"
       :tabs="$options.IssuableListTabs"
@@ -472,13 +489,14 @@ export default {
           :aria-label="$options.i18n.calendarLabel"
         />
         <csv-import-export-buttons
+          v-if="isSignedIn"
           class="gl-mr-3"
           :export-csv-path="exportCsvPathWithQuery"
           :issuable-count="totalIssues"
         />
         <gl-button
           v-if="canBulkUpdate"
-          :disabled="showBulkEditSidebar"
+          :disabled="isBulkEditButtonDisabled"
           @click="handleBulkUpdateClick"
         >
           {{ __('Edit issues') }}
@@ -492,6 +510,10 @@ export default {
         <issue-card-time-info :issue="issuable" />
       </template>
 
+      <template #status="{ issuable = {} }">
+        {{ getStatus(issuable) }}
+      </template>
+
       <template #statistics="{ issuable = {} }">
         <li
           v-if="issuable.mergeRequestsCount"
diff --git a/app/assets/javascripts/issues_list/constants.js b/app/assets/javascripts/issues_list/constants.js
index 38a0d953835..ee515079668 100644
--- a/app/assets/javascripts/issues_list/constants.js
+++ b/app/assets/javascripts/issues_list/constants.js
@@ -188,89 +188,6 @@ export const sortParams = {
   },
 };
 
-export const sortOptions = [
-  {
-    id: 1,
-    title: __('Priority'),
-    sortDirection: {
-      ascending: PRIORITY_ASC,
-      descending: PRIORITY_DESC,
-    },
-  },
-  {
-    id: 2,
-    title: __('Created date'),
-    sortDirection: {
-      ascending: CREATED_ASC,
-      descending: CREATED_DESC,
-    },
-  },
-  {
-    id: 3,
-    title: __('Last updated'),
-    sortDirection: {
-      ascending: UPDATED_ASC,
-      descending: UPDATED_DESC,
-    },
-  },
-  {
-    id: 4,
-    title: __('Milestone due date'),
-    sortDirection: {
-      ascending: MILESTONE_DUE_ASC,
-      descending: MILESTONE_DUE_DESC,
-    },
-  },
-  {
-    id: 5,
-    title: __('Due date'),
-    sortDirection: {
-      ascending: DUE_DATE_ASC,
-      descending: DUE_DATE_DESC,
-    },
-  },
-  {
-    id: 6,
-    title: __('Popularity'),
-    sortDirection: {
-      ascending: POPULARITY_ASC,
-      descending: POPULARITY_DESC,
-    },
-  },
-  {
-    id: 7,
-    title: __('Label priority'),
-    sortDirection: {
-      ascending: LABEL_PRIORITY_ASC,
-      descending: LABEL_PRIORITY_DESC,
-    },
-  },
-  {
-    id: 8,
-    title: __('Manual'),
-    sortDirection: {
-      ascending: RELATIVE_POSITION_ASC,
-      descending: RELATIVE_POSITION_ASC,
-    },
-  },
-  {
-    id: 9,
-    title: __('Weight'),
-    sortDirection: {
-      ascending: WEIGHT_ASC,
-      descending: WEIGHT_DESC,
-    },
-  },
-  {
-    id: 10,
-    title: __('Blocking'),
-    sortDirection: {
-      ascending: BLOCKING_ISSUES_ASC,
-      descending: BLOCKING_ISSUES_DESC,
-    },
-  },
-];
-
 export const MAX_LIST_SIZE = 10;
 
 export const FILTERED_SEARCH_TERM = 'filtered-search-term';
diff --git a/app/assets/javascripts/issues_list/utils.js b/app/assets/javascripts/issues_list/utils.js
index f470ccb5e06..30d122e7bbe 100644
--- a/app/assets/javascripts/issues_list/utils.js
+++ b/app/assets/javascripts/issues_list/utils.js
@@ -1,10 +1,127 @@
-import { FILTERED_SEARCH_TERM, filters, sortParams } from '~/issues_list/constants';
+import {
+  BLOCKING_ISSUES_ASC,
+  BLOCKING_ISSUES_DESC,
+  CREATED_ASC,
+  CREATED_DESC,
+  DUE_DATE_ASC,
+  DUE_DATE_DESC,
+  FILTERED_SEARCH_TERM,
+  filters,
+  LABEL_PRIORITY_ASC,
+  LABEL_PRIORITY_DESC,
+  MILESTONE_DUE_ASC,
+  MILESTONE_DUE_DESC,
+  POPULARITY_ASC,
+  POPULARITY_DESC,
+  PRIORITY_ASC,
+  PRIORITY_DESC,
+  RELATIVE_POSITION_ASC,
+  sortParams,
+  UPDATED_ASC,
+  UPDATED_DESC,
+  WEIGHT_ASC,
+  WEIGHT_DESC,
+} from '~/issues_list/constants';
+import { __ } from '~/locale';
 
 export const getSortKey = (orderBy, sort) =>
   Object.keys(sortParams).find(
     (key) => sortParams[key].order_by === orderBy && sortParams[key].sort === sort,
   );
 
+export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) => {
+  const sortOptions = [
+    {
+      id: 1,
+      title: __('Priority'),
+      sortDirection: {
+        ascending: PRIORITY_ASC,
+        descending: PRIORITY_DESC,
+      },
+    },
+    {
+      id: 2,
+      title: __('Created date'),
+      sortDirection: {
+        ascending: CREATED_ASC,
+        descending: CREATED_DESC,
+      },
+    },
+    {
+      id: 3,
+      title: __('Last updated'),
+      sortDirection: {
+        ascending: UPDATED_ASC,
+        descending: UPDATED_DESC,
+      },
+    },
+    {
+      id: 4,
+      title: __('Milestone due date'),
+      sortDirection: {
+        ascending: MILESTONE_DUE_ASC,
+        descending: MILESTONE_DUE_DESC,
+      },
+    },
+    {
+      id: 5,
+      title: __('Due date'),
+      sortDirection: {
+        ascending: DUE_DATE_ASC,
+        descending: DUE_DATE_DESC,
+      },
+    },
+    {
+      id: 6,
+      title: __('Popularity'),
+      sortDirection: {
+        ascending: POPULARITY_ASC,
+        descending: POPULARITY_DESC,
+      },
+    },
+    {
+      id: 7,
+      title: __('Label priority'),
+      sortDirection: {
+        ascending: LABEL_PRIORITY_ASC,
+        descending: LABEL_PRIORITY_DESC,
+      },
+    },
+    {
+      id: 8,
+      title: __('Manual'),
+      sortDirection: {
+        ascending: RELATIVE_POSITION_ASC,
+        descending: RELATIVE_POSITION_ASC,
+      },
+    },
+  ];
+
+  if (hasIssueWeightsFeature) {
+    sortOptions.push({
+      id: 9,
+      title: __('Weight'),
+      sortDirection: {
+        ascending: WEIGHT_ASC,
+        descending: WEIGHT_DESC,
+      },
+    });
+  }
+
+  if (hasBlockedIssuesFeature) {
+    sortOptions.push({
+      id: 10,
+      title: __('Blocking'),
+      sortDirection: {
+        ascending: BLOCKING_ISSUES_ASC,
+        descending: BLOCKING_ISSUES_DESC,
+      },
+    });
+  }
+
+  return sortOptions;
+};
+
 const tokenTypes = Object.keys(filters);
 
 const urlParamKeys = tokenTypes.flatMap((key) => Object.values(filters[key].urlParam));
diff --git a/app/assets/javascripts/jobs/components/table/index.js b/app/assets/javascripts/jobs/components/table/index.js
index b6b3bb6d379..05d6ebfd6d6 100644
--- a/app/assets/javascripts/jobs/components/table/index.js
+++ b/app/assets/javascripts/jobs/components/table/index.js
@@ -16,13 +16,21 @@ export default (containerId = 'js-jobs-table') => {
     return false;
   }
 
-  const { fullPath, jobCounts, jobStatuses } = containerEl.dataset;
+  const {
+    fullPath,
+    jobCounts,
+    jobStatuses,
+    pipelineEditorPath,
+    emptyStateSvgPath,
+  } = containerEl.dataset;
 
   return new Vue({
     el: containerEl,
     apolloProvider,
     provide: {
+      emptyStateSvgPath,
       fullPath,
+      pipelineEditorPath,
       jobStatuses: JSON.parse(jobStatuses),
       jobCounts: JSON.parse(jobCounts),
     },
diff --git a/app/assets/javascripts/jobs/components/table/jobs_table.vue b/app/assets/javascripts/jobs/components/table/jobs_table.vue
index f52f5163dda..2736aa42684 100644
--- a/app/assets/javascripts/jobs/components/table/jobs_table.vue
+++ b/app/assets/javascripts/jobs/components/table/jobs_table.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlTable } from '@gitlab/ui';
-import { __ } from '~/locale';
+import { s__, __ } from '~/locale';
 import CiBadge from '~/vue_shared/components/ci_badge_link.vue';
 import ActionsCell from './cells/actions_cell.vue';
 import DurationCell from './cells/duration_cell.vue';
@@ -13,6 +13,9 @@ const defaultTableClasses = {
 };
 
 export default {
+  i18n: {
+    emptyText: s__('Jobs|No jobs to show'),
+  },
   fields: [
     {
       key: 'status',
@@ -90,6 +93,8 @@ export default {
     :items="jobs"
     :fields="$options.fields"
     :tbody-tr-attr="{ 'data-testid': 'jobs-table-row' }"
+    :empty-text="$options.i18n.emptyText"
+    show-empty
     stacked="lg"
     fixed
   >
diff --git a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
index b153f53a179..cf7970f41b1 100644
--- a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
+++ b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
@@ -3,6 +3,7 @@ import { GlAlert, GlSkeletonLoader } from '@gitlab/ui';
 import { __ } from '~/locale';
 import GetJobs from './graphql/queries/get_jobs.query.graphql';
 import JobsTable from './jobs_table.vue';
+import JobsTableEmptyState from './jobs_table_empty_state.vue';
 import JobsTableTabs from './jobs_table_tabs.vue';
 
 export default {
@@ -13,6 +14,7 @@ export default {
     GlAlert,
     GlSkeletonLoader,
     JobsTable,
+    JobsTableEmptyState,
     JobsTableTabs,
   },
   inject: {
@@ -41,15 +43,21 @@ export default {
       jobs: null,
       hasError: false,
       isAlertDismissed: false,
+      scope: null,
     };
   },
   computed: {
     shouldShowAlert() {
       return this.hasError && !this.isAlertDismissed;
     },
+    showEmptyState() {
+      return this.jobs.length === 0 && !this.scope;
+    },
   },
   methods: {
     fetchJobsByStatus(scope) {
+      this.scope = scope;
+
       this.$apollo.queries.jobs.refetch({ statuses: scope });
     },
   },
@@ -80,6 +88,8 @@ export default {
       />
     </div>
 
+    <jobs-table-empty-state v-else-if="showEmptyState" />
+
     <jobs-table v-else :jobs="jobs" />
   </div>
 </template>
diff --git a/app/assets/javascripts/jobs/components/table/jobs_table_empty_state.vue b/app/assets/javascripts/jobs/components/table/jobs_table_empty_state.vue
new file mode 100644
index 00000000000..fcdd52b719c
--- /dev/null
+++ b/app/assets/javascripts/jobs/components/table/jobs_table_empty_state.vue
@@ -0,0 +1,35 @@
+<script>
+import { GlEmptyState } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+export default {
+  i18n: {
+    title: s__('Jobs|Use jobs to automate your tasks'),
+    description: s__(
+      'Jobs|Jobs are the building blocks of a GitLab CI/CD pipeline. Each job has a specific task, like testing code. To set up jobs in a CI/CD pipeline, add a CI/CD configuration file to your project.',
+    ),
+    buttonText: s__('Jobs|Create CI/CD configuration file'),
+  },
+  components: {
+    GlEmptyState,
+  },
+  inject: {
+    pipelineEditorPath: {
+      default: '',
+    },
+    emptyStateSvgPath: {
+      default: '',
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-empty-state
+    :title="$options.i18n.title"
+    :description="$options.i18n.description"
+    :svg-path="emptyStateSvgPath"
+    :primary-button-link="pipelineEditorPath"
+    :primary-button-text="$options.i18n.buttonText"
+  />
+</template>
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index a509828815a..0a038febb9f 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -4,6 +4,8 @@ import { isString, mapValues, isNumber, reduce } from 'lodash';
 import * as timeago from 'timeago.js';
 import { languageCode, s__, __, n__ } from '../../locale';
 
+export const SECONDS_IN_DAY = 86400;
+
 const DAYS_IN_WEEK = 7;
 
 window.timeago = timeago;
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue
index 7649c363daa..04e493712ec 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue
@@ -1,4 +1,5 @@
 <script>
+import { GlButton } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import { mapActions } from 'vuex';
 import { deprecatedCreateFlash as flash } from '~/flash';
@@ -7,6 +8,9 @@ import { __ } from '~/locale';
 import { INTERACTIVE_RESOLVE_MODE } from '../constants';
 
 export default {
+  components: {
+    GlButton,
+  },
   props: {
     file: {
       type: Object,
@@ -100,21 +104,21 @@ export default {
 };
 </script>
 <template>
-  <div v-show="file.showEditor" class="diff-editor-wrap">
-    <div v-if="file.promptDiscardConfirmation" class="discard-changes-alert-wrap">
-      <div class="discard-changes-alert">
-        {{ __('Are you sure you want to discard your changes?') }}
-        <div class="discard-actions">
-          <button
-            class="btn btn-sm btn-danger-secondary gl-button"
-            @click="acceptDiscardConfirmation(file)"
-          >
-            {{ __('Discard changes') }}
-          </button>
-          <button class="btn btn-default btn-sm gl-button" @click="cancelDiscardConfirmation(file)">
-            {{ __('Cancel') }}
-          </button>
-        </div>
+  <div v-show="file.showEditor">
+    <div v-if="file.promptDiscardConfirmation" class="discard-changes-alert">
+      {{ __('Are you sure you want to discard your changes?') }}
+      <div class="gl-ml-3 gl-display-inline-block">
+        <gl-button
+          size="small"
+          variant="danger"
+          category="secondary"
+          @click="acceptDiscardConfirmation(file)"
+        >
+          {{ __('Discard changes') }}
+        </gl-button>
+        <gl-button size="small" @click="cancelDiscardConfirmation(file)">
+          {{ __('Cancel') }}
+        </gl-button>
       </div>
     </div>
     <div :class="classObject" class="editor-wrap">
diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
index 9721481e6be..a856d38c089 100644
--- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
+++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
@@ -35,7 +35,7 @@ export default {
         <td :class="lineCssClass(line)" class="diff-line-num header"></td>
         <td :class="lineCssClass(line)" class="line_content header">
           <strong>{{ line.richText }}</strong>
-          <button class="btn" @click="handleSelected({ file, line })">
+          <button type="button" @click="handleSelected({ file, line })">
             {{ line.buttonTitle }}
           </button>
         </td>
diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue
index 7b1d947ccff..2c89b614c87 100644
--- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue
+++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue
@@ -35,7 +35,7 @@ export default {
           <td class="diff-line-num header" :class="lineCssClass(line)"></td>
           <td class="line_content header" :class="lineCssClass(line)">
             <strong>{{ line.richText }}</strong>
-            <button class="btn" @click="handleSelected({ file, line })">
+            <button type="button" @click="handleSelected({ file, line })">
               {{ line.buttonTitle }}
             </button>
           </td>
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
index 0509cf0afa1..3e31e2e93ae 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlSprintf } from '@gitlab/ui';
+import { GlSprintf, GlButton, GlButtonGroup } from '@gitlab/ui';
 import { mapGetters, mapState, mapActions } from 'vuex';
 import { __ } from '~/locale';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
@@ -20,6 +20,8 @@ import { INTERACTIVE_RESOLVE_MODE } from './constants';
  */
 export default {
   components: {
+    GlButton,
+    GlButtonGroup,
     GlSprintf,
     FileIcon,
     DiffFileEditor,
@@ -77,28 +79,23 @@ export default {
       {{ conflictsData.errorMessage }}
     </div>
     <template v-if="!isLoading && !hasError">
-      <div class="content-block oneline-block files-changed">
-        <div v-if="fileTextTypePresent" class="inline-parallel-buttons">
-          <div class="btn-group">
-            <button
-              :class="{ active: !isParallel }"
-              class="btn gl-button"
-              @click="setViewType('inline')"
-            >
+      <div class="gl-border-b-0 gl-py-5 gl-line-height-32">
+        <div v-if="fileTextTypePresent" class="gl-float-right">
+          <gl-button-group>
+            <gl-button :selected="!isParallel" @click="setViewType('inline')">
               {{ __('Inline') }}
-            </button>
-            <button
-              :class="{ active: isParallel }"
-              class="btn gl-button"
+            </gl-button>
+            <gl-button
+              :selected="isParallel"
               data-testid="side-by-side"
               @click="setViewType('parallel')"
             >
               {{ __('Side-by-side') }}
-            </button>
-          </div>
+            </gl-button>
+          </gl-button-group>
         </div>
         <div class="js-toggle-container">
-          <div class="commit-stat-summary" data-testid="conflicts-count">
+          <div data-testid="conflicts-count">
             <gl-sprintf :message="$options.i18n.commitStatSummary">
               <template #conflict>
                 <strong class="cred">{{ getConflictsCountText }}</strong>
@@ -127,47 +124,43 @@ export default {
                 <strong class="file-title-name">{{ file.filePath }}</strong>
               </div>
               <div class="file-actions d-flex align-items-center gl-ml-auto gl-align-self-start">
-                <div v-if="file.type === 'text'" class="btn-group gl-mr-3">
-                  <button
-                    :class="{ active: file.resolveMode === 'interactive' }"
-                    class="btn gl-button"
-                    type="button"
+                <gl-button-group v-if="file.type === 'text'" class="gl-mr-3">
+                  <gl-button
+                    :selected="file.resolveMode === 'interactive'"
                     data-testid="interactive-button"
                     @click="onClickResolveModeButton(file, 'interactive')"
                   >
                     {{ __('Interactive mode') }}
-                  </button>
-                  <button
-                    :class="{ active: file.resolveMode === 'edit' }"
-                    class="btn gl-button"
-                    type="button"
+                  </gl-button>
+                  <gl-button
+                    :selected="file.resolveMode === 'edit'"
                     data-testid="inline-button"
                     @click="onClickResolveModeButton(file, 'edit')"
                   >
                     {{ __('Edit inline') }}
-                  </button>
-                </div>
-                <a :href="file.blobPath" class="btn gl-button view-file">
+                  </gl-button>
+                </gl-button-group>
+                <gl-button :href="file.blobPath">
                   <gl-sprintf :message="__('View file @ %{commitSha}')">
                     <template #commitSha>
                       {{ conflictsData.shortCommitSha }}
                     </template>
                   </gl-sprintf>
-                </a>
+                </gl-button>
               </div>
             </div>
             <div class="diff-content diff-wrap-lines">
-              <template v-if="file.resolveMode === 'interactive' && file.type === 'text'">
-                <div v-if="!isParallel" class="file-content">
-                  <inline-conflict-lines :file="file" />
-                </div>
-                <div v-if="isParallel" class="file-content">
-                  <parallel-conflict-lines :file="file" />
-                </div>
-              </template>
-              <div v-if="file.resolveMode === 'edit' || file.type === 'text-editor'">
-                <diff-file-editor :file="file" />
+              <div
+                v-if="file.resolveMode === 'interactive' && file.type === 'text'"
+                class="file-content"
+              >
+                <parallel-conflict-lines v-if="isParallel" :file="file" />
+                <inline-conflict-lines v-else :file="file" />
               </div>
+              <diff-file-editor
+                v-if="file.resolveMode === 'edit' || file.type === 'text-editor'"
+                :file="file"
+              />
             </div>
           </div>
         </div>
@@ -176,10 +169,10 @@ export default {
       <div class="resolve-conflicts-form">
         <div class="form-group row">
           <div class="col-md-4">
-            <h4>
+            <h4 class="gl-mt-0">
               {{ __('Resolve conflicts on source branch') }}
             </h4>
-            <div class="resolve-info">
+            <div class="gl-mb-5" data-testid="resolve-info">
               <gl-sprintf :message="$options.i18n.resolveInfo">
                 <template #use_ours>
                   <code>{{ s__('MergeConflict|Use ours') }}</code>
@@ -199,7 +192,7 @@ export default {
             <label class="label-bold" for="commit-message">
               {{ __('Commit message') }}
             </label>
-            <div class="commit-message-container">
+            <div class="commit-message-container gl-mb-4">
               <div class="max-width-marker"></div>
               <textarea
                 id="commit-message"
@@ -209,27 +202,17 @@ export default {
                 rows="5"
               ></textarea>
             </div>
-          </div>
-        </div>
-        <div class="form-group row">
-          <div class="offset-md-4 col-md-8">
-            <div class="row">
-              <div class="col-6">
-                <button
-                  :disabled="!isReadyToCommit"
-                  class="btn gl-button btn-success js-submit-button"
-                  type="button"
-                  @click="submitResolvedConflicts(resolveConflictsPath)"
-                >
-                  <span>{{ getCommitButtonText }}</span>
-                </button>
-              </div>
-              <div class="col-6 text-right">
-                <a :href="mergeRequestPath" class="gl-button btn btn-default">
-                  {{ __('Cancel') }}
-                </a>
-              </div>
-            </div>
+            <gl-button
+              :disabled="!isReadyToCommit"
+              variant="confirm"
+              class="js-submit-button"
+              @click="submitResolvedConflicts(resolveConflictsPath)"
+            >
+              {{ getCommitButtonText }}
+            </gl-button>
+            <gl-button :href="mergeRequestPath">
+              {{ __('Cancel') }}
+            </gl-button>
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
index f053fe1fd2d..584f794752d 100644
--- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
+++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
@@ -284,7 +284,7 @@ export default {
       <gl-datepicker
         ref="datePicker"
         class="gl-relative"
-        :value="parsedDate"
+        :default-date="parsedDate"
         show-clear-button
         @input="setDate"
         @clear="setDate(null)"
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index bc7a31c112f..dd0c0bd9b60 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -670,10 +670,6 @@ table.code {
   float: right;
 }
 
-.files-changed {
-  border-bottom: 0;
-}
-
 .merge-request-details .file-content.image_file img {
   max-height: 50vh;
 }
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 1939a4b5be4..aedb54c6d11 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -853,7 +853,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
 
   .frequent-items-dropdown-sidebar,
   .frequent-items-dropdown-content {
-    padding: 8px 0;
+    @include gl-pt-3;
   }
 
   .loading-animation {
@@ -895,7 +895,6 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
   }
 
   .frequent-items-list-container {
-    height: 304px;
     padding: 8px 0;
     overflow-y: auto;
 
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss
index 4d5032ac674..8baf70da0c6 100644
--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -5,16 +5,7 @@
  */
 
 .status-box {
-
-  /* Extra small devices (phones, less than 768px) */
-  /* No media query since this is the default in Bootstrap */
-  padding: 5px 11px;
-  margin-top: 4px;
-  /* Small devices (tablets, 768px and up) */
-  @include media-breakpoint-up(sm) {
-    padding: 0 $gl-btn-padding;
-    margin-top: 5px;
-  }
+  padding: 0 $gl-btn-padding;
 
   border-radius: $border-radius-default;
   display: block;
diff --git a/app/assets/stylesheets/page_bundles/merge_conflicts.scss b/app/assets/stylesheets/page_bundles/merge_conflicts.scss
index d7473d2c942..9fe56fd337f 100644
--- a/app/assets/stylesheets/page_bundles/merge_conflicts.scss
+++ b/app/assets/stylesheets/page_bundles/merge_conflicts.scss
@@ -173,22 +173,5 @@
     text-align: right;
     padding: $gl-padding-top $gl-padding;
     color: var(--gl-text-color, $gl-text-color);
-
-    .discard-actions {
-      display: inline-block;
-      margin-left: 10px;
-    }
-  }
-
-  .resolve-conflicts-form {
-    h4 {
-      margin-top: 0;
-    }
-
-    .resolve-info {
-      @media(max-width: map-get($grid-breakpoints, lg)-1) {
-        margin-bottom: $gl-padding;
-      }
-    }
   }
 }
diff --git a/app/assets/stylesheets/page_bundles/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss
index 858e13fc558..03dd12ec230 100644
--- a/app/assets/stylesheets/page_bundles/milestone.scss
+++ b/app/assets/stylesheets/page_bundles/milestone.scss
@@ -38,18 +38,6 @@ $status-box-line-height: 26px;
         color: var(--blue-600, $blue-600);
       }
     }
-
-    .status-box {
-      font-size: $tooltip-font-size;
-      margin-top: 0;
-      margin-right: $gl-padding-4;
-      line-height: $status-box-line-height;
-
-      @include media-breakpoint-down(xs) {
-        line-height: unset;
-        padding: $gl-padding-4 $gl-input-padding;
-      }
-    }
   }
 }
 
@@ -199,11 +187,6 @@ $status-box-line-height: 26px;
   align-items: center;
   flex-wrap: wrap;
 
-  .status-box {
-    margin-top: 0;
-    order: 1;
-  }
-
   .milestone-buttons {
     margin-left: auto;
     order: 2;
diff --git a/app/controllers/concerns/page_limiter.rb b/app/controllers/concerns/page_limiter.rb
index 3c280fa4f12..362b02e5856 100644
--- a/app/controllers/concerns/page_limiter.rb
+++ b/app/controllers/concerns/page_limiter.rb
@@ -46,7 +46,7 @@ module PageLimiter
 
     if params[:page].present? && params[:page].to_i > max_page_number
       record_page_limit_interception
-      raise PageOutOfBoundsError.new(max_page_number)
+      raise PageOutOfBoundsError, max_page_number
     end
   end
 
diff --git a/app/finders/packages/go/version_finder.rb b/app/finders/packages/go/version_finder.rb
index 6ee02b8c6f6..8500a441fb7 100644
--- a/app/finders/packages/go/version_finder.rb
+++ b/app/finders/packages/go/version_finder.rb
@@ -37,7 +37,7 @@ module Packages
           @mod.version_by(commit: target)
 
         else
-          raise ArgumentError.new 'not a valid target'
+          raise ArgumentError, 'not a valid target'
         end
       end
     end
diff --git a/app/helpers/time_zone_helper.rb b/app/helpers/time_zone_helper.rb
index 00f65b72c8e..fe045182c96 100644
--- a/app/helpers/time_zone_helper.rb
+++ b/app/helpers/time_zone_helper.rb
@@ -18,7 +18,7 @@ module TimeZoneHelper
   def timezone_data(format: :short)
     attrs = TIME_ZONE_FORMAT_ATTRS.fetch(format) do
       valid_formats = TIME_ZONE_FORMAT_ATTRS.keys.map { |k| ":#{k}"}.join(", ")
-      raise ArgumentError.new("Invalid format :#{format}. Valid formats are #{valid_formats}.")
+      raise ArgumentError, "Invalid format :#{format}. Valid formats are #{valid_formats}."
     end
 
     ActiveSupport::TimeZone.all.map do |timezone|
diff --git a/app/models/bulk_imports/tracker.rb b/app/models/bulk_imports/tracker.rb
index 282ba9e19ac..1b108d5c042 100644
--- a/app/models/bulk_imports/tracker.rb
+++ b/app/models/bulk_imports/tracker.rb
@@ -35,7 +35,7 @@ class BulkImports::Tracker < ApplicationRecord
 
   def pipeline_class
     unless BulkImports::Stage.pipeline_exists?(pipeline_name)
-      raise NameError.new("'#{pipeline_name}' is not a valid BulkImport Pipeline")
+      raise NameError, "'#{pipeline_name}' is not a valid BulkImport Pipeline"
     end
 
     pipeline_name.constantize
diff --git a/app/models/concerns/cache_markdown_field.rb b/app/models/concerns/cache_markdown_field.rb
index 34c1b6d25a4..a5cf947ba07 100644
--- a/app/models/concerns/cache_markdown_field.rb
+++ b/app/models/concerns/cache_markdown_field.rb
@@ -26,7 +26,7 @@ module CacheMarkdownField
 
   # Returns the default Banzai render context for the cached markdown field.
   def banzai_render_context(field)
-    raise ArgumentError.new("Unknown field: #{field.inspect}") unless
+    raise ArgumentError, "Unknown field: #{field.inspect}" unless
       cached_markdown_fields.markdown_fields.include?(field)
 
     # Always include a project key, or Banzai complains
@@ -99,7 +99,7 @@ module CacheMarkdownField
   end
 
   def cached_html_for(markdown_field)
-    raise ArgumentError.new("Unknown field: #{markdown_field}") unless
+    raise ArgumentError, "Unknown field: #{markdown_field}" unless
       cached_markdown_fields.markdown_fields.include?(markdown_field)
 
     __send__(cached_markdown_fields.html_field(markdown_field)) # rubocop:disable GitlabSecurity/PublicSend
diff --git a/app/models/concerns/group_descendant.rb b/app/models/concerns/group_descendant.rb
index 67953105bed..b376537a418 100644
--- a/app/models/concerns/group_descendant.rb
+++ b/app/models/concerns/group_descendant.rb
@@ -22,7 +22,7 @@ module GroupDescendant
     return [] if descendants.empty?
 
     unless descendants.all? { |hierarchy| hierarchy.is_a?(GroupDescendant) }
-      raise ArgumentError.new(_('element is not a hierarchy'))
+      raise ArgumentError, _('element is not a hierarchy')
     end
 
     all_hierarchies = descendants.map do |descendant|
@@ -56,7 +56,7 @@ module GroupDescendant
     end
 
     if parent.nil? && hierarchy_top.present?
-      raise ArgumentError.new(_('specified top is not part of the tree'))
+      raise ArgumentError, _('specified top is not part of the tree')
     end
 
     if parent && parent != hierarchy_top
diff --git a/app/models/concerns/has_wiki_page_meta_attributes.rb b/app/models/concerns/has_wiki_page_meta_attributes.rb
index 136f2d00ce3..55681bc91a5 100644
--- a/app/models/concerns/has_wiki_page_meta_attributes.rb
+++ b/app/models/concerns/has_wiki_page_meta_attributes.rb
@@ -59,7 +59,7 @@ module HasWikiPageMetaAttributes
 
       if conflict.present?
         meta.errors.add(:canonical_slug, 'Duplicate value found')
-        raise CanonicalSlugConflictError.new(meta)
+        raise CanonicalSlugConflictError, meta
       end
 
       meta
diff --git a/app/models/concerns/reactive_caching.rb b/app/models/concerns/reactive_caching.rb
index dbc70ac2218..9ed2070d11c 100644
--- a/app/models/concerns/reactive_caching.rb
+++ b/app/models/concerns/reactive_caching.rb
@@ -168,7 +168,7 @@ module ReactiveCaching
 
       data_deep_size = Gitlab::Utils::DeepSize.new(data, max_size: self.class.reactive_cache_hard_limit)
 
-      raise ExceededReactiveCacheLimit.new unless data_deep_size.valid?
+      raise ExceededReactiveCacheLimit unless data_deep_size.valid?
     end
   end
 end
diff --git a/app/models/concerns/sha256_attribute.rb b/app/models/concerns/sha256_attribute.rb
index 5c52236ab6d..4921f7f1a7e 100644
--- a/app/models/concerns/sha256_attribute.rb
+++ b/app/models/concerns/sha256_attribute.rb
@@ -31,7 +31,7 @@ module Sha256Attribute
       end
 
       unless column.type == :binary
-        raise ArgumentError.new("sha256_attribute #{name.inspect} is invalid since the column type is not :binary")
+        raise ArgumentError, "sha256_attribute #{name.inspect} is invalid since the column type is not :binary"
       end
     rescue StandardError => error
       Gitlab::AppLogger.error "Sha256Attribute initialization: #{error.message}"
diff --git a/app/models/concerns/sha_attribute.rb b/app/models/concerns/sha_attribute.rb
index e2a78e11f99..9ad628a1c48 100644
--- a/app/models/concerns/sha_attribute.rb
+++ b/app/models/concerns/sha_attribute.rb
@@ -24,7 +24,7 @@ module ShaAttribute
       return unless column
 
       unless column.type == :binary
-        raise ArgumentError.new("sha_attribute #{name.inspect} is invalid since the column type is not :binary")
+        raise ArgumentError, "sha_attribute #{name.inspect} is invalid since the column type is not :binary"
       end
     rescue StandardError => error
       Gitlab::AppLogger.error "ShaAttribute initialization: #{error.message}"
diff --git a/app/models/concerns/storage/legacy_namespace.rb b/app/models/concerns/storage/legacy_namespace.rb
index 743be9287ea..948190dfadf 100644
--- a/app/models/concerns/storage/legacy_namespace.rb
+++ b/app/models/concerns/storage/legacy_namespace.rb
@@ -10,7 +10,7 @@ module Storage
       proj_with_tags = first_project_with_container_registry_tags
 
       if proj_with_tags
-        raise Gitlab::UpdatePathError.new("Namespace #{name} (#{id}) cannot be moved because at least one project (e.g. #{proj_with_tags.name} (#{proj_with_tags.id})) has tags in container registry")
+        raise Gitlab::UpdatePathError, "Namespace #{name} (#{id}) cannot be moved because at least one project (e.g. #{proj_with_tags.name} (#{proj_with_tags.id})) has tags in container registry"
       end
 
       parent_was = if saved_change_to_parent? && parent_id_before_last_save.present?
@@ -83,7 +83,7 @@ module Storage
 
             # if we cannot move namespace directory we should rollback
             # db changes in order to prevent out of sync between db and fs
-            raise Gitlab::UpdatePathError.new('namespace directory cannot be moved')
+            raise Gitlab::UpdatePathError, 'namespace directory cannot be moved'
           end
         end
       end
diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb
index 535cf25eb9d..34c8630bb90 100644
--- a/app/models/concerns/token_authenticatable.rb
+++ b/app/models/concerns/token_authenticatable.rb
@@ -12,7 +12,7 @@ module TokenAuthenticatable
 
     def add_authentication_token_field(token_field, options = {})
       if token_authenticatable_fields.include?(token_field)
-        raise ArgumentError.new("#{token_field} already configured via add_authentication_token_field")
+        raise ArgumentError, "#{token_field} already configured via add_authentication_token_field"
       end
 
       token_authenticatable_fields.push(token_field)
diff --git a/app/models/concerns/x509_serial_number_attribute.rb b/app/models/concerns/x509_serial_number_attribute.rb
index 1db693ce892..dbba80eff53 100644
--- a/app/models/concerns/x509_serial_number_attribute.rb
+++ b/app/models/concerns/x509_serial_number_attribute.rb
@@ -31,7 +31,7 @@ module X509SerialNumberAttribute
       end
 
       unless column.type == :binary
-        raise ArgumentError.new("x509_serial_number_attribute #{name.inspect} is invalid since the column type is not :binary")
+        raise ArgumentError, "x509_serial_number_attribute #{name.inspect} is invalid since the column type is not :binary"
       end
     rescue StandardError => error
       Gitlab::AppLogger.error "X509SerialNumberAttribute initialization: #{error.message}"
diff --git a/app/models/namespace/traversal_hierarchy.rb b/app/models/namespace/traversal_hierarchy.rb
index 28cf55f7486..adb31c19a4c 100644
--- a/app/models/namespace/traversal_hierarchy.rb
+++ b/app/models/namespace/traversal_hierarchy.rb
@@ -20,7 +20,7 @@ class Namespace
     end
 
     def initialize(root)
-      raise StandardError.new('Must specify a root node') if root.parent_id
+      raise StandardError, 'Must specify a root node' if root.parent_id
 
       @root = root
     end
diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb
index 66180e0bd32..c881734bd85 100644
--- a/app/models/namespaces/traversal/linear.rb
+++ b/app/models/namespaces/traversal/linear.rb
@@ -85,7 +85,7 @@ module Namespaces
 
       # Search this namespace's lineage. Bound inclusively by top node.
       def lineage(top)
-        raise UnboundedSearch.new('Must bound search by a top') unless top
+        raise UnboundedSearch, 'Must bound search by a top' unless top
 
         without_sti_condition
           .traversal_ids_contains("{#{top.id}}")
diff --git a/app/models/packages/go/module.rb b/app/models/packages/go/module.rb
index b38b691ed6c..00d51c21881 100644
--- a/app/models/packages/go/module.rb
+++ b/app/models/packages/go/module.rb
@@ -18,8 +18,8 @@ module Packages
       end
 
       def version_by(ref: nil, commit: nil)
-        raise ArgumentError.new 'no filter specified' unless ref || commit
-        raise ArgumentError.new 'ref and commit are mutually exclusive' if ref && commit
+        raise ArgumentError, 'no filter specified' unless ref || commit
+        raise ArgumentError, 'ref and commit are mutually exclusive' if ref && commit
 
         if commit
           return version_by_sha(commit) if commit.is_a? String
diff --git a/app/models/packages/go/module_version.rb b/app/models/packages/go/module_version.rb
index fd575e6c96c..c442b2416f1 100644
--- a/app/models/packages/go/module_version.rb
+++ b/app/models/packages/go/module_version.rb
@@ -17,15 +17,15 @@ module Packages
       delegate :build, to: :@semver, allow_nil: true
 
       def initialize(mod, type, commit, name: nil, semver: nil, ref: nil)
-        raise ArgumentError.new("invalid type '#{type}'") unless VALID_TYPES.include? type
-        raise ArgumentError.new("mod is required") unless mod
-        raise ArgumentError.new("commit is required") unless commit
+        raise ArgumentError, "invalid type '#{type}'" unless VALID_TYPES.include? type
+        raise ArgumentError, "mod is required" unless mod
+        raise ArgumentError, "commit is required" unless commit
 
         if type == :ref
-          raise ArgumentError.new("ref is required") unless ref
+          raise ArgumentError, "ref is required" unless ref
         elsif type == :pseudo
-          raise ArgumentError.new("name is required") unless name
-          raise ArgumentError.new("semver is required") unless semver
+          raise ArgumentError, "name is required" unless name
+          raise ArgumentError, "semver is required" unless semver
         end
 
         @mod = mod
diff --git a/app/models/project.rb b/app/models/project.rb
index 4e995c1fff2..b21f61ee11f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1004,7 +1004,7 @@ class Project < ApplicationRecord
   end
 
   def latest_successful_build_for_ref!(job_name, ref = default_branch)
-    latest_successful_build_for_ref(job_name, ref) || raise(ActiveRecord::RecordNotFound.new("Couldn't find job #{job_name}"))
+    latest_successful_build_for_ref(job_name, ref) || raise(ActiveRecord::RecordNotFound, "Couldn't find job #{job_name}")
   end
 
   def latest_pipeline(ref = default_branch, sha = nil)
diff --git a/app/models/releases/evidence.rb b/app/models/releases/evidence.rb
index 7c428f5ad03..5fe91b0fef5 100644
--- a/app/models/releases/evidence.rb
+++ b/app/models/releases/evidence.rb
@@ -5,7 +5,7 @@ module Releases
     include ShaAttribute
     include Presentable
 
-    belongs_to :release, inverse_of: :evidences
+    belongs_to :release, inverse_of: :evidences, touch: true
 
     default_scope { order(created_at: :asc) } # rubocop:disable Cop/DefaultScope
 
diff --git a/app/models/releases/link.rb b/app/models/releases/link.rb
index fc2fa639f56..acc56d3980a 100644
--- a/app/models/releases/link.rb
+++ b/app/models/releases/link.rb
@@ -4,7 +4,7 @@ module Releases
   class Link < ApplicationRecord
     self.table_name = 'release_links'
 
-    belongs_to :release
+    belongs_to :release, touch: true
 
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/218753
     # Regex modified to prevent catastrophic backtracking
diff --git a/app/models/ssh_host_key.rb b/app/models/ssh_host_key.rb
index 7e34988c7a0..bb928118edf 100644
--- a/app/models/ssh_host_key.rb
+++ b/app/models/ssh_host_key.rb
@@ -128,10 +128,10 @@ class SshHostKey
 
   def normalize_url(url)
     full_url = ::Addressable::URI.parse(url)
-    raise ArgumentError.new("Invalid URL") unless full_url&.scheme == 'ssh'
+    raise ArgumentError, "Invalid URL" unless full_url&.scheme == 'ssh'
 
     Addressable::URI.parse("ssh://#{full_url.host}:#{full_url.inferred_port}")
   rescue Addressable::URI::InvalidURIError
-    raise ArgumentError.new("Invalid URL")
+    raise ArgumentError, "Invalid URL"
   end
 end
diff --git a/app/services/alert_management/process_prometheus_alert_service.rb b/app/services/alert_management/process_prometheus_alert_service.rb
index 0591376bcdf..605ab7a1869 100644
--- a/app/services/alert_management/process_prometheus_alert_service.rb
+++ b/app/services/alert_management/process_prometheus_alert_service.rb
@@ -25,13 +25,6 @@ module AlertManagement
 
     attr_reader :project, :payload
 
-    override :process_new_alert
-    def process_new_alert
-      return if resolving_alert?
-
-      super
-    end
-
     override :incoming_payload
     def incoming_payload
       strong_memoize(:incoming_payload) do
diff --git a/app/services/clusters/aws/fetch_credentials_service.rb b/app/services/clusters/aws/fetch_credentials_service.rb
index 497e676f549..7fd1b56657c 100644
--- a/app/services/clusters/aws/fetch_credentials_service.rb
+++ b/app/services/clusters/aws/fetch_credentials_service.rb
@@ -14,7 +14,7 @@ module Clusters
       end
 
       def execute
-        raise MissingRoleError.new('AWS provisioning role not configured') unless provision_role.present?
+        raise MissingRoleError, 'AWS provisioning role not configured' unless provision_role.present?
 
         ::Aws::AssumeRoleCredentials.new(
           client: client,
diff --git a/app/services/concerns/alert_management/alert_processing.rb b/app/services/concerns/alert_management/alert_processing.rb
index d6403181f86..a1520258de8 100644
--- a/app/services/concerns/alert_management/alert_processing.rb
+++ b/app/services/concerns/alert_management/alert_processing.rb
@@ -19,11 +19,7 @@ module AlertManagement
     # Updates or creates alert from payload for project
     # including system notes
     def process_alert
-      if alert.persisted?
-        process_existing_alert
-      else
-        process_new_alert
-      end
+      alert.persisted? ? process_existing_alert : process_new_alert
     end
 
     # Creates or closes issue for alert and notifies stakeholders
@@ -33,22 +29,16 @@ module AlertManagement
     end
 
     def process_existing_alert
-      if resolving_alert?
-        process_resolved_alert
-      else
-        process_firing_alert
-      end
+      resolving_alert? ? process_resolved_alert : process_firing_alert
     end
 
     def process_resolved_alert
       SystemNoteService.log_resolving_alert(alert, alert_source)
 
-      return unless auto_close_incident?
-
       if alert.resolve(incoming_payload.ends_at)
         SystemNoteService.change_alert_status(alert, User.alert_bot)
 
-        close_issue(alert.issue)
+        close_issue(alert.issue) if auto_close_incident?
       else
         logger.warn(
           message: 'Unable to update AlertManagement::Alert status to resolved',
@@ -76,6 +66,8 @@ module AlertManagement
       if alert.save
         alert.execute_services
         SystemNoteService.create_new_alert(alert, alert_source)
+
+        process_resolved_alert if resolving_alert?
       else
         logger.warn(
           message: "Unable to create AlertManagement::Alert from #{alert_source}",
@@ -128,7 +120,7 @@ module AlertManagement
     end
 
     def alert_source
-      alert.monitoring_tool
+      incoming_payload.monitoring_tool
     end
 
     def logger
diff --git a/app/services/groups/import_export/export_service.rb b/app/services/groups/import_export/export_service.rb
index a436aec1b39..5ba34460871 100644
--- a/app/services/groups/import_export/export_service.rb
+++ b/app/services/groups/import_export/export_service.rb
@@ -96,7 +96,7 @@ module Groups
       def notify_error!
         notify_error
 
-        raise Gitlab::ImportExport::Error.new(shared.errors.to_sentence)
+        raise Gitlab::ImportExport::Error, shared.errors.to_sentence
       end
 
       def notify_success
diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb
index bf3f09f22d4..25ef2db49c3 100644
--- a/app/services/groups/import_export/import_service.rb
+++ b/app/services/groups/import_export/import_service.rb
@@ -114,7 +114,7 @@ module Groups
       def notify_error!
         notify_error
 
-        raise Gitlab::ImportExport::Error.new(shared.errors.to_sentence)
+        raise Gitlab::ImportExport::Error, shared.errors.to_sentence
       end
 
       def remove_base_tmp_dir
diff --git a/app/services/metrics/dashboard/grafana_metric_embed_service.rb b/app/services/metrics/dashboard/grafana_metric_embed_service.rb
index 6069d236e82..e94c8d92c3a 100644
--- a/app/services/metrics/dashboard/grafana_metric_embed_service.rb
+++ b/app/services/metrics/dashboard/grafana_metric_embed_service.rb
@@ -80,7 +80,7 @@ module Metrics
 
       def fetch_dashboard
         uid = GrafanaUidParser.new(grafana_url, project).parse
-        raise DashboardProcessingError.new(_('Dashboard uid not found')) unless uid
+        raise DashboardProcessingError, _('Dashboard uid not found') unless uid
 
         response = client.get_dashboard(uid: uid)
 
@@ -89,7 +89,7 @@ module Metrics
 
       def fetch_datasource(dashboard)
         name = DatasourceNameParser.new(grafana_url, dashboard).parse
-        raise DashboardProcessingError.new(_('Datasource name not found')) unless name
+        raise DashboardProcessingError, _('Datasource name not found') unless name
 
         response = client.get_datasource(name: name)
 
@@ -115,7 +115,7 @@ module Metrics
       def parse_json(json)
         Gitlab::Json.parse(json, symbolize_names: true)
       rescue JSON::ParserError
-        raise DashboardProcessingError.new(_('Grafana response contains invalid json'))
+        raise DashboardProcessingError, _('Grafana response contains invalid json')
       end
     end
 
diff --git a/app/services/metrics/dashboard/transient_embed_service.rb b/app/services/metrics/dashboard/transient_embed_service.rb
index 0a9c4bc7b86..29ea9909a36 100644
--- a/app/services/metrics/dashboard/transient_embed_service.rb
+++ b/app/services/metrics/dashboard/transient_embed_service.rb
@@ -39,7 +39,7 @@ module Metrics
       end
 
       def invalid_embed_json!(message)
-        raise DashboardProcessingError.new(_("Parsing error for param :embed_json. %{message}") % { message: message })
+        raise DashboardProcessingError, _("Parsing error for param :embed_json. %{message}") % { message: message }
       end
     end
   end
diff --git a/app/services/namespaces/statistics_refresher_service.rb b/app/services/namespaces/statistics_refresher_service.rb
index c07b302839b..805060cdee9 100644
--- a/app/services/namespaces/statistics_refresher_service.rb
+++ b/app/services/namespaces/statistics_refresher_service.rb
@@ -9,7 +9,7 @@ module Namespaces
 
       root_storage_statistics.recalculate!
     rescue ActiveRecord::ActiveRecordError => e
-      raise RefresherError.new(e.message)
+      raise RefresherError, e.message
     end
 
     private
diff --git a/app/services/notification_recipients/builder/base.rb b/app/services/notification_recipients/builder/base.rb
index b41b969ad7c..d902ff5f565 100644
--- a/app/services/notification_recipients/builder/base.rb
+++ b/app/services/notification_recipients/builder/base.rb
@@ -172,6 +172,8 @@ module NotificationRecipients
       # Get project users with WATCH notification level
       # rubocop: disable CodeReuse/ActiveRecord
       def project_watchers
+        return new_project_watchers if Feature.enabled?(:notification_setting_recipient_refactor, project)
+
         project_members_ids = user_ids_notifiable_on(project)
 
         user_ids_with_project_global = user_ids_notifiable_on(project, :global)
@@ -184,16 +186,38 @@ module NotificationRecipients
 
         user_scope.where(id: user_ids_with_project_setting.concat(user_ids_with_group_setting).uniq)
       end
+
+      def new_project_watchers
+        notification_by_sources = related_notification_settings_sources(:watch)
+
+        return if notification_by_sources.blank?
+
+        user_ids = NotificationSetting.from_union(notification_by_sources).select(:user_id)
+
+        user_scope.where(id: user_ids)
+      end
       # rubocop: enable CodeReuse/ActiveRecord
 
       # rubocop: disable CodeReuse/ActiveRecord
       def group_watchers
+        return new_group_watchers if Feature.enabled?(:notification_setting_recipient_refactor, project)
+
         user_ids_with_group_global = user_ids_notifiable_on(group, :global)
         user_ids = user_ids_with_global_level_watch(user_ids_with_group_global)
         user_ids_with_group_setting = select_group_members_ids(group, [], user_ids_with_group_global, user_ids)
 
         user_scope.where(id: user_ids_with_group_setting)
       end
+
+      def new_group_watchers
+        return [] unless group
+
+        user_ids = group
+          .notification_settings
+          .where(source_or_global_setting_by_level_query(:watch)).select(:user_id)
+
+        user_scope.where(id: user_ids)
+      end
       # rubocop: enable CodeReuse/ActiveRecord
 
       def add_subscribed_users
diff --git a/app/services/packages/debian/extract_changes_metadata_service.rb b/app/services/packages/debian/extract_changes_metadata_service.rb
index eb5baa7e53f..43a4db5bdfc 100644
--- a/app/services/packages/debian/extract_changes_metadata_service.rb
+++ b/app/services/packages/debian/extract_changes_metadata_service.rb
@@ -20,7 +20,7 @@ module Packages
           files: files
         }
       rescue ActiveModel::ValidationError => e
-        raise ExtractionError.new(e.message)
+        raise ExtractionError, e.message
       end
 
       private
@@ -41,10 +41,10 @@ module Packages
 
       def files
         strong_memoize(:files) do
-          raise ExtractionError.new("is not a changes file") unless file_type == :changes
-          raise ExtractionError.new("Files field is missing") if fields['Files'].blank?
-          raise ExtractionError.new("Checksums-Sha1 field is missing") if fields['Checksums-Sha1'].blank?
-          raise ExtractionError.new("Checksums-Sha256 field is missing") if fields['Checksums-Sha256'].blank?
+          raise ExtractionError, "is not a changes file" unless file_type == :changes
+          raise ExtractionError, "Files field is missing" if fields['Files'].blank?
+          raise ExtractionError, "Checksums-Sha1 field is missing" if fields['Checksums-Sha1'].blank?
+          raise ExtractionError, "Checksums-Sha256 field is missing" if fields['Checksums-Sha256'].blank?
 
           init_entries_from_files
           entries_from_checksums_sha1
@@ -73,8 +73,8 @@ module Packages
         each_lines_for('Checksums-Sha1') do |line|
           sha1sum, size, filename = line.split
           entry = @entries[filename]
-          raise ExtractionError.new("#{filename} is listed in Checksums-Sha1 but not in Files") unless entry
-          raise ExtractionError.new("Size for #{filename} in Files and Checksums-Sha1 differ") unless entry.size == size.to_i
+          raise ExtractionError, "#{filename} is listed in Checksums-Sha1 but not in Files" unless entry
+          raise ExtractionError, "Size for #{filename} in Files and Checksums-Sha1 differ" unless entry.size == size.to_i
 
           entry.sha1sum = sha1sum
         end
@@ -84,8 +84,8 @@ module Packages
         each_lines_for('Checksums-Sha256') do |line|
           sha256sum, size, filename = line.split
           entry = @entries[filename]
-          raise ExtractionError.new("#{filename} is listed in Checksums-Sha256 but not in Files") unless entry
-          raise ExtractionError.new("Size for #{filename} in Files and Checksums-Sha256 differ") unless entry.size == size.to_i
+          raise ExtractionError, "#{filename} is listed in Checksums-Sha256 but not in Files" unless entry
+          raise ExtractionError, "Size for #{filename} in Files and Checksums-Sha256 differ" unless entry.size == size.to_i
 
           entry.sha256sum = sha256sum
         end
@@ -104,7 +104,7 @@ module Packages
           entry.package_file = ::Packages::PackageFileFinder.new(@package_file.package, filename).execute!
           entry.validate!
         rescue ActiveRecord::RecordNotFound
-          raise ExtractionError.new("#{filename} is listed in Files but was not uploaded")
+          raise ExtractionError, "#{filename} is listed in Files but was not uploaded"
         end
       end
     end
diff --git a/app/services/packages/debian/extract_metadata_service.rb b/app/services/packages/debian/extract_metadata_service.rb
index 015f472c7c9..f94587919b9 100644
--- a/app/services/packages/debian/extract_metadata_service.rb
+++ b/app/services/packages/debian/extract_metadata_service.rb
@@ -12,7 +12,7 @@ module Packages
       end
 
       def execute
-        raise ExtractionError.new('invalid package file') unless valid_package_file?
+        raise ExtractionError, 'invalid package file' unless valid_package_file?
 
         extract_metadata
       end
diff --git a/app/services/packages/nuget/metadata_extraction_service.rb b/app/services/packages/nuget/metadata_extraction_service.rb
index 59125669f7d..dd5f1bcc936 100644
--- a/app/services/packages/nuget/metadata_extraction_service.rb
+++ b/app/services/packages/nuget/metadata_extraction_service.rb
@@ -26,7 +26,7 @@ module Packages
       end
 
       def execute
-        raise ExtractionError.new('invalid package file') unless valid_package_file?
+        raise ExtractionError, 'invalid package file' unless valid_package_file?
 
         extract_metadata(nuspec_file)
       end
@@ -94,8 +94,8 @@ module Packages
           Zip::File.open(file_path) do |zip_file|
             entry = zip_file.glob('*.nuspec').first
 
-            raise ExtractionError.new('nuspec file not found') unless entry
-            raise ExtractionError.new('nuspec file too big') if entry.size > MAX_FILE_SIZE
+            raise ExtractionError, 'nuspec file not found' unless entry
+            raise ExtractionError, 'nuspec file too big' if entry.size > MAX_FILE_SIZE
 
             entry.get_input_stream.read
           end
diff --git a/app/services/packages/nuget/update_package_from_metadata_service.rb b/app/services/packages/nuget/update_package_from_metadata_service.rb
index bd19a0a6b62..8210072eab3 100644
--- a/app/services/packages/nuget/update_package_from_metadata_service.rb
+++ b/app/services/packages/nuget/update_package_from_metadata_service.rb
@@ -16,7 +16,7 @@ module Packages
       end
 
       def execute
-        raise InvalidMetadataError.new('package name and/or package version not found in metadata') unless valid_metadata?
+        raise InvalidMetadataError, 'package name and/or package version not found in metadata' unless valid_metadata?
 
         try_obtain_lease do
           @package_file.transaction do
@@ -33,7 +33,7 @@ module Packages
           end
         end
       rescue ActiveRecord::RecordInvalid => e
-        raise InvalidMetadataError.new(e.message)
+        raise InvalidMetadataError, e.message
       end
 
       private
diff --git a/app/services/packages/pypi/create_package_service.rb b/app/services/packages/pypi/create_package_service.rb
index cb8d9559dc9..b988c191734 100644
--- a/app/services/packages/pypi/create_package_service.rb
+++ b/app/services/packages/pypi/create_package_service.rb
@@ -13,7 +13,7 @@ module Packages
           )
 
           unless meta.valid?
-            raise ActiveRecord::RecordInvalid.new(meta)
+            raise ActiveRecord::RecordInvalid, meta
           end
 
           Packages::Pypi::Metadatum.upsert(meta.attributes)
diff --git a/app/services/packages/rubygems/process_gem_service.rb b/app/services/packages/rubygems/process_gem_service.rb
index 59d3c3f1e7d..f51d02d5eac 100644
--- a/app/services/packages/rubygems/process_gem_service.rb
+++ b/app/services/packages/rubygems/process_gem_service.rb
@@ -107,7 +107,7 @@ module Packages
           Gem::Package.new(File.open(file_path))
         end
       rescue StandardError
-        raise ExtractionError.new('Unable to read gem file')
+        raise ExtractionError, 'Unable to read gem file'
       end
 
       # used by ExclusiveLeaseGuard
diff --git a/app/services/projects/after_rename_service.rb b/app/services/projects/after_rename_service.rb
index a2cdb87e631..054b358c58a 100644
--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -49,10 +49,8 @@ module Projects
     def first_ensure_no_registry_tags_are_present
       return unless project.has_container_registry_tags?
 
-      raise RenameFailedError.new(
-        "Project #{full_path_before} cannot be renamed because images are " \
+      raise RenameFailedError, "Project #{full_path_before} cannot be renamed because images are " \
           "present in its container registry"
-      )
     end
 
     def expire_caches_before_rename
@@ -144,7 +142,7 @@ module Projects
 
       Gitlab::AppLogger.error(error)
 
-      raise RenameFailedError.new(error)
+      raise RenameFailedError, error
     end
   end
 end
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index b151b6b3830..387a2d66094 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -174,7 +174,7 @@ module Projects
     end
 
     def raise_error(message)
-      raise DestroyError.new(message)
+      raise DestroyError, message
     end
 
     def flush_caches(project)
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb
index c2a8db7b657..64c0f1ff4ac 100644
--- a/app/services/projects/import_export/export_service.rb
+++ b/app/services/projects/import_export/export_service.rb
@@ -112,7 +112,7 @@ module Projects
       def notify_error!
         notify_error
 
-        raise Gitlab::ImportExport::Error.new(shared.errors.to_sentence)
+        raise Gitlab::ImportExport::Error, shared.errors.to_sentence
       end
 
       def notify_success
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 8a5e0706126..db4c022bdd4 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -47,16 +47,16 @@ module Projects
       @old_namespace = project.namespace
 
       if Project.where(namespace_id: @new_namespace.try(:id)).where('path = ? or name = ?', project.path, project.name).exists?
-        raise TransferError.new(s_("TransferProject|Project with same name or path in target namespace already exists"))
+        raise TransferError, s_("TransferProject|Project with same name or path in target namespace already exists")
       end
 
       if project.has_container_registry_tags?
         # We currently don't support renaming repository if it contains tags in container registry
-        raise TransferError.new(s_('TransferProject|Project cannot be transferred, because tags are present in its container registry'))
+        raise TransferError, s_('TransferProject|Project cannot be transferred, because tags are present in its container registry')
       end
 
       if project.has_packages?(:npm) && !new_namespace_has_same_root?(project)
-        raise TransferError.new(s_("TransferProject|Root namespace can't be updated if project has NPM packages"))
+        raise TransferError, s_("TransferProject|Root namespace can't be updated if project has NPM packages")
       end
 
       proceed_to_transfer
@@ -170,7 +170,7 @@ module Projects
 
       # Move main repository
       unless move_repo_folder(@old_path, @new_path)
-        raise TransferError.new(s_("TransferProject|Cannot move project"))
+        raise TransferError, s_("TransferProject|Cannot move project")
       end
 
       # Disk path is changed; we need to ensure we reload it
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 8384bfa813f..454a80623c6 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -49,11 +49,11 @@ module Projects
 
     def validate!
       unless valid_visibility_level_change?(project, params[:visibility_level])
-        raise ValidationError.new(s_('UpdateProject|New visibility level not allowed!'))
+        raise ValidationError, s_('UpdateProject|New visibility level not allowed!')
       end
 
       if renaming_project_with_container_registry_tags?
-        raise ValidationError.new(s_('UpdateProject|Cannot rename project because it contains container registry tags!'))
+        raise ValidationError, s_('UpdateProject|Cannot rename project because it contains container registry tags!')
       end
 
       validate_default_branch_change
@@ -67,7 +67,7 @@ module Projects
       if project.change_head(params[:default_branch])
         after_default_branch_change(previous_default_branch)
       else
-        raise ValidationError.new(s_("UpdateProject|Could not set the default branch"))
+        raise ValidationError, s_("UpdateProject|Could not set the default branch")
       end
     end
 
diff --git a/app/services/static_site_editor/config_service.rb b/app/services/static_site_editor/config_service.rb
index 3237f96290c..c8e7165e076 100644
--- a/app/services/static_site_editor/config_service.rb
+++ b/app/services/static_site_editor/config_service.rb
@@ -67,7 +67,7 @@ module StaticSiteEditor
 
     def check_for_duplicate_keys!(generated_data, file_data)
       duplicate_keys = generated_data.keys & file_data.keys
-      raise ValidationError.new("Duplicate key(s) '#{duplicate_keys}' found.") if duplicate_keys.present?
+      raise ValidationError, "Duplicate key(s) '#{duplicate_keys}' found." if duplicate_keys.present?
     end
 
     def merged_data(generated_data, file_data)
diff --git a/app/services/submit_usage_ping_service.rb b/app/services/submit_usage_ping_service.rb
index d628b1ea7c7..037dd1c49d5 100644
--- a/app/services/submit_usage_ping_service.rb
+++ b/app/services/submit_usage_ping_service.rb
@@ -22,7 +22,7 @@ class SubmitUsagePingService
 
     usage_data = Gitlab::UsageData.data(force_refresh: true)
 
-    raise SubmissionError.new('Usage data is blank') if usage_data.blank?
+    raise SubmissionError, 'Usage data is blank' if usage_data.blank?
 
     raw_usage_data = save_raw_usage_data(usage_data)
 
@@ -33,12 +33,12 @@ class SubmitUsagePingService
       headers: { 'Content-type' => 'application/json' }
     )
 
-    raise SubmissionError.new("Unsuccessful response code: #{response.code}") unless response.success?
+    raise SubmissionError, "Unsuccessful response code: #{response.code}" unless response.success?
 
     version_usage_data_id = response.dig('conv_index', 'usage_data_id') || response.dig('dev_ops_score', 'usage_data_id')
 
     unless version_usage_data_id.is_a?(Integer) && version_usage_data_id > 0
-      raise SubmissionError.new("Invalid usage_data_id in response: #{version_usage_data_id}")
+      raise SubmissionError, "Invalid usage_data_id in response: #{version_usage_data_id}"
     end
 
     raw_usage_data.update_version_metadata!(usage_data_id: version_usage_data_id)
diff --git a/app/services/terraform/remote_state_handler.rb b/app/services/terraform/remote_state_handler.rb
index db47bc024ba..e9a13cee764 100644
--- a/app/services/terraform/remote_state_handler.rb
+++ b/app/services/terraform/remote_state_handler.rb
@@ -94,7 +94,7 @@ module Terraform
     end
 
     def find_state!(find_params)
-      find_state(find_params) || raise(ActiveRecord::RecordNotFound.new("Couldn't find state"))
+      find_state(find_params) || raise(ActiveRecord::RecordNotFound, "Couldn't find state")
     end
   end
 end
diff --git a/app/services/todos/destroy/entity_leave_service.rb b/app/services/todos/destroy/entity_leave_service.rb
index 6d4fc3865ac..94f8926f93f 100644
--- a/app/services/todos/destroy/entity_leave_service.rb
+++ b/app/services/todos/destroy/entity_leave_service.rb
@@ -9,7 +9,7 @@ module Todos
 
       def initialize(user_id, entity_id, entity_type)
         unless %w(Group Project).include?(entity_type)
-          raise ArgumentError.new("#{entity_type} is not an entity user can leave")
+          raise ArgumentError, "#{entity_type} is not an entity user can leave"
         end
 
         @user = UserFinder.new(user_id).find_by_id
diff --git a/app/services/users/update_assigned_open_issue_count_service.rb b/app/services/users/update_assigned_open_issue_count_service.rb
index c7e586e0556..2ed05853b2f 100644
--- a/app/services/users/update_assigned_open_issue_count_service.rb
+++ b/app/services/users/update_assigned_open_issue_count_service.rb
@@ -8,7 +8,7 @@ module Users
     def initialize(target_user:)
       @target_user = target_user
 
-      raise ArgumentError.new("Please provide a target user") unless target_user.is_a?(User)
+      raise ArgumentError, "Please provide a target user" unless target_user.is_a?(User)
     end
 
     def execute
diff --git a/app/services/users/update_canonical_email_service.rb b/app/services/users/update_canonical_email_service.rb
index e75452f60fd..c4b7a98f60b 100644
--- a/app/services/users/update_canonical_email_service.rb
+++ b/app/services/users/update_canonical_email_service.rb
@@ -7,7 +7,7 @@ module Users
     INCLUDED_DOMAINS_PATTERN = [/gmail.com/].freeze
 
     def initialize(user:)
-      raise ArgumentError.new("Please provide a user") unless user.is_a?(User)
+      raise ArgumentError, "Please provide a user" unless user.is_a?(User)
 
       @user = user
     end
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index b69720eefd6..ef68fb9a537 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -34,7 +34,7 @@ module Users
     def execute!(*args, &block)
       result = execute(*args, &block)
 
-      raise ActiveRecord::RecordInvalid.new(@user) unless result[:status] == :success
+      raise ActiveRecord::RecordInvalid, @user unless result[:status] == :success
 
       true
     end
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index 44dfa92f2f5..44f8e6b0e28 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -451,7 +451,7 @@ module ObjectStorage
     def with_exclusive_lease
       lease_key = exclusive_lease_key
       uuid = Gitlab::ExclusiveLease.new(lease_key, timeout: 1.hour.to_i).try_obtain
-      raise ExclusiveLeaseTaken.new(lease_key) unless uuid
+      raise ExclusiveLeaseTaken, lease_key unless uuid
 
       yield uuid
     ensure
diff --git a/app/validators/cron_validator.rb b/app/validators/cron_validator.rb
index 6f42bdb5f9b..91b9cfcccc4 100644
--- a/app/validators/cron_validator.rb
+++ b/app/validators/cron_validator.rb
@@ -10,7 +10,7 @@ class CronValidator < ActiveModel::EachValidator
       cron_parser = Gitlab::Ci::CronParser.new(record.public_send(attribute), record.cron_timezone) # rubocop:disable GitlabSecurity/PublicSend
       record.errors.add(attribute, " is invalid syntax") unless cron_parser.cron_valid?
     else
-      raise NonWhitelistedAttributeError.new "Non-whitelisted attribute"
+      raise NonWhitelistedAttributeError, "Non-whitelisted attribute"
     end
   end
 end
diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml
index f2aab3d9394..1da3881c104 100644
--- a/app/views/projects/jobs/index.html.haml
+++ b/app/views/projects/jobs/index.html.haml
@@ -2,7 +2,7 @@
 - add_page_specific_style 'page_bundles/ci_status'
 
 - if Feature.enabled?(:jobs_table_vue, @project, default_enabled: :yaml)
-  #js-jobs-table{ data: { full_path: @project.full_path, job_counts: job_counts.to_json, job_statuses: job_statuses.to_json } }
+  #js-jobs-table{ data: { full_path: @project.full_path, job_counts: job_counts.to_json, job_statuses: job_statuses.to_json, pipeline_editor_path: project_ci_pipeline_editor_path(@project), empty_state_svg_path: image_path('jobs-empty-state.svg') } }
 - else
   .top-area
     - build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) }
diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml
index 92564ec48bd..6c8bc3a2316 100644
--- a/app/views/shared/runners/_shared_runners_description.html.haml
+++ b/app/views/shared/runners/_shared_runners_description.html.haml
@@ -3,11 +3,10 @@
 %h4
   = _('Shared runners')
 
-.bs-callout.shared-runners-description
-  = _('These runners are shared across this GitLab instance.')
-  %p
+.bs-callout{ data: { testid: 'shared-runners-description' } }
+  %p= _('These runners are shared across this GitLab instance.')
   - if Gitlab::CurrentSettings.shared_runners_text.present?
-    = markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text)
+    = markdown(Gitlab::CurrentSettings.current_application_settings.shared_runners_text)
   - else
-    = _('The same shared runner executes code from multiple projects, unless you configure autoscaling with %{link} set to 1 (which it is on GitLab.com).').html_safe % { link: link }
+    %p= _('The same shared runner executes code from multiple projects, unless you configure autoscaling with %{link} set to 1 (which it is on GitLab.com).').html_safe % { link: link }
   = yield
diff --git a/app/workers/concerns/git_garbage_collect_methods.rb b/app/workers/concerns/git_garbage_collect_methods.rb
index 17a80d1ddb3..c46deeb716f 100644
--- a/app/workers/concerns/git_garbage_collect_methods.rb
+++ b/app/workers/concerns/git_garbage_collect_methods.rb
@@ -97,10 +97,10 @@ module GitGarbageCollectMethods
     end
   rescue GRPC::NotFound => e
     Gitlab::GitLogger.error("#{__method__} failed:\nRepository not found")
-    raise Gitlab::Git::Repository::NoRepository.new(e)
+    raise Gitlab::Git::Repository::NoRepository, e
   rescue GRPC::BadStatus => e
     Gitlab::GitLogger.error("#{__method__} failed:\n#{e}")
-    raise Gitlab::Git::CommandError.new(e)
+    raise Gitlab::Git::CommandError, e
   end
 
   def get_gitaly_client(task, repository)
diff --git a/app/workers/object_storage/migrate_uploads_worker.rb b/app/workers/object_storage/migrate_uploads_worker.rb
index ba2640c73ce..7323ab50370 100644
--- a/app/workers/object_storage/migrate_uploads_worker.rb
+++ b/app/workers/object_storage/migrate_uploads_worker.rb
@@ -50,7 +50,7 @@ module ObjectStorage
         Gitlab::AppLogger.info header(success, failures)
         Gitlab::AppLogger.warn failures(failures)
 
-        raise MigrationFailures.new(failures.map(&:error)) if failures.any?
+        raise MigrationFailures, failures.map(&:error) if failures.any?
       end
 
       def header(success, failures)
diff --git a/app/workers/packages/maven/metadata/sync_worker.rb b/app/workers/packages/maven/metadata/sync_worker.rb
index 8075bd015c2..c53117a08c5 100644
--- a/app/workers/packages/maven/metadata/sync_worker.rb
+++ b/app/workers/packages/maven/metadata/sync_worker.rb
@@ -33,10 +33,10 @@ module Packages
           if result.success?
             log_extra_metadata_on_done(:message, result.message)
           else
-            raise SyncError.new(result.message)
+            raise SyncError, result.message
           end
 
-          raise SyncError.new(result.message) unless result.success?
+          raise SyncError, result.message unless result.success?
         end
 
         private
diff --git a/app/workers/users/update_open_issue_count_worker.rb b/app/workers/users/update_open_issue_count_worker.rb
index efe4e507e20..d9e313d53df 100644
--- a/app/workers/users/update_open_issue_count_worker.rb
+++ b/app/workers/users/update_open_issue_count_worker.rb
@@ -11,10 +11,10 @@ module Users
     def perform(target_user_ids)
       target_user_ids = Array.wrap(target_user_ids)
 
-      raise ArgumentError.new('No target user ID provided') if target_user_ids.empty?
+      raise ArgumentError, 'No target user ID provided' if target_user_ids.empty?
 
       target_users = User.id_in(target_user_ids)
-      raise ArgumentError.new('No valid target user ID provided') if target_users.empty?
+      raise ArgumentError, 'No valid target user ID provided' if target_users.empty?
 
       target_users.each do |user|
         Users::UpdateAssignedOpenIssueCountService.new(target_user: user).execute
diff --git a/changelogs/unreleased/321090-leipert-gitlab-ui.yml b/changelogs/unreleased/321090-leipert-gitlab-ui.yml
new file mode 100644
index 00000000000..c1e1793464d
--- /dev/null
+++ b/changelogs/unreleased/321090-leipert-gitlab-ui.yml
@@ -0,0 +1,5 @@
+---
+title: Align UI of Merge Conflicts app with our design system
+merge_request: 59400
+author:
+type: other
diff --git a/changelogs/unreleased/326045-refactor-notification-recipients-builder-for-watch.yml b/changelogs/unreleased/326045-refactor-notification-recipients-builder-for-watch.yml
new file mode 100644
index 00000000000..1953f67d17d
--- /dev/null
+++ b/changelogs/unreleased/326045-refactor-notification-recipients-builder-for-watch.yml
@@ -0,0 +1,5 @@
+---
+title: Refactor notification recipients builder for watchers
+merge_request: 60572
+author:
+type: performance
diff --git a/changelogs/unreleased/329614-issue-due-date-changes-without-user-input.yml b/changelogs/unreleased/329614-issue-due-date-changes-without-user-input.yml
new file mode 100644
index 00000000000..38f3a6d8a09
--- /dev/null
+++ b/changelogs/unreleased/329614-issue-due-date-changes-without-user-input.yml
@@ -0,0 +1,5 @@
+---
+title: Fix due date being randomly set in issue page
+merge_request: 60917
+author:
+type: fixed
diff --git a/changelogs/unreleased/mrincon-fix-xss-shared-runners-text.yml b/changelogs/unreleased/mrincon-fix-xss-shared-runners-text.yml
new file mode 100644
index 00000000000..145e9f2ceaf
--- /dev/null
+++ b/changelogs/unreleased/mrincon-fix-xss-shared-runners-text.yml
@@ -0,0 +1,5 @@
+---
+title: Fix XSS vulnerability in shared runner description
+merge_request: 60891
+author:
+type: security
diff --git a/changelogs/unreleased/pl-rubocop-todo-raise-args.yml b/changelogs/unreleased/pl-rubocop-todo-raise-args.yml
new file mode 100644
index 00000000000..b7ebce27adf
--- /dev/null
+++ b/changelogs/unreleased/pl-rubocop-todo-raise-args.yml
@@ -0,0 +1,5 @@
+---
+title: Resolves offenses Style/RaiseArgs
+merge_request: 58009
+author: Shubham Kumar @imskr
+type: fixed
diff --git a/changelogs/unreleased/sy-consistently-auto-resolve-alerts.yml b/changelogs/unreleased/sy-consistently-auto-resolve-alerts.yml
new file mode 100644
index 00000000000..ac736635eca
--- /dev/null
+++ b/changelogs/unreleased/sy-consistently-auto-resolve-alerts.yml
@@ -0,0 +1,5 @@
+---
+title: Always resolve GitLab alerts when recovery alert payload is received
+merge_request: 57302
+author:
+type: changed
diff --git a/config/feature_flags/development/api_caching_releases.yml b/config/feature_flags/development/api_caching_releases.yml
new file mode 100644
index 00000000000..41e019f62f1
--- /dev/null
+++ b/config/feature_flags/development/api_caching_releases.yml
@@ -0,0 +1,8 @@
+---
+name: api_caching_releases
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60194
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329861
+milestone: '13.12'
+type: development
+group: group::release
+default_enabled: false
diff --git a/db/migrate/20190402150158_backport_enterprise_schema.rb b/db/migrate/20190402150158_backport_enterprise_schema.rb
index c4fbb4b2ab9..ba5f700a877 100644
--- a/db/migrate/20190402150158_backport_enterprise_schema.rb
+++ b/db/migrate/20190402150158_backport_enterprise_schema.rb
@@ -914,7 +914,7 @@ class BackportEnterpriseSchema < ActiveRecord::Migration[5.0]
         MSG
       end
 
-    raise StandardError.new(message)
+    raise StandardError, message
   end
 
   def create_missing_tables
diff --git a/doc/administration/geo/disaster_recovery/index.md b/doc/administration/geo/disaster_recovery/index.md
index d1ea2978202..7c6f4a32b57 100644
--- a/doc/administration/geo/disaster_recovery/index.md
+++ b/doc/administration/geo/disaster_recovery/index.md
@@ -62,8 +62,7 @@ must disable the **primary** node.
 
 - If you do not have SSH access to the **primary** node, take the machine offline and
   prevent it from rebooting by any means at your disposal.
-  Since there are many ways you may prefer to accomplish this, we will avoid a
-  single recommendation. You may need to:
+  You might need to:
 
   - Reconfigure the load balancers.
   - Change DNS records (for example, point the primary DNS record to the
@@ -240,11 +239,11 @@ an external PostgreSQL database, as it can only perform changes on a **secondary
 node with GitLab and the database on the same machine. As a result, a manual process is
 required:
 
-1. Promote the replica database associated with the **secondary** site. This will
-   set the database to read-write. The instructions vary depending on where your database is hosted:
+1. Promote the replica database associated with the **secondary** site. This
+   sets the database to read-write. The instructions vary depending on where your database is hosted:
    - [Amazon RDS](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html#USER_ReadRepl.Promote)
    - [Azure PostgreSQL](https://docs.microsoft.com/en-us/azure/postgresql/howto-read-replicas-portal#stop-replication)
-   - For other external PostgreSQL databases, save the following script in you
+   - For other external PostgreSQL databases, save the following script in your
      secondary node, for example `/tmp/geo_promote.sh`, and modify the connection
      parameters to match your environment. Then, execute it to promote the replica:
 
@@ -292,7 +291,7 @@ required:
 ### Step 4. (Optional) Updating the primary domain DNS record
 
 Updating the DNS records for the primary domain to point to the **secondary** node
-will prevent the need to update all references to the primary domain to the
+to prevent the need to update all references to the primary domain to the
 secondary domain, like changing Git remotes and API URLs.
 
 1. SSH into the **secondary** node and login as root:
@@ -311,7 +310,7 @@ secondary domain, like changing Git remotes and API URLs.
    ```
 
    NOTE:
-   Changing `external_url` won't prevent access via the old secondary URL, as
+   Changing `external_url` does not prevent access via the old secondary URL, as
    long as the secondary DNS records are still intact.
 
 1. Reconfigure the **secondary** node for the change to take effect:
@@ -326,7 +325,7 @@ secondary domain, like changing Git remotes and API URLs.
    gitlab-rake geo:update_primary_node_url
    ```
 
-   This command will use the changed `external_url` configuration defined
+   This command uses the changed `external_url` configuration defined
    in `/etc/gitlab/gitlab.rb`.
 
 1. For GitLab 11.11 through 12.7 only, you may need to update the **primary**
@@ -334,7 +333,7 @@ secondary domain, like changing Git remotes and API URLs.
 
    To determine if you need to do this, search for the
    `gitlab_rails["geo_node_name"]` setting in your `/etc/gitlab/gitlab.rb`
-   file. If it is commented out with `#` or not found at all, then you will
+   file. If it is commented out with `#` or not found at all, then you
    need to update the **primary** node's name in the database. You can search for it
    like so:
 
@@ -444,7 +443,7 @@ and after that you also need two extra steps.
 
 Now we need to make each **secondary** node listen to changes on the new **primary** node. To do that you need
 to [initiate the replication process](../setup/database.md#step-3-initiate-the-replication-process) again but this time
-for another **primary** node. All the old replication settings will be overwritten.
+for another **primary** node. All the old replication settings are overwritten.
 
 ## Promoting a secondary Geo cluster in GitLab Cloud Native Helm Charts
 
@@ -479,8 +478,7 @@ must disable the **primary** site:
 
 - If you do not have access to the **primary** Kubernetes cluster, take the cluster offline and
   prevent it from coming back online by any means at your disposal.
-  Since there are many ways you may prefer to accomplish this, we will avoid a
-  single recommendation. You may need to:
+  You might need to:
 
   - Reconfigure the load balancers.
   - Change DNS records (for example, point the primary DNS record to the
diff --git a/doc/administration/geo/index.md b/doc/administration/geo/index.md
index 8026842248d..6cec13fde02 100644
--- a/doc/administration/geo/index.md
+++ b/doc/administration/geo/index.md
@@ -27,7 +27,7 @@ to clone and fetch large repositories, speeding up development.
 
 For a video introduction to Geo, see [Introduction to GitLab Geo - GitLab Features](https://www.youtube.com/watch?v=-HDLxSjEh6w).
 
-To make sure you're using the right version of the documentation, navigate to [this page on GitLab.com](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/administration/geo/index.md) and choose the appropriate release from the **Switch branch/tag** dropdown. For example, [`v11.2.3-ee`](https://gitlab.com/gitlab-org/gitlab/blob/v11.2.3-ee/doc/administration/geo/index.md).
+To make sure you're using the right version of the documentation, navigate to [the Geo page on GitLab.com](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/administration/geo/index.md) and choose the appropriate release from the **Switch branch/tag** dropdown. For example, [`v11.2.3-ee`](https://gitlab.com/gitlab-org/gitlab/blob/v11.2.3-ee/doc/administration/geo/index.md).
 
 ## Use cases
 
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index d8c018c83f8..d9a9c456235 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -1304,8 +1304,8 @@ GitLab Rails application, the Docker Registry, or something else. In this
 case, since we know that since the login succeeded, we probably need to look
 at the communication between the client and the Registry.
 
-The REST API between the Docker client and Registry is [described
-here](https://docs.docker.com/registry/spec/api/). Normally, one would just
+The REST API between the Docker client and Registry is described
+[in the Docker documentation](https://docs.docker.com/registry/spec/api/). Normally, one would just
 use Wireshark or tcpdump to capture the traffic and see where things went
 wrong. However, since all communications between Docker clients and servers
 are done over HTTPS, it's a bit difficult to decrypt the traffic quickly even
diff --git a/doc/api/events.md b/doc/api/events.md
index 5664d97d7db..49d99cc43fe 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -71,10 +71,10 @@ Parameters:
 | --------- | ---- | -------- | ----------- |
 | `action` | string | no | Include only events of a particular [action type](#action-types) |
 | `target_type` | string | no | Include only events of a particular [target type](#target-types) |
-| `before` | date | no |  Include only events created before a particular date. Please see [here for the supported format](#date-formatting) |
-| `after` | date | no |  Include only events created after a particular date. Please see [here for the supported format](#date-formatting)  |
+| `before` | date | no |  Include only events created before a particular date. [View how to format dates](#date-formatting). |
+| `after` | date | no |  Include only events created after a particular date. [View how to format dates](#date-formatting).  |
 | `scope` | string | no | Include all events across a user's projects. |
-| `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc` |
+| `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc`. |
 
 Example request:
 
@@ -148,9 +148,9 @@ Parameters:
 | `id` | integer | yes | The ID or Username of the user |
 | `action` | string | no | Include only events of a particular [action type](#action-types) |
 | `target_type` | string | no | Include only events of a particular [target type](#target-types) |
-| `before` | date | no |  Include only events created before a particular date. Please see [here for the supported format](#date-formatting) |
-| `after` | date | no |  Include only events created after a particular date. Please see [here for the supported format](#date-formatting)  |
-| `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc` |
+| `before` | date | no |  Include only events created before a particular date. [View how to format dates](#date-formatting). |
+| `after` | date | no |  Include only events created after a particular date. [View how to format dates](#date-formatting). |
+| `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc`. |
 | `page` | integer | no | The page of results to return. Defaults to 1. |
 | `per_page` | integer | no | The number of results per page. Defaults to 20. |
 
@@ -286,9 +286,9 @@ Parameters:
 | `project_id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
 | `action` | string | no | Include only events of a particular [action type](#action-types) |
 | `target_type` | string | no | Include only events of a particular [target type](#target-types) |
-| `before` | date | no |  Include only events created before a particular date. Please see [here for the supported format](#date-formatting) |
-| `after` | date | no |  Include only events created after a particular date. Please see [here for the supported format](#date-formatting)  |
-| `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc` |
+| `before` | date | no |  Include only events created before a particular date. [View how to format dates](#date-formatting). |
+| `after` | date | no |  Include only events created after a particular date. [View how to format dates](#date-formatting).  |
+| `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc`. |
 
 Example request:
 
diff --git a/doc/architecture/blueprints/container_registry_metadata_database/index.md b/doc/architecture/blueprints/container_registry_metadata_database/index.md
index 4e40f249e56..86628b31536 100644
--- a/doc/architecture/blueprints/container_registry_metadata_database/index.md
+++ b/doc/architecture/blueprints/container_registry_metadata_database/index.md
@@ -26,7 +26,7 @@ graph LR
    R -- Write/read metadata --> B
 ```
 
-Client applications (e.g. GitLab Rails and Docker CLI) interact with the Container Registry through its [HTTP API](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/spec/api.md). The most common operations are pushing and pulling images to/from the registry, which require a series of HTTP requests in a specific order. The request flow for these operations is detailed [here](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs-gitlab/push-pull-request-flow.md).
+Client applications (e.g. GitLab Rails and Docker CLI) interact with the Container Registry through its [HTTP API](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/spec/api.md). The most common operations are pushing and pulling images to/from the registry, which require a series of HTTP requests in a specific order. The request flow for these operations is detailed in the [Request flow](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs-gitlab/push-pull-request-flow.md).
 
 The registry supports multiple [storage backends](https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md#storage), including Google Cloud Storage (GCS) which is used for the GitLab.com registry. In the storage backend, images are stored as blobs, deduplicated, and shared across repositories. These are then linked (like a symlink) to each repository that relies on them, giving them access to the central storage location.
 
@@ -156,7 +156,7 @@ Running *online* and [*post deployment*](../../../development/post_deployment_mi
 
 The registry database will be partitioned from start to achieve greater performance (by limiting the amount of data to act upon and enable parallel execution), easier maintenance (by splitting tables and indexes into smaller units), and high availability (with partition independence). By partitioning the database from start we can also facilitate a sharding implementation later on if necessary.
 
-Although blobs are shared across repositories, manifest and tag metadata are scoped by repository. This is also visible at the API level, where all write and read requests (except [listing repositories](https://gitlab.com/gitlab-org/container-registry/-/blob/a113d0f0ab29b49cf88e173ee871893a9fc56a90/docs/spec/api.md#listing-repositories)) are scoped by repository, with its namespace being part of the request URI. For this reason, after [identifying access patterns](https://gitlab.com/gitlab-org/gitlab/-/issues/234255), we decided to partition manifests and tags by repository and blobs by digest, ensuring that lookups are always performed by partition key for optimal performance. The initial version of the partitioned schema was documented [here](https://gitlab.com/gitlab-com/www-gitlab-com/-/merge_requests/60918).
+Although blobs are shared across repositories, manifest and tag metadata are scoped by repository. This is also visible at the API level, where all write and read requests (except [listing repositories](https://gitlab.com/gitlab-org/container-registry/-/blob/a113d0f0ab29b49cf88e173ee871893a9fc56a90/docs/spec/api.md#listing-repositories)) are scoped by repository, with its namespace being part of the request URI. For this reason, after [identifying access patterns](https://gitlab.com/gitlab-org/gitlab/-/issues/234255), we decided to partition manifests and tags by repository and blobs by digest, ensuring that lookups are always performed by partition key for optimal performance. The initial version of the partitioned schema was documented [in a merge request](https://gitlab.com/gitlab-com/www-gitlab-com/-/merge_requests/60918).
 
 #### GitLab.com
 
diff --git a/doc/architecture/blueprints/image_resizing/index.md b/doc/architecture/blueprints/image_resizing/index.md
index 686a2f9c8f5..26c15d7a035 100644
--- a/doc/architecture/blueprints/image_resizing/index.md
+++ b/doc/architecture/blueprints/image_resizing/index.md
@@ -35,10 +35,10 @@ sequenceDiagram
 
 Content image resizing is a more complex problem to tackle. There are no set size restrictions and there are additional features or requirements to consider.
 
-- Dynamic WebP support - the WebP format typically achieves an average of 30% more compression than JPEG without the loss of image quality. More details [here](https://developers.google.com/speed/webp/docs/c_study)
+- Dynamic WebP support - the WebP format typically achieves an average of 30% more compression than JPEG without the loss of image quality. More details are in [this Google Comparative Study](https://developers.google.com/speed/webp/docs/c_study)
 - Extract first image of GIF's so we can prevent from loading 10MB pixels
 - Check Device Pixel Ratio to deliver nice images on High DPI screens
-- Progressive image loading, similar to what is described [here](https://www.sitepoint.com/how-to-build-your-own-progressive-image-loader/)
+- Progressive image loading, similar to what is described in [this article about how to build a progressive image loader](https://www.sitepoint.com/how-to-build-your-own-progressive-image-loader/)
 - Resizing recommendations (size, clarity, etc.)
 - Storage
 
diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index c9538c38850..08a4401181b 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -266,7 +266,7 @@ Changes to the issue format can be submitted in the
 Any feature flag change that affects any GitLab instance is automatically logged in
 [features_json.log](../../administration/logs.md#features_jsonlog).
 You can search the change history in [Kibana](https://about.gitlab.com/handbook/support/workflows/kibana.html).
-You can access the feature flag change history for GitLab.com [here](https://log.gprd.gitlab.net/goto/d060337c017723084c6d97e09e591fc6).
+You can also access the feature flag change history for GitLab.com [in Kibana](https://log.gprd.gitlab.net/goto/d060337c017723084c6d97e09e591fc6).
 
 ## Cleaning up
 
diff --git a/doc/development/multi_version_compatibility.md b/doc/development/multi_version_compatibility.md
index 8a8026d6e09..44e93bfb8a8 100644
--- a/doc/development/multi_version_compatibility.md
+++ b/doc/development/multi_version_compatibility.md
@@ -65,7 +65,7 @@ Let's see how we can handle them safely.
 ### Route changes
 
 When changing routing we should pay attention to make sure a route generated from the new version can be served by the old one and vice versa.
-As you can see in [this page](#some-links-to-issues-and-mrs-were-broken), not doing it can lead to an outage.
+[As you can see](#some-links-to-issues-and-mrs-were-broken), not doing it can lead to an outage.
 This type of change may look like an immediate switch between the two implementations. However,
 especially with the canary stage, there is an extended period of time where both version of the code
 coexists in production.
diff --git a/doc/development/packages.md b/doc/development/packages.md
index 2dd712f2692..3727376d957 100644
--- a/doc/development/packages.md
+++ b/doc/development/packages.md
@@ -219,8 +219,8 @@ demonstrates adding an instance-level endpoint for Conan to workhorse. You can a
 implemented in the same file.
 
 Once the route has been added, you must add an additional `/authorize` version of the upload endpoint to your API file.
-[Here is an example](https://gitlab.com/gitlab-org/gitlab/blob/398fef1ca26ae2b2c3dc89750f6b20455a1e5507/ee/lib/api/maven_packages.rb#L164)
-of the additional endpoint added for Maven. The `/authorize` endpoint verifies and authorizes the request from workhorse,
+[This example](https://gitlab.com/gitlab-org/gitlab/blob/398fef1ca26ae2b2c3dc89750f6b20455a1e5507/ee/lib/api/maven_packages.rb#L164)
+shows the additional endpoint added for Maven. The `/authorize` endpoint verifies and authorizes the request from workhorse,
 then the normal upload endpoint is implemented below, consuming the metadata that workhorse provides in order to
 create the package record. Workhorse provides a variety of file metadata such as type, size, and different checksum formats.
 
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index b096d5bff61..a080d513afa 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -4,12 +4,12 @@ group: Ecosystem
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# GitLab for Jira app **(FREE SAAS)**
+# GitLab.com for Jira Cloud app **(FREE SAAS)**
 
 You can integrate GitLab.com and Jira Cloud using the
-[GitLab for Jira](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud)
-app in the Atlassian Marketplace. The user configuring GitLab for Jira must have
-[Maintainer](../../user/permissions.md) permissions in the GitLab namespace.
+[GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud)
+app in the Atlassian Marketplace. The user configuring GitLab.com for Jira Cloud must have
+[Maintainer](../../user/permissions.md) permissions in the GitLab.com namespace.
 
 This integration method supports [smart commits](dvcs.md#smart-commits).
 
@@ -18,30 +18,30 @@ synchronized in real-time. The DVCS connector updates data only once per hour.
 If you are not using both of these environments, use the [Jira DVCS Connector](dvcs.md) method.
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-For a walkthrough of the integration with GitLab for Jira, watch
-[Configure GitLab Jira Integration using Marketplace App](https://youtu.be/SwR-g1s1zTo) on YouTube.
+For a walkthrough of the integration with GitLab.com for Jira Cloud, watch
+[Configure GitLab.com Jira Could Integration using Marketplace App](https://youtu.be/SwR-g1s1zTo) on YouTube.
 
 1. Go to **Jira Settings > Apps > Find new apps**, then search for GitLab.
-1. Click **GitLab for Jira**, then click **Get it now**, or go to the
+1. Click **GitLab.com for Jira Cloud**, then click **Get it now**, or go to the
    [App in the marketplace directly](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud).
 
-   ![Install GitLab App on Jira](img/jira_dev_panel_setup_com_1.png)
+   ![Install GitLab.com app on Jira Cloud](img/jira_dev_panel_setup_com_1.png)
 1. After installing, click **Get started** to go to the configurations page.
    This page is always available under **Jira Settings > Apps > Manage apps**.
 
-   ![Start GitLab App configuration on Jira](img/jira_dev_panel_setup_com_2.png)
+   ![Start GitLab.com app configuration on Jira Cloud](img/jira_dev_panel_setup_com_2.png)
 1. If not already signed in to GitLab.com, you must sign in as a user with
    [Maintainer](../../user/permissions.md) permissions to add namespaces.
 
-   ![Sign in to GitLab.com in GitLab Jira App](img/jira_dev_panel_setup_com_3_v13_9.png)
+   ![Sign in to GitLab.com in GitLab.com for Jira Cloud app](img/jira_dev_panel_setup_com_3_v13_9.png)
 1. Select **Add namespace** to open the list of available namespaces.
 
 1. Identify the namespace you want to link, and select **Link**.
 
-   ![Link namespace in GitLab Jira App](img/jira_dev_panel_setup_com_4_v13_9.png)
+   ![Link namespace in GitLab.com for Jira Cloud app](img/jira_dev_panel_setup_com_4_v13_9.png)
 
 NOTE:
-The GitLab user only needs access when adding a new namespace. For syncing with
+The GitLab.com user only needs access when adding a new namespace. For syncing with
 Jira, we do not depend on the user's token.
 
 After a namespace is added:
@@ -52,10 +52,10 @@ After a namespace is added:
 
 Support for syncing past branch and commit data [is planned](https://gitlab.com/gitlab-org/gitlab/-/issues/263240).
 
-## Install the GitLab Jira Cloud application for self-managed instances **(FREE SELF)**
+## Install the GitLab.com for Jira Cloud application for self-managed instances **(FREE SELF)**
 
 If your GitLab instance is self-managed, you must follow some
-extra steps to install the GitLab Jira Cloud application.
+extra steps to install the GitLab.com for Jira Cloud application.
 
 Each Jira Cloud application must be installed from a single location. Jira fetches
 a [manifest file](https://developer.atlassian.com/cloud/jira/platform/connect-app-descriptor/)
@@ -91,7 +91,7 @@ from outside the Marketplace, which allows you to install the application:
 
 1. Disable [development mode](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-2--enable-development-mode) on your Jira instance.
 
-The **GitLab for Jira** app now displays under **Manage apps**. You can also
+The **GitLab.com for Jira Cloud** app now displays under **Manage apps**. You can also
 click **Get started** to open the configuration page rendered from your GitLab instance.
 
 NOTE:
@@ -121,9 +121,9 @@ for details.
 NOTE:
 DVCS means distributed version control system.
 
-## Troubleshooting GitLab for Jira
+## Troubleshooting GitLab.com for Jira Cloud
 
-The GitLab for Jira App uses an iframe to add namespaces on the settings page. Some browsers block cross-site cookies. This can lead to a message saying that the user needs to log in on GitLab.com even though the user is already logged in.
+The GitLab.com for Jira Cloud app uses an iframe to add namespaces on the settings page. Some browsers block cross-site cookies. This can lead to a message saying that the user needs to log in on GitLab.com even though the user is already logged in.
 
 > "You need to sign in or sign up before continuing."
 
diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md
index 1617e950104..cc1a3a96577 100644
--- a/doc/integration/jira/development_panel.md
+++ b/doc/integration/jira/development_panel.md
@@ -52,7 +52,7 @@ self-managed GitLab) set up the integration to simplify administration.
 
 | If you use Jira on: | GitLab.com customers need: | GitLab self-managed customers need: |
 |-|-|-|
-| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) application installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab and Jira. | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab Jira Cloud application for self-managed instances](connect-app.md#install-the-gitlab-jira-cloud-application-for-self-managed-instances) for more information. |
+| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) application installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab and Jira. | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab Jira Cloud application for self-managed instances](connect-app.md#install-the-gitlabcom-for-jira-cloud-application-for-self-managed-instances) for more information. |
 | Your own server | The Jira DVCS (distributed version control system) connector. This syncs data hourly. | The [Jira DVCS Connector](dvcs.md). |
 
 Each GitLab project can be configured to connect to an entire Jira instance. That means one GitLab
diff --git a/doc/user/project/integrations/prometheus_library/cloudwatch.md b/doc/user/project/integrations/prometheus_library/cloudwatch.md
index 0eaa9cae7c0..b35ebacbd31 100644
--- a/doc/user/project/integrations/prometheus_library/cloudwatch.md
+++ b/doc/user/project/integrations/prometheus_library/cloudwatch.md
@@ -31,7 +31,7 @@ Cloudwatch exporter retrieves and parses the specified Cloudwatch metrics, and
 translates them into a Prometheus monitoring endpoint.
 
 The only supported AWS resource is the Elastic Load Balancer, whose Cloudwatch
-metrics are [documented here](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-cloudwatch-metrics.html).
+metrics are listed in [this AWS documentation](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-cloudwatch-metrics.html).
 
 You can [download a sample Cloudwatch Exporter configuration file](../samples/cloudwatch.yml)
 that's configured for basic AWS ELB monitoring.
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index f6857623bc4..3bbe9e6cb66 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -65,7 +65,10 @@ For an existing project, you can set up push mirroring as follows:
 ![Repository mirroring push settings screen](img/repository_mirroring_push_settings.png)
 
 When push mirroring is enabled, only push commits directly to the mirrored repository to prevent the
-mirror diverging. The mirrored repository receives all changes when:
+mirror diverging. 
+
+Unlike [pull mirroring](#how-it-works), the mirrored repository is not periodically auto-synced. 
+The mirrored repository receives all changes only when:
 
 - Commits are pushed to GitLab.
 - A [forced update](#forcing-an-update) is initiated.
diff --git a/lib/api/helpers/caching.rb b/lib/api/helpers/caching.rb
index d0f22109879..64b681633b6 100644
--- a/lib/api/helpers/caching.rb
+++ b/lib/api/helpers/caching.rb
@@ -119,8 +119,11 @@ module API
         objs.flatten!
         map = multi_key_map(objs, context: context)
 
-        cache.fetch_multi(*map.keys, **kwargs) do |key|
-          yield map[key]
+        # TODO: `contextual_cache_key` should be constructed based on the guideline https://docs.gitlab.com/ee/development/redis.html#multi-key-commands.
+        Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
+          cache.fetch_multi(*map.keys, **kwargs) do |key|
+            yield map[key]
+          end
         end
       end
 
diff --git a/lib/api/helpers/headers_helpers.rb b/lib/api/helpers/headers_helpers.rb
index 908c57bb04e..56445ccbd0d 100644
--- a/lib/api/helpers/headers_helpers.rb
+++ b/lib/api/helpers/headers_helpers.rb
@@ -8,7 +8,7 @@ module API
       def set_http_headers(header_data)
         header_data.each do |key, value|
           if value.is_a?(Enumerable)
-            raise ArgumentError.new("Header value should be a string")
+            raise ArgumentError, "Header value should be a string"
           end
 
           header "X-Gitlab-#{key.to_s.split('_').collect(&:capitalize).join('-')}", value.to_s
diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb
index 4dcfc0cf7eb..ec69e1da961 100644
--- a/lib/api/internal/base.rb
+++ b/lib/api/internal/base.rb
@@ -158,7 +158,7 @@ module API
           status 200
 
           unless actor.key_or_user
-            raise ActiveRecord::RecordNotFound.new('User not found!')
+            raise ActiveRecord::RecordNotFound, 'User not found!'
           end
 
           actor.update_last_used_at!
diff --git a/lib/api/releases.rb b/lib/api/releases.rb
index 0fdbe8ff866..cefdf40d789 100644
--- a/lib/api/releases.rb
+++ b/lib/api/releases.rb
@@ -33,7 +33,21 @@ module API
       get ':id/releases' do
         releases = ::ReleasesFinder.new(user_project, current_user, declared_params.slice(:order_by, :sort)).execute
 
-        present paginate(releases), with: Entities::Release, current_user: current_user
+        if Feature.enabled?(:api_caching_releases, user_project, default_enabled: :yaml)
+          # We cache the serialized payload per user in order to avoid repeated renderings.
+          # Since the cached result could contain sensitive information,
+          # it will expire in a short interval.
+          present_cached paginate(releases),
+                         with: Entities::Release,
+                         # `current_user` could be absent if the releases are publicly accesible.
+                         # We should not use `cache_key` for the user because the version/updated_at
+                         # context is unnecessary here.
+                         cache_context: -> (_) { "user:{#{current_user&.id}}" },
+                         expires_in: 5.minutes,
+                         current_user: current_user
+        else
+          present paginate(releases), with: Entities::Release, current_user: current_user
+        end
       end
 
       desc 'Get a single project release' do
diff --git a/lib/bulk_imports/clients/http.rb b/lib/bulk_imports/clients/http.rb
index ef99122cdfd..55abb9a15be 100644
--- a/lib/bulk_imports/clients/http.rb
+++ b/lib/bulk_imports/clients/http.rb
@@ -63,7 +63,7 @@ module BulkImports
       def with_error_handling
         response = yield
 
-        raise ConnectionError.new("Error #{response.code}") unless response.success?
+        raise ConnectionError, "Error #{response.code}" unless response.success?
 
         response
       rescue *Gitlab::HTTP::HTTP_ERRORS => e
diff --git a/lib/declarative_enum.rb b/lib/declarative_enum.rb
index f3c8c181c73..b890bbd364f 100644
--- a/lib/declarative_enum.rb
+++ b/lib/declarative_enum.rb
@@ -64,7 +64,7 @@ module DeclarativeEnum
   end
 
   def define(&block)
-    raise LocalJumpError.new('No block given') unless block
+    raise LocalJumpError, 'No block given' unless block
 
     @definition = Builder.new(definition, block).build
   end
diff --git a/lib/flowdock/git.rb b/lib/flowdock/git.rb
index f165ecfc1fa..539fd66a510 100644
--- a/lib/flowdock/git.rb
+++ b/lib/flowdock/git.rb
@@ -17,7 +17,7 @@ module Flowdock
     end
 
     def initialize(ref, from, to, options = {})
-      raise TokenError.new("Flowdock API token not found") unless options[:token]
+      raise TokenError, "Flowdock API token not found" unless options[:token]
 
       @ref = ref
       @from = from
diff --git a/lib/gitlab/alert_management/payload/base.rb b/lib/gitlab/alert_management/payload/base.rb
index 11868ab4e14..5e535ded439 100644
--- a/lib/gitlab/alert_management/payload/base.rb
+++ b/lib/gitlab/alert_management/payload/base.rb
@@ -193,7 +193,7 @@ module Gitlab
 
         def parse_time(value)
           Time.parse(value).utc
-        rescue ArgumentError
+        rescue ArgumentError, TypeError
         end
 
         def parse_integer(value)
diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb
index 6f6ac79c16b..81442c35f6f 100644
--- a/lib/gitlab/auth/auth_finders.rb
+++ b/lib/gitlab/auth/auth_finders.rb
@@ -160,7 +160,7 @@ module Gitlab
 
         case AccessTokenValidationService.new(access_token, request: request).validate(scopes: scopes)
         when AccessTokenValidationService::INSUFFICIENT_SCOPE
-          raise InsufficientScopeError.new(scopes)
+          raise InsufficientScopeError, scopes
         when AccessTokenValidationService::EXPIRED
           raise ExpiredError
         when AccessTokenValidationService::REVOKED
diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb
index 504fa9ca045..1a7874257f4 100644
--- a/lib/gitlab/auth/ldap/config.rb
+++ b/lib/gitlab/auth/ldap/config.rb
@@ -59,7 +59,7 @@ module Gitlab
         end
 
         def self.invalid_provider(provider)
-          raise InvalidProvider.new("Unknown provider (#{provider}). Available providers: #{providers}")
+          raise InvalidProvider, "Unknown provider (#{provider}). Available providers: #{providers}"
         end
 
         def self.encrypted_secrets
diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb
index ea08fa7238b..44106897df8 100644
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -13,7 +13,7 @@ module Gitlab
         repos_to_import = Dir.glob(import_path + '**/*.git')
 
         unless user = User.admins.order_id_asc.first
-          raise NoAdminError.new('No admin user found to import repositories')
+          raise NoAdminError, 'No admin user found to import repositories'
         end
 
         repos_to_import.each do |repo_path|
diff --git a/lib/gitlab/changelog/committer.rb b/lib/gitlab/changelog/committer.rb
index 31661650eff..52c355478c5 100644
--- a/lib/gitlab/changelog/committer.rb
+++ b/lib/gitlab/changelog/committer.rb
@@ -55,7 +55,7 @@ module Gitlab
 
           result = service.execute
 
-          raise Error.new(result[:message]) if result[:status] != :success
+          raise Error, result[:message] if result[:status] != :success
         end
       end
 
diff --git a/lib/gitlab/changelog/parser.rb b/lib/gitlab/changelog/parser.rb
index a4c8da283cd..fac6fc19148 100644
--- a/lib/gitlab/changelog/parser.rb
+++ b/lib/gitlab/changelog/parser.rb
@@ -169,7 +169,7 @@ module Gitlab
         # We raise a custom error so it's easier to catch different changelog
         # related errors. In addition, this ensures the caller of this method
         # doesn't depend on a Parslet specific error class.
-        raise Error.new("Failed to parse the template: #{ex.message}")
+        raise Error, "Failed to parse the template: #{ex.message}"
       end
     end
   end
diff --git a/lib/gitlab/ci/parsers/test/junit.rb b/lib/gitlab/ci/parsers/test/junit.rb
index 50cd703da4a..ca7fbde6713 100644
--- a/lib/gitlab/ci/parsers/test/junit.rb
+++ b/lib/gitlab/ci/parsers/test/junit.rb
@@ -31,7 +31,7 @@ module Gitlab
           def ensure_test_cases_limited!(total_parsed, limit)
             return unless limit > 0 && total_parsed > limit
 
-            raise JunitParserError.new("number of test cases exceeded the limit of #{limit}")
+            raise JunitParserError, "number of test cases exceeded the limit of #{limit}"
           end
 
           def all_cases(root, parent = nil, &blk)
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb
index dc4951f76bb..a8c1002f2b9 100644
--- a/lib/gitlab/ci/yaml_processor.rb
+++ b/lib/gitlab/ci/yaml_processor.rb
@@ -141,7 +141,7 @@ module Gitlab
       end
 
       def error!(message)
-        raise ValidationError.new(message)
+        raise ValidationError, message
       end
     end
   end
diff --git a/lib/gitlab/cycle_analytics/summary/base.rb b/lib/gitlab/cycle_analytics/summary/base.rb
index a825d48fb77..67ad75652b0 100644
--- a/lib/gitlab/cycle_analytics/summary/base.rb
+++ b/lib/gitlab/cycle_analytics/summary/base.rb
@@ -11,11 +11,11 @@ module Gitlab
         end
 
         def title
-          raise NotImplementedError.new("Expected #{self.name} to implement title")
+          raise NotImplementedError, "Expected #{self.name} to implement title"
         end
 
         def value
-          raise NotImplementedError.new("Expected #{self.name} to implement value")
+          raise NotImplementedError, "Expected #{self.name} to implement value"
         end
       end
     end
diff --git a/lib/gitlab/database/loose_index_scan_distinct_count.rb b/lib/gitlab/database/loose_index_scan_distinct_count.rb
index 884f4d47ff8..0c8a9ad25d9 100644
--- a/lib/gitlab/database/loose_index_scan_distinct_count.rb
+++ b/lib/gitlab/database/loose_index_scan_distinct_count.rb
@@ -94,7 +94,7 @@ module Gitlab
         elsif column.is_a?(Arel::Attributes::Attribute)
           column
         else
-          raise ColumnConfigurationError.new("Cannot transform the column: #{column.inspect}, please provide the column name as string")
+          raise ColumnConfigurationError, "Cannot transform the column: #{column.inspect}, please provide the column name as string"
         end
       end
     end
diff --git a/lib/gitlab/encrypted_configuration.rb b/lib/gitlab/encrypted_configuration.rb
index fe49af3ab33..6b64281e631 100644
--- a/lib/gitlab/encrypted_configuration.rb
+++ b/lib/gitlab/encrypted_configuration.rb
@@ -65,7 +65,7 @@ module Gitlab
 
       contents = deserialize(read)
 
-      raise InvalidConfigError.new unless contents.is_a?(Hash)
+      raise InvalidConfigError unless contents.is_a?(Hash)
 
       @config = contents.deep_symbolize_keys
     end
@@ -115,7 +115,7 @@ module Gitlab
     end
 
     def handle_missing_key!
-      raise MissingKeyError.new if @key.nil?
+      raise MissingKeyError if @key.nil?
     end
   end
 end
diff --git a/lib/gitlab/experimentation.rb b/lib/gitlab/experimentation.rb
index 259e53c2f7c..1b838b45122 100644
--- a/lib/gitlab/experimentation.rb
+++ b/lib/gitlab/experimentation.rb
@@ -150,7 +150,7 @@ module Gitlab
         elsif subject.respond_to?(:to_s)
           subject.to_s
         else
-          raise ArgumentError.new('Subject must respond to `to_global_id` or `to_s`')
+          raise ArgumentError, 'Subject must respond to `to_global_id` or `to_s`'
         end
       end
     end
diff --git a/lib/gitlab/external_authorization/client.rb b/lib/gitlab/external_authorization/client.rb
index 582051010d3..43f7f042592 100644
--- a/lib/gitlab/external_authorization/client.rb
+++ b/lib/gitlab/external_authorization/client.rb
@@ -24,7 +24,7 @@ module Gitlab
         )
         ::Gitlab::ExternalAuthorization::Response.new(response)
       rescue *Gitlab::HTTP::HTTP_ERRORS => e
-        raise ::Gitlab::ExternalAuthorization::RequestFailed.new(e)
+        raise ::Gitlab::ExternalAuthorization::RequestFailed, e
       end
 
       private
diff --git a/lib/gitlab/git/conflict/resolver.rb b/lib/gitlab/git/conflict/resolver.rb
index 26e82643a4c..751184b23df 100644
--- a/lib/gitlab/git/conflict/resolver.rb
+++ b/lib/gitlab/git/conflict/resolver.rb
@@ -20,9 +20,9 @@ module Gitlab
             gitaly_conflicts_client(@target_repository).list_conflict_files.to_a
           end
         rescue GRPC::FailedPrecondition => e
-          raise Gitlab::Git::Conflict::Resolver::ConflictSideMissing.new(e.message)
+          raise Gitlab::Git::Conflict::Resolver::ConflictSideMissing, e.message
         rescue GRPC::BadStatus => e
-          raise Gitlab::Git::CommandError.new(e)
+          raise Gitlab::Git::CommandError, e
         end
 
         def resolve_conflicts(source_repository, resolution, source_branch:, target_branch:)
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 3361cee733b..45cf8f5572a 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -89,9 +89,9 @@ module Gitlab
       def root_ref
         gitaly_ref_client.default_branch_name
       rescue GRPC::NotFound => e
-        raise NoRepository.new(e.message)
+        raise NoRepository, e.message
       rescue GRPC::Unknown => e
-        raise Gitlab::Git::CommandError.new(e.message)
+        raise Gitlab::Git::CommandError, e.message
       end
 
       def exists?
@@ -348,7 +348,7 @@ module Gitlab
 
         limit = options[:limit]
         if limit == 0 || !limit.is_a?(Integer)
-          raise ArgumentError.new("invalid Repository#log limit: #{limit.inspect}")
+          raise ArgumentError, "invalid Repository#log limit: #{limit.inspect}"
         end
 
         wrapped_gitaly_errors do
@@ -414,7 +414,7 @@ module Gitlab
             end
           end
       rescue ArgumentError => e
-        raise Gitlab::Git::Repository::GitError.new(e)
+        raise Gitlab::Git::Repository::GitError, e
       end
 
       # Returns the SHA of the most recent common ancestor of +from+ and +to+
@@ -836,7 +836,7 @@ module Gitlab
       def fsck
         msg, status = gitaly_repository_client.fsck
 
-        raise GitError.new("Could not fsck repository: #{msg}") unless status == 0
+        raise GitError, "Could not fsck repository: #{msg}" unless status == 0
       end
 
       def create_from_bundle(bundle_path)
diff --git a/lib/gitlab/git/rugged_impl/repository.rb b/lib/gitlab/git/rugged_impl/repository.rb
index 8679d977773..ea10b4e7cd8 100644
--- a/lib/gitlab/git/rugged_impl/repository.rb
+++ b/lib/gitlab/git/rugged_impl/repository.rb
@@ -31,7 +31,7 @@ module Gitlab
         def rugged
           @rugged ||= ::Rugged::Repository.new(path, alternates: alternate_object_directories)
         rescue ::Rugged::RepositoryError, ::Rugged::OSError
-          raise ::Gitlab::Git::Repository::NoRepository.new('no repository for such path')
+          raise ::Gitlab::Git::Repository::NoRepository, 'no repository for such path'
         end
 
         def cleanup
diff --git a/lib/gitlab/git/wraps_gitaly_errors.rb b/lib/gitlab/git/wraps_gitaly_errors.rb
index 2009683d32c..1d34f3c8eb2 100644
--- a/lib/gitlab/git/wraps_gitaly_errors.rb
+++ b/lib/gitlab/git/wraps_gitaly_errors.rb
@@ -6,13 +6,13 @@ module Gitlab
       def wrapped_gitaly_errors(&block)
         yield block
       rescue GRPC::NotFound => e
-        raise Gitlab::Git::Repository::NoRepository.new(e)
+        raise Gitlab::Git::Repository::NoRepository, e
       rescue GRPC::InvalidArgument => e
-        raise ArgumentError.new(e)
+        raise ArgumentError, e
       rescue GRPC::DeadlineExceeded => e
-        raise Gitlab::Git::CommandTimedOut.new(e)
+        raise Gitlab::Git::CommandTimedOut, e
       rescue GRPC::BadStatus => e
-        raise Gitlab::Git::CommandError.new(e)
+        raise Gitlab::Git::CommandError, e
       end
     end
   end
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb
index 5ce1b1f0c87..fd794acb4dd 100644
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
@@ -59,7 +59,7 @@ module Gitlab
                                      :user_create_branch, request, timeout: GitalyClient.long_timeout)
 
         if response.pre_receive_error.present?
-          raise Gitlab::Git::PreReceiveError.new(response.pre_receive_error)
+          raise Gitlab::Git::PreReceiveError, response.pre_receive_error
         end
 
         branch = response.branch
@@ -159,7 +159,7 @@ module Gitlab
 
         branch_update = second_response.branch_update
         return if branch_update.nil?
-        raise Gitlab::Git::CommitError.new('failed to apply merge to branch') unless branch_update.commit_id.present?
+        raise Gitlab::Git::CommitError, 'failed to apply merge to branch' unless branch_update.commit_id.present?
 
         Gitlab::Git::OperationService::BranchUpdate.from_gitaly(branch_update)
       ensure
diff --git a/lib/gitlab/gitaly_client/ref_service.rb b/lib/gitlab/gitaly_client/ref_service.rb
index 97b6813c080..ac2db99ee01 100644
--- a/lib/gitlab/gitaly_client/ref_service.rb
+++ b/lib/gitlab/gitaly_client/ref_service.rb
@@ -292,7 +292,7 @@ module Gitlab
       end
 
       def invalid_ref!(message)
-        raise Gitlab::Git::Repository::InvalidRef.new(message)
+        raise Gitlab::Git::Repository::InvalidRef, message
       end
     end
   end
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index a93f4071efc..d2dbd456180 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -319,7 +319,7 @@ module Gitlab
         response = GitalyClient.call(@storage, :repository_service, :calculate_checksum, request, timeout: GitalyClient.fast_timeout)
         response.checksum.presence
       rescue GRPC::DataLoss => e
-        raise Gitlab::Git::Repository::InvalidRepository.new(e)
+        raise Gitlab::Git::Repository::InvalidRepository, e
       end
 
       def raw_changes_between(from, to)
diff --git a/lib/gitlab/golang.rb b/lib/gitlab/golang.rb
index 31b7a198b92..1b625a3a514 100644
--- a/lib/gitlab/golang.rb
+++ b/lib/gitlab/golang.rb
@@ -69,13 +69,13 @@ module Gitlab
       # Error messages are based on the responses of proxy.golang.org
 
       # Verify that the SHA fragment references a commit
-      raise ArgumentError.new 'invalid pseudo-version: unknown commit' unless commit
+      raise ArgumentError, 'invalid pseudo-version: unknown commit' unless commit
 
       # Require the SHA fragment to be 12 characters long
-      raise ArgumentError.new 'invalid pseudo-version: revision is shorter than canonical' unless version.commit_id.length == 12
+      raise ArgumentError, 'invalid pseudo-version: revision is shorter than canonical' unless version.commit_id.length == 12
 
       # Require the timestamp to match that of the commit
-      raise ArgumentError.new 'invalid pseudo-version: does not match version-control timestamp' unless commit.committed_date.strftime('%Y%m%d%H%M%S') == version.timestamp
+      raise ArgumentError, 'invalid pseudo-version: does not match version-control timestamp' unless commit.committed_date.strftime('%Y%m%d%H%M%S') == version.timestamp
 
       commit
     end
diff --git a/lib/gitlab/graphql/pagination/keyset/connection.rb b/lib/gitlab/graphql/pagination/keyset/connection.rb
index e525996ec10..61903c566f0 100644
--- a/lib/gitlab/graphql/pagination/keyset/connection.rb
+++ b/lib/gitlab/graphql/pagination/keyset/connection.rb
@@ -114,7 +114,7 @@ module Gitlab
           def limited_nodes
             strong_memoize(:limited_nodes) do
               if first && last
-                raise Gitlab::Graphql::Errors::ArgumentError.new("Can only provide either `first` or `last`, not both")
+                raise Gitlab::Graphql::Errors::ArgumentError, "Can only provide either `first` or `last`, not both"
               end
 
               if last
@@ -158,7 +158,7 @@ module Gitlab
           def ordered_items
             strong_memoize(:ordered_items) do
               unless items.primary_key.present?
-                raise ArgumentError.new('Relation must have a primary key')
+                raise ArgumentError, 'Relation must have a primary key'
               end
 
               list = OrderInfo.build_order_list(items)
diff --git a/lib/gitlab/graphql/pagination/keyset/order_info.rb b/lib/gitlab/graphql/pagination/keyset/order_info.rb
index 0494329bfd9..88f9c97002c 100644
--- a/lib/gitlab/graphql/pagination/keyset/order_info.rb
+++ b/lib/gitlab/graphql/pagination/keyset/order_info.rb
@@ -36,24 +36,24 @@ module Gitlab
 
           def self.validate_ordering(relation, order_list)
             if order_list.empty?
-              raise ArgumentError.new('A minimum of 1 ordering field is required')
+              raise ArgumentError, 'A minimum of 1 ordering field is required'
             end
 
             if order_list.count > 2
               # Keep in mind an order clause for primary key is added if one is not present
               # lib/gitlab/graphql/pagination/keyset/connection.rb:97
-              raise ArgumentError.new('A maximum of 2 ordering fields are allowed')
+              raise ArgumentError, 'A maximum of 2 ordering fields are allowed'
             end
 
             # make sure the last ordering field is non-nullable
             attribute_name = order_list.last&.attribute_name
 
             if relation.columns_hash[attribute_name].null
-              raise ArgumentError.new("Column `#{attribute_name}` must not allow NULL")
+              raise ArgumentError, "Column `#{attribute_name}` must not allow NULL"
             end
 
             if order_list.last.attribute_name != relation.primary_key
-              raise ArgumentError.new("Last ordering field must be the primary key, `#{relation.primary_key}`")
+              raise ArgumentError, "Last ordering field must be the primary key, `#{relation.primary_key}`"
             end
           end
 
diff --git a/lib/gitlab/graphql/pagination/keyset/query_builder.rb b/lib/gitlab/graphql/pagination/keyset/query_builder.rb
index ee9c902c735..a2f53ae83dd 100644
--- a/lib/gitlab/graphql/pagination/keyset/query_builder.rb
+++ b/lib/gitlab/graphql/pagination/keyset/query_builder.rb
@@ -12,7 +12,7 @@ module Gitlab
             @before_or_after = before_or_after
 
             if order_list.empty?
-              raise ArgumentError.new('No ordering scopes have been supplied')
+              raise ArgumentError, 'No ordering scopes have been supplied'
             end
           end
 
@@ -49,7 +49,7 @@ module Gitlab
             end
 
             if order_list.count == 1 && attr_values.first.nil?
-              raise Gitlab::Graphql::Errors::ArgumentError.new('Before/after cursor invalid: `nil` was provided as only sortable value')
+              raise Gitlab::Graphql::Errors::ArgumentError, 'Before/after cursor invalid: `nil` was provided as only sortable value'
             end
 
             if order_list.count == 1 || attr_values.first.present?
diff --git a/lib/gitlab/graphql/variables.rb b/lib/gitlab/graphql/variables.rb
index 1c6fb011012..e17ca56d022 100644
--- a/lib/gitlab/graphql/variables.rb
+++ b/lib/gitlab/graphql/variables.rb
@@ -32,7 +32,7 @@ module Gitlab
           raise Invalid, "Unexpected parameter: #{ambiguous_param}"
         end
       rescue JSON::ParserError => e
-        raise Invalid.new(e)
+        raise Invalid, e
       end
     end
   end
diff --git a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
index e2dba831661..1e8009d29c2 100644
--- a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
+++ b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
@@ -28,7 +28,7 @@ module Gitlab
 
         def handle_response_error(response)
           unless response.success?
-            raise StrategyError.new("Error uploading the project. Code #{response.code}: #{response.message}")
+            raise StrategyError, "Error uploading the project. Code #{response.code}: #{response.message}"
           end
         end
 
diff --git a/lib/gitlab/import_export/after_export_strategy_builder.rb b/lib/gitlab/import_export/after_export_strategy_builder.rb
index 37394f46a99..d7b30f46903 100644
--- a/lib/gitlab/import_export/after_export_strategy_builder.rb
+++ b/lib/gitlab/import_export/after_export_strategy_builder.rb
@@ -12,7 +12,7 @@ module Gitlab
         klass = strategy_klass.constantize rescue nil
 
         unless klass && klass < AfterExportStrategies::BaseAfterExportStrategy
-          raise StrategyNotFoundError.new("Strategy #{strategy_klass} not found")
+          raise StrategyNotFoundError, "Strategy #{strategy_klass} not found"
         end
 
         klass.new(**attributes.symbolize_keys)
diff --git a/lib/gitlab/import_export/file_importer.rb b/lib/gitlab/import_export/file_importer.rb
index 3fd96e14a63..af195fd4d11 100644
--- a/lib/gitlab/import_export/file_importer.rb
+++ b/lib/gitlab/import_export/file_importer.rb
@@ -57,7 +57,7 @@ module Gitlab
       def decompress_archive
         result = untar_zxf(archive: @archive_file, dir: @shared.export_path)
 
-        raise ImporterError.new("Unable to decompress #{@archive_file} into #{@shared.export_path}") unless result
+        raise ImporterError, "Unable to decompress #{@archive_file} into #{@shared.export_path}" unless result
 
         result
       end
@@ -87,7 +87,7 @@ module Gitlab
       end
 
       def validate_decompressed_archive_size
-        raise ImporterError.new(_('Decompressed archive size validation failed.')) unless size_validator.valid?
+        raise ImporterError, _('Decompressed archive size validation failed.') unless size_validator.valid?
       end
 
       def size_validator
diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index 6b2022dbb75..c2510bbe938 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -21,7 +21,7 @@ module Gitlab
         if import_file && check_version! && restorers.all?(&:restore) && overwrite_project
           project
         else
-          raise Projects::ImportService::Error.new(shared.errors.to_sentence)
+          raise Projects::ImportService::Error, shared.errors.to_sentence
         end
       rescue StandardError => e
         # If some exception was raised could mean that the SnippetsRepoRestorer
@@ -29,7 +29,7 @@ module Gitlab
         # This is a state we don't want them to be, so we better delete them.
         remove_non_migrated_snippets
 
-        raise Projects::ImportService::Error.new(e.message)
+        raise Projects::ImportService::Error, e.message
       ensure
         remove_base_tmp_dir
         remove_import_file
diff --git a/lib/gitlab/import_export/json/legacy_reader.rb b/lib/gitlab/import_export/json/legacy_reader.rb
index 4fc69c2b182..f29c0a44188 100644
--- a/lib/gitlab/import_export/json/legacy_reader.rb
+++ b/lib/gitlab/import_export/json/legacy_reader.rb
@@ -30,7 +30,7 @@ module Gitlab
             ActiveSupport::JSON.decode(IO.read(@path))
           rescue StandardError => e
             Gitlab::ErrorTracking.log_exception(e)
-            raise Gitlab::ImportExport::Error.new('Incorrect JSON format')
+            raise Gitlab::ImportExport::Error, 'Incorrect JSON format'
           end
         end
 
diff --git a/lib/gitlab/import_export/lfs_restorer.rb b/lib/gitlab/import_export/lfs_restorer.rb
index b007b348b3e..d73ae1410a3 100644
--- a/lib/gitlab/import_export/lfs_restorer.rb
+++ b/lib/gitlab/import_export/lfs_restorer.rb
@@ -74,7 +74,7 @@ module Gitlab
             json = IO.read(lfs_json_path)
             ActiveSupport::JSON.decode(json)
           rescue StandardError
-            raise Gitlab::ImportExport::Error.new('Incorrect JSON format')
+            raise Gitlab::ImportExport::Error, 'Incorrect JSON format'
           end
       end
 
diff --git a/lib/gitlab/import_export/shared.rb b/lib/gitlab/import_export/shared.rb
index 09ed4eb568d..f295ab38de0 100644
--- a/lib/gitlab/import_export/shared.rb
+++ b/lib/gitlab/import_export/shared.rb
@@ -90,7 +90,7 @@ module Gitlab
         when 'Group'
           @exportable.full_path
         else
-          raise Gitlab::ImportExport::Error.new("Unsupported Exportable Type #{@exportable&.class}")
+          raise Gitlab::ImportExport::Error, "Unsupported Exportable Type #{@exportable&.class}"
         end
       end
 
diff --git a/lib/gitlab/import_export/version_checker.rb b/lib/gitlab/import_export/version_checker.rb
index abf293d98fa..5ec9db00d0a 100644
--- a/lib/gitlab/import_export/version_checker.rb
+++ b/lib/gitlab/import_export/version_checker.rb
@@ -27,7 +27,7 @@ module Gitlab
 
       def verify_version!(version)
         if different_version?(version)
-          raise Gitlab::ImportExport::Error.new("Import version mismatch: Required #{Gitlab::ImportExport.version} but was #{version}")
+          raise Gitlab::ImportExport::Error, "Import version mismatch: Required #{Gitlab::ImportExport.version} but was #{version}"
         else
           true
         end
@@ -41,7 +41,7 @@ module Gitlab
           error: e.message
         )
 
-        raise Gitlab::ImportExport::Error.new('Incorrect VERSION format')
+        raise Gitlab::ImportExport::Error, 'Incorrect VERSION format'
       end
     end
   end
diff --git a/lib/gitlab/instrumentation/redis_cluster_validator.rb b/lib/gitlab/instrumentation/redis_cluster_validator.rb
index 644a5fc4fff..005751fb0db 100644
--- a/lib/gitlab/instrumentation/redis_cluster_validator.rb
+++ b/lib/gitlab/instrumentation/redis_cluster_validator.rb
@@ -62,7 +62,7 @@ module Gitlab
           end
 
           if key_slots.uniq.many? # rubocop: disable CodeReuse/ActiveRecord
-            raise CrossSlotError.new("Redis command #{command_name} arguments hash to different slots. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands")
+            raise CrossSlotError, "Redis command #{command_name} arguments hash to different slots. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands"
           end
         end
 
diff --git a/lib/gitlab/jira/http_client.rb b/lib/gitlab/jira/http_client.rb
index f0b08bb6b6a..3e7659db240 100644
--- a/lib/gitlab/jira/http_client.rb
+++ b/lib/gitlab/jira/http_client.rb
@@ -12,7 +12,7 @@ module Gitlab
       def request(*args)
         result = make_request(*args)
 
-        raise JIRA::HTTPError.new(result.response) unless result.response.is_a?(Net::HTTPSuccess)
+        raise JIRA::HTTPError, result.response unless result.response.is_a?(Net::HTTPSuccess)
 
         result
       end
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb
index 5a63b268bc9..561cd4509b1 100644
--- a/lib/gitlab/json.rb
+++ b/lib/gitlab/json.rb
@@ -84,7 +84,7 @@ module Gitlab
 
         Oj.load(string, opts)
       rescue Oj::ParseError, Encoding::UndefinedConversionError => ex
-        raise parser_error.new(ex)
+        raise parser_error, ex
       end
 
       # Take a Ruby object and convert it to a string. This method varies
diff --git a/lib/gitlab/legacy_github_import/label_formatter.rb b/lib/gitlab/legacy_github_import/label_formatter.rb
index 0b6e4612843..415b1b8878f 100644
--- a/lib/gitlab/legacy_github_import/label_formatter.rb
+++ b/lib/gitlab/legacy_github_import/label_formatter.rb
@@ -20,7 +20,7 @@ module Gitlab
         service = ::Labels::FindOrCreateService.new(nil, project, params)
         label   = service.execute(skip_authorization: true)
 
-        raise ActiveRecord::RecordInvalid.new(label) unless label.persisted?
+        raise ActiveRecord::RecordInvalid, label unless label.persisted?
 
         label
       end
diff --git a/lib/gitlab/lfs/client.rb b/lib/gitlab/lfs/client.rb
index cd7a94f24d9..a05e8107cad 100644
--- a/lib/gitlab/lfs/client.rb
+++ b/lib/gitlab/lfs/client.rb
@@ -43,7 +43,7 @@ module Gitlab
         body = Gitlab::Json.parse(rsp.body)
         transfer = body.fetch('transfer', 'basic')
 
-        raise UnsupportedTransferError.new(transfer.inspect) unless transfer == 'basic'
+        raise UnsupportedTransferError, transfer.inspect unless transfer == 'basic'
 
         body
       end
diff --git a/lib/gitlab/metrics/dashboard/errors.rb b/lib/gitlab/metrics/dashboard/errors.rb
index 07ddd315bcc..1a951172f74 100644
--- a/lib/gitlab/metrics/dashboard/errors.rb
+++ b/lib/gitlab/metrics/dashboard/errors.rb
@@ -33,7 +33,7 @@ module Gitlab
         end
 
         def panels_not_found!(opts)
-          raise PanelNotFoundError.new(_("No panels matching properties %{opts}") % { opts: opts })
+          raise PanelNotFoundError, _("No panels matching properties %{opts}") % { opts: opts }
         end
       end
     end
diff --git a/lib/gitlab/metrics/dashboard/stages/base_stage.rb b/lib/gitlab/metrics/dashboard/stages/base_stage.rb
index ee2d36621b4..c2a8a88108f 100644
--- a/lib/gitlab/metrics/dashboard/stages/base_stage.rb
+++ b/lib/gitlab/metrics/dashboard/stages/base_stage.rb
@@ -23,15 +23,15 @@ module Gitlab
           protected
 
           def missing_panel_groups!
-            raise Errors::LayoutError.new('Top-level key :panel_groups must be an array')
+            raise Errors::LayoutError, 'Top-level key :panel_groups must be an array'
           end
 
           def missing_panels!
-            raise Errors::LayoutError.new('Each "panel_group" must define an array :panels')
+            raise Errors::LayoutError, 'Each "panel_group" must define an array :panels'
           end
 
           def missing_metrics!
-            raise Errors::LayoutError.new('Each "panel" must define an array :metrics')
+            raise Errors::LayoutError, 'Each "panel" must define an array :metrics'
           end
 
           def for_metrics
diff --git a/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb b/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb
index a12082b704c..2c17982d299 100644
--- a/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb
+++ b/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb
@@ -39,7 +39,7 @@ module Gitlab
           end
 
           def error!(message)
-            raise Errors::DashboardProcessingError.new(message)
+            raise Errors::DashboardProcessingError, message
           end
 
           def group_url(metric)
@@ -67,14 +67,14 @@ module Gitlab
           def query_for_metric(metric)
             query = metric[query_type(metric)]
 
-            raise Errors::MissingQueryError.new('Each "metric" must define one of :query or :query_range') unless query
+            raise Errors::MissingQueryError, 'Each "metric" must define one of :query or :query_range' unless query
 
             query
           end
 
           def verify_params
-            raise Errors::DashboardProcessingError.new(_('Cluster is required for Stages::ClusterEndpointInserter')) unless params[:cluster]
-            raise Errors::DashboardProcessingError.new(_('Cluster type must be specificed for Stages::ClusterEndpointInserter')) unless params[:cluster_type]
+            raise Errors::DashboardProcessingError, _('Cluster is required for Stages::ClusterEndpointInserter') unless params[:cluster]
+            raise Errors::DashboardProcessingError, _('Cluster type must be specificed for Stages::ClusterEndpointInserter') unless params[:cluster_type]
           end
         end
       end
diff --git a/lib/gitlab/metrics/dashboard/stages/metric_endpoint_inserter.rb b/lib/gitlab/metrics/dashboard/stages/metric_endpoint_inserter.rb
index dd85bd0beb1..d885d978524 100644
--- a/lib/gitlab/metrics/dashboard/stages/metric_endpoint_inserter.rb
+++ b/lib/gitlab/metrics/dashboard/stages/metric_endpoint_inserter.rb
@@ -6,7 +6,7 @@ module Gitlab
       module Stages
         class MetricEndpointInserter < BaseStage
           def transform!
-            raise Errors::DashboardProcessingError.new(_('Environment is required for Stages::MetricEndpointInserter')) unless params[:environment]
+            raise Errors::DashboardProcessingError, _('Environment is required for Stages::MetricEndpointInserter') unless params[:environment]
 
             for_metrics do |metric|
               metric[:prometheus_endpoint_path] = endpoint_for_metric(metric)
@@ -43,7 +43,7 @@ module Gitlab
           def query_for_metric(metric)
             query = metric[query_type(metric)]
 
-            raise Errors::MissingQueryError.new('Each "metric" must define one of :query or :query_range') unless query
+            raise Errors::MissingQueryError, 'Each "metric" must define one of :query or :query_range' unless query
 
             # We need to remove any newlines since our UrlBlocker does not allow
             # multiline URLs.
diff --git a/lib/gitlab/metrics/dashboard/stages/variable_endpoint_inserter.rb b/lib/gitlab/metrics/dashboard/stages/variable_endpoint_inserter.rb
index 20e7fe477e5..b3ce0b79675 100644
--- a/lib/gitlab/metrics/dashboard/stages/variable_endpoint_inserter.rb
+++ b/lib/gitlab/metrics/dashboard/stages/variable_endpoint_inserter.rb
@@ -8,7 +8,7 @@ module Gitlab
           VARIABLE_TYPE_METRIC_LABEL_VALUES = 'metric_label_values'
 
           def transform!
-            raise Errors::DashboardProcessingError.new(_('Environment is required for Stages::VariableEndpointInserter')) unless params[:environment]
+            raise Errors::DashboardProcessingError, _('Environment is required for Stages::VariableEndpointInserter') unless params[:environment]
 
             for_variables do |variable_name, variable|
               if variable.is_a?(Hash) && variable[:type] == VARIABLE_TYPE_METRIC_LABEL_VALUES
diff --git a/lib/gitlab/multi_collection_paginator.rb b/lib/gitlab/multi_collection_paginator.rb
index 002171854ad..87cc0a0d3d2 100644
--- a/lib/gitlab/multi_collection_paginator.rb
+++ b/lib/gitlab/multi_collection_paginator.rb
@@ -5,7 +5,7 @@ module Gitlab
     attr_reader :first_collection, :second_collection, :per_page
 
     def initialize(*collections, per_page: nil)
-      raise ArgumentError.new('Only 2 collections are supported') if collections.size != 2
+      raise ArgumentError, 'Only 2 collections are supported' if collections.size != 2
 
       @per_page = (per_page || Kaminari.config.default_per_page).to_i
       @first_collection, @second_collection = collections
diff --git a/lib/gitlab/object_hierarchy.rb b/lib/gitlab/object_hierarchy.rb
index ee44740b58b..23548e30977 100644
--- a/lib/gitlab/object_hierarchy.rb
+++ b/lib/gitlab/object_hierarchy.rb
@@ -14,7 +14,7 @@ module Gitlab
     # descendants_base - An instance of ActiveRecord::Relation for which to
     #                    get child objects. If omitted, ancestors_base is used.
     def initialize(ancestors_base, descendants_base = ancestors_base, options: {})
-      raise ArgumentError.new("Model of ancestors_base does not match model of descendants_base") if ancestors_base.model != descendants_base.model
+      raise ArgumentError, "Model of ancestors_base does not match model of descendants_base" if ancestors_base.model != descendants_base.model
 
       @ancestors_base = ancestors_base
       @descendants_base = descendants_base
diff --git a/lib/gitlab/otp_key_rotator.rb b/lib/gitlab/otp_key_rotator.rb
index 1d3200aa099..b65c8613d00 100644
--- a/lib/gitlab/otp_key_rotator.rb
+++ b/lib/gitlab/otp_key_rotator.rb
@@ -32,8 +32,8 @@ module Gitlab
     def rotate!(old_key:, new_key:)
       old_key ||= Gitlab::Application.secrets.otp_key_base
 
-      raise ArgumentError.new("Old key is the same as the new key") if old_key == new_key
-      raise ArgumentError.new("New key is too short! Must be 256 bits") if new_key.size < 64
+      raise ArgumentError, "Old key is the same as the new key" if old_key == new_key
+      raise ArgumentError, "New key is too short! Must be 256 bits" if new_key.size < 64
 
       write_csv do |csv|
         ActiveRecord::Base.transaction do
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index f5fcd5c6093..35a61182a9a 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -10,7 +10,7 @@ module Gitlab
       def draw(routes_name)
         drawn_any = draw_ee(routes_name) | draw_ce(routes_name)
 
-        drawn_any || raise(RoutesNotFound.new("Cannot find #{routes_name}"))
+        drawn_any || raise(RoutesNotFound, "Cannot find #{routes_name}")
       end
 
       def draw_ce(routes_name)
diff --git a/lib/gitlab/phabricator_import/conduit/client.rb b/lib/gitlab/phabricator_import/conduit/client.rb
index 4469a3f5849..5945cde9618 100644
--- a/lib/gitlab/phabricator_import/conduit/client.rb
+++ b/lib/gitlab/phabricator_import/conduit/client.rb
@@ -13,7 +13,7 @@ module Gitlab
           Response.parse!(response)
         rescue *Gitlab::HTTP::HTTP_ERRORS => e
           # Wrap all errors from the API into an API-error.
-          raise ApiError.new(e)
+          raise ApiError, e
         end
 
         private
diff --git a/lib/gitlab/phabricator_import/conduit/response.rb b/lib/gitlab/phabricator_import/conduit/response.rb
index 1b03cfa05e6..26037ba183e 100644
--- a/lib/gitlab/phabricator_import/conduit/response.rb
+++ b/lib/gitlab/phabricator_import/conduit/response.rb
@@ -18,7 +18,7 @@ module Gitlab
 
           response
         rescue JSON::JSONError => e
-          raise ResponseError.new(e)
+          raise ResponseError, e
         end
 
         def initialize(json)
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index ee3d98f3602..f5eb27b6916 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -14,7 +14,7 @@ module Gitlab
       private
 
       def validate!(obj)
-        raise ParsingError.new(obj.errors.full_messages.join('\n')) unless obj.valid?
+        raise ParsingError, obj.errors.full_messages.join('\n') unless obj.valid?
       end
 
       def group_from_entry(entry)
diff --git a/lib/gitlab/redis/boolean.rb b/lib/gitlab/redis/boolean.rb
index 9b0b20fc2be..cd0877c5b13 100644
--- a/lib/gitlab/redis/boolean.rb
+++ b/lib/gitlab/redis/boolean.rb
@@ -50,7 +50,7 @@ module Gitlab
         # @return [String] the encoded boolean
         # @raise [NotABooleanError] if the value isn't true or false
         def encode(value)
-          raise NotABooleanError.new(value) unless bool?(value)
+          raise NotABooleanError, value unless bool?(value)
 
           [LABEL, to_string(value)].join(DELIMITER)
         end
@@ -61,11 +61,11 @@ module Gitlab
         # @return [Boolean] true or false
         # @raise [NotAnEncodedBooleanStringError] if the provided value isn't an encoded boolean
         def decode(value)
-          raise NotAnEncodedBooleanStringError.new(value.class) unless value.is_a?(String)
+          raise NotAnEncodedBooleanStringError, value.class unless value.is_a?(String)
 
           label, bool_str = *value.split(DELIMITER, 2)
 
-          raise NotAnEncodedBooleanStringError.new(label) unless label == LABEL
+          raise NotAnEncodedBooleanStringError, label unless label == LABEL
 
           from_string(bool_str)
         end
@@ -99,7 +99,7 @@ module Gitlab
         end
 
         def from_string(str)
-          raise NotAnEncodedBooleanStringError.new(str) unless [TRUE_STR, FALSE_STR].include?(str)
+          raise NotAnEncodedBooleanStringError, str unless [TRUE_STR, FALSE_STR].include?(str)
 
           str == TRUE_STR
         end
diff --git a/lib/gitlab/redis/hll.rb b/lib/gitlab/redis/hll.rb
index 010a6b59da5..0d04545688b 100644
--- a/lib/gitlab/redis/hll.rb
+++ b/lib/gitlab/redis/hll.rb
@@ -46,7 +46,7 @@ module Gitlab
       def validate_key!(key)
         return if KEY_REGEX.match?(key)
 
-        raise KeyFormatError.new("Invalid key format. #{key} key should have changeable parts in curly braces. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands")
+        raise KeyFormatError, "Invalid key format. #{key} key should have changeable parts in curly braces. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands"
       end
     end
   end
diff --git a/lib/gitlab/repository_url_builder.rb b/lib/gitlab/repository_url_builder.rb
index a2d0d50d20b..ed9a298ee8c 100644
--- a/lib/gitlab/repository_url_builder.rb
+++ b/lib/gitlab/repository_url_builder.rb
@@ -10,7 +10,7 @@ module Gitlab
         when :http
           http_url(path)
         else
-          raise NotImplementedError.new("No URL builder defined for protocol #{protocol}")
+          raise NotImplementedError, "No URL builder defined for protocol #{protocol}"
         end
       end
 
diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb
index cad127922df..fd9fb8ab7e2 100644
--- a/lib/gitlab/routing.rb
+++ b/lib/gitlab/routing.rb
@@ -30,7 +30,7 @@ module Gitlab
       rescue URI::InvalidURIError => e
         # If url is invalid, raise custom error,
         # which can be ignored by monitoring tools.
-        raise ActionController::RoutingError.new(e.message)
+        raise ActionController::RoutingError, e.message
       end
     end
 
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb
index 968ef06b085..ee9e6da6146 100644
--- a/lib/gitlab/runtime.rb
+++ b/lib/gitlab/runtime.rb
@@ -26,13 +26,9 @@ module Gitlab
         if matches.one?
           matches.first
         elsif matches.none?
-          raise UnknownProcessError.new(
-            "Failed to identify runtime for process #{Process.pid} (#{$0})"
-          )
+          raise UnknownProcessError, "Failed to identify runtime for process #{Process.pid} (#{$0})"
         else
-          raise AmbiguousProcessError.new(
-            "Ambiguous runtime #{matches} for process #{Process.pid} (#{$0})"
-          )
+          raise AmbiguousProcessError, "Ambiguous runtime #{matches} for process #{Process.pid} (#{$0})"
         end
       end
 
diff --git a/lib/gitlab/search/parsed_query.rb b/lib/gitlab/search/parsed_query.rb
index 5d5d407c172..0aaab2e0668 100644
--- a/lib/gitlab/search/parsed_query.rb
+++ b/lib/gitlab/search/parsed_query.rb
@@ -50,7 +50,7 @@ module Gitlab
         when :including then including
         when :excluding then excluding
         else
-          raise ArgumentError.new(type)
+          raise ArgumentError, type
         end
       end
     end
diff --git a/lib/gitlab/sidekiq_config/worker_matcher.rb b/lib/gitlab/sidekiq_config/worker_matcher.rb
index a73e6cb286b..d615d5ecba4 100644
--- a/lib/gitlab/sidekiq_config/worker_matcher.rb
+++ b/lib/gitlab/sidekiq_config/worker_matcher.rb
@@ -51,7 +51,7 @@ module Gitlab
       def predicate_for_term(term)
         match = term.match(QUERY_TERM_REGEX)
 
-        raise InvalidTerm.new("Invalid term: #{term}") unless match
+        raise InvalidTerm, "Invalid term: #{term}" unless match
 
         _, lhs, op, rhs = *match
 
@@ -67,14 +67,14 @@ module Gitlab
         else
           # This is unreachable because InvalidTerm will be raised instead, but
           # keeping it allows to guard against that changing in future.
-          raise UnknownOperator.new("Unknown operator: #{op}")
+          raise UnknownOperator, "Unknown operator: #{op}"
         end
       end
 
       def predicate_factory(lhs, values)
         values_block = QUERY_PREDICATES[lhs.to_sym]
 
-        raise UnknownPredicate.new("Unknown predicate: #{lhs}") unless values_block
+        raise UnknownPredicate, "Unknown predicate: #{lhs}" unless values_block
 
         lambda do |queue|
           comparator = Array(queue[lhs.to_sym]).to_set
diff --git a/lib/gitlab/task_helpers.rb b/lib/gitlab/task_helpers.rb
index db3c058184c..1ceccc64ec0 100644
--- a/lib/gitlab/task_helpers.rb
+++ b/lib/gitlab/task_helpers.rb
@@ -109,7 +109,7 @@ module Gitlab
     def run_command!(command)
       output, status = Gitlab::Popen.popen(command)
 
-      raise Gitlab::TaskFailedError.new(output) unless status == 0
+      raise Gitlab::TaskFailedError, output unless status == 0
 
       output
     end
diff --git a/lib/gitlab/untrusted_regexp.rb b/lib/gitlab/untrusted_regexp.rb
index 706c0925302..09236a7f1f0 100644
--- a/lib/gitlab/untrusted_regexp.rb
+++ b/lib/gitlab/untrusted_regexp.rb
@@ -22,7 +22,7 @@ module Gitlab
 
       @regexp = RE2::Regexp.new(pattern, log_errors: false)
 
-      raise RegexpError.new(regexp.error) unless regexp.ok?
+      raise RegexpError, regexp.error unless regexp.ok?
     end
 
     def replace_all(text, rewrite)
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index f98c488bbe5..e2cfa1ece31 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -49,7 +49,7 @@ module Gitlab
         when ::DesignManagement::Design
           design_url(object, **options)
         else
-          raise NotImplementedError.new("No URL builder defined for #{object.inspect}")
+          raise NotImplementedError, "No URL builder defined for #{object.inspect}"
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index 543c910cec8..bbbaae5a689 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -232,8 +232,8 @@ module Gitlab
 
         # Compose the key in order to store events daily or weekly
         def redis_key(event, time, context = '')
-          raise UnknownEvent.new("Unknown event #{event[:name]}") unless known_events_names.include?(event[:name].to_s)
-          raise UnknownAggregation.new("Use :daily or :weekly aggregation") unless ALLOWED_AGGREGATIONS.include?(event[:aggregation].to_sym)
+          raise UnknownEvent, "Unknown event #{event[:name]}" unless known_events_names.include?(event[:name].to_s)
+          raise UnknownAggregation, "Use :daily or :weekly aggregation" unless ALLOWED_AGGREGATIONS.include?(event[:aggregation].to_sym)
 
           key = apply_slot(event)
           key = apply_time_aggregation(key, time, event)
diff --git a/lib/gitlab/utils.rb b/lib/gitlab/utils.rb
index c1a57566640..d70e5c3594c 100644
--- a/lib/gitlab/utils.rb
+++ b/lib/gitlab/utils.rb
@@ -16,7 +16,7 @@ module Gitlab
       path_regex = /(\A(\.{1,2})\z|\A\.\.[\/\\]|[\/\\]\.\.\z|[\/\\]\.\.[\/\\]|\n)/
 
       if path.match?(path_regex)
-        raise PathTraversalAttackError.new('Invalid path')
+        raise PathTraversalAttackError, 'Invalid path'
       end
 
       path
diff --git a/lib/gitlab/utils/override.rb b/lib/gitlab/utils/override.rb
index c92865636d0..39670a835a6 100644
--- a/lib/gitlab/utils/override.rb
+++ b/lib/gitlab/utils/override.rb
@@ -43,12 +43,12 @@ module Gitlab
             instance_method_defined?(parent, method_name)
           end
 
-          raise NotImplementedError.new("#{klass}\##{method_name} doesn't exist!") unless overridden_parent
+          raise NotImplementedError, "#{klass}\##{method_name} doesn't exist!" unless overridden_parent
 
           super_method_arity = find_direct_method(overridden_parent, method_name).arity
 
           unless arity_compatible?(sub_method_arity, super_method_arity)
-            raise NotImplementedError.new("#{subject}\##{method_name} has arity of #{sub_method_arity}, but #{overridden_parent}\##{method_name} has arity of #{super_method_arity}")
+            raise NotImplementedError, "#{subject}\##{method_name} has arity of #{sub_method_arity}, but #{overridden_parent}\##{method_name} has arity of #{super_method_arity}"
           end
         end
 
diff --git a/lib/gitlab/verify/batch_verifier.rb b/lib/gitlab/verify/batch_verifier.rb
index 95dbedbcaf9..71d106db742 100644
--- a/lib/gitlab/verify/batch_verifier.rb
+++ b/lib/gitlab/verify/batch_verifier.rb
@@ -24,11 +24,11 @@ module Gitlab
       end
 
       def name
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       def describe(_object)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       private
@@ -77,27 +77,27 @@ module Gitlab
 
       # This should return an ActiveRecord::Relation suitable for calling #in_batches on
       def all_relation
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       # Should return true if the object is stored locally
       def local?(_object)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       # The checksum we expect the object to have
       def expected_checksum(_object)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       # The freshly-recalculated checksum of the object
       def actual_checksum(_object)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       # Be sure to perform a hard check of the remote object (don't just check DB value)
       def remote_object_exists?(object)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
     end
   end
diff --git a/lib/gitlab/view/presenter/delegated.rb b/lib/gitlab/view/presenter/delegated.rb
index 4a90ab758fb..d14f8cc4e5e 100644
--- a/lib/gitlab/view/presenter/delegated.rb
+++ b/lib/gitlab/view/presenter/delegated.rb
@@ -11,7 +11,7 @@ module Gitlab
 
           attributes.each do |key, value|
             if subject.respond_to?(key)
-              raise CannotOverrideMethodError.new("#{subject} already respond to #{key}!")
+              raise CannotOverrideMethodError, "#{subject} already respond to #{key}!"
             end
 
             define_singleton_method(key) { value }
diff --git a/lib/grafana/time_window.rb b/lib/grafana/time_window.rb
index 111e3ab7de2..6cc757d77c5 100644
--- a/lib/grafana/time_window.rb
+++ b/lib/grafana/time_window.rb
@@ -109,7 +109,7 @@ module Grafana
       def from_ms_since_epoch(time)
         return if time.nil?
 
-        raise Error.new('Expected milliseconds since epoch') unless ms_since_epoch?(time)
+        raise Error, 'Expected milliseconds since epoch' unless ms_since_epoch?(time)
 
         new(cast_ms_to_time(time))
       end
diff --git a/lib/mattermost/client.rb b/lib/mattermost/client.rb
index a9551ffbd30..7fb959a149c 100644
--- a/lib/mattermost/client.rb
+++ b/lib/mattermost/client.rb
@@ -52,12 +52,12 @@ module Mattermost
       json_response = Gitlab::Json.parse(response.body, legacy_mode: true)
 
       unless response.success?
-        raise Mattermost::ClientError.new(json_response['message'] || 'Undefined error')
+        raise Mattermost::ClientError, json_response['message'] || 'Undefined error'
       end
 
       json_response
     rescue JSON::JSONError
-      raise Mattermost::ClientError.new('Cannot parse response')
+      raise Mattermost::ClientError, 'Cannot parse response'
     end
   end
 end
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
index b349b46dc18..523d82f9161 100644
--- a/lib/mattermost/session.rb
+++ b/lib/mattermost/session.rb
@@ -174,9 +174,9 @@ module Mattermost
     def handle_exceptions
       yield
     rescue Gitlab::HTTP::Error => e
-      raise Mattermost::ConnectionError.new(e.message)
+      raise Mattermost::ConnectionError, e.message
     rescue Errno::ECONNREFUSED => e
-      raise Mattermost::ConnectionError.new(e.message)
+      raise Mattermost::ConnectionError, e.message
     end
 
     def parse_cookie(response)
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index c02456e9755..66040bb9849 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -404,7 +404,7 @@ module QA
       end
 
       def visible?
-        raise NoRequiredElementsError.new(self.class) if self.class.required_elements.empty?
+        raise NoRequiredElementsError, self.class if self.class.required_elements.empty?
 
         self.class.required_elements.each do |required_element|
           return false if has_no_element? required_element
diff --git a/spec/controllers/concerns/graceful_timeout_handling_spec.rb b/spec/controllers/concerns/graceful_timeout_handling_spec.rb
index cece36f06b2..e496d12856b 100644
--- a/spec/controllers/concerns/graceful_timeout_handling_spec.rb
+++ b/spec/controllers/concerns/graceful_timeout_handling_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe GracefulTimeoutHandling, type: :controller do
     skip_before_action :authenticate_user!
 
     def index
-      raise ActiveRecord::QueryCanceled.new
+      raise ActiveRecord::QueryCanceled
     end
   end
 
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index 081927ea73c..776ed9774b1 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -201,7 +201,7 @@ RSpec.describe Projects::LabelsController do
       context 'service raising InvalidRecord' do
         before do
           expect_any_instance_of(Labels::PromoteService).to receive(:execute) do |label|
-            raise ActiveRecord::RecordInvalid.new(label_1)
+            raise ActiveRecord::RecordInvalid, label_1
           end
         end
 
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 1b1152897fc..d9e3bfd6a9c 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -173,7 +173,7 @@ RSpec.describe 'Merge request > User resolves conflicts', :js do
       end
 
       it "renders bad name without xss issues" do
-        expect(find('.resolve-conflicts-form .resolve-info')).to have_content(bad_branch_name)
+        expect(find('[data-testid="resolve-info"]')).to have_content(bad_branch_name)
       end
     end
   end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index acfb7c2602a..64250931006 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -160,18 +160,67 @@ RSpec.describe 'Runners' do
       end
     end
 
-    context 'when application settings have shared_runners_text' do
-      let(:shared_runners_text) { 'custom **shared** runners description' }
-      let(:shared_runners_html) { 'custom shared runners description' }
+    context 'shared runner text' do
+      context 'when application settings have no shared_runners_text' do
+        it 'user sees default shared runners description' do
+          visit project_runners_path(project)
 
-      before do
-        stub_application_setting(shared_runners_text: shared_runners_text)
+          page.within("[data-testid='shared-runners-description']") do
+            expect(page).to have_content('The same shared runner executes code from multiple projects')
+          end
+        end
       end
 
-      it 'user sees shared runners description' do
-        visit project_runners_path(project)
+      context 'when application settings have shared_runners_text' do
+        let(:shared_runners_text) { 'custom **shared** runners description' }
+        let(:shared_runners_html) { 'custom shared runners description' }
 
-        expect(page.find('.shared-runners-description')).to have_content(shared_runners_html)
+        before do
+          stub_application_setting(shared_runners_text: shared_runners_text)
+        end
+
+        it 'user sees shared runners description' do
+          visit project_runners_path(project)
+
+          page.within("[data-testid='shared-runners-description']") do
+            expect(page).not_to have_content('The same shared runner executes code from multiple projects')
+            expect(page).to have_content(shared_runners_html)
+          end
+        end
+      end
+
+      context 'when application settings have an unsafe link in shared_runners_text' do
+        let(:shared_runners_text) { '<a href="javascript:alert(\'xss\')">link</a>' }
+
+        before do
+          stub_application_setting(shared_runners_text: shared_runners_text)
+        end
+
+        it 'user sees no link' do
+          visit project_runners_path(project)
+
+          page.within("[data-testid='shared-runners-description']") do
+            expect(page).to have_content('link')
+            expect(page).not_to have_link('link')
+          end
+        end
+      end
+
+      context 'when application settings have an unsafe image in shared_runners_text' do
+        let(:shared_runners_text) { '<img src="404.png" onerror="alert(\'xss\')"/>' }
+
+        before do
+          stub_application_setting(shared_runners_text: shared_runners_text)
+        end
+
+        it 'user sees image safely' do
+          visit project_runners_path(project)
+
+          page.within("[data-testid='shared-runners-description']") do
+            expect(page).to have_css('img')
+            expect(page).not_to have_css('img[onerror]')
+          end
+        end
       end
     end
   end
@@ -190,7 +239,7 @@ RSpec.describe 'Runners' do
 
         click_on 'Enable shared runners'
 
-        expect(page.find('.shared-runners-description')).to have_content('Disable shared runners')
+        expect(page.find("[data-testid='shared-runners-description']")).to have_content('Disable shared runners')
         expect(page).not_to have_selector('#toggle-shared-runners-form')
       end
     end
diff --git a/spec/frontend/issuable_list/components/issuable_item_spec.js b/spec/frontend/issuable_list/components/issuable_item_spec.js
index 7281d2fde1d..e324f071966 100644
--- a/spec/frontend/issuable_list/components/issuable_item_spec.js
+++ b/spec/frontend/issuable_list/components/issuable_item_spec.js
@@ -453,5 +453,31 @@ describe('IssuableItem', () => {
       expect(updatedAtEl.find('span').attributes('title')).toBe('Sep 10, 2020 11:41am GMT+0000');
       expect(updatedAtEl.text()).toBe(wrapper.vm.updatedAt);
     });
+
+    describe('when issuable is closed', () => {
+      it('renders issuable card with a closed style', () => {
+        wrapper = createComponent({ issuable: { ...mockIssuable, closedAt: '2020-12-10' } });
+
+        expect(wrapper.classes()).toContain('closed');
+      });
+    });
+
+    describe('when issuable was created within the past 24 hours', () => {
+      it('renders issuable card with a recently-created style', () => {
+        wrapper = createComponent({
+          issuable: { ...mockIssuable, createdAt: '2020-12-10T12:34:56' },
+        });
+
+        expect(wrapper.classes()).toContain('today');
+      });
+    });
+
+    describe('when issuable was created earlier than the past 24 hours', () => {
+      it('renders issuable card without a recently-created style', () => {
+        wrapper = createComponent({ issuable: { ...mockIssuable, createdAt: '2020-12-09' } });
+
+        expect(wrapper.classes()).not.toContain('today');
+      });
+    });
   });
 });
diff --git a/spec/frontend/issues_list/components/issues_list_app_spec.js b/spec/frontend/issues_list/components/issues_list_app_spec.js
index 9a4c2edc01a..c0b3ad0f21f 100644
--- a/spec/frontend/issues_list/components/issues_list_app_spec.js
+++ b/spec/frontend/issues_list/components/issues_list_app_spec.js
@@ -15,10 +15,10 @@ import {
   PAGE_SIZE,
   PAGE_SIZE_MANUAL,
   RELATIVE_POSITION_ASC,
-  sortOptions,
   sortParams,
 } from '~/issues_list/constants';
 import eventHub from '~/issues_list/eventhub';
+import { getSortOptions } from '~/issues_list/utils';
 import axios from '~/lib/utils/axios_utils';
 import { setUrlParams } from '~/lib/utils/url_utility';
 
@@ -35,7 +35,9 @@ describe('IssuesListApp component', () => {
     emptyStateSvgPath: 'empty-state.svg',
     endpoint: 'api/endpoint',
     exportCsvPath: 'export/csv/path',
+    hasBlockedIssuesFeature: true,
     hasIssues: true,
+    hasIssueWeightsFeature: true,
     isSignedIn: false,
     issuesPath: 'path/to/issues',
     jiraIntegrationPath: 'jira/integration/path',
@@ -43,7 +45,6 @@ describe('IssuesListApp component', () => {
     projectLabelsPath: 'project/labels/path',
     projectPath: 'path/to/project',
     rssPath: 'rss/path',
-    showImportButton: true,
     showNewIssueLink: true,
     signInPath: 'sign/in/path',
   };
@@ -105,7 +106,7 @@ describe('IssuesListApp component', () => {
         namespace: defaultProvide.projectPath,
         recentSearchesStorageKey: 'issues',
         searchInputPlaceholder: 'Search or filter results…',
-        sortOptions,
+        sortOptions: getSortOptions(true, true),
         initialSortBy: CREATED_DESC,
         tabs: IssuableListTabs,
         currentTab: IssuableStates.Opened,
@@ -142,18 +143,33 @@ describe('IssuesListApp component', () => {
       });
     });
 
-    it('renders csv import/export component', async () => {
-      const search = '?page=1&search=refactor&state=opened&order_by=created_at&sort=desc';
+    describe('csv import/export component', () => {
+      describe('when user is signed in', () => {
+        it('renders', async () => {
+          const search = '?page=1&search=refactor&state=opened&order_by=created_at&sort=desc';
 
-      global.jsdom.reconfigure({ url: `${TEST_HOST}${search}` });
+          global.jsdom.reconfigure({ url: `${TEST_HOST}${search}` });
 
-      wrapper = mountComponent({ mountFn: mount });
+          wrapper = mountComponent({
+            provide: { ...defaultProvide, isSignedIn: true },
+            mountFn: mount,
+          });
 
-      await waitForPromises();
+          await waitForPromises();
 
-      expect(findCsvImportExportButtons().props()).toMatchObject({
-        exportCsvPath: `${defaultProvide.exportCsvPath}${search}`,
-        issuableCount: xTotal,
+          expect(findCsvImportExportButtons().props()).toMatchObject({
+            exportCsvPath: `${defaultProvide.exportCsvPath}${search}`,
+            issuableCount: xTotal,
+          });
+        });
+      });
+
+      describe('when user is not signed in', () => {
+        it('does not render', () => {
+          wrapper = mountComponent({ provide: { ...defaultProvide, isSignedIn: false } });
+
+          expect(findCsvImportExportButtons().exists()).toBe(false);
+        });
       });
     });
 
@@ -369,11 +385,11 @@ describe('IssuesListApp component', () => {
 
         it('shows Jira integration information', () => {
           const paragraphs = wrapper.findAll('p');
-          expect(paragraphs.at(2).text()).toContain(IssuesListApp.i18n.jiraIntegrationTitle);
-          expect(paragraphs.at(3).text()).toContain(
+          expect(paragraphs.at(1).text()).toContain(IssuesListApp.i18n.jiraIntegrationTitle);
+          expect(paragraphs.at(2).text()).toContain(
             'Enable the Jira integration to view your Jira issues in GitLab.',
           );
-          expect(paragraphs.at(4).text()).toContain(
+          expect(paragraphs.at(3).text()).toContain(
             IssuesListApp.i18n.jiraIntegrationSecondaryMessage,
           );
           expect(findGlLink().text()).toBe('Enable the Jira integration');
diff --git a/spec/frontend/issues_list/utils_spec.js b/spec/frontend/issues_list/utils_spec.js
index fbd0a535174..00b387263ea 100644
--- a/spec/frontend/issues_list/utils_spec.js
+++ b/spec/frontend/issues_list/utils_spec.js
@@ -6,6 +6,7 @@ import {
   convertToUrlParams,
   getFilterTokens,
   getSortKey,
+  getSortOptions,
 } from '~/issues_list/utils';
 
 describe('getSortKey', () => {
@@ -15,6 +16,39 @@ describe('getSortKey', () => {
   });
 });
 
+describe('getSortOptions', () => {
+  describe.each`
+    hasIssueWeightsFeature | hasBlockedIssuesFeature | length | containsWeight | containsBlocking
+    ${false}               | ${false}                | ${8}   | ${false}       | ${false}
+    ${true}                | ${false}                | ${9}   | ${true}        | ${false}
+    ${false}               | ${true}                 | ${9}   | ${false}       | ${true}
+    ${true}                | ${true}                 | ${10}  | ${true}        | ${true}
+  `(
+    'when hasIssueWeightsFeature=$hasIssueWeightsFeature and hasBlockedIssuesFeature=$hasBlockedIssuesFeature',
+    ({
+      hasIssueWeightsFeature,
+      hasBlockedIssuesFeature,
+      length,
+      containsWeight,
+      containsBlocking,
+    }) => {
+      const sortOptions = getSortOptions(hasIssueWeightsFeature, hasBlockedIssuesFeature);
+
+      it('returns the correct length of sort options', () => {
+        expect(sortOptions).toHaveLength(length);
+      });
+
+      it(`${containsWeight ? 'contains' : 'does not contain'} weight option`, () => {
+        expect(sortOptions.some((option) => option.title === 'Weight')).toBe(containsWeight);
+      });
+
+      it(`${containsBlocking ? 'contains' : 'does not contain'} blocking option`, () => {
+        expect(sortOptions.some((option) => option.title === 'Blocking')).toBe(containsBlocking);
+      });
+    },
+  );
+});
+
 describe('getFilterTokens', () => {
   it('returns filtered tokens given "window.location.search"', () => {
     expect(getFilterTokens(locationSearch)).toEqual(filteredTokens);
diff --git a/spec/frontend/jobs/components/table/job_table_app_spec.js b/spec/frontend/jobs/components/table/job_table_app_spec.js
index 3f91b44ae5a..9d1135e26c8 100644
--- a/spec/frontend/jobs/components/table/job_table_app_spec.js
+++ b/spec/frontend/jobs/components/table/job_table_app_spec.js
@@ -1,5 +1,5 @@
-import { GlSkeletonLoader, GlAlert } from '@gitlab/ui';
-import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { GlSkeletonLoader, GlAlert, GlEmptyState } from '@gitlab/ui';
+import { createLocalVue, mount, shallowMount } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -7,7 +7,7 @@ import getJobsQuery from '~/jobs/components/table/graphql/queries/get_jobs.query
 import JobsTable from '~/jobs/components/table/jobs_table.vue';
 import JobsTableApp from '~/jobs/components/table/jobs_table_app.vue';
 import JobsTableTabs from '~/jobs/components/table/jobs_table_tabs.vue';
-import { mockJobsQueryResponse } from '../../mock_data';
+import { mockJobsQueryResponse, mockJobsQueryEmptyResponse } from '../../mock_data';
 
 const projectPath = 'gitlab-org/gitlab';
 const localVue = createLocalVue();
@@ -18,11 +18,13 @@ describe('Job table app', () => {
 
   const successHandler = jest.fn().mockResolvedValue(mockJobsQueryResponse);
   const failedHandler = jest.fn().mockRejectedValue(new Error('GraphQL error'));
+  const emptyHandler = jest.fn().mockResolvedValue(mockJobsQueryEmptyResponse);
 
   const findSkeletonLoader = () => wrapper.findComponent(GlSkeletonLoader);
   const findTable = () => wrapper.findComponent(JobsTable);
   const findTabs = () => wrapper.findComponent(JobsTableTabs);
   const findAlert = () => wrapper.findComponent(GlAlert);
+  const findEmptyState = () => wrapper.findComponent(GlEmptyState);
 
   const createMockApolloProvider = (handler) => {
     const requestHandlers = [[getJobsQuery, handler]];
@@ -30,8 +32,8 @@ describe('Job table app', () => {
     return createMockApollo(requestHandlers);
   };
 
-  const createComponent = (handler = successHandler) => {
-    wrapper = shallowMount(JobsTableApp, {
+  const createComponent = (handler = successHandler, mountFn = shallowMount) => {
+    wrapper = mountFn(JobsTableApp, {
       provide: {
         projectPath,
       },
@@ -85,4 +87,24 @@ describe('Job table app', () => {
       expect(findAlert().exists()).toBe(true);
     });
   });
+
+  describe('empty state', () => {
+    it('should display empty state if there are no jobs and tab scope is null', async () => {
+      createComponent(emptyHandler, mount);
+
+      await waitForPromises();
+
+      expect(findEmptyState().exists()).toBe(true);
+      expect(findTable().exists()).toBe(false);
+    });
+
+    it('should not display empty state if there are jobs and tab scope is not null', async () => {
+      createComponent(successHandler, mount);
+
+      await waitForPromises();
+
+      expect(findEmptyState().exists()).toBe(false);
+      expect(findTable().exists()).toBe(true);
+    });
+  });
 });
diff --git a/spec/frontend/jobs/components/table/jobs_table_empty_state_spec.js b/spec/frontend/jobs/components/table/jobs_table_empty_state_spec.js
new file mode 100644
index 00000000000..05b066a9edc
--- /dev/null
+++ b/spec/frontend/jobs/components/table/jobs_table_empty_state_spec.js
@@ -0,0 +1,37 @@
+import { GlEmptyState } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import JobsTableEmptyState from '~/jobs/components/table/jobs_table_empty_state.vue';
+
+describe('Jobs table empty state', () => {
+  let wrapper;
+
+  const pipelineEditorPath = '/root/project/-/ci/editor';
+  const emptyStateSvgPath = 'assets/jobs-empty-state.svg';
+
+  const findEmptyState = () => wrapper.findComponent(GlEmptyState);
+
+  const createComponent = () => {
+    wrapper = shallowMount(JobsTableEmptyState, {
+      provide: {
+        pipelineEditorPath,
+        emptyStateSvgPath,
+      },
+    });
+  };
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  it('displays empty state', () => {
+    expect(findEmptyState().exists()).toBe(true);
+  });
+
+  it('links to the pipeline editor', () => {
+    expect(findEmptyState().props('primaryButtonLink')).toBe(pipelineEditorPath);
+  });
+
+  it('shows an empty state image', () => {
+    expect(findEmptyState().props('svgPath')).toBe(emptyStateSvgPath);
+  });
+});
diff --git a/spec/frontend/jobs/mock_data.js b/spec/frontend/jobs/mock_data.js
index bdedbffff22..d2c065a3aba 100644
--- a/spec/frontend/jobs/mock_data.js
+++ b/spec/frontend/jobs/mock_data.js
@@ -1501,3 +1501,11 @@ export const mockJobsQueryResponse = {
     },
   },
 };
+
+export const mockJobsQueryEmptyResponse = {
+  data: {
+    project: {
+      jobs: [],
+    },
+  },
+};
diff --git a/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js b/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js
index d175b541edb..a09edb50f20 100644
--- a/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js
+++ b/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js
@@ -82,20 +82,20 @@ describe('Merge Conflict Resolver App', () => {
         const interactiveButton = findFileInteractiveButton(findFiles().at(0));
         const inlineButton = findFileInlineButton(findFiles().at(0));
 
-        expect(interactiveButton.classes('active')).toBe(true);
-        expect(inlineButton.classes('active')).toBe(false);
+        expect(interactiveButton.props('selected')).toBe(true);
+        expect(inlineButton.props('selected')).toBe(false);
       });
 
       it('clicking inline set inline as default', async () => {
         mountComponent();
 
         const inlineButton = findFileInlineButton(findFiles().at(0));
-        expect(inlineButton.classes('active')).toBe(false);
+        expect(inlineButton.props('selected')).toBe(false);
 
-        inlineButton.trigger('click');
+        inlineButton.vm.$emit('click');
         await wrapper.vm.$nextTick();
 
-        expect(inlineButton.classes('active')).toBe(true);
+        expect(inlineButton.props('selected')).toBe(true);
       });
 
       it('inline mode shows a inline-conflict-lines', () => {
@@ -110,7 +110,7 @@ describe('Merge Conflict Resolver App', () => {
       it('parallel mode shows a parallel-conflict-lines', async () => {
         mountComponent();
 
-        findSideBySideButton().trigger('click');
+        findSideBySideButton().vm.$emit('click');
         await wrapper.vm.$nextTick();
 
         const parallelConflictLinesComponent = findParallelConflictLines(findFiles().at(0));
diff --git a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
index d4e2483b765..273235fe197 100644
--- a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
+++ b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
@@ -1,3 +1,4 @@
+import { GlDatepicker } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
@@ -23,6 +24,7 @@ describe('Sidebar date Widget', () => {
 
   const findEditableItem = () => wrapper.findComponent(SidebarEditableItem);
   const findPopoverIcon = () => wrapper.find('[data-testid="inherit-date-popover"]');
+  const findDatePicker = () => wrapper.find(GlDatepicker);
 
   const createComponent = ({
     dueDateQueryHandler = jest.fn().mockResolvedValue(issuableDueDateResponse()),
@@ -50,6 +52,7 @@ describe('Sidebar date Widget', () => {
       },
       stubs: {
         SidebarEditableItem,
+        GlDatepicker,
       },
     });
   };
@@ -109,6 +112,11 @@ describe('Sidebar date Widget', () => {
     it('emits `dueDateUpdated` event with the date payload', () => {
       expect(wrapper.emitted('dueDateUpdated')).toEqual([[date]]);
     });
+
+    it('uses a correct prop to set the initial date for GlDatePicker', () => {
+      expect(findDatePicker().props('value')).toBe(null);
+      expect(findDatePicker().props('defaultDate')).toEqual(wrapper.vm.parsedDate);
+    });
   });
 
   it.each`
diff --git a/spec/lib/gitlab/alert_management/payload/base_spec.rb b/spec/lib/gitlab/alert_management/payload/base_spec.rb
index e093b3587c2..d3c1a96253c 100644
--- a/spec/lib/gitlab/alert_management/payload/base_spec.rb
+++ b/spec/lib/gitlab/alert_management/payload/base_spec.rb
@@ -89,6 +89,12 @@ RSpec.describe Gitlab::AlertManagement::Payload::Base do
 
         it { is_expected.to be_nil }
       end
+
+      context 'with time in seconds' do
+        let(:raw_payload) { { 'test' => 1618877936 } }
+
+        it { is_expected.to be_nil }
+      end
     end
 
     context 'with an integer type provided' do
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index b735ac7940b..cc9f005b189 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -176,7 +176,7 @@ RSpec.describe Gitlab::Database do
 
           closed_pool = pool
 
-          raise error.new('boom')
+          raise error, 'boom'
         end
       rescue error
       end
diff --git a/spec/lib/gitlab/external_authorization/access_spec.rb b/spec/lib/gitlab/external_authorization/access_spec.rb
index a6773cc19e1..812ef2b54e9 100644
--- a/spec/lib/gitlab/external_authorization/access_spec.rb
+++ b/spec/lib/gitlab/external_authorization/access_spec.rb
@@ -82,7 +82,7 @@ RSpec.describe Gitlab::ExternalAuthorization::Access, :clean_gitlab_redis_cache
       context 'when the request fails' do
         before do
           allow(fake_client).to receive(:request_access) do
-            raise ::Gitlab::ExternalAuthorization::RequestFailed.new('Service unavailable')
+            raise ::Gitlab::ExternalAuthorization::RequestFailed, 'Service unavailable'
           end
         end
 
diff --git a/spec/lib/gitlab/external_authorization/client_spec.rb b/spec/lib/gitlab/external_authorization/client_spec.rb
index c08da382486..b907b0bb262 100644
--- a/spec/lib/gitlab/external_authorization/client_spec.rb
+++ b/spec/lib/gitlab/external_authorization/client_spec.rb
@@ -71,7 +71,7 @@ RSpec.describe Gitlab::ExternalAuthorization::Client do
     end
 
     it 'wraps exceptions if the request fails' do
-      expect(Gitlab::HTTP).to receive(:post) { raise Gitlab::HTTP::BlockedUrlError.new('the request broke') }
+      expect(Gitlab::HTTP).to receive(:post) { raise Gitlab::HTTP::BlockedUrlError, 'the request broke' }
 
       expect { client.request_access }
         .to raise_error(::Gitlab::ExternalAuthorization::RequestFailed)
diff --git a/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb b/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb
index e448277b307..2c9da0f6606 100644
--- a/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb
+++ b/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Gitlab::Git::WrapsGitalyErrors do
 
     mapping.each do |grpc_error, error|
       it "wraps #{grpc_error} in a #{error}" do
-        expect { wrapper.wrapped_gitaly_errors { raise grpc_error.new('wrapped') } }
+        expect { wrapper.wrapped_gitaly_errors { raise grpc_error, 'wrapped' } }
           .to raise_error(error)
       end
     end
diff --git a/spec/models/ci/pipeline_schedule_spec.rb b/spec/models/ci/pipeline_schedule_spec.rb
index 3e5fbbfe823..028208a56f1 100644
--- a/spec/models/ci/pipeline_schedule_spec.rb
+++ b/spec/models/ci/pipeline_schedule_spec.rb
@@ -178,7 +178,7 @@ RSpec.describe Ci::PipelineSchedule do
 
     context 'when record is invalid' do
       before do
-        allow(pipeline_schedule).to receive(:save!) { raise ActiveRecord::RecordInvalid.new(pipeline_schedule) }
+        allow(pipeline_schedule).to receive(:save!) { raise ActiveRecord::RecordInvalid, pipeline_schedule }
       end
 
       it 'nullifies the next run at' do
diff --git a/spec/models/namespace/traversal_hierarchy_spec.rb b/spec/models/namespace/traversal_hierarchy_spec.rb
index b166d541171..baefc161691 100644
--- a/spec/models/namespace/traversal_hierarchy_spec.rb
+++ b/spec/models/namespace/traversal_hierarchy_spec.rb
@@ -86,7 +86,7 @@ RSpec.describe Namespace::TraversalHierarchy, type: :model do
         connection_double = double(:connection)
 
         allow(Namespace).to receive(:connection).and_return(connection_double)
-        allow(connection_double).to receive(:exec_query) { raise ActiveRecord::Deadlocked.new }
+        allow(connection_double).to receive(:exec_query) { raise ActiveRecord::Deadlocked }
       end
 
       it { expect { subject }.to raise_error(ActiveRecord::Deadlocked) }
diff --git a/spec/requests/api/api_guard/admin_mode_middleware_spec.rb b/spec/requests/api/api_guard/admin_mode_middleware_spec.rb
index 63bcec4b52a..ba7a01a2cd9 100644
--- a/spec/requests/api/api_guard/admin_mode_middleware_spec.rb
+++ b/spec/requests/api/api_guard/admin_mode_middleware_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe API::APIGuard::AdminModeMiddleware, :request_store do
     let(:app) do
       Class.new(API::API) do
         get 'willfail' do
-          raise StandardError.new('oh noes!')
+          raise StandardError, 'oh noes!'
         end
       end
     end
diff --git a/spec/requests/api/helpers_spec.rb b/spec/requests/api/helpers_spec.rb
index 8160a94aef2..ce0018d6d0d 100644
--- a/spec/requests/api/helpers_spec.rb
+++ b/spec/requests/api/helpers_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe API::Helpers do
   end
 
   def error!(message, status, header)
-    raise StandardError.new("#{status} - #{message}")
+    raise StandardError, "#{status} - #{message}"
   end
 
   def set_param(key, value)
diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb
index dcef0653ec0..f3d100449a1 100644
--- a/spec/requests/api/releases_spec.rb
+++ b/spec/requests/api/releases_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe API::Releases do
     project.add_developer(developer)
   end
 
-  describe 'GET /projects/:id/releases' do
+  describe 'GET /projects/:id/releases', :use_clean_rails_redis_caching do
     context 'when there are two releases' do
       let!(:release_1) do
         create(:release,
@@ -147,6 +147,60 @@ RSpec.describe API::Releases do
       end.not_to exceed_all_query_limit(control_count)
     end
 
+    it 'serializes releases for the first time and read cached data from the second time' do
+      create_list(:release, 2, project: project)
+
+      expect(API::Entities::Release)
+        .to receive(:represent).with(instance_of(Release), any_args)
+        .twice
+
+      5.times { get api("/projects/#{project.id}/releases", maintainer) }
+    end
+
+    it 'increments the cache key when link is updated' do
+      releases = create_list(:release, 2, project: project)
+
+      expect(API::Entities::Release)
+        .to receive(:represent).with(instance_of(Release), any_args)
+        .exactly(4).times
+
+      2.times { get api("/projects/#{project.id}/releases", maintainer) }
+
+      releases.each { |release| create(:release_link, release: release) }
+
+      3.times { get api("/projects/#{project.id}/releases", maintainer) }
+    end
+
+    it 'increments the cache key when evidence is updated' do
+      releases = create_list(:release, 2, project: project)
+
+      expect(API::Entities::Release)
+        .to receive(:represent).with(instance_of(Release), any_args)
+        .exactly(4).times
+
+      2.times { get api("/projects/#{project.id}/releases", maintainer) }
+
+      releases.each { |release| create(:evidence, release: release) }
+
+      3.times { get api("/projects/#{project.id}/releases", maintainer) }
+    end
+
+    context 'when api_caching_releases feature flag is disabled' do
+      before do
+        stub_feature_flags(api_caching_releases: false)
+      end
+
+      it 'serializes releases everytime' do
+        create_list(:release, 2, project: project)
+
+        expect(API::Entities::Release)
+          .to receive(:represent).with(kind_of(ActiveRecord::Relation), any_args)
+          .exactly(5).times
+
+        5.times { get api("/projects/#{project.id}/releases", maintainer) }
+      end
+    end
+
     context 'when tag does not exist in git repository' do
       let!(:release) { create(:release, project: project, tag: 'v1.1.5') }
 
@@ -230,6 +284,20 @@ RSpec.describe API::Releases do
         end
       end
     end
+
+    context 'when releases are public and request user is absent' do
+      let(:project) { create(:project, :repository, :public) }
+
+      it 'returns the releases' do
+        create(:release, project: project, tag: 'v0.1')
+
+        get api("/projects/#{project.id}/releases")
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response.count).to eq(1)
+        expect(json_response.first['tag_name']).to eq('v0.1')
+      end
+    end
   end
 
   describe 'GET /projects/:id/releases/:tag_name' do
diff --git a/spec/services/alert_management/process_prometheus_alert_service_spec.rb b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
index 84c64508a8d..86a6cdee52d 100644
--- a/spec/services/alert_management/process_prometheus_alert_service_spec.rb
+++ b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
@@ -48,7 +48,7 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
       context 'with resolving payload' do
         let(:prometheus_status) { 'resolved' }
 
-        it_behaves_like 'processes prometheus recovery alert'
+        it_behaves_like 'processes recovery alert'
       end
 
       context 'environment given' do
diff --git a/spec/services/auto_merge/base_service_spec.rb b/spec/services/auto_merge/base_service_spec.rb
index 1d33dc15838..3f535b83788 100644
--- a/spec/services/auto_merge/base_service_spec.rb
+++ b/spec/services/auto_merge/base_service_spec.rb
@@ -84,7 +84,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save merge request' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'does not yield block' do
@@ -195,7 +195,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'does not yield block' do
@@ -213,7 +213,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save merge request' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'returns error status' do
@@ -260,7 +260,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'returns error status' do
diff --git a/spec/services/branches/delete_service_spec.rb b/spec/services/branches/delete_service_spec.rb
index 291431c1723..727cadc5a50 100644
--- a/spec/services/branches/delete_service_spec.rb
+++ b/spec/services/branches/delete_service_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe Branches::DeleteService do
       context 'when Gitlab::Git::CommandError is raised' do
         before do
           allow(repository).to receive(:rm_branch) do
-            raise Gitlab::Git::CommandError.new('Could not update patch')
+            raise Gitlab::Git::CommandError, 'Could not update patch'
           end
         end
 
diff --git a/spec/services/ci/parse_dotenv_artifact_service_spec.rb b/spec/services/ci/parse_dotenv_artifact_service_spec.rb
index 8a96479bc6f..7536e04f2de 100644
--- a/spec/services/ci/parse_dotenv_artifact_service_spec.rb
+++ b/spec/services/ci/parse_dotenv_artifact_service_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Ci::ParseDotenvArtifactService do
 
       context 'when parse error happens' do
         before do
-          allow(service).to receive(:scan_line!) { raise described_class::ParserError.new('Invalid Format') }
+          allow(service).to receive(:scan_line!) { raise described_class::ParserError, 'Invalid Format' }
         end
 
         it 'returns error' do
diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb
index 938165a807c..01dce0dfbce 100644
--- a/spec/services/merge_requests/merge_to_ref_service_spec.rb
+++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb
@@ -94,7 +94,7 @@ RSpec.describe MergeRequests::MergeToRefService do
 
     it 'returns an error when Gitlab::Git::CommandError is raised during merge' do
       allow(project.repository).to receive(:merge_to_ref) do
-        raise Gitlab::Git::CommandError.new('Failed to create merge commit')
+        raise Gitlab::Git::CommandError, 'Failed to create merge commit'
       end
 
       result = service.execute(merge_request)
diff --git a/spec/support/helpers/board_helpers.rb b/spec/support/helpers/board_helpers.rb
index 6e145fed733..dff3f9d976c 100644
--- a/spec/support/helpers/board_helpers.rb
+++ b/spec/support/helpers/board_helpers.rb
@@ -4,6 +4,7 @@ module BoardHelpers
   def click_card(card)
     within card do
       first('.board-card-number').click
+      wait_for_requests
     end
   end
 end
diff --git a/spec/support/helpers/dns_helpers.rb b/spec/support/helpers/dns_helpers.rb
index 1795b0a9ac3..ba32ccbb6f1 100644
--- a/spec/support/helpers/dns_helpers.rb
+++ b/spec/support/helpers/dns_helpers.rb
@@ -18,7 +18,7 @@ module DnsHelpers
 
   def stub_invalid_dns!
     allow(Addrinfo).to receive(:getaddrinfo).with(/\Afoobar\.\w|(\d{1,3}\.){4,}\d{1,3}\z/i, anything, nil, :STREAM) do
-      raise SocketError.new("getaddrinfo: Name or service not known")
+      raise SocketError, "getaddrinfo: Name or service not known"
     end
   end
 
diff --git a/spec/support/helpers/next_found_instance_of.rb b/spec/support/helpers/next_found_instance_of.rb
index feb63f90211..c8cdbaf2c5d 100644
--- a/spec/support/helpers/next_found_instance_of.rb
+++ b/spec/support/helpers/next_found_instance_of.rb
@@ -22,7 +22,7 @@ module NextFoundInstanceOf
   private
 
   def check_if_active_record!(klass)
-    raise ArgumentError.new(ERROR_MESSAGE) unless klass < ActiveRecord::Base
+    raise ArgumentError, ERROR_MESSAGE unless klass < ActiveRecord::Base
   end
 
   def stub_allocate(target, klass)
diff --git a/spec/support/helpers/redis_without_keys.rb b/spec/support/helpers/redis_without_keys.rb
index e030f1028f7..ff64a3cf08e 100644
--- a/spec/support/helpers/redis_without_keys.rb
+++ b/spec/support/helpers/redis_without_keys.rb
@@ -4,7 +4,7 @@ class Redis
   ForbiddenCommand = Class.new(StandardError)
 
   def keys(*args)
-    raise ForbiddenCommand.new("Don't use `Redis#keys` as it iterates over all "\
-                               "keys in redis. Use `Redis#scan_each` instead.")
+    raise ForbiddenCommand, "Don't use `Redis#keys` as it iterates over all "\
+                               "keys in redis. Use `Redis#scan_each` instead."
   end
 end
diff --git a/spec/support/helpers/require_migration.rb b/spec/support/helpers/require_migration.rb
index c2902aa4ec7..b5313e78f5d 100644
--- a/spec/support/helpers/require_migration.rb
+++ b/spec/support/helpers/require_migration.rb
@@ -20,7 +20,7 @@ class RequireMigration
   class << self
     def require_migration!(file_name)
       file_paths = search_migration_file(file_name)
-      raise AutoLoadError.new(file_name) unless file_paths.first
+      raise AutoLoadError, file_name unless file_paths.first
 
       require file_paths.first
     end
diff --git a/spec/support/shared_examples/services/alert_management/alert_processing/alert_recovery_shared_examples.rb b/spec/support/shared_examples/services/alert_management/alert_processing/alert_recovery_shared_examples.rb
index e299a83cf97..86e7da5bcbe 100644
--- a/spec/support/shared_examples/services/alert_management/alert_processing/alert_recovery_shared_examples.rb
+++ b/spec/support/shared_examples/services/alert_management/alert_processing/alert_recovery_shared_examples.rb
@@ -111,67 +111,3 @@ RSpec.shared_examples 'processes recovery alert' do
     end
   end
 end
-
-RSpec.shared_examples 'processes prometheus recovery alert' do
-  context 'seen for the first time' do
-    it_behaves_like 'does not create an alert management alert'
-    it_behaves_like 'does not send alert notification emails'
-    it_behaves_like 'does not process incident issues'
-  end
-
-  context 'for an existing alert with the same fingerprint' do
-    let_it_be(:gitlab_fingerprint) { Digest::SHA1.hexdigest(fingerprint) }
-
-    context 'which is triggered' do
-      let_it_be(:alert) { create(:alert_management_alert, :triggered, project: project, fingerprint: gitlab_fingerprint, monitoring_tool: source) }
-
-      it_behaves_like 'resolves an existing alert management alert'
-      it_behaves_like 'creates expected system notes for alert', :recovery_alert, :resolve_alert
-      it_behaves_like 'sends alert notification emails if enabled'
-      it_behaves_like 'closes related incident if enabled'
-      it_behaves_like 'writes a warning to the log for a failed alert status update'
-
-      it_behaves_like 'does not create an alert management alert'
-      it_behaves_like 'does not process incident issues'
-      it_behaves_like 'does not add an alert management alert event'
-    end
-
-    context 'which is ignored' do
-      let_it_be(:alert) { create(:alert_management_alert, :ignored, project: project, fingerprint: gitlab_fingerprint, monitoring_tool: source) }
-
-      it_behaves_like 'resolves an existing alert management alert'
-      it_behaves_like 'creates expected system notes for alert', :recovery_alert, :resolve_alert
-      it_behaves_like 'sends alert notification emails if enabled'
-      it_behaves_like 'closes related incident if enabled'
-      it_behaves_like 'writes a warning to the log for a failed alert status update'
-
-      it_behaves_like 'does not create an alert management alert'
-      it_behaves_like 'does not process incident issues'
-      it_behaves_like 'does not add an alert management alert event'
-    end
-
-    context 'which is acknowledged' do
-      let_it_be(:alert) { create(:alert_management_alert, :acknowledged, project: project, fingerprint: gitlab_fingerprint, monitoring_tool: source) }
-
-      it_behaves_like 'resolves an existing alert management alert'
-      it_behaves_like 'creates expected system notes for alert', :recovery_alert, :resolve_alert
-      it_behaves_like 'sends alert notification emails if enabled'
-      it_behaves_like 'closes related incident if enabled'
-      it_behaves_like 'writes a warning to the log for a failed alert status update'
-
-      it_behaves_like 'does not create an alert management alert'
-      it_behaves_like 'does not process incident issues'
-      it_behaves_like 'does not add an alert management alert event'
-    end
-
-    context 'which is resolved' do
-      let_it_be(:alert) { create(:alert_management_alert, :resolved, project: project, fingerprint: gitlab_fingerprint, monitoring_tool: source) }
-
-      it_behaves_like 'does not create an alert management alert'
-      it_behaves_like 'does not send alert notification emails'
-      it_behaves_like 'does not change the alert end time'
-      it_behaves_like 'does not process incident issues'
-      it_behaves_like 'does not add an alert management alert event'
-    end
-  end
-end
diff --git a/spec/support/shared_examples/services/alert_management_shared_examples.rb b/spec/support/shared_examples/services/alert_management_shared_examples.rb
index a0e084967e5..827ae42f970 100644
--- a/spec/support/shared_examples/services/alert_management_shared_examples.rb
+++ b/spec/support/shared_examples/services/alert_management_shared_examples.rb
@@ -48,9 +48,19 @@ end
 
 RSpec.shared_examples 'processes never-before-seen recovery alert' do
   it_behaves_like 'creates an alert management alert or errors'
-  it_behaves_like 'creates expected system notes for alert', :new_alert
+  it_behaves_like 'creates expected system notes for alert', :new_alert, :recovery_alert, :resolve_alert
   it_behaves_like 'sends alert notification emails if enabled'
-  it_behaves_like 'processes incident issues if enabled'
+  it_behaves_like 'does not process incident issues'
+  it_behaves_like 'writes a warning to the log for a failed alert status update' do
+    let(:alert) { nil } # Ensure the next alert id is used
+  end
+
+  it 'resolves the alert' do
+    subject
+
+    expect(AlertManagement::Alert.last.ended_at).to be_present
+    expect(AlertManagement::Alert.last.resolved?).to be(true)
+  end
 end
 
 RSpec.shared_examples 'processes one firing and one resolved prometheus alerts' do
@@ -58,10 +68,10 @@ RSpec.shared_examples 'processes one firing and one resolved prometheus alerts'
     expect(Gitlab::AppLogger).not_to receive(:warn)
 
     expect { subject }
-      .to change(AlertManagement::Alert, :count).by(1)
-      .and change(Note, :count).by(1)
+      .to change(AlertManagement::Alert, :count).by(2)
+      .and change(Note, :count).by(4)
   end
 
   it_behaves_like 'processes incident issues'
-  it_behaves_like 'sends alert notification emails', count: 1
+  it_behaves_like 'sends alert notification emails', count: 2
 end
diff --git a/spec/support/stored_repositories.rb b/spec/support/stored_repositories.rb
index 95f0f971787..84396c675b9 100644
--- a/spec/support/stored_repositories.rb
+++ b/spec/support/stored_repositories.rb
@@ -3,7 +3,7 @@
 RSpec.configure do |config|
   config.before(:each, :broken_storage) do
     allow(Gitlab::GitalyClient).to receive(:call) do
-      raise GRPC::Unavailable.new('Gitaly broken in this spec')
+      raise GRPC::Unavailable, 'Gitaly broken in this spec'
     end
   end
 end