From 6092dcc437ef3e9300cc32cb7c6daea9448cba40 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 2 Oct 2020 12:09:03 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../batch_comments/components/draft_note.vue  |   5 -
 .../components/preview_dropdown.vue           | 111 ++------
 .../components/preview_item.vue               |  17 +-
 .../components/publish_button.vue             |  20 +-
 .../batch_comments/components/review_bar.vue  |  47 +---
 .../stores/modules/batch_comments/actions.js  |  22 --
 .../modules/batch_comments/mutation_types.js  |   7 -
 .../modules/batch_comments/mutations.js       |  16 --
 .../stores/modules/batch_comments/state.js    |   2 -
 app/assets/javascripts/confirm_modal.js       |  12 +-
 .../groups/components/item_actions.vue        |   2 +
 .../groups/components/item_stats_value.vue    |   3 +-
 .../fields/description_template.vue           |  11 +-
 .../javascripts/lib/utils/url_utility.js      |   9 +
 .../pages/projects/tags/index/index.js        |  12 +
 .../pages/projects/tags/remove_tag.js         |  16 ++
 .../pages/projects/tags/show/index.js         |  10 +
 .../details_page/partial_cleanup_alert.vue    |  38 +++
 .../components/list_page/image_list_row.vue   |   1 +
 .../explorer/constants/expiration_policies.js |   4 +
 .../registry/explorer/pages/details.vue       |  20 +-
 .../states/mr_widget_missing_branch.vue       |   7 +-
 .../vue_shared/components/confirm_modal.vue   |  11 +-
 app/assets/stylesheets/framework/wells.scss   |   1 -
 app/assets/stylesheets/pages/projects.scss    |   2 +-
 app/channels/application_cable/connection.rb  |   6 +-
 app/controllers/boards/issues_controller.rb   |   2 +
 app/controllers/boards/lists_controller.rb    |   2 +
 .../controller_with_feature_category.rb       |  29 +-
 .../config.rb                                 |  38 ---
 app/controllers/confirmations_controller.rb   |   2 +
 .../dashboard/groups_controller.rb            |   2 +
 .../dashboard/labels_controller.rb            |   2 +
 .../dashboard/milestones_controller.rb        |   2 +
 .../dashboard/projects_controller.rb          |   2 +
 .../dashboard/snippets_controller.rb          |   2 +
 app/controllers/dashboard/todos_controller.rb |   2 +
 app/controllers/dashboard_controller.rb       |   4 +
 app/controllers/explore/groups_controller.rb  |   2 +
 .../explore/projects_controller.rb            |   2 +
 .../explore/snippets_controller.rb            |   2 +
 .../projects/merge_requests_controller.rb     |  17 +-
 app/controllers/projects/tags_controller.rb   |  23 +-
 app/helpers/application_settings_helper.rb    |   5 +-
 app/helpers/tags_helper.rb                    |   9 +
 app/models/issue.rb                           |   1 +
 app/models/issue_email_participant.rb         |  13 +
 app/models/project.rb                         |   6 +
 app/models/project_tracing_setting.rb         |  15 ++
 app/models/user.rb                            |  10 +-
 app/policies/releases/evidence_policy.rb      |   1 +
 .../container_repository_entity.rb            |   1 +
 app/services/ci/update_build_state_service.rb |   8 +-
 .../copy_design_collection/copy_service.rb    |   2 +-
 app/services/system_notes/incident_service.rb |   2 -
 .../application_settings/_signup.html.haml    |   8 +
 .../registry/repositories/index.html.haml     |   2 +
 .../profiles/two_factor_auths/show.html.haml  |   6 +-
 .../projects/buttons/_remove_tag.html.haml    |   6 +
 .../registry/repositories/index.html.haml     |   3 +
 app/views/projects/tags/_tag.html.haml        |   6 +-
 app/views/projects/tags/destroy.js.haml       |   4 -
 app/views/projects/tags/show.html.haml        |   3 +-
 .../unreleased/225293-emaill-participants.yml |   5 +
 ...-for-partially-executed-cleanup-polici.yml |   5 +
 ...-description-template-replace-fa-icons.yml |   5 +
 .../ph-212334-fixTwoButtonReviewSubmit.yml    |   5 +
 .../pl-tracing-core-2-usage-data.yml          |   5 +
 ...-add_severity_system_note-feature-flag.yml |   5 +
 ...> admin_approval_for_new_user_signups.yml} |   8 +-
 .../forbid_sidekiq_in_transactions.rb         |   2 +-
 config/locales/devise.en.yml                  |   2 +
 ...2052316_create_issue_email_participants.rb |  32 +++
 db/schema_migrations/20200922052316           |   1 +
 db/structure.sql                              |  28 ++
 doc/development/database/index.md             |   1 +
 .../database/table_partitioning.md            | 253 ++++++++++++++++++
 .../feature_categorization/index.md           |  36 +--
 .../merge_requests/img/commit_nav_v13_4.png   | Bin 0 -> 21170 bytes
 .../reviewing_and_managing_merge_requests.md  |   2 +
 lib/gitlab/usage_data.rb                      |   4 +-
 locale/gitlab.pot                             |  58 ++--
 qa/qa/page/merge_request/show.rb              |   2 -
 .../application_cable/connection_spec.rb      |  54 ++--
 .../application_settings_controller_spec.rb   |  32 +++
 .../admin/sessions_controller_spec.rb         |   2 +-
 .../application_controller_spec.rb            |   4 +-
 .../config_spec.rb                            |  53 ----
 .../controller_with_feature_category_spec.rb  |  38 ++-
 spec/controllers/every_controller_spec.rb     |  25 +-
 .../releases/evidences_controller_spec.rb     |  32 +--
 .../projects/tags_controller_spec.rb          |  21 ++
 spec/controllers/sessions_controller_spec.rb  |  23 ++
 spec/factories/issue_email_participants.rb    |   8 +
 spec/factories/project_tracing_settings.rb    |   8 +
 spec/factories/usage_data.rb                  |   3 +
 spec/features/admin/admin_settings_spec.rb    |  32 +++
 spec/features/calendar_spec.rb                |   2 +-
 .../merge_request/batch_comments_spec.rb      |  15 --
 spec/features/projects/branches_spec.rb       |   4 +-
 .../tags/developer_deletes_tag_spec.rb        |  27 +-
 .../components/preview_item_spec.js           |  16 --
 .../components/publish_button_spec.js         |  11 -
 .../components/publish_dropdown_spec.js       |  89 ++----
 .../modules/batch_comments/actions_spec.js    |  90 +------
 .../modules/batch_comments/mutations_spec.js  |  52 ----
 .../groups/components/item_actions_spec.js    | 141 +++++-----
 .../groups/components/item_caret_spec.js      |  58 ++--
 .../groups/components/item_stats_spec.js      | 135 +++-------
 .../components/item_stats_value_spec.js       | 115 ++++----
 .../groups/components/item_type_icon_spec.js  |  84 +++---
 spec/frontend/lib/utils/url_utility_spec.js   |  12 +
 .../partial_cleanup_alert_spec.js             |  71 +++++
 .../registry/explorer/pages/details_spec.js   |  65 ++++-
 .../components/confirm_modal_spec.js          |  16 ++
 spec/lib/backup/files_spec.rb                 |   2 +-
 .../inline_grafana_metrics_filter_spec.rb     |   2 +-
 .../alert_management/payload/generic_spec.rb  |   4 +-
 .../gitlab/analytics/unique_visits_spec.rb    |   2 +-
 .../lib/gitlab/auth/current_user_mode_spec.rb |   2 +-
 .../gitlab/bitbucket_import/importer_spec.rb  |   2 +-
 spec/lib/gitlab/ci/cron_parser_spec.rb        |  14 +-
 spec/lib/gitlab/danger/roulette_spec.rb       |   2 +-
 spec/lib/gitlab/danger/teammate_spec.rb       |   2 +-
 .../database/background_migration_job_spec.rb |   2 +-
 .../database/obsolete_ignored_columns_spec.rb |   2 +-
 .../partitioning/monthly_strategy_spec.rb     |   2 +-
 .../table_management_helpers_spec.rb          |   4 +-
 spec/lib/gitlab/git/branch_spec.rb            |   6 +-
 .../loggers/queue_duration_logger_spec.rb     |   2 +-
 spec/lib/gitlab/import_export/all_models.yml  |   1 +
 spec/lib/gitlab/lfs_token_spec.rb             |   2 +-
 .../middleware/rails_queue_duration_spec.rb   |   2 +-
 ...dditional_metrics_deployment_query_spec.rb |   2 +-
 .../queries/deployment_query_spec.rb          |   2 +-
 spec/lib/gitlab/tracking_spec.rb              |   2 +-
 .../hll_redis_counter_spec.rb                 |   2 +-
 spec/lib/gitlab/usage_data_spec.rb            |   8 +-
 spec/lib/grafana/time_window_spec.rb          |   6 +-
 ...ll_status_page_published_incidents_spec.rb |   2 +-
 spec/models/ci/freeze_period_status_spec.rb   |   4 +-
 spec/models/ci/pipeline_schedule_spec.rb      |   4 +-
 spec/models/ci_platform_metric_spec.rb        |   6 +-
 .../concerns/resolvable_discussion_spec.rb    |   6 +-
 spec/models/concerns/schedulable_spec.rb      |   2 +-
 spec/models/import_failure_spec.rb            |   2 +-
 spec/models/issue/metrics_spec.rb             |  14 +-
 spec/models/issue_email_participant_spec.rb   |  19 ++
 spec/models/issue_spec.rb                     |   1 +
 spec/models/project_feature_usage_spec.rb     |   2 +-
 spec/models/project_spec.rb                   |   1 +
 spec/models/project_tracing_setting_spec.rb   |  40 +++
 spec/models/todo_spec.rb                      |   2 +-
 spec/models/user_spec.rb                      |   6 +-
 spec/requests/api/releases_spec.rb            |   4 +-
 .../projects/cycle_analytics_events_spec.rb   |   2 +-
 spec/requests/request_profiler_spec.rb        |   2 +-
 spec/services/ci/retry_build_service_spec.rb  |   4 +-
 .../ci/update_build_state_service_spec.rb     |  17 ++
 .../deployments/after_create_service_spec.rb  |   4 +-
 .../copy_service_spec.rb                      |  26 +-
 spec/services/issues/update_service_spec.rb   |   2 +-
 spec/services/keys/last_used_service_spec.rb  |   2 +-
 .../merge_requests/update_service_spec.rb     |   2 +-
 spec/services/notes/create_service_spec.rb    |   2 +-
 spec/services/notes/update_service_spec.rb    |   2 +-
 .../system_notes/incident_service_spec.rb     |  64 ++---
 spec/support/helpers/usage_data_helpers.rb    |   1 +
 .../known_sign_in_shared_examples.rb          |   2 +-
 .../models/throttled_touch_shared_examples.rb |   4 +-
 spec/workers/post_receive_spec.rb             |   2 +-
 171 files changed, 1538 insertions(+), 1247 deletions(-)
 create mode 100644 app/assets/javascripts/pages/projects/tags/index/index.js
 create mode 100644 app/assets/javascripts/pages/projects/tags/remove_tag.js
 create mode 100644 app/assets/javascripts/pages/projects/tags/show/index.js
 create mode 100644 app/assets/javascripts/registry/explorer/components/details_page/partial_cleanup_alert.vue
 delete mode 100644 app/controllers/concerns/controller_with_feature_category/config.rb
 create mode 100644 app/models/issue_email_participant.rb
 create mode 100644 app/models/project_tracing_setting.rb
 create mode 100644 app/views/projects/buttons/_remove_tag.html.haml
 delete mode 100644 app/views/projects/tags/destroy.js.haml
 create mode 100644 changelogs/unreleased/225293-emaill-participants.yml
 create mode 100644 changelogs/unreleased/243750-display-messages-and-warning-for-partially-executed-cleanup-polici.yml
 create mode 100644 changelogs/unreleased/mw-description-template-replace-fa-icons.yml
 create mode 100644 changelogs/unreleased/ph-212334-fixTwoButtonReviewSubmit.yml
 create mode 100644 changelogs/unreleased/pl-tracing-core-2-usage-data.yml
 create mode 100644 changelogs/unreleased/remove-add_severity_system_note-feature-flag.yml
 rename config/feature_flags/development/{add_severity_system_note.yml => admin_approval_for_new_user_signups.yml} (66%)
 create mode 100644 db/migrate/20200922052316_create_issue_email_participants.rb
 create mode 100644 db/schema_migrations/20200922052316
 create mode 100644 doc/development/database/table_partitioning.md
 create mode 100644 doc/user/project/merge_requests/img/commit_nav_v13_4.png
 delete mode 100644 spec/controllers/concerns/controller_with_feature_category/config_spec.rb
 create mode 100644 spec/factories/issue_email_participants.rb
 create mode 100644 spec/factories/project_tracing_settings.rb
 create mode 100644 spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js
 create mode 100644 spec/models/issue_email_participant_spec.rb
 create mode 100644 spec/models/project_tracing_setting_spec.rb

diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue
index a6cd36caede..74069b61f07 100644
--- a/app/assets/javascripts/batch_comments/components/draft_note.vue
+++ b/app/assets/javascripts/batch_comments/components/draft_note.vue
@@ -18,11 +18,6 @@ export default {
       type: Object,
       required: true,
     },
-    diffFile: {
-      type: Object,
-      required: false,
-      default: () => ({}),
-    },
     line: {
       type: Object,
       required: false,
diff --git a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue
index 2b37ed19176..e18dc344cd7 100644
--- a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue
+++ b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue
@@ -1,114 +1,43 @@
 <script>
-import { mapActions, mapGetters, mapState } from 'vuex';
-import { GlButton, GlLoadingIcon, GlIcon } from '@gitlab/ui';
-import { sprintf, n__ } from '~/locale';
-import DraftsCount from './drafts_count.vue';
-import PublishButton from './publish_button.vue';
+import { mapActions, mapGetters } from 'vuex';
+import { GlDropdown, GlDropdownItem, GlIcon } from '@gitlab/ui';
 import PreviewItem from './preview_item.vue';
 
 export default {
   components: {
-    GlButton,
-    GlLoadingIcon,
+    GlDropdown,
+    GlDropdownItem,
     GlIcon,
-    DraftsCount,
-    PublishButton,
     PreviewItem,
   },
   computed: {
-    ...mapGetters(['isNotesFetched']),
     ...mapGetters('batchComments', ['draftsCount', 'sortedDrafts']),
-    ...mapState('batchComments', ['showPreviewDropdown']),
-    dropdownTitle() {
-      return sprintf(
-        n__('%{count} pending comment', '%{count} pending comments', this.draftsCount),
-        { count: this.draftsCount },
-      );
-    },
-  },
-  watch: {
-    showPreviewDropdown() {
-      if (this.showPreviewDropdown && this.$refs.dropdown) {
-        this.$nextTick(() => this.$refs.dropdown.$el.focus());
-      }
-    },
-  },
-  mounted() {
-    document.addEventListener('click', this.onClickDocument);
-  },
-  beforeDestroy() {
-    document.removeEventListener('click', this.onClickDocument);
   },
   methods: {
-    ...mapActions('batchComments', ['toggleReviewDropdown']),
+    ...mapActions('batchComments', ['scrollToDraft']),
     isLast(index) {
       return index === this.sortedDrafts.length - 1;
     },
-    onClickDocument({ target }) {
-      if (
-        this.showPreviewDropdown &&
-        !target.closest('.review-preview-dropdown, .js-publish-draft-button')
-      ) {
-        this.toggleReviewDropdown();
-      }
-    },
   },
 };
 </script>
 
 <template>
-  <div
-    class="dropdown float-right review-preview-dropdown"
-    :class="{
-      show: showPreviewDropdown,
-    }"
+  <gl-dropdown
+    :header-text="n__('%d pending comment', '%d pending comments', draftsCount)"
+    dropup
+    toggle-class="qa-review-preview-toggle"
   >
-    <gl-button
-      ref="dropdown"
-      type="button"
-      category="primary"
-      variant="success"
-      class="review-preview-dropdown-toggle qa-review-preview-toggle"
-      @click="toggleReviewDropdown"
+    <template #button-content>
+      {{ __('Pending comments') }}
+      <gl-icon class="dropdown-chevron" name="chevron-up" />
+    </template>
+    <gl-dropdown-item
+      v-for="(draft, index) in sortedDrafts"
+      :key="draft.id"
+      @click="scrollToDraft(draft)"
     >
-      {{ __('Finish review') }}
-      <drafts-count />
-      <gl-icon name="angle-up" />
-    </gl-button>
-    <div
-      class="dropdown-menu dropdown-menu-large dropdown-menu-right dropdown-open-top"
-      :class="{
-        show: showPreviewDropdown,
-      }"
-    >
-      <div class="dropdown-title gl-display-flex gl-align-items-center">
-        <span class="gl-ml-auto">{{ dropdownTitle }}</span>
-        <gl-button
-          :aria-label="__('Close')"
-          type="button"
-          category="tertiary"
-          size="small"
-          class="dropdown-title-button gl-ml-auto gl-p-0!"
-          icon="close"
-          @click="toggleReviewDropdown"
-        />
-      </div>
-      <div class="dropdown-content">
-        <ul v-if="isNotesFetched">
-          <li v-for="(draft, index) in sortedDrafts" :key="draft.id">
-            <preview-item :draft="draft" :is-last="isLast(index)" />
-          </li>
-        </ul>
-        <gl-loading-icon v-else size="lg" class="gl-mt-3 gl-mb-3" />
-      </div>
-      <div class="dropdown-footer">
-        <publish-button
-          :show-count="false"
-          :should-publish="true"
-          :label="__('Submit review')"
-          class="float-right gl-mr-3"
-        />
-      </div>
-    </div>
-  </div>
+      <preview-item :draft="draft" :is-last="isLast(index)" />
+    </gl-dropdown-item>
+  </gl-dropdown>
 </template>
diff --git a/app/assets/javascripts/batch_comments/components/preview_item.vue b/app/assets/javascripts/batch_comments/components/preview_item.vue
index c89a6b537ef..dca6d90fbcb 100644
--- a/app/assets/javascripts/batch_comments/components/preview_item.vue
+++ b/app/assets/javascripts/batch_comments/components/preview_item.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapGetters } from 'vuex';
 import { GlSprintf, GlIcon } from '@gitlab/ui';
 import { IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants';
 import { sprintf, __ } from '~/locale';
@@ -78,7 +78,6 @@ export default {
     },
   },
   methods: {
-    ...mapActions('batchComments', ['scrollToDraft']),
     getLineClasses(lineNumber) {
       return getLineClasses(lineNumber);
     },
@@ -88,17 +87,7 @@ export default {
 </script>
 
 <template>
-  <button
-    type="button"
-    class="review-preview-item menu-item"
-    :class="[
-      componentClasses,
-      {
-        'is-last': isLast,
-      },
-    ]"
-    @click="scrollToDraft(draft)"
-  >
+  <span>
     <span class="review-preview-item-header">
       <gl-icon class="flex-shrink-0" :name="iconName" />
       <span
@@ -139,5 +128,5 @@ export default {
     >
       <gl-icon class="gl-mr-3" name="status_success" /> {{ resolvedStatusMessage }}
     </span>
-  </button>
+  </span>
 </template>
diff --git a/app/assets/javascripts/batch_comments/components/publish_button.vue b/app/assets/javascripts/batch_comments/components/publish_button.vue
index 0c79e185f06..ecced36771e 100644
--- a/app/assets/javascripts/batch_comments/components/publish_button.vue
+++ b/app/assets/javascripts/batch_comments/components/publish_button.vue
@@ -1,7 +1,6 @@
 <script>
 import { mapActions, mapState } from 'vuex';
 import { GlButton } from '@gitlab/ui';
-import { __ } from '~/locale';
 import DraftsCount from './drafts_count.vue';
 
 export default {
@@ -15,11 +14,6 @@ export default {
       required: false,
       default: false,
     },
-    label: {
-      type: String,
-      required: false,
-      default: __('Finish review'),
-    },
     category: {
       type: String,
       required: false,
@@ -30,22 +24,14 @@ export default {
       required: false,
       default: 'success',
     },
-    shouldPublish: {
-      type: Boolean,
-      required: true,
-    },
   },
   computed: {
     ...mapState('batchComments', ['isPublishing']),
   },
   methods: {
-    ...mapActions('batchComments', ['publishReview', 'toggleReviewDropdown']),
+    ...mapActions('batchComments', ['publishReview']),
     onClick() {
-      if (this.shouldPublish) {
-        this.publishReview();
-      } else {
-        this.toggleReviewDropdown();
-      }
+      this.publishReview();
     },
   },
 };
@@ -59,7 +45,7 @@ export default {
     :variant="variant"
     @click="onClick"
   >
-    {{ label }}
+    {{ __('Submit review') }}
     <drafts-count v-if="showCount" />
   </gl-button>
 </template>
diff --git a/app/assets/javascripts/batch_comments/components/review_bar.vue b/app/assets/javascripts/batch_comments/components/review_bar.vue
index e51888eabc1..035d6f4e0ab 100644
--- a/app/assets/javascripts/batch_comments/components/review_bar.vue
+++ b/app/assets/javascripts/batch_comments/components/review_bar.vue
@@ -1,22 +1,15 @@
 <script>
-/* eslint-disable vue/no-v-html */
-import { mapActions, mapState, mapGetters } from 'vuex';
-import { GlModal, GlModalDirective, GlButton } from '@gitlab/ui';
-import { sprintf, s__ } from '~/locale';
+import { mapActions, mapGetters } from 'vuex';
 import PreviewDropdown from './preview_dropdown.vue';
+import PublishButton from './publish_button.vue';
 
 export default {
   components: {
-    GlButton,
-    GlModal,
     PreviewDropdown,
-  },
-  directives: {
-    'gl-modal': GlModalDirective,
+    PublishButton,
   },
   computed: {
     ...mapGetters(['isNotesFetched']),
-    ...mapState('batchComments', ['isDiscarding']),
     ...mapGetters('batchComments', ['draftsCount']),
   },
   watch: {
@@ -27,45 +20,17 @@ export default {
     },
   },
   methods: {
-    ...mapActions('batchComments', ['discardReview', 'expandAllDiscussions']),
+    ...mapActions('batchComments', ['expandAllDiscussions']),
   },
-  modalId: 'discard-draft-review',
-  text: sprintf(
-    s__(
-      `BatchComments|You're about to discard your review which will delete all of your pending comments.
-      The deleted comments %{strong_start}cannot%{strong_end} be restored.`,
-    ),
-    {
-      strong_start: '<strong>',
-      strong_end: '</strong>',
-    },
-    false,
-  ),
 };
 </script>
 <template>
   <div v-show="draftsCount > 0">
     <nav class="review-bar-component">
-      <div class="review-bar-content qa-review-bar">
+      <div class="review-bar-content qa-review-bar d-flex gl-justify-content-end">
         <preview-dropdown />
-        <gl-button
-          v-gl-modal="$options.modalId"
-          :loading="isDiscarding"
-          class="qa-discard-review float-right"
-        >
-          {{ __('Discard review') }}
-        </gl-button>
+        <publish-button class="gl-ml-3" show-count />
       </div>
     </nav>
-    <gl-modal
-      :title="s__('BatchComments|Discard review?')"
-      :ok-title="s__('BatchComments|Delete all pending comments')"
-      :modal-id="$options.modalId"
-      title-tag="h4"
-      ok-variant="danger qa-modal-delete-pending-comments"
-      @ok="discardReview"
-    >
-      <p v-html="$options.text"></p>
-    </gl-modal>
   </div>
 </template>
diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
index d9b92113103..ebd821125fb 100644
--- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
+++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
@@ -75,15 +75,6 @@ export const updateDiscussionsAfterPublish = ({ dispatch, getters, rootGetters }
       }),
   );
 
-export const discardReview = ({ commit, getters }) => {
-  commit(types.REQUEST_DISCARD_REVIEW);
-
-  return service
-    .discard(getters.getNotesData.draftsDiscardPath)
-    .then(() => commit(types.RECEIVE_DISCARD_REVIEW_SUCCESS))
-    .catch(() => commit(types.RECEIVE_DISCARD_REVIEW_ERROR));
-};
-
 export const updateDraft = (
   { commit, getters },
   { note, noteText, resolveDiscussion, position, callback },
@@ -108,8 +99,6 @@ export const scrollToDraft = ({ dispatch, rootGetters }, draft) => {
   const draftID = `note_${draft.id}`;
   const el = document.querySelector(`#${tabEl} #${draftID}`);
 
-  dispatch('closeReviewDropdown');
-
   window.location.hash = draftID;
 
   if (window.mrTabs.currentAction !== tab) {
@@ -125,17 +114,6 @@ export const scrollToDraft = ({ dispatch, rootGetters }, draft) => {
   }
 };
 
-export const toggleReviewDropdown = ({ dispatch, state }) => {
-  if (state.showPreviewDropdown) {
-    dispatch('closeReviewDropdown');
-  } else {
-    dispatch('openReviewDropdown');
-  }
-};
-
-export const openReviewDropdown = ({ commit }) => commit(types.OPEN_REVIEW_DROPDOWN);
-export const closeReviewDropdown = ({ commit }) => commit(types.CLOSE_REVIEW_DROPDOWN);
-
 export const expandAllDiscussions = ({ dispatch, state }) =>
   state.drafts
     .filter(draft => draft.discussion_id)
diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js
index c8f0658c21c..df523a692d3 100644
--- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js
+++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js
@@ -11,13 +11,6 @@ export const REQUEST_PUBLISH_REVIEW = 'REQUEST_PUBLISH_REVIEW';
 export const RECEIVE_PUBLISH_REVIEW_SUCCESS = 'RECEIVE_PUBLISH_REVIEW_SUCCESS';
 export const RECEIVE_PUBLISH_REVIEW_ERROR = 'RECEIVE_PUBLISH_REVIEW_ERROR';
 
-export const REQUEST_DISCARD_REVIEW = 'REQUEST_DISCARD_REVIEW';
-export const RECEIVE_DISCARD_REVIEW_SUCCESS = 'RECEIVE_DISCARD_REVIEW_SUCCESS';
-export const RECEIVE_DISCARD_REVIEW_ERROR = 'RECEIVE_DISCARD_REVIEW_ERROR';
-
 export const RECEIVE_DRAFT_UPDATE_SUCCESS = 'RECEIVE_DRAFT_UPDATE_SUCCESS';
 
-export const OPEN_REVIEW_DROPDOWN = 'OPEN_REVIEW_DROPDOWN';
-export const CLOSE_REVIEW_DROPDOWN = 'CLOSE_REVIEW_DROPDOWN';
-
 export const TOGGLE_RESOLVE_DISCUSSION = 'TOGGLE_RESOLVE_DISCUSSION';
diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js
index 81ceef7b160..731f4b6d12a 100644
--- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js
+++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js
@@ -43,16 +43,6 @@ export default {
   [types.RECEIVE_PUBLISH_REVIEW_ERROR](state) {
     state.isPublishing = false;
   },
-  [types.REQUEST_DISCARD_REVIEW](state) {
-    state.isDiscarding = true;
-  },
-  [types.RECEIVE_DISCARD_REVIEW_SUCCESS](state) {
-    state.isDiscarding = false;
-    state.drafts = [];
-  },
-  [types.RECEIVE_DISCARD_REVIEW_ERROR](state) {
-    state.isDiscarding = false;
-  },
   [types.RECEIVE_DRAFT_UPDATE_SUCCESS](state, data) {
     const index = state.drafts.findIndex(draft => draft.id === data.id);
 
@@ -60,12 +50,6 @@ export default {
       state.drafts.splice(index, 1, processDraft(data));
     }
   },
-  [types.OPEN_REVIEW_DROPDOWN](state) {
-    state.showPreviewDropdown = true;
-  },
-  [types.CLOSE_REVIEW_DROPDOWN](state) {
-    state.showPreviewDropdown = false;
-  },
   [types.TOGGLE_RESOLVE_DISCUSSION](state, draftId) {
     state.drafts = state.drafts.map(draft => {
       if (draft.id === draftId) {
diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/state.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/state.js
index 80c710deab0..6b97fc242c8 100644
--- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/state.js
+++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/state.js
@@ -4,6 +4,4 @@ export default () => ({
   drafts: [],
   isPublishing: false,
   currentlyPublishingDrafts: [],
-  isDiscarding: false,
-  showPreviewDropdown: false,
 });
diff --git a/app/assets/javascripts/confirm_modal.js b/app/assets/javascripts/confirm_modal.js
index 4b4fdf03873..bf2ea3ce38a 100644
--- a/app/assets/javascripts/confirm_modal.js
+++ b/app/assets/javascripts/confirm_modal.js
@@ -1,14 +1,16 @@
 import Vue from 'vue';
 import ConfirmModal from '~/vue_shared/components/confirm_modal.vue';
 
-const mountConfirmModal = () => {
-  return new Vue({
+const mountConfirmModal = optionalProps =>
+  new Vue({
     render(h) {
       return h(ConfirmModal, {
-        props: { selector: '.js-confirm-modal-button' },
+        props: {
+          selector: '.js-confirm-modal-button',
+          ...optionalProps,
+        },
       });
     },
   }).$mount();
-};
 
-export default () => mountConfirmModal();
+export default (optionalProps = {}) => mountConfirmModal(optionalProps);
diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue
index 5487e25066e..2e92a608f76 100644
--- a/app/assets/javascripts/groups/components/item_actions.vue
+++ b/app/assets/javascripts/groups/components/item_actions.vue
@@ -53,6 +53,7 @@ export default {
       :aria-label="leaveBtnTitle"
       data-container="body"
       data-placement="bottom"
+      data-testid="leave-group-btn"
       class="leave-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5"
       @click.prevent="onLeaveGroup"
     >
@@ -66,6 +67,7 @@ export default {
       :aria-label="editBtnTitle"
       data-container="body"
       data-placement="bottom"
+      data-testid="edit-group-btn"
       class="edit-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5"
     >
       <gl-icon name="settings" class="position-top-0 align-middle" />
diff --git a/app/assets/javascripts/groups/components/item_stats_value.vue b/app/assets/javascripts/groups/components/item_stats_value.vue
index 18efd8c6823..2185284c892 100644
--- a/app/assets/javascripts/groups/components/item_stats_value.vue
+++ b/app/assets/javascripts/groups/components/item_stats_value.vue
@@ -57,6 +57,7 @@ export default {
     :title="title"
     data-container="body"
   >
-    <gl-icon :name="iconName" /> <span v-if="isValuePresent" class="stat-value"> {{ value }} </span>
+    <gl-icon :name="iconName" />
+    <span v-if="isValuePresent" class="stat-value" data-testid="itemStatValue"> {{ value }} </span>
   </span>
 </template>
diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue
index e1b308c6f57..8a1a8448bb8 100644
--- a/app/assets/javascripts/issue_show/components/fields/description_template.vue
+++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue
@@ -1,5 +1,4 @@
 <script>
-/* eslint-disable @gitlab/vue-require-i18n-strings */
 import $ from 'jquery';
 import { GlIcon } from '@gitlab/ui';
 import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors';
@@ -62,11 +61,15 @@ export default {
       data-toggle="dropdown"
     >
       <span class="dropdown-toggle-text">{{ __('Choose a template') }}</span>
-      <i aria-hidden="true" class="fa fa-chevron-down"> </i>
+      <gl-icon
+        name="chevron-down"
+        class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
+        aria-hidden="true"
+      />
     </button>
     <div class="dropdown-menu dropdown-select">
       <div class="dropdown-title gl-display-flex gl-justify-content-center">
-        <span class="gl-ml-auto">Choose a template</span>
+        <span class="gl-ml-auto">{{ __('Choose a template') }}</span>
         <button
           class="dropdown-title-button dropdown-menu-close gl-ml-auto"
           :aria-label="__('Close')"
@@ -82,7 +85,7 @@ export default {
           :placeholder="__('Filter')"
           autocomplete="off"
         />
-        <i aria-hidden="true" class="fa fa-search dropdown-input-search"> </i>
+        <gl-icon name="search" class="dropdown-input-search" aria-hidden="true" />
         <gl-icon
           name="close"
           class="dropdown-input-clear js-dropdown-input-clear"
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
index ee00cb85fa4..7f6b212b5fc 100644
--- a/app/assets/javascripts/lib/utils/url_utility.js
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -255,6 +255,15 @@ export function getBaseURL() {
   return `${protocol}//${host}`;
 }
 
+/**
+ * Takes a URL and returns content from the start until the final '/'
+ *
+ * @param {String} url - full url, including protocol and host
+ */
+export function stripFinalUrlSegment(url) {
+  return new URL('.', url).href;
+}
+
 /**
  * Returns true if url is an absolute URL
  *
diff --git a/app/assets/javascripts/pages/projects/tags/index/index.js b/app/assets/javascripts/pages/projects/tags/index/index.js
new file mode 100644
index 00000000000..ec56fa3e075
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/tags/index/index.js
@@ -0,0 +1,12 @@
+import { initRemoveTag } from '../remove_tag';
+
+document.addEventListener('DOMContentLoaded', () => {
+  initRemoveTag({
+    onDelete: path => {
+      document
+        .querySelector(`[data-path="${path}"]`)
+        .closest('.js-tag-list')
+        .remove();
+    },
+  });
+});
diff --git a/app/assets/javascripts/pages/projects/tags/remove_tag.js b/app/assets/javascripts/pages/projects/tags/remove_tag.js
new file mode 100644
index 00000000000..7e83dbe0565
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/tags/remove_tag.js
@@ -0,0 +1,16 @@
+import createFlash from '~/flash';
+import axios from '~/lib/utils/axios_utils';
+import initConfirmModal from '~/confirm_modal';
+
+export const initRemoveTag = ({ onDelete = () => {} }) => {
+  return initConfirmModal({
+    handleSubmit: (path = '') =>
+      axios
+        .delete(path)
+        .then(() => onDelete(path))
+        .catch(({ response: { data } }) => {
+          const { message } = data;
+          createFlash({ message });
+        }),
+  });
+};
diff --git a/app/assets/javascripts/pages/projects/tags/show/index.js b/app/assets/javascripts/pages/projects/tags/show/index.js
new file mode 100644
index 00000000000..651cc05ca4f
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/tags/show/index.js
@@ -0,0 +1,10 @@
+import { redirectTo, getBaseURL, stripFinalUrlSegment } from '~/lib/utils/url_utility';
+import { initRemoveTag } from '../remove_tag';
+
+document.addEventListener('DOMContentLoaded', () => {
+  initRemoveTag({
+    onDelete: (path = '') => {
+      redirectTo(stripFinalUrlSegment([getBaseURL(), path].join('')));
+    },
+  });
+});
diff --git a/app/assets/javascripts/registry/explorer/components/details_page/partial_cleanup_alert.vue b/app/assets/javascripts/registry/explorer/components/details_page/partial_cleanup_alert.vue
new file mode 100644
index 00000000000..d13d815a59e
--- /dev/null
+++ b/app/assets/javascripts/registry/explorer/components/details_page/partial_cleanup_alert.vue
@@ -0,0 +1,38 @@
+<script>
+import { GlSprintf, GlAlert, GlLink } from '@gitlab/ui';
+
+import { DELETE_ALERT_TITLE, DELETE_ALERT_LINK_TEXT } from '../../constants/index';
+
+export default {
+  components: {
+    GlSprintf,
+    GlAlert,
+    GlLink,
+  },
+  props: {
+    runCleanupPoliciesHelpPagePath: { type: String, required: false, default: '' },
+    cleanupPoliciesHelpPagePath: { type: String, required: false, default: '' },
+  },
+  i18n: {
+    DELETE_ALERT_TITLE,
+    DELETE_ALERT_LINK_TEXT,
+  },
+};
+</script>
+
+<template>
+  <gl-alert variant="warning" :title="$options.i18n.DELETE_ALERT_TITLE" @dismiss="$emit('dismiss')">
+    <gl-sprintf :message="$options.i18n.DELETE_ALERT_LINK_TEXT">
+      <template #adminLink="{content}">
+        <gl-link data-testid="run-link" :href="runCleanupPoliciesHelpPagePath" target="_blank">{{
+          content
+        }}</gl-link>
+      </template>
+      <template #docLink="{content}">
+        <gl-link data-testid="help-link" :href="cleanupPoliciesHelpPagePath" target="_blank">{{
+          content
+        }}</gl-link>
+      </template>
+    </gl-sprintf>
+  </gl-alert>
+</template>
diff --git a/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue
index 32bf27f1143..76cc57853c7 100644
--- a/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue
+++ b/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue
@@ -42,6 +42,7 @@ export default {
         name: this.item.path,
         tags_path: this.item.tags_path,
         id: this.item.id,
+        cleanup_policy_started_at: this.item.cleanup_policy_started_at,
       });
       return window.btoa(params);
     },
diff --git a/app/assets/javascripts/registry/explorer/constants/expiration_policies.js b/app/assets/javascripts/registry/explorer/constants/expiration_policies.js
index 8af25ca6ecc..5f73834d995 100644
--- a/app/assets/javascripts/registry/explorer/constants/expiration_policies.js
+++ b/app/assets/javascripts/registry/explorer/constants/expiration_policies.js
@@ -9,3 +9,7 @@ export const EXPIRATION_POLICY_DISABLED_TEXT = s__(
 export const EXPIRATION_POLICY_DISABLED_MESSAGE = s__(
   'ContainerRegistry|Expiration policies help manage the storage space used by the Container Registry, but the expiration policies for this registry are disabled. Contact your administrator to enable. %{docLinkStart}More information%{docLinkEnd}',
 );
+export const DELETE_ALERT_TITLE = s__('ContainerRegistry|Some tags were not deleted');
+export const DELETE_ALERT_LINK_TEXT = s__(
+  'ContainerRegistry|The cleanup policy timed out before it could delete all tags. An administrator can %{adminLinkStart}manually run cleanup now%{adminLinkEnd} or you can wait for the cleanup policy to automatically run again. %{docLinkStart}More information%{docLinkEnd}',
+);
diff --git a/app/assets/javascripts/registry/explorer/pages/details.vue b/app/assets/javascripts/registry/explorer/pages/details.vue
index b697bca6259..d2fb695dbfa 100644
--- a/app/assets/javascripts/registry/explorer/pages/details.vue
+++ b/app/assets/javascripts/registry/explorer/pages/details.vue
@@ -4,6 +4,7 @@ import { GlPagination, GlResizeObserverDirective } from '@gitlab/ui';
 import { GlBreakpointInstance } from '@gitlab/ui/dist/utils';
 import Tracking from '~/tracking';
 import DeleteAlert from '../components/details_page/delete_alert.vue';
+import PartialCleanupAlert from '../components/details_page/partial_cleanup_alert.vue';
 import DeleteModal from '../components/details_page/delete_modal.vue';
 import DetailsHeader from '../components/details_page/details_header.vue';
 import TagsList from '../components/details_page/tags_list.vue';
@@ -21,6 +22,7 @@ import {
 export default {
   components: {
     DeleteAlert,
+    PartialCleanupAlert,
     DetailsHeader,
     GlPagination,
     DeleteModal,
@@ -37,13 +39,16 @@ export default {
       itemsToBeDeleted: [],
       isDesktop: true,
       deleteAlertType: null,
+      dismissPartialCleanupWarning: false,
     };
   },
   computed: {
     ...mapState(['tagsPagination', 'isLoading', 'config', 'tags']),
-    imageName() {
-      const { name } = decodeAndParse(this.$route.params.id);
-      return name;
+    queryParameters() {
+      return decodeAndParse(this.$route.params.id);
+    },
+    showPartialCleanupWarning() {
+      return this.queryParameters.cleanup_policy_started_at && !this.dismissPartialCleanupWarning;
     },
     tracking() {
       return {
@@ -120,7 +125,14 @@ export default {
       class="gl-my-2"
     />
 
-    <details-header :image-name="imageName" />
+    <partial-cleanup-alert
+      v-if="showPartialCleanupWarning"
+      :run-cleanup-policies-help-page-path="config.runCleanupPoliciesHelpPagePath"
+      :cleanup-policies-help-page-path="config.cleanupPoliciesHelpPagePath"
+      @dismiss="dismissPartialCleanupWarning = true"
+    />
+
+    <details-header :image-name="queryParameters.name" />
 
     <tags-loader v-if="isLoading" />
     <template v-else>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
index 83783528cc1..6489569cf68 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
@@ -1,13 +1,12 @@
 <script>
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
 import { sprintf, s__ } from '~/locale';
-import tooltip from '~/vue_shared/directives/tooltip';
 import statusIcon from '../mr_widget_status_icon.vue';
 
 export default {
   name: 'MRWidgetMissingBranch',
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
   components: {
     GlIcon,
@@ -52,7 +51,7 @@ export default {
       <span class="bold js-branch-text">
         <span class="capitalize"> {{ missingBranchName }} </span>
         {{ s__('mrWidget|branch does not exist.') }} {{ missingBranchNameMessage }}
-        <gl-icon v-tooltip :title="message" :aria-label="message" name="question-o" />
+        <gl-icon v-gl-tooltip :title="message" :aria-label="message" name="question-o" />
       </span>
     </div>
   </div>
diff --git a/app/assets/javascripts/vue_shared/components/confirm_modal.vue b/app/assets/javascripts/vue_shared/components/confirm_modal.vue
index e7f6cc1abc0..a42a606d446 100644
--- a/app/assets/javascripts/vue_shared/components/confirm_modal.vue
+++ b/app/assets/javascripts/vue_shared/components/confirm_modal.vue
@@ -12,6 +12,11 @@ export default {
       type: String,
       required: true,
     },
+    handleSubmit: {
+      type: Function,
+      required: false,
+      default: null,
+    },
   },
   data() {
     return {
@@ -41,7 +46,11 @@ export default {
       this.$refs.modal.hide();
     },
     submitModal() {
-      this.$refs.form.submit();
+      if (this.handleSubmit) {
+        this.handleSubmit(this.path);
+      } else {
+        this.$refs.form.submit();
+      }
     },
   },
   csrf,
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 774ba5d9964..d550a1faa18 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -3,7 +3,6 @@
   color: $gl-text-color;
   border: 1px solid $border-color;
   border-radius: $border-radius-default;
-  margin-bottom: $gl-padding-8;
 
   .card.card-body-segment {
     padding: $gl-padding;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 1d7b536f012..05ade210153 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -778,7 +778,7 @@
     }
 
     .btn {
-      margin-top: $gl-padding-8;
+      margin-bottom: $gl-padding-8;
       padding: $gl-btn-vert-padding $gl-btn-padding;
       line-height: $gl-btn-line-height;
 
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index b2d98d243f9..bdd9d00ca7f 100644
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -15,12 +15,14 @@ module ApplicationCable
     private
 
     def find_user_from_session_store
-      session = ActiveSession.sessions_from_ids([session_id.private_id]).first
+      session = ActiveSession.sessions_from_ids(Array.wrap(session_id)).first
       Warden::SessionSerializer.new('rack.session' => session).fetch(:user)
     end
 
     def session_id
-      Rack::Session::SessionId.new(cookies[Gitlab::Application.config.session_options[:key]])
+      session_cookie = cookies[Gitlab::Application.config.session_options[:key]]
+
+      Rack::Session::SessionId.new(session_cookie).private_id if session_cookie.present?
     end
 
     def notification_payload(_)
diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb
index a18c80b996e..f5a9b9b61db 100644
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@@ -21,6 +21,8 @@ module Boards
     before_action :validate_id_list, only: [:bulk_move]
     before_action :can_move_issues?, only: [:bulk_move]
 
+    feature_category :boards
+
     def index
       list_service = Boards::Issues::ListService.new(board_parent, current_user, filter_params)
       issues = issues_from(list_service)
diff --git a/app/controllers/boards/lists_controller.rb b/app/controllers/boards/lists_controller.rb
index 4eb436e4ce7..aecd287370f 100644
--- a/app/controllers/boards/lists_controller.rb
+++ b/app/controllers/boards/lists_controller.rb
@@ -8,6 +8,8 @@ module Boards
     before_action :authorize_read_list, only: [:index]
     skip_before_action :authenticate_user!, only: [:index]
 
+    feature_category :boards
+
     def index
       lists = Boards::Lists::ListService.new(board.resource_parent, current_user).execute(board)
 
diff --git a/app/controllers/concerns/controller_with_feature_category.rb b/app/controllers/concerns/controller_with_feature_category.rb
index f8985cf0950..c1ff9ef2e69 100644
--- a/app/controllers/concerns/controller_with_feature_category.rb
+++ b/app/controllers/concerns/controller_with_feature_category.rb
@@ -5,35 +5,38 @@ module ControllerWithFeatureCategory
   include Gitlab::ClassAttributes
 
   class_methods do
-    def feature_category(category, config = {})
-      validate_config!(config)
+    def feature_category(category, actions = [])
+      feature_category_configuration[category] ||= []
+      feature_category_configuration[category] += actions.map(&:to_s)
 
-      category_config = Config.new(category, config[:only], config[:except], config[:if], config[:unless])
-      # Add the config to the beginning. That way, the last defined one takes precedence.
-      feature_category_configuration.unshift(category_config)
+      validate_config!(feature_category_configuration)
     end
 
     def feature_category_for_action(action)
-      category_config = feature_category_configuration.find { |config| config.matches?(action) }
+      category_config = feature_category_configuration.find do |_, actions|
+        actions.empty? || actions.include?(action)
+      end
 
-      category_config&.category || superclass_feature_category_for_action(action)
+      category_config&.first || superclass_feature_category_for_action(action)
     end
 
     private
 
     def validate_config!(config)
-      invalid_keys = config.keys - [:only, :except, :if, :unless]
-      if invalid_keys.any?
-        raise ArgumentError, "unknown arguments: #{invalid_keys} "
+      empty = config.find { |_, actions| actions.empty? }
+      duplicate_actions = config.values.flatten.group_by(&:itself).select { |_, v| v.count > 1 }.keys
+
+      if config.length > 1 && empty
+        raise ArgumentError, "#{empty.first} is defined for all actions, but other categories are set"
       end
 
-      if config.key?(:only) && config.key?(:except)
-        raise ArgumentError, "cannot configure both `only` and `except`"
+      if duplicate_actions.any?
+        raise ArgumentError, "Actions have multiple feature categories: #{duplicate_actions.join(', ')}"
       end
     end
 
     def feature_category_configuration
-      class_attributes[:feature_category_config] ||= []
+      class_attributes[:feature_category_config] ||= {}
     end
 
     def superclass_feature_category_for_action(action)
diff --git a/app/controllers/concerns/controller_with_feature_category/config.rb b/app/controllers/concerns/controller_with_feature_category/config.rb
deleted file mode 100644
index 624691ee4f6..00000000000
--- a/app/controllers/concerns/controller_with_feature_category/config.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module ControllerWithFeatureCategory
-  class Config
-    attr_reader :category
-
-    def initialize(category, only, except, if_proc, unless_proc)
-      @category = category.to_sym
-      @only, @except = only&.map(&:to_s), except&.map(&:to_s)
-      @if_proc, @unless_proc = if_proc, unless_proc
-    end
-
-    def matches?(action)
-      included?(action) && !excluded?(action) &&
-        if_proc?(action) && !unless_proc?(action)
-    end
-
-    private
-
-    attr_reader :only, :except, :if_proc, :unless_proc
-
-    def if_proc?(action)
-      if_proc.nil? || if_proc.call(action)
-    end
-
-    def unless_proc?(action)
-      unless_proc.present? && unless_proc.call(action)
-    end
-
-    def included?(action)
-      only.nil? || only.include?(action)
-    end
-
-    def excluded?(action)
-      except.present? && except.include?(action)
-    end
-  end
-end
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index a27c4027380..c42c9827eaf 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -3,6 +3,8 @@
 class ConfirmationsController < Devise::ConfirmationsController
   include AcceptsPendingInvitations
 
+  feature_category :users
+
   def almost_there
     flash[:notice] = nil
     render layout: "devise_empty"
diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb
index f82cde8e10a..23ffcd50369 100644
--- a/app/controllers/dashboard/groups_controller.rb
+++ b/app/controllers/dashboard/groups_controller.rb
@@ -5,6 +5,8 @@ class Dashboard::GroupsController < Dashboard::ApplicationController
 
   skip_cross_project_access_check :index
 
+  feature_category :subgroups
+
   def index
     groups = GroupsFinder.new(current_user, all_available: false).execute
     render_group_tree(groups)
diff --git a/app/controllers/dashboard/labels_controller.rb b/app/controllers/dashboard/labels_controller.rb
index 89d87c2d5c8..e3773f65744 100644
--- a/app/controllers/dashboard/labels_controller.rb
+++ b/app/controllers/dashboard/labels_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Dashboard::LabelsController < Dashboard::ApplicationController
+  feature_category :issue_tracking
+
   def index
     respond_to do |format|
       format.json { render json: LabelSerializer.new.represent_appearance(labels) }
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 14f9a026688..e17b16c26a2 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -4,6 +4,8 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   before_action :projects
   before_action :groups, only: :index
 
+  feature_category :issue_tracking
+
   def index
     respond_to do |format|
       format.html do
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 2bd6fd85381..f7a74f40e4b 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -14,6 +14,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   before_action :projects, only: [:index]
   skip_cross_project_access_check :index, :starred
 
+  feature_category :projects
+
   def index
     respond_to do |format|
       format.html do
diff --git a/app/controllers/dashboard/snippets_controller.rb b/app/controllers/dashboard/snippets_controller.rb
index a8ca3dbd0e7..6fe3d878639 100644
--- a/app/controllers/dashboard/snippets_controller.rb
+++ b/app/controllers/dashboard/snippets_controller.rb
@@ -7,6 +7,8 @@ class Dashboard::SnippetsController < Dashboard::ApplicationController
 
   skip_cross_project_access_check :index
 
+  feature_category :snippets
+
   def index
     @snippet_counts = Snippets::CountService
       .new(current_user, author: current_user)
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index 4fc2f7b0571..0ae326b5d94 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -9,6 +9,8 @@ class Dashboard::TodosController < Dashboard::ApplicationController
   before_action :authorize_read_group!, only: :index
   before_action :find_todos, only: [:index, :destroy_all]
 
+  feature_category :issue_tracking
+
   def index
     @sort = params[:sort]
     @todos = @todos.page(params[:page])
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 07cc31fb7d3..a88cf64d842 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -15,6 +15,10 @@ class DashboardController < Dashboard::ApplicationController
 
   respond_to :html
 
+  feature_category :audit_events, [:activity]
+  feature_category :issue_tracking, [:issues, :issues_calendar]
+  feature_category :code_review, [:merge_requests]
+
   def activity
     respond_to do |format|
       format.html
diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb
index 67db797b80a..aa4196b1c18 100644
--- a/app/controllers/explore/groups_controller.rb
+++ b/app/controllers/explore/groups_controller.rb
@@ -3,6 +3,8 @@
 class Explore::GroupsController < Explore::ApplicationController
   include GroupTree
 
+  feature_category :subgroups
+
   def index
     render_group_tree GroupsFinder.new(current_user).execute
   end
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index b3fa089a712..42795e418a4 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -18,6 +18,8 @@ class Explore::ProjectsController < Explore::ApplicationController
 
   rescue_from PageOutOfBoundsError, with: :page_out_of_bounds
 
+  feature_category :projects
+
   def index
     @projects = load_projects
 
diff --git a/app/controllers/explore/snippets_controller.rb b/app/controllers/explore/snippets_controller.rb
index 3a56a48e578..91ab18f2f55 100644
--- a/app/controllers/explore/snippets_controller.rb
+++ b/app/controllers/explore/snippets_controller.rb
@@ -3,6 +3,8 @@
 class Explore::SnippetsController < Explore::ApplicationController
   include Gitlab::NoteableMetadata
 
+  feature_category :snippets
+
   def index
     @snippets = SnippetsFinder.new(current_user, explore: true)
       .execute
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 44b053b0ee3..8ca70602c89 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -50,12 +50,17 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
   after_action :log_merge_request_show, only: [:show]
 
-  feature_category :source_code_management,
-                   unless: -> (action) { action.ends_with?("_reports") }
-  feature_category :code_testing,
-                   only: [:test_reports, :coverage_reports, :terraform_reports]
-  feature_category :accessibility_testing,
-                   only: [:accessibility_reports]
+  feature_category :code_review, [
+                     :assign_related_issues, :bulk_update, :cancel_auto_merge,
+                     :ci_environments_status, :commit_change_content, :commits,
+                     :context_commits, :destroy, :diff_for_path, :discussions,
+                     :edit, :exposed_artifacts, :index, :merge,
+                     :pipeline_status, :pipelines, :rebase, :remove_wip, :show,
+                     :toggle_award_emoji, :toggle_subscription, :update
+                   ]
+
+  feature_category :code_testing, [:test_reports, :coverage_reports, :terraform_reports]
+  feature_category :accessibility_testing, [:accessibility_reports]
 
   def index
     @merge_requests = @issuables
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 475ca8894e4..71effebf1c0 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -76,25 +76,10 @@ class Projects::TagsController < Projects::ApplicationController
   def destroy
     result = ::Tags::DestroyService.new(project, current_user).execute(params[:id])
 
-    respond_to do |format|
-      if result[:status] == :success
-        format.html do
-          redirect_to project_tags_path(@project), status: :see_other
-        end
-
-        format.js
-      else
-        @error = result[:message]
-
-        format.html do
-          redirect_to project_tags_path(@project),
-            alert: @error, status: :see_other
-        end
-
-        format.js do
-          render status: :ok
-        end
-      end
+    if result[:status] == :success
+      render json: result
+    else
+      render json: { message: result[:message] }, status: result[:return_code]
     end
   end
 
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 585d13279dd..804ba9090c2 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -167,7 +167,7 @@ module ApplicationSettingsHelper
   end
 
   def visible_attributes
-    [
+    attributes = [
       :abuse_notification_email,
       :after_sign_out_path,
       :after_sign_up_text,
@@ -331,6 +331,9 @@ module ApplicationSettingsHelper
       :wiki_page_max_content_bytes,
       :container_registry_delete_tags_service_timeout
     ]
+
+    attributes << :require_admin_approval_after_user_signup if Feature.enabled?(:admin_approval_for_new_user_signups)
+    attributes
   end
 
   def external_authorization_service_attributes
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 4984b51555d..bfc8803f514 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -38,4 +38,13 @@ module TagsHelper
 
     text.html_safe
   end
+
+  def delete_tag_modal_attributes(tag_name)
+    {
+      title: s_('TagsPage|Delete tag'),
+      message: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag_name },
+      okVariant: 'danger',
+      okTitle: s_('TagsPage|Delete tag')
+    }.to_json
+  end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index ad2a6981b71..621b1a83b82 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -56,6 +56,7 @@ class Issue < ApplicationRecord
     dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
 
   has_many :issue_assignees
+  has_many :issue_email_participants
   has_many :assignees, class_name: "User", through: :issue_assignees
   has_many :zoom_meetings
   has_many :user_mentions, class_name: "IssueUserMention", dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
diff --git a/app/models/issue_email_participant.rb b/app/models/issue_email_participant.rb
new file mode 100644
index 00000000000..8eb9b6a8152
--- /dev/null
+++ b/app/models/issue_email_participant.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class IssueEmailParticipant < ApplicationRecord
+  belongs_to :issue
+
+  validates :email, presence: true, uniqueness: { scope: [:issue_id] }
+  validates :issue, presence: true
+  validate :validate_email_format
+
+  def validate_email_format
+    self.errors.add(:email, I18n.t(:invalid, scope: 'valid_email.validations.email')) unless ValidateEmail.valid?(self.email)
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index d726b9aece6..d45bec70727 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -199,6 +199,7 @@ class Project < ApplicationRecord
   has_one :import_export_upload, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :export_jobs, class_name: 'ProjectExportJob'
   has_one :project_repository, inverse_of: :project
+  has_one :tracing_setting, class_name: 'ProjectTracingSetting'
   has_one :incident_management_setting, inverse_of: :project, class_name: 'IncidentManagement::ProjectIncidentManagementSetting'
   has_one :error_tracking_setting, inverse_of: :project, class_name: 'ErrorTracking::ProjectErrorTrackingSetting'
   has_one :metrics_setting, inverse_of: :project, class_name: 'ProjectMetricsSetting'
@@ -564,6 +565,7 @@ class Project < ApplicationRecord
   }
 
   scope :imported_from, -> (type) { where(import_type: type) }
+  scope :with_tracing_enabled, -> { joins(:tracing_setting) }
 
   enum auto_cancel_pending_pipelines: { disabled: 0, enabled: 1 }
 
@@ -2523,6 +2525,10 @@ class Project < ApplicationRecord
     instance.token
   end
 
+  def tracing_external_url
+    tracing_setting&.external_url
+  end
+
   private
 
   def find_service(services, name)
diff --git a/app/models/project_tracing_setting.rb b/app/models/project_tracing_setting.rb
new file mode 100644
index 00000000000..93fa80aed67
--- /dev/null
+++ b/app/models/project_tracing_setting.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ProjectTracingSetting < ApplicationRecord
+  belongs_to :project
+
+  validates :external_url, length: { maximum: 255 }, public_url: true
+
+  before_validation :sanitize_external_url
+
+  private
+
+  def sanitize_external_url
+    self.external_url = Rails::Html::FullSanitizer.new.sanitize(self.external_url)
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 639d370f4b9..5bbdb2b2e9a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -64,11 +64,6 @@ class User < ApplicationRecord
   # and should be added after Devise modules are initialized.
   include AsyncDeviseEmail
 
-  BLOCKED_MESSAGE = "Your account has been blocked. Please contact your GitLab " \
-                    "administrator if you think this is an error."
-  LOGIN_FORBIDDEN = "Your account does not have the required permission to login. Please contact your GitLab " \
-                    "administrator if you think this is an error."
-
   MINIMUM_INACTIVE_DAYS = 90
 
   # Override Devise::Models::Trackable#update_tracked_fields!
@@ -381,11 +376,12 @@ class User < ApplicationRecord
     super && can?(:log_in)
   end
 
+  # The messages for these keys are defined in `devise.en.yml`
   def inactive_message
     if blocked?
-      BLOCKED_MESSAGE
+      :blocked
     elsif internal?
-      LOGIN_FORBIDDEN
+      :forbidden
     else
       super
     end
diff --git a/app/policies/releases/evidence_policy.rb b/app/policies/releases/evidence_policy.rb
index 701913e6fe4..3e35f2f5e87 100644
--- a/app/policies/releases/evidence_policy.rb
+++ b/app/policies/releases/evidence_policy.rb
@@ -15,6 +15,7 @@ module Releases
     # - Project
     # - Milestones
     # - Issues
+    # TODO: remove issues from this check: https://gitlab.com/gitlab-org/gitlab/-/issues/259674
     condition(:allowed_to_read_evidence) do
       can?(:read_release) &&
         can?(:download_code) &&
diff --git a/app/serializers/container_repository_entity.rb b/app/serializers/container_repository_entity.rb
index 4c87d1438b0..9a002971bef 100644
--- a/app/serializers/container_repository_entity.rb
+++ b/app/serializers/container_repository_entity.rb
@@ -4,6 +4,7 @@ class ContainerRepositoryEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :id, :name, :path, :location, :created_at, :status, :tags_count
+  expose :expiration_policy_started_at, as: :cleanup_policy_started_at
 
   expose :tags_path do |repository|
     project_registry_repository_tags_path(project, repository, format: :json)
diff --git a/app/services/ci/update_build_state_service.rb b/app/services/ci/update_build_state_service.rb
index 50d7f1136f2..cc8e2060888 100644
--- a/app/services/ci/update_build_state_service.rb
+++ b/app/services/ci/update_build_state_service.rb
@@ -70,7 +70,9 @@ module Ci
     end
 
     def validate_build_trace!
-      if chunks_persisted?
+      return unless has_chunks?
+
+      unless live_chunks_pending?
         metrics.increment_trace_operation(operation: :finalized)
       end
 
@@ -110,8 +112,8 @@ module Ci
       build.trace_chunks.live.any?
     end
 
-    def chunks_persisted?
-      build.trace_chunks.any? && !live_chunks_pending?
+    def has_chunks?
+      build.trace_chunks.any?
     end
 
     def pending_state_outdated?
diff --git a/app/services/design_management/copy_design_collection/copy_service.rb b/app/services/design_management/copy_design_collection/copy_service.rb
index c7e2f955383..68f69a9c8db 100644
--- a/app/services/design_management/copy_design_collection/copy_service.rb
+++ b/app/services/design_management/copy_design_collection/copy_service.rb
@@ -246,7 +246,7 @@ module DesignManagement
         new_designs = DesignManagement::Design.unscoped.find(design_ids)
 
         # Execute another query to filter only designs with notes
-        DesignManagement::Design.unscoped.where(id: designs).joins(:notes).find_each(batch_size: 100) do |old_design|
+        DesignManagement::Design.unscoped.where(id: designs).joins(:notes).distinct.find_each(batch_size: 100) do |old_design|
           new_design = new_designs.find { |d| d.filename == old_design.filename }
 
           Notes::CopyService.new(current_user, old_design, new_design).execute
diff --git a/app/services/system_notes/incident_service.rb b/app/services/system_notes/incident_service.rb
index c3596bd58c2..4628662f0e9 100644
--- a/app/services/system_notes/incident_service.rb
+++ b/app/services/system_notes/incident_service.rb
@@ -10,8 +10,6 @@ module SystemNotes
     #
     # Returns the created Note object
     def change_incident_severity
-      return unless Feature.enabled?(:add_severity_system_note, noteable.project)
-
       severity = noteable.severity
 
       if severity_label = IssuableSeverity::SEVERITY_LABELS[severity.to_sym]
diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml
index 2e0ac69257a..adc585125a6 100644
--- a/app/views/admin/application_settings/_signup.html.haml
+++ b/app/views/admin/application_settings/_signup.html.haml
@@ -9,6 +9,14 @@
           Sign-up enabled
           .form-text.text-muted
             = _("When enabled, any user visiting %{host} will be able to create an account.") % { host: "#{new_user_session_url(host: Gitlab.config.gitlab.host)}" }
+    - if Feature.enabled?(:admin_approval_for_new_user_signups)
+      .form-group
+        .form-check
+          = f.check_box :require_admin_approval_after_user_signup, class: 'form-check-input'
+          = f.label :require_admin_approval_after_user_signup, class: 'form-check-label' do
+            = _('Require admin approval for new sign-ups')
+            .form-text.text-muted
+              = _("When enabled, any user visiting %{host} and creating an account will have to be explicitly approved by the admin before they can login. This setting is effective only if sign-ups are enabled.") % { host: "#{new_user_session_url(host: Gitlab.config.gitlab.host)}" }
     .form-group
       .form-check
         = f.check_box :send_user_confirmation_email, class: 'form-check-input'
diff --git a/app/views/groups/registry/repositories/index.html.haml b/app/views/groups/registry/repositories/index.html.haml
index 2cac8e653e5..21882c3e3ce 100644
--- a/app/views/groups/registry/repositories/index.html.haml
+++ b/app/views/groups/registry/repositories/index.html.haml
@@ -12,6 +12,8 @@
         "containers_error_image" => image_path('illustrations/docker-error-state.svg'),
         "registry_host_url_with_port" => escape_once(registry_config.host_port),
         "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
+        "run_cleanup_policies_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'run-the-cleanup-policy-now'),
+        "cleanup_policies_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'how-the-cleanup-policy-works'),
         "is_admin": current_user&.admin.to_s,
         is_group_page: "true",
         character_error: @character_error.to_s } }
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index d6a4ac09915..3e21928e306 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -64,12 +64,12 @@
         - else
           = _('Register Universal Two-Factor (U2F) Device')
       %p
-        = _('Use a hardware device to add the second factor of authentication.')
+        = _('Set up a hardware device as a second factor to sign in.')
       %p
         - if webauthn_enabled
-          = _("As WebAuthn devices are only supported by a few browsers, we require that you set up a two-factor authentication app before a WebAuthn device. That way you'll always be able to log in - even when you're using an unsupported browser.")
+          = _("Not all browsers support WebAuthn. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even from an unsupported browser.")
         - else
-          = _("As U2F devices are only supported by a few browsers, we require that you set up a two-factor authentication app before a U2F device. That way you'll always be able to log in - even when you're using an unsupported browser.")
+          = _("Not all browsers support U2F devices. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even when you're using an unsupported browser.")
     .col-lg-8
       - registration = webauthn_enabled ? @webauthn_registration : @u2f_registration
       - if registration.errors.present?
diff --git a/app/views/projects/buttons/_remove_tag.html.haml b/app/views/projects/buttons/_remove_tag.html.haml
new file mode 100644
index 00000000000..bc378b847be
--- /dev/null
+++ b/app/views/projects/buttons/_remove_tag.html.haml
@@ -0,0 +1,6 @@
+- project = local_assigns.fetch(:project, nil)
+- tag = local_assigns.fetch(:tag, nil)
+- return unless project && tag
+
+%button{ type: "button", class: "js-remove-tag js-confirm-modal-button gl-button btn btn-remove remove-row has-tooltip gl-ml-3 #{protected_tag?(project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), data: { container: 'body', path: project_tag_path(@project, tag.name), modal_attributes: delete_tag_modal_attributes(tag.name) } }
+  = sprite_icon("remove")
diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml
index 8540ce30060..9ac1fda169f 100644
--- a/app/views/projects/registry/repositories/index.html.haml
+++ b/app/views/projects/registry/repositories/index.html.haml
@@ -15,5 +15,8 @@
         "registry_host_url_with_port" => escape_once(registry_config.host_port),
         "expiration_policy_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'),
         "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
+        "run_cleanup_policies_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'run-the-cleanup-policy-now'),
+        "cleanup_policies_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'how-the-cleanup-policy-works'),
+
         "is_admin": current_user&.admin.to_s,
         character_error: @character_error.to_s } }
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 4f14ee4d044..d7231e758c7 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -1,6 +1,7 @@
 - commit = @repository.commit(tag.dereferenced_target)
 - release = @releases.find { |release| release.tag == tag.name }
-%li.flex-row.allow-wrap
+
+%li.flex-row.allow-wrap.js-tag-list
   .row-main-content
     = sprite_icon('tag')
     = link_to tag.name, project_tag_path(@project, tag.name), class: 'item-title ref-name'
@@ -38,5 +39,4 @@
     - if can?(current_user, :admin_tag, @project)
       = link_to edit_project_tag_release_path(@project, tag.name), class: 'btn btn-edit has-tooltip', title: s_('TagsPage|Edit release notes'), data: { container: "body" } do
         = sprite_icon("pencil")
-      = link_to project_tag_path(@project, tag.name), class: "btn btn-remove remove-row has-tooltip gl-ml-3 #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag.name }, container: 'body' }, remote: true do
-        = sprite_icon("remove")
+      = render 'projects/buttons/remove_tag', project: @project, tag: tag
diff --git a/app/views/projects/tags/destroy.js.haml b/app/views/projects/tags/destroy.js.haml
deleted file mode 100644
index 59d359bbf10..00000000000
--- a/app/views/projects/tags/destroy.js.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- if @error.present?
-  new Flash({ message: '#{escape_javascript(@error)}', type: 'alert' });
-- elsif @repository.tags.empty?
-  $('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000)
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 25a560da5c6..d726d2ab233 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -52,8 +52,7 @@
       = render 'projects/buttons/download', project: @project, ref: @tag.name
     - if can?(current_user, :admin_tag, @project)
       .btn-container.controls-item-full
-        = link_to project_tag_path(@project, @tag.name), class: "btn btn-icon btn-danger gl-button remove-row has-tooltip #{protected_tag?(@project, @tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: @tag.name } } do
-          = sprite_icon('remove', css_class: 'gl-icon')
+        = render 'projects/buttons/remove_tag', project: @project, tag: @tag
 
   - if @tag.message.present?
     %pre.wrap{ data: { qa_selector: 'tag_message_content' } }
diff --git a/changelogs/unreleased/225293-emaill-participants.yml b/changelogs/unreleased/225293-emaill-participants.yml
new file mode 100644
index 00000000000..78a4853dc6f
--- /dev/null
+++ b/changelogs/unreleased/225293-emaill-participants.yml
@@ -0,0 +1,5 @@
+---
+title: Add issue_email_participants table and related model
+merge_request: 42943
+author:
+type: other
diff --git a/changelogs/unreleased/243750-display-messages-and-warning-for-partially-executed-cleanup-polici.yml b/changelogs/unreleased/243750-display-messages-and-warning-for-partially-executed-cleanup-polici.yml
new file mode 100644
index 00000000000..e3f090109cf
--- /dev/null
+++ b/changelogs/unreleased/243750-display-messages-and-warning-for-partially-executed-cleanup-polici.yml
@@ -0,0 +1,5 @@
+---
+title: Display alert for partially executed cleanup policies
+merge_request: 43831
+author:
+type: changed
diff --git a/changelogs/unreleased/mw-description-template-replace-fa-icons.yml b/changelogs/unreleased/mw-description-template-replace-fa-icons.yml
new file mode 100644
index 00000000000..99a0f095d15
--- /dev/null
+++ b/changelogs/unreleased/mw-description-template-replace-fa-icons.yml
@@ -0,0 +1,5 @@
+---
+title: "Description Templates: Replace fontawesome icons with GitLab SVGs"
+merge_request: 43379
+author:
+type: changed
diff --git a/changelogs/unreleased/ph-212334-fixTwoButtonReviewSubmit.yml b/changelogs/unreleased/ph-212334-fixTwoButtonReviewSubmit.yml
new file mode 100644
index 00000000000..90c20a6b97b
--- /dev/null
+++ b/changelogs/unreleased/ph-212334-fixTwoButtonReviewSubmit.yml
@@ -0,0 +1,5 @@
+---
+title: Improve two button review submit in merge requests
+merge_request: 43149
+author:
+type: changed
diff --git a/changelogs/unreleased/pl-tracing-core-2-usage-data.yml b/changelogs/unreleased/pl-tracing-core-2-usage-data.yml
new file mode 100644
index 00000000000..0dab5f6bb68
--- /dev/null
+++ b/changelogs/unreleased/pl-tracing-core-2-usage-data.yml
@@ -0,0 +1,5 @@
+---
+title: Move Tracing usage data ping to Core
+merge_request: 44006
+author:
+type: added
diff --git a/changelogs/unreleased/remove-add_severity_system_note-feature-flag.yml b/changelogs/unreleased/remove-add_severity_system_note-feature-flag.yml
new file mode 100644
index 00000000000..117d7511d8b
--- /dev/null
+++ b/changelogs/unreleased/remove-add_severity_system_note-feature-flag.yml
@@ -0,0 +1,5 @@
+---
+title: Add system note on incident severity change
+merge_request: 43998
+author:
+type: added
diff --git a/config/feature_flags/development/add_severity_system_note.yml b/config/feature_flags/development/admin_approval_for_new_user_signups.yml
similarity index 66%
rename from config/feature_flags/development/add_severity_system_note.yml
rename to config/feature_flags/development/admin_approval_for_new_user_signups.yml
index 35fed18ea4e..bbb21fcbffe 100644
--- a/config/feature_flags/development/add_severity_system_note.yml
+++ b/config/feature_flags/development/admin_approval_for_new_user_signups.yml
@@ -1,7 +1,7 @@
 ---
-name: add_severity_system_note
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42358
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/251110
-group: group::health
+name: admin_approval_for_new_user_signups
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43827
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258980
 type: development
+group: group::access
 default_enabled: false
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb
index 6bcd4dbd52f..f505fb5843a 100644
--- a/config/initializers/forbid_sidekiq_in_transactions.rb
+++ b/config/initializers/forbid_sidekiq_in_transactions.rb
@@ -46,7 +46,7 @@ end
 module ActiveRecord
   class Base
     module SkipTransactionCheckAfterCommit
-      def committed!(*)
+      def committed!(*args, **kwargs)
         Sidekiq::Worker.skipping_transaction_check { super }
       end
     end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index e4a46be9bf3..14580e2bb3b 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -16,6 +16,8 @@ en:
       timeout: "Your session expired. Please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your email address before continuing. Please check your email for the link we sent you, or click 'Resend confirmation email'."
+      blocked: "Your account has been blocked. Please contact your GitLab administrator if you think this is an error."
+      forbidden: "Your account does not have the required permission to login. Please contact your GitLab administrator if you think this is an error."
     mailer:
       confirmation_instructions:
         subject: "Confirmation instructions"
diff --git a/db/migrate/20200922052316_create_issue_email_participants.rb b/db/migrate/20200922052316_create_issue_email_participants.rb
new file mode 100644
index 00000000000..a8aeb9d9a5a
--- /dev/null
+++ b/db/migrate/20200922052316_create_issue_email_participants.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class CreateIssueEmailParticipants < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless table_exists?(:issue_email_participants)
+      with_lock_retries do
+        create_table :issue_email_participants do |t|
+          t.references :issue, index: false, null: false, foreign_key: { on_delete: :cascade }
+          t.datetime_with_timezone :created_at, null: false
+          t.datetime_with_timezone :updated_at, null: false
+          t.text :email, null: false
+
+          t.index [:issue_id, :email], unique: true
+        end
+      end
+
+      add_text_limit(:issue_email_participants, :email, 255)
+    end
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :issue_email_participants
+    end
+  end
+end
diff --git a/db/schema_migrations/20200922052316 b/db/schema_migrations/20200922052316
new file mode 100644
index 00000000000..31bd12178ef
--- /dev/null
+++ b/db/schema_migrations/20200922052316
@@ -0,0 +1 @@
+384d022662437de21b4b3b97bf2f1dec2925be6afe4b62828c97dc9b3b3fc77c
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 2e50f47ca7e..534ca6c5274 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12676,6 +12676,24 @@ CREATE TABLE issue_assignees (
     issue_id integer NOT NULL
 );
 
+CREATE TABLE issue_email_participants (
+    id bigint NOT NULL,
+    issue_id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    email text NOT NULL,
+    CONSTRAINT check_2c321d408d CHECK ((char_length(email) <= 255))
+);
+
+CREATE SEQUENCE issue_email_participants_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE issue_email_participants_id_seq OWNED BY issue_email_participants.id;
+
 CREATE TABLE issue_links (
     id integer NOT NULL,
     source_id integer NOT NULL,
@@ -17447,6 +17465,8 @@ ALTER TABLE ONLY ip_restrictions ALTER COLUMN id SET DEFAULT nextval('ip_restric
 
 ALTER TABLE ONLY issuable_severities ALTER COLUMN id SET DEFAULT nextval('issuable_severities_id_seq'::regclass);
 
+ALTER TABLE ONLY issue_email_participants ALTER COLUMN id SET DEFAULT nextval('issue_email_participants_id_seq'::regclass);
+
 ALTER TABLE ONLY issue_links ALTER COLUMN id SET DEFAULT nextval('issue_links_id_seq'::regclass);
 
 ALTER TABLE ONLY issue_metrics ALTER COLUMN id SET DEFAULT nextval('issue_metrics_id_seq'::regclass);
@@ -18565,6 +18585,9 @@ ALTER TABLE ONLY ip_restrictions
 ALTER TABLE ONLY issuable_severities
     ADD CONSTRAINT issuable_severities_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY issue_email_participants
+    ADD CONSTRAINT issue_email_participants_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY issue_links
     ADD CONSTRAINT issue_links_pkey PRIMARY KEY (id);
 
@@ -20349,6 +20372,8 @@ CREATE UNIQUE INDEX index_issue_assignees_on_issue_id_and_user_id ON issue_assig
 
 CREATE INDEX index_issue_assignees_on_user_id ON issue_assignees USING btree (user_id);
 
+CREATE UNIQUE INDEX index_issue_email_participants_on_issue_id_and_email ON issue_email_participants USING btree (issue_id, email);
+
 CREATE INDEX index_issue_links_on_source_id ON issue_links USING btree (source_id);
 
 CREATE UNIQUE INDEX index_issue_links_on_source_id_and_target_id ON issue_links USING btree (source_id, target_id);
@@ -22621,6 +22646,9 @@ ALTER TABLE ONLY user_synced_attributes_metadata
 ALTER TABLE ONLY project_authorizations
     ADD CONSTRAINT fk_rails_0f84bb11f3 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY issue_email_participants
+    ADD CONSTRAINT fk_rails_0fdfd8b811 FOREIGN KEY (issue_id) REFERENCES issues(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_request_context_commits
     ADD CONSTRAINT fk_rails_0fe0039f60 FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE CASCADE;
 
diff --git a/doc/development/database/index.md b/doc/development/database/index.md
index 9ea5b6fcaac..0ae39ed7ca7 100644
--- a/doc/development/database/index.md
+++ b/doc/development/database/index.md
@@ -24,6 +24,7 @@
 - [Background migrations](../background_migrations.md)
 - [Swapping tables](../swapping_tables.md)
 - [Deleting migrations](../deleting_migrations.md)
+- [Partitioning tables](table_partitioning.md)
 
 ## Debugging
 
diff --git a/doc/development/database/table_partitioning.md b/doc/development/database/table_partitioning.md
new file mode 100644
index 00000000000..00981ef28a2
--- /dev/null
+++ b/doc/development/database/table_partitioning.md
@@ -0,0 +1,253 @@
+# Database table partitioning
+
+Table partitioning is a powerful database feature that allows a table's
+data to be split into smaller physical tables that act as a single large
+table. If the application is designed to work with partitioning in mind,
+there can be multiple benefits, such as:
+
+- Query performance can be improved greatly, because the database can
+cheaply eliminate much of the data from the search space, while still
+providing full SQL capabilities.
+
+- Bulk deletes can be achieved with minimal impact on the database by
+dropping entire partitions. This is a natural fit for features that need
+to periodically delete data that falls outside the retention window.
+
+- Administrative tasks like `VACUUM` and index rebuilds can operate on
+individual partitions, rather than across a single massive table.
+
+Unfortunately, not all models fit a partitioning scheme, and there are
+significant drawbacks if implemented incorrectly. Additionally, tables
+can only be partitioned at their creation, making it nontrivial to apply
+partitioning to a busy database. A suite of migration tools are available
+to enable backend developers to partition existing tables, but the
+migration process is rather heavy, taking multiple steps split across
+several releases. Due to the limitations of partitioning and the related
+migrations, you should understand how partitioning fits your use case
+before attempting to leverage this feature.
+
+## Determining when to use partitioning
+
+While partitioning can be very useful when properly applied, it's
+imperative to identify if the data and workload of a table naturally fit a
+partitioning scheme. There are a few details you'll have to understand
+in order to decide if partitioning is a good fit for your particular
+problem.
+
+First, a table is partitioned on a partition key, which is a column or
+set of columns which determine how the data will be split across the
+partitions. The partition key is used by the database when reading or
+writing data, to decide which partition(s) need to be accessed. The
+partition key should be a column that would be included in a `WHERE`
+clause on almost all queries accessing that table.
+
+Second, it's necessary to understand the strategy the database will
+use to split the data across the partitions. The scheme supported by the
+GitLab migration helpers is date-range partitioning, where each partition
+in the table contains data for a single month. In this case, the partitioning
+key would need to be a timestamp or date column. In order for this type of
+partitioning to work well, most queries would need to access data within a
+certain date range.
+
+For a more concrete example, the `audit_events` table can be used, which
+was the first table to be partitioned in the application database
+(scheduled for deployment with the GitLab 13.5 release). This
+table tracks audit entries of security events that happen in the
+application. In almost all cases, users want to see audit activity that
+occurs in a certain timeframe. As a result, date-range partitioning
+was a natural fit for how the data would be accessed.
+
+To look at this in more detail, imagine a simplified `audit_events` schema:
+
+```sql
+CREATE TABLE audit_events (
+  id SERIAL NOT NULL PRIMARY KEY,
+  author_id INT NOT NULL,
+  details jsonb NOT NULL,
+  created_at timestamptz NOT NULL);
+```
+
+Now imagine typical queries in the UI would display the data within a
+certain date range, like a single week:
+
+```sql
+SELECT *
+FROM audit_events
+WHERE created_at >= '2020-01-01 00:00:00'
+  AND created_at < '2020-01-08 00:00:00'
+ORDER BY created_at DESC
+LIMIT 100
+```
+
+If the table is partioned on the `created_at` column the base table would
+look like:
+
+```sql
+CREATE TABLE audit_events (
+  id SERIAL NOT NULL,
+  author_id INT NOT NULL,
+  details jsonb NOT NULL,
+  created_at timestamptz NOT NULL,
+  PRIMARY KEY (id, created_at))
+PARTITION BY RANGE(created_at);
+```
+
+NOTE: **Note:**
+The primary key of a partitioned table must include the partition key as
+part of the primary key definition.
+
+And we might have a list of partitions for the table, such as:
+
+```sql
+audit_events_202001 FOR VALUES FROM ('2020-01-01') TO ('2020-02-01')
+audit_events_202002 FOR VALUES FROM ('2020-02-01') TO ('2020-03-01')
+audit_events_202003 FOR VALUES FROM ('2020-03-01') TO ('2020-04-01')
+```
+
+Each partition is a separate physical table, with the same structure as
+the base `audit_events` table, but contains only data for rows where the
+partition key falls in the specified range. For example, the partition
+`audit_events_202001` contains rows where the `created_at` column is
+greater than or equal to `2020-01-01` and less than `2020-02-01`.
+
+Now, if we look at the previous example query again, the database can
+use the `WHERE` to recognize that all matching rows will be in the
+`audit_events_202001` partition. Rather than searching all of the data
+in all of the partitions, it can search only the single month's worth
+of data in the appropriate partition. In a large table, this can
+dramatically reduce the amount of data the database needs to access.
+However, imagine a query that does not filter based on the partitioning
+key, such as:
+
+```sql
+SELECT *
+FROM audit_events
+WHERE author_id = 123
+ORDER BY created_at DESC
+LIMIT 100
+```
+
+In this example, the database can't prune any partitions from the search,
+because matching data could exist in any of them. As a result, it has to
+query each partition individually, and aggregate the rows into a single result
+set. Since `author_id` would be indexed, the performance impact could
+likely be acceptable, but on more complex queries the overhead can be
+substantial. Partitioning should only be leveraged if the access patterns
+of the data support the partitioning strategy, otherwise performance will
+suffer.
+
+## Partitioning a table
+
+Unfortunately, tables can only be partitioned at their creation, making
+it nontrivial to apply to a busy database. A suite of migration
+tools have been developed to enable backend developers to partition
+existing tables. This migration process takes multiple steps which must
+be split across several releases.
+
+### Caveats
+
+The partitioning migration helpers work by creating a partitioned duplicate
+of the original table and using a combination of a trigger and a background
+migration to copy data into the new table. Changes to the original table
+schema can be made in parallel with the partitioning migration, but they
+must take care to not break the underlying mechanism that makes the migration
+work. For example, if a column is added to the table that is being
+partitioned, both the partitioned table and the trigger definition need to
+be updated to match.
+
+### Step 1: Creating the partitioned copy (Release N)
+
+The first step is to add a migration to create the partitioned copy of
+the original table. This migration will also create the appropriate
+partitions based on the data in the original table, and install a
+trigger that will sync writes from the original table into the
+partitioned copy.
+
+An example migration of partitioning the `audit_events` table by its
+`created_at` column would look like:
+
+```ruby
+class PartitionAuditEvents < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::PartitioningMigrationHelpers
+
+  def up
+    partition_table_by_date :audit_events, :created_at
+  end
+
+  def down
+    drop_partitioned_table_for :audit_events
+  end
+end
+```
+
+Once this has executed, any inserts, updates or deletes in the
+original table will also be duplicated in the new table. For updates and
+deletes, the operation will only have an effect if the corresponding row
+exists in the partitioned table.
+
+### Step 2: Backfill the partitioned copy (Release N)
+
+The second step is to add a post-deployment migration that will schedule
+the background jobs that will backfill existing data from the original table
+into the partitioned copy.
+
+Continuing the above example, the migration would look like:
+
+```ruby
+class BackfillPartitionAuditEvents < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::PartitioningMigrationHelpers
+
+  def up
+    enqueue_partitioning_data_migration :audit_events
+  end
+
+  def down
+    cleanup_partitioning_data_migration :audit_events
+  end
+end
+```
+
+This step uses the same mechanism as any background migration, so you
+may want to read the [Background Migration](../background_migrations.md)
+guide for details on that process. Background jobs are scheduled every
+2 minutes and copy `50_000` records at a time, which can be used to
+estimate the timing of the background migration portion of the
+partitioning migration.
+
+### Step 3: Post-backfill cleanup (Release N+1)
+
+The third step must occur at least one release after the release that
+includes the background migration. This gives time for the background
+migration to execute properly in self-managed installations. In this step,
+add another post-deployment migration that will cleanup after the
+background migration. This includes forcing any remaining jobs to
+execute, and copying data that may have been missed, due to dropped or
+failed jobs.
+
+Once again, continuing the example, this migration would look like:
+
+```ruby
+class CleanupPartitionedAuditEventsBackfill < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::PartitioningMigrationHelpers
+
+  def up
+    finalize_backfilling_partitioned_table :audit_events
+  end
+
+  def down
+    # no op
+  end
+end
+```
+
+After this migration has completed, the original table and partitioned
+table should contain identical data. The trigger installed on the
+original table guarantees that the data will remain in sync going
+forward.
+
+### Step 4: Swap the partitioned and non-partitioned tables (Release N+1)
+
+The final step of the migration will make the partitioned table ready
+for use by the application. This section will be updated when the
+migration helper is ready, for now development can be followed in the
+[Tracking Issue](https://gitlab.com/gitlab-org/gitlab/-/issues/241267).
diff --git a/doc/development/feature_categorization/index.md b/doc/development/feature_categorization/index.md
index 3fd402ebe84..31ec9ee65b6 100644
--- a/doc/development/feature_categorization/index.md
+++ b/doc/development/feature_categorization/index.md
@@ -75,38 +75,23 @@ A feature category can be specified on an entire controller
 using:
 
 ```ruby
-class Projects::MergeRequestsController < ApplicationController
-  feature_category :source_code_management
+class Boards::ListsController < ApplicationController
+  feature_category :kanban_boards
 end
 ```
 
 The feature category can be limited to a list of actions using the
-`only` argument, actions can be excluded using the `except` argument.
+second argument:
 
 ```ruby
-class Projects::MergeRequestsController < ApplicationController
-  feature_category :code_testing, only: [:metrics_reports]
-  feature_category :source_code_management, except: [:test_reports, :coverage_reports]
+class DashboardController < ApplicationController
+  feature_category :issue_tracking, [:issues, :issues_calendar]
+  feature_category :code_review, [:merge_requests]
 end
 ```
 
-`except` and `only` arguments can not be combined.
-
-When specifying `except` all other actions will get the specified
-category assigned.
-
-The assignment can also be scoped using `if` and `unless` procs:
-
-```ruby
-class Projects::MergeRequestsController < ApplicationController
-  feature_category :source_code_management,
-                   unless: -> (action) { action.include?("reports") }
-                   if: -> (action) { action.include?("widget") }
-end
-```
-
-In this case, both procs need to be satisfied for the action to get
-the category assigned.
+These forms cannot be mixed: if a controller has more than one category,
+every single action must be listed.
 
 ### Excluding controller actions from feature categorization
 
@@ -125,6 +110,5 @@ The `spec/controllers/every_controller_spec.rb` will iterate over all
 defined routes, and check the controller to see if a category is
 assigned to all actions.
 
-The spec also validates if the used feature categories are known. And
-if the actions used in `only` and `except` configuration still exist
-as routes.
+The spec also validates if the used feature categories are known. And if
+the actions used in configuration still exist as routes.
diff --git a/doc/user/project/merge_requests/img/commit_nav_v13_4.png b/doc/user/project/merge_requests/img/commit_nav_v13_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ae6ce326936818fb7f81f8573d228aab39448fd
GIT binary patch
literal 21170
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%0Aux9V_38Z-t>ES&(blIN9cjky@{c;
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
WBO}B8Bi1{PTWG22fu$-pBmM=1Q<rZ5

literal 0
HcmV?d00001

diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
index 3a18cacde64..2e0c0d7aeeb 100644
--- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
+++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
@@ -122,6 +122,8 @@ the commits to open the single-commit view. From there, you can navigate among t
 by clicking the **Prev** and **Next** buttons on the top-right of the page or by using the
 <kbd>X</kbd> and <kbd>C</kbd> keyboard shortcuts.
 
+![Merge requests commit navigation](img/commit_nav_v13_4.png)
+
 ### Incrementally expand merge request diffs
 
 By default, the diff shows only the parts of a file which are changed.
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 7fe8c596b13..fbfc7beed9a 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -141,6 +141,7 @@ module Gitlab
             projects_creating_incidents: distinct_count(Issue.incident, :project_id),
             projects_imported_from_github: count(Project.where(import_type: 'github')),
             projects_with_repositories_enabled: count(ProjectFeature.where('repository_access_level > ?', ProjectFeature::DISABLED)),
+            projects_with_tracing_enabled: count(ProjectTracingSetting),
             projects_with_error_tracking_enabled: count(::ErrorTracking::ProjectErrorTrackingSetting.where(enabled: true)),
             projects_with_alerts_service_enabled: count(AlertsService.active),
             projects_with_prometheus_alerts: distinct_count(PrometheusAlert, :project_id),
@@ -573,7 +574,8 @@ module Gitlab
           clusters_applications_prometheus: cluster_applications_user_distinct_count(::Clusters::Applications::Prometheus, time_period),
           operations_dashboard_default_dashboard: count(::User.active.with_dashboard('operations').where(time_period),
                                                         start: user_minimum_id,
-                                                        finish: user_maximum_id)
+                                                        finish: user_maximum_id),
+          projects_with_tracing_enabled: distinct_count(::Project.with_tracing_enabled.where(time_period), :creator_id)
         }
       end
       # rubocop: enable CodeReuse/ActiveRecord
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f8004ba4f87..aa3ad74030f 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -265,6 +265,11 @@ msgid_plural "%d open issues"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d pending comment"
+msgid_plural "%d pending comments"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d personal project will be removed and cannot be restored."
 msgid_plural "%d personal projects will be removed and cannot be restored."
 msgstr[0] ""
@@ -424,11 +429,6 @@ msgid_plural "%{count} participants"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%{count} pending comment"
-msgid_plural "%{count} pending comments"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%{count} related %{pluralized_subject}: %{links}"
 msgstr ""
 
@@ -3476,12 +3476,6 @@ msgstr ""
 msgid "Artifacts"
 msgstr ""
 
-msgid "As U2F devices are only supported by a few browsers, we require that you set up a two-factor authentication app before a U2F device. That way you'll always be able to log in - even when you're using an unsupported browser."
-msgstr ""
-
-msgid "As WebAuthn devices are only supported by a few browsers, we require that you set up a two-factor authentication app before a WebAuthn device. That way you'll always be able to log in - even when you're using an unsupported browser."
-msgstr ""
-
 msgid "As we continue to build more features for SAST, we'd love your feedback on the SAST configuration feature in %{linkStart}this issue%{linkEnd}."
 msgstr ""
 
@@ -3987,15 +3981,6 @@ msgstr ""
 msgid "BambooService|You must set up automatic revision labeling and a repository trigger in Bamboo."
 msgstr ""
 
-msgid "BatchComments|Delete all pending comments"
-msgstr ""
-
-msgid "BatchComments|Discard review?"
-msgstr ""
-
-msgid "BatchComments|You're about to discard your review which will delete all of your pending comments. The deleted comments %{strong_start}cannot%{strong_end} be restored."
-msgstr ""
-
 msgid "Be careful. Changing the project's namespace can have unintended side effects."
 msgstr ""
 
@@ -6989,6 +6974,9 @@ msgstr[1] ""
 msgid "ContainerRegistry|Set cleanup policy"
 msgstr ""
 
+msgid "ContainerRegistry|Some tags were not deleted"
+msgstr ""
+
 msgid "ContainerRegistry|Something went wrong while fetching the cleanup policy."
 msgstr ""
 
@@ -7028,6 +7016,9 @@ msgstr ""
 msgid "ContainerRegistry|Tags with names matching this regex pattern will %{italicStart}expire:%{italicEnd}"
 msgstr ""
 
+msgid "ContainerRegistry|The cleanup policy timed out before it could delete all tags. An administrator can %{adminLinkStart}manually run cleanup now%{adminLinkEnd} or you can wait for the cleanup policy to automatically run again. %{docLinkStart}More information%{docLinkEnd}"
+msgstr ""
+
 msgid "ContainerRegistry|The last tag related to this image was recently removed. This empty image and any associated data will be automatically removed as part of the regular Garbage Collection process. If you have any questions, contact your administrator."
 msgstr ""
 
@@ -9069,9 +9060,6 @@ msgstr ""
 msgid "Discard draft"
 msgstr ""
 
-msgid "Discard review"
-msgstr ""
-
 msgid "DiscordService|Discord Notifications"
 msgstr ""
 
@@ -11323,9 +11311,6 @@ msgstr ""
 msgid "Finish editing this message first!"
 msgstr ""
 
-msgid "Finish review"
-msgstr ""
-
 msgid "Finish setting up your dedicated account for %{group_name}."
 msgstr ""
 
@@ -17544,6 +17529,12 @@ msgstr ""
 msgid "Not Implemented"
 msgstr ""
 
+msgid "Not all browsers support U2F devices. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even when you're using an unsupported browser."
+msgstr ""
+
+msgid "Not all browsers support WebAuthn. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even from an unsupported browser."
+msgstr ""
+
 msgid "Not all data has been processed yet, the accuracy of the chart for the selected timeframe is limited."
 msgstr ""
 
@@ -18578,6 +18569,9 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
+msgid "Pending comments"
+msgstr ""
+
 msgid "People without permission will never get a notification and won't be able to comment."
 msgstr ""
 
@@ -21827,6 +21821,9 @@ msgstr ""
 msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The allowlist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com."
 msgstr ""
 
+msgid "Require admin approval for new sign-ups"
+msgstr ""
+
 msgid "Require all users in this group to setup Two-factor authentication"
 msgstr ""
 
@@ -23465,6 +23462,9 @@ msgstr ""
 msgid "Set up a %{type} Runner manually"
 msgstr ""
 
+msgid "Set up a hardware device as a second factor to sign in."
+msgstr ""
+
 msgid "Set up assertions/attributes/claims (email, first_name, last_name) and NameID according to %{docsLinkStart}the documentation %{icon}%{docsLinkEnd}"
 msgstr ""
 
@@ -27920,9 +27920,6 @@ msgstr ""
 msgid "Use Service Desk to connect with your users (e.g. to offer customer support) through email right inside GitLab"
 msgstr ""
 
-msgid "Use a hardware device to add the second factor of authentication."
-msgstr ""
-
 msgid "Use an one time password authenticator on your mobile device or computer to enable two-factor authentication (2FA)."
 msgstr ""
 
@@ -28950,6 +28947,9 @@ msgstr ""
 msgid "When a runner is locked, it cannot be assigned to other projects"
 msgstr ""
 
+msgid "When enabled, any user visiting %{host} and creating an account will have to be explicitly approved by the admin before they can login. This setting is effective only if sign-ups are enabled."
+msgstr ""
+
 msgid "When enabled, any user visiting %{host} will be able to create an account."
 msgstr ""
 
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index c884b10b597..164f25389c0 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -75,8 +75,6 @@ module QA
 
         view 'app/assets/javascripts/batch_comments/components/review_bar.vue' do
           element :review_bar
-          element :discard_review
-          element :modal_delete_pending_comments
         end
 
         view 'app/assets/javascripts/notes/components/note_form.vue' do
diff --git a/spec/channels/application_cable/connection_spec.rb b/spec/channels/application_cable/connection_spec.rb
index e5f7ea1103c..7d60548f780 100644
--- a/spec/channels/application_cable/connection_spec.rb
+++ b/spec/channels/application_cable/connection_spec.rb
@@ -5,27 +5,39 @@ require 'spec_helper'
 RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
   let(:session_id) { Rack::Session::SessionId.new('6919a6f1bb119dd7396fadc38fd18d0d') }
 
-  before do
-    Gitlab::Redis::SharedState.with do |redis|
-      redis.set("session:gitlab:#{session_id.private_id}", Marshal.dump(session_hash))
+  context 'when session cookie is set' do
+    before do
+      Gitlab::Redis::SharedState.with do |redis|
+        redis.set("session:gitlab:#{session_id.private_id}", Marshal.dump(session_hash))
+      end
+
+      cookies[Gitlab::Application.config.session_options[:key]] = session_id.public_id
     end
 
-    cookies[Gitlab::Application.config.session_options[:key]] = session_id.public_id
-  end
+    context 'when user is logged in' do
+      let(:user) { create(:user) }
+      let(:session_hash) { { 'warden.user.user.key' => [[user.id], user.encrypted_password[0, 29]] } }
 
-  context 'when user is logged in' do
-    let(:user) { create(:user) }
-    let(:session_hash) { { 'warden.user.user.key' => [[user.id], user.encrypted_password[0, 29]] } }
+      it 'sets current_user' do
+        connect
 
-    it 'sets current_user' do
-      connect
+        expect(connection.current_user).to eq(user)
+      end
 
-      expect(connection.current_user).to eq(user)
+      context 'with a stale password' do
+        let(:partial_password_hash) { build(:user, password: 'some_old_password').encrypted_password[0, 29] }
+        let(:session_hash) { { 'warden.user.user.key' => [[user.id], partial_password_hash] } }
+
+        it 'sets current_user to nil' do
+          connect
+
+          expect(connection.current_user).to be_nil
+        end
+      end
     end
 
-    context 'with a stale password' do
-      let(:partial_password_hash) { build(:user, password: 'some_old_password').encrypted_password[0, 29] }
-      let(:session_hash) { { 'warden.user.user.key' => [[user.id], partial_password_hash] } }
+    context 'when user is not logged in' do
+      let(:session_hash) { {} }
 
       it 'sets current_user to nil' do
         connect
@@ -35,13 +47,21 @@ RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
     end
   end
 
-  context 'when user is not logged in' do
-    let(:session_hash) { {} }
-
+  context 'when session cookie is not set' do
     it 'sets current_user to nil' do
       connect
 
       expect(connection.current_user).to be_nil
     end
   end
+
+  context 'when session cookie is an empty string' do
+    it 'sets current_user to nil' do
+      cookies[Gitlab::Application.config.session_options[:key]] = ''
+
+      connect
+
+      expect(connection.current_user).to be_nil
+    end
+  end
 end
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index ec7d18caa16..7bba44fc524 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -87,6 +87,38 @@ RSpec.describe Admin::ApplicationSettingsController do
       sign_in(admin)
     end
 
+    context 'require_admin_approval_after_user_signup setting' do
+      subject do
+        put :update, params: { application_setting: { require_admin_approval_after_user_signup: true } }
+      end
+
+      context 'when feature is enabled' do
+        before do
+          stub_feature_flags(admin_approval_for_new_user_signups: true)
+        end
+
+        it 'updates the require_admin_approval_after_user_signup setting' do
+          subject
+
+          expect(response).to redirect_to(general_admin_application_settings_path)
+          expect(ApplicationSetting.current.require_admin_approval_after_user_signup).to eq(true)
+        end
+      end
+
+      context 'when feature is disabled' do
+        before do
+          stub_feature_flags(admin_approval_for_new_user_signups: false)
+        end
+
+        it 'does not update the require_admin_approval_after_user_signup setting' do
+          subject
+
+          expect(response).to redirect_to(general_admin_application_settings_path)
+          expect(ApplicationSetting.current.require_admin_approval_after_user_signup).not_to eq(true)
+        end
+      end
+    end
+
     it 'updates the password_authentication_enabled_for_git setting' do
       put :update, params: { application_setting: { password_authentication_enabled_for_git: "0" } }
 
diff --git a/spec/controllers/admin/sessions_controller_spec.rb b/spec/controllers/admin/sessions_controller_spec.rb
index 35982e57034..5fa7a7f278d 100644
--- a/spec/controllers/admin/sessions_controller_spec.rb
+++ b/spec/controllers/admin/sessions_controller_spec.rb
@@ -109,7 +109,7 @@ RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do
         # triggering the auth form will request admin mode
         get :new
 
-        Timecop.freeze(Gitlab::Auth::CurrentUserMode::ADMIN_MODE_REQUESTED_GRACE_PERIOD.from_now) do
+        travel_to(Gitlab::Auth::CurrentUserMode::ADMIN_MODE_REQUESTED_GRACE_PERIOD.from_now) do
           post :create, params: { user: { password: user.password } }
 
           expect(response).to redirect_to(new_admin_session_path)
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 188a4cb04af..94e110325f9 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -416,13 +416,13 @@ RSpec.describe ApplicationController do
         end
 
         it 'returns false if the grace period has expired' do
-          Timecop.freeze(3.hours.from_now) do
+          travel_to(3.hours.from_now) do
             expect(subject).to be_falsey
           end
         end
 
         it 'returns true if the grace period is still active' do
-          Timecop.freeze(1.hour.from_now) do
+          travel_to(1.hour.from_now) do
             expect(subject).to be_truthy
           end
         end
diff --git a/spec/controllers/concerns/controller_with_feature_category/config_spec.rb b/spec/controllers/concerns/controller_with_feature_category/config_spec.rb
deleted file mode 100644
index 9b8ffd2baab..00000000000
--- a/spec/controllers/concerns/controller_with_feature_category/config_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require "fast_spec_helper"
-require "rspec-parameterized"
-require_relative "../../../../app/controllers/concerns/controller_with_feature_category/config"
-
-RSpec.describe ControllerWithFeatureCategory::Config do
-  describe "#matches?" do
-    using RSpec::Parameterized::TableSyntax
-
-    where(:only_actions, :except_actions, :if_proc, :unless_proc, :test_action, :expected) do
-      nil         | nil         | nil   | nil   | "action"   | true
-      [:included] | nil         | nil   | nil   | "action"   | false
-      [:included] | nil         | nil   | nil   | "included" | true
-      nil         | [:excluded] | nil   | nil   | "excluded" | false
-      nil         | nil         | true  | nil   | "action"   | true
-      [:included] | nil         | true  | nil   | "action"   | false
-      [:included] | nil         | true  | nil   | "included" | true
-      nil         | [:excluded] | true  | nil   | "excluded" | false
-      nil         | nil         | false | nil   | "action"   | false
-      [:included] | nil         | false | nil   | "action"   | false
-      [:included] | nil         | false | nil   | "included" | false
-      nil         | [:excluded] | false | nil   | "excluded" | false
-      nil         | nil         | nil   | true  | "action"   | false
-      [:included] | nil         | nil   | true  | "action"   | false
-      [:included] | nil         | nil   | true  | "included" | false
-      nil         | [:excluded] | nil   | true  | "excluded" | false
-      nil         | nil         | nil   | false | "action"   | true
-      [:included] | nil         | nil   | false | "action"   | false
-      [:included] | nil         | nil   | false | "included" | true
-      nil         | [:excluded] | nil   | false | "excluded" | false
-      nil         | nil         | true  | false | "action"   | true
-      [:included] | nil         | true  | false | "action"   | false
-      [:included] | nil         | true  | false | "included" | true
-      nil         | [:excluded] | true  | false | "excluded" | false
-      nil         | nil         | false | true  | "action"   | false
-      [:included] | nil         | false | true  | "action"   | false
-      [:included] | nil         | false | true  | "included" | false
-      nil         | [:excluded] | false | true  | "excluded" | false
-    end
-
-    with_them do
-      let(:config) do
-        if_to_proc = if_proc.nil? ? nil : -> (_) { if_proc }
-        unless_to_proc = unless_proc.nil? ? nil : -> (_) { unless_proc }
-
-        described_class.new(:category, only_actions, except_actions, if_to_proc, unless_to_proc)
-      end
-
-      specify { expect(config.matches?(test_action)).to be(expected) }
-    end
-  end
-end
diff --git a/spec/controllers/concerns/controller_with_feature_category_spec.rb b/spec/controllers/concerns/controller_with_feature_category_spec.rb
index e603a7d14c4..55e84755f5c 100644
--- a/spec/controllers/concerns/controller_with_feature_category_spec.rb
+++ b/spec/controllers/concerns/controller_with_feature_category_spec.rb
@@ -2,7 +2,6 @@
 
 require 'fast_spec_helper'
 require_relative "../../../app/controllers/concerns/controller_with_feature_category"
-require_relative "../../../app/controllers/concerns/controller_with_feature_category/config"
 
 RSpec.describe ControllerWithFeatureCategory do
   describe ".feature_category_for_action" do
@@ -14,17 +13,15 @@ RSpec.describe ControllerWithFeatureCategory do
 
     let(:controller) do
       Class.new(base_controller) do
-        feature_category :baz
-        feature_category :foo, except: %w(update edit)
-        feature_category :bar, only: %w(index show)
-        feature_category :quux, only: %w(destroy)
-        feature_category :quuz, only: %w(destroy)
+        feature_category :foo, %w(update edit)
+        feature_category :bar, %w(index show)
+        feature_category :quux, %w(destroy)
       end
     end
 
     let(:subclass) do
       Class.new(controller) do
-        feature_category :qux, only: %w(index)
+        feature_category :baz, %w(subclass_index)
       end
     end
 
@@ -33,34 +30,31 @@ RSpec.describe ControllerWithFeatureCategory do
     end
 
     it "returns the expected category", :aggregate_failures do
-      expect(controller.feature_category_for_action("update")).to eq(:baz)
-      expect(controller.feature_category_for_action("hello")).to eq(:foo)
+      expect(controller.feature_category_for_action("update")).to eq(:foo)
       expect(controller.feature_category_for_action("index")).to eq(:bar)
+      expect(controller.feature_category_for_action("destroy")).to eq(:quux)
     end
 
-    it "returns the closest match for categories defined in subclasses" do
-      expect(subclass.feature_category_for_action("index")).to eq(:qux)
-      expect(subclass.feature_category_for_action("show")).to eq(:bar)
+    it "returns the expected category for categories defined in subclasses" do
+      expect(subclass.feature_category_for_action("subclass_index")).to eq(:baz)
     end
 
-    it "returns the last defined feature category when multiple match" do
-      expect(controller.feature_category_for_action("destroy")).to eq(:quuz)
-    end
-
-    it "raises an error when using including and excluding the same action" do
+    it "raises an error when defining for the controller and for individual actions" do
       expect do
         Class.new(base_controller) do
-          feature_category :hello, only: [:world], except: [:world]
+          feature_category :hello
+          feature_category :goodbye, [:world]
         end
-      end.to raise_error(%r(cannot configure both `only` and `except`))
+      end.to raise_error(ArgumentError, "hello is defined for all actions, but other categories are set")
     end
 
-    it "raises an error when using unknown arguments" do
+    it "raises an error when multiple calls define the same action" do
       expect do
         Class.new(base_controller) do
-          feature_category :hello, hello: :world
+          feature_category :hello, [:world]
+          feature_category :goodbye, ["world"]
         end
-      end.to raise_error(%r(unknown arguments))
+      end.to raise_error(ArgumentError, "Actions have multiple feature categories: world")
     end
   end
 end
diff --git a/spec/controllers/every_controller_spec.rb b/spec/controllers/every_controller_spec.rb
index 4785ee9ed8f..d333c98ccf7 100644
--- a/spec/controllers/every_controller_spec.rb
+++ b/spec/controllers/every_controller_spec.rb
@@ -17,20 +17,27 @@ RSpec.describe "Every controller" do
         .compact
         .select { |route| route[:controller].present? && route[:action].present? }
         .map { |route| [constantize_controller(route[:controller]), route[:action]] }
-        .reject { |route| route.first.nil? || !route.first.include?(ControllerWithFeatureCategory) }
+        .select { |(controller, action)| controller&.include?(ControllerWithFeatureCategory) }
+        .reject { |(controller, action)| controller == Devise::UnlocksController }
     end
 
     let_it_be(:routes_without_category) do
       controller_actions.map do |controller, action|
-        "#{controller}##{action}" unless controller.feature_category_for_action(action)
+        next if controller.feature_category_for_action(action)
+        next unless controller.to_s.start_with?('B', 'C', 'D', 'E', 'F', 'Projects::MergeRequestsController')
+
+        "#{controller}##{action}"
       end.compact
     end
 
     it "has feature categories" do
-      pending("We'll work on defining categories for all controllers: "\
-              "https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/463")
+      routes_without_category.map { |x| x.split('#') }.group_by(&:first).each do |controller, actions|
+        puts controller
+        puts actions.map { |x| ":#{x.last}" }.sort.join(', ')
+        puts ''
+      end
 
-      expect(routes_without_category).to be_empty, "#{routes_without_category.first(10)} did not have a category"
+      expect(routes_without_category).to be_empty, "#{routes_without_category} did not have a category"
     end
 
     it "completed controllers don't get new routes without categories" do
@@ -74,9 +81,9 @@ RSpec.describe "Every controller" do
   end
 
   def actions_defined_in_feature_category_config(controller)
-    feature_category_configs = controller.send(:class_attributes)[:feature_category_config]
-    feature_category_configs.map do |config|
-      Array(config.send(:only)) + Array(config.send(:except))
-    end.flatten.uniq.map(&:to_s)
+    controller.send(:class_attributes)[:feature_category_config]
+      .values
+      .flatten
+      .map(&:to_s)
   end
 end
diff --git a/spec/controllers/projects/releases/evidences_controller_spec.rb b/spec/controllers/projects/releases/evidences_controller_spec.rb
index d5a9665d6a5..0ec4cdf2a31 100644
--- a/spec/controllers/projects/releases/evidences_controller_spec.rb
+++ b/spec/controllers/projects/releases/evidences_controller_spec.rb
@@ -113,18 +113,6 @@ RSpec.describe Projects::Releases::EvidencesController do
 
         it_behaves_like 'does not show the issue in evidence'
 
-        context 'when the issue is confidential' do
-          let(:issue) { create(:issue, :confidential, project: project) }
-
-          it_behaves_like 'does not show the issue in evidence'
-        end
-
-        context 'when the user is the author of the confidential issue' do
-          let(:issue) { create(:issue, :confidential, project: project, author: user) }
-
-          it_behaves_like 'does not show the issue in evidence'
-        end
-
         context 'when project is private' do
           let(:project) { create(:project, :repository, :private) }
 
@@ -143,32 +131,16 @@ RSpec.describe Projects::Releases::EvidencesController do
 
         it_behaves_like 'does not show the issue in evidence'
 
-        context 'when the issue is confidential' do
-          let(:issue) { create(:issue, :confidential, project: project) }
-
-          it_behaves_like 'does not show the issue in evidence'
-        end
-
-        context 'when the user is the author of the confidential issue' do
-          let(:issue) { create(:issue, :confidential, project: project, author: user) }
-
-          it_behaves_like 'does not show the issue in evidence'
-        end
-
         context 'when project is private' do
           let(:project) { create(:project, :repository, :private) }
 
-          it 'returns evidence ' do
-            subject
-
-            expect(json_response).to eq(evidence.summary)
-          end
+          it_behaves_like 'does not show the issue in evidence'
         end
 
         context 'when project restricts the visibility of issues to project members only' do
           let(:project) { create(:project, :repository, :issues_private) }
 
-          it_behaves_like 'evidence not found'
+          it_behaves_like 'does not show the issue in evidence'
         end
       end
 
diff --git a/spec/controllers/projects/tags_controller_spec.rb b/spec/controllers/projects/tags_controller_spec.rb
index d213d003bed..57760088183 100644
--- a/spec/controllers/projects/tags_controller_spec.rb
+++ b/spec/controllers/projects/tags_controller_spec.rb
@@ -131,4 +131,25 @@ RSpec.describe Projects::TagsController do
       end
     end
   end
+
+  describe 'DELETE #destroy' do
+    let(:tag) { project.repository.add_tag(user, 'fake-tag', 'master') }
+    let(:request) do
+      delete(:destroy, params: { id: tag.name, namespace_id: project.namespace.to_param, project_id: project })
+    end
+
+    before do
+      project.add_developer(user)
+      sign_in(user)
+    end
+
+    it 'deletes tag' do
+      request
+
+      expect(response).to be_successful
+      expect(response.body).to include("Tag was removed")
+
+      expect(project.repository.find_tag(tag.name)).not_to be_present
+    end
+  end
 end
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 688539f2a03..47d234df22b 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -78,6 +78,9 @@ RSpec.describe SessionsController do
     end
 
     context 'when using standard authentications' do
+      let(:user) { create(:user) }
+      let(:post_action) { post(:create, params: { user: { login: user.username, password: user.password } }) }
+
       context 'invalid password' do
         it 'does not authenticate user' do
           post(:create, params: { user: { login: 'invalid', password: 'invalid' } })
@@ -87,6 +90,26 @@ RSpec.describe SessionsController do
         end
       end
 
+      context 'a blocked user' do
+        it 'does not authenticate the user' do
+          user.block!
+          post_action
+
+          expect(@request.env['warden']).not_to be_authenticated
+          expect(flash[:alert]).to include('Your account has been blocked')
+        end
+      end
+
+      context 'an internal user' do
+        it 'does not authenticate the user' do
+          user.ghost!
+          post_action
+
+          expect(@request.env['warden']).not_to be_authenticated
+          expect(flash[:alert]).to include('Your account does not have the required permission to login')
+        end
+      end
+
       context 'when using valid password', :clean_gitlab_redis_shared_state do
         let(:user) { create(:user) }
         let(:user_params) { { login: user.username, password: user.password } }
diff --git a/spec/factories/issue_email_participants.rb b/spec/factories/issue_email_participants.rb
new file mode 100644
index 00000000000..730e224b01e
--- /dev/null
+++ b/spec/factories/issue_email_participants.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :issue_email_participant do
+    issue
+    email { generate(:email) }
+  end
+end
diff --git a/spec/factories/project_tracing_settings.rb b/spec/factories/project_tracing_settings.rb
new file mode 100644
index 00000000000..05c1529c18e
--- /dev/null
+++ b/spec/factories/project_tracing_settings.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :project_tracing_setting do
+    project
+    external_url { 'https://example.com' }
+  end
+end
diff --git a/spec/factories/usage_data.rb b/spec/factories/usage_data.rb
index a2eaee54ee9..2f7c6fde3e4 100644
--- a/spec/factories/usage_data.rb
+++ b/spec/factories/usage_data.rb
@@ -50,6 +50,9 @@ FactoryBot.define do
       create(:protected_branch, project: projects[0])
       create(:protected_branch, name: 'main', project: projects[0])
 
+      # Tracing
+      create(:project_tracing_setting, project: projects[0])
+
       # Incident Labeled Issues
       incident_label = create(:label, :incident, project: projects[0])
       create(:labeled_issue, project: projects[0], labels: [incident_label])
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 38f0b813183..e1df1c69351 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -130,6 +130,38 @@ RSpec.describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_n
         expect(user_internal_regex['placeholder']).to eq 'Regex pattern'
       end
 
+      context 'Change Sign-up restrictions' do
+        context 'Require Admin approval for new signup setting' do
+          context 'when feature is enabled' do
+            before do
+              stub_feature_flags(admin_approval_for_new_user_signups: true)
+            end
+
+            it 'changes the setting' do
+              page.within('.as-signup') do
+                check 'Require admin approval for new sign-ups'
+                click_button 'Save changes'
+              end
+
+              expect(current_settings.require_admin_approval_after_user_signup).to be_truthy
+              expect(page).to have_content "Application settings saved successfully"
+            end
+          end
+
+          context 'when feature is disabled' do
+            before do
+              stub_feature_flags(admin_approval_for_new_user_signups: false)
+            end
+
+            it 'does not show the the setting' do
+              page.within('.as-signup') do
+                expect(page).not_to have_selector('.application_setting_require_admin_approval_after_user_signup')
+              end
+            end
+          end
+        end
+      end
+
       it 'Change Sign-in restrictions' do
         page.within('.as-signin') do
           fill_in 'Home page URL', with: 'https://about.gitlab.com/'
diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index 346f305f0d0..5f58fa420fb 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -180,7 +180,7 @@ RSpec.describe 'Contributions Calendar', :js do
       before do
         push_code_contribution
 
-        Timecop.freeze(Date.yesterday) do
+        travel_to(Date.yesterday) do
           Issues::CreateService.new(contributed_project, user, issue_params).execute
         end
       end
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
index 40f6482c948..c8fc23bebf9 100644
--- a/spec/features/merge_request/batch_comments_spec.rb
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -41,7 +41,6 @@ RSpec.describe 'Merge request > Batch comments', :js do
       write_comment
 
       page.within('.review-bar-content') do
-        click_button 'Finish review'
         click_button 'Submit review'
       end
 
@@ -64,18 +63,6 @@ RSpec.describe 'Merge request > Batch comments', :js do
       expect(page).to have_selector('.note:not(.draft-note)', text: 'Line is wrong')
     end
 
-    it 'discards review' do
-      write_comment
-
-      click_button 'Discard review'
-
-      click_button 'Delete all pending comments'
-
-      wait_for_requests
-
-      expect(page).not_to have_selector('.draft-note-component')
-    end
-
     it 'deletes draft note' do
       write_comment
 
@@ -149,7 +136,6 @@ RSpec.describe 'Merge request > Batch comments', :js do
         write_reply_to_discussion(resolve: true)
 
         page.within('.review-bar-content') do
-          click_button 'Finish review'
           click_button 'Submit review'
         end
 
@@ -192,7 +178,6 @@ RSpec.describe 'Merge request > Batch comments', :js do
         write_reply_to_discussion(button_text: 'Start a review', unresolve: true)
 
         page.within('.review-bar-content') do
-          click_button 'Finish review'
           click_button 'Submit review'
         end
 
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 0e2444c5434..4224fdbc1fc 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -21,11 +21,11 @@ RSpec.describe 'Branches' do
       before do
         # Add 4 stale branches
         (1..4).reverse_each do |i|
-          Timecop.freeze((threshold + i).ago) { create_file(message: "a commit in stale-#{i}", branch_name: "stale-#{i}") }
+          travel_to((threshold + i).ago) { create_file(message: "a commit in stale-#{i}", branch_name: "stale-#{i}") }
         end
         # Add 6 active branches
         (1..6).each do |i|
-          Timecop.freeze((threshold - i).ago) { create_file(message: "a commit in active-#{i}", branch_name: "active-#{i}") }
+          travel_to((threshold - i).ago) { create_file(message: "a commit in active-#{i}", branch_name: "active-#{i}") }
         end
       end
 
diff --git a/spec/features/tags/developer_deletes_tag_spec.rb b/spec/features/tags/developer_deletes_tag_spec.rb
index de9296bc08e..7c4c6f54685 100644
--- a/spec/features/tags/developer_deletes_tag_spec.rb
+++ b/spec/features/tags/developer_deletes_tag_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Developer deletes tag' do
+RSpec.describe 'Developer deletes tag', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: group) }
@@ -13,11 +13,12 @@ RSpec.describe 'Developer deletes tag' do
     visit project_tags_path(project)
   end
 
-  context 'from the tags list page', :js do
+  context 'from the tags list page' do
     it 'deletes the tag' do
       expect(page).to have_content 'v1.1.0'
 
-      delete_tag 'v1.1.0'
+      container = page.find('.content .flex-row', text: 'v1.1.0')
+      delete_tag container
 
       expect(page).not_to have_content 'v1.1.0'
     end
@@ -29,15 +30,15 @@ RSpec.describe 'Developer deletes tag' do
       expect(current_path).to eq(
         project_tag_path(project, 'v1.0.0'))
 
-      click_on 'Delete tag'
+      container = page.find('.nav-controls')
+      delete_tag container
 
-      expect(current_path).to eq(
-        project_tags_path(project))
+      expect(current_path).to eq("#{project_tags_path(project)}/")
       expect(page).not_to have_content 'v1.0.0'
     end
   end
 
-  context 'when pre-receive hook fails', :js do
+  context 'when pre-receive hook fails' do
     before do
       allow_next_instance_of(Gitlab::GitalyClient::OperationService) do |instance|
         allow(instance).to receive(:rm_tag)
@@ -46,15 +47,17 @@ RSpec.describe 'Developer deletes tag' do
     end
 
     it 'shows the error message' do
-      delete_tag 'v1.1.0'
+      container = page.find('.content .flex-row', text: 'v1.1.0')
+      delete_tag container
 
       expect(page).to have_content('Do not delete tags')
     end
   end
 
-  def delete_tag(tag)
-    page.within('.content') do
-      accept_confirm { find("li > .row-fixed-content.controls a.btn-remove[href='/#{project.full_path}/-/tags/#{tag}']").click }
-    end
+  def delete_tag(container)
+    container.find('.js-remove-tag').click
+
+    page.within('.modal') { click_button('Delete tag') }
+    wait_for_requests
   end
 end
diff --git a/spec/frontend/batch_comments/components/preview_item_spec.js b/spec/frontend/batch_comments/components/preview_item_spec.js
index 2b63ece28ba..8ddad3dacfe 100644
--- a/spec/frontend/batch_comments/components/preview_item_spec.js
+++ b/spec/frontend/batch_comments/components/preview_item_spec.js
@@ -43,22 +43,6 @@ describe('Batch comments draft preview item component', () => {
     );
   });
 
-  it('adds is last class', () => {
-    createComponent(true);
-
-    expect(vm.$el.classList).toContain('is-last');
-  });
-
-  it('scrolls to draft on click', () => {
-    createComponent();
-
-    jest.spyOn(vm.$store, 'dispatch').mockImplementation();
-
-    vm.$el.click();
-
-    expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/scrollToDraft', vm.draft);
-  });
-
   describe('for file', () => {
     it('renders file path', () => {
       createComponent(false, { file_path: 'index.js', file_hash: 'abc', position: {} });
diff --git a/spec/frontend/batch_comments/components/publish_button_spec.js b/spec/frontend/batch_comments/components/publish_button_spec.js
index 4362f62c7f8..4032713150c 100644
--- a/spec/frontend/batch_comments/components/publish_button_spec.js
+++ b/spec/frontend/batch_comments/components/publish_button_spec.js
@@ -29,17 +29,6 @@ describe('Batch comments publish button component', () => {
     expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/publishReview', undefined);
   });
 
-  it('dispatches toggleReviewDropdown when shouldPublish is false on click', () => {
-    vm.shouldPublish = false;
-
-    vm.$el.click();
-
-    expect(vm.$store.dispatch).toHaveBeenCalledWith(
-      'batchComments/toggleReviewDropdown',
-      undefined,
-    );
-  });
-
   it('sets loading when isPublishing is true', done => {
     vm.$store.state.batchComments.isPublishing = true;
 
diff --git a/spec/frontend/batch_comments/components/publish_dropdown_spec.js b/spec/frontend/batch_comments/components/publish_dropdown_spec.js
index fb3c532174d..f235867f002 100644
--- a/spec/frontend/batch_comments/components/publish_dropdown_spec.js
+++ b/spec/frontend/batch_comments/components/publish_dropdown_spec.js
@@ -1,96 +1,39 @@
-import Vue from 'vue';
-import { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
+import Vuex from 'vuex';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import PreviewDropdown from '~/batch_comments/components/preview_dropdown.vue';
 import { createStore } from '~/mr_notes/stores';
 import '~/behaviors/markdown/render_gfm';
 import { createDraft } from '../mock_data';
 
-describe('Batch comments publish dropdown component', () => {
-  let vm;
-  let Component;
+const localVue = createLocalVue();
+localVue.use(Vuex);
 
-  function createComponent(extendStore = () => {}) {
+describe('Batch comments publish dropdown component', () => {
+  let wrapper;
+
+  function createComponent() {
     const store = createStore();
     store.state.batchComments.drafts.push(createDraft(), { ...createDraft(), id: 2 });
 
-    extendStore(store);
-
-    vm = mountComponentWithStore(Component, { store });
+    wrapper = shallowMount(PreviewDropdown, {
+      store,
+    });
   }
 
-  beforeAll(() => {
-    Component = Vue.extend(PreviewDropdown);
-  });
-
   afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('toggles dropdown when clicking button', done => {
-    createComponent();
-
-    jest.spyOn(vm.$store, 'dispatch');
-
-    vm.$el.querySelector('.review-preview-dropdown-toggle').click();
-
-    expect(vm.$store.dispatch).toHaveBeenCalledWith(
-      'batchComments/toggleReviewDropdown',
-      expect.anything(),
-    );
-
-    setImmediate(() => {
-      expect(vm.$el.classList).toContain('show');
-
-      done();
-    });
-  });
-
-  it('toggles dropdown when clicking body', () => {
-    createComponent();
-
-    vm.$store.state.batchComments.showPreviewDropdown = true;
-
-    jest.spyOn(vm.$store, 'dispatch').mockImplementation();
-
-    document.body.click();
-
-    expect(vm.$store.dispatch).toHaveBeenCalledWith(
-      'batchComments/toggleReviewDropdown',
-      undefined,
-    );
+    wrapper.destroy();
   });
 
   it('renders list of drafts', () => {
-    createComponent(store => {
-      Object.assign(store.state.notes, {
-        isNotesFetched: true,
-      });
-    });
+    createComponent();
 
-    expect(vm.$el.querySelectorAll('.dropdown-content li').length).toBe(2);
-  });
-
-  it('adds is-last class to last item', () => {
-    createComponent(store => {
-      Object.assign(store.state.notes, {
-        isNotesFetched: true,
-      });
-    });
-
-    expect(vm.$el.querySelectorAll('.dropdown-content li')[1].querySelector('.is-last')).not.toBe(
-      null,
-    );
+    expect(wrapper.findAll(GlDropdownItem).length).toBe(2);
   });
 
   it('renders draft count in dropdown title', () => {
     createComponent();
 
-    expect(vm.$el.querySelector('.dropdown-title').textContent).toContain('2 pending comments');
-  });
-
-  it('renders publish button in footer', () => {
-    createComponent();
-
-    expect(vm.$el.querySelector('.dropdown-footer .js-publish-draft-button')).not.toBe(null);
+    expect(wrapper.find(GlDropdown).props('headerText')).toEqual('2 pending comments');
   });
 });
diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
index a6942115649..e66f36aa3a2 100644
--- a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
+++ b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
@@ -199,42 +199,6 @@ describe('Batch comments store actions', () => {
     });
   });
 
-  describe('discardReview', () => {
-    it('commits mutations', done => {
-      const getters = {
-        getNotesData: { draftsDiscardPath: TEST_HOST },
-      };
-      const commit = jest.fn();
-      mock.onAny().reply(200);
-
-      actions
-        .discardReview({ getters, commit })
-        .then(() => {
-          expect(commit.mock.calls[0]).toEqual(['REQUEST_DISCARD_REVIEW']);
-          expect(commit.mock.calls[1]).toEqual(['RECEIVE_DISCARD_REVIEW_SUCCESS']);
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('commits error mutations', done => {
-      const getters = {
-        getNotesData: { draftsDiscardPath: TEST_HOST },
-      };
-      const commit = jest.fn();
-      mock.onAny().reply(500);
-
-      actions
-        .discardReview({ getters, commit })
-        .then(() => {
-          expect(commit.mock.calls[0]).toEqual(['REQUEST_DISCARD_REVIEW']);
-          expect(commit.mock.calls[1]).toEqual(['RECEIVE_DISCARD_REVIEW_ERROR']);
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-
   describe('updateDraft', () => {
     let getters;
 
@@ -284,56 +248,6 @@ describe('Batch comments store actions', () => {
     });
   });
 
-  describe('toggleReviewDropdown', () => {
-    it('dispatches openReviewDropdown', done => {
-      testAction(
-        actions.toggleReviewDropdown,
-        null,
-        { showPreviewDropdown: false },
-        [],
-        [{ type: 'openReviewDropdown' }],
-        done,
-      );
-    });
-
-    it('dispatches closeReviewDropdown when showPreviewDropdown is true', done => {
-      testAction(
-        actions.toggleReviewDropdown,
-        null,
-        { showPreviewDropdown: true },
-        [],
-        [{ type: 'closeReviewDropdown' }],
-        done,
-      );
-    });
-  });
-
-  describe('openReviewDropdown', () => {
-    it('commits OPEN_REVIEW_DROPDOWN', done => {
-      testAction(
-        actions.openReviewDropdown,
-        null,
-        null,
-        [{ type: 'OPEN_REVIEW_DROPDOWN' }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('closeReviewDropdown', () => {
-    it('commits CLOSE_REVIEW_DROPDOWN', done => {
-      testAction(
-        actions.closeReviewDropdown,
-        null,
-        null,
-        [{ type: 'CLOSE_REVIEW_DROPDOWN' }],
-        [],
-        done,
-      );
-    });
-  });
-
   describe('expandAllDiscussions', () => {
     it('dispatches expandDiscussion for all drafts', done => {
       const state = {
@@ -383,9 +297,7 @@ describe('Batch comments store actions', () => {
 
       actions.scrollToDraft({ dispatch, rootGetters }, draft);
 
-      expect(dispatch.mock.calls[0]).toEqual(['closeReviewDropdown']);
-
-      expect(dispatch.mock.calls[1]).toEqual([
+      expect(dispatch.mock.calls[0]).toEqual([
         'expandDiscussion',
         { discussionId: '1' },
         { root: true },
diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js
index a86726269ef..1406f66fd10 100644
--- a/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js
+++ b/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js
@@ -89,42 +89,6 @@ describe('Batch comments mutations', () => {
     });
   });
 
-  describe(types.REQUEST_DISCARD_REVIEW, () => {
-    it('sets isDiscarding to true', () => {
-      mutations[types.REQUEST_DISCARD_REVIEW](state);
-
-      expect(state.isDiscarding).toBe(true);
-    });
-  });
-
-  describe(types.RECEIVE_DISCARD_REVIEW_SUCCESS, () => {
-    it('emptys drafts array', () => {
-      state.drafts.push('test');
-
-      mutations[types.RECEIVE_DISCARD_REVIEW_SUCCESS](state);
-
-      expect(state.drafts).toEqual([]);
-    });
-
-    it('sets isDiscarding to false', () => {
-      state.isDiscarding = true;
-
-      mutations[types.RECEIVE_DISCARD_REVIEW_SUCCESS](state);
-
-      expect(state.isDiscarding).toBe(false);
-    });
-  });
-
-  describe(types.RECEIVE_DISCARD_REVIEW_ERROR, () => {
-    it('updates isDiscarding to false', () => {
-      state.isDiscarding = true;
-
-      mutations[types.RECEIVE_DISCARD_REVIEW_ERROR](state);
-
-      expect(state.isDiscarding).toBe(false);
-    });
-  });
-
   describe(types.RECEIVE_DRAFT_UPDATE_SUCCESS, () => {
     it('updates draft in store', () => {
       state.drafts.push({ id: 1 });
@@ -140,20 +104,4 @@ describe('Batch comments mutations', () => {
       ]);
     });
   });
-
-  describe(types.OPEN_REVIEW_DROPDOWN, () => {
-    it('sets showPreviewDropdown to true', () => {
-      mutations[types.OPEN_REVIEW_DROPDOWN](state);
-
-      expect(state.showPreviewDropdown).toBe(true);
-    });
-  });
-
-  describe(types.CLOSE_REVIEW_DROPDOWN, () => {
-    it('sets showPreviewDropdown to false', () => {
-      mutations[types.CLOSE_REVIEW_DROPDOWN](state);
-
-      expect(state.showPreviewDropdown).toBe(false);
-    });
-  });
 });
diff --git a/spec/frontend/groups/components/item_actions_spec.js b/spec/frontend/groups/components/item_actions_spec.js
index f5df8c180d5..d4aa29eaadd 100644
--- a/spec/frontend/groups/components/item_actions_spec.js
+++ b/spec/frontend/groups/components/item_actions_spec.js
@@ -1,84 +1,87 @@
-import Vue from 'vue';
-
-import mountComponent from 'helpers/vue_mount_component_helper';
-import itemActionsComponent from '~/groups/components/item_actions.vue';
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon } from '@gitlab/ui';
+import ItemActions from '~/groups/components/item_actions.vue';
 import eventHub from '~/groups/event_hub';
 import { mockParentGroupItem, mockChildren } from '../mock_data';
 
-const createComponent = (group = mockParentGroupItem, parentGroup = mockChildren[0]) => {
-  const Component = Vue.extend(itemActionsComponent);
+describe('ItemActions', () => {
+  let wrapper;
+  const parentGroup = mockChildren[0];
 
-  return mountComponent(Component, {
-    group,
+  const defaultProps = {
+    group: mockParentGroupItem,
     parentGroup,
-  });
-};
+  };
 
-describe('ItemActionsComponent', () => {
-  let vm;
-
-  beforeEach(() => {
-    vm = createComponent();
-  });
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(ItemActions, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
 
   afterEach(() => {
-    vm.$destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
-  describe('methods', () => {
-    describe('onLeaveGroup', () => {
-      it('emits `showLeaveGroupModal` event with `group` and `parentGroup` props', () => {
-        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
-        vm.onLeaveGroup();
+  const findEditGroupBtn = () => wrapper.find('[data-testid="edit-group-btn"]');
+  const findEditGroupIcon = () => findEditGroupBtn().find(GlIcon);
+  const findLeaveGroupBtn = () => wrapper.find('[data-testid="leave-group-btn"]');
+  const findLeaveGroupIcon = () => findLeaveGroupBtn().find(GlIcon);
 
-        expect(eventHub.$emit).toHaveBeenCalledWith(
-          'showLeaveGroupModal',
-          vm.group,
-          vm.parentGroup,
-        );
+  describe('template', () => {
+    it('renders component template correctly', () => {
+      createComponent();
+
+      expect(wrapper.classes()).toContain('controls');
+    });
+
+    it('renders "Edit group" button with correct attribute values', () => {
+      const group = {
+        ...mockParentGroupItem,
+        canEdit: true,
+      };
+
+      createComponent({ group });
+
+      expect(findEditGroupBtn().exists()).toBe(true);
+      expect(findEditGroupBtn().classes()).toContain('no-expand');
+      expect(findEditGroupBtn().attributes('href')).toBe(group.editPath);
+      expect(findEditGroupBtn().attributes('aria-label')).toBe('Edit group');
+      expect(findEditGroupBtn().attributes('data-original-title')).toBe('Edit group');
+      expect(findEditGroupIcon().exists()).toBe(true);
+      expect(findEditGroupIcon().props('name')).toBe('settings');
+    });
+
+    describe('`canLeave` is true', () => {
+      const group = {
+        ...mockParentGroupItem,
+        canLeave: true,
+      };
+
+      beforeEach(() => {
+        createComponent({ group });
+      });
+
+      it('renders "Leave this group" button with correct attribute values', () => {
+        expect(findLeaveGroupBtn().exists()).toBe(true);
+        expect(findLeaveGroupBtn().classes()).toContain('no-expand');
+        expect(findLeaveGroupBtn().attributes('href')).toBe(group.leavePath);
+        expect(findLeaveGroupBtn().attributes('aria-label')).toBe('Leave this group');
+        expect(findLeaveGroupBtn().attributes('data-original-title')).toBe('Leave this group');
+        expect(findLeaveGroupIcon().exists()).toBe(true);
+        expect(findLeaveGroupIcon().props('name')).toBe('leave');
+      });
+
+      it('emits event on "Leave this group" button click', () => {
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+
+        findLeaveGroupBtn().trigger('click');
+
+        expect(eventHub.$emit).toHaveBeenCalledWith('showLeaveGroupModal', group, parentGroup);
       });
     });
   });
-
-  describe('template', () => {
-    it('should render component template correctly', () => {
-      expect(vm.$el.classList.contains('controls')).toBeTruthy();
-    });
-
-    it('should render Edit Group button with correct attribute values', () => {
-      const group = { ...mockParentGroupItem };
-      group.canEdit = true;
-      const newVm = createComponent(group);
-
-      const editBtn = newVm.$el.querySelector('a.edit-group');
-
-      expect(editBtn).toBeDefined();
-      expect(editBtn.classList.contains('no-expand')).toBeTruthy();
-      expect(editBtn.getAttribute('href')).toBe(group.editPath);
-      expect(editBtn.getAttribute('aria-label')).toBe('Edit group');
-      expect(editBtn.dataset.originalTitle).toBe('Edit group');
-      expect(editBtn.querySelectorAll('svg').length).not.toBe(0);
-      expect(editBtn.querySelector('svg').getAttribute('data-testid')).toBe('settings-icon');
-
-      newVm.$destroy();
-    });
-
-    it('should render Leave Group button with correct attribute values', () => {
-      const group = { ...mockParentGroupItem };
-      group.canLeave = true;
-      const newVm = createComponent(group);
-
-      const leaveBtn = newVm.$el.querySelector('a.leave-group');
-
-      expect(leaveBtn).toBeDefined();
-      expect(leaveBtn.classList.contains('no-expand')).toBeTruthy();
-      expect(leaveBtn.getAttribute('href')).toBe(group.leavePath);
-      expect(leaveBtn.getAttribute('aria-label')).toBe('Leave this group');
-      expect(leaveBtn.dataset.originalTitle).toBe('Leave this group');
-      expect(leaveBtn.querySelectorAll('svg').length).not.toBe(0);
-      expect(leaveBtn.querySelector('svg').getAttribute('data-testid')).toBe('leave-icon');
-
-      newVm.$destroy();
-    });
-  });
 });
diff --git a/spec/frontend/groups/components/item_caret_spec.js b/spec/frontend/groups/components/item_caret_spec.js
index 4ff7482414c..b2915607a06 100644
--- a/spec/frontend/groups/components/item_caret_spec.js
+++ b/spec/frontend/groups/components/item_caret_spec.js
@@ -1,38 +1,48 @@
-import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon } from '@gitlab/ui';
+import ItemCaret from '~/groups/components/item_caret.vue';
 
-import mountComponent from 'helpers/vue_mount_component_helper';
-import itemCaretComponent from '~/groups/components/item_caret.vue';
+describe('ItemCaret', () => {
+  let wrapper;
 
-const createComponent = (isGroupOpen = false) => {
-  const Component = Vue.extend(itemCaretComponent);
+  const defaultProps = {
+    isGroupOpen: false,
+  };
 
-  return mountComponent(Component, {
-    isGroupOpen,
-  });
-};
-
-describe('ItemCaretComponent', () => {
-  let vm;
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(ItemCaret, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
 
   afterEach(() => {
-    vm.$destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
+  const findAllGlIcons = () => wrapper.findAll(GlIcon);
+  const findGlIcon = () => wrapper.find(GlIcon);
+
   describe('template', () => {
-    it('should render component template correctly', () => {
-      vm = createComponent();
-      expect(vm.$el.classList.contains('folder-caret')).toBeTruthy();
-      expect(vm.$el.querySelectorAll('svg').length).toBe(1);
+    it('renders component template correctly', () => {
+      createComponent();
+
+      expect(wrapper.classes()).toContain('folder-caret');
+      expect(findAllGlIcons()).toHaveLength(1);
     });
 
-    it('should render caret down icon if `isGroupOpen` prop is `true`', () => {
-      vm = createComponent(true);
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).toBe('angle-down-icon');
-    });
+    it.each`
+      isGroupOpen | icon
+      ${true}     | ${'angle-down'}
+      ${false}    | ${'angle-right'}
+    `('renders "$icon" icon when `isGroupOpen` is $isGroupOpen', ({ isGroupOpen, icon }) => {
+      createComponent({
+        isGroupOpen,
+      });
 
-    it('should render caret right icon if `isGroupOpen` prop is `false`', () => {
-      vm = createComponent();
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).toBe('angle-right-icon');
+      expect(findGlIcon().props('name')).toBe(icon);
     });
   });
 });
diff --git a/spec/frontend/groups/components/item_stats_spec.js b/spec/frontend/groups/components/item_stats_spec.js
index 771643609ec..d8c88a608ac 100644
--- a/spec/frontend/groups/components/item_stats_spec.js
+++ b/spec/frontend/groups/components/item_stats_spec.js
@@ -1,119 +1,50 @@
-import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
+import ItemStats from '~/groups/components/item_stats.vue';
+import ItemStatsValue from '~/groups/components/item_stats_value.vue';
 
-import mountComponent from 'helpers/vue_mount_component_helper';
-import itemStatsComponent from '~/groups/components/item_stats.vue';
-import {
-  mockParentGroupItem,
-  ITEM_TYPE,
-  VISIBILITY_TYPE_ICON,
-  GROUP_VISIBILITY_TYPE,
-  PROJECT_VISIBILITY_TYPE,
-} from '../mock_data';
+import { mockParentGroupItem, ITEM_TYPE } from '../mock_data';
 
-const createComponent = (item = mockParentGroupItem) => {
-  const Component = Vue.extend(itemStatsComponent);
+describe('ItemStats', () => {
+  let wrapper;
 
-  return mountComponent(Component, {
-    item,
+  const defaultProps = {
+    item: mockParentGroupItem,
+  };
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(ItemStats, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
-};
 
-describe('ItemStatsComponent', () => {
-  describe('computed', () => {
-    describe('visibilityIcon', () => {
-      it('should return icon class based on `item.visibility` value', () => {
-        Object.keys(VISIBILITY_TYPE_ICON).forEach(visibility => {
-          const item = { ...mockParentGroupItem, visibility };
-          const vm = createComponent(item);
-
-          expect(vm.visibilityIcon).toBe(VISIBILITY_TYPE_ICON[visibility]);
-          vm.$destroy();
-        });
-      });
-    });
-
-    describe('visibilityTooltip', () => {
-      it('should return tooltip string for Group based on `item.visibility` value', () => {
-        Object.keys(GROUP_VISIBILITY_TYPE).forEach(visibility => {
-          const item = { ...mockParentGroupItem, visibility, type: ITEM_TYPE.GROUP };
-          const vm = createComponent(item);
-
-          expect(vm.visibilityTooltip).toBe(GROUP_VISIBILITY_TYPE[visibility]);
-          vm.$destroy();
-        });
-      });
-
-      it('should return tooltip string for Project based on `item.visibility` value', () => {
-        Object.keys(PROJECT_VISIBILITY_TYPE).forEach(visibility => {
-          const item = { ...mockParentGroupItem, visibility, type: ITEM_TYPE.PROJECT };
-          const vm = createComponent(item);
-
-          expect(vm.visibilityTooltip).toBe(PROJECT_VISIBILITY_TYPE[visibility]);
-          vm.$destroy();
-        });
-      });
-    });
-
-    describe('isProject', () => {
-      it('should return boolean value representing whether `item.type` is Project or not', () => {
-        let item;
-        let vm;
-
-        item = { ...mockParentGroupItem, type: ITEM_TYPE.PROJECT };
-        vm = createComponent(item);
-
-        expect(vm.isProject).toBeTruthy();
-        vm.$destroy();
-
-        item = { ...mockParentGroupItem, type: ITEM_TYPE.GROUP };
-        vm = createComponent(item);
-
-        expect(vm.isProject).toBeFalsy();
-        vm.$destroy();
-      });
-    });
-
-    describe('isGroup', () => {
-      it('should return boolean value representing whether `item.type` is Group or not', () => {
-        let item;
-        let vm;
-
-        item = { ...mockParentGroupItem, type: ITEM_TYPE.GROUP };
-        vm = createComponent(item);
-
-        expect(vm.isGroup).toBeTruthy();
-        vm.$destroy();
-
-        item = { ...mockParentGroupItem, type: ITEM_TYPE.PROJECT };
-        vm = createComponent(item);
-
-        expect(vm.isGroup).toBeFalsy();
-        vm.$destroy();
-      });
-    });
-  });
+  const findItemStatsValue = () => wrapper.find(ItemStatsValue);
 
   describe('template', () => {
     it('renders component container element correctly', () => {
-      const vm = createComponent();
+      createComponent();
 
-      expect(vm.$el.classList.contains('stats')).toBeTruthy();
-
-      vm.$destroy();
+      expect(wrapper.classes()).toContain('stats');
     });
 
     it('renders start count and last updated information for project item correctly', () => {
-      const item = { ...mockParentGroupItem, type: ITEM_TYPE.PROJECT, starCount: 4 };
-      const vm = createComponent(item);
+      const item = {
+        ...mockParentGroupItem,
+        type: ITEM_TYPE.PROJECT,
+        starCount: 4,
+      };
 
-      const projectStarIconEl = vm.$el.querySelector('.project-stars');
+      createComponent({ item });
 
-      expect(projectStarIconEl).not.toBeNull();
-      expect(projectStarIconEl.querySelectorAll('svg').length).toBeGreaterThan(0);
-      expect(projectStarIconEl.querySelectorAll('.stat-value').length).toBeGreaterThan(0);
-      expect(vm.$el.querySelectorAll('.last-updated').length).toBeGreaterThan(0);
-
-      vm.$destroy();
+      expect(findItemStatsValue().exists()).toBe(true);
+      expect(findItemStatsValue().props('cssClass')).toBe('project-stars');
+      expect(wrapper.contains('.last-updated')).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/groups/components/item_stats_value_spec.js b/spec/frontend/groups/components/item_stats_value_spec.js
index 11246390444..6f018aa79a0 100644
--- a/spec/frontend/groups/components/item_stats_value_spec.js
+++ b/spec/frontend/groups/components/item_stats_value_spec.js
@@ -1,82 +1,67 @@
-import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon } from '@gitlab/ui';
+import ItemStatsValue from '~/groups/components/item_stats_value.vue';
 
-import mountComponent from 'helpers/vue_mount_component_helper';
-import itemStatsValueComponent from '~/groups/components/item_stats_value.vue';
+describe('ItemStatsValue', () => {
+  let wrapper;
 
-const createComponent = ({ title, cssClass, iconName, tooltipPlacement, value }) => {
-  const Component = Vue.extend(itemStatsValueComponent);
+  const defaultProps = {
+    title: 'Subgroups',
+    cssClass: 'number-subgroups',
+    iconName: 'folder',
+    tooltipPlacement: 'left',
+  };
 
-  return mountComponent(Component, {
-    title,
-    cssClass,
-    iconName,
-    tooltipPlacement,
-    value,
-  });
-};
-
-describe('ItemStatsValueComponent', () => {
-  describe('computed', () => {
-    let vm;
-    const itemConfig = {
-      title: 'Subgroups',
-      cssClass: 'number-subgroups',
-      iconName: 'folder',
-      tooltipPlacement: 'left',
-    };
-
-    describe('isValuePresent', () => {
-      it('returns true if non-empty `value` is present', () => {
-        vm = createComponent({ ...itemConfig, value: 10 });
-
-        expect(vm.isValuePresent).toBeTruthy();
-      });
-
-      it('returns false if empty `value` is present', () => {
-        vm = createComponent(itemConfig);
-
-        expect(vm.isValuePresent).toBeFalsy();
-      });
-
-      afterEach(() => {
-        vm.$destroy();
-      });
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(ItemStatsValue, {
+      propsData: { ...defaultProps, ...props },
     });
+  };
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
+  const findGlIcon = () => wrapper.find(GlIcon);
+  const findStatValue = () => wrapper.find('[data-testid="itemStatValue"]');
+
   describe('template', () => {
-    let vm;
-    beforeEach(() => {
-      vm = createComponent({
-        title: 'Subgroups',
-        cssClass: 'number-subgroups',
-        iconName: 'folder',
-        tooltipPlacement: 'left',
-        value: 10,
+    describe('when `value` is not provided', () => {
+      it('does not render value count', () => {
+        createComponent();
+
+        expect(findStatValue().exists()).toBe(false);
       });
     });
 
-    afterEach(() => {
-      vm.$destroy();
-    });
+    describe('when `value` is provided', () => {
+      beforeEach(() => {
+        createComponent({
+          value: 10,
+        });
+      });
 
-    it('renders component element correctly', () => {
-      expect(vm.$el.classList.contains('number-subgroups')).toBeTruthy();
-      expect(vm.$el.querySelectorAll('svg').length).toBeGreaterThan(0);
-      expect(vm.$el.querySelectorAll('.stat-value').length).toBeGreaterThan(0);
-    });
+      it('renders component element correctly', () => {
+        expect(wrapper.classes()).toContain('number-subgroups');
+      });
 
-    it('renders element tooltip correctly', () => {
-      expect(vm.$el.dataset.originalTitle).toBe('Subgroups');
-      expect(vm.$el.dataset.placement).toBe('left');
-    });
+      it('renders element tooltip correctly', () => {
+        expect(wrapper.attributes('data-original-title')).toBe('Subgroups');
+        expect(wrapper.attributes('data-placement')).toBe('left');
+      });
 
-    it('renders element icon correctly', () => {
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).toBe('folder-icon');
-    });
+      it('renders element icon correctly', () => {
+        expect(findGlIcon().exists()).toBe(true);
+        expect(findGlIcon().props('name')).toBe('folder');
+      });
 
-    it('renders value count correctly', () => {
-      expect(vm.$el.querySelector('.stat-value').innerText.trim()).toContain('10');
+      it('renders value count correctly', () => {
+        expect(findStatValue().classes()).toContain('stat-value');
+        expect(findStatValue().text()).toBe('10');
+      });
     });
   });
 });
diff --git a/spec/frontend/groups/components/item_type_icon_spec.js b/spec/frontend/groups/components/item_type_icon_spec.js
index 477c413ddcd..5e7056be218 100644
--- a/spec/frontend/groups/components/item_type_icon_spec.js
+++ b/spec/frontend/groups/components/item_type_icon_spec.js
@@ -1,53 +1,53 @@
-import Vue from 'vue';
-
-import mountComponent from 'helpers/vue_mount_component_helper';
-import itemTypeIconComponent from '~/groups/components/item_type_icon.vue';
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon } from '@gitlab/ui';
+import ItemTypeIcon from '~/groups/components/item_type_icon.vue';
 import { ITEM_TYPE } from '../mock_data';
 
-const createComponent = (itemType = ITEM_TYPE.GROUP, isGroupOpen = false) => {
-  const Component = Vue.extend(itemTypeIconComponent);
+describe('ItemTypeIcon', () => {
+  let wrapper;
 
-  return mountComponent(Component, {
-    itemType,
-    isGroupOpen,
+  const defaultProps = {
+    itemType: ITEM_TYPE.GROUP,
+    isGroupOpen: false,
+  };
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(ItemTypeIcon, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
-};
 
-describe('ItemTypeIconComponent', () => {
+  const findGlIcon = () => wrapper.find(GlIcon);
+
   describe('template', () => {
-    it('should render component template correctly', () => {
-      const vm = createComponent();
+    it('renders component template correctly', () => {
+      createComponent();
 
-      expect(vm.$el.classList.contains('item-type-icon')).toBeTruthy();
-      vm.$destroy();
+      expect(wrapper.classes()).toContain('item-type-icon');
     });
 
-    it('should render folder open or close icon based `isGroupOpen` prop value', () => {
-      let vm;
-
-      vm = createComponent(ITEM_TYPE.GROUP, true);
-
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).toBe('folder-open-icon');
-      vm.$destroy();
-
-      vm = createComponent(ITEM_TYPE.GROUP);
-
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).toBe('folder-o-icon');
-      vm.$destroy();
-    });
-
-    it('should render bookmark icon based on `isProject` prop value', () => {
-      let vm;
-
-      vm = createComponent(ITEM_TYPE.PROJECT);
-
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).toBe('bookmark-icon');
-      vm.$destroy();
-
-      vm = createComponent(ITEM_TYPE.GROUP);
-
-      expect(vm.$el.querySelector('svg').getAttribute('data-testid')).not.toBe('bookmark-icon');
-      vm.$destroy();
-    });
+    it.each`
+      type                 | isGroupOpen | icon
+      ${ITEM_TYPE.GROUP}   | ${true}     | ${'folder-open'}
+      ${ITEM_TYPE.GROUP}   | ${false}    | ${'folder-o'}
+      ${ITEM_TYPE.PROJECT} | ${true}     | ${'bookmark'}
+      ${ITEM_TYPE.PROJECT} | ${false}    | ${'bookmark'}
+    `(
+      'shows "$icon" icon when `itemType` is "$type" and `isGroupOpen` is $isGroupOpen',
+      ({ type, isGroupOpen, icon }) => {
+        createComponent({
+          itemType: type,
+          isGroupOpen,
+        });
+        expect(findGlIcon().props('name')).toBe(icon);
+      },
+    );
   });
 });
diff --git a/spec/frontend/lib/utils/url_utility_spec.js b/spec/frontend/lib/utils/url_utility_spec.js
index 3cc675d2007..2afc1694281 100644
--- a/spec/frontend/lib/utils/url_utility_spec.js
+++ b/spec/frontend/lib/utils/url_utility_spec.js
@@ -701,6 +701,18 @@ describe('URL utility', () => {
     });
   });
 
+  describe('stripFinalUrlSegment', () => {
+    it.each`
+      path                                                        | expected
+      ${'http://fake.domain/twitter/typeahead-js/-/tags/v0.11.0'} | ${'http://fake.domain/twitter/typeahead-js/-/tags/'}
+      ${'http://fake.domain/bar/cool/-/nested/content'}           | ${'http://fake.domain/bar/cool/-/nested/'}
+      ${'http://fake.domain/bar/cool?q="search"'}                 | ${'http://fake.domain/bar/'}
+      ${'http://fake.domain/bar/cool#link-to-something'}          | ${'http://fake.domain/bar/'}
+    `('stripFinalUrlSegment $path => $expected', ({ path, expected }) => {
+      expect(urlUtils.stripFinalUrlSegment(path)).toBe(expected);
+    });
+  });
+
   describe('escapeFileUrl', () => {
     it('encodes URL excluding the slashes', () => {
       expect(urlUtils.escapeFileUrl('/foo-bar/file.md')).toBe('/foo-bar/file.md');
diff --git a/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js b/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js
new file mode 100644
index 00000000000..17821d8be31
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js
@@ -0,0 +1,71 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlAlert, GlSprintf } from '@gitlab/ui';
+import component from '~/registry/explorer/components/details_page/partial_cleanup_alert.vue';
+import { DELETE_ALERT_TITLE, DELETE_ALERT_LINK_TEXT } from '~/registry/explorer/constants';
+
+describe('Partial Cleanup alert', () => {
+  let wrapper;
+
+  const findAlert = () => wrapper.find(GlAlert);
+  const findRunLink = () => wrapper.find('[data-testid="run-link"');
+  const findHelpLink = () => wrapper.find('[data-testid="help-link"');
+
+  const mountComponent = () => {
+    wrapper = shallowMount(component, {
+      stubs: { GlSprintf },
+      propsData: {
+        runCleanupPoliciesHelpPagePath: 'foo',
+        cleanupPoliciesHelpPagePath: 'bar',
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it(`gl-alert has the correct properties`, () => {
+    mountComponent();
+
+    expect(findAlert().props()).toMatchObject({
+      title: DELETE_ALERT_TITLE,
+      variant: 'warning',
+    });
+  });
+
+  it('has the right text', () => {
+    mountComponent();
+
+    expect(wrapper.text()).toMatchInterpolatedText(DELETE_ALERT_LINK_TEXT);
+  });
+
+  it('contains run link', () => {
+    mountComponent();
+
+    const link = findRunLink();
+    expect(link.exists()).toBe(true);
+    expect(link.attributes()).toMatchObject({
+      href: 'foo',
+      target: '_blank',
+    });
+  });
+
+  it('contains help link', () => {
+    mountComponent();
+
+    const link = findHelpLink();
+    expect(link.exists()).toBe(true);
+    expect(link.attributes()).toMatchObject({
+      href: 'bar',
+      target: '_blank',
+    });
+  });
+
+  it('GlAlert dismiss event triggers a dismiss event', () => {
+    mountComponent();
+
+    findAlert().vm.$emit('dismiss');
+    expect(wrapper.emitted('dismiss')).toEqual([[]]);
+  });
+});
diff --git a/spec/frontend/registry/explorer/pages/details_spec.js b/spec/frontend/registry/explorer/pages/details_spec.js
index 66e8a4aea0d..86b52c4f06a 100644
--- a/spec/frontend/registry/explorer/pages/details_spec.js
+++ b/spec/frontend/registry/explorer/pages/details_spec.js
@@ -3,6 +3,7 @@ import { GlPagination } from '@gitlab/ui';
 import Tracking from '~/tracking';
 import component from '~/registry/explorer/pages/details.vue';
 import DeleteAlert from '~/registry/explorer/components/details_page/delete_alert.vue';
+import PartialCleanupAlert from '~/registry/explorer/components/details_page/partial_cleanup_alert.vue';
 import DetailsHeader from '~/registry/explorer/components/details_page/details_header.vue';
 import TagsLoader from '~/registry/explorer/components/details_page/tags_loader.vue';
 import TagsList from '~/registry/explorer/components/details_page/tags_list.vue';
@@ -30,8 +31,10 @@ describe('Details Page', () => {
   const findDeleteAlert = () => wrapper.find(DeleteAlert);
   const findDetailsHeader = () => wrapper.find(DetailsHeader);
   const findEmptyTagsState = () => wrapper.find(EmptyTagsState);
+  const findPartialCleanupAlert = () => wrapper.find(PartialCleanupAlert);
 
-  const routeId = window.btoa(JSON.stringify({ name: 'foo', tags_path: 'bar' }));
+  const routeIdGenerator = override =>
+    window.btoa(JSON.stringify({ name: 'foo', tags_path: 'bar', ...override }));
 
   const tagsArrayToSelectedTags = tags =>
     tags.reduce((acc, c) => {
@@ -39,7 +42,7 @@ describe('Details Page', () => {
       return acc;
     }, {});
 
-  const mountComponent = options => {
+  const mountComponent = ({ options, routeParams } = {}) => {
     wrapper = shallowMount(component, {
       store,
       stubs: {
@@ -48,7 +51,7 @@ describe('Details Page', () => {
       mocks: {
         $route: {
           params: {
-            id: routeId,
+            id: routeIdGenerator(routeParams),
           },
         },
       },
@@ -224,7 +227,7 @@ describe('Details Page', () => {
           findDeleteModal().vm.$emit('confirmDelete');
           expect(dispatchSpy).toHaveBeenCalledWith('requestDeleteTag', {
             tag: store.state.tags[0],
-            params: routeId,
+            params: routeIdGenerator(),
           });
         });
       });
@@ -239,7 +242,7 @@ describe('Details Page', () => {
           findDeleteModal().vm.$emit('confirmDelete');
           expect(dispatchSpy).toHaveBeenCalledWith('requestDeleteTags', {
             ids: store.state.tags.map(t => t.name),
-            params: routeId,
+            params: routeIdGenerator(),
           });
         });
       });
@@ -273,11 +276,57 @@ describe('Details Page', () => {
     it('has the correct props', () => {
       store.commit(SET_INITIAL_STATE, { ...config });
       mountComponent({
-        data: () => ({
-          deleteAlertType,
-        }),
+        options: {
+          data: () => ({
+            deleteAlertType,
+          }),
+        },
       });
       expect(findDeleteAlert().props()).toEqual({ ...config, deleteAlertType });
     });
   });
+
+  describe('Partial Cleanup Alert', () => {
+    const config = {
+      runCleanupPoliciesHelpPagePath: 'foo',
+      cleanupPoliciesHelpPagePath: 'bar',
+    };
+
+    describe('when expiration_policy_started is not null', () => {
+      const routeParams = { cleanup_policy_started_at: Date.now().toString() };
+
+      it('exists', () => {
+        mountComponent({ routeParams });
+
+        expect(findPartialCleanupAlert().exists()).toBe(true);
+      });
+
+      it('has the correct props', () => {
+        store.commit(SET_INITIAL_STATE, { ...config });
+
+        mountComponent({ routeParams });
+
+        expect(findPartialCleanupAlert().props()).toEqual({ ...config });
+      });
+
+      it('dismiss hides the component', async () => {
+        mountComponent({ routeParams });
+
+        expect(findPartialCleanupAlert().exists()).toBe(true);
+        findPartialCleanupAlert().vm.$emit('dismiss');
+
+        await wrapper.vm.$nextTick();
+
+        expect(findPartialCleanupAlert().exists()).toBe(false);
+      });
+    });
+
+    describe('when expiration_policy_started is null', () => {
+      it('the component is hidden', () => {
+        mountComponent();
+
+        expect(findPartialCleanupAlert().exists()).toBe(false);
+      });
+    });
+  });
 });
diff --git a/spec/frontend/vue_shared/components/confirm_modal_spec.js b/spec/frontend/vue_shared/components/confirm_modal_spec.js
index 5d92af64de0..8456ca9d125 100644
--- a/spec/frontend/vue_shared/components/confirm_modal_spec.js
+++ b/spec/frontend/vue_shared/components/confirm_modal_spec.js
@@ -86,6 +86,22 @@ describe('vue_shared/components/confirm_modal', () => {
         expect(findForm().element.submit).not.toHaveBeenCalled();
       });
 
+      describe('with handleSubmit prop', () => {
+        const handleSubmit = jest.fn();
+        beforeEach(() => {
+          createComponent({ handleSubmit });
+          findModal().vm.$emit('primary');
+        });
+
+        it('will call handleSubmit', () => {
+          expect(handleSubmit).toHaveBeenCalled();
+        });
+
+        it('does not submit the form', () => {
+          expect(findForm().element.submit).not.toHaveBeenCalled();
+        });
+      });
+
       describe('when modal submitted', () => {
         beforeEach(() => {
           findModal().vm.$emit('primary');
diff --git a/spec/lib/backup/files_spec.rb b/spec/lib/backup/files_spec.rb
index c2dbaac7f15..45cc73974d6 100644
--- a/spec/lib/backup/files_spec.rb
+++ b/spec/lib/backup/files_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Backup::Files do
     let(:timestamp) { Time.utc(2017, 3, 22) }
 
     around do |example|
-      Timecop.freeze(timestamp) { example.run }
+      travel_to(timestamp) { example.run }
     end
 
     describe 'folders with permission' do
diff --git a/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb b/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb
index 8bdb24ab08c..d29af311ee5 100644
--- a/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb
+++ b/spec/lib/banzai/filter/inline_grafana_metrics_filter_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Banzai::Filter::InlineGrafanaMetricsFilter do
   it_behaves_like 'a metrics embed filter'
 
   around do |example|
-    Timecop.freeze(Time.utc(2019, 3, 17, 13, 10)) { example.run }
+    travel_to(Time.utc(2019, 3, 17, 13, 10)) { example.run }
   end
 
   context 'when grafana is not configured' do
diff --git a/spec/lib/gitlab/alert_management/payload/generic_spec.rb b/spec/lib/gitlab/alert_management/payload/generic_spec.rb
index 3683dcd752f..b7660462b0d 100644
--- a/spec/lib/gitlab/alert_management/payload/generic_spec.rb
+++ b/spec/lib/gitlab/alert_management/payload/generic_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Gitlab::AlertManagement::Payload::Generic do
     subject { parsed_payload.starts_at }
 
     around do |example|
-      Timecop.freeze(current_time) { example.run }
+      travel_to(current_time) { example.run }
     end
 
     context 'without start_time' do
@@ -99,7 +99,7 @@ RSpec.describe Gitlab::AlertManagement::Payload::Generic do
     subject { parsed_payload.ends_at }
 
     around do |example|
-      Timecop.freeze(current_time) { example.run }
+      travel_to(current_time) { example.run }
     end
 
     context 'without end_time' do
diff --git a/spec/lib/gitlab/analytics/unique_visits_spec.rb b/spec/lib/gitlab/analytics/unique_visits_spec.rb
index 1432c9ac58f..6ac58e13f4c 100644
--- a/spec/lib/gitlab/analytics/unique_visits_spec.rb
+++ b/spec/lib/gitlab/analytics/unique_visits_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Gitlab::Analytics::UniqueVisits, :clean_gitlab_redis_shared_state
     # Without freezing the time, the test may behave inconsistently
     # depending on which day of the week test is run.
     reference_time = Time.utc(2020, 6, 1)
-    Timecop.freeze(reference_time) { example.run }
+    travel_to(reference_time) { example.run }
   end
 
   describe '#track_visit' do
diff --git a/spec/lib/gitlab/auth/current_user_mode_spec.rb b/spec/lib/gitlab/auth/current_user_mode_spec.rb
index 60b403780c0..ffd7813190a 100644
--- a/spec/lib/gitlab/auth/current_user_mode_spec.rb
+++ b/spec/lib/gitlab/auth/current_user_mode_spec.rb
@@ -121,7 +121,7 @@ RSpec.describe Gitlab::Auth::CurrentUserMode, :do_not_mock_admin_mode, :request_
             subject.enable_admin_mode!(password: user.password)
             expect(subject.admin_mode?).to be(true), 'admin mode is not active in the present'
 
-            Timecop.freeze(Gitlab::Auth::CurrentUserMode::MAX_ADMIN_MODE_TIME.from_now) do
+            travel_to(Gitlab::Auth::CurrentUserMode::MAX_ADMIN_MODE_TIME.from_now) do
               # in the future this will be a new request, simulate by clearing the RequestStore
               Gitlab::SafeRequestStore.clear!
 
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
index d4483bf1754..b723c31c4aa 100644
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
@@ -312,7 +312,7 @@ RSpec.describe Gitlab::BitbucketImport::Importer do
         # attributes later.
         existing_label.reload
 
-        Timecop.freeze(Time.now + 1.minute) do
+        travel_to(Time.now + 1.minute) do
           importer.execute
 
           label_after_import = project.labels.find(existing_label.id)
diff --git a/spec/lib/gitlab/ci/cron_parser_spec.rb b/spec/lib/gitlab/ci/cron_parser_spec.rb
index f724825a9cc..dd27b4045c9 100644
--- a/spec/lib/gitlab/ci/cron_parser_spec.rb
+++ b/spec/lib/gitlab/ci/cron_parser_spec.rb
@@ -82,7 +82,7 @@ RSpec.describe Gitlab::Ci::CronParser do
 
         context 'when PST (Pacific Standard Time)' do
           it 'converts time in server time zone' do
-            Timecop.freeze(Time.utc(2017, 1, 1)) do
+            travel_to(Time.utc(2017, 1, 1)) do
               expect(subject.hour).to eq(hour_in_utc)
             end
           end
@@ -90,7 +90,7 @@ RSpec.describe Gitlab::Ci::CronParser do
 
         context 'when PDT (Pacific Daylight Time)' do
           it 'converts time in server time zone' do
-            Timecop.freeze(Time.utc(2017, 6, 1)) do
+            travel_to(Time.utc(2017, 6, 1)) do
               expect(subject.hour).to eq(hour_in_utc)
             end
           end
@@ -117,7 +117,7 @@ RSpec.describe Gitlab::Ci::CronParser do
 
         context 'when CET (Central European Time)' do
           it 'converts time in server time zone' do
-            Timecop.freeze(Time.utc(2017, 1, 1)) do
+            travel_to(Time.utc(2017, 1, 1)) do
               expect(subject.hour).to eq(hour_in_utc)
             end
           end
@@ -125,7 +125,7 @@ RSpec.describe Gitlab::Ci::CronParser do
 
         context 'when CEST (Central European Summer Time)' do
           it 'converts time in server time zone' do
-            Timecop.freeze(Time.utc(2017, 6, 1)) do
+            travel_to(Time.utc(2017, 6, 1)) do
               expect(subject.hour).to eq(hour_in_utc)
             end
           end
@@ -152,7 +152,7 @@ RSpec.describe Gitlab::Ci::CronParser do
 
     context 'when EST (Eastern Standard Time)' do
       it 'converts time in server time zone' do
-        Timecop.freeze(Time.utc(2017, 1, 1)) do
+        travel_to(Time.utc(2017, 1, 1)) do
           expect(subject.hour).to eq(hour_in_utc)
         end
       end
@@ -160,7 +160,7 @@ RSpec.describe Gitlab::Ci::CronParser do
 
     context 'when EDT (Eastern Daylight Time)' do
       it 'converts time in server time zone' do
-        Timecop.freeze(Time.utc(2017, 6, 1)) do
+        travel_to(Time.utc(2017, 6, 1)) do
           expect(subject.hour).to eq(hour_in_utc)
         end
       end
@@ -174,7 +174,7 @@ RSpec.describe Gitlab::Ci::CronParser do
       # (e.g. America/Chicago) at the start of the test. Stubbing
       # TZ doesn't appear to be enough.
       it 'generates day without TZInfo::AmbiguousTime error' do
-        Timecop.freeze(Time.utc(2020, 1, 1)) do
+        travel_to(Time.utc(2020, 1, 1)) do
           expect(subject.year).to eq(year)
           expect(subject.month).to eq(12)
           expect(subject.day).to eq(1)
diff --git a/spec/lib/gitlab/danger/roulette_spec.rb b/spec/lib/gitlab/danger/roulette_spec.rb
index a1a8fdecb85..9acaa57ee10 100644
--- a/spec/lib/gitlab/danger/roulette_spec.rb
+++ b/spec/lib/gitlab/danger/roulette_spec.rb
@@ -7,7 +7,7 @@ require 'gitlab/danger/roulette'
 
 RSpec.describe Gitlab::Danger::Roulette do
   around do |example|
-    Timecop.freeze(Time.utc(2020, 06, 22, 10)) { example.run }
+    travel_to(Time.utc(2020, 06, 22, 10)) { example.run }
   end
 
   let(:backend_available) { true }
diff --git a/spec/lib/gitlab/danger/teammate_spec.rb b/spec/lib/gitlab/danger/teammate_spec.rb
index 6fd32493d6b..5a47d74a7f3 100644
--- a/spec/lib/gitlab/danger/teammate_spec.rb
+++ b/spec/lib/gitlab/danger/teammate_spec.rb
@@ -149,7 +149,7 @@ RSpec.describe Gitlab::Danger::Teammate do
 
   describe '#local_hour' do
     around do |example|
-      Timecop.freeze(Time.utc(2020, 6, 23, 10)) { example.run }
+      travel_to(Time.utc(2020, 6, 23, 10)) { example.run }
     end
 
     context 'when author is given' do
diff --git a/spec/lib/gitlab/database/background_migration_job_spec.rb b/spec/lib/gitlab/database/background_migration_job_spec.rb
index dd5bf8b512f..42695925a1c 100644
--- a/spec/lib/gitlab/database/background_migration_job_spec.rb
+++ b/spec/lib/gitlab/database/background_migration_job_spec.rb
@@ -85,7 +85,7 @@ RSpec.describe Gitlab::Database::BackgroundMigrationJob do
       let!(:job1) { create(:background_migration_job, :succeeded, created_at: initial_time, updated_at: initial_time) }
 
       it 'does not update non-pending jobs' do
-        Timecop.freeze(initial_time + 1.day) do
+        travel_to(initial_time + 1.day) do
           expect { described_class.mark_all_as_succeeded('TestJob', [1, 100]) }
             .to change { described_class.succeeded.count }.from(1).to(2)
         end
diff --git a/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb b/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb
index 034bf966db7..8a35d8149ad 100644
--- a/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb
+++ b/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe Gitlab::Database::ObsoleteIgnoredColumns do
 
   describe '#execute' do
     it 'returns a list of class names and columns pairs' do
-      Timecop.freeze(REMOVE_DATE) do
+      travel_to(REMOVE_DATE) do
         expect(subject.execute).to eq([
           ['Testing::A', {
             'unused' => IgnorableColumns::ColumnIgnore.new(Date.parse('2019-01-01'), '12.0'),
diff --git a/spec/lib/gitlab/database/partitioning/monthly_strategy_spec.rb b/spec/lib/gitlab/database/partitioning/monthly_strategy_spec.rb
index 334cac653cf..885eef5723e 100644
--- a/spec/lib/gitlab/database/partitioning/monthly_strategy_spec.rb
+++ b/spec/lib/gitlab/database/partitioning/monthly_strategy_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Gitlab::Database::Partitioning::MonthlyStrategy do
     let(:partitioning_key) { :created_at }
 
     around do |example|
-      Timecop.freeze(Date.parse('2020-08-22')) { example.run }
+      travel_to(Date.parse('2020-08-22')) { example.run }
     end
 
     context 'with existing partitions' do
diff --git a/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb b/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
index bfbd7d1879b..147637cf471 100644
--- a/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
+++ b/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
@@ -213,7 +213,7 @@ RSpec.describe Gitlab::Database::PartitioningMigrationHelpers::TableManagementHe
         it 'creates partitions including the next month from today' do
           today = Date.new(2020, 5, 8)
 
-          Timecop.freeze(today) do
+          travel_to(today) do
             migration.partition_table_by_date source_table, partition_column, min_date: min_date
 
             expect_range_partitions_for(partitioned_table, {
@@ -233,7 +233,7 @@ RSpec.describe Gitlab::Database::PartitioningMigrationHelpers::TableManagementHe
       context 'without min_date, max_date' do
         it 'creates partitions for the current and next month' do
           current_date = Date.new(2020, 05, 22)
-          Timecop.freeze(current_date.to_time) do
+          travel_to(current_date.to_time) do
             migration.partition_table_by_date source_table, partition_column
 
             expect_range_partitions_for(partitioned_table, {
diff --git a/spec/lib/gitlab/git/branch_spec.rb b/spec/lib/gitlab/git/branch_spec.rb
index e1bcf4aeeb1..9271f635b14 100644
--- a/spec/lib/gitlab/git/branch_spec.rb
+++ b/spec/lib/gitlab/git/branch_spec.rb
@@ -85,9 +85,9 @@ RSpec.describe Gitlab::Git::Branch, :seed_helper do
       }
     end
 
-    let(:stale_sha) { Timecop.freeze(Gitlab::Git::Branch::STALE_BRANCH_THRESHOLD.ago - 5.days) { create_commit } }
-    let(:active_sha) { Timecop.freeze(Gitlab::Git::Branch::STALE_BRANCH_THRESHOLD.ago + 5.days) { create_commit } }
-    let(:future_sha) { Timecop.freeze(100.days.since) { create_commit } }
+    let(:stale_sha) { travel_to(Gitlab::Git::Branch::STALE_BRANCH_THRESHOLD.ago - 5.days) { create_commit } }
+    let(:active_sha) { travel_to(Gitlab::Git::Branch::STALE_BRANCH_THRESHOLD.ago + 5.days) { create_commit } }
+    let(:future_sha) { travel_to(100.days.since) { create_commit } }
 
     before do
       repository.create_branch('stale-1', stale_sha)
diff --git a/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb b/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb
index e68c1446502..9538c4bae2b 100644
--- a/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb
+++ b/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Gitlab::GrapeLogging::Loggers::QueueDurationLogger do
       end
 
       it 'returns the correct duration in seconds' do
-        Timecop.freeze(start_time) do
+        travel_to(start_time) do
           subject.before
 
           expect(subject.parameters(mock_request, nil)).to eq( { 'queue_duration_s': 1.hour.to_f })
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 204fbff0c08..3bb9e52ef50 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -51,6 +51,7 @@ issues:
 - status_page_published_incident
 - namespace
 - note_authors
+- issue_email_participants
 events:
 - author
 - project
diff --git a/spec/lib/gitlab/lfs_token_spec.rb b/spec/lib/gitlab/lfs_token_spec.rb
index 9b8b2c1417a..4b40e8960b2 100644
--- a/spec/lib/gitlab/lfs_token_spec.rb
+++ b/spec/lib/gitlab/lfs_token_spec.rb
@@ -104,7 +104,7 @@ RSpec.describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
 
           # Needs to be at least LfsToken::DEFAULT_EXPIRE_TIME + 60 seconds
           # in order to check whether it is valid 1 minute after it has expired
-          Timecop.freeze(Time.now + described_class::DEFAULT_EXPIRE_TIME + 60) do
+          travel_to(Time.now + described_class::DEFAULT_EXPIRE_TIME + 60) do
             expect(lfs_token.token_valid?(expired_token)).to be false
           end
         end
diff --git a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
index cdb48024531..a9dae72f4db 100644
--- a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
+++ b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Gitlab::Middleware::RailsQueueDuration do
 
         expect(transaction).to receive(:observe).with(:gitlab_rails_queue_duration_seconds, 1)
 
-        Timecop.freeze(Time.at(3)) do
+        travel_to(Time.at(3)) do
           expect(middleware.call(env)).to eq('yay')
         end
       end
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
index 8abc944eeb1..b2350eff9f9 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery do
   around do |example|
-    Timecop.freeze(Time.local(2008, 9, 1, 12, 0, 0)) { example.run }
+    travel_to(Time.local(2008, 9, 1, 12, 0, 0)) { example.run }
   end
 
   include_examples 'additional metrics query' do
diff --git a/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
index 4683c4eae28..66b93d0dd72 100644
--- a/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Gitlab::Prometheus::Queries::DeploymentQuery do
 
   around do |example|
     time_without_subsecond_values = Time.local(2008, 9, 1, 12, 0, 0)
-    Timecop.freeze(time_without_subsecond_values) { example.run }
+    travel_to(time_without_subsecond_values) { example.run }
   end
 
   it 'sends appropriate queries to prometheus' do
diff --git a/spec/lib/gitlab/tracking_spec.rb b/spec/lib/gitlab/tracking_spec.rb
index f0bf7b9964f..6ddeaf98370 100644
--- a/spec/lib/gitlab/tracking_spec.rb
+++ b/spec/lib/gitlab/tracking_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Gitlab::Tracking do
     end
 
     around do |example|
-      Timecop.freeze(timestamp) { example.run }
+      travel_to(timestamp) { example.run }
     end
 
     before do
diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
index 6d4f52974aa..3255e3616b2 100644
--- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
     # depending on which day of the week test is run.
     # Monday 6th of June
     reference_time = Time.utc(2020, 6, 1)
-    Timecop.freeze(reference_time) { example.run }
+    travel_to(reference_time) { example.run }
   end
 
   describe '.categories' do
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 57de6e49a08..984fd4c08e6 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -285,17 +285,20 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
         cluster = create(:cluster, user: user)
         create(:project, creator: user)
         create(:clusters_applications_prometheus, :installed, cluster: cluster)
+        create(:project_tracing_setting)
       end
 
       expect(described_class.usage_activity_by_stage_monitor({})).to include(
         clusters: 2,
         clusters_applications_prometheus: 2,
-        operations_dashboard_default_dashboard: 2
+        operations_dashboard_default_dashboard: 2,
+        projects_with_tracing_enabled: 2
       )
       expect(described_class.usage_activity_by_stage_monitor(described_class.last_28_days_time_period)).to include(
         clusters: 1,
         clusters_applications_prometheus: 1,
-        operations_dashboard_default_dashboard: 1
+        operations_dashboard_default_dashboard: 1,
+        projects_with_tracing_enabled: 1
       )
     end
   end
@@ -445,6 +448,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       expect(count_data[:projects_inheriting_instance_mattermost_active]).to eq(1)
       expect(count_data[:projects_with_repositories_enabled]).to eq(3)
       expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
+      expect(count_data[:projects_with_tracing_enabled]).to eq(1)
       expect(count_data[:projects_with_alerts_service_enabled]).to eq(1)
       expect(count_data[:projects_with_prometheus_alerts]).to eq(2)
       expect(count_data[:projects_with_terraform_reports]).to eq(2)
diff --git a/spec/lib/grafana/time_window_spec.rb b/spec/lib/grafana/time_window_spec.rb
index 9ee65c6cf20..0657bed7b28 100644
--- a/spec/lib/grafana/time_window_spec.rb
+++ b/spec/lib/grafana/time_window_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Grafana::TimeWindow do
   let(:to) { '1552828200000' }
 
   around do |example|
-    Timecop.freeze(Time.utc(2019, 3, 17, 13, 10)) { example.run }
+    travel_to(Time.utc(2019, 3, 17, 13, 10)) { example.run }
   end
 
   describe '#formatted' do
@@ -37,7 +37,7 @@ RSpec.describe Grafana::RangeWithDefaults do
   let(:to) { Grafana::Timestamp.from_ms_since_epoch('1552828200000') }
 
   around do |example|
-    Timecop.freeze(Time.utc(2019, 3, 17, 13, 10)) { example.run }
+    travel_to(Time.utc(2019, 3, 17, 13, 10)) { example.run }
   end
 
   describe '#to_hash' do
@@ -82,7 +82,7 @@ RSpec.describe Grafana::Timestamp do
   let(:timestamp) { Time.at(1552799400) }
 
   around do |example|
-    Timecop.freeze(Time.utc(2019, 3, 17, 13, 10)) { example.run }
+    travel_to(Time.utc(2019, 3, 17, 13, 10)) { example.run }
   end
 
   describe '#formatted' do
diff --git a/spec/migrations/backfill_status_page_published_incidents_spec.rb b/spec/migrations/backfill_status_page_published_incidents_spec.rb
index 2b1ab891038..674484cdf0a 100644
--- a/spec/migrations/backfill_status_page_published_incidents_spec.rb
+++ b/spec/migrations/backfill_status_page_published_incidents_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe BackfillStatusPagePublishedIncidents, :migration do
     end
 
     it 'creates a StatusPage::PublishedIncident record for each published issue' do
-      Timecop.freeze(current_time) do
+      travel_to(current_time) do
         expect(incidents.all).to be_empty
 
         migrate!
diff --git a/spec/models/ci/freeze_period_status_spec.rb b/spec/models/ci/freeze_period_status_spec.rb
index 831895cb528..f51381f7a5f 100644
--- a/spec/models/ci/freeze_period_status_spec.rb
+++ b/spec/models/ci/freeze_period_status_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Ci::FreezePeriodStatus do
 
   shared_examples 'within freeze period' do |time|
     it 'is frozen' do
-      Timecop.freeze(time) do
+      travel_to(time) do
         expect(subject).to be_truthy
       end
     end
@@ -19,7 +19,7 @@ RSpec.describe Ci::FreezePeriodStatus do
 
   shared_examples 'outside freeze period' do |time|
     it 'is not frozen' do
-      Timecop.freeze(time) do
+      travel_to(time) do
         expect(subject).to be_falsy
       end
     end
diff --git a/spec/models/ci/pipeline_schedule_spec.rb b/spec/models/ci/pipeline_schedule_spec.rb
index 949d5f7bd04..cec3b544e50 100644
--- a/spec/models/ci/pipeline_schedule_spec.rb
+++ b/spec/models/ci/pipeline_schedule_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe Ci::PipelineSchedule do
     subject { described_class.runnable_schedules }
 
     let!(:pipeline_schedule) do
-      Timecop.freeze(1.day.ago) do
+      travel_to(1.day.ago) do
         create(:ci_pipeline_schedule, :hourly)
       end
     end
@@ -118,7 +118,7 @@ RSpec.describe Ci::PipelineSchedule do
       let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) }
 
       it "updates next_run_at to the sidekiq worker's execution time" do
-        Timecop.freeze(Time.zone.parse("2019-06-01 12:18:00+0000")) do
+        travel_to(Time.zone.parse("2019-06-01 12:18:00+0000")) do
           expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at)
         end
       end
diff --git a/spec/models/ci_platform_metric_spec.rb b/spec/models/ci_platform_metric_spec.rb
index 0b00875df43..f73db713791 100644
--- a/spec/models/ci_platform_metric_spec.rb
+++ b/spec/models/ci_platform_metric_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe CiPlatformMetric do
       let(:tomorrow) { today + 1.day }
 
       it 'inserts platform target counts for that day' do
-        Timecop.freeze(today) do
+        travel_to(today) do
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'ECS')
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'ECS')
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'FARGATE')
@@ -53,7 +53,7 @@ RSpec.describe CiPlatformMetric do
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'FARGATE')
           described_class.insert_auto_devops_platform_targets!
         end
-        Timecop.freeze(tomorrow) do
+        travel_to(tomorrow) do
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'FARGATE')
           described_class.insert_auto_devops_platform_targets!
         end
@@ -69,7 +69,7 @@ RSpec.describe CiPlatformMetric do
       let(:today) { Time.zone.local(1982, 4, 24) }
 
       it 'ignores those values' do
-        Timecop.freeze(today) do
+        travel_to(today) do
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'ECS')
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'FOO')
           create(:ci_variable, key: described_class::CI_VARIABLE_KEY, value: 'BAR')
diff --git a/spec/models/concerns/resolvable_discussion_spec.rb b/spec/models/concerns/resolvable_discussion_spec.rb
index c91ddfee944..c0e5ddc23b1 100644
--- a/spec/models/concerns/resolvable_discussion_spec.rb
+++ b/spec/models/concerns/resolvable_discussion_spec.rb
@@ -553,13 +553,13 @@ RSpec.describe Discussion, ResolvableDiscussion do
     let(:time) { Time.current.utc }
 
     before do
-      Timecop.freeze(time - 1.second) do
+      travel_to(time - 1.second) do
         first_note.resolve!(current_user)
       end
-      Timecop.freeze(time) do
+      travel_to(time) do
         third_note.resolve!(current_user)
       end
-      Timecop.freeze(time + 1.second) do
+      travel_to(time + 1.second) do
         second_note.resolve!(current_user)
       end
     end
diff --git a/spec/models/concerns/schedulable_spec.rb b/spec/models/concerns/schedulable_spec.rb
index 875c2d80e55..62acd12e267 100644
--- a/spec/models/concerns/schedulable_spec.rb
+++ b/spec/models/concerns/schedulable_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Schedulable do
   context 'for a pipeline_schedule' do
     # let! is used to reset the next_run_at value before each spec
     let(:object) do
-      Timecop.freeze(1.day.ago) do
+      travel_to(1.day.ago) do
         create(:ci_pipeline_schedule, :hourly)
       end
     end
diff --git a/spec/models/import_failure_spec.rb b/spec/models/import_failure_spec.rb
index cdef125e890..9fee1b0ae7b 100644
--- a/spec/models/import_failure_spec.rb
+++ b/spec/models/import_failure_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe ImportFailure do
 
     it 'orders hard failures by newest first' do
       older_failure = hard_failure.dup
-      Timecop.freeze(1.day.before(hard_failure.created_at)) do
+      travel_to(1.day.before(hard_failure.created_at)) do
         older_failure.save!
 
         expect(ImportFailure.hard_failures_by_correlation_id(correlation_id)).to eq([hard_failure, older_failure])
diff --git a/spec/models/issue/metrics_spec.rb b/spec/models/issue/metrics_spec.rb
index 966e4321378..1d3c09a48b7 100644
--- a/spec/models/issue/metrics_spec.rb
+++ b/spec/models/issue/metrics_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Issue::Metrics do
     context "milestones" do
       it "records the first time an issue is associated with a milestone" do
         time = Time.current
-        Timecop.freeze(time) { subject.update(milestone: create(:milestone, project: project)) }
+        travel_to(time) { subject.update(milestone: create(:milestone, project: project)) }
         metrics = subject.metrics
 
         expect(metrics).to be_present
@@ -47,9 +47,9 @@ RSpec.describe Issue::Metrics do
 
       it "does not record the second time an issue is associated with a milestone" do
         time = Time.current
-        Timecop.freeze(time) { subject.update(milestone: create(:milestone, project: project)) }
-        Timecop.freeze(time + 2.hours) { subject.update(milestone: nil) }
-        Timecop.freeze(time + 6.hours) { subject.update(milestone: create(:milestone, project: project)) }
+        travel_to(time) { subject.update(milestone: create(:milestone, project: project)) }
+        travel_to(time + 2.hours) { subject.update(milestone: nil) }
+        travel_to(time + 6.hours) { subject.update(milestone: create(:milestone, project: project)) }
         metrics = subject.metrics
 
         expect(metrics).to be_present
@@ -61,7 +61,7 @@ RSpec.describe Issue::Metrics do
       it "records the first time an issue is associated with a list label" do
         list_label = create(:list).label
         time = Time.current
-        Timecop.freeze(time) { subject.update(label_ids: [list_label.id]) }
+        travel_to(time) { subject.update(label_ids: [list_label.id]) }
         metrics = subject.metrics
 
         expect(metrics).to be_present
@@ -71,9 +71,9 @@ RSpec.describe Issue::Metrics do
       it "does not record the second time an issue is associated with a list label" do
         time = Time.current
         first_list_label = create(:list).label
-        Timecop.freeze(time) { subject.update(label_ids: [first_list_label.id]) }
+        travel_to(time) { subject.update(label_ids: [first_list_label.id]) }
         second_list_label = create(:list).label
-        Timecop.freeze(time + 5.hours) { subject.update(label_ids: [second_list_label.id]) }
+        travel_to(time + 5.hours) { subject.update(label_ids: [second_list_label.id]) }
         metrics = subject.metrics
 
         expect(metrics).to be_present
diff --git a/spec/models/issue_email_participant_spec.rb b/spec/models/issue_email_participant_spec.rb
new file mode 100644
index 00000000000..f19e65e31f3
--- /dev/null
+++ b/spec/models/issue_email_participant_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe IssueEmailParticipant do
+  describe "Associations" do
+    it { is_expected.to belong_to(:issue) }
+  end
+
+  describe 'Validations' do
+    subject { build(:issue_email_participant) }
+
+    it { is_expected.to validate_presence_of(:issue) }
+    it { is_expected.to validate_presence_of(:email) }
+    it { is_expected.to validate_uniqueness_of(:email).scoped_to([:issue_id]) }
+
+    it_behaves_like 'an object with RFC3696 compliant email-formated attributes', :email
+  end
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index b830ce23c1c..16ea2989eda 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -28,6 +28,7 @@ RSpec.describe Issue do
     it { is_expected.to have_and_belong_to_many(:prometheus_alert_events) }
     it { is_expected.to have_and_belong_to_many(:self_managed_prometheus_alert_events) }
     it { is_expected.to have_many(:prometheus_alerts) }
+    it { is_expected.to have_many(:issue_email_participants) }
 
     describe 'versions.most_recent' do
       it 'returns the most recent version' do
diff --git a/spec/models/project_feature_usage_spec.rb b/spec/models/project_feature_usage_spec.rb
index 908b98ee9c2..d55d41fab85 100644
--- a/spec/models/project_feature_usage_spec.rb
+++ b/spec/models/project_feature_usage_spec.rb
@@ -48,7 +48,7 @@ RSpec.describe ProjectFeatureUsage, type: :model do
         feature_usage.log_jira_dvcs_integration_usage
         first_logged_at = feature_usage.jira_dvcs_cloud_last_sync_at
 
-        Timecop.freeze(1.hour.from_now) do
+        travel_to(1.hour.from_now) do
           ProjectFeatureUsage.new(project_id: project.id).log_jira_dvcs_integration_usage
         end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 96645005d0a..7fdc1dd12c1 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -72,6 +72,7 @@ RSpec.describe Project do
     it { is_expected.to have_one(:last_event).class_name('Event') }
     it { is_expected.to have_one(:forked_from_project).through(:fork_network_member) }
     it { is_expected.to have_one(:auto_devops).class_name('ProjectAutoDevops') }
+    it { is_expected.to have_one(:tracing_setting).class_name('ProjectTracingSetting') }
     it { is_expected.to have_one(:error_tracking_setting).class_name('ErrorTracking::ProjectErrorTrackingSetting') }
     it { is_expected.to have_one(:project_setting) }
     it { is_expected.to have_one(:alerting_setting).class_name('Alerting::ProjectAlertingSetting') }
diff --git a/spec/models/project_tracing_setting_spec.rb b/spec/models/project_tracing_setting_spec.rb
new file mode 100644
index 00000000000..a7e4e557b25
--- /dev/null
+++ b/spec/models/project_tracing_setting_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ProjectTracingSetting do
+  describe '#external_url' do
+    let_it_be(:project) { create(:project) }
+
+    let(:tracing_setting) { project.build_tracing_setting }
+
+    describe 'Validations' do
+      describe 'external_url' do
+        it 'accepts a valid url' do
+          tracing_setting.external_url = 'https://gitlab.com'
+
+          expect(tracing_setting).to be_valid
+        end
+
+        it 'fails with an invalid url' do
+          tracing_setting.external_url = 'gitlab.com'
+
+          expect(tracing_setting).to be_invalid
+        end
+
+        it 'fails with a blank string' do
+          tracing_setting.external_url = nil
+
+          expect(tracing_setting).to be_invalid
+        end
+
+        it 'sanitizes the url' do
+          tracing_setting.external_url = %{https://replaceme.com/'><script>alert(document.cookie)</script>}
+
+          expect(tracing_setting).to be_valid
+          expect(tracing_setting.external_url).to eq(%{https://replaceme.com/'&gt;})
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/todo_spec.rb b/spec/models/todo_spec.rb
index 0e3473ec0d1..a9c4c6680cd 100644
--- a/spec/models/todo_spec.rb
+++ b/spec/models/todo_spec.rb
@@ -443,7 +443,7 @@ RSpec.describe Todo do
     it 'updates updated_at' do
       create(:todo, :pending)
 
-      Timecop.freeze(1.day.from_now) do
+      travel_to(1.day.from_now) do
         expected_update_date = Time.current.utc
 
         ids = described_class.batch_update(state: :done)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 0f71c7790d4..af5614ba85e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -3902,7 +3902,7 @@ RSpec.describe User do
 
           it 'changes the namespace (just to compare to when username is not changed)' do
             expect do
-              Timecop.freeze(1.second.from_now) do
+              travel_to(1.second.from_now) do
                 user.update!(username: new_username)
               end
             end.to change { user.namespace.updated_at }
@@ -4899,7 +4899,7 @@ RSpec.describe User do
         user.block
       end
 
-      it { is_expected.to eq User::BLOCKED_MESSAGE }
+      it { is_expected.to eq :blocked }
     end
 
     context 'when user is an internal user' do
@@ -4907,7 +4907,7 @@ RSpec.describe User do
         user.update(user_type: :ghost)
       end
 
-      it { is_expected.to be User::LOGIN_FORBIDDEN }
+      it { is_expected.to be :forbidden }
     end
 
     context 'when user is locked' do
diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb
index 779ae983886..01ead9eef54 100644
--- a/spec/requests/api/releases_spec.rb
+++ b/spec/requests/api/releases_spec.rb
@@ -259,7 +259,7 @@ RSpec.describe API::Releases do
         end
 
         it '#collected_at' do
-          Timecop.freeze(Time.now.round) do
+          travel_to(Time.now.round) do
             get api("/projects/#{project.id}/releases/v0.1", maintainer)
 
             expect(json_response['evidences'].first['collected_at'].to_datetime.to_i).to be_within(1.minute).of(release.evidences.first.created_at.to_i)
@@ -476,7 +476,7 @@ RSpec.describe API::Releases do
 
     it 'sets the released_at to the current time if the released_at parameter is not provided' do
       now = Time.zone.parse('2015-08-25 06:00:00Z')
-      Timecop.freeze(now) do
+      travel_to(now) do
         post api("/projects/#{project.id}/releases", maintainer), params: params
 
         expect(project.releases.last.released_at).to eq(now)
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb
index 4338bfa3759..3f57b8ba67b 100644
--- a/spec/requests/projects/cycle_analytics_events_spec.rb
+++ b/spec/requests/projects/cycle_analytics_events_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'value stream analytics events' do
       project.add_developer(user)
 
       3.times do |count|
-        Timecop.freeze(Time.now + count.days) do
+        travel_to(Time.now + count.days) do
           create_cycle
         end
       end
diff --git a/spec/requests/request_profiler_spec.rb b/spec/requests/request_profiler_spec.rb
index 7f9999bf3d2..72689595480 100644
--- a/spec/requests/request_profiler_spec.rb
+++ b/spec/requests/request_profiler_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Request Profiler' do
       time    = Time.now
       path    = "/#{project.full_path}"
 
-      Timecop.freeze(time) do
+      travel_to(time) do
         get path, params: {}, headers: { 'X-Profile-Token' => Gitlab::RequestProfiler.profile_token, 'X-Profile-Mode' => profile_type }
       end
 
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index 51741440075..4c1e698d52d 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -154,7 +154,7 @@ RSpec.describe Ci::RetryBuildService do
 
   describe '#execute' do
     let(:new_build) do
-      Timecop.freeze(1.second.from_now) do
+      travel_to(1.second.from_now) do
         service.execute(build)
       end
     end
@@ -257,7 +257,7 @@ RSpec.describe Ci::RetryBuildService do
 
   describe '#reprocess' do
     let(:new_build) do
-      Timecop.freeze(1.second.from_now) do
+      travel_to(1.second.from_now) do
         service.reprocess!(build)
       end
     end
diff --git a/spec/services/ci/update_build_state_service_spec.rb b/spec/services/ci/update_build_state_service_spec.rb
index 80735985406..aa1de368154 100644
--- a/spec/services/ci/update_build_state_service_spec.rb
+++ b/spec/services/ci/update_build_state_service_spec.rb
@@ -83,6 +83,23 @@ RSpec.describe Ci::UpdateBuildStateService do
       { checksum: 'crc32:12345678', state: 'failed', failure_reason: 'script_failure' }
     end
 
+    context 'when build does not have associated trace chunks' do
+      it 'updates a build status' do
+        result = subject.execute
+
+        expect(build).to be_failed
+        expect(result.status).to eq 200
+      end
+
+      it 'does not increment invalid trace metric' do
+        execute_with_stubbed_metrics!
+
+        expect(metrics)
+          .not_to have_received(:increment_trace_operation)
+          .with(operation: :invalid)
+      end
+    end
+
     context 'when build trace has been migrated' do
       before do
         create(:ci_build_trace_chunk, :persisted, build: build, initial_data: 'abcd')
diff --git a/spec/services/deployments/after_create_service_spec.rb b/spec/services/deployments/after_create_service_spec.rb
index 6cdb4c88191..ee9b008c2f8 100644
--- a/spec/services/deployments/after_create_service_spec.rb
+++ b/spec/services/deployments/after_create_service_spec.rb
@@ -269,14 +269,14 @@ RSpec.describe Deployments::AfterCreateService do
           it "does not overwrite the older 'first_deployed_to_production_at' time" do
             # Previous deploy
             time = 5.minutes.from_now
-            Timecop.freeze(time) { service.execute }
+            travel_to(time) { service.execute }
 
             expect(merge_request.reload.metrics.merged_at).to be < merge_request.reload.metrics.first_deployed_to_production_at
 
             previous_time = merge_request.reload.metrics.first_deployed_to_production_at
 
             # Current deploy
-            Timecop.freeze(time + 12.hours) { service.execute }
+            travel_to(time + 12.hours) { service.execute }
 
             expect(merge_request.reload.metrics.first_deployed_to_production_at).to eq(previous_time)
           end
diff --git a/spec/services/design_management/copy_design_collection/copy_service_spec.rb b/spec/services/design_management/copy_design_collection/copy_service_spec.rb
index 09a4df59c6a..e93e5f13fea 100644
--- a/spec/services/design_management/copy_design_collection/copy_service_spec.rb
+++ b/spec/services/design_management/copy_design_collection/copy_service_spec.rb
@@ -133,18 +133,26 @@ RSpec.describe DesignManagement::CopyDesignCollection::CopyService, :clean_gitla
           end
 
           it 'copies design notes correctly', :aggregate_failures, :sidekiq_inline do
-            note = create(:diff_note_on_design, noteable: designs.first, project: project)
+            old_notes = [
+              create(:diff_note_on_design, note: 'first note', noteable: designs.first, project: project, author: create(:user)),
+              create(:diff_note_on_design, note: 'second note', noteable: designs.first, project: project, author: create(:user))
+            ]
+            matchers = old_notes.map do |note|
+              have_attributes(
+                note.attributes.slice(
+                  :type,
+                  :author_id,
+                  :note,
+                  :position
+                )
+              )
+            end
 
-            expect { subject }.to change { Note.count }.by(1)
+            expect { subject }.to change { Note.count }.by(2)
 
-            new_note = target_issue.designs.first.notes.first
+            new_notes = target_issue.designs.first.notes.fresh
 
-            expect(new_note).to have_attributes(
-              type: note.type,
-              author_id: note.author_id,
-              note: note.note,
-              position: note.position
-            )
+            expect(new_notes).to match_array(matchers)
           end
 
           it 'links the LfsObjects' do
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index b3e8fba4e9a..cfda27795c7 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -650,7 +650,7 @@ RSpec.describe Issues::UpdateService, :mailer do
 
       context 'when the labels change' do
         before do
-          Timecop.freeze(1.minute.from_now) do
+          travel_to(1.minute.from_now) do
             update_issue(label_ids: [label.id])
           end
         end
diff --git a/spec/services/keys/last_used_service_spec.rb b/spec/services/keys/last_used_service_spec.rb
index 82b6b05975b..a2cd5ffdd38 100644
--- a/spec/services/keys/last_used_service_spec.rb
+++ b/spec/services/keys/last_used_service_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Keys::LastUsedService do
       key = create(:key, last_used_at: 1.year.ago)
       time = Time.zone.now
 
-      Timecop.freeze(time) { described_class.new(key).execute }
+      travel_to(time) { described_class.new(key).execute }
 
       expect(key.reload.last_used_at).to be_like_time(time)
     end
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 84ca77b4ad5..ed8872b71f7 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -583,7 +583,7 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
 
       context 'when the labels change' do
         before do
-          Timecop.freeze(1.minute.from_now) do
+          travel_to(1.minute.from_now) do
             update_merge_request({ label_ids: [label.id] })
           end
         end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 7c0d4b756bd..4da9f4115a1 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -437,7 +437,7 @@ RSpec.describe Notes::CreateService do
         expect do
           existing_note
 
-          Timecop.freeze(Time.current + 1.minute) { subject }
+          travel_to(Time.current + 1.minute) { subject }
 
           existing_note.reload
         end.to change { existing_note.type }.from(nil).to('DiscussionNote')
diff --git a/spec/services/notes/update_service_spec.rb b/spec/services/notes/update_service_spec.rb
index 47b8ba0cd72..66efdf8abe7 100644
--- a/spec/services/notes/update_service_spec.rb
+++ b/spec/services/notes/update_service_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Notes::UpdateService do
     end
 
     it 'does not update the note when params is blank' do
-      Timecop.freeze(1.day.from_now) do
+      travel_to(1.day.from_now) do
         expect { update_note({}) }.not_to change { note.reload.updated_at }
       end
     end
diff --git a/spec/services/system_notes/incident_service_spec.rb b/spec/services/system_notes/incident_service_spec.rb
index 1906d890305..ab9b9eb2bd4 100644
--- a/spec/services/system_notes/incident_service_spec.rb
+++ b/spec/services/system_notes/incident_service_spec.rb
@@ -15,64 +15,44 @@ RSpec.describe ::SystemNotes::IncidentService do
       allow(Gitlab::AppLogger).to receive(:error).and_call_original
     end
 
-    context 'with add_severity_system_note feature flag enabled' do
-      before do
-        stub_feature_flags(add_severity_system_note: project)
-      end
-
-      it_behaves_like 'a system note' do
-        let(:action) { 'severity' }
-      end
-
-      IssuableSeverity.severities.keys.each do |severity|
-        context "with #{severity} severity" do
-          before do
-            issuable_severity.update!(severity: severity)
-          end
-
-          it 'has the appropriate message' do
-            severity_label = IssuableSeverity::SEVERITY_LABELS.fetch(severity.to_sym)
-
-            expect(change_severity.note).to eq("changed the severity to **#{severity_label}**")
-          end
-        end
-      end
-
-      context 'when severity is invalid' do
-        let(:invalid_severity) { 'invalid-severity' }
+    it_behaves_like 'a system note' do
+      let(:action) { 'severity' }
+    end
 
+    IssuableSeverity.severities.keys.each do |severity|
+      context "with #{severity} severity" do
         before do
-          allow(noteable).to receive(:severity).and_return(invalid_severity)
+          issuable_severity.update!(severity: severity)
         end
 
-        it 'does not create system note' do
-          expect { change_severity }.not_to change { noteable.notes.count }
-        end
+        it 'has the appropriate message' do
+          severity_label = IssuableSeverity::SEVERITY_LABELS.fetch(severity.to_sym)
 
-        it 'writes error to logs' do
-          change_severity
-
-          expect(Gitlab::AppLogger).to have_received(:error).with(
-            message: 'Cannot create a system note for severity change',
-            noteable_class: noteable.class.to_s,
-            noteable_id: noteable.id,
-            severity: invalid_severity
-          )
+          expect(change_severity.note).to eq("changed the severity to **#{severity_label}**")
         end
       end
     end
 
-    context 'with add_severity_system_note feature flag disabled' do
+    context 'when severity is invalid' do
+      let(:invalid_severity) { 'invalid-severity' }
+
       before do
-        stub_feature_flags(add_severity_system_note: false)
+        allow(noteable).to receive(:severity).and_return(invalid_severity)
       end
 
       it 'does not create system note' do
         expect { change_severity }.not_to change { noteable.notes.count }
       end
 
-      it 'does not write error to logs' do
-        expect(Gitlab::AppLogger).not_to have_received(:error)
+      it 'writes error to logs' do
+        change_severity
+
+        expect(Gitlab::AppLogger).to have_received(:error).with(
+          message: 'Cannot create a system note for severity change',
+          noteable_class: noteable.class.to_s,
+          noteable_id: noteable.id,
+          severity: invalid_severity
+        )
       end
     end
   end
diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb
index 27ac8562b76..17e806d21d9 100644
--- a/spec/support/helpers/usage_data_helpers.rb
+++ b/spec/support/helpers/usage_data_helpers.rb
@@ -99,6 +99,7 @@ module UsageDataHelpers
       projects_with_error_tracking_enabled
       projects_with_alerts_service_enabled
       projects_with_prometheus_alerts
+      projects_with_tracing_enabled
       projects_with_expiration_policy_enabled
       projects_with_expiration_policy_disabled
       projects_with_expiration_policy_enabled_with_keep_n_unset
diff --git a/spec/support/shared_examples/controllers/known_sign_in_shared_examples.rb b/spec/support/shared_examples/controllers/known_sign_in_shared_examples.rb
index 7f26155f9d6..3f147f942ba 100644
--- a/spec/support/shared_examples/controllers/known_sign_in_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/known_sign_in_shared_examples.rb
@@ -59,7 +59,7 @@ RSpec.shared_examples 'known sign in' do
     it 'notifies the user when the cookie is expired' do
       stub_cookie
 
-      Timecop.freeze((KnownSignIn::KNOWN_SIGN_IN_COOKIE_EXPIRY + 1.day).from_now) do
+      travel_to((KnownSignIn::KNOWN_SIGN_IN_COOKIE_EXPIRY + 1.day).from_now) do
         expect_next_instance_of(NotificationService) do |instance|
           expect(instance).to receive(:unknown_sign_in)
         end
diff --git a/spec/support/shared_examples/models/throttled_touch_shared_examples.rb b/spec/support/shared_examples/models/throttled_touch_shared_examples.rb
index 14b851d2828..e869cbce6ae 100644
--- a/spec/support/shared_examples/models/throttled_touch_shared_examples.rb
+++ b/spec/support/shared_examples/models/throttled_touch_shared_examples.rb
@@ -13,8 +13,8 @@ RSpec.shared_examples 'throttled touch' do
       first_updated_at = Time.zone.now - (ThrottledTouch::TOUCH_INTERVAL * 2)
       second_updated_at = Time.zone.now - (ThrottledTouch::TOUCH_INTERVAL * 1.5)
 
-      Timecop.freeze(first_updated_at) { subject.touch }
-      Timecop.freeze(second_updated_at) { subject.touch }
+      travel_to(first_updated_at) { subject.touch }
+      travel_to(second_updated_at) { subject.touch }
 
       expect(subject.updated_at).to be_like_time(first_updated_at)
     end
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 50d164d1705..cb626b08456 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -290,7 +290,7 @@ RSpec.describe PostReceive do
 
       # MySQL drops milliseconds in the timestamps, so advance at least
       # a second to ensure we see changes.
-      Timecop.freeze(1.second.from_now) do
+      travel_to(1.second.from_now) do
         expect do
           perform
           project.reload