diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index f51cb3a153a..277347903f3 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -1396,7 +1396,6 @@ ee/lib/ee/api/entities/project.rb @gitlab-org/manage/manage-workspace/backend-ap
 /ee/config/events/202108302307_profiles_controller_search_audit_event.yml @gitlab-org/govern/compliance
 /ee/config/events/202108302307_projects__audit_events_controller_search_audit_event.yml @gitlab-org/govern/compliance
 /ee/config/events/202111041910_admin__audit_logs_controller_search_audit_event.yml @gitlab-org/govern/compliance
-/ee/config/feature_flags/development/audit_log_group_level.yml @gitlab-org/govern/compliance
 /ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml @gitlab-org/govern/compliance
 /ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml @gitlab-org/govern/compliance
 /ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml @gitlab-org/govern/compliance
diff --git a/Gemfile b/Gemfile
index e7af9b8d9ed..172e7a7fb49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -485,7 +485,7 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
-gem 'stackprof', '~> 0.2.21', require: false
+gem 'stackprof', '~> 0.2.23', require: false
 gem 'rbtrace', '~> 0.4', require: false
 gem 'memory_profiler', '~> 1.0', require: false
 gem 'activerecord-explain-analyze', '~> 0.1', require: false
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 48d27c3d728..9bbc459802f 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -590,7 +590,7 @@
 {"name":"sqlite3","version":"1.6.0","platform":"x86_64-linux","checksum":"a2488dcf0e72928bab2b15b934113ce8d7a3b4031277e362d66e40956d5c709e"},
 {"name":"ssh_data","version":"1.3.0","platform":"ruby","checksum":"ec7c1e95a3aebeee412147998f4c147b4b05da6ed0aafda6083f9449318eaac0"},
 {"name":"ssrf_filter","version":"1.0.8","platform":"ruby","checksum":"03f49f54837e407d43ee93ec733a8a94dc1bcf8185647ac61606e63aaedaa0db"},
-{"name":"stackprof","version":"0.2.21","platform":"ruby","checksum":"2b6406c55dc2e134b2789c4cc631d96e67da87821a166f4ae12f15bec5cff5ae"},
+{"name":"stackprof","version":"0.2.23","platform":"ruby","checksum":"5c930b229c27bc64a2a0eb5e7203d76756ba0567bad7bf5290921ee1ed50230b"},
 {"name":"state_machines","version":"0.5.0","platform":"ruby","checksum":"23e6249d374a920b528dccade403518b4abbd83841a3e2c9ef13e6f1a009b102"},
 {"name":"state_machines-activemodel","version":"0.8.0","platform":"ruby","checksum":"e932dab190d4be044fb5f9cab01a3ea0b092c5f113d4676c6c0a0d49bf738d2c"},
 {"name":"state_machines-activerecord","version":"0.8.0","platform":"ruby","checksum":"072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6"},
diff --git a/Gemfile.lock b/Gemfile.lock
index e41d13b8d8c..004e463d3bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1453,7 +1453,7 @@ GEM
       mini_portile2 (~> 2.8.0)
     ssh_data (1.3.0)
     ssrf_filter (1.0.8)
-    stackprof (0.2.21)
+    stackprof (0.2.23)
     state_machines (0.5.0)
     state_machines-activemodel (0.8.0)
       activemodel (>= 5.1)
@@ -1897,7 +1897,7 @@ DEPENDENCIES
   sprite-factory (~> 1.7)
   sprockets (~> 3.7.0)
   ssh_data (~> 1.3)
-  stackprof (~> 0.2.21)
+  stackprof (~> 0.2.23)
   state_machines-activerecord (~> 0.8.0)
   sys-filesystem (~> 1.4.3)
   tanuki_emoji (~> 0.6)
diff --git a/app/assets/javascripts/admin/users/components/actions/activate.vue b/app/assets/javascripts/admin/users/components/actions/activate.vue
index 3a54035c587..0099c8da8e6 100644
--- a/app/assets/javascripts/admin/users/components/actions/activate.vue
+++ b/app/assets/javascripts/admin/users/components/actions/activate.vue
@@ -41,7 +41,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.activate,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/approve.vue b/app/assets/javascripts/admin/users/components/actions/approve.vue
index 5a8c675822d..52560ebe5b1 100644
--- a/app/assets/javascripts/admin/users/components/actions/approve.vue
+++ b/app/assets/javascripts/admin/users/components/actions/approve.vue
@@ -43,7 +43,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.approve,
-            attributes: [{ variant: 'confirm', 'data-qa-selector': 'approve_user_confirm_button' }],
+            attributes: { variant: 'confirm', 'data-qa-selector': 'approve_user_confirm_button' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/ban.vue b/app/assets/javascripts/admin/users/components/actions/ban.vue
index 898a688c203..203d076914f 100644
--- a/app/assets/javascripts/admin/users/components/actions/ban.vue
+++ b/app/assets/javascripts/admin/users/components/actions/ban.vue
@@ -56,7 +56,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.ban,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/block.vue b/app/assets/javascripts/admin/users/components/actions/block.vue
index d25dd400f9b..d50b76aaa92 100644
--- a/app/assets/javascripts/admin/users/components/actions/block.vue
+++ b/app/assets/javascripts/admin/users/components/actions/block.vue
@@ -42,7 +42,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.block,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/deactivate.vue b/app/assets/javascripts/admin/users/components/actions/deactivate.vue
index c85f3f01675..ab1069601d2 100644
--- a/app/assets/javascripts/admin/users/components/actions/deactivate.vue
+++ b/app/assets/javascripts/admin/users/components/actions/deactivate.vue
@@ -51,7 +51,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.deactivate,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/reject.vue b/app/assets/javascripts/admin/users/components/actions/reject.vue
index bac08de1d5e..2b9c4acfcb5 100644
--- a/app/assets/javascripts/admin/users/components/actions/reject.vue
+++ b/app/assets/javascripts/admin/users/components/actions/reject.vue
@@ -54,7 +54,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.reject,
-            attributes: [{ variant: 'danger' }],
+            attributes: { variant: 'danger' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/unban.vue b/app/assets/javascripts/admin/users/components/actions/unban.vue
index beede2d37d7..42b6fb3bdd4 100644
--- a/app/assets/javascripts/admin/users/components/actions/unban.vue
+++ b/app/assets/javascripts/admin/users/components/actions/unban.vue
@@ -37,7 +37,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.unban,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
           messageHtml,
         },
diff --git a/app/assets/javascripts/admin/users/components/actions/unblock.vue b/app/assets/javascripts/admin/users/components/actions/unblock.vue
index 720f2efd932..f94e128a945 100644
--- a/app/assets/javascripts/admin/users/components/actions/unblock.vue
+++ b/app/assets/javascripts/admin/users/components/actions/unblock.vue
@@ -32,7 +32,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.unblock,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
         },
       });
diff --git a/app/assets/javascripts/admin/users/components/actions/unlock.vue b/app/assets/javascripts/admin/users/components/actions/unlock.vue
index 55ea3e0aba7..c78c260b4fe 100644
--- a/app/assets/javascripts/admin/users/components/actions/unlock.vue
+++ b/app/assets/javascripts/admin/users/components/actions/unlock.vue
@@ -31,7 +31,7 @@ export default {
           },
           actionPrimary: {
             text: I18N_USER_ACTIONS.unlock,
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
           },
         },
       });
diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue
index 416e4fcecc7..09f997d73aa 100644
--- a/app/assets/javascripts/badges/components/badge_settings.vue
+++ b/app/assets/javascripts/badges/components/badge_settings.vue
@@ -26,7 +26,7 @@ export default {
     primaryProps() {
       return {
         text: __('Delete badge'),
-        attributes: [{ category: 'primary' }, { variant: 'danger' }],
+        attributes: { category: 'primary', variant: 'danger' },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index 896810bfb3a..9ea801dc9a2 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -128,14 +128,12 @@ export default {
     primaryProps() {
       return {
         text: this.buttonText,
-        attributes: [
-          {
-            variant: this.buttonKind,
-            disabled: this.submitDisabled,
-            loading: this.isLoading,
-            'data-qa-selector': 'save_changes_button',
-          },
-        ],
+        attributes: {
+          variant: this.buttonKind,
+          disabled: this.submitDisabled,
+          loading: this.isLoading,
+          'data-qa-selector': 'save_changes_button',
+        },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/boards/components/board_settings_sidebar.vue b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
index c0c2699b63d..afa20f63913 100644
--- a/app/assets/javascripts/boards/components/board_settings_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
@@ -136,11 +136,11 @@ export default {
       size="sm"
       :action-primary="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
         text: $options.i18n.modalAction,
-        attributes: [{ variant: 'danger' }],
+        attributes: { variant: 'danger' },
       } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
       :action-secondary="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
         text: $options.i18n.modalCancel,
-        attributes: [{ variant: 'default' }],
+        attributes: { variant: 'default' },
       } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
       @primary="handleModalPrimary"
     >
diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue b/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue
index 16bfc7f3abe..92c824fb5a1 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue
@@ -10,11 +10,11 @@ export default {
     ),
     actionPrimary: {
       text: s__('PipelineSchedules|Delete pipeline schedule'),
-      attributes: [{ variant: 'danger' }],
+      attributes: { variant: 'danger' },
     },
     actionCancel: {
       text: __('Cancel'),
-      attributes: [],
+      attributes: {},
     },
   },
   components: {
diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue
index 3ac52d4735d..7863b0e3ef0 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue
@@ -27,12 +27,10 @@ export default {
     actionPrimary() {
       return {
         text: this.$options.i18n.takeOwnership,
-        attributes: [
-          {
-            variant: 'confirm',
-            category: 'primary',
-          },
-        ],
+        attributes: {
+          variant: 'confirm',
+          category: 'primary',
+        },
       };
     },
   },
diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue
index 7ded3945a32..b4d84309c5f 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue
@@ -27,14 +27,12 @@ export default {
     actionPrimary() {
       return {
         text: this.$options.i18n.takeOwnership,
-        attributes: [
-          {
-            variant: 'confirm',
-            category: 'primary',
-            href: this.ownershipUrl,
-            'data-method': 'post',
-          },
-        ],
+        attributes: {
+          variant: 'confirm',
+          category: 'primary',
+          href: this.ownershipUrl,
+          'data-method': 'post',
+        },
       };
     },
   },
diff --git a/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue b/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue
index db8c953ce3c..6ce88fc54de 100644
--- a/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue
+++ b/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue
@@ -73,13 +73,13 @@ export default {
     actionPrimary() {
       return {
         text: i18n.modalAction,
-        attributes: [{ variant: 'danger' }],
+        attributes: { variant: 'danger' },
       };
     },
     actionSecondary() {
       return {
         text: i18n.modalCancel,
-        attributes: [{ variant: 'default' }],
+        attributes: { variant: 'default' },
       };
     },
   },
diff --git a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue
index f0af0da4bb4..697162b50ae 100644
--- a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue
+++ b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue
@@ -78,16 +78,17 @@ export default {
     primaryModalProps() {
       return {
         text: this.$options.i18n.revokeButton,
-        attributes: [
-          { disabled: this.loading || this.disableModalSubmit, loading: this.loading },
-          { variant: 'danger' },
-        ],
+        attributes: {
+          disabled: this.loading || this.disableModalSubmit,
+          loading: this.loading,
+          variant: 'danger',
+        },
       };
     },
     cancelModalProps() {
       return {
         text: this.$options.i18n.modalCancel,
-        attributes: [],
+        attributes: {},
       };
     },
     disableModalSubmit() {
diff --git a/app/assets/javascripts/clusters_list/components/delete_agent_button.vue b/app/assets/javascripts/clusters_list/components/delete_agent_button.vue
index 7a028858d10..913db87f019 100644
--- a/app/assets/javascripts/clusters_list/components/delete_agent_button.vue
+++ b/app/assets/javascripts/clusters_list/components/delete_agent_button.vue
@@ -77,16 +77,17 @@ export default {
     primaryModalProps() {
       return {
         text: this.$options.i18n.modalAction,
-        attributes: [
-          { disabled: this.loading || this.disableModalSubmit, loading: this.loading },
-          { variant: 'danger' },
-        ],
+        attributes: {
+          disabled: this.loading || this.disableModalSubmit,
+          loading: this.loading,
+          variant: 'danger',
+        },
       };
     },
     cancelModalProps() {
       return {
         text: this.$options.i18n.modalCancel,
-        attributes: [],
+        attributes: {},
       };
     },
     disableModalSubmit() {
diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue
index c67b544eacd..b13b0ede9f0 100644
--- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue
+++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue
@@ -48,15 +48,13 @@ export default {
     addDeployFreezeButton() {
       return {
         text: this.isEditing ? __('Save deploy freeze') : __('Add deploy freeze'),
-        attributes: [
-          { variant: 'confirm' },
-          {
-            disabled:
-              !isValidCron(this.freezeStartCron) ||
-              !isValidCron(this.freezeEndCron) ||
-              !this.selectedTimezone,
-          },
-        ],
+        attributes: {
+          variant: 'confirm',
+          disabled:
+            !isValidCron(this.freezeStartCron) ||
+            !isValidCron(this.freezeEndCron) ||
+            !this.selectedTimezone,
+        },
       };
     },
     invalidFreezeStartCron() {
diff --git a/app/assets/javascripts/deploy_keys/components/confirm_modal.vue b/app/assets/javascripts/deploy_keys/components/confirm_modal.vue
index 1932435c42a..25551d7b5cb 100644
--- a/app/assets/javascripts/deploy_keys/components/confirm_modal.vue
+++ b/app/assets/javascripts/deploy_keys/components/confirm_modal.vue
@@ -22,11 +22,11 @@ export default {
     title: __('Do you want to remove this deploy key?'),
     actionPrimary: {
       text: __('Remove deploy key'),
-      attributes: [{ variant: 'danger' }],
+      attributes: { variant: 'danger' },
     },
     actionSecondary: {
       text: __('Cancel'),
-      attributes: [{ category: 'tertiary' }],
+      attributes: { category: 'tertiary' },
     },
     static: true,
     modalId: 'confirm-remove-deploy-key',
diff --git a/app/assets/javascripts/environments/components/canary_update_modal.vue b/app/assets/javascripts/environments/components/canary_update_modal.vue
index cacd868bed0..aff7d34f191 100644
--- a/app/assets/javascripts/environments/components/canary_update_modal.vue
+++ b/app/assets/javascripts/environments/components/canary_update_modal.vue
@@ -42,7 +42,7 @@ export default {
     modalId: CANARY_UPDATE_MODAL,
     actionPrimary: {
       text: s__('CanaryIngress|Change ratio'),
-      attributes: [{ variant: 'confirm' }],
+      attributes: { variant: 'confirm' },
     },
     actionCancel: { text: __('Cancel') },
     static: true,
diff --git a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue
index 8259574f8e3..53a93bbce30 100644
--- a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue
+++ b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue
@@ -135,7 +135,7 @@ export default {
   csrf,
   cancelProps: {
     text: __('Cancel'),
-    attributes: [{ variant: 'danger' }],
+    attributes: { variant: 'danger' },
   },
   docsPath: helpPagePath('ci/environments/index.md', { anchor: 'retry-or-roll-back-a-deployment' }),
 };
diff --git a/app/assets/javascripts/environments/components/delete_environment_modal.vue b/app/assets/javascripts/environments/components/delete_environment_modal.vue
index f91d288a54c..47f38980acc 100644
--- a/app/assets/javascripts/environments/components/delete_environment_modal.vue
+++ b/app/assets/javascripts/environments/components/delete_environment_modal.vue
@@ -29,7 +29,7 @@ export default {
     primaryProps() {
       return {
         text: s__('Environments|Delete environment'),
-        attributes: [{ variant: 'danger' }],
+        attributes: { variant: 'danger' },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue
index 162ad598c8c..dc0c5dc0f46 100644
--- a/app/assets/javascripts/environments/components/stop_environment_modal.vue
+++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue
@@ -33,7 +33,7 @@ export default {
     primaryProps() {
       return {
         text: s__('Environments|Stop environment'),
-        attributes: [{ variant: 'danger' }],
+        attributes: { variant: 'danger' },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue b/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue
index 366ee6bb05b..9fb5d9f0943 100644
--- a/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue
+++ b/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue
@@ -84,11 +84,9 @@ export default {
     cancelActionProps() {
       return {
         text: this.$options.translations.cancelActionLabel,
-        attributes: [
-          {
-            category: 'secondary',
-          },
-        ],
+        attributes: {
+          category: 'secondary',
+        },
       };
     },
     canRegenerateInstanceId() {
@@ -98,14 +96,12 @@ export default {
       return this.canUserRotateToken
         ? {
             text: this.$options.translations.instanceIdRegenerateActionLabel,
-            attributes: [
-              {
-                category: 'secondary',
-                disabled: !this.canRegenerateInstanceId,
-                loading: this.isRotating,
-                variant: 'danger',
-              },
-            ],
+            attributes: {
+              category: 'secondary',
+              disabled: !this.canRegenerateInstanceId,
+              loading: this.isRotating,
+              variant: 'danger',
+            },
           }
         : null;
     },
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index 7c2339dac71..82eddf5603f 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -59,7 +59,7 @@ export default {
     primaryProps() {
       return {
         text: __('Leave group'),
-        attributes: [{ variant: 'danger' }, { category: 'primary' }],
+        attributes: { variant: 'danger', category: 'primary' },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index d250552742e..4d728bd35d4 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -50,13 +50,13 @@ export default {
     actionPrimary() {
       return {
         text: this.buttonLabel,
-        attributes: [{ variant: 'confirm' }],
+        attributes: { variant: 'confirm' },
       };
     },
     actionCancel() {
       return {
         text: i18n.cancelButtonText,
-        attributes: [{ variant: 'default' }],
+        attributes: { variant: 'default' },
       };
     },
     isCreatingNewFile() {
diff --git a/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue
index bc6aa231a93..024f562b71d 100644
--- a/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue
+++ b/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue
@@ -11,7 +11,7 @@ export default {
     primaryProps() {
       return {
         text: __('Save'),
-        attributes: [{ variant: 'confirm' }, { category: 'primary' }],
+        attributes: { variant: 'confirm', category: 'primary' },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue
index 41cd650f932..e766064a69b 100644
--- a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue
+++ b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue
@@ -9,7 +9,7 @@ export default {
   },
   primaryProps: {
     text: __('Reset'),
-    attributes: [{ variant: 'danger' }, { category: 'primary' }],
+    attributes: { variant: 'danger', category: 'primary' },
   },
   cancelProps: {
     text: __('Cancel'),
diff --git a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
index 91a52c36e41..6d1a3ceba16 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
@@ -1,17 +1,16 @@
 <script>
-import { GlButton, GlLink, GlIcon, GlDropdownItem } from '@gitlab/ui';
+import { GlButton, GlLink, GlDropdownItem } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import eventHub from '../event_hub';
 import {
   TRIGGER_ELEMENT_BUTTON,
-  TRIGGER_ELEMENT_SIDE_NAV,
   TRIGGER_DEFAULT_QA_SELECTOR,
   TRIGGER_ELEMENT_WITH_EMOJI,
   TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI,
 } from '../constants';
 
 export default {
-  components: { GlButton, GlLink, GlIcon, GlDropdownItem },
+  components: { GlButton, GlLink, GlDropdownItem },
   props: {
     displayText: {
       type: String,
@@ -66,7 +65,6 @@ export default {
     },
   },
   TRIGGER_ELEMENT_BUTTON,
-  TRIGGER_ELEMENT_SIDE_NAV,
   TRIGGER_ELEMENT_WITH_EMOJI,
   TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI,
 };
@@ -82,17 +80,6 @@ export default {
   >
     {{ displayText }}
   </gl-button>
-  <gl-link
-    v-else-if="checkTrigger($options.TRIGGER_ELEMENT_SIDE_NAV)"
-    v-bind="componentAttributes"
-    data-is-link="true"
-    @click="openModal"
-  >
-    <span class="nav-icon-container">
-      <gl-icon :name="icon" />
-    </span>
-    <span class="nav-item-name"> {{ displayText }} </span>
-  </gl-link>
   <gl-link
     v-else-if="checkTrigger($options.TRIGGER_ELEMENT_WITH_EMOJI)"
     v-bind="componentAttributes"
diff --git a/app/assets/javascripts/invite_members/constants.js b/app/assets/javascripts/invite_members/constants.js
index 34b4e436392..86badd16d6c 100644
--- a/app/assets/javascripts/invite_members/constants.js
+++ b/app/assets/javascripts/invite_members/constants.js
@@ -19,7 +19,6 @@ export const GROUP_FILTERS = {
 export const USERS_FILTER_ALL = 'all';
 export const USERS_FILTER_SAML_PROVIDER_ID = 'saml_provider_id';
 export const TRIGGER_ELEMENT_BUTTON = 'button';
-export const TRIGGER_ELEMENT_SIDE_NAV = 'side-nav';
 export const TOP_NAV_INVITE_MEMBERS_COMPONENT = 'invite_members';
 export const TRIGGER_ELEMENT_WITH_EMOJI = 'text-emoji';
 export const TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI = 'dropdown-text-emoji';
diff --git a/app/assets/javascripts/issuable/components/related_issuable_item.vue b/app/assets/javascripts/issuable/components/related_issuable_item.vue
index 608c1deac64..ded54d60d1d 100644
--- a/app/assets/javascripts/issuable/components/related_issuable_item.vue
+++ b/app/assets/javascripts/issuable/components/related_issuable_item.vue
@@ -101,26 +101,22 @@ export default {
     :class="{
       'issuable-info-container': !canReorder,
       'card-body': canReorder,
-      'gl-pr-2': canRemove,
     }"
-    class="item-body d-flex align-items-center gl-py-3 gl-px-5"
+    class="item-body gl-display-flex gl-align-items-center gl-gap-3 gl-px-3 gl-py-2 py-xl-0 gl-mx-n2"
   >
     <div
-      class="item-contents gl-display-flex gl-align-items-center gl-flex-wrap gl-flex-grow-1 flex-xl-nowrap gl-min-h-7"
+      class="item-contents gl-display-flex gl-align-items-center gl-flex-wrap gl-flex-grow-1 gl-gap-2 flex-xl-nowrap gl-min-h-7"
     >
       <!-- Title area: Status icon (XL) and title -->
-      <div class="item-title d-flex align-items-xl-center mb-xl-0 gl-min-w-0">
-        <div ref="iconElementXL">
-          <gl-icon
-            v-if="hasState"
-            ref="iconElementXL"
-            class="gl-mr-3"
-            :class="iconClasses"
-            :name="iconName"
-            :title="stateTitle"
-            :aria-label="state"
-          />
-        </div>
+      <div class="item-title gl-display-flex gl-gap-3 gl-min-w-0">
+        <gl-icon
+          v-if="hasState"
+          ref="iconElementXL"
+          :class="iconClasses"
+          :name="iconName"
+          :title="stateTitle"
+          :aria-label="state"
+        />
         <gl-tooltip :target="() => $refs.iconElementXL">
           <span v-safe-html="stateTitle"></span>
         </gl-tooltip>
@@ -129,42 +125,46 @@ export default {
           v-gl-tooltip
           name="eye-slash"
           :title="__('Confidential')"
-          class="confidential-icon gl-mr-2 align-self-baseline align-self-md-auto mt-xl-0"
+          class="confidential-icon"
           :aria-label="__('Confidential')"
         />
-        <gl-link
-          :href="computedPath"
-          class="sortable-link gl-font-weight-normal"
-          @click="handleTitleClick"
-        >
+        <gl-link :href="computedPath" class="sortable-link" @click="handleTitleClick">
           {{ title }}
         </gl-link>
       </div>
 
       <!-- Info area: meta, path, and assignees -->
-      <div class="item-info-area d-flex flex-xl-grow-1 flex-shrink-0">
+      <div
+        class="item-info-area gl-display-flex gl-flex-grow-1 gl-flex-shrink-0 gl-gap-3 gl-ml-6 ml-xl-0"
+      >
         <!-- Meta area: path and attributes -->
         <!-- If there is no room beside the path, meta attributes are put ABOVE it (flex-wrap-reverse). -->
         <!-- See design: https://gitlab-org.gitlab.io/gitlab-design/hosted/pedro/%2383-issue-mr-rows-cards-spec-previews/#artboard16 -->
         <div
-          class="item-meta d-flex flex-wrap-reverse justify-content-start justify-content-md-between"
+          class="item-meta gl-display-flex gl-md-justify-content-space-between gl-gap-3 gl-flex-wrap-wrap-reverse"
         >
           <!-- Path area: status icon (<XL), path, issue # -->
           <div
-            class="item-path-area item-path-id d-flex align-items-center mr-2 mt-2 mt-xl-0 ml-xl-2"
+            class="item-path-area item-path-id gl-display-flex gl-align-items-center gl-flex-wrap gl-gap-3"
           >
             <gl-tooltip :target="() => $refs.iconElement">
               <span v-safe-html="stateTitle"></span>
             </gl-tooltip>
-            <span v-gl-tooltip :title="itemPath" class="path-id-text d-inline-block">{{
-              itemPath
-            }}</span>
+            <span
+              v-if="itemPath"
+              v-gl-tooltip
+              :title="itemPath"
+              class="path-id-text d-inline-block"
+              >{{ itemPath }}</span
+            >
             <span>{{ pathIdSeparator }}{{ itemId }}</span>
           </div>
 
           <!-- Attributes area: CI, epic count, weight, milestone -->
           <!-- They have a different order on large screen sizes -->
-          <div class="item-attributes-area d-flex align-items-center mt-2 mt-xl-0">
+          <div
+            class="item-attributes-area gl-display-flex gl-align-items-center gl-flex-wrap gl-gap-3"
+          >
             <span v-if="hasPipeline" class="mr-ci-status order-md-last">
               <a :href="pipelineStatus.details_path">
                 <ci-icon v-gl-tooltip :status="pipelineStatus" :title="pipelineStatusTooltip" />
@@ -174,7 +174,7 @@ export default {
             <issue-milestone
               v-if="hasMilestone"
               :milestone="milestone"
-              class="d-flex align-items-center item-milestone order-md-first ml-md-0"
+              class="item-milestone gl-font-sm gl-display-flex gl-align-items-center order-md-first"
             />
 
             <!-- Flex order for slots is defined in the parent component: e.g. related_issues_block.vue -->
@@ -198,24 +198,17 @@ export default {
             <issue-assignees
               v-if="hasAssignees"
               :assignees="assignees"
-              class="item-assignees align-items-center align-self-end flex-shrink-0 order-md-2 d-none d-md-flex"
+              class="item-assignees gl-display-flex gl-align-items-center gl-align-self-end gl-flex-shrink-0 order-md-2"
             />
           </div>
         </div>
-
-        <!-- Assignees. On small layouts, these are put here, at the end of the card. -->
-        <issue-assignees
-          v-if="assignees.length !== 0"
-          :assignees="assignees"
-          class="item-assignees d-flex align-items-center align-self-end flex-shrink-0 d-md-none gl-ml-3"
-        />
       </div>
     </div>
 
     <span
       v-if="isLocked"
       v-gl-tooltip
-      class="gl-px-3 gl-display-inline-block gl-cursor-not-allowed"
+      class="gl-display-inline-block gl-cursor-not-allowed"
       :title="lockedMessage"
       data-testid="lockIcon"
     >
@@ -226,8 +219,9 @@ export default {
       v-gl-tooltip
       icon="close"
       category="tertiary"
+      size="small"
       :disabled="removeDisabled"
-      class="js-issue-item-remove-button gl-ml-3"
+      class="js-issue-item-remove-button"
       data-qa-selector="remove_related_issue_button"
       :title="__('Remove')"
       :aria-label="__('Remove')"
diff --git a/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue
index a9274be0c4c..af06884bbb4 100644
--- a/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue
+++ b/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue
@@ -65,7 +65,7 @@ export default {
 
 <template>
   <div v-if="isFetchingMergeRequests || (!isFetchingMergeRequests && totalCount)">
-    <div class="card card-slim gl-mt-5 gl-mb-0">
+    <div class="card card-slim gl-mt-5 gl-mb-0 gl-bg-gray-10">
       <div class="card-header gl-px-5 gl-py-4 gl-bg-white">
         <div
           class="card-title gl-relative gl-display-flex gl-align-items-center gl-line-height-20 gl-font-weight-bold gl-m-0"
@@ -88,10 +88,10 @@ export default {
         v-if="isFetchingMergeRequests"
         size="sm"
         label="Fetching related merge requests"
-        class="gl-py-3"
+        class="gl-py-4"
       />
-      <ul v-else class="content-list related-items-list gl-bg-gray-10">
-        <li v-for="mr in mergeRequests" :key="mr.id" class="list-item gl-m-0! gl-p-0!">
+      <ul v-else class="content-list related-items-list">
+        <li v-for="mr in mergeRequests" :key="mr.id" class="list-item gl-m-0! gl-px-4! gl-py-3!">
           <related-issuable-item
             :id-key="mr.id"
             :display-reference="mr.reference"
diff --git a/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue b/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue
index 913924cc7b1..a3f1a2c4be8 100644
--- a/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue
+++ b/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue
@@ -30,18 +30,16 @@ export default {
     return {
       primaryProps: {
         text: this.$options.i18n.primaryText,
-        attributes: [
-          {
-            'data-method': 'post',
-            'data-testid': 'retry-button-modal',
-            href: this.href,
-            variant: 'danger',
-          },
-        ],
+        attributes: {
+          'data-method': 'post',
+          'data-testid': 'retry-button-modal',
+          href: this.href,
+          variant: 'danger',
+        },
       },
       cancelProps: {
         text: this.$options.i18n.cancel,
-        attributes: [{ category: 'secondary', variant: 'default' }],
+        attributes: { category: 'secondary', variant: 'default' },
       },
     };
   },
diff --git a/app/assets/javascripts/labels/components/promote_label_modal.vue b/app/assets/javascripts/labels/components/promote_label_modal.vue
index 890cad26ee8..298cc20ab35 100644
--- a/app/assets/javascripts/labels/components/promote_label_modal.vue
+++ b/app/assets/javascripts/labels/components/promote_label_modal.vue
@@ -9,7 +9,7 @@ import eventHub from '../event_hub';
 export default {
   primaryProps: {
     text: s__('Labels|Promote Label'),
-    attributes: [{ variant: 'confirm' }],
+    attributes: { variant: 'confirm' },
   },
   cancelProps: {
     text: __('Cancel'),
diff --git a/app/assets/javascripts/milestones/components/delete_milestone_modal.vue b/app/assets/javascripts/milestones/components/delete_milestone_modal.vue
index 7f46456b78f..8e7428089e2 100644
--- a/app/assets/javascripts/milestones/components/delete_milestone_modal.vue
+++ b/app/assets/javascripts/milestones/components/delete_milestone_modal.vue
@@ -103,7 +103,7 @@ Once deleted, it cannot be undone or recovered.`),
   },
   primaryProps: {
     text: s__('Milestones|Delete milestone'),
-    attributes: [{ variant: 'danger' }, { category: 'primary' }],
+    attributes: { variant: 'danger', category: 'primary' },
   },
   cancelProps: {
     text: __('Cancel'),
diff --git a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue
index bd3896d1a8d..63791dcd011 100644
--- a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue
+++ b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue
@@ -80,11 +80,11 @@ export default {
   },
   primaryAction: {
     text: s__('Milestones|Promote Milestone'),
-    attributes: [{ variant: 'confirm' }],
+    attributes: { variant: 'confirm' },
   },
   cancelAction: {
     text: __('Cancel'),
-    attributes: [],
+    attributes: {},
   },
 };
 </script>
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue
index 2da8ca2d8a8..0757ac5522a 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue
@@ -85,7 +85,7 @@ export default {
     size="sm"
     :action-primary="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
       text: __('Delete'),
-      attributes: [{ variant: 'danger' }, { disabled: disablePrimaryButton }],
+      attributes: { variant: 'danger', disabled: disablePrimaryButton },
     } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
     :action-cancel="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
       text: __('Cancel'),
diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue
index 45dc217b9e3..b24ec65464f 100644
--- a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue
+++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue
@@ -55,7 +55,7 @@ export default {
   modalButtons: {
     primary: {
       text: s__('DependencyProxy|Clear cache'),
-      attributes: [{ variant: 'danger' }],
+      attributes: { variant: 'danger' },
     },
     secondary: {
       text: __('Cancel'),
diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue b/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue
index fd099ee4e69..fdc58e4bd05 100644
--- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue
+++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue
@@ -122,15 +122,15 @@ export default {
   modal: {
     packageDeletePrimaryAction: {
       text: __('Delete'),
-      attributes: [
-        { variant: 'danger' },
-        { category: 'primary' },
-        { 'data-qa-selector': 'delete_modal_button' },
-      ],
+      attributes: {
+        variant: 'danger',
+        category: 'primary',
+        'data-qa-selector': 'delete_modal_button',
+      },
     },
     fileDeletePrimaryAction: {
       text: __('Delete'),
-      attributes: [{ variant: 'danger' }, { category: 'primary' }],
+      attributes: { variant: 'danger', category: 'primary' },
     },
     cancelAction: {
       text: __('Cancel'),
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue
index 011a2668a8b..b167fff26b0 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue
@@ -32,7 +32,7 @@ export default {
   modal: {
     packagesDeletePrimaryAction: {
       text: DELETE_PACKAGE_MODAL_PRIMARY_ACTION,
-      attributes: [{ variant: 'danger' }, { category: 'primary' }],
+      attributes: { variant: 'danger', category: 'primary' },
     },
     cancelAction: {
       text: __('Cancel'),
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue
index a5eda6cb47a..1ce2140894e 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue
@@ -314,19 +314,19 @@ export default {
   modal: {
     packageDeletePrimaryAction: {
       text: s__('PackageRegistry|Permanently delete'),
-      attributes: [
-        { variant: 'danger' },
-        { category: 'primary' },
-        { 'data-qa-selector': 'delete_modal_button' },
-      ],
+      attributes: {
+        variant: 'danger',
+        category: 'primary',
+        'data-qa-selector': 'delete_modal_button',
+      },
     },
     fileDeletePrimaryAction: {
       text: __('Delete'),
-      attributes: [{ variant: 'danger' }, { category: 'primary' }],
+      attributes: { variant: 'danger', category: 'primary' },
     },
     filesDeletePrimaryAction: {
       text: s__('PackageRegistry|Permanently delete assets'),
-      attributes: [{ variant: 'danger' }, { category: 'primary' }],
+      attributes: { variant: 'danger', category: 'primary' },
     },
     cancelAction: {
       text: __('Cancel'),
diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue b/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue
index 2aff20a1928..3bc785ee1b6 100644
--- a/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue
+++ b/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue
@@ -43,7 +43,7 @@ export default {
   },
   primaryAction: {
     text: PRIMARY_ACTION_TEXT,
-    attributes: [{ variant: 'danger' }],
+    attributes: { variant: 'danger' },
   },
   cancelAction: {
     text: CANCEL_TEXT,
diff --git a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
index 48241a213ef..3a91f8e2c55 100644
--- a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
+++ b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
@@ -72,7 +72,7 @@ export default {
     primaryProps() {
       return {
         text: __('Delete project'),
-        attributes: [{ variant: 'danger' }, { category: 'primary' }, { disabled: !this.canSubmit }],
+        attributes: { variant: 'danger', category: 'primary', disabled: !this.canSubmit },
       };
     },
   },
diff --git a/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue b/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue
index 44728ea9cdf..7db94ea435e 100644
--- a/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue
+++ b/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue
@@ -33,7 +33,7 @@ export default {
     primaryProps() {
       return {
         text: I18N_PASSWORD_PROMPT_CONFIRM_BUTTON,
-        attributes: [{ variant: 'danger' }, { category: 'primary' }, { disabled: !this.isValid }],
+        attributes: { variant: 'danger', category: 'primary', disabled: !this.isValid },
       };
     },
   },
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue
index eb70b5fbb7a..9f38be668f2 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue
@@ -42,7 +42,7 @@ export default {
     primaryProps() {
       return {
         text: s__('Pipeline|Stop pipeline'),
-        attributes: [{ variant: 'danger' }],
+        attributes: { variant: 'danger' },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue b/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue
index 2d1f1945e5a..10db3e1c56b 100644
--- a/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue
+++ b/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue
@@ -66,7 +66,7 @@ export default {
   },
   modalCloseButton: {
     text: __('Close'),
-    attributes: [{ variant: 'confirm' }],
+    attributes: { variant: 'confirm' },
   },
 };
 </script>
diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue
index 3cb2dce87d3..c64fbc91d12 100644
--- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue
+++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue
@@ -38,11 +38,12 @@ export default {
     primaryProps() {
       return {
         text: __('Delete account'),
-        attributes: [
-          { variant: 'danger', 'data-qa-selector': 'confirm_delete_account_button' },
-          { category: 'primary' },
-          { disabled: !this.canSubmit },
-        ],
+        attributes: {
+          variant: 'danger',
+          'data-qa-selector': 'confirm_delete_account_button',
+          category: 'primary',
+          disabled: !this.canSubmit,
+        },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue
index 599d5650dc3..d96b5748abc 100644
--- a/app/assets/javascripts/profile/account/components/update_username.vue
+++ b/app/assets/javascripts/profile/account/components/update_username.vue
@@ -60,11 +60,7 @@ Please update your Git repository remotes as soon as possible.`),
     primaryProps() {
       return {
         text: __('Update username'),
-        attributes: [
-          { variant: 'confirm' },
-          { category: 'primary' },
-          { disabled: this.isRequestPending },
-        ],
+        attributes: { variant: 'confirm', category: 'primary', disabled: this.isRequestPending },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/projects/commit/components/form_modal.vue b/app/assets/javascripts/projects/commit/components/form_modal.vue
index b499977aaef..28bbf67c090 100644
--- a/app/assets/javascripts/projects/commit/components/form_modal.vue
+++ b/app/assets/javascripts/projects/commit/components/form_modal.vue
@@ -52,16 +52,16 @@ export default {
       checked: true,
       actionPrimary: {
         text: this.i18n.actionPrimaryText,
-        attributes: [
-          { variant: 'confirm' },
-          { category: 'primary' },
-          { 'data-testid': 'submit-commit' },
-          { 'data-qa-selector': 'submit_commit_button' },
-        ],
+        attributes: {
+          variant: 'confirm',
+          category: 'primary',
+          'data-testid': 'submit-commit',
+          'data-qa-selector': 'submit_commit_button',
+        },
       },
       actionCancel: {
         text: this.i18n.actionCancelText,
-        attributes: [{ 'data-testid': 'cancel-commit' }],
+        attributes: { 'data-testid': 'cancel-commit' },
       },
     };
   },
diff --git a/app/assets/javascripts/projects/components/shared/delete_button.vue b/app/assets/javascripts/projects/components/shared/delete_button.vue
index 64a16b462f5..06c0230c8e0 100644
--- a/app/assets/javascripts/projects/components/shared/delete_button.vue
+++ b/app/assets/javascripts/projects/components/shared/delete_button.vue
@@ -62,11 +62,11 @@ export default {
       return {
         primary: {
           text: __('Yes, delete project'),
-          attributes: [
-            { variant: 'danger' },
-            { disabled: this.confirmDisabled },
-            { 'data-qa-selector': 'confirm_delete_button' },
-          ],
+          attributes: {
+            variant: 'danger',
+            disabled: this.confirmDisabled,
+            'data-qa-selector': 'confirm_delete_button',
+          },
         },
         cancel: {
           text: __('Cancel, keep project'),
diff --git a/app/assets/javascripts/related_issues/components/add_issuable_form.vue b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
index adae92a92e9..7ecc39a56e7 100644
--- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue
+++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
@@ -182,7 +182,7 @@ export default {
           :checked="linkedIssueType"
         />
       </gl-form-group>
-      <p class="bold">
+      <p class="bold gl-mb-2">
         {{ issuableInputText }}
       </p>
     </template>
diff --git a/app/assets/javascripts/related_issues/components/related_issues_block.vue b/app/assets/javascripts/related_issues/components/related_issues_block.vue
index a12aa67d467..043d925198c 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_block.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_block.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlLink, GlIcon, GlButton, GlCard } from '@gitlab/ui';
+import { GlLink, GlIcon, GlLoadingIcon, GlButton, GlCard } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import {
   issuableIconMap,
@@ -17,6 +17,7 @@ export default {
   components: {
     GlLink,
     GlIcon,
+    GlLoadingIcon,
     GlButton,
     GlCard,
     AddIssuableForm,
@@ -239,15 +240,12 @@ export default {
       </template>
       <div
         v-if="isOpen"
-        class="linked-issues-card-body"
-        :class="{
-          'gl-p-5': isFormVisible || shouldShowTokenBody,
-        }"
+        class="linked-issues-card-body gl-py-3 gl-px-4 gl-bg-gray-10"
         data-testid="related-issues-body"
       >
         <div
           v-if="isFormVisible"
-          class="js-add-related-issues-form-area card-body bordered-box bg-white"
+          class="js-add-related-issues-form-area card-body bg-white gl-mt-2 gl-border-1 gl-border-solid gl-border-gray-100 gl-rounded-base"
           :class="{ 'gl-mb-5': shouldShowTokenBody, 'gl-show-field-errors': hasError }"
         >
           <add-issuable-form
@@ -270,6 +268,7 @@ export default {
           />
         </div>
         <template v-if="shouldShowTokenBody">
+          <gl-loading-icon v-if="isFetching" size="sm" class="gl-py-2" />
           <related-issues-list
             v-for="(category, index) in categorisedIssues"
             :key="category.linkType"
@@ -281,13 +280,16 @@ export default {
             :issuable-type="issuableType"
             :path-id-separator="pathIdSeparator"
             :related-issues="category.issues"
-            :class="{ 'gl-mt-5': index > 0 }"
+            :class="{
+              'gl-pb-3 gl-mb-5 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100':
+                index !== categorisedIssues.length - 1,
+            }"
             @relatedIssueRemoveRequest="$emit('relatedIssueRemoveRequest', $event)"
             @saveReorder="$emit('saveReorder', $event)"
           />
         </template>
         <div v-if="!shouldShowTokenBody && !isFormVisible" data-testid="related-items-empty">
-          <p class="gl-my-5 gl-px-5 gl-text-gray-500">
+          <p class="gl-p-2 gl-mb-0 gl-text-gray-500">
             {{ emptyStateMessage }}
             <gl-link
               v-if="hasHelpPath"
diff --git a/app/assets/javascripts/related_issues/components/related_issues_list.vue b/app/assets/javascripts/related_issues/components/related_issues_list.vue
index 7387b9ab87c..4429c1beb00 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_list.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_list.vue
@@ -97,11 +97,13 @@ export default {
 
 <template>
   <div :data-link-type="listLinkType">
-    <h4 v-if="heading" class="gl-font-base mt-0">{{ heading }}</h4>
-    <div
-      class="related-issues-token-body bordered-box bg-white"
-      :class="{ 'sortable-container': canReorder }"
+    <h4
+      v-if="heading"
+      class="gl-font-sm gl-font-weight-semibold gl-text-gray-700 gl-mx-2 gl-mt-3 gl-mb-2"
     >
+      {{ heading }}
+    </h4>
+    <div class="related-issues-token-body" :class="{ 'sortable-container': canReorder }">
       <div v-if="isFetching" class="gl-mb-2" data-qa-selector="related_issues_loading_placeholder">
         <gl-loading-icon
           ref="loadingIcon"
@@ -121,7 +123,7 @@ export default {
           }"
           :data-key="issue.id"
           :data-ordering-id="issuableOrderingId(issue)"
-          class="js-related-issues-token-list-item list-item pt-0 pb-0"
+          class="js-related-issues-token-list-item list-item pt-0 pb-0 gl-border-b-0!"
         >
           <related-issuable-item
             :id-key="issue.id"
diff --git a/app/assets/javascripts/repository/components/delete_blob_modal.vue b/app/assets/javascripts/repository/components/delete_blob_modal.vue
index baf8449b188..cbdf6ef9ccd 100644
--- a/app/assets/javascripts/repository/components/delete_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/delete_blob_modal.vue
@@ -101,23 +101,19 @@ export default {
     primaryOptions() {
       return {
         text: this.$options.i18n.PRIMARY_OPTIONS_TEXT,
-        attributes: [
-          {
-            variant: 'danger',
-            loading: this.loading,
-            disabled: this.loading || !this.form.state,
-          },
-        ],
+        attributes: {
+          variant: 'danger',
+          loading: this.loading,
+          disabled: this.loading || !this.form.state,
+        },
       };
     },
     cancelOptions() {
       return {
         text: this.$options.i18n.SECONDARY_OPTIONS_TEXT,
-        attributes: [
-          {
-            disabled: this.loading,
-          },
-        ],
+        attributes: {
+          disabled: this.loading,
+        },
       };
     },
     showCreateNewMrToggle() {
diff --git a/app/assets/javascripts/repository/components/new_directory_modal.vue b/app/assets/javascripts/repository/components/new_directory_modal.vue
index d9f3a30d28f..f36a700c902 100644
--- a/app/assets/javascripts/repository/components/new_directory_modal.vue
+++ b/app/assets/javascripts/repository/components/new_directory_modal.vue
@@ -93,23 +93,19 @@ export default {
     primaryOptions() {
       return {
         text: this.primaryBtnText,
-        attributes: [
-          {
-            variant: 'confirm',
-            loading: this.loading,
-            disabled: !this.formCompleted || this.loading,
-          },
-        ],
+        attributes: {
+          variant: 'confirm',
+          loading: this.loading,
+          disabled: !this.formCompleted || this.loading,
+        },
       };
     },
     cancelOptions() {
       return {
         text: SECONDARY_OPTIONS_TEXT,
-        attributes: [
-          {
-            disabled: this.loading,
-          },
-        ],
+        attributes: {
+          disabled: this.loading,
+        },
       };
     },
     showCreateNewMrToggle() {
diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index d597a3a78d1..0c9b46344c5 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -1,10 +1,8 @@
 <script>
 import paginatedTreeQuery from 'shared_queries/repository/paginated_tree.query.graphql';
 import { createAlert } from '~/alert';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   TREE_PAGE_SIZE,
-  TREE_INITIAL_FETCH_COUNT,
   TREE_PAGE_LIMIT,
   COMMIT_BATCH_SIZE,
   GITALY_UNAVAILABLE_CODE,
@@ -23,7 +21,7 @@ export default {
     FileTable,
     FilePreview,
   },
-  mixins: [getRefMixin, glFeatureFlagMixin()],
+  mixins: [getRefMixin],
   apollo: {
     projectPath: {
       query: projectPathQuery,
@@ -59,13 +57,6 @@ export default {
     };
   },
   computed: {
-    pageSize() {
-      // we want to exponentially increase the page size to reduce the load on the frontend
-      const exponentialSize = (TREE_PAGE_SIZE / TREE_INITIAL_FETCH_COUNT) * (this.fetchCounter + 1);
-      return exponentialSize < TREE_PAGE_SIZE && this.glFeatures.increasePageSizeExponentially
-        ? exponentialSize
-        : TREE_PAGE_SIZE;
-    },
     totalEntries() {
       return Object.values(this.entries).flat().length;
     },
@@ -110,7 +101,7 @@ export default {
             ref: this.ref,
             path: originalPath,
             nextPageCursor: this.nextPageCursor,
-            pageSize: this.pageSize,
+            pageSize: TREE_PAGE_SIZE,
           },
         })
         .then(({ data }) => {
diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index f76242f3d37..4ca625bc0de 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -106,23 +106,19 @@ export default {
     primaryOptions() {
       return {
         text: this.primaryBtnText,
-        attributes: [
-          {
-            variant: 'confirm',
-            loading: this.loading,
-            disabled: !this.formCompleted || this.loading,
-          },
-        ],
+        attributes: {
+          variant: 'confirm',
+          loading: this.loading,
+          disabled: !this.formCompleted || this.loading,
+        },
       };
     },
     cancelOptions() {
       return {
         text: SECONDARY_OPTIONS_TEXT,
-        attributes: [
-          {
-            disabled: this.loading,
-          },
-        ],
+        attributes: {
+          disabled: this.loading,
+        },
       };
     },
     formattedFileSize() {
diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js
index 5098053c4f7..73fecee92b7 100644
--- a/app/assets/javascripts/repository/constants.js
+++ b/app/assets/javascripts/repository/constants.js
@@ -3,7 +3,6 @@ import { __ } from '~/locale';
 export const GITALY_UNAVAILABLE_CODE = 'unavailable';
 export const TREE_PAGE_LIMIT = 1000; // the maximum amount of items per page
 export const TREE_PAGE_SIZE = 100; // the amount of items to be fetched per (batch) request
-export const TREE_INITIAL_FETCH_COUNT = TREE_PAGE_LIMIT / TREE_PAGE_SIZE; // the amount of (batch) requests to make
 
 export const COMMIT_BATCH_SIZE = 25; // we request commit data in batches of 25
 
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue b/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue
index a0deb08961f..9b582ba41ed 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue
@@ -56,13 +56,11 @@ export default {
     primaryProps() {
       return {
         text: s__('CreateTimelogForm|Save'),
-        attributes: [
-          {
-            variant: 'confirm',
-            disabled: this.submitDisabled,
-            loading: this.isLoading,
-          },
-        ],
+        attributes: {
+          variant: 'confirm',
+          disabled: this.submitDisabled,
+          loading: this.isLoading,
+        },
       };
     },
     cancelProps() {
diff --git a/app/assets/javascripts/super_sidebar/components/context_switcher.vue b/app/assets/javascripts/super_sidebar/components/context_switcher.vue
index 1b51ff7aa3f..c8ca30cb545 100644
--- a/app/assets/javascripts/super_sidebar/components/context_switcher.vue
+++ b/app/assets/javascripts/super_sidebar/components/context_switcher.vue
@@ -46,6 +46,7 @@ export default {
           </div>
           <ul :aria-label="$options.i18n.switchTo" class="gl-p-0">
             <nav-item :item="$options.contextSwitcherItems.yourWork" />
+            <nav-item :item="$options.contextSwitcherItems.explore" />
           </ul>
         </li>
         <frequent-projects-list :username="username" :view-all-link="projectsPath" />
diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue
index 2f248729579..bfeace80f42 100644
--- a/app/assets/javascripts/super_sidebar/components/user_bar.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue
@@ -52,7 +52,15 @@ export default {
 <template>
   <div class="user-bar">
     <div class="gl-display-flex gl-align-items-center gl-px-3 gl-py-2 gl-gap-2">
-      <a v-safe-html="$options.logo" :href="rootPath"></a>
+      <a :href="rootPath">
+        <img
+          v-if="sidebarData.logo_url"
+          data-testid="brand-header-custom-logo"
+          :src="sidebarData.logo_url"
+          class="gl-h-6"
+        />
+        <span v-else v-safe-html="$options.logo"></span>
+      </a>
       <gl-badge
         v-if="sidebarData.gitlab_com_and_canary"
         variant="success"
diff --git a/app/assets/javascripts/super_sidebar/mock_data.js b/app/assets/javascripts/super_sidebar/mock_data.js
index 8b35b5b7d45..5e5ad97eb68 100644
--- a/app/assets/javascripts/super_sidebar/mock_data.js
+++ b/app/assets/javascripts/super_sidebar/mock_data.js
@@ -2,6 +2,7 @@ import { s__ } from '~/locale';
 
 export const contextSwitcherItems = {
   yourWork: { title: s__('Navigation|Your work'), link: '/', icon: 'work' },
+  explore: { title: s__('Navigation|Explore'), link: '/explore', icon: 'compass' },
   recentProjects: [
     {
       // eslint-disable-next-line @gitlab/require-i18n-strings
diff --git a/app/assets/javascripts/terraform/components/init_command_modal.vue b/app/assets/javascripts/terraform/components/init_command_modal.vue
index 0d8a883972f..ad7f4774bd2 100644
--- a/app/assets/javascripts/terraform/components/init_command_modal.vue
+++ b/app/assets/javascripts/terraform/components/init_command_modal.vue
@@ -33,7 +33,7 @@ export default {
     closeModalProps() {
       return {
         text: this.$options.i18n.closeText,
-        attributes: [],
+        attributes: {},
       };
     },
   },
diff --git a/app/assets/javascripts/terraform/components/states_table_actions.vue b/app/assets/javascripts/terraform/components/states_table_actions.vue
index 773ecf1d5d5..586b3e96e44 100644
--- a/app/assets/javascripts/terraform/components/states_table_actions.vue
+++ b/app/assets/javascripts/terraform/components/states_table_actions.vue
@@ -69,7 +69,7 @@ export default {
     cancelModalProps() {
       return {
         text: this.$options.i18n.modalCancel,
-        attributes: [],
+        attributes: {},
       };
     },
     disableModalSubmit() {
@@ -81,7 +81,7 @@ export default {
     primaryModalProps() {
       return {
         text: this.$options.i18n.modalRemove,
-        attributes: [{ disabled: this.disableModalSubmit }, { variant: 'danger' }],
+        attributes: { disabled: this.disableModalSubmit, variant: 'danger' },
       };
     },
     commandModalId() {
diff --git a/app/assets/javascripts/toggles/index.js b/app/assets/javascripts/toggles/index.js
index 5848b3a424c..500fe8c1150 100644
--- a/app/assets/javascripts/toggles/index.js
+++ b/app/assets/javascripts/toggles/index.js
@@ -17,20 +17,12 @@ export const initToggle = (el) => {
 
   return new Vue({
     el,
-    props: {
-      disabled: {
-        type: Boolean,
-        required: false,
-        default: parseBoolean(disabled),
-      },
-      isLoading: {
-        type: Boolean,
-        required: false,
-        default: parseBoolean(isLoading),
-      },
-    },
+    name: 'ToggleFromHtml',
+
     data() {
       return {
+        disabled: parseBoolean(disabled),
+        isLoading: parseBoolean(isLoading),
         value: parseBoolean(isChecked),
       };
     },
diff --git a/app/assets/javascripts/user_lists/components/add_user_modal.vue b/app/assets/javascripts/user_lists/components/add_user_modal.vue
index e982d10f63b..37c9548ad64 100644
--- a/app/assets/javascripts/user_lists/components/add_user_modal.vue
+++ b/app/assets/javascripts/user_lists/components/add_user_modal.vue
@@ -19,11 +19,11 @@ export default {
   modalOptions: {
     actionPrimary: {
       text: s__('UserLists|Add'),
-      attributes: [{ 'data-testid': 'confirm-add-user-ids', variant: 'confirm' }],
+      attributes: { 'data-testid': 'confirm-add-user-ids', variant: 'confirm' },
     },
     actionCancel: {
       text: s__('UserLists|Cancel'),
-      attributes: [{ 'data-testid': 'cancel-add-user-ids' }],
+      attributes: { 'data-testid': 'cancel-add-user-ids' },
     },
     modalId: ADD_USER_MODAL_ID,
     static: true,
diff --git a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue
index d0a634d8e54..65a601ed927 100644
--- a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue
+++ b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue
@@ -60,13 +60,11 @@ export default {
     actionPrimary() {
       return {
         text: this.confirmButtonText,
-        attributes: [
-          {
-            variant: 'danger',
-            disabled: !this.isValid,
-            'data-qa-selector': 'confirm_danger_modal_button',
-          },
-        ],
+        attributes: {
+          variant: 'danger',
+          disabled: !this.isValid,
+          'data-qa-selector': 'confirm_danger_modal_button',
+        },
       };
     },
     actionCancel() {
diff --git a/app/assets/javascripts/work_items/components/widget_wrapper.vue b/app/assets/javascripts/work_items/components/widget_wrapper.vue
index dadac78a128..ba1470f97cd 100644
--- a/app/assets/javascripts/work_items/components/widget_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/widget_wrapper.vue
@@ -73,7 +73,7 @@ export default {
     <div
       v-if="isOpen"
       class="gl-bg-gray-10 gl-rounded-bottom-left-base gl-rounded-bottom-right-base"
-      :class="{ 'gl-p-5 gl-pb-3': !error }"
+      :class="{ 'gl-px-5 gl-py-4': !error }"
       data-testid="widget-body"
     >
       <slot name="body"></slot>
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
index 3d1be30b487..d7e54ea1eb0 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
@@ -338,7 +338,7 @@ export default {
 
       <template v-else>
         <div v-if="isChildrenEmpty && !isShownAddForm && !error" data-testid="links-empty">
-          <p class="gl-mb-3 gl-text-gray-500">
+          <p class="gl-mb-0 gl-text-gray-500">
             {{ $options.i18n.emptyStateMessage }}
           </p>
         </div>
diff --git a/app/assets/stylesheets/components/related_items_list.scss b/app/assets/stylesheets/components/related_items_list.scss
index 23bd2980c48..6cb7dcca27d 100644
--- a/app/assets/stylesheets/components/related_items_list.scss
+++ b/app/assets/stylesheets/components/related_items_list.scss
@@ -35,6 +35,14 @@ $item-remove-button-space: 42px;
 .item-body {
   position: relative;
   line-height: $gl-line-height;
+  border: 1px solid transparent;
+  border-radius: $gl-border-radius-base;
+
+  &:hover,
+  &:focus-within {
+    background-color: $white;
+    border-color: $gray-50;
+  }
 
   .merge-request-status.closed {
     color: $red-500;
@@ -63,6 +71,7 @@ $item-remove-button-space: 42px;
 
     .sortable-link {
       color: $gray-900;
+      font-weight: 500;
     }
   }
 
@@ -89,16 +98,6 @@ $item-remove-button-space: 42px;
     }
   }
 
-  .item-attributes-area {
-    > * {
-      margin-left: 8px;
-    }
-
-    @include media-breakpoint-down(sm) {
-      margin-left: -8px;
-    }
-  }
-
   .item-milestone,
   .item-weight {
     cursor: help;
@@ -149,7 +148,7 @@ $item-remove-button-space: 42px;
 }
 
 .item-path-id {
-  font-size: $gl-font-size-xs;
+  font-size: $gl-font-size-small;
   white-space: nowrap;
 
   .path-id-text {
@@ -158,30 +157,6 @@ $item-remove-button-space: 42px;
   }
 }
 
-.btn-item-remove {
-  position: absolute;
-  top: $gl-padding-4 / 2;
-  right: 0;
-  padding: $gl-padding-4;
-  margin-right: $gl-padding-4 / 2;
-  line-height: 0;
-  border-color: transparent;
-  background-color: transparent;
-  color: $gl-text-color-secondary;
-
-  .related-items-tree & {
-    position: relative;
-    top: initial;
-    padding: $btn-sm-side-margin;
-    margin-right: initial;
-  }
-
-  &:hover {
-    color: $gl-text-color;
-    border-color: $border-color;
-  }
-}
-
 .mr-ci-status {
   line-height: 0;
 }
@@ -193,10 +168,6 @@ $item-remove-button-space: 42px;
 }
 
 @include media-breakpoint-up(sm) {
-  .item-info-area {
-    flex-basis: 100%;
-  }
-
   .sortable-link {
     max-width: 90%;
   }
@@ -267,18 +238,7 @@ $item-remove-button-space: 42px;
     }
   }
 
-  .btn-item-remove {
-    position: relative;
-    top: initial;
-    padding: $btn-sm-side-margin;
-    margin-right: $gl-padding-4 / 2;
-  }
-
   .sortable-link {
     line-height: 1.3;
   }
-
-  .item-info-area {
-    flex-basis: auto;
-  }
 }
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index f76a66fcb95..0d20e14a5c6 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -299,3 +299,9 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
 .gl-focus:focus {
   @include gl-focus;
 }
+
+.gl-md-justify-content-space-between {
+  @include gl-media-breakpoint-up(md) {
+    justify-content: space-between;
+  }
+}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index dec170cf582..7f6da83611e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -39,7 +39,6 @@ class ProjectsController < Projects::ApplicationController
   before_action do
     push_frontend_feature_flag(:highlight_js, @project)
     push_frontend_feature_flag(:file_line_blame, @project)
-    push_frontend_feature_flag(:increase_page_size_exponentially, @project)
     push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks)
     push_licensed_feature(:security_orchestration_policies) if @project.present? && @project.licensed_feature_available?(:security_orchestration_policies)
     push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?)
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index e81868faa6e..3f20e1c0e86 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -14,7 +14,7 @@ class SnippetsController < Snippets::ApplicationController
 
   skip_before_action :authenticate_user!, only: [:index, :show, :raw]
 
-  layout 'snippets'
+  layout :determine_layout
 
   def index
     if params[:username].present?
@@ -48,4 +48,12 @@ class SnippetsController < Snippets::ApplicationController
   def spammable_path
     snippet_path(@snippet)
   end
+
+  def determine_layout
+    if action_name == 'show' && @snippet.author != current_user
+      'explore'
+    else
+      'snippets'
+    end
+  end
 end
diff --git a/app/finders/abuse_reports_finder.rb b/app/finders/abuse_reports_finder.rb
index f5ef507f4e6..c3159198261 100644
--- a/app/finders/abuse_reports_finder.rb
+++ b/app/finders/abuse_reports_finder.rb
@@ -24,6 +24,7 @@ class AbuseReportsFinder
     filter_by_user_id
 
     filter_by_user
+    filter_by_reporter
     filter_by_status
     filter_by_category
   end
@@ -48,12 +49,21 @@ class AbuseReportsFinder
   def filter_by_user
     return unless params[:user].present?
 
-    user_id = User.by_username(params[:user]).pick(:id)
+    user_id = find_user_id(params[:user])
     return unless user_id
 
     @reports = @reports.by_user_id(user_id)
   end
 
+  def filter_by_reporter
+    return unless params[:reporter].present?
+
+    user_id = find_user_id(params[:reporter])
+    return unless user_id
+
+    @reports = @reports.by_reporter_id(user_id)
+  end
+
   def filter_by_user_id
     return unless params[:user_id].present?
 
@@ -71,4 +81,8 @@ class AbuseReportsFinder
 
     @reports = @reports.order_by(sort_by)
   end
+
+  def find_user_id(username)
+    User.by_username(username).pick(:id)
+  end
 end
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 7bb382e14df..0352f5a1dfc 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -57,7 +57,7 @@ module DashboardHelper
   private
 
   def get_dashboard_nav_links
-    links = [:projects, :groups, :snippets]
+    links = [:projects, :groups, :snippets, :your_work, :explore]
 
     if can?(current_user, :read_cross_project)
       links += [:activity, :milestones]
diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb
index 2967501f628..ed24f2509e8 100644
--- a/app/helpers/explore_helper.rb
+++ b/app/helpers/explore_helper.rb
@@ -57,7 +57,7 @@ module ExploreHelper
   private
 
   def get_explore_nav_links
-    [:projects, :groups, :snippets]
+    [:projects, :groups, :topics, :snippets]
   end
 
   def request_path_with_options(options = {})
diff --git a/app/helpers/nav/top_nav_helper.rb b/app/helpers/nav/top_nav_helper.rb
index fb11c183aeb..756baabd249 100644
--- a/app/helpers/nav/top_nav_helper.rb
+++ b/app/helpers/nav/top_nav_helper.rb
@@ -64,7 +64,6 @@ module Nav
     end
 
     def build_anonymous_view_model(builder:)
-      # These come from `app/views/layouts/nav/_explore.html.ham`
       if explore_nav_link?(:projects)
         builder.add_primary_menu_item_with_shortcut(
           header: top_nav_localized_headers[:explore],
@@ -83,6 +82,15 @@ module Nav
         )
       end
 
+      if explore_nav_link?(:topics)
+        builder.add_primary_menu_item_with_shortcut(
+          header: top_nav_localized_headers[:explore],
+          active: active_nav_link?(page: topics_explore_projects_path, path: 'projects#topic'),
+          href: topics_explore_projects_path,
+          **topics_menu_item_attrs
+        )
+      end
+
       if explore_nav_link?(:snippets)
         builder.add_primary_menu_item_with_shortcut(
           header: top_nav_localized_headers[:explore],
@@ -123,39 +131,54 @@ module Nav
         builder.add_view(GROUPS_VIEW, container_view_props(namespace: 'groups', current_item: current_item, submenu: groups_submenu))
       end
 
+      if dashboard_nav_link?(:your_work)
+        builder.add_primary_menu_item(
+          id: 'your-work',
+          header: top_nav_localized_headers[:switch_to],
+          title: _('Your work'),
+          href: dashboard_projects_path,
+          active: active_nav_link?(controller: []),
+          icon: 'work',
+          data: { **menu_data_tracking_attrs('your-work') }
+        )
+      end
+
+      if dashboard_nav_link?(:explore)
+        builder.add_primary_menu_item(
+          id: 'explore',
+          header: top_nav_localized_headers[:switch_to],
+          title: _('Explore'),
+          href: explore_projects_path,
+          active: active_nav_link?(controller: ["explore/groups", "explore/snippets"], page: ["/explore/projects", "/explore", "/explore/projects/topics"], path: ["projects#topic"]),
+          icon: 'compass',
+          data: { **menu_data_tracking_attrs('explore') }
+        )
+      end
+
       if dashboard_nav_link?(:milestones)
-        builder.add_primary_menu_item_with_shortcut(
-          id: 'milestones',
-          header: top_nav_localized_headers[:explore],
+        builder.add_shortcut(
+          id: 'milestones-shortcut',
           title: _('Milestones'),
           href: dashboard_milestones_path,
-          active: active_nav_link?(controller: 'dashboard/milestones'),
-          icon: 'clock',
-          data: { **menu_data_tracking_attrs('milestones') },
-          shortcut_class: 'dashboard-shortcuts-milestones'
+          css_class: 'dashboard-shortcuts-milestones'
         )
       end
 
       if dashboard_nav_link?(:snippets)
-        builder.add_primary_menu_item_with_shortcut(
-          header: top_nav_localized_headers[:explore],
-          active: active_nav_link?(controller: 'dashboard/snippets'),
-          data: { qa_selector: 'snippets_link', **menu_data_tracking_attrs('snippets') },
+        builder.add_shortcut(
+          id: 'snippets-shortcut',
+          title: _('Snippets'),
           href: dashboard_snippets_path,
-          **snippets_menu_item_attrs
+          css_class: 'dashboard-shortcuts-snippets'
         )
       end
 
       if dashboard_nav_link?(:activity)
-        builder.add_primary_menu_item_with_shortcut(
-          id: 'activity',
-          header: top_nav_localized_headers[:explore],
+        builder.add_shortcut(
+          id: 'activity-shortcut',
           title: _('Activity'),
           href: activity_dashboard_path,
-          active: active_nav_link?(path: 'dashboard#activity'),
-          icon: 'history',
-          data: { **menu_data_tracking_attrs('activity') },
-          shortcut_class: 'dashboard-shortcuts-activity'
+          css_class: 'dashboard-shortcuts-activity'
         )
       end
 
@@ -220,6 +243,15 @@ module Nav
       }
     end
 
+    def topics_menu_item_attrs
+      {
+        id: 'topics',
+        title: _('Topics'),
+        icon: 'labels',
+        shortcut_class: 'dashboard-shortcuts-topics'
+      }
+    end
+
     def snippets_menu_item_attrs
       {
         id: 'snippets',
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 7f0a928c62c..59ffe6a183e 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -97,7 +97,7 @@ module NavHelper
   def super_sidebar_supported?
     return true if @nav.nil?
 
-    %w(your_work project group profile user_profile).include?(@nav)
+    %w(your_work explore project group profile user_profile).include?(@nav)
   end
 
   def get_header_links
diff --git a/app/helpers/sidebars_helper.rb b/app/helpers/sidebars_helper.rb
index 756040986db..01dbddc5d5b 100644
--- a/app/helpers/sidebars_helper.rb
+++ b/app/helpers/sidebars_helper.rb
@@ -49,6 +49,7 @@ module SidebarsHelper
       avatar_url: user.avatar_url,
       has_link_to_profile: current_user_menu?(:profile),
       link_to_profile: user_url(user),
+      logo_url: current_appearance&.header_logo_path,
       status: {
         can_update: can?(current_user, :update_user_status, current_user),
         busy: user.status&.busy?,
@@ -107,6 +108,8 @@ module SidebarsHelper
     when 'user_profile'
       context = Sidebars::Context.new(current_user: user, container: viewed_user, **context_adds)
       Sidebars::UserProfile::Panel.new(context)
+    when 'explore'
+      Sidebars::Explore::Panel.new(Sidebars::Context.new(current_user: user, container: nil, **context_adds))
     else
       context = your_work_sidebar_context(user, **context_adds)
       Sidebars::YourWork::Panel.new(context)
diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 1d2d077e0ff..5ae5367ca5a 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -43,6 +43,7 @@ class AbuseReport < ApplicationRecord
   validate :links_to_spam_contains_valid_urls
 
   scope :by_user_id, ->(id) { where(user_id: id) }
+  scope :by_reporter_id, ->(id) { where(reporter_id: id) }
   scope :by_category, ->(category) { where(category: category) }
   scope :with_users, -> { includes(:reporter, :user) }
 
diff --git a/app/services/work_items/parent_links/create_service.rb b/app/services/work_items/parent_links/create_service.rb
index 288ca152f93..85b470c47ca 100644
--- a/app/services/work_items/parent_links/create_service.rb
+++ b/app/services/work_items/parent_links/create_service.rb
@@ -10,6 +10,8 @@ module WorkItems
         link = WorkItems::ParentLink.find_or_initialize_by(work_item: work_item)
         link.work_item_parent = issuable
 
+        link.move_to_end
+
         if link.changed? && link.save
           create_notes(work_item)
         end
diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml
index b67cc29f296..5751ae9059a 100644
--- a/app/views/admin/application_settings/_repository_check.html.haml
+++ b/app/views/admin/application_settings/_repository_check.html.haml
@@ -13,7 +13,9 @@
           = _("If you get a lot of false alarms from repository checks, you can clear all repository check information from the database.")
           - clear_repository_checks_link = _('Clear all repository checks')
           - clear_repository_checks_message = _('This clears repository check states for all projects in the database and cannot be undone. Are you sure?')
-        = link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message, confirm_btn_variant: 'danger' }, aria: { label: _('Clear repository checks') }, method: :put, class: "gl-button btn btn-sm btn-danger gl-mt-3"
+        = render Pajamas::ButtonComponent.new(variant: :danger, href: clear_repository_check_states_admin_application_settings_path, method: :put, button_options: { class: 'btn-sm gl-mt-3', data: { confirm: clear_repository_checks_message, confirm_btn_variant: 'danger' }, aria: { label: _('Clear repository checks') } }) do
+          = clear_repository_checks_link
+
 
     .sub-section
       %h4= _("Housekeeping")
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml
index 09e2e35c617..7734c0a7c9a 100644
--- a/app/views/dashboard/_groups_head.html.haml
+++ b/app/views/dashboard/_groups_head.html.haml
@@ -1,14 +1,13 @@
 .page-title-holder.d-flex.align-items-center
   %h1.page-title.gl-font-size-h-display= _('Groups')
 
-  - if current_user.can_create_group?
-    .page-title-controls
+  .page-title-controls.gl-display-flex.gl-align-items-center.gl-gap-5
+    = link_to _("Explore groups"), explore_groups_path
+    - if current_user.can_create_group?
       = render Pajamas::ButtonComponent.new(href: new_group_path, variant: :confirm, button_options: { data: { qa_selector: "new_group_button", testid: "new-group-button" } }) do
         = _("New group")
-.top-area
-  = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do
-    = gl_tab_link_to _("Your groups"), dashboard_groups_path
-    = gl_tab_link_to _("Explore public groups"), explore_groups_path, data: { qa_selector: "public_groups_tab" }
+
+.top-area.gl-p-3.gl-justify-content-end
   .nav-controls
     = render 'shared/groups/search_form'
     = render 'shared/groups/dropdown'
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index c58d4cff034..e600d84f492 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -4,8 +4,9 @@
 .page-title-holder.gl-display-flex.gl-align-items-center
   %h1.page-title.gl-font-size-h-display= _('Projects')
 
-  - if current_user.can_create_project?
-    .page-title-controls
+  .page-title-controls.gl-display-flex.gl-align-items-center.gl-gap-5
+    = link_to _("Explore projects"), explore_projects_path
+    - if current_user.can_create_project?
       = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm, button_options: { data: { qa_selector: 'new_project_button' } }) do
         = _("New project")
 
diff --git a/app/views/dashboard/_projects_nav.html.haml b/app/views/dashboard/_projects_nav.html.haml
index 7cbd2fb14ec..87bd5209fdf 100644
--- a/app/views/dashboard/_projects_nav.html.haml
+++ b/app/views/dashboard/_projects_nav.html.haml
@@ -1,5 +1,4 @@
 - is_your_projects_path = current_page?(dashboard_projects_path) || current_page?(root_path)
-- is_explore_projects_path = current_page?(explore_root_path) || current_page?(trending_explore_projects_path) || current_page?(starred_explore_projects_path) || current_page?(explore_projects_path)
 
 = gl_tabs_nav({ class: 'scrolling-tabs nav-links gl-display-flex gl-flex-grow-1 gl-w-full nav gl-tabs-nav' }) do
   = gl_tab_link_to dashboard_projects_path, { item_active: is_your_projects_path, class: 'shortcuts-activity', data: { placement: 'right' } } do
@@ -8,6 +7,4 @@
   = gl_tab_link_to starred_dashboard_projects_path, { data: { placement: 'right' } } do
     = s_("ProjectList|Starred")
     = gl_tab_counter_badge(limited_counter_with_delimiter(@total_starred_projects_count))
-  = gl_tab_link_to s_("ProjectList|Explore"), explore_root_path, { item_active: is_explore_projects_path, data: { placement: 'right' } }
-  = gl_tab_link_to s_("ProjectList|Topics"), topics_explore_projects_path, { data: { placement: 'right' } }
   = render_if_exists "dashboard/removed_projects_tab"
diff --git a/app/views/dashboard/_snippets_head.html.haml b/app/views/dashboard/_snippets_head.html.haml
index 5a798c249d1..e0e8aaa0fd9 100644
--- a/app/views/dashboard/_snippets_head.html.haml
+++ b/app/views/dashboard/_snippets_head.html.haml
@@ -1,13 +1,8 @@
 .page-title-holder.d-flex.align-items-center
   %h1.page-title.gl-font-size-h-display= _('Snippets')
 
-  - if current_user && current_user.snippets.any? || @snippets.any?
-    .page-title-controls
-      - if can?(current_user, :create_snippet)
-        = render Pajamas::ButtonComponent.new(href: new_snippet_path, variant: :confirm, button_options: { title: _("New snippet") }) do
-          = _("New snippet")
-
-.top-area
-  = gl_tabs_nav({ class: 'gl-border-0' }) do
-    = gl_tab_link_to _('Your snippets'), dashboard_snippets_path, { title: _('Your snippets') }
-    = gl_tab_link_to _('Explore snippets'), explore_snippets_path, { title: _('Explore snippets') }
+  .page-title-controls.gl-display-flex.gl-align-items-center.gl-gap-5
+    = link_to _("Explore snippets"), explore_snippets_path
+    - if can?(current_user, :create_snippet)
+      = render Pajamas::ButtonComponent.new(href: new_snippet_path, variant: :confirm, button_options: { title: _("New snippet") }) do
+        = _("New snippet")
diff --git a/app/views/dashboard/snippets/index.html.haml b/app/views/dashboard/snippets/index.html.haml
index 68457ab33f7..42386e5b9cc 100644
--- a/app/views/dashboard/snippets/index.html.haml
+++ b/app/views/dashboard/snippets/index.html.haml
@@ -5,7 +5,7 @@
 
 = render 'dashboard/snippets_head'
 - if current_user.snippets.exists?
-  = render partial: 'snippets/snippets_scope_menu', locals: { include_private: true, counts: @snippet_counts }
+  .top-area= render partial: 'snippets/snippets_scope_menu', locals: { include_private: true, counts: @snippet_counts }
   = render partial: 'shared/snippets/list', locals: { link_project: true }
 - else
   = render 'shared/empty_states/snippets', button_path: button_path
diff --git a/app/views/explore/groups/_nav.html.haml b/app/views/explore/groups/_nav.html.haml
index 3c9c4e9f76b..176bfd307b2 100644
--- a/app/views/explore/groups/_nav.html.haml
+++ b/app/views/explore/groups/_nav.html.haml
@@ -1,6 +1,4 @@
-.top-area
-  = gl_tabs_nav({ class: 'gl-display-flex gl-flex-grow-1 gl-border-none'}) do
-    = gl_tab_link_to _("Explore Groups"), explore_groups_path
+.top-area.gl-p-3.gl-justify-content-end
   .nav-controls
     = render 'shared/groups/search_form'
     = render 'shared/groups/dropdown'
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 60132818193..213346b4cc2 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,14 +1,17 @@
-- @hide_top_links = true
-- page_title    _("Groups")
+- breadcrumb_title _("Groups")
+- page_title    _("Explore groups")
 - header_title  _("Groups"), dashboard_groups_path
 
 = render_dashboard_ultimate_trial(current_user)
 
-- if current_user
-  = render 'dashboard/groups_head'
-- else
-  = render 'explore/head'
-  = render 'nav'
+.page-title-holder.gl-display-flex.gl-align-items-center
+  %h1.page-title.gl-font-size-h-display= page_title
+  .page-title-controls
+    - if current_user&.can_create_group?
+      = render Pajamas::ButtonComponent.new(href: new_group_path, variant: :confirm) do
+        = _("New group")
+
+= render 'nav'
 
 - if cookies[:explore_groups_landing_dismissed] != 'true'
   .explore-groups.landing.content-block.js-explore-groups-landing.hide
diff --git a/app/views/explore/projects/_nav.html.haml b/app/views/explore/projects/_nav.html.haml
index 9119026320a..ab565279238 100644
--- a/app/views/explore/projects/_nav.html.haml
+++ b/app/views/explore/projects/_nav.html.haml
@@ -1,10 +1,8 @@
 .top-area
   = gl_tabs_nav({ class: 'gl-display-flex gl-flex-grow-1 gl-border-none'}) do
     = gl_tab_link_to _('All'), explore_projects_path, { item_active: current_page?(explore_projects_path) || current_page?(explore_root_path) }
-    = gl_tab_link_to _('Most stars'), starred_explore_projects_path
+    = gl_tab_link_to _('Most starred'), starred_explore_projects_path
     = gl_tab_link_to _('Trending'), trending_explore_projects_path
 
   .nav-controls
-    - unless current_user
-      = render 'shared/projects/search_form'
-    = render 'filter'
+    = render 'shared/projects/search_form'
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index 9585eb76912..53b252db4fe 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -1,14 +1,15 @@
-- @hide_top_links = true
-- page_title    _("Projects")
-- header_title  _("Projects"), dashboard_projects_path
+- breadcrumb_title _("Projects")
+- page_title _("Explore projects")
 - page_canonical_link explore_projects_url
 
 = render_dashboard_ultimate_trial(current_user)
 
-- if current_user
-  = render 'dashboard/projects_head', project_tab_filter: :explore
-- else
-  = render 'explore/head'
+.page-title-holder.gl-display-flex.gl-align-items-center
+  %h1.page-title.gl-font-size-h-display= page_title
+  .page-title-controls
+    - if current_user&.can_create_project?
+      = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm) do
+        = _("New project")
 
 = render 'explore/projects/nav'
 = render 'projects', projects: @projects
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index ec7eefea264..c765c086027 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -1,13 +1,14 @@
 - @hide_top_links = true
-- page_title    _("Projects")
+- page_title    _("Explore projects")
 - header_title  _("Projects"), dashboard_projects_path
 
 = render_dashboard_ultimate_trial(current_user)
 
-- if current_user
-  = render 'dashboard/projects_head', project_tab_filter: :starred
-- else
-  = render 'explore/head'
+.page-title-holder.gl-display-flex.gl-align-items-center
+  %h1.page-title.gl-font-size-h-display= page_title
+  .page-title-controls
+    = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm) do
+      = _("New project")
 
 = render 'explore/projects/nav'
 = render 'projects', projects: @projects
diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml
index 7b2c5683482..ad8d1276bb1 100644
--- a/app/views/explore/projects/topic.html.haml
+++ b/app/views/explore/projects/topic.html.haml
@@ -1,5 +1,5 @@
-- @hide_top_links = false
-- @no_container = true
+- add_to_breadcrumbs _("Topics"), topics_explore_projects_path
+- breadcrumb_title @topic.title_or_name
 - page_title @topic.title_or_name, _("Topics")
 - max_topic_title_length = 50
 
diff --git a/app/views/explore/projects/topics.html.haml b/app/views/explore/projects/topics.html.haml
index 228304d25b6..08cd122c6aa 100644
--- a/app/views/explore/projects/topics.html.haml
+++ b/app/views/explore/projects/topics.html.haml
@@ -1,12 +1,9 @@
-- @hide_top_links = true
-- page_title    _("Topics")
+- breadcrumb_title _("Topics")
+- page_title    _("Explore topics")
 - header_title  _("Topics"), topics_explore_projects_path
 
 = render_dashboard_ultimate_trial(current_user)
 
-- if current_user
-  = render 'explore/topics/head'
-- else
-  = render 'explore/head'
+= render 'explore/topics/head'
 
 = render partial: 'shared/topics/list'
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 8a92ec31b22..043189315b4 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -1,13 +1,15 @@
 - @hide_top_links = true
-- page_title    _("Projects")
+- page_title    _("Explore projects")
 - header_title  _("Projects"), dashboard_projects_path
 
 = render_dashboard_ultimate_trial(current_user)
 
-- if current_user
-  = render 'dashboard/projects_head', project_tab_filter: :explore_trending
-- else
-  = render 'explore/head'
+.page-title-holder.gl-display-flex.gl-align-items-center
+  %h1.page-title.gl-font-size-h-display= page_title
+  .page-title-controls
+    - if current_user&.can_create_project?
+      = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm) do
+        = _("New project")
 
 = render 'explore/projects/nav'
 = render 'projects', projects: @projects
diff --git a/app/views/explore/snippets/index.html.haml b/app/views/explore/snippets/index.html.haml
index bf861e30b3a..bd8b9c29389 100644
--- a/app/views/explore/snippets/index.html.haml
+++ b/app/views/explore/snippets/index.html.haml
@@ -1,10 +1,12 @@
-- @hide_top_links = true
-- page_title    _("Snippets")
+- breadcrumb_title _("Snippets")
+- page_title    _("Explore snippets")
 - header_title  _("Snippets"), snippets_path
 
-- if current_user
-  = render 'dashboard/snippets_head'
-- else
-  = render 'explore/head'
+.page-title-holder.gl-display-flex.gl-align-items-center
+  %h1.page-title.gl-font-size-h-display= page_title
+  .page-title-controls
+    - if can?(current_user, :create_snippet)
+      = render Pajamas::ButtonComponent.new(href: new_snippet_path, variant: :confirm) do
+        = _("New snippet")
 
 = render partial: 'shared/snippets/list', locals: { link_project: true }
diff --git a/app/views/explore/topics/_head.html.haml b/app/views/explore/topics/_head.html.haml
index f7d80d63c45..db8de333517 100644
--- a/app/views/explore/topics/_head.html.haml
+++ b/app/views/explore/topics/_head.html.haml
@@ -1,10 +1,6 @@
-.page-title-holder.d-flex.align-items-center
-  %h1.page-title.gl-font-size-h-display= _('Projects')
+.page-title-holder.gl-display-flex.gl-align-items-center
+  %h1.page-title.gl-font-size-h-display= page_title
 
-.top-area
-  .scrolling-tabs-container.inner-page-scroll-tabs.gl-flex-grow-1.gl-min-w-0.gl-w-full
-    .fade-left= sprite_icon('chevron-lg-left', size: 12)
-    .fade-right= sprite_icon('chevron-lg-right', size: 12)
-    = render 'dashboard/projects_nav'
+.top-area.gl-p-4
   .nav-controls
     = render 'shared/topics/search_form'
diff --git a/app/views/groups/_invite_members_side_nav_link.html.haml b/app/views/groups/_invite_members_side_nav_link.html.haml
deleted file mode 100644
index ab7d4fc5041..00000000000
--- a/app/views/groups/_invite_members_side_nav_link.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.js-invite-members-trigger{ data: { trigger_source: 'group-side-nav',
-  icon: 'users',
-  display_text: title,
-  trigger_element: 'side-nav',
-  qa_selector: 'invite_members_sidebar_button' } }
-
-= render partial: 'shared/nav/sidebar_submenu', locals: { sidebar_menu: sidebar_menu }
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index c495bab4547..02c00a53316 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -1,11 +1,6 @@
-- page_title _("Explore")
+- header_title _("Explore"), explore_root_path
 
-- if current_user
-  - @left_sidebar = true
-  - nav "your_work"
-
-- unless current_user
-  - @hide_breadcrumbs = true
-  - header_title _("Explore GitLab"), explore_root_path
+- @left_sidebar = true
+- nav "explore"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/nav/sidebar/_explore.html.haml b/app/views/layouts/nav/sidebar/_explore.html.haml
new file mode 100644
index 00000000000..ccbcb434af1
--- /dev/null
+++ b/app/views/layouts/nav/sidebar/_explore.html.haml
@@ -0,0 +1 @@
+= render partial: 'shared/nav/sidebar', object: Sidebars::Explore::Panel.new(Sidebars::Context.new(current_user: current_user, container: nil))
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
index 95a204a3319..e396f38499a 100644
--- a/app/views/layouts/snippets.html.haml
+++ b/app/views/layouts/snippets.html.haml
@@ -1,9 +1,10 @@
 - page_title _("Snippets")
-- header_title _("Snippets"), snippets_path
+- header_title _("Snippets"), dashboard_snippets_path
 - snippets_upload_path = snippets_upload_path(@snippet, current_user)
 
+- @left_sidebar = true
+
 - if current_user
-  - @left_sidebar = true
   - nav "your_work"
 
 - content_for :page_specific_javascripts do
diff --git a/app/views/projects/_invite_members_side_nav_link.html.haml b/app/views/projects/_invite_members_side_nav_link.html.haml
deleted file mode 100644
index 771c7c650c2..00000000000
--- a/app/views/projects/_invite_members_side_nav_link.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.js-invite-members-trigger{ data: { trigger_source: 'project-side-nav',
-  icon: 'users',
-  display_text: title,
-  trigger_element: 'side-nav',
-  qa_selector: 'invite_members_sidebar_button' } }
-
-= render partial: 'shared/nav/sidebar_submenu', locals: { sidebar_menu: sidebar_menu }
diff --git a/app/views/shared/nav/_explore_scope_header.html.haml b/app/views/shared/nav/_explore_scope_header.html.haml
new file mode 100644
index 00000000000..da22d6dbcf2
--- /dev/null
+++ b/app/views/shared/nav/_explore_scope_header.html.haml
@@ -0,0 +1,6 @@
+%li.context-header
+  = link_to explore_root_url, title: _('Explore'), class: 'has-tooltip', data: { container: 'body', placement: 'right' } do
+    %span.avatar-container.icon-avatar.rect-avatar.s32
+      = sprite_icon('compass', size: 18)
+    %span.sidebar-context-title
+      = _('Explore')
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index eb9465a409f..583f25b68eb 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -4,8 +4,9 @@
   - add_page_startup_graphql_call('snippet/project_permissions', { fullPath: @snippet.project_id })
 - else
   - add_page_startup_graphql_call('snippet/user_permissions')
-- @hide_top_links = true
-- add_to_breadcrumbs _("Snippets"), dashboard_snippets_path
+- if @snippet.author != current_user
+  -# Different breadcrumbs if this page is rendered as part of the Explore section
+  - add_to_breadcrumbs _("Snippets"), explore_snippets_path
 - breadcrumb_title @snippet.to_reference
 - page_title "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets")
 - content_for :prefetch_asset_tags do
diff --git a/config/feature_flags/development/increase_page_size_exponentially.yml b/config/feature_flags/development/increase_page_size_exponentially.yml
deleted file mode 100644
index 8297a4078fa..00000000000
--- a/config/feature_flags/development/increase_page_size_exponentially.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: increase_page_size_exponentially
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66174
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369434
-milestone: '14.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_in_side_nav.yml b/config/feature_flags/experiment/invite_members_in_side_nav.yml
deleted file mode 100644
index 1cb8d6d2b0a..00000000000
--- a/config/feature_flags/experiment/invite_members_in_side_nav.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_in_side_nav
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342951
-milestone: '14.5'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/db/migrate/20230307091216_add_status_reporter_id_and_id_index_to_abuse_reports.rb b/db/migrate/20230307091216_add_status_reporter_id_and_id_index_to_abuse_reports.rb
new file mode 100644
index 00000000000..cfd077368c8
--- /dev/null
+++ b/db/migrate/20230307091216_add_status_reporter_id_and_id_index_to_abuse_reports.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddStatusReporterIdAndIdIndexToAbuseReports < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'index_abuse_reports_on_status_reporter_id_and_id'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :abuse_reports, [:status, :reporter_id, :id], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :abuse_reports, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20230214181633_finalize_ci_build_needs_big_int_conversion.rb b/db/post_migrate/20230214181633_finalize_ci_build_needs_big_int_conversion.rb
index 11870b9c540..1ac7b447457 100644
--- a/db/post_migrate/20230214181633_finalize_ci_build_needs_big_int_conversion.rb
+++ b/db/post_migrate/20230214181633_finalize_ci_build_needs_big_int_conversion.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class FinalizeCiBuildNeedsBigIntConversion < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
   restrict_gitlab_migration gitlab_schema: :gitlab_ci
 
   TABLE_NAME = 'ci_build_needs'
diff --git a/db/schema_migrations/20230307091216 b/db/schema_migrations/20230307091216
new file mode 100644
index 00000000000..4727747daa7
--- /dev/null
+++ b/db/schema_migrations/20230307091216
@@ -0,0 +1 @@
+0c13f0053959e1c3e66f0c87d55d4a9190b36d61f67bb1b3ec32f73fa699c961
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 39311eb44d4..6b74fff0ae3 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -29154,6 +29154,8 @@ CREATE INDEX index_abuse_reports_on_status_and_updated_at ON abuse_reports USING
 
 CREATE INDEX index_abuse_reports_on_status_category_and_id ON abuse_reports USING btree (status, category, id);
 
+CREATE INDEX index_abuse_reports_on_status_reporter_id_and_id ON abuse_reports USING btree (status, reporter_id, id);
+
 CREATE INDEX index_abuse_reports_on_user_id ON abuse_reports USING btree (user_id);
 
 CREATE UNIQUE INDEX "index_achievements_on_namespace_id_LOWER_name" ON achievements USING btree (namespace_id, lower(name));
diff --git a/doc/administration/auth/oidc.md b/doc/administration/auth/oidc.md
index ea6922629d8..4edc00b0d62 100644
--- a/doc/administration/auth/oidc.md
+++ b/doc/administration/auth/oidc.md
@@ -561,6 +561,254 @@ Example installations from source configuration (file path: `config/gitlab.yml`)
     }
 ```
 
+## Configure users based on OIDC group membership **(PREMIUM)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/209898) in GitLab 15.10.
+
+You can configure OIDC group membership to:
+
+- Require users to be members of a certain group.
+- Assign users [external roles](../../user/admin_area/external_users.md), or as
+  administrators based on group membership.
+
+GitLab checks these groups on each sign in and updates user attributes as necessary.
+This feature **does not** allow you to automatically add users to GitLab
+[groups](../../user/group/index.md).
+
+### Required groups
+
+Your identity provider (IdP) must pass group information to GitLab in the OIDC response. To use this
+response to require users to be members of a certain group, configure GitLab to identify:
+
+- Where to look for the groups in the OIDC response, using the `groups_attribute` setting.
+- Which group membership is required to sign in, using the `required_groups` setting.
+
+If you do not set `required_groups` or leave the setting empty, any user authenticated by the IdP through OIDC can use GitLab.
+
+For Omnibus GitLab:
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+   ```ruby
+   gitlab_rails['omniauth_providers'] = [
+     {
+       name: "openid_connect",
+       label: "Provider name",
+       args: {
+         name: "openid_connect",
+         scope: ["openid","profile","email"],
+         response_type: "code",
+         issuer: "<your_oidc_url>",
+         discovery: true,
+         client_auth_method: "query",
+         uid_field: "<uid_field>",
+         client_options: {
+           identifier: "<your_oidc_client_id>",
+           secret: "<your_oidc_client_secret>",
+           redirect_uri: "<your_gitlab_url>/users/auth/openid_connect/callback",
+           gitlab: {
+             groups_attribute: "groups",
+             required_groups: ["Developer"]
+           }
+         }
+       }
+     }
+   ]
+   ```
+
+1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure)
+   for the changes to take effect.
+
+For installation from source:
+
+1. Edit `/home/git/gitlab/config/gitlab.yml`:
+
+   ```yaml
+   production: &base
+     omniauth:
+       providers:
+        - { name: 'openid_connect',
+            label: 'Provider name',
+         args: {
+           name: 'openid_connect',
+           scope: ['openid','profile','email'],
+           response_type: 'code',
+           issuer: '<your_oidc_url>',
+           discovery: true,
+           client_auth_method: 'query',
+           uid_field: '<uid_field>',
+           client_options: {
+             identifier: '<your_oidc_client_id>',
+             secret: '<your_oidc_client_secret>',
+             redirect_uri: '<your_gitlab_url>/users/auth/openid_connect/callback',
+             gitlab: {
+               groups_attribute: "groups",
+               required_groups: ["Developer"]
+             }
+           }
+         }
+       }
+   ```
+
+1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source)
+   for the changes to take effect.
+
+### External groups
+
+Your IdP must pass group information to GitLab in the OIDC response. To use this
+response to identify users as [external users](../../user/admin_area/external_users.md)
+based on group membership, configure GitLab to identify:
+
+- Where to look for the groups in the OIDC response, using the `groups_attribute` setting.
+- Which group memberships should identify a user as an
+  [external user](../../user/admin_area/external_users.md), using the
+ `external_groups` setting.
+
+For Omnibus GitLab:
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+   ```ruby
+   gitlab_rails['omniauth_providers'] = [
+     {
+       name: "openid_connect",
+       label: "Provider name",
+       args: {
+         name: "openid_connect",
+         scope: ["openid","profile","email"],
+         response_type: "code",
+         issuer: "<your_oidc_url>",
+         discovery: true,
+         client_auth_method: "query",
+         uid_field: "<uid_field>",
+         client_options: {
+           identifier: "<your_oidc_client_id>",
+           secret: "<your_oidc_client_secret>",
+           redirect_uri: "<your_gitlab_url>/users/auth/openid_connect/callback",
+           gitlab: {
+             groups_attribute: "groups",
+             external_groups: ["Freelancer"]
+           }
+         }
+       }
+     }
+   ]
+   ```
+
+1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure)
+   for the changes to take effect.
+
+For installation from source:
+
+1. Edit `/home/git/gitlab/config/gitlab.yml`:
+
+   ```yaml
+   production: &base
+     omniauth:
+       providers:
+        - { name: 'openid_connect',
+            label: 'Provider name',
+         args: {
+           name: 'openid_connect',
+           scope: ['openid','profile','email'],
+           response_type: 'code',
+           issuer: '<your_oidc_url>',
+           discovery: true,
+           client_auth_method: 'query',
+           uid_field: '<uid_field>',
+           client_options: {
+             identifier: '<your_oidc_client_id>',
+             secret: '<your_oidc_client_secret>',
+             redirect_uri: '<your_gitlab_url>/users/auth/openid_connect/callback',
+             gitlab: {
+               groups_attribute: "groups",
+               external_groups: ["Freelancer"]
+             }
+           }
+         }
+       }
+   ```
+
+1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source)
+   for the changes to take effect.
+
+### Administrator groups
+
+Your IdP must pass group information to GitLab in the OIDC response. To use this
+response to assign users as administrator based on group membership, configure GitLab to identify:
+
+- Where to look for the groups in the OIDC response, using the `groups_attribute` setting.
+- Which group memberships grant the user administrator access, using the
+ `admin_groups` setting.
+
+For Omnibus GitLab:
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+   ```ruby
+   gitlab_rails['omniauth_providers'] = [
+     {
+       name: "openid_connect",
+       label: "Provider name",
+       args: {
+         name: "openid_connect",
+         scope: ["openid","profile","email"],
+         response_type: "code",
+         issuer: "<your_oidc_url>",
+         discovery: true,
+         client_auth_method: "query",
+         uid_field: "<uid_field>",
+         client_options: {
+           identifier: "<your_oidc_client_id>",
+           secret: "<your_oidc_client_secret>",
+           redirect_uri: "<your_gitlab_url>/users/auth/openid_connect/callback",
+           gitlab: {
+             groups_attribute: "groups",
+             admin_groups: ["Admin"]
+           }
+         }
+       }
+     }
+   ]
+   ```
+
+1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure)
+   for the changes to take effect.
+
+For installation from source:
+
+1. Edit `/home/git/gitlab/config/gitlab.yml`:
+
+   ```yaml
+   production: &base
+     omniauth:
+       providers:
+        - { name: 'openid_connect',
+            label: 'Provider name',
+         args: {
+           name: 'openid_connect',
+           scope: ['openid','profile','email'],
+           response_type: 'code',
+           issuer: '<your_oidc_url>',
+           discovery: true,
+           client_auth_method: 'query',
+           uid_field: '<uid_field>',
+           client_options: {
+             identifier: '<your_oidc_client_id>',
+             secret: '<your_oidc_client_secret>',
+             redirect_uri: '<your_gitlab_url>/users/auth/openid_connect/callback',
+             gitlab: {
+               groups_attribute: "groups",
+               admin_groups: ["Admin"]
+             }
+           }
+         }
+       }
+   ```
+
+1. Save the file and [reconfigure GitLab](../restart_gitlab.md#installations-from-source)
+   for the changes to take effect.
+
 ## Troubleshooting
 
 1. Ensure `discovery` is set to `true`. If you set it to `false`, you must
diff --git a/doc/administration/clusters/kas.md b/doc/administration/clusters/kas.md
index 1f549898a80..7a289b6a500 100644
--- a/doc/administration/clusters/kas.md
+++ b/doc/administration/clusters/kas.md
@@ -50,6 +50,8 @@ To enable the agent server on multiple nodes:
 1. For each agent server node, edit `/etc/gitlab/gitlab.rb`:
 
    ```ruby
+   gitlab_kas_external_url 'wss://kas.gitlab.example.com/'
+
    gitlab_kas['enable'] = true
    gitlab_kas['api_secret_key'] = '<32_bytes_long_base64_encoded_value>'
    gitlab_kas['private_api_secret_key'] = '<32_bytes_long_base64_encoded_value>'
@@ -65,18 +67,24 @@ To enable the agent server on multiple nodes:
    gitlab_rails['gitlab_kas_external_k8s_proxy_url'] = 'https://gitlab.example.com/-/kubernetes-agent/k8s-proxy/'
    ```
 
-   In this configuration:
-
-   - `gitlab_kas['private_api_listen_address']` is the address the agent server listens on. You can set it to `0.0.0.0` or an IP address reachable by other nodes in the cluster.
-   - `OWN_PRIVATE_API_URL` is the environment variable used by the KAS process for service discovery. You can set it to a hostname or IP address of the node you're configuring. The node must be reachable by other nodes in the cluster.
-   - `gitlab_kas['api_secret_key']` is the shared secret used for authentication between KAS and GitLab. This value must be Base64-encoded and exactly 32 bytes long.
-   - `gitlab_kas['private_api_secret_key']` is the shared secret used for authentication between different KAS instances. This value must be Base64-encoded and exactly 32 bytes long.
-   - `gitlab_rails['gitlab_kas_external_url']` is the user-facing URL for the in-cluster `agentk`.
-   - `gitlab_rails['gitlab_kas_internal_url']` is the internal URL the GitLab backend uses to communicate with KAS.
-   - `gitlab_rails['gitlab_kas_external_k8s_proxy_url']` is the user-facing URL for Kubernetes API proxying.
-
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
 
+##### Agent server node settings
+
+| Setting | Description |
+|---------|-------------|
+| `gitlab_kas['private_api_listen_address']` | The address the agent server listens on. Set to `0.0.0.0` or to an IP address reachable by other nodes in the cluster. |
+| `gitlab_kas['api_secret_key']` | The shared secret used for authentication between KAS and GitLab. The value must be Base64-encoded and exactly 32 bytes long. |
+| `gitlab_kas['private_api_secret_key']` | The shared secret used for authentication between different KAS instances. The value must be Base64-encoded and exactly 32 bytes long. |
+| `OWN_PRIVATE_API_URL` | The environment variable used by KAS for service discovery. Set to the hostname or IP address of the node you're configuring. The node must be reachable by other nodes in the cluster. |
+| `gitlab_kas_external_url` | The user-facing URL for the in-cluster `agentk`. Can be a fully qualified domain or subdomain, <sup>**1**</sup> or a GitLab external URL. <sup>**2**</sup> If blank, defaults to a GitLab external URL. |
+| `gitlab_rails['gitlab_kas_external_url']` | The user-facing URL for the in-cluster `agentk`. If blank, defaults to the `gitlab_kas_external_url`. |
+| `gitlab_rails['gitlab_kas_external_k8s_proxy_url']` | The user-facing URL for Kubernetes API proxying. If blank, defaults to a URL based on `gitlab_kas_external_url`. |
+| `gitlab_rails['gitlab_kas_internal_url']` | The internal URL the GitLab backend uses to communicate with KAS. |
+
+1. For example, `wss://kas.gitlab.example.com/`.
+1. For example, `wss://gitlab.example.com/-/kubernetes-agent/`.
+
 ### For GitLab Helm Chart
 
 For GitLab [Helm Chart](https://docs.gitlab.com/charts/) installations:
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index a8c192dc944..674f9b6035a 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -9,12 +9,12 @@ type: concepts, howto
 
 You can use GitLab CI/CD with Docker to create Docker images.
 For example, you can create a Docker image of your application,
-test it, and publish it to a container registry.
+test it, and push it to a container registry.
 
 To run Docker commands in your CI/CD jobs, you must configure
-GitLab Runner to support `docker` commands.
+GitLab Runner to support `docker` commands. This method requires `privileged` mode.
 
-If you want to build Docker images without enabling privileged mode on the runner,
+If you want to build Docker images without enabling `privileged` mode on the runner,
 you can use a [Docker alternative](#docker-alternatives).
 
 ## Enable Docker commands in your CI/CD jobs
@@ -58,7 +58,7 @@ the Docker commands, but needs permission to do so.
    sudo -u gitlab-runner -H docker info
    ```
 
-1. In GitLab, to verify that everything works, add `docker info` to `.gitlab-ci.yml`:
+1. In GitLab, add `docker info` to `.gitlab-ci.yml` to verify that Docker is working:
 
    ```yaml
    before_script:
@@ -70,10 +70,10 @@ the Docker commands, but needs permission to do so.
        - docker run my-docker-image /script/to/run/tests
    ```
 
-You can now use `docker` commands (and install `docker-compose` if needed).
+You can now use `docker` commands (and install Docker Compose if needed).
 
-When you add `gitlab-runner` to the `docker` group, you are effectively granting `gitlab-runner` full root permissions.
-For more information, see the [security of the `docker` group](https://blog.zopyx.com/on-docker-security-docker-group-considered-harmful/).
+When you add `gitlab-runner` to the `docker` group, you effectively grant `gitlab-runner` full root permissions.
+For more information, see [security of the `docker` group](https://blog.zopyx.com/on-docker-security-docker-group-considered-harmful/).
 
 ### Use Docker-in-Docker
 
@@ -83,15 +83,15 @@ For more information, see the [security of the `docker` group](https://blog.zopy
 - The executor uses a [container image of Docker](https://hub.docker.com/_/docker/), provided
   by Docker, to run your CI/CD jobs.
 
-The Docker image has all of the `docker` tools installed and can run
+The Docker image includes all of the `docker` tools and can run
 the job script in context of the image in privileged mode.
 
-We recommend you use Docker-in-Docker with TLS enabled,
+You should use Docker-in-Docker with TLS enabled,
 which is supported by [GitLab.com shared runners](../runners/index.md).
 
-You should always specify a specific version of the image, like `docker:20.10.16`.
+You should always pin a specific version of the image, like `docker:20.10.16`.
 If you use a tag like `docker:stable`, you have no control over which version is used.
-Unpredictable behavior can result, especially when new versions are released.
+This can cause incompatibility problems when new versions are released.
 
 #### Use the Docker executor with Docker-in-Docker
 
@@ -101,14 +101,11 @@ You can use the Docker executor to run jobs in a Docker container.
 
 > Introduced in GitLab Runner 11.11.
 
-The Docker daemon supports connections over TLS. In Docker 19.03.12 and later,
-TLS is the default.
+The Docker daemon supports connections over TLS. TLS is the default in Docker 19.03.12 and later.
 
 WARNING:
-This task enables `--docker-privileged`. When you do this, you are effectively disabling all of
-the security mechanisms of containers and exposing your host to privilege
-escalation. Doing this can lead to container breakout. For more information,
-see the official Docker documentation about
+This task enables `--docker-privileged`, which effectively disables the container's security mechanisms and exposes your host to privilege
+escalation. This action can cause container breakout. For more information, see
 [runtime privilege and Linux capabilities](https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities).
 
 To use Docker-in-Docker with TLS enabled:
@@ -134,10 +131,9 @@ To use Docker-in-Docker with TLS enabled:
      you must always use `privileged = true` in your Docker containers.
    - This command mounts `/certs/client` for the service and build
      container, which is needed for the Docker client to use the
-     certificates in that directory. For more information on how
-     Docker with TLS works, see <https://hub.docker.com/_/docker/#tls>.
+     certificates in that directory. For more information, see [the Docker image documentation](https://hub.docker.com/_/docker/).
 
-   The previous command creates a `config.toml` entry similar to this:
+   The previous command creates a `config.toml` entry similar to the following example:
 
    ```toml
    [[runners]]
@@ -155,7 +151,7 @@ To use Docker-in-Docker with TLS enabled:
        [runners.cache.gcs]
    ```
 
-1. You can now use `docker` in the job script. Note the inclusion of the
+1. You can now use `docker` in the job script. You should include the
    `docker:20.10.16-dind` service:
 
    ```yaml
@@ -193,7 +189,7 @@ To use Docker-in-Docker with TLS enabled:
 
 ##### Docker-in-Docker with TLS disabled in the Docker executor
 
-Sometimes you might have legitimate reasons to disable TLS.
+Sometimes there are legitimate reasons to disable TLS.
 For example, you have no control over the GitLab Runner configuration
 that you are using.
 
@@ -215,7 +211,7 @@ Assuming that the runner's `config.toml` is similar to:
     [runners.cache.gcs]
 ```
 
-You can now use `docker` in the job script. Note the inclusion of the
+You can now use `docker` in the job script. You should include the
 `docker:20.10.16-dind` service:
 
 ```yaml
@@ -254,7 +250,7 @@ build:
 
 #### Use the Kubernetes executor with Docker-in-Docker
 
-You can use the Kubernetes executor to run jobs in a Docker container.
+You can use the [Kubernetes executor](https://docs.gitlab.com/runner/executors/kubernetes.html) to run jobs in a Docker container.
 
 ##### Docker-in-Docker with TLS enabled in Kubernetes
 
@@ -280,7 +276,7 @@ To use Docker-in-Docker with TLS enabled in Kubernetes:
            medium = "Memory"
    ```
 
-1. You can now use `docker` in the job script. Note the inclusion of the
+1. You can now use `docker` in the job script. You should include the
    `docker:20.10.16-dind` service:
 
    ```yaml
@@ -324,25 +320,23 @@ To use Docker-in-Docker with TLS enabled in Kubernetes:
        - docker run my-docker-image /script/to/run/tests
    ```
 
-#### Limitations of Docker-in-Docker
+#### Known issues with Docker-in-Docker
 
-Docker-in-Docker is the recommended configuration, but is
-not without its own challenges:
+Docker-in-Docker is the recommended configuration, but you should be aware of the following issues:
 
 - **The `docker-compose` command**: This command is not available in this configuration by default.
-  To use `docker-compose` in your job scripts, follow the `docker-compose`
+  To use `docker-compose` in your job scripts, follow the Docker Compose
   [installation instructions](https://docs.docker.com/compose/install/).
-- **Cache**: Each job runs in a new environment. Concurrent jobs work fine,
-  because every build gets its own instance of Docker engine and they don't conflict with each other.
-  However, jobs can be slower because there's no caching of layers.
+- **Cache**: Each job runs in a new environment. Because every build gets its own instance of the Docker engine, concurrent jobs do not cause conflicts.
+  However, jobs can be slower because there's no caching of layers. See [Docker layer caching](#make-docker-in-docker-builds-faster-with-docker-layer-caching).
 - **Storage drivers**: By default, earlier versions of Docker use the `vfs` storage driver,
   which copies the file system for each job. Docker 17.09 and later use `--storage-driver overlay2`, which is
   the recommended storage driver. See [Using the OverlayFS driver](#use-the-overlayfs-driver) for details.
-- **Root file system**: Because the `docker:20.10.16-dind` container and the runner container don't share their
+- **Root file system**: Because the `docker:20.10.16-dind` container and the runner container do not share their
   root file system, you can use the job's working directory as a mount point for
   child containers. For example, if you have files you want to share with a
-  child container, you might create a subdirectory under `/builds/$CI_PROJECT_PATH`
-  and use it as your mount point. For a more detailed explanation, view
+  child container, you could create a subdirectory under `/builds/$CI_PROJECT_PATH`
+  and use it as your mount point. For a more detailed explanation, see
   [issue #41227](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41227).
 
   ```yaml
@@ -362,16 +356,16 @@ NOTE:
 If you bind the Docker socket and you are
 [using GitLab Runner 11.11 or later](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1261),
 you can no longer use `docker:20.10.16-dind` as a service. Volume bindings
-are done to the services as well, making these incompatible.
+also affect services, making them incompatible.
 
 #### Use the Docker executor with Docker socket binding
 
 To make Docker available in the context of the image, you need to mount
 `/var/run/docker.sock` into the launched containers. To do this with the Docker
-executor, you need to add `"/var/run/docker.sock:/var/run/docker.sock"` to the
+executor, add `"/var/run/docker.sock:/var/run/docker.sock"` to the
 [Volumes in the `[runners.docker]` section](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#volumes-in-the-runnersdocker-section).
 
-Your configuration should look something like this:
+Your configuration should look similar to this example:
 
 ```toml
 [[runners]]
@@ -388,7 +382,7 @@ Your configuration should look something like this:
     Insecure = false
 ```
 
-You can also do this while registering your runner by providing the following options:
+To mount `/var/run/docker.sock` while registering your runner, include the following options:
 
 ```shell
 sudo gitlab-runner register -n \
@@ -402,10 +396,10 @@ sudo gitlab-runner register -n \
 
 ##### Enable registry mirror for `docker:dind` service
 
-When the Docker daemon starts inside of the service container, it uses
-the default configuration. You may want to configure a
+When the Docker daemon starts inside the service container, it uses
+the default configuration. You might want to configure a
 [registry mirror](https://docs.docker.com/registry/recipes/mirror/) for
-performance improvements and to ensure you don't reach Docker Hub rate limits.
+performance improvements and to ensure you do not exceed Docker Hub rate limits.
 
 ###### The service in the `.gitlab-ci.yml` file
 
@@ -474,9 +468,9 @@ content:
 ```
 
 Update the `config.toml` file to mount the file to
-`/etc/docker/daemon.json`. This would mount the file for **every**
-container that is created by GitLab Runner. The configuration is
-picked up by the `dind` service.
+`/etc/docker/daemon.json`. This mounts the file for **every**
+container created by GitLab Runner. The configuration is
+detected by the `dind` service.
 
 ```toml
 [[runners]]
@@ -516,13 +510,12 @@ kubectl create configmap docker-daemon --namespace gitlab-runner --from-file /tm
 ```
 
 NOTE:
-Make sure to use the namespace that the Kubernetes executor for GitLab Runner uses
-to create job pods in.
+You must use the namespace that the Kubernetes executor for GitLab Runner uses to create job pods.
 
 After the ConfigMap is created, you can update the `config.toml`
 file to mount the file to `/etc/docker/daemon.json`. This update
-mounts the file for **every** container that is created by GitLab Runner.
-The configuration is picked up by the `dind` service.
+mounts the file for **every** container created by GitLab Runner.
+The `dind` service detects this configuration.
 
 ```toml
 [[runners]]
@@ -537,22 +530,21 @@ The configuration is picked up by the `dind` service.
       sub_path = "daemon.json"
 ```
 
-##### Limitations of Docker socket binding
+##### Known issues with Docker socket binding
 
 When you use Docker socket binding, you avoid running Docker in privileged mode. However,
 the implications of this method are:
 
-- By sharing the Docker daemon, you are effectively disabling all
-  the security mechanisms of containers and exposing your host to privilege
-  escalation, which can lead to container breakout. For example, if a project
-  ran `docker rm -f $(docker ps -a -q)` it would remove the GitLab Runner
+- By sharing the Docker daemon, you effectively disable all
+  the container's security mechanisms and expose your host to privilege
+  escalation. This can cause container breakout. For example, if a project
+  ran `docker rm -f $(docker ps -a -q)`, it would remove the GitLab Runner
   containers.
-- Concurrent jobs may not work; if your tests
-  create containers with specific names, they may conflict with each other.
-- Any containers spawned by Docker commands are siblings of the runner rather
-  than children of the runner. This may have complications and limitations that
-  are unsuitable for your workflow.
-- Sharing files and directories from the source repository into containers may not
+- Concurrent jobs might not work. If your tests
+  create containers with specific names, they might conflict with each other.
+- Any containers created by Docker commands are siblings of the runner, rather
+  than children of the runner. This might cause complications for your workflow.
+- Sharing files and directories from the source repository into containers might not
   work as expected. Volume mounting is done in the context of the host
   machine, not the build container. For example:
 
@@ -560,8 +552,8 @@ the implications of this method are:
    docker run --rm -t -i -v $(pwd)/src:/home/app/src test-image:latest run_app_tests
    ```
 
-You don't need to include the `docker:20.10.16-dind` service, like you do when
-you're using the Docker-in-Docker executor:
+You do not need to include the `docker:20.10.16-dind` service, like you do when
+you use the Docker-in-Docker executor:
 
 ```yaml
 image: docker:20.10.16
@@ -580,7 +572,7 @@ build:
 
 When you use Docker-in-Docker, the
 [standard authentication methods](using_docker_images.md#access-an-image-from-a-private-container-registry)
-don't work because a fresh Docker daemon is started with the service.
+do not work, because a fresh Docker daemon is started with the service.
 
 ### Option 1: Run `docker login`
 
@@ -612,14 +604,14 @@ empty or remove it.
 
 If you are an administrator for GitLab Runner, you can mount a file
 with the authentication configuration to `~/.docker/config.json`.
-Then every job that the runner picks up is authenticated already. If you
+Then every job that the runner picks up is already authenticated. If you
 are using the official `docker:20.10.16` image, the home directory is
 under `/root`.
 
 If you mount the configuration file, any `docker` command
 that modifies the `~/.docker/config.json` fails. For example, `docker login`
 fails, because the file is mounted as read-only. Do not change it from
-read-only, because problems occur.
+read-only, because this causes problems.
 
 Here is an example of `/opt/.docker/config.json` that follows the
 [`DOCKER_AUTH_CONFIG`](using_docker_images.md#determine-your-docker_auth_config-data)
@@ -685,7 +677,7 @@ If you already have
 defined, you can use the variable and save it in
 `~/.docker/config.json`.
 
-There are multiple ways to define this authentication:
+You can define this authentication in several ways:
 
 - In [`pre_build_script`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section)
   in the runner configuration file.
@@ -718,24 +710,23 @@ build:
 
 When using Docker-in-Docker, Docker downloads all layers of your image every
 time you create a build. Recent versions of Docker (Docker 1.13 and later) can
-use a pre-existing image as a cache during the `docker build` step. This considerably
-speeds up the build process.
+use a pre-existing image as a cache during the `docker build` step. This significantly
+accelerates the build process.
 
 ### How Docker caching works
 
-When running `docker build`, each command in `Dockerfile` results in a layer.
-These layers are kept around as a cache and can be reused if there haven't been
-any changes. Change in one layer causes all subsequent layers to be recreated.
+When running `docker build`, each command in `Dockerfile` creates a layer.
+These layers are retained as a cache and can be reused if there have been no changes. Change in one layer causes the recreation of all subsequent layers.
 
-You can specify a tagged image to be used as a cache source for the `docker build`
-command by using the `--cache-from` argument. Multiple images can be specified
+To specify a tagged image to be used as a cache source for the `docker build`
+command, use the `--cache-from` argument. Multiple images can be specified
 as a cache source by using multiple `--cache-from` arguments. Any image that's used
-with the `--cache-from` argument must first be pulled
+with the `--cache-from` argument must be pulled
 (using `docker pull`) before it can be used as a cache source.
 
 ### Docker caching example
 
-Here's a `.gitlab-ci.yml` file that shows how to use Docker caching:
+This example `.gitlab-ci.yml` file shows how to use Docker caching:
 
 ```yaml
 image: docker:20.10.16
@@ -768,35 +759,33 @@ In the `script` section for the `build` stage:
    cache (see the `--cache-from $CI_REGISTRY_IMAGE:latest` argument) if
    available, and tags it.
 1. The last two commands push the tagged Docker images to the container registry
-   so that they may also be used as cache for subsequent builds.
+   so that they can also be used as cache for subsequent builds.
 
 ## Use the OverlayFS driver
 
 NOTE:
 The shared runners on GitLab.com use the `overlay2` driver by default.
 
-By default, when using `docker:dind`, Docker uses the `vfs` storage driver which
-copies the file system on every run. This is a disk-intensive operation
-which can be avoided if a different driver is used, for example `overlay2`.
+By default, when using `docker:dind`, Docker uses the `vfs` storage driver, which
+copies the file system on every run. You can avoid this disk-intensive operation by using a different driver, for example `overlay2`.
 
 ### Requirements
 
-1. Make sure a recent kernel is used, preferably `>= 4.2`.
+1. Ensure a recent kernel is used, preferably `>= 4.2`.
 1. Check whether the `overlay` module is loaded:
 
    ```shell
    sudo lsmod | grep overlay
    ```
 
-   If you see no result, then it isn't loaded. To load it use:
+   If you see no result, then the module is not loaded. To load the module, use:
 
    ```shell
    sudo modprobe overlay
    ```
 
-   If everything went fine, you need to make sure module is loaded on reboot.
-   On Ubuntu systems, this is done by editing `/etc/modules`. Just add the
-   following line into it:
+   If the module loaded, you must make sure the module loads on reboot.
+   On Ubuntu systems, do this by adding the following line to `/etc/modules`:
 
    ```plaintext
    overlay
@@ -823,7 +812,7 @@ environment variable in the
 environment = ["DOCKER_DRIVER=overlay2"]
 ```
 
-If you're running multiple runners, you have to modify all configuration files.
+If you're running multiple runners, you must modify all configuration files.
 
 Read more about the [runner configuration](https://docs.gitlab.com/runner/configuration/)
 and [using the OverlayFS storage driver](https://docs.docker.com/storage/storagedriver/overlayfs-driver/).
@@ -833,8 +822,8 @@ and [using the OverlayFS storage driver](https://docs.docker.com/storage/storage
 To build Docker images without enabling privileged mode on the runner, you can
 use one of these alternatives:
 
-- [`kaniko`](using_kaniko.md).
-- [`buildah`](https://github.com/containers/buildah).
+- [`kaniko`](using_kaniko.md)
+- [`buildah`](https://github.com/containers/buildah)
 
 For example, with `buildah`:
 
@@ -868,7 +857,7 @@ build:
 
 ## Use the GitLab Container Registry
 
-After you've built a Docker image, you can push it up to the built-in
+After you've built a Docker image, you can push it to the
 [GitLab Container Registry](../../user/packages/container_registry/build_and_push_images.md#use-gitlab-cicd).
 
 ## Troubleshooting
@@ -879,18 +868,18 @@ This is a common error when you are using
 [Docker-in-Docker](#use-docker-in-docker)
 v19.03 or later.
 
-This issue occurs because Docker starts on TLS automatically.
+This error occurs because Docker starts on TLS automatically.
 
-- If this is your first time setting it up, read
+- If this is your first time setting it up, see
   [use the Docker executor with the Docker image](#use-docker-in-docker).
-- If you are upgrading from v18.09 or earlier, read our
+- If you are upgrading from v18.09 or earlier, see the
   [upgrade guide](https://about.gitlab.com/blog/2019/07/31/docker-in-docker-with-docker-19-dot-03/).
 
-This error can also occur with the [Kubernetes executor](https://docs.gitlab.com/runner/executors/kubernetes.html#using-dockerdind) when attempts are made to access the Docker-in-Docker service before it has had time to fully start up. For a more detailed explanation, see [this issue](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27215).
+This error can also occur with the [Kubernetes executor](https://docs.gitlab.com/runner/executors/kubernetes.html#using-dockerdind) when attempts are made to access the Docker-in-Docker service before it has fully started up. For a more detailed explanation, see [issue 27215](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27215).
 
 ### Docker `no such host` error
 
-You may get an error that says
+You might get an error that says
 `docker: error during connect: Post https://docker:2376/v1.40/containers/create: dial tcp: lookup docker on x.x.x.x:53: no such host`.
 
 This issue can occur when the service's image name
diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index 0c21e7cd766..859e7265a2a 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -89,8 +89,9 @@ voters to agree.
 
 When features are deprecated and removed, update the related documentation.
 
-API documentation follows these guidelines, but the GraphQL docs use
-a [separate process](../api_graphql_styleguide.md#deprecating-schema-items).
+NOTE:
+A separate process exists for [GraphQL docs](../api_graphql_styleguide.md#deprecating-schema-items)
+and [REST API docs](restful_api_styleguide.md#deprecations).
 
 ### Deprecate a page or topic
 
diff --git a/doc/gitlab-basics/add-file.md b/doc/gitlab-basics/add-file.md
index 1728ee46b99..0915b9b8e21 100644
--- a/doc/gitlab-basics/add-file.md
+++ b/doc/gitlab-basics/add-file.md
@@ -7,89 +7,95 @@ type: howto
 
 # Add a file to a repository **(FREE)**
 
-Adding files to a repository is a small, but key task. Bringing files in to a repository,
-such as code, images, or documents, allows them to be tracked by Git, even though they
-may have been created elsewhere.
+Adding files to a repository is a small, but key, task. No matter where the code,
+images, or documents were created, Git tracks them after you add them to your repository.
 
-You can add a file to a repository in your terminal, and
-then push to GitLab. You can also use the [web interface](../user/project/repository/web_editor.md#upload-a-file),
-which may be a simpler solution.
+## Add an existing file
 
-If you need to create a file first, for example a `README.md` text file, that can
-also be done from the terminal or
-[web interface](../user/project/repository/web_editor.md#create-a-file).
+To add an existing file to your repository, either:
 
-## Add a file using the command line
+- Upload the file from the GitLab UI.
+- Add a file to your repository from the command line, then push the file up to GitLab.
 
-Open a terminal (or shell), and change into the folder of your
-GitLab project. This usually means running the following command until you get
-to the desired destination:
+### From the UI
 
-```shell
-cd <destination folder>
-```
+If you are unfamiliar with the command line, use the
+[Web Editor](../user/project/repository/web_editor.md) to upload a file from the GitLab UI:
 
-[Create a new branch](../tutorials/make_your_first_git_commit.md#create-a-branch-and-make-changes) to add your file into. Submitting changes directly
-to the default branch should be avoided unless your project is very small and you're the
-only person working on it.
+<!-- Original source for this list: doc/user/project/repository/web_editor.md#upload-a-file -->
+<!-- For why we duplicated the info, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111072#note_1267429478 -->
 
-You can also [switch to an existing branch](start-using-git.md#switch-to-a-branch)
-if you have one already.
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. From the project dashboard or repository, next to the branch name, select the plus icon (**{plus}**).
+1. From the dropdown list, select **Upload file**.
+1. Complete the fields. To create a merge request with the uploaded file, ensure the **Start a new merge request with these changes** toggle is turned on.
+1. Select **Upload file**.
 
-Using your standard tool for copying files (for example, Finder in macOS, or File Explorer
-on Windows), put the file into a directory in the GitLab project.
+### From the command line
 
-Check if your file is actually present in the directory (if you're on Windows,
-use `dir` instead):
+To add a new file from the command line:
 
-```shell
-ls
-```
+1. Open a terminal (or shell) window.
+1. Use the "change directory" (`cd`) command to go to your GitLab project's folder.
+   Run the `cd DESTINATION` command, changing `DESTINATION` to the location of your folder.
+1. Choose a Git branch to work in. You can either:
+   - [Create a new branch](../tutorials/make_your_first_git_commit.md#create-a-branch-and-make-changes)
+     to add your file into. Don't submit changes directly to the default branch of your
+     repository unless your project is very small and you're the only person working on it.
+   - [Switch to an existing branch](start-using-git.md#switch-to-a-branch).
+1. Copy the file into the appropriate directory in your project. Use your standard tool
+   for copying files, such as Finder in macOS, or File Explorer in Windows.
+1. In your terminal window, confirm that your file is present in the directory:
+   - Windows: Use the `dir` command.
+   - All other operating systems: Use the `ls` command.
+   You should see the name of the file in the list shown.
+1. Check the status of your file with the `git status` command. Your file's name
+   should be red. Files listed in red are in your file system, but Git isn't tracking them yet.
+1. Tell Git to track this file with the `git add FILENAME` command, replacing `FILENAME`
+   with the name of your file.
+1. Check the status of your file again with the `git status` command. Your file's name
+   should be green. Files listed in green are tracked locally by Git, but still
+   need to be committed and pushed.
+1. Commit (save) your file to your local copy of your project's Git repository:
 
-You should see the name of the file in the list shown.
+   ```shell
+   git commit -m "DESCRIBE COMMIT IN A FEW WORDS"
+   ```
 
-Check the status:
+1. Push (send) your changes from your copy of the repository, up to GitLab.
+   In this command, `origin` refers to the copy of the repository stored at GitLab.
+   Replace `BRANCHNAME` with the name of your branch:
 
-```shell
-git status
-```
+   ```shell
+   git push origin BRANCHNAME
+   ```
 
-Your file's name should appear in red, so `git` took notice of it! Now add it
-to the repository:
+1. Git prepares, compresses, and sends the data. Lines from the remote repository
+   (here, GitLab) are prefixed with `remote:` like this:
 
-```shell
-git add <name of file>
-```
+   ```plaintext
+   Enumerating objects: 9, done.
+   Counting objects: 100% (9/9), done.
+   Delta compression using up to 10 threads
+   Compressing objects: 100% (5/5), done.
+   Writing objects: 100% (5/5), 1.84 KiB | 1.84 MiB/s, done.
+   Total 5 (delta 3), reused 0 (delta 0), pack-reused 0
+   remote:
+   remote: To create a merge request for BRANCHNAME, visit:
+   remote:   https://gitlab.com/gitlab-org/gitlab/-/merge_requests/new?merge_request%5Bsource_branch%5D=BRANCHNAME
+   remote:
+   To https://gitlab.com/gitlab-org/gitlab.git
+    * [new branch]                BRANCHNAME -> BRANCHNAME
+   branch 'BRANCHNAME' set up to track 'origin/BRANCHNAME'.
+   ```
 
-Check the status again, your file's name should have turned green:
+Your file is now copied from your local copy of the repository, up to the remote
+repository at GitLab. To create a merge request, copy the link sent back from the remote
+repository and paste it into a browser window.
 
-```shell
-git status
-```
+## Add a new file
 
-Commit (save) your file to the repository:
+To create a new file (like a `README.md` text file) in your repository, either:
 
-```shell
-git commit -m "DESCRIBE COMMIT IN A FEW WORDS"
-```
-
-Now you can push (send) your changes (in the branch `<branch-name>`) to GitLab
-(the Git remote named 'origin'):
-
-```shell
-git push origin <branch-name>
-```
-
-Your image is added to your branch in your repository in GitLab.
-
-<!-- ## Troubleshooting
-
-Include any troubleshooting steps that you can foresee. If you know beforehand what issues
-one might have when setting this up, or when something is changed, or on upgrading, it's
-important to describe those, too. Think of things that may go wrong and include them here.
-This is important to minimize requests for support, and to avoid doc comments with
-questions that you know someone might ask.
-
-Each scenario can be a third-level heading, for example `### Getting error message X`.
-If you have none to add when creating a doc, leave this section in place
-but commented out to help encourage others to add to it in the future. -->
+- [Create the file](../user/project/repository/web_editor.md#create-a-file) from the GitLab UI.
+- Create the file from the terminal.
diff --git a/doc/user/clusters/agent/gitops/flux_tutorial.md b/doc/user/clusters/agent/gitops/flux_tutorial.md
index b3ef9d174d9..5f902002f83 100644
--- a/doc/user/clusters/agent/gitops/flux_tutorial.md
+++ b/doc/user/clusters/agent/gitops/flux_tutorial.md
@@ -7,7 +7,8 @@ info: A tutorial using Flux with Project Access Tokens
 # Tutorial: Set up Flux for GitOps **(FREE)**
 
 This tutorial teaches you how to set up Flux for GitOps. You'll set up a sample project,
-complete a bootstrap Flux installation, and authenticate your installation with a project access token.
+complete a bootstrap Flux installation, and authenticate your installation with a
+[project access token](../../../project/settings/project_access_tokens.md).
 
 You can find the fully configured tutorial project [in this GitLab repository](https://gitlab.com/gitlab-org/configure/examples/flux/flux-config). It works in conjunction with [this repository](https://gitlab.com/gitlab-org/configure/examples/flux/web-app-manifests/-/tree/main), which contains the example Kubernetes manifests.
 
@@ -20,7 +21,9 @@ To set up Flux with a project access token:
 
 Prerequisites:
 
-- On GitLab SaaS, you must have the Premium or Ultimate tier. On self-managed instances, you can have any tier.
+- On GitLab SaaS, you must have the Premium or Ultimate tier to use a project access token.
+  On self-managed instances, you can have any tier.
+- Not recommended. You can authenticate with a [personal or group access token](flux.md#bootstrap-installation) in all tiers.
 - You must have a Kubernetes cluster running.
 
 ## Create the Flux repository
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 462dcb5e3d8..1bb73c9a2e7 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -466,6 +466,7 @@ subscriptions.
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106256) in GitLab 15.7 [with a flag](../administration/feature_flags.md) named `customizable_roles`.
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110810) in GitLab 15.9.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114524) in GitLab 15.10.
 
 Custom roles allow group members who are assigned the Owner role to create roles
 specific to the needs of their organization.
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index ee6e3df772c..33002e687bd 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -200,39 +200,59 @@ Configure FortiToken Cloud in GitLab. On your GitLab server:
 
 ### Set up a WebAuthn device
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22506) in GitLab 13.4 [with a flag](../../../administration/feature_flags.md) named `webauthn`. Disabled by default.
-> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/232671) in GitLab 14.6.
+> - WebAuthn devices [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22506) in GitLab 13.4 [with a flag](../../../administration/feature_flags.md) named `webauthn`. Disabled by default.
+> - WebAuthn devices [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/232671) in GitLab 14.6.
+> - Optional one-time password authentication for WebAuthn devices [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/378844) in GitLab 15.10 [with a flag](../../../administration/feature_flags.md) named `webauthn_without_topt`. [Enabled on GitLab.com and self-managed by default](https://gitlab.com/gitlab-org/gitlab/-/issues/232671).
 
 FLAG:
-On self-managed GitLab, by default this feature is available. To disable the feature, ask an administrator to
+On self-managed GitLab, by default, WebAuthn devices are available. To disable the feature, ask an administrator to
 [disable the feature flag](../../../administration/feature_flags.md) named `webauthn`. If you disable the WebAuthn
 feature flag after WebAuthn devices have been registered, these devices are not usable until you re-enable this feature.
+On GitLab.com, WebAuthn devices are available.
+
+FLAG:
+On self-managed GitLab, by default, optional one-time password authentication for WebAuthn devices is available. To hide the feature, ask an administrator to [disable the feature flag](../../../administration/feature_flags.md) named `webauthn_without_topt`.
 On GitLab.com, this feature is available.
 
-WebAuthn [supported by](https://caniuse.com/#search=webauthn):
+WebAuthn is [supported by](https://caniuse.com/#search=webauthn) the following:
 
-- The following desktop browsers:
+- Desktop browsers:
   - Chrome
   - Edge
   - Firefox
   - Opera
   - Safari
-- The following mobile browsers:
+- Mobile browsers:
   - Chrome for Android
   - Firefox for Android
   - iOS Safari (since iOS 13.3)
 
 To set up 2FA with a WebAuthn-compatible device:
 
+1. Optional. [Set up a one-time password](#enable-one-time-password).
 1. Access your [**User settings**](../index.md#access-your-user-settings).
 1. Select **Account**.
 1. Select **Enable Two-Factor Authentication**.
 1. Plug in your WebAuthn device.
+1. Enter a device name and in GitLab 15.10 and later, your GitLab account password.
+   You might not need to enter this password if you have signed in through your
+   identity provider.
 1. Select **Set up New WebAuthn Device**.
 1. Depending on your device, you might have to press a button or touch a sensor.
 
-A message displays indicating that your device was successfully set up. Recovery codes are not generated for WebAuthn
-devices.
+You should receive a message indicating that you successfully set up your device.
+
+When you set up 2FA with a WebAuthn-compatible device, that device is linked to
+a specific browser on a specific computer. Depending on the browser and WebAuthn
+device, you might be able to configure settings to use the WebAuthn device on a
+different browser or computer.
+
+If this is the first time you have set up 2FA, you
+must [download recovery codes](#recovery-codes) so you can recover access to your
+account if you lose access.
+
+WARNING:
+You can lose access to your account if you clear your browser data.
 
 ## Recovery codes
 
@@ -245,7 +265,7 @@ these recovery codes to sign in to your account.
 WARNING:
 Each code can be used only once to sign in to your account.
 
-We recommend copying and printing them, or downloading them using the **Download codes** button for storage in a safe
+You should copy and print the codes, or use **Download codes** to download them for storage in a safe
 place. If you choose to download them, the file is called `gitlab-recovery-codes.txt`.
 
 NOTE:
@@ -275,7 +295,7 @@ and you're presented with a second prompt, depending on which type of 2FA you've
 
 ### Sign in using a one-time password
 
-When asked, enter the pin from your one time password authenticator's application or a recovery code to sign in.
+When asked, enter the pin from your one-time password authenticator's application or a recovery code to sign in.
 
 ### Sign in using a WebAuthn device
 
@@ -374,7 +394,7 @@ a GitLab global administrator disable 2FA for your account:
 ## Information for GitLab administrators **(FREE SELF)**
 
 - Take care that 2FA keeps working after [restoring a GitLab backup](../../../raketasks/backup_restore.md).
-- To ensure 2FA authorizes correctly with a time-based one time passwords (TOTP) server, synchronize your GitLab
+- To ensure 2FA authorizes correctly with a time-based one-time password (TOTP) server, synchronize your GitLab
   server's time using a service like NTP. Otherwise, authorization can always fail because of time differences.
 - The GitLab WebAuthn implementation does _not_ work when the GitLab instance is accessed from multiple hostnames
   or FQDNs. Each WebAuthn registration is linked to the _current hostname_ at the time of registration, and
diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md
index 2574c90982e..c42e4304e3b 100644
--- a/doc/user/project/code_owners.md
+++ b/doc/user/project/code_owners.md
@@ -8,12 +8,32 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > Moved to GitLab Premium in 13.9.
 
-Code Owners define who develops and maintains a feature, and own the resulting
-files or directories in a repository.
+Use the Code Owners feature to define who has expertise for specific parts of your project's codebase.
+Define the owners of files and directories in a repository to:
 
-- The users you define as Code Owners are displayed in the UI when you browse directories.
-- You can set your merge requests so they must be approved by Code Owners before merge.
-- You can protect a branch and allow only Code Owners to approve changes to the branch.
+- **Require owners to approve changes.** Combine protected branches with Code Owners to require
+  experts to approve merge requests before they merge into a protected branch.
+- **Identify owners.** Code Owner names are displayed on the files and directories they own:
+  ![Code Owners displayed in UI](img/codeowners_in_UI_v15_10.png)
+
+Use Code Owners in combination with merge request
+[approval rules](merge_requests/approvals/rules.md) (either optional or required)
+to build a flexible approval workflow:
+
+- Use **Code Owners** to ensure quality. Define the users who have domain expertise
+  for specific paths in your repository.
+- Use **Approval rules** to define areas of expertise that don't correspond to specific
+  file paths in your repository. Approval rules help guide merge request creators to
+  the correct set of reviewers, such as frontend developers or a security team.
+
+For example:
+
+| Type | Name | Scope  | Comment    |
+|------|------|--------|------------|
+| Approval rule            | UX                   | All files     | A user experience (UX) team member reviews the user experience of all changes made in your project.
+| Approval rule            | Security             | All files     | A security team member reviews all changes for vulnerabilities.
+| Code Owner approval rule | Frontend: Code Style | `*.css` files | A frontend engineer reviews CSS file changes for adherence to project style standards.
+| Code Owner approval rule | Backend: Code Review | `*.rb` files  | A backend engineer reviews the logic and code style of Ruby files.
 
 <div class="video-fallback">
   Video introduction: <a href="https://www.youtube.com/watch?v=RoyBySTUSB0">Code Owners</a>.
@@ -24,38 +44,16 @@ files or directories in a repository.
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 
-Use Code Owners and approvers together with
-[approval rules](merge_requests/approvals/rules.md) to build a flexible approval
-workflow:
+## View a file's Code Owner
 
-- Use **Code Owners** to define the users who have domain expertise for specific paths in your repository.
-- Use **Approvers** and **Approval rules** to define domains of expertise (such as a security team)
-  that are not scoped to specific file paths in your repository.
-  - **Approvers** define the users.
-  - **Approval rules** define when these users can approve work, and whether or not their approval is required.
+To view the Code Owners for a file:
 
-For example:
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the left sidebar, select **Repository > Files**.
+1. Go to the file or directory you want to see the Code Owners for.
+1. Optional. Select your desired branch.
 
-| Type | Name | Scope  | Comment    |
-|------|------|--------|------------|
-| Approval rule            | UX                   | All files     | A user experience (UX) team member reviews the user experience of all changes made in your project. |
-| Approval rule            | Security             | All files     | A security team member reviews all changes for vulnerabilities.                                     |
-| Code Owner approval rule | Frontend: Code Style | `*.css` files | A frontend engineer reviews CSS file changes for adherence to project style standards.              |
-| Code Owner approval rule | Backend: Code Review | `*.rb` files  | A backend engineer reviews the logic and code style of Ruby files.                                  |
-
-## Code Owners file
-
-A `CODEOWNERS` file (with no extension) specifies the users or
-[shared groups](members/share_project_with_groups.md) responsible for
-specific files and directories in a repository.
-
-Each repository uses a single `CODEOWNERS` file. GitLab checks these locations
-in your repository in this order. The first `CODEOWNERS` file found is used, and
-all others are ignored:
-
-1. In the root directory: `./CODEOWNERS`.
-1. In the `docs` directory: `./docs/CODEOWNERS`.
-1. In the `.gitlab` directory: `./.gitlab/CODEOWNERS`.
+GitLab shows the Code Owners at the top of the page.
 
 ## Set up Code Owners
 
@@ -76,9 +74,21 @@ all others are ignored:
    directoryname/ @groupname
    ```
 
-The Code Owners are now displayed in the UI. They apply to the current branch only.
+### Code Owners file
 
-Next steps:
+A `CODEOWNERS` file (with no extension) specifies the users or
+[shared groups](members/share_project_with_groups.md) responsible for
+specific files and directories in a repository.
+
+Each repository uses a single `CODEOWNERS` file. GitLab checks these locations
+in your repository in this order. The first `CODEOWNERS` file found is used, and
+all others are ignored:
+
+1. In the root directory: `./CODEOWNERS`.
+1. In the `docs` directory: `./docs/CODEOWNERS`.
+1. In the `.gitlab` directory: `./.gitlab/CODEOWNERS`.
+
+### Make Code Owners eligible approvers or require their approval of MRs
 
 - [Add Code Owners as merge request approvers](merge_requests/approvals/rules.md#code-owners-as-eligible-approvers).
 - Set up [Code Owner approval on a protected branch](protected_branches.md#require-code-owner-approval-on-a-protected-branch).
diff --git a/doc/user/project/img/codeowners_in_UI_v15_10.png b/doc/user/project/img/codeowners_in_UI_v15_10.png
new file mode 100644
index 00000000000..c643d333791
Binary files /dev/null and b/doc/user/project/img/codeowners_in_UI_v15_10.png differ
diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md
index 7e2c1b0265d..ace7e119469 100644
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
@@ -108,6 +108,9 @@ To link to a single line, you can also:
 
 To upload a binary file in the Web Editor:
 
+<!-- This list is duplicated at doc/gitlab-basics/add-file.md#from-the-ui -->
+<!-- For why we duplicated the info, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111072#note_1267429478 -->
+
 1. On the top bar, select **Main menu > Projects** and find your project.
 1. From the project dashboard or repository, next to the branch name, select the plus icon (**{plus}**).
 1. From the dropdown list, select **Upload file**.
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 5c2ae7fefd0..93d58710b0c 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -109,7 +109,7 @@ module Gitlab
       # rubocop: enable Metrics/ParameterLists
 
       def create_repository(default_branch = nil)
-        request = Gitaly::CreateRepositoryRequest.new(repository: @gitaly_repo, default_branch: default_branch)
+        request = Gitaly::CreateRepositoryRequest.new(repository: @gitaly_repo, default_branch: encode_binary(default_branch))
         gitaly_client_call(@storage, :repository_service, :create_repository, request, timeout: GitalyClient.fast_timeout)
       end
 
diff --git a/lib/sidebars/explore/menus/groups_menu.rb b/lib/sidebars/explore/menus/groups_menu.rb
new file mode 100644
index 00000000000..542da0ad7fd
--- /dev/null
+++ b/lib/sidebars/explore/menus/groups_menu.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Explore
+    module Menus
+      class GroupsMenu < ::Sidebars::Menu
+        override :link
+        def link
+          explore_groups_path
+        end
+
+        override :title
+        def title
+          _('Groups')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'group'
+        end
+
+        override :render?
+        def render?
+          true
+        end
+
+        override :active_routes
+        def active_routes
+          { controller: ['explore/groups'] }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/explore/menus/projects_menu.rb b/lib/sidebars/explore/menus/projects_menu.rb
new file mode 100644
index 00000000000..29c35d23b7b
--- /dev/null
+++ b/lib/sidebars/explore/menus/projects_menu.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Explore
+    module Menus
+      class ProjectsMenu < ::Sidebars::Menu
+        override :link
+        def link
+          explore_projects_path
+        end
+
+        override :title
+        def title
+          _('Projects')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'project'
+        end
+
+        override :render?
+        def render?
+          true
+        end
+
+        override :active_routes
+        def active_routes
+          { page: [link, explore_root_path] }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/explore/menus/snippets_menu.rb b/lib/sidebars/explore/menus/snippets_menu.rb
new file mode 100644
index 00000000000..67b852258a7
--- /dev/null
+++ b/lib/sidebars/explore/menus/snippets_menu.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Explore
+    module Menus
+      class SnippetsMenu < ::Sidebars::Menu
+        override :link
+        def link
+          explore_snippets_path
+        end
+
+        override :title
+        def title
+          _('Snippets')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'snippet'
+        end
+
+        override :render?
+        def render?
+          true
+        end
+
+        override :active_routes
+        def active_routes
+          { controller: ['explore/snippets'] }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/explore/menus/topics_menu.rb b/lib/sidebars/explore/menus/topics_menu.rb
new file mode 100644
index 00000000000..5e0a7897873
--- /dev/null
+++ b/lib/sidebars/explore/menus/topics_menu.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Explore
+    module Menus
+      class TopicsMenu < ::Sidebars::Menu
+        override :link
+        def link
+          topics_explore_projects_path
+        end
+
+        override :title
+        def title
+          _('Topics')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'labels'
+        end
+
+        override :render?
+        def render?
+          true
+        end
+
+        override :active_routes
+        def active_routes
+          { page: link, path: 'projects#topic' }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/explore/panel.rb b/lib/sidebars/explore/panel.rb
new file mode 100644
index 00000000000..9a585a99705
--- /dev/null
+++ b/lib/sidebars/explore/panel.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Explore
+    class Panel < ::Sidebars::Panel
+      override :configure_menus
+      def configure_menus
+        add_menus
+      end
+
+      override :aria_label
+      def aria_label
+        _('Explore')
+      end
+
+      override :render_raw_scope_menu_partial
+      def render_raw_scope_menu_partial
+        "shared/nav/explore_scope_header"
+      end
+
+      override :super_sidebar_context_header
+      def super_sidebar_context_header
+        {
+          title: aria_label,
+          icon: 'compass'
+        }
+      end
+
+      private
+
+      def add_menus
+        add_menu(Sidebars::Explore::Menus::ProjectsMenu.new(context))
+        add_menu(Sidebars::Explore::Menus::GroupsMenu.new(context))
+        add_menu(Sidebars::Explore::Menus::TopicsMenu.new(context))
+        add_menu(Sidebars::Explore::Menus::SnippetsMenu.new(context))
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/menus/invite_team_members_menu.rb b/lib/sidebars/groups/menus/invite_team_members_menu.rb
deleted file mode 100644
index 0779b696061..00000000000
--- a/lib/sidebars/groups/menus/invite_team_members_menu.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Sidebars
-  module Groups
-    module Menus
-      class InviteTeamMembersMenu < ::Sidebars::Menu
-        override :title
-        def title
-          s_('InviteMember|Invite members')
-        end
-
-        override :render?
-        def render?
-          can?(context.current_user, :admin_group_member, context.group) && all_valid_members.size <= 1
-        end
-
-        override :menu_partial
-        def menu_partial
-          'groups/invite_members_side_nav_link'
-        end
-
-        override :menu_partial_options
-        def menu_partial_options
-          {
-            group: context.group,
-            title: title,
-            sidebar_menu: self
-          }
-        end
-
-        override :extra_nav_link_html_options
-        def extra_nav_link_html_options
-          {
-            'data-test-id': 'side-nav-invite-members'
-          }
-        end
-
-        private
-
-        def all_valid_members
-          GroupMembersFinder.new(context.group, context.current_user).execute
-        end
-      end
-    end
-  end
-end
diff --git a/lib/sidebars/groups/panel.rb b/lib/sidebars/groups/panel.rb
index e8b815bdce7..77ca51ddf92 100644
--- a/lib/sidebars/groups/panel.rb
+++ b/lib/sidebars/groups/panel.rb
@@ -16,22 +16,12 @@ module Sidebars
         add_menu(Sidebars::Groups::Menus::PackagesRegistriesMenu.new(context))
         add_menu(Sidebars::Groups::Menus::CustomerRelationsMenu.new(context))
         add_menu(Sidebars::Groups::Menus::SettingsMenu.new(context))
-        add_invite_members_menu
       end
 
       override :aria_label
       def aria_label
         context.group.subgroup? ? _('Subgroup navigation') : _('Group navigation')
       end
-
-      private
-
-      def add_invite_members_menu
-        experiment(:invite_members_in_side_nav, group: context.group) do |e|
-          e.control {}
-          e.candidate { add_menu(Sidebars::Groups::Menus::InviteTeamMembersMenu.new(context)) }
-        end
-      end
     end
   end
 end
diff --git a/lib/sidebars/panel.rb b/lib/sidebars/panel.rb
index aa8ff177caa..4c0d4caf81e 100644
--- a/lib/sidebars/panel.rb
+++ b/lib/sidebars/panel.rb
@@ -4,7 +4,6 @@ module Sidebars
   class Panel
     extend ::Gitlab::Utils::Override
     include ::Sidebars::Concerns::PositionableList
-    include Gitlab::Experiment::Dsl
 
     attr_reader :context, :scope_menu, :hidden_menu
 
diff --git a/lib/sidebars/projects/menus/invite_team_members_menu.rb b/lib/sidebars/projects/menus/invite_team_members_menu.rb
deleted file mode 100644
index 0db49f1e12a..00000000000
--- a/lib/sidebars/projects/menus/invite_team_members_menu.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Sidebars
-  module Projects
-    module Menus
-      class InviteTeamMembersMenu < ::Sidebars::Menu
-        override :title
-        def title
-          s_('InviteMember|Invite members')
-        end
-
-        override :render?
-        def render?
-          can?(context.current_user, :admin_project_member, context.project) && all_valid_members.size <= 1
-        end
-
-        override :menu_partial
-        def menu_partial
-          'projects/invite_members_side_nav_link'
-        end
-
-        override :menu_partial_options
-        def menu_partial_options
-          {
-            project: context.project,
-            title: title,
-            sidebar_menu: self
-          }
-        end
-
-        override :extra_nav_link_html_options
-        def extra_nav_link_html_options
-          {
-            'data-test-id': 'side-nav-invite-members'
-          }
-        end
-
-        private
-
-        def all_valid_members
-          MembersFinder.new(context.project, context.current_user)
-                       .execute(include_relations: [:inherited, :direct, :invited_groups])
-        end
-      end
-    end
-  end
-end
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index 9d0f5eb87bd..5d8bc18ac88 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -34,14 +34,6 @@ module Sidebars
         add_wiki_menus
         add_menu(Sidebars::Projects::Menus::SnippetsMenu.new(context))
         add_menu(Sidebars::Projects::Menus::SettingsMenu.new(context))
-        add_invite_members_menu
-      end
-
-      def add_invite_members_menu
-        experiment(:invite_members_in_side_nav, group: context.project.group) do |e|
-          e.control {}
-          e.candidate { add_menu(Sidebars::Projects::Menus::InviteTeamMembersMenu.new(context)) }
-        end
       end
 
       def add_wiki_menus
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f0a6e955812..3c5bd88a702 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -17183,9 +17183,6 @@ msgstr ""
 msgid "Explore GitLab"
 msgstr ""
 
-msgid "Explore Groups"
-msgstr ""
-
 msgid "Explore groups"
 msgstr ""
 
@@ -17195,15 +17192,15 @@ msgstr ""
 msgid "Explore projects"
 msgstr ""
 
-msgid "Explore public groups"
-msgstr ""
-
 msgid "Explore public projects"
 msgstr ""
 
 msgid "Explore snippets"
 msgstr ""
 
+msgid "Explore topics"
+msgstr ""
+
 msgid "Export"
 msgstr ""
 
@@ -28003,7 +28000,7 @@ msgstr ""
 msgid "Most relevant"
 msgstr ""
 
-msgid "Most stars"
+msgid "Most starred"
 msgstr ""
 
 msgid "Move"
@@ -28302,6 +28299,9 @@ msgstr ""
 msgid "Navigation|Context navigation"
 msgstr ""
 
+msgid "Navigation|Explore"
+msgstr ""
+
 msgid "Navigation|FREQUENT GROUPS"
 msgstr ""
 
@@ -33714,15 +33714,9 @@ msgstr ""
 msgid "ProjectLastActivity|Never"
 msgstr ""
 
-msgid "ProjectList|Explore"
-msgstr ""
-
 msgid "ProjectList|Starred"
 msgstr ""
 
-msgid "ProjectList|Topics"
-msgstr ""
-
 msgid "ProjectList|Yours"
 msgstr ""
 
@@ -50374,9 +50368,6 @@ msgid_plural "Your free group is now limited to %d members"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Your groups"
-msgstr ""
-
 msgid "Your instance has %{remaining_user_count} users remaining of the %{total_user_count} included in your subscription. You can add more users than the number included in your license, and we will include the overage in your next bill."
 msgstr ""
 
@@ -50479,9 +50470,6 @@ msgstr ""
 msgid "Your sign-in page is %{url}."
 msgstr ""
 
-msgid "Your snippets"
-msgstr ""
-
 msgid "Your subscription expired!"
 msgstr ""
 
diff --git a/package.json b/package.json
index 2e7d0235483..e9be18ad4c5 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/fonts": "^1.2.0",
     "@gitlab/svgs": "3.24.0",
-    "@gitlab/ui": "56.3.0",
+    "@gitlab/ui": "56.4.0",
     "@gitlab/visual-review-tools": "1.7.3",
     "@gitlab/web-ide": "0.0.1-dev-20230223005157",
     "@mattiasbuelens/web-streams-adapter": "^0.1.0",
diff --git a/qa/qa/page/component/groups_filter.rb b/qa/qa/page/component/groups_filter.rb
index ea91ced8679..14e49e53b75 100644
--- a/qa/qa/page/component/groups_filter.rb
+++ b/qa/qa/page/component/groups_filter.rb
@@ -16,10 +16,6 @@ module QA
           base.view 'app/assets/javascripts/groups/components/groups.vue' do
             element :groups_list_tree_container
           end
-
-          base.view 'app/views/dashboard/_groups_head.html.haml' do
-            element :public_groups_tab
-          end
         end
 
         private
@@ -29,14 +25,8 @@ module QA
         # @return [Boolean] whether a group with given name exists
         def has_filtered_group?(name)
           filter_group(name)
-          return true if page.has_link?(name, wait: 0) # element containing link to group
 
-          return false unless has_element?(:public_groups_tab, wait: 0)
-
-          # Check public groups
-          click_element(:public_groups_tab)
-          filter_group(name)
-          page.has_link?(name, wait: 0)
+          page.has_link?(name, wait: 0) # element containing link to group
         end
 
         # Filter by group name
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index bc99aa14b0d..f86849061e8 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -53,7 +53,6 @@ module QA
           element :admin_area_link
           element :projects_dropdown
           element :groups_dropdown
-          element :snippets_link
           element :menu_item_link
         end
 
@@ -99,6 +98,10 @@ module QA
           end
         end
 
+        def go_to_snippets
+          click_element(:sidebar_menu_link, menu_item: 'Snippets')
+        end
+
         def go_to_create_project
           click_element(:new_menu_toggle)
           click_element(:global_new_project_link)
diff --git a/qa/qa/resource/snippet.rb b/qa/qa/resource/snippet.rb
index a79e8c7de6b..84711075442 100644
--- a/qa/qa/resource/snippet.rb
+++ b/qa/qa/resource/snippet.rb
@@ -22,9 +22,7 @@ module QA
       end
 
       def fabricate!
-        Page::Main::Menu.perform do |menu|
-          menu.go_to_menu_dropdown_option(:snippets_link)
-        end
+        Page::Main::Menu.perform(&:go_to_snippets)
 
         Page::Dashboard::Snippet::Index.perform(&:go_to_new_snippet_page)
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/snippet_index_page_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/snippet_index_page_spec.rb
index 63e9fdbb881..a63c5cefff4 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/snippet_index_page_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/snippet_index_page_spec.rb
@@ -52,9 +52,7 @@ module QA
       shared_examples 'displaying details on index page' do |snippet_type, testcase|
         it "shows correct details of #{snippet_type} including file number", testcase: testcase do
           send(snippet_type)
-          Page::Main::Menu.perform do |menu|
-            menu.go_to_menu_dropdown_option(:snippets_link)
-          end
+          Page::Main::Menu.perform(&:go_to_snippets)
 
           Page::Dashboard::Snippet::Index.perform do |snippet|
             aggregate_failures 'file content verification' do
diff --git a/spec/features/contextual_sidebar_spec.rb b/spec/features/contextual_sidebar_spec.rb
index 2b671d4b3f1..132c8eb7192 100644
--- a/spec/features/contextual_sidebar_spec.rb
+++ b/spec/features/contextual_sidebar_spec.rb
@@ -39,74 +39,5 @@ RSpec.describe 'Contextual sidebar', :js, feature_category: :remote_development
         expect(page).to have_selector('.is-showing-fly-out')
       end
     end
-
-    context 'with invite_members_in_side_nav experiment', :experiment do
-      it 'allows opening of modal for the candidate experience' do
-        stub_experiments(invite_members_in_side_nav: :candidate)
-        expect(experiment(:invite_members_in_side_nav)).to track(:assignment)
-                                                             .with_context(group: project.group)
-                                                             .on_next_instance
-
-        visit project_path(project)
-
-        page.within '[data-test-id="side-nav-invite-members"' do
-          find('[data-test-id="invite-members-button"').click
-        end
-
-        expect(page).to have_content("You're inviting members to the")
-      end
-
-      it 'does not have invite members link in side nav for the control experience' do
-        stub_experiments(invite_members_in_side_nav: :control)
-        expect(experiment(:invite_members_in_side_nav)).to track(:assignment)
-                                                             .with_context(group: project.group)
-                                                             .on_next_instance
-
-        visit project_path(project)
-
-        expect(page).not_to have_css('[data-test-id="side-nav-invite-members"')
-      end
-    end
-  end
-
-  context 'when context is a group' do
-    let_it_be(:user) { create(:user) }
-    let_it_be(:group) do
-      create(:group).tap do |g|
-        g.add_owner(user)
-      end
-    end
-
-    before do
-      sign_in(user)
-    end
-
-    context 'with invite_members_in_side_nav experiment', :experiment do
-      it 'allows opening of modal for the candidate experience' do
-        stub_experiments(invite_members_in_side_nav: :candidate)
-        expect(experiment(:invite_members_in_side_nav)).to track(:assignment)
-                                                             .with_context(group: group)
-                                                             .on_next_instance
-
-        visit group_path(group)
-
-        page.within '[data-test-id="side-nav-invite-members"' do
-          find('[data-test-id="invite-members-button"').click
-        end
-
-        expect(page).to have_content("You're inviting members to the")
-      end
-
-      it 'does not have invite members link in side nav for the control experience' do
-        stub_experiments(invite_members_in_side_nav: :control)
-        expect(experiment(:invite_members_in_side_nav)).to track(:assignment)
-                                                             .with_context(group: group)
-                                                             .on_next_instance
-
-        visit group_path(group)
-
-        expect(page).not_to have_css('[data-test-id="side-nav-invite-members"')
-      end
-    end
   end
 end
diff --git a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
index f5b02a87758..a5d6ba58ffa 100644
--- a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
+++ b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
@@ -21,9 +21,8 @@ RSpec.describe 'The group dashboard', :js, feature_category: :subgroups do
       within_top_nav do
         expect(page).to have_button('Projects')
         expect(page).to have_button('Groups')
-        expect(page).to have_link('Activity')
-        expect(page).to have_link('Milestones')
-        expect(page).to have_link('Snippets')
+        expect(page).to have_link('Your work')
+        expect(page).to have_link('Explore')
       end
     end
 
@@ -36,9 +35,8 @@ RSpec.describe 'The group dashboard', :js, feature_category: :subgroups do
       within_top_nav do
         expect(page).to have_button('Projects')
         expect(page).to have_button('Groups')
-        expect(page).not_to have_link('Activity')
-        expect(page).not_to have_link('Milestones')
-        expect(page).to have_link('Snippets')
+        expect(page).to have_link('Your work')
+        expect(page).to have_link('Explore')
       end
     end
   end
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index a45e0a58ed6..1fb393e1769 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -230,4 +230,11 @@ RSpec.describe 'Dashboard Groups page', :js, feature_category: :subgroups do
       expect(page).not_to have_content(another_group.name)
     end
   end
+
+  it 'links to the "Explore groups" page' do
+    sign_in(user)
+    visit dashboard_groups_path
+
+    expect(page).to have_link("Explore groups", href: explore_groups_path)
+  end
 end
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index 099a7b14cd8..eafc41c0f40 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -20,6 +20,12 @@ RSpec.describe 'Dashboard Projects', feature_category: :projects do
 
   it_behaves_like "a dashboard page with sidebar", :dashboard_projects_path, :projects
 
+  it 'links to the "Explore projects" page' do
+    visit dashboard_projects_path
+
+    expect(page).to have_link("Explore projects", href: explore_projects_path)
+  end
+
   context 'when user has access to the project' do
     it 'shows role badge' do
       visit dashboard_projects_path
diff --git a/spec/features/dashboard/snippets_spec.rb b/spec/features/dashboard/snippets_spec.rb
index ba40290d866..f4234b433f8 100644
--- a/spec/features/dashboard/snippets_spec.rb
+++ b/spec/features/dashboard/snippets_spec.rb
@@ -7,6 +7,13 @@ RSpec.describe 'Dashboard snippets', feature_category: :source_code_management d
 
   it_behaves_like 'a dashboard page with sidebar', :dashboard_snippets_path, :snippets
 
+  it 'links to the "Explore snippets" page' do
+    sign_in(user)
+    visit dashboard_snippets_path
+
+    expect(page).to have_link("Explore snippets", href: explore_snippets_path)
+  end
+
   context 'when the project has snippets' do
     let(:project) { create(:project, :public, creator: user) }
     let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.first_owner, project: project) }
diff --git a/spec/features/explore/navbar_spec.rb b/spec/features/explore/navbar_spec.rb
new file mode 100644
index 00000000000..8f281abe6a7
--- /dev/null
+++ b/spec/features/explore/navbar_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe '"Explore" navbar', feature_category: :navigation do
+  include_context '"Explore" navbar structure'
+
+  it_behaves_like 'verified navigation bar' do
+    before do
+      visit explore_projects_path
+    end
+  end
+end
diff --git a/spec/features/nav/top_nav_responsive_spec.rb b/spec/features/nav/top_nav_responsive_spec.rb
index f1862a3b9b2..9ac63c26ba0 100644
--- a/spec/features/nav/top_nav_responsive_spec.rb
+++ b/spec/features/nav/top_nav_responsive_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'top nav responsive', :js, feature_category: :navigation do
 
     context 'when menu is closed' do
       it 'has page content and hides responsive menu', :aggregate_failures do
-        expect(page).to have_css('.page-title', text: 'Projects')
+        expect(page).to have_css('.page-title', text: 'Explore projects')
         expect(page).to have_link('Dashboard', id: 'logo')
 
         expect(page).to have_no_css('.top-nav-responsive')
@@ -34,14 +34,15 @@ RSpec.describe 'top nav responsive', :js, feature_category: :navigation do
       end
 
       it 'hides everything and shows responsive menu', :aggregate_failures do
-        expect(page).to have_no_css('.page-title', text: 'Projects')
+        expect(page).to have_no_css('.page-title', text: 'Explore projects')
         expect(page).to have_no_link('Dashboard', id: 'logo')
 
         within '.top-nav-responsive' do
           expect(page).to have_link(nil, href: search_path)
           expect(page).to have_button('Projects')
           expect(page).to have_button('Groups')
-          expect(page).to have_link('Snippets', href: dashboard_snippets_path)
+          expect(page).to have_link('Your work', href: dashboard_projects_path)
+          expect(page).to have_link('Explore', href: explore_projects_path)
         end
       end
 
diff --git a/spec/features/snippets/show_spec.rb b/spec/features/snippets/show_spec.rb
index dc2fcdd7305..d6ff8c066c4 100644
--- a/spec/features/snippets/show_spec.rb
+++ b/spec/features/snippets/show_spec.rb
@@ -28,11 +28,10 @@ RSpec.describe 'Snippet', :js, feature_category: :source_code_management do
   it_behaves_like 'a dashboard page with sidebar', :dashboard_snippets_path, :snippets
 
   context 'when unauthenticated' do
-    it 'does not have the sidebar' do
+    it 'shows the "Explore" sidebar' do
       visit snippet_path(snippet)
 
-      expect(page).to have_title _('Snippets')
-      expect(page).not_to have_css('aside.nav-sidebar')
+      expect(page).to have_css('aside.nav-sidebar[aria-label="Explore"]')
     end
   end
 
diff --git a/spec/finders/abuse_reports_finder_spec.rb b/spec/finders/abuse_reports_finder_spec.rb
index 5b92dcd9069..d3b148375d4 100644
--- a/spec/finders/abuse_reports_finder_spec.rb
+++ b/spec/finders/abuse_reports_finder_spec.rb
@@ -5,8 +5,11 @@ require 'spec_helper'
 RSpec.describe AbuseReportsFinder, '#execute' do
   let_it_be(:user1) { create(:user) }
   let_it_be(:user2) { create(:user) }
+  let_it_be(:reporter) { create(:user) }
   let_it_be(:abuse_report_1) { create(:abuse_report, id: 20, category: 'spam', user: user1) }
-  let_it_be(:abuse_report_2) { create(:abuse_report, :closed, id: 30, category: 'phishing', user: user2) }
+  let_it_be(:abuse_report_2) do
+    create(:abuse_report, :closed, id: 30, category: 'phishing', user: user2, reporter: reporter)
+  end
 
   let(:params) { {} }
 
@@ -26,17 +29,15 @@ RSpec.describe AbuseReportsFinder, '#execute' do
     end
   end
 
-  context 'when params[:user] is present' do
-    let(:params) { { user: abuse_report_1.user.username } }
-
-    it 'returns abuse reports for the specified user' do
-      expect(subject).to match_array([abuse_report_1])
+  shared_examples 'returns filtered reports' do |filter_field|
+    it "returns abuse reports filtered by #{filter_field}_id" do
+      expect(subject).to match_array(filtered_reports)
     end
 
-    context 'when no user has username = params[:user]' do
+    context "when no user has username = params[:#{filter_field}]" do
       before do
         allow(User).to receive_message_chain(:by_username, :pick)
-          .with(params[:user])
+          .with(params[filter_field])
           .with(:id)
           .and_return(nil)
       end
@@ -47,6 +48,20 @@ RSpec.describe AbuseReportsFinder, '#execute' do
     end
   end
 
+  context 'when params[:user] is present' do
+    it_behaves_like 'returns filtered reports', :user do
+      let(:params) { { user: user1.username } }
+      let(:filtered_reports) { [abuse_report_1] }
+    end
+  end
+
+  context 'when params[:reporter] is present' do
+    it_behaves_like 'returns filtered reports', :reporter do
+      let(:params) { { reporter: reporter.username } }
+      let(:filtered_reports) { [abuse_report_2] }
+    end
+  end
+
   context 'when params[:status] is present' do
     context 'when value is "open"' do
       let(:params) { { status: 'open' } }
diff --git a/spec/frontend/boards/components/board_form_spec.js b/spec/frontend/boards/components/board_form_spec.js
index 7f881a92964..62db59f8f57 100644
--- a/spec/frontend/boards/components/board_form_spec.js
+++ b/spec/frontend/boards/components/board_form_spec.js
@@ -136,7 +136,7 @@ describe('BoardForm', () => {
 
       it('passes correct primary action text and variant', () => {
         expect(findModalActionPrimary().text).toBe('Create board');
-        expect(findModalActionPrimary().attributes[0].variant).toBe('confirm');
+        expect(findModalActionPrimary().attributes.variant).toBe('confirm');
       });
 
       it('does not render delete confirmation message', () => {
@@ -248,7 +248,7 @@ describe('BoardForm', () => {
 
       it('passes correct primary action text and variant', () => {
         expect(findModalActionPrimary().text).toBe('Save changes');
-        expect(findModalActionPrimary().attributes[0].variant).toBe('confirm');
+        expect(findModalActionPrimary().attributes.variant).toBe('confirm');
       });
 
       it('does not render delete confirmation message', () => {
@@ -369,7 +369,7 @@ describe('BoardForm', () => {
     it('passes correct primary action text and variant', () => {
       createComponent({ canAdminBoard: true, currentPage: formType.delete });
       expect(findModalActionPrimary().text).toBe('Delete');
-      expect(findModalActionPrimary().attributes[0].variant).toBe('danger');
+      expect(findModalActionPrimary().attributes.variant).toBe('danger');
     });
 
     it('renders delete confirmation message', () => {
diff --git a/spec/frontend/ci/pipeline_schedules/components/take_ownership_modal_legacy_spec.js b/spec/frontend/ci/pipeline_schedules/components/take_ownership_modal_legacy_spec.js
index 7e6d4ec4bf8..e4ff9a0545b 100644
--- a/spec/frontend/ci/pipeline_schedules/components/take_ownership_modal_legacy_spec.js
+++ b/spec/frontend/ci/pipeline_schedules/components/take_ownership_modal_legacy_spec.js
@@ -25,14 +25,12 @@ describe('Take ownership modal', () => {
     const actionPrimary = findModal().props('actionPrimary');
 
     expect(actionPrimary.attributes).toEqual(
-      expect.objectContaining([
-        {
-          category: 'primary',
-          variant: 'confirm',
-          href: url,
-          'data-method': 'post',
-        },
-      ]),
+      expect.objectContaining({
+        category: 'primary',
+        variant: 'confirm',
+        href: url,
+        'data-method': 'post',
+      }),
     );
   });
 
diff --git a/spec/frontend/clusters/agents/components/revoke_token_button_spec.js b/spec/frontend/clusters/agents/components/revoke_token_button_spec.js
index 9199c76585f..ed7c940bb04 100644
--- a/spec/frontend/clusters/agents/components/revoke_token_button_spec.js
+++ b/spec/frontend/clusters/agents/components/revoke_token_button_spec.js
@@ -45,7 +45,7 @@ describe('RevokeTokenButton', () => {
   const findInput = () => wrapper.findComponent(GlFormInput);
   const findTooltip = () => wrapper.findComponent(GlTooltip);
   const findPrimaryAction = () => findModal().props('actionPrimary');
-  const findPrimaryActionAttributes = (attr) => findPrimaryAction().attributes[0][attr];
+  const findPrimaryActionAttributes = (attr) => findPrimaryAction().attributes[attr];
 
   const createMockApolloProvider = ({ mutationResponse }) => {
     revokeSpy = jest.fn().mockResolvedValue(mutationResponse);
diff --git a/spec/frontend/clusters_list/components/delete_agent_button_spec.js b/spec/frontend/clusters_list/components/delete_agent_button_spec.js
index a0642996a20..53cf67bca0f 100644
--- a/spec/frontend/clusters_list/components/delete_agent_button_spec.js
+++ b/spec/frontend/clusters_list/components/delete_agent_button_spec.js
@@ -33,7 +33,7 @@ describe('DeleteAgentButton', () => {
   const findDeleteBtn = () => wrapper.findComponent(GlButton);
   const findInput = () => wrapper.findComponent(GlFormInput);
   const findPrimaryAction = () => findModal().props('actionPrimary');
-  const findPrimaryActionAttributes = (attr) => findPrimaryAction().attributes[0][attr];
+  const findPrimaryActionAttributes = (attr) => findPrimaryAction().attributes[attr];
   const findDeleteAgentButtonTooltip = () => wrapper.findByTestId('delete-agent-button-tooltip');
   const getTooltipText = (el) => {
     const binding = getBinding(el, 'gl-tooltip');
diff --git a/spec/frontend/environments/canary_update_modal_spec.js b/spec/frontend/environments/canary_update_modal_spec.js
index 7eb2a54a080..a101ed4e00a 100644
--- a/spec/frontend/environments/canary_update_modal_spec.js
+++ b/spec/frontend/environments/canary_update_modal_spec.js
@@ -45,7 +45,7 @@ describe('/environments/components/canary_update_modal.vue', () => {
       modalId: 'confirm-canary-change',
       actionPrimary: {
         text: 'Change ratio',
-        attributes: [{ variant: 'confirm' }],
+        attributes: { variant: 'confirm' },
       },
       actionCancel: { text: 'Cancel' },
     });
diff --git a/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js b/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js
index 4851e03f713..b06e0340991 100644
--- a/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js
+++ b/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js
@@ -50,7 +50,7 @@ describe('Configure Feature Flags Modal', () => {
     });
 
     it('should default disable the primary action', () => {
-      const [{ disabled }] = findSecondaryAction().attributes;
+      const { disabled } = findSecondaryAction().attributes;
       expect(disabled).toBe(true);
     });
 
@@ -116,7 +116,7 @@ describe('Configure Feature Flags Modal', () => {
     it('should enable the secondary action', async () => {
       findProjectNameInput().vm.$emit('input', provide.projectName);
       await nextTick();
-      const [{ disabled }] = findSecondaryAction().attributes;
+      const { disabled } = findSecondaryAction().attributes;
       expect(disabled).toBe(false);
     });
   });
diff --git a/spec/frontend/ide/components/new_dropdown/modal_spec.js b/spec/frontend/ide/components/new_dropdown/modal_spec.js
index a0c454dde82..36c3d323e63 100644
--- a/spec/frontend/ide/components/new_dropdown/modal_spec.js
+++ b/spec/frontend/ide/components/new_dropdown/modal_spec.js
@@ -93,11 +93,11 @@ describe('new file modal component', () => {
     it('renders modal', () => {
       expect(findGlModal().props()).toMatchObject({
         actionCancel: {
-          attributes: [{ variant: 'default' }],
+          attributes: { variant: 'default' },
           text: 'Cancel',
         },
         actionPrimary: {
-          attributes: [{ variant: 'confirm' }],
+          attributes: { variant: 'confirm' },
           text: 'Create file',
         },
         actionSecondary: null,
@@ -169,7 +169,7 @@ describe('new file modal component', () => {
         expect(findGlModal().props()).toMatchObject({
           title: modalTitle,
           actionPrimary: {
-            attributes: [{ variant: 'confirm' }],
+            attributes: { variant: 'confirm' },
             text: btnTitle,
           },
         });
@@ -297,7 +297,7 @@ describe('new file modal component', () => {
       expect(findGlModal().props()).toMatchObject({
         title,
         actionPrimary: {
-          attributes: [{ variant: 'confirm' }],
+          attributes: { variant: 'confirm' },
           text: title,
         },
       });
diff --git a/spec/frontend/invite_members/components/invite_members_trigger_spec.js b/spec/frontend/invite_members/components/invite_members_trigger_spec.js
index 699a0ad5809..cdb6182e2ae 100644
--- a/spec/frontend/invite_members/components/invite_members_trigger_spec.js
+++ b/spec/frontend/invite_members/components/invite_members_trigger_spec.js
@@ -1,10 +1,9 @@
-import { GlButton, GlLink, GlIcon, GlDropdownItem } from '@gitlab/ui';
+import { GlButton, GlLink, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue';
 import eventHub from '~/invite_members/event_hub';
 import {
   TRIGGER_ELEMENT_BUTTON,
-  TRIGGER_ELEMENT_SIDE_NAV,
   TRIGGER_DEFAULT_QA_SELECTOR,
   TRIGGER_ELEMENT_WITH_EMOJI,
   TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI,
@@ -22,7 +21,6 @@ let findButton;
 const triggerComponent = {
   button: GlButton,
   anchor: GlLink,
-  'side-nav': GlLink,
   'text-emoji': GlLink,
   'dropdown-text-emoji': GlDropdownItem,
 };
@@ -47,10 +45,6 @@ const triggerItems = [
   {
     triggerElement: 'anchor',
   },
-  {
-    triggerElement: TRIGGER_ELEMENT_SIDE_NAV,
-    icon: 'plus',
-  },
   {
     triggerElement: TRIGGER_ELEMENT_WITH_EMOJI,
     icon: 'shaking_hands',
@@ -101,17 +95,6 @@ describe.each(triggerItems)('with triggerElement as %s', (triggerItem) => {
   });
 });
 
-describe('side-nav with icon', () => {
-  it('includes the specified icon with correct size when triggerElement is link', () => {
-    const findIcon = () => wrapper.findComponent(GlIcon);
-
-    createComponent({ triggerElement: TRIGGER_ELEMENT_SIDE_NAV, icon: 'plus' });
-
-    expect(findIcon().exists()).toBe(true);
-    expect(findIcon().props('name')).toBe('plus');
-  });
-});
-
 describe('link with emoji', () => {
   it('includes the specified icon with correct size when triggerElement is link', () => {
     const findEmoji = () => wrapper.findComponent(GlEmoji);
diff --git a/spec/frontend/jobs/components/job/job_retry_forward_deployment_modal_spec.js b/spec/frontend/jobs/components/job/job_retry_forward_deployment_modal_spec.js
index d60043f33f7..712269a1e83 100644
--- a/spec/frontend/jobs/components/job/job_retry_forward_deployment_modal_spec.js
+++ b/spec/frontend/jobs/components/job/job_retry_forward_deployment_modal_spec.js
@@ -64,13 +64,11 @@ describe('Job Retry Forward Deployment Modal', () => {
     beforeEach(createWrapper);
 
     it('should correctly configure the primary action', () => {
-      expect(findModal().props('actionPrimary').attributes).toMatchObject([
-        {
-          'data-method': 'post',
-          href: job.retry_path,
-          variant: 'danger',
-        },
-      ]);
+      expect(findModal().props('actionPrimary').attributes).toMatchObject({
+        'data-method': 'post',
+        href: job.retry_path,
+        variant: 'danger',
+      });
     });
   });
 });
diff --git a/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/delete_modal_spec.js b/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/delete_modal_spec.js
index 992e2eb6f3e..860f9b3a0c1 100644
--- a/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/delete_modal_spec.js
+++ b/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/delete_modal_spec.js
@@ -30,7 +30,7 @@ describe('Delete Modal', () => {
   const expectPrimaryActionStatus = (disabled = true) =>
     expect(findModal().props('actionPrimary')).toMatchObject(
       expect.objectContaining({
-        attributes: [{ variant: 'danger' }, { disabled }],
+        attributes: { variant: 'danger', disabled },
       }),
     );
 
diff --git a/spec/frontend/packages_and_registries/package_registry/components/delete_modal_spec.js b/spec/frontend/packages_and_registries/package_registry/components/delete_modal_spec.js
index 9c1ebf5a2eb..d0817a8678e 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/delete_modal_spec.js
+++ b/spec/frontend/packages_and_registries/package_registry/components/delete_modal_spec.js
@@ -45,7 +45,7 @@ describe('DeleteModal', () => {
   it('passes actionPrimary prop', () => {
     expect(findModal().props('actionPrimary')).toStrictEqual({
       text: 'Permanently delete',
-      attributes: [{ variant: 'danger' }, { category: 'primary' }],
+      attributes: { variant: 'danger', category: 'primary' },
     });
   });
 
diff --git a/spec/frontend/pages/profiles/password_prompt/password_prompt_modal_spec.js b/spec/frontend/pages/profiles/password_prompt/password_prompt_modal_spec.js
index 439bb342d01..18a0098a715 100644
--- a/spec/frontend/pages/profiles/password_prompt/password_prompt_modal_spec.js
+++ b/spec/frontend/pages/profiles/password_prompt/password_prompt_modal_spec.js
@@ -25,8 +25,7 @@ describe('Password prompt modal', () => {
   const findField = () => wrapper.findByTestId('password-prompt-field');
   const findModal = () => wrapper.findComponent(GlModal);
   const findConfirmBtn = () => findModal().props('actionPrimary');
-  const findConfirmBtnDisabledState = () =>
-    findModal().props('actionPrimary').attributes[2].disabled;
+  const findConfirmBtnDisabledState = () => findModal().props('actionPrimary').attributes.disabled;
 
   const findCancelBtn = () => findModal().props('actionCancel');
 
diff --git a/spec/frontend/repository/components/delete_blob_modal_spec.js b/spec/frontend/repository/components/delete_blob_modal_spec.js
index 5846174296a..9ca45bfb655 100644
--- a/spec/frontend/repository/components/delete_blob_modal_spec.js
+++ b/spec/frontend/repository/components/delete_blob_modal_spec.js
@@ -183,7 +183,7 @@ describe('DeleteBlobModal', () => {
       });
 
       it('disables submit button', async () => {
-        expect(findModal().props('actionPrimary').attributes[0]).toEqual(
+        expect(findModal().props('actionPrimary').attributes).toEqual(
           expect.objectContaining({ disabled: true }),
         );
       });
@@ -203,7 +203,7 @@ describe('DeleteBlobModal', () => {
       });
 
       it('enables submit button', async () => {
-        expect(findModal().props('actionPrimary').attributes[0]).toEqual(
+        expect(findModal().props('actionPrimary').attributes).toEqual(
           expect.objectContaining({ disabled: false }),
         );
       });
diff --git a/spec/frontend/repository/components/new_directory_modal_spec.js b/spec/frontend/repository/components/new_directory_modal_spec.js
index d70021650ed..c920159375f 100644
--- a/spec/frontend/repository/components/new_directory_modal_spec.js
+++ b/spec/frontend/repository/components/new_directory_modal_spec.js
@@ -181,7 +181,7 @@ describe('NewDirectoryModal', () => {
 
       it('disables submit button', async () => {
         await fillForm({ dirName: '', branchName: '', commitMessage: '' });
-        expect(findModal().props('actionPrimary').attributes[0].disabled).toBe(true);
+        expect(findModal().props('actionPrimary').attributes.disabled).toBe(true);
       });
 
       it('creates an alert error', async () => {
diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js
index 76a50c41a66..0f4edb19632 100644
--- a/spec/frontend/repository/components/tree_content_spec.js
+++ b/spec/frontend/repository/components/tree_content_spec.js
@@ -1,6 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
 import { nextTick } from 'vue';
-import paginatedTreeQuery from 'shared_queries/repository/paginated_tree.query.graphql';
 import FilePreview from '~/repository/components/preview/index.vue';
 import FileTable from '~/repository/components/table/index.vue';
 import TreeContent from 'jh_else_ce/repository/components/tree_content.vue';
@@ -33,12 +32,6 @@ function factory(path, appoloMockResponse = mockResponse) {
     mocks: {
       $apollo,
     },
-    provide: {
-      glFeatures: {
-        increasePageSizeExponentially: true,
-        paginatedTreeGraphqlQuery: true,
-      },
-    },
   });
 }
 
@@ -167,37 +160,6 @@ describe('Repository table component', () => {
 
       expect(findFileTable().props('hasMore')).toBe(limitReached);
     });
-
-    it.each`
-      fetchCounter | pageSize
-      ${0}         | ${10}
-      ${2}         | ${30}
-      ${4}         | ${50}
-      ${6}         | ${70}
-      ${8}         | ${90}
-      ${10}        | ${100}
-      ${20}        | ${100}
-      ${100}       | ${100}
-      ${200}       | ${100}
-    `('exponentially increases page size, to a maximum of 100', ({ fetchCounter, pageSize }) => {
-      factory('/');
-      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
-      // eslint-disable-next-line no-restricted-syntax
-      vm.setData({ fetchCounter });
-
-      vm.vm.fetchFiles();
-
-      expect($apollo.query).toHaveBeenCalledWith({
-        query: paginatedTreeQuery,
-        variables: {
-          pageSize,
-          nextPageCursor: '',
-          path: '/',
-          projectPath: '',
-          ref: '',
-        },
-      });
-    });
   });
 
   describe('commit data', () => {
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index 21699f81900..f7c31f91cd7 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -53,9 +53,9 @@ describe('UploadBlobModal', () => {
   const findBranchName = () => wrapper.findComponent(GlFormInput);
   const findMrToggle = () => wrapper.findComponent(GlToggle);
   const findUploadDropzone = () => wrapper.findComponent(UploadDropzone);
-  const actionButtonDisabledState = () => findModal().props('actionPrimary').attributes[0].disabled;
-  const cancelButtonDisabledState = () => findModal().props('actionCancel').attributes[0].disabled;
-  const actionButtonLoadingState = () => findModal().props('actionPrimary').attributes[0].loading;
+  const actionButtonDisabledState = () => findModal().props('actionPrimary').attributes.disabled;
+  const cancelButtonDisabledState = () => findModal().props('actionCancel').attributes.disabled;
+  const actionButtonLoadingState = () => findModal().props('actionPrimary').attributes.loading;
 
   describe.each`
     canPushCode | displayBranchName | displayForkedBranchMessage
diff --git a/spec/frontend/sidebar/components/time_tracking/create_timelog_form_spec.js b/spec/frontend/sidebar/components/time_tracking/create_timelog_form_spec.js
index 715f66d305a..a7c3867c359 100644
--- a/spec/frontend/sidebar/components/time_tracking/create_timelog_form_spec.js
+++ b/spec/frontend/sidebar/components/time_tracking/create_timelog_form_spec.js
@@ -47,8 +47,8 @@ describe('Create Timelog Form', () => {
   const findAlert = () => wrapper.findComponent(GlAlert);
   const findDocsLink = () => wrapper.findByTestId('timetracking-docs-link');
   const findSaveButton = () => findModal().props('actionPrimary');
-  const findSaveButtonLoadingState = () => findSaveButton().attributes[0].loading;
-  const findSaveButtonDisabledState = () => findSaveButton().attributes[0].disabled;
+  const findSaveButtonLoadingState = () => findSaveButton().attributes.loading;
+  const findSaveButtonDisabledState = () => findSaveButton().attributes.disabled;
 
   const submitForm = () => findForm().trigger('submit');
 
diff --git a/spec/frontend/super_sidebar/components/user_bar_spec.js b/spec/frontend/super_sidebar/components/user_bar_spec.js
index a5faad967fc..ae15dd55644 100644
--- a/spec/frontend/super_sidebar/components/user_bar_spec.js
+++ b/spec/frontend/super_sidebar/components/user_bar_spec.js
@@ -13,6 +13,7 @@ describe('UserBar component', () => {
   const findCreateMenu = () => wrapper.findComponent(CreateMenu);
   const findCounter = (at) => wrapper.findAllComponents(Counter).at(at);
   const findMergeRequestMenu = () => wrapper.findComponent(MergeRequestMenu);
+  const findBrandLogo = () => wrapper.findByTestId('brand-header-custom-logo');
 
   const createWrapper = (extraSidebarData = {}) => {
     wrapper = shallowMountExtended(UserBar, {
@@ -55,6 +56,11 @@ describe('UserBar component', () => {
       expect(findCounter(2).props('href')).toBe('/dashboard/todos');
       expect(findCounter(2).props('label')).toBe(__('To-Do list'));
     });
+
+    it('renders branding logo', () => {
+      expect(findBrandLogo().exists()).toBe(true);
+      expect(findBrandLogo().attributes('src')).toBe(sidebarData.logo_url);
+    });
   });
 
   describe('GitLab Next badge', () => {
diff --git a/spec/frontend/super_sidebar/mock_data.js b/spec/frontend/super_sidebar/mock_data.js
index 2cd055e6d07..32f56e5c107 100644
--- a/spec/frontend/super_sidebar/mock_data.js
+++ b/spec/frontend/super_sidebar/mock_data.js
@@ -68,6 +68,7 @@ export const sidebarData = {
   name: 'Administrator',
   username: 'root',
   avatar_url: 'path/to/img_administrator',
+  logo_url: 'path/to/logo',
   assigned_open_issues_count: 1,
   todos_pending_count: 3,
   issues_dashboard_path: 'path/to/issues',
diff --git a/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js b/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js
index b03b6bfb61d..d7f94c00d09 100644
--- a/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js
+++ b/spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js
@@ -24,7 +24,7 @@ describe('Confirm Danger Modal', () => {
   const findAdditionalMessage = () => wrapper.findByTestId('confirm-danger-message');
   const findPrimaryAction = () => findModal().props('actionPrimary');
   const findCancelAction = () => findModal().props('actionCancel');
-  const findPrimaryActionAttributes = (attr) => findPrimaryAction().attributes[0][attr];
+  const findPrimaryActionAttributes = (attr) => findPrimaryAction().attributes[attr];
 
   const createComponent = ({ provide = {} } = {}) =>
     shallowMountExtended(ConfirmDangerModal, {
diff --git a/spec/helpers/explore_helper_spec.rb b/spec/helpers/explore_helper_spec.rb
index 4ae1b738858..68c5289a85f 100644
--- a/spec/helpers/explore_helper_spec.rb
+++ b/spec/helpers/explore_helper_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe ExploreHelper do
 
   describe '#explore_nav_links' do
     it 'has all the expected links by default' do
-      menu_items = [:projects, :groups, :snippets]
+      menu_items = [:projects, :groups, :topics, :snippets]
 
       expect(helper.explore_nav_links).to contain_exactly(*menu_items)
     end
diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
index ce5ac2e5404..2b69557b840 100644
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ b/spec/helpers/nav/top_nav_helper_spec.rb
@@ -56,6 +56,7 @@ RSpec.describe Nav::TopNavHelper do
         expected_primary = [
           { href: '/explore', icon: 'project', id: 'project', title: 'Projects' },
           { href: '/explore/groups', icon: 'group', id: 'groups', title: 'Groups' },
+          { href: '/explore/projects/topics', icon: 'labels', id: 'topics', title: 'Topics' },
           { href: '/explore/snippets', icon: 'snippet', id: 'snippets', title: 'Snippets' }
         ].map do |item|
           ::Gitlab::Nav::TopNavMenuItem.build(**item)
@@ -78,6 +79,12 @@ RSpec.describe Nav::TopNavHelper do
             title: 'Groups',
             css_class: 'dashboard-shortcuts-groups'
           },
+          {
+            href: '/explore/projects/topics',
+            id: 'topics-shortcut',
+            title: 'Topics',
+            css_class: 'dashboard-shortcuts-topics'
+          },
           {
             href: '/explore/snippets',
             id: 'snippets-shortcut',
@@ -320,20 +327,6 @@ RSpec.describe Nav::TopNavHelper do
       context 'with milestones' do
         let(:with_milestones) { true }
 
-        it 'has expected :primary' do
-          expected_header = ::Gitlab::Nav::TopNavMenuHeader.build(
-            title: 'Explore'
-          )
-          expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
-            data: { **menu_data_tracking_attrs('milestones') },
-            href: '/dashboard/milestones',
-            icon: 'clock',
-            id: 'milestones',
-            title: 'Milestones'
-          )
-          expect(subject[:primary]).to eq([expected_header, expected_primary])
-        end
-
         it 'has expected :shortcuts' do
           expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
             id: 'milestones-shortcut',
@@ -348,23 +341,6 @@ RSpec.describe Nav::TopNavHelper do
       context 'with snippets' do
         let(:with_snippets) { true }
 
-        it 'has expected :primary' do
-          expected_header = ::Gitlab::Nav::TopNavMenuHeader.build(
-            title: 'Explore'
-          )
-          expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
-            data: {
-              qa_selector: 'snippets_link',
-              **menu_data_tracking_attrs('snippets')
-            },
-            href: '/dashboard/snippets',
-            icon: 'snippet',
-            id: 'snippets',
-            title: 'Snippets'
-          )
-          expect(subject[:primary]).to eq([expected_header, expected_primary])
-        end
-
         it 'has expected :shortcuts' do
           expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
             id: 'snippets-shortcut',
@@ -379,20 +355,6 @@ RSpec.describe Nav::TopNavHelper do
       context 'with activity' do
         let(:with_activity) { true }
 
-        it 'has expected :primary' do
-          expected_header = ::Gitlab::Nav::TopNavMenuHeader.build(
-            title: 'Explore'
-          )
-          expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
-            data: { **menu_data_tracking_attrs('activity') },
-            href: '/dashboard/activity',
-            icon: 'history',
-            id: 'activity',
-            title: 'Activity'
-          )
-          expect(subject[:primary]).to eq([expected_header, expected_primary])
-        end
-
         it 'has expected :shortcuts' do
           expected_shortcuts = ::Gitlab::Nav::TopNavMenuItem.build(
             id: 'activity-shortcut',
diff --git a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
index 671f1ee1a0a..f457ba06074 100644
--- a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
@@ -275,7 +275,8 @@ RSpec.describe Gitlab::GitalyClient::RepositoryService do
     it 'sends a create_repository message without arguments' do
       expect_any_instance_of(Gitaly::RepositoryService::Stub)
         .to receive(:create_repository)
-        .with(gitaly_request_with_path(storage_name, relative_path).and(gitaly_request_with_params(default_branch: '')), kind_of(Hash))
+        .with(gitaly_request_with_path(storage_name, relative_path)
+        .and(gitaly_request_with_params(default_branch: '')), kind_of(Hash))
         .and_return(double)
 
       client.create_repository
@@ -284,11 +285,23 @@ RSpec.describe Gitlab::GitalyClient::RepositoryService do
     it 'sends a create_repository message with default branch' do
       expect_any_instance_of(Gitaly::RepositoryService::Stub)
         .to receive(:create_repository)
-        .with(gitaly_request_with_path(storage_name, relative_path).and(gitaly_request_with_params(default_branch: 'default-branch-name')), kind_of(Hash))
+        .with(gitaly_request_with_path(storage_name, relative_path)
+        .and(gitaly_request_with_params(default_branch: 'default-branch-name')), kind_of(Hash))
         .and_return(double)
 
       client.create_repository('default-branch-name')
     end
+
+    it 'sends a create_repository message with default branch containing non ascii chars' do
+      expect_any_instance_of(Gitaly::RepositoryService::Stub)
+        .to receive(:create_repository)
+        .with(gitaly_request_with_path(storage_name, relative_path)
+        .and(gitaly_request_with_params(
+          default_branch: Gitlab::EncodingHelper.encode_binary('feature/新機能'))), kind_of(Hash)
+        ).and_return(double)
+
+      client.create_repository('feature/新機能')
+    end
   end
 
   describe '#create_from_snapshot' do
diff --git a/spec/lib/sidebars/groups/menus/invite_team_members_menu_spec.rb b/spec/lib/sidebars/groups/menus/invite_team_members_menu_spec.rb
deleted file mode 100644
index a79e5182f45..00000000000
--- a/spec/lib/sidebars/groups/menus/invite_team_members_menu_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Sidebars::Groups::Menus::InviteTeamMembersMenu do
-  let_it_be(:owner) { create(:user) }
-  let_it_be(:guest) { create(:user) }
-  let_it_be(:group) do
-    build(:group).tap do |g|
-      g.add_owner(owner)
-    end
-  end
-
-  let(:context) { Sidebars::Groups::Context.new(current_user: owner, container: group) }
-
-  subject(:invite_menu) { described_class.new(context) }
-
-  context 'when the group is viewed by an owner of the group' do
-    describe '#render?' do
-      it 'renders the Invite team members link' do
-        expect(invite_menu.render?).to eq(true)
-      end
-
-      context 'when the group already has at least 2 members' do
-        before do
-          group.add_guest(guest)
-        end
-
-        it 'does not render the link' do
-          expect(invite_menu.render?).to eq(false)
-        end
-      end
-    end
-
-    describe '#title' do
-      it 'displays the correct Invite team members text for the link in the side nav' do
-        expect(invite_menu.title).to eq('Invite members')
-      end
-    end
-  end
-
-  context 'when the group is viewed by a guest user without admin permissions' do
-    let(:context) { Sidebars::Groups::Context.new(current_user: guest, container: group) }
-
-    before do
-      group.add_guest(guest)
-    end
-
-    describe '#render?' do
-      it 'does not render the link' do
-        expect(subject.render?).to eq(false)
-      end
-    end
-  end
-end
diff --git a/spec/lib/sidebars/projects/menus/invite_team_members_menu_spec.rb b/spec/lib/sidebars/projects/menus/invite_team_members_menu_spec.rb
deleted file mode 100644
index 9838aa8c3e3..00000000000
--- a/spec/lib/sidebars/projects/menus/invite_team_members_menu_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Sidebars::Projects::Menus::InviteTeamMembersMenu do
-  let_it_be(:project) { create(:project) }
-  let_it_be(:guest) { create(:user) }
-
-  let(:context) { Sidebars::Projects::Context.new(current_user: owner, container: project) }
-
-  subject(:invite_menu) { described_class.new(context) }
-
-  context 'when the project is viewed by an owner of the group' do
-    let(:owner) { project.first_owner }
-
-    describe '#render?' do
-      it 'renders the Invite team members link' do
-        expect(invite_menu.render?).to eq(true)
-      end
-
-      context 'when the project already has at least 2 members' do
-        before do
-          project.add_guest(guest)
-        end
-
-        it 'does not render the link' do
-          expect(invite_menu.render?).to eq(false)
-        end
-      end
-    end
-
-    describe '#title' do
-      it 'displays the correct Invite team members text for the link in the side nav' do
-        expect(invite_menu.title).to eq('Invite members')
-      end
-    end
-  end
-
-  context 'when the project is viewed by a guest user without admin permissions' do
-    let(:context) { Sidebars::Projects::Context.new(current_user: guest, container: project) }
-
-    before do
-      project.add_guest(guest)
-    end
-
-    describe '#render?' do
-      it 'does not render' do
-        expect(invite_menu.render?).to eq(false)
-      end
-    end
-  end
-end
diff --git a/spec/models/abuse_report_spec.rb b/spec/models/abuse_report_spec.rb
index 30639f5a580..9026a870138 100644
--- a/spec/models/abuse_report_spec.rb
+++ b/spec/models/abuse_report_spec.rb
@@ -71,9 +71,18 @@ RSpec.describe AbuseReport, feature_category: :insider_threat do
   end
 
   describe 'scopes' do
-    let_it_be(:report1) { create(:abuse_report) }
+    let_it_be(:reporter) { create(:user) }
+    let_it_be(:report1) { create(:abuse_report, reporter: reporter) }
     let_it_be(:report2) { create(:abuse_report, :closed, category: 'phishing') }
 
+    describe '.by_reporter_id' do
+      subject(:results) { described_class.by_reporter_id(reporter.id) }
+
+      it 'returns reports with reporter_id equal to the given user id' do
+        expect(subject).to match_array([report1])
+      end
+    end
+
     describe '.open' do
       subject(:results) { described_class.open }
 
diff --git a/spec/requests/api/graphql/mutations/work_items/create_spec.rb b/spec/requests/api/graphql/mutations/work_items/create_spec.rb
index 16f78b67b5c..7519389ab49 100644
--- a/spec/requests/api/graphql/mutations/work_items/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/work_items/create_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
       'title' => 'new title',
       'description' => 'new description',
       'confidential' => true,
-      'workItemTypeId' => WorkItems::Type.default_by_type(:task).to_global_id.to_s
+      'workItemTypeId' => WorkItems::Type.default_by_type(:task).to_gid.to_s
     }
   end
 
@@ -43,14 +43,14 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
       expect(created_work_item.work_item_type.base_type).to eq('task')
       expect(mutation_response['workItem']).to include(
         input.except('workItemTypeId').merge(
-          'id' => created_work_item.to_global_id.to_s,
+          'id' => created_work_item.to_gid.to_s,
           'workItemType' => hash_including('name' => 'Task')
         )
       )
     end
 
     context 'when input is invalid' do
-      let(:input) { { 'title' => '', 'workItemTypeId' => WorkItems::Type.default_by_type(:task).to_global_id.to_s } }
+      let(:input) { { 'title' => '', 'workItemTypeId' => WorkItems::Type.default_by_type(:task).to_gid.to_s } }
 
       it 'does not create and returns validation errors' do
         expect do
@@ -98,8 +98,8 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
         let(:input) do
           {
             title: 'item1',
-            workItemTypeId: WorkItems::Type.default_by_type(:task).to_global_id.to_s,
-            hierarchyWidget: { 'parentId' => parent.to_global_id.to_s }
+            workItemTypeId: WorkItems::Type.default_by_type(:task).to_gid.to_s,
+            hierarchyWidget: { 'parentId' => parent.to_gid.to_s }
           }
         end
 
@@ -110,7 +110,7 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
           expect(widgets_response).to include(
             {
               'children' => { 'edges' => [] },
-              'parent' => { 'id' => parent.to_global_id.to_s },
+              'parent' => { 'id' => parent.to_gid.to_s },
               'type' => 'HIERARCHY'
             }
           )
@@ -137,6 +137,40 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
             expect(graphql_errors.first['message']).to include('No object found for `parentId')
           end
         end
+
+        context 'when adjacent is already in place' do
+          let_it_be(:adjacent) { create(:work_item, :task, project: project) }
+
+          let(:work_item) { WorkItem.last }
+
+          let(:input) do
+            {
+              title: 'item1',
+              workItemTypeId: WorkItems::Type.default_by_type(:task).to_gid.to_s,
+              hierarchyWidget: { 'parentId' => parent.to_gid.to_s }
+            }
+          end
+
+          before(:all) do
+            create(:parent_link, work_item_parent: parent, work_item: adjacent, relative_position: 0)
+          end
+
+          it 'creates work item and sets the relative position to be AFTER adjacent' do
+            expect do
+              post_graphql_mutation(mutation, current_user: current_user)
+            end.to change(WorkItem, :count).by(1)
+
+            expect(response).to have_gitlab_http_status(:success)
+            expect(widgets_response).to include(
+              {
+                'children' => { 'edges' => [] },
+                'parent' => { 'id' => parent.to_gid.to_s },
+                'type' => 'HIERARCHY'
+              }
+            )
+            expect(work_item.parent_link.relative_position).to be > adjacent.parent_link.relative_position
+          end
+        end
       end
 
       context 'when unsupported widget input is sent' do
@@ -144,7 +178,7 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
           {
             'title' => 'new title',
             'description' => 'new description',
-            'workItemTypeId' => WorkItems::Type.default_by_type(:test_case).to_global_id.to_s,
+            'workItemTypeId' => WorkItems::Type.default_by_type(:test_case).to_gid.to_s,
             'hierarchyWidget' => {}
           }
         end
@@ -181,8 +215,8 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
         let(:input) do
           {
             title: 'some WI',
-            workItemTypeId: WorkItems::Type.default_by_type(:task).to_global_id.to_s,
-            milestoneWidget: { 'milestoneId' => milestone.to_global_id.to_s }
+            workItemTypeId: WorkItems::Type.default_by_type(:task).to_gid.to_s,
+            milestoneWidget: { 'milestoneId' => milestone.to_gid.to_s }
           }
         end
 
@@ -196,7 +230,7 @@ RSpec.describe 'Create a work item', feature_category: :team_planning do
             expect(widgets_response).to include(
               {
                 'type' => 'MILESTONE',
-                'milestone' => { 'id' => milestone.to_global_id.to_s }
+                'milestone' => { 'id' => milestone.to_gid.to_s }
               }
             )
           end
diff --git a/spec/services/work_items/parent_links/create_service_spec.rb b/spec/services/work_items/parent_links/create_service_spec.rb
index 5884847eac3..a989ecf9c07 100644
--- a/spec/services/work_items/parent_links/create_service_spec.rb
+++ b/spec/services/work_items/parent_links/create_service_spec.rb
@@ -68,6 +68,40 @@ RSpec.describe WorkItems::ParentLinks::CreateService, feature_category: :portfol
       end
     end
 
+    context 'when adjacent is already in place' do
+      using RSpec::Parameterized::TableSyntax
+
+      let_it_be_with_reload(:parent_item) { create(:work_item, :objective, project: project) }
+      let_it_be_with_reload(:current_item) { create(:work_item, :objective, project: project) }
+
+      let_it_be_with_reload(:adjacent) do
+        create(:work_item, :objective, project: project)
+      end
+
+      let_it_be_with_reload(:link_to_adjacent) do
+        create(:parent_link, work_item_parent: parent_item, work_item: adjacent)
+      end
+
+      subject { described_class.new(parent_item, user, { target_issuable: current_item }).execute }
+
+      where(:adjacent_position, :expected_order) do
+        -100 | lazy { [adjacent, current_item] }
+        0    | lazy { [adjacent, current_item] }
+        100  | lazy { [adjacent, current_item] }
+      end
+
+      with_them do
+        before do
+          link_to_adjacent.update!(relative_position: adjacent_position)
+        end
+
+        it 'sets relative positions' do
+          expect { subject }.to change(parent_link_class, :count).by(1)
+          expect(parent_item.work_item_children_by_relative_position).to eq(expected_order)
+        end
+      end
+    end
+
     context 'when there are tasks to relate' do
       let(:params) { { issuable_references: [task1, task2] } }
 
diff --git a/spec/services/work_items/widgets/hierarchy_service/create_service_spec.rb b/spec/services/work_items/widgets/hierarchy_service/create_service_spec.rb
new file mode 100644
index 00000000000..8d834c9a4f8
--- /dev/null
+++ b/spec/services/work_items/widgets/hierarchy_service/create_service_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe WorkItems::Widgets::HierarchyService::CreateService, feature_category: :portfolio_management do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:parent_item) { create(:work_item, project: project) }
+
+  let(:widget) { parent_item.widgets.find { |widget| widget.is_a?(WorkItems::Widgets::Hierarchy) } }
+
+  shared_examples 'raises a WidgetError' do
+    it { expect { subject }.to raise_error(described_class::WidgetError, message) }
+  end
+
+  before(:all) do
+    project.add_developer(user)
+  end
+
+  describe '#create' do
+    subject { described_class.new(widget: widget, current_user: user).after_create_in_transaction(params: params) }
+
+    context 'when invalid params are present' do
+      let(:params) { { other_parent: 'parent_work_item' } }
+
+      it_behaves_like 'raises a WidgetError' do
+        let(:message) { 'One or more arguments are invalid: other_parent.' }
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 8b03d8a2770..866a97b0e3c 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -259,3 +259,30 @@ RSpec.shared_context 'dashboard navbar structure' do
     ]
   end
 end
+
+RSpec.shared_context '"Explore" navbar structure' do
+  let(:structure) do
+    [
+      {
+        nav_item: "Explore",
+        nav_sub_items: []
+      },
+      {
+        nav_item: _("Projects"),
+        nav_sub_items: []
+      },
+      {
+        nav_item: _("Groups"),
+        nav_sub_items: []
+      },
+      {
+        nav_item: _("Topics"),
+        nav_sub_items: []
+      },
+      {
+        nav_item: _("Snippets"),
+        nav_sub_items: []
+      }
+    ]
+  end
+end
diff --git a/yarn.lock b/yarn.lock
index 7af7d9ba185..6f863ef6b3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1237,10 +1237,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.24.0.tgz#bc8265919aa04b06cd08be91637471bad195936d"
   integrity sha512-R4s5qJUFUIbPflknpw1aI/PchiNq65vY7LVsJZnQkY+vi+AgmsETdut/AdferbGWmeWMU0q2wuVu9phE8lDUgA==
 
-"@gitlab/ui@56.3.0":
-  version "56.3.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-56.3.0.tgz#6503564f852db6b414ac6e5f224754be7bcc2edf"
-  integrity sha512-HXechAWiHN9IgDHHrxFjDNhfVDTpivliL780sRGrJbzlPxqbvsk/jPW+PdSdDOhkXoZe9seEfaDRdF5eb+QoQQ==
+"@gitlab/ui@56.4.0":
+  version "56.4.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-56.4.0.tgz#35e2ee19fff9ff803f8737300d957b6a9f6ade1f"
+  integrity sha512-L+0lf5jXrE34RruiibeDOb4wiziSsUhB+d3CHTQIjtm6qdqcwgYT03AoNTgc/E/YVLshEKywTJnnyakreecAlw==
   dependencies:
     "@popperjs/core" "^2.11.2"
     bootstrap-vue "2.23.1"