diff --git a/.gitleaksignore b/.gitleaksignore
index dc2ea1a8434..8d44c5eccc1 100644
--- a/.gitleaksignore
+++ b/.gitleaksignore
@@ -1,6 +1,13 @@
 afedb913baf4203aa688421873fdb9f94649578e:doc/api/users.md:generic-api-key:2201
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:33
 spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:34
 spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:35
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:36
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:37
 spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:38
 spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:39
-spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:40
\ No newline at end of file
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:40
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:41
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:55
+spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:57
+spec/frontend/lib/utils/secret_detection_spec.js:gitlab-pat:28
\ No newline at end of file
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index b4fb5d0ef6a..492bec83f9a 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -1029,7 +1029,6 @@ RSpec/ContextWording:
     - 'spec/features/admin/admin_disables_git_access_protocol_spec.rb'
     - 'spec/features/admin/admin_hook_logs_spec.rb'
     - 'spec/features/admin/admin_hooks_spec.rb'
-    - 'spec/features/admin/admin_jobs_spec.rb'
     - 'spec/features/admin/admin_mode/login_spec.rb'
     - 'spec/features/admin/admin_mode_spec.rb'
     - 'spec/features/admin/admin_settings_spec.rb'
diff --git a/app/assets/javascripts/ci/admin/jobs_table/graphql/queries/get_all_jobs.query.graphql b/app/assets/javascripts/ci/admin/jobs_table/graphql/queries/get_all_jobs.query.graphql
index 2e77f4db907..b53414ee6a3 100644
--- a/app/assets/javascripts/ci/admin/jobs_table/graphql/queries/get_all_jobs.query.graphql
+++ b/app/assets/javascripts/ci/admin/jobs_table/graphql/queries/get_all_jobs.query.graphql
@@ -85,6 +85,7 @@ query getAllJobs(
         readBuild
         readJobArtifacts
         updateBuild
+        cancelBuild
       }
     }
   }
diff --git a/app/models/users/credit_card_validation.rb b/app/models/users/credit_card_validation.rb
index 5de7dd98b34..14702252203 100644
--- a/app/models/users/credit_card_validation.rb
+++ b/app/models/users/credit_card_validation.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Users
-  class CreditCardValidation < ApplicationRecord
+  class CreditCardValidation < MainClusterwide::ApplicationRecord
     include IgnorableColumns
 
     RELEASE_DAY = Date.new(2021, 5, 17)
diff --git a/app/models/users/phone_number_validation.rb b/app/models/users/phone_number_validation.rb
index 420bfa74770..3c9f0a54c2c 100644
--- a/app/models/users/phone_number_validation.rb
+++ b/app/models/users/phone_number_validation.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Users
-  class PhoneNumberValidation < ApplicationRecord
+  class PhoneNumberValidation < MainClusterwide::ApplicationRecord
     include IgnorableColumns
 
     # SMS send attempts subsequent to the first one will have wait times of 1
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index cbf0833df00..a529bb463b6 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_edit_by_web_ide
 events:
   - name: g_edit_by_web_ide
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index b224962de67..eb5bfb031c2 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_edit_by_sfe
 events:
   - name: g_edit_by_sfe
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 9c165f348ae..927855df5cc 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_edit_by_snippet_ide
 events:
   - name: g_edit_by_snippet_ide
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 58912c1d72a..7df9e24cb02 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_title_changed
 events:
   - name: g_project_management_issue_title_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index fd79979a24e..d55d67451f3 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_description_changed
 events:
   - name: g_project_management_issue_description_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 1e7b2c5e65b..b1c3d67522f 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_assignee_changed
 events:
   - name: g_project_management_issue_assignee_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 5beba665e0e..8b10613b36c 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_made_confidential
 events:
   - name: g_project_management_issue_made_confidential
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index b20ae68f126..bfe0eac91f8 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_made_visible
 events:
   - name: g_project_management_issue_made_visible
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 0e6f5fb78df..dfdce8285ab 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_created
 events:
   - name: g_project_management_issue_created
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 08ad3d7644d..e523e447938 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_closed
 events:
   - name: g_project_management_issue_closed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index 5420a9213b1..a5e09ec2304 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_reopened
 events:
   - name: g_project_management_issue_reopened
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 793e6a71813..848b41fcecd 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_label_changed
 events:
   - name: g_project_management_issue_label_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 6b8a1a91fa0..4d3763929a1 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_milestone_changed
 events:
   - name: g_project_management_issue_milestone_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index be3c37585b9..35e39d38c56 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_cross_referenced
 events:
   - name: g_project_management_issue_cross_referenced
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 69461d90a88..fe8f46ae093 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_moved
 events:
   - name: g_project_management_issue_moved
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 2145cbf1420..807a162627f 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_related
 events:
   - name: g_project_management_issue_related
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 04df5221d5e..8bc113117d0 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_marked_as_duplicate
 events:
   - name: g_project_management_issue_marked_as_duplicate
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 7472ef1fc13..daab6e6388c 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_locked
 events:
   - name: g_project_management_issue_locked
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 8c815c0851e..006f781d8b0 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_unlocked
 events:
   - name: g_project_management_issue_unlocked
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index 075f99170d0..d6c8e734ae0 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_designs_added
 events:
   - name: g_project_management_issue_designs_added
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 7b5166fe177..1ea756614f0 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_designs_modified
 events:
   - name: g_project_management_issue_designs_modified
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index ac8ae1696e6..47924ddf2ce 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_designs_removed
 events:
   - name: g_project_management_issue_designs_removed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 3719726cfd8..f8e5cb45f94 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_due_date_changed
 events:
   - name: g_project_management_issue_due_date_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 7cba6c77a2b..9b172d6d8d7 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_time_estimate_changed
 events:
   - name: g_project_management_issue_time_estimate_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 587b1f58bcb..5a15782d630 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_time_spent_changed
 events:
   - name: g_project_management_issue_time_spent_changed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index eae1ca2225e..f2bddd2124f 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_comment_added
 events:
   - name: g_project_management_issue_comment_added
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 2c5338173ac..3f287846438 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_comment_edited
 events:
   - name: g_project_management_issue_comment_edited
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index 2fafdf51764..42782a33972 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_comment_removed
 events:
   - name: g_project_management_issue_comment_removed
     unique: user.id
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index 9ebe2a6f117..d7186adc0f5 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_cloned
 events:
   - name: g_project_management_issue_cloned
     unique: user.id
diff --git a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
index a87de425c4e..4ae5242067c 100644
--- a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
+++ b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
@@ -12,9 +12,6 @@ time_frame: 28d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-options:
-  events:
-    - g_project_management_issue_design_comments_removed
 events:
   - name: g_project_management_issue_design_comments_removed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index c956b597606..e4fe3fd0182 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -11,9 +11,6 @@ milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_title_changed
 events:
   - name: g_project_management_issue_title_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index a9cd4e5318a..13e27fb17ee 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_edit_by_web_ide
 events:
   - name: g_edit_by_web_ide
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index feb39509973..78b2419bff9 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_edit_by_sfe
 events:
   - name: g_edit_by_sfe
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index d84a80be1c6..fd55043c448 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_edit_by_snippet_ide
 events:
   - name: g_edit_by_snippet_ide
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 3e9f34edca3..97f960d6cd8 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_description_changed
 events:
   - name: g_project_management_issue_description_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index 3882e44df20..588de265698 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_assignee_changed
 events:
   - name: g_project_management_issue_assignee_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index 1f52751bfb7..b84038b48f7 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_made_confidential
 events:
   - name: g_project_management_issue_made_confidential
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index 2744b7606f6..39e5c713aef 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_made_visible
 events:
   - name: g_project_management_issue_made_visible
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index ab31bf2ffce..a4c96743ec3 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_created
 events:
   - name: g_project_management_issue_created
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index c0c287a4ed9..a455d43ded5 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_closed
 events:
   - name: g_project_management_issue_closed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 862572f5df0..21b326a9153 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_reopened
 events:
   - name: g_project_management_issue_reopened
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 8263186dc9d..b1202a8e560 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_label_changed
 events:
   - name: g_project_management_issue_label_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 3bbe2f09739..6ca1c48b93b 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_milestone_changed
 events:
   - name: g_project_management_issue_milestone_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index fbbcb98fb2c..4b7c83348ea 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_cross_referenced
 events:
   - name: g_project_management_issue_cross_referenced
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index b306fb7b918..ed7cbfe2c20 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_moved
 events:
   - name: g_project_management_issue_moved
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index f7ef09248a5..161aecc7540 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_related
 events:
   - name: g_project_management_issue_related
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 314287dcec7..3305826598c 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_marked_as_duplicate
 events:
   - name: g_project_management_issue_marked_as_duplicate
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index c526b1832b6..1b28a6e44ba 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_locked
 events:
   - name: g_project_management_issue_locked
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index ca03adbb81d..5327ab6e4e5 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_designs_added
 events:
   - name: g_project_management_issue_designs_added
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index b463794db4b..b1a80f40d31 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_designs_modified
 events:
   - name: g_project_management_issue_designs_modified
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index 80ef0b6b93e..b8a611e7767 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_designs_removed
 events:
   - name: g_project_management_issue_designs_removed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 7651406f9ed..8666aec2ad0 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_due_date_changed
 events:
   - name: g_project_management_issue_due_date_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index 222df5f22ed..303575e5830 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_time_estimate_changed
 events:
   - name: g_project_management_issue_time_estimate_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index f9624fa3ae5..8ee490ee609 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_time_spent_changed
 events:
   - name: g_project_management_issue_time_spent_changed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index 34bd0ce8bd3..ffc87bc0ac6 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_comment_added
 events:
   - name: g_project_management_issue_comment_added
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 6b92e88144f..7329d1435ee 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_comment_edited
 events:
   - name: g_project_management_issue_comment_edited
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index fab024466b8..12af8e5ead6 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_comment_removed
 events:
   - name: g_project_management_issue_comment_removed
     unique: user.id
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 83d2e618c2d..ba2aebcc459 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -9,9 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-options:
-  events:
-  - g_project_management_issue_cloned
 events:
   - name: g_project_management_issue_cloned
     unique: user.id
diff --git a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
index e0de5e7d2e6..8ace22e91df 100644
--- a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
+++ b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
@@ -12,9 +12,6 @@ time_frame: 7d
 data_source: internal_events
 data_category: optional
 performance_indicator_type: []
-options:
-  events:
-    - g_project_management_issue_design_comments_removed
 events:
   - name: g_project_management_issue_design_comments_removed
     unique: user.id
diff --git a/db/docs/user_phone_number_validations.yml b/db/docs/user_phone_number_validations.yml
index 5d0100cdb95..1842c44235f 100644
--- a/db/docs/user_phone_number_validations.yml
+++ b/db/docs/user_phone_number_validations.yml
@@ -7,4 +7,4 @@ feature_categories:
 description: Stores whether the user has verified their phone number
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97762
 milestone: '15.5'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_clusterwide
diff --git a/doc/development/database/multiple_databases.md b/doc/development/database/multiple_databases.md
index c5d674044b4..a290d336d5c 100644
--- a/doc/development/database/multiple_databases.md
+++ b/doc/development/database/multiple_databases.md
@@ -194,6 +194,26 @@ background migration. It also specifies a `belongs_to` relation which
 will be added to the model to automatically populate the `sharding_key` in
 the `before_save`.
 
+##### Defining a `desired_sharding_key` when the parent table also has a `desired_sharding_key`
+
+By default, a `desired_sharding_key` configuration will validate that the chosen `sharding_key`
+exists on the parent table. However, if the parent table also has a `desired_sharding_key` configuration
+and is itself waiting to be backfilled, you need to include the `awaiting_backfill_on_parent` field.
+For example:
+
+```yaml
+desired_sharding_key:
+  project_id:
+    references: projects
+    backfill_via:
+      parent:
+        foreign_key: package_file_id
+        table: packages_package_files
+        sharding_key: project_id
+        belongs_to: package_file
+    awaiting_backfill_on_parent: true
+```
+
 There are likely edge cases where this `desired_sharding_key` structure is not
 suitable for backfilling a `sharding_key`. In such cases the team owning the
 table will need to create the necessary merge requests to add the
diff --git a/spec/features/admin/admin_jobs_spec.rb b/spec/features/admin/admin_jobs_spec.rb
index fc775c180ff..707d6976f39 100644
--- a/spec/features/admin/admin_jobs_spec.rb
+++ b/spec/features/admin/admin_jobs_spec.rb
@@ -14,8 +14,8 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
   describe 'GET /admin/jobs' do
     let(:pipeline) { create(:ci_pipeline) }
 
-    context 'All tab' do
-      context 'when have jobs' do
+    describe '"All" tab' do
+      context 'with jobs' do
         it 'shows all jobs', :js do
           create(:ci_build, pipeline: pipeline, status: :pending)
           create(:ci_build, pipeline: pipeline, status: :running)
@@ -27,7 +27,13 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
           wait_for_requests
 
           expect(page).to have_selector('[data-testid="jobs-all-tab"]')
-          expect(page.all('[data-testid="jobs-table-row"]').size).to eq(4)
+
+          jobs = page.all('[data-testid="jobs-table-row"]')
+          expect(jobs.size).to eq(4)
+          expect(jobs.at(0)).to have_button('Retry')
+          expect(jobs.at(1)).to have_button('Run again')
+          expect(jobs.at(2)).to have_button('Cancel')
+          expect(jobs.at(3)).to have_button('Cancel')
 
           click_button 'Cancel all jobs'
 
@@ -36,7 +42,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
         end
       end
 
-      context 'when have no jobs' do
+      context 'with no jobs' do
         it 'shows a message' do
           visit admin_jobs_path
 
@@ -49,7 +55,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
       end
     end
 
-    context 'Finished tab' do
+    describe '"Finished" tab' do
       context 'when have finished jobs' do
         it 'shows finished jobs' do
           build1 = create(:ci_build, pipeline: pipeline, status: :pending)
@@ -72,7 +78,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
         end
       end
 
-      context 'when have no jobs finished' do
+      context 'when no jobs have finished' do
         it 'shows a message' do
           create(:ci_build, pipeline: pipeline, status: :running)
 
@@ -91,7 +97,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
       end
     end
 
-    context 'jobs table links' do
+    describe 'jobs table links' do
       let_it_be(:namespace) { create(:namespace) }
       let_it_be(:project) { create(:project, namespace: namespace) }
       let_it_be(:runner) { create(:ci_runner, :instance) }
@@ -113,7 +119,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
       end
     end
 
-    context 'job filtering' do
+    describe 'job filtering' do
       it 'filters jobs by status' do
         create(:ci_build, pipeline: pipeline, status: :success)
         create(:ci_build, pipeline: pipeline, status: :failed)
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index f1781153da7..1dd26c2b86f 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -3329,7 +3329,6 @@
 - './spec/features/admin/admin_health_check_spec.rb'
 - './spec/features/admin/admin_hook_logs_spec.rb'
 - './spec/features/admin/admin_hooks_spec.rb'
-- './spec/features/admin/admin_jobs_spec.rb'
 - './spec/features/admin/admin_labels_spec.rb'
 - './spec/features/admin/admin_manage_applications_spec.rb'
 - './spec/features/admin/admin_mode/login_spec.rb'