From bfa1adf9773ba7ea7cde546ea545b72721d36faa Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 30 Mar 2023 12:08:15 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/layout/argument_alignment.yml   |  2 -
 .../layout/first_hash_element_indentation.yml |  1 -
 .rubocop_todo/layout/line_length.yml          |  2 -
 .rubocop_todo/lint/symbol_conversion.yml      |  2 -
 .rubocop_todo/lint/unused_block_argument.yml  |  1 -
 .../naming/heredoc_delimiter_naming.yml       |  1 -
 .rubocop_todo/rspec/context_wording.yml       |  1 -
 .../rspec/missing_feature_category.yml        |  1 -
 .../style/class_and_module_children.yml       |  1 -
 GITALY_SERVER_VERSION                         |  2 +-
 .../components/board_filtered_search.vue      |  8 +-
 .../boards/components/board_form.vue          | 10 +-
 .../boards/components/board_top_bar.vue       |  1 +
 .../issue_board_filtered_search.vue           |  6 ++
 app/assets/javascripts/diffs/i18n.js          |  3 +
 app/assets/javascripts/diffs/store/actions.js | 26 +++++
 .../graphql_shared/issuable_client.js         | 20 ++++
 .../incidents/timeline_events_form.vue        |  2 +-
 .../lib/utils/vue3compat/vue_apollo.js        | 78 +++++++++++++++
 .../pages/projects/blob/show/index.js         |  1 +
 .../branch_rules/components/view/index.vue    |  2 +
 .../components/view/protection_row.vue        |  8 +-
 .../settings/repository/branch_rules/app.vue  | 11 ++-
 .../branch_rules/components/branch_rule.vue   |  8 +-
 .../ref/components/ref_selector.vue           |  8 ++
 app/assets/javascripts/ref/stores/actions.js  |  4 +-
 .../javascripts/ref/stores/mutation_types.js  |  1 +
 .../javascripts/ref/stores/mutations.js       |  3 +
 app/assets/javascripts/ref/stores/state.js    |  1 +
 app/assets/javascripts/repository/index.js    |  1 +
 .../super_sidebar/components/user_menu.vue    |  4 +-
 app/assets/stylesheets/pages/notes.scss       | 12 ++-
 .../projects/incidents_controller.rb          |  1 -
 app/controllers/projects/issues_controller.rb |  1 -
 app/models/namespaces/traversal/linear.rb     |  2 +-
 app/models/packages/debian.rb                 |  2 +
 app/models/packages/debian/file_metadatum.rb  | 94 ++++++++++---------
 app/models/packages/package.rb                |  2 +-
 app/models/packages/package_file.rb           |  7 ++
 .../debian/find_or_create_incoming_service.rb |  2 +-
 .../notify/reassigned_issue_email.text.erb    |  2 +-
 .../projects/branch_rules/_show.html.haml     |  2 +-
 .../projects/merge_requests/_mr_box.html.haml |  2 +-
 .../merge_requests/_mr_title.html.haml        |  2 +-
 app/workers/all_queues.yml                    |  9 ++
 .../cleanup_dangling_package_files_worker.rb  | 32 +++++++
 .../debian/process_package_file_worker.rb     |  3 +-
 .../development/incident_event_tags.yml       |  8 --
 ...ad_max_access_levels_for_labels_finder.yml |  2 +-
 config/initializers/1_settings.rb             |  3 +
 config/webpack.config.js                      |  1 +
 ...kages_debian_file_metadata_when_unknown.rb | 17 ++++
 ...ity_finding_signatures_on_signature_sha.rb | 15 +++
 ...00222_drop_software_licenses_temp_index.rb | 16 ++++
 db/schema_migrations/20230327125705           |  1 +
 db/schema_migrations/20230329100222           |  1 +
 db/schema_migrations/20230329194244           |  1 +
 db/structure.sql                              |  6 +-
 .../blueprints/database_testing/index.md      |  7 +-
 doc/ci/jobs/ci_job_token.md                   |  3 +-
 .../incident_timeline_events.md               |  5 +-
 doc/tutorials/index.md                        |  7 +-
 doc/user/analytics/value_streams_dashboard.md |  2 +-
 doc/user/group/import/index.md                |  7 +-
 doc/user/packages/npm_registry/index.md       | 61 +++++++-----
 doc/user/product_analytics/index.md           |  2 +-
 jest.config.base.js                           |  1 +
 .../super_sidebar_menus/analyze_menu.rb       | 33 +++++++
 .../groups/super_sidebar_menus/build_menu.rb  | 26 +++++
 .../groups/super_sidebar_menus/manage_menu.rb | 30 ++++++
 .../super_sidebar_menus/monitor_menu.rb       | 27 ++++++
 .../super_sidebar_menus/operations_menu.rb    | 12 ++-
 .../groups/super_sidebar_menus/plan_menu.rb   | 14 ++-
 .../groups/super_sidebar_menus/secure_menu.rb | 30 ++++++
 lib/sidebars/groups/super_sidebar_panel.rb    | 11 ++-
 lib/sidebars/projects/menus/monitor_menu.rb   | 10 +-
 .../super_sidebar_menus/monitor_menu.rb       | 12 +++
 locale/gitlab.pot                             |  6 ++
 package.json                                  |  2 +
 qa/qa/page/project/settings/branch_rules.rb   | 33 +++++++
 .../project/settings/branch_rules_details.rb  | 35 +++++++
 qa/qa/page/project/settings/repository.rb     |  8 ++
 .../api/1_manage/group_access_token_spec.rb   |  6 ++
 .../api/1_manage/project_access_token_spec.rb |  6 ++
 .../repository/add_new_branch_rule_spec.rb    | 69 ++++++++++++++
 .../packages/debian/file_metadatum.rb         | 61 ++++++------
 spec/factories/packages/package_files.rb      |  1 +
 .../incident_timeline_events_spec.rb          |  4 +-
 spec/features/users/login_spec.rb             | 47 +++++-----
 spec/frontend/diffs/store/actions_spec.js     | 82 ++++++++++++++++
 .../create_timeline_events_form_spec.js       |  1 -
 .../incidents/timeline_events_form_spec.js    | 12 +--
 .../ref/components/ref_selector_spec.js       | 22 +++++
 spec/frontend/ref/stores/actions_spec.js      |  7 ++
 spec/frontend/ref/stores/mutations_spec.js    | 10 ++
 .../super_sidebar_menus/analyze_menu_spec.rb  | 28 ++++++
 .../super_sidebar_menus/build_menu_spec.rb    | 21 +++++
 .../super_sidebar_menus/manage_menu_spec.rb   | 25 +++++
 .../super_sidebar_menus/monitor_menu_spec.rb  | 22 +++++
 .../operations_menu_spec.rb                   | 24 +++++
 .../super_sidebar_menus/plan_menu_spec.rb     | 26 +++++
 .../super_sidebar_menus/secure_menu_spec.rb   | 25 +++++
 .../groups/super_sidebar_panel_spec.rb        |  7 +-
 .../super_sidebar_menus/monitor_menu_spec.rb  | 14 +++
 .../projects/super_sidebar_panel_spec.rb      |  1 -
 spec/mailers/notify_spec.rb                   | 30 +++++-
 ..._drop_software_licenses_temp_index_spec.rb | 20 ++++
 .../packages/debian/file_metadatum_spec.rb    | 45 +++++----
 spec/models/packages/package_file_spec.rb     | 11 +++
 ...anup_dangling_package_files_worker_spec.rb | 85 +++++++++++++++++
 .../process_package_file_worker_spec.rb       |  1 +
 yarn.lock                                     | 14 +++
 112 files changed, 1347 insertions(+), 230 deletions(-)
 create mode 100644 app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js
 create mode 100644 app/workers/packages/debian/cleanup_dangling_package_files_worker.rb
 delete mode 100644 config/feature_flags/development/incident_event_tags.yml
 create mode 100644 db/migrate/20230329194244_add_index_packages_debian_file_metadata_when_unknown.rb
 create mode 100644 db/post_migrate/20230327125705_add_index_to_vulnerability_finding_signatures_on_signature_sha.rb
 create mode 100644 db/post_migrate/20230329100222_drop_software_licenses_temp_index.rb
 create mode 100644 db/schema_migrations/20230327125705
 create mode 100644 db/schema_migrations/20230329100222
 create mode 100644 db/schema_migrations/20230329194244
 create mode 100644 lib/sidebars/groups/super_sidebar_menus/analyze_menu.rb
 create mode 100644 lib/sidebars/groups/super_sidebar_menus/build_menu.rb
 create mode 100644 lib/sidebars/groups/super_sidebar_menus/manage_menu.rb
 create mode 100644 lib/sidebars/groups/super_sidebar_menus/monitor_menu.rb
 create mode 100644 lib/sidebars/groups/super_sidebar_menus/secure_menu.rb
 create mode 100644 qa/qa/page/project/settings/branch_rules.rb
 create mode 100644 qa/qa/page/project/settings/branch_rules_details.rb
 create mode 100644 qa/qa/specs/features/browser_ui/3_create/repository/add_new_branch_rule_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/analyze_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/build_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/manage_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/monitor_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb
 create mode 100644 spec/lib/sidebars/groups/super_sidebar_menus/secure_menu_spec.rb
 create mode 100644 spec/migrations/20230329100222_drop_software_licenses_temp_index_spec.rb
 create mode 100644 spec/workers/packages/debian/cleanup_dangling_package_files_worker_spec.rb

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 827ec9b1e7d..be4a464b05b 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -556,7 +556,6 @@ Layout/ArgumentAlignment:
     - 'app/models/packages/cleanup/policy.rb'
     - 'app/models/packages/conan/metadatum.rb'
     - 'app/models/packages/debian/file_entry.rb'
-    - 'app/models/packages/debian/file_metadatum.rb'
     - 'app/models/packages/package.rb'
     - 'app/models/packages/rpm/metadatum.rb'
     - 'app/models/pages_domain.rb'
@@ -665,7 +664,6 @@ Layout/ArgumentAlignment:
     - 'app/validators/feature_flag_user_xids_validator.rb'
     - 'app/workers/gitlab/github_import/stage/import_protected_branches_worker.rb'
     - 'app/workers/gitlab/jira_import/stuck_jira_import_jobs_worker.rb'
-    - 'app/workers/packages/debian/process_package_file_worker.rb'
     - 'app/workers/repository_update_remote_mirror_worker.rb'
     - 'app/workers/run_pipeline_schedule_worker.rb'
     - 'app/workers/stuck_export_jobs_worker.rb'
diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index 71a32b64c50..e65c8658ba3 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -186,7 +186,6 @@ Layout/FirstHashElementIndentation:
     - 'spec/controllers/projects/web_ide_terminals_controller_spec.rb'
     - 'spec/controllers/projects_controller_spec.rb'
     - 'spec/factories/ci/builds.rb'
-    - 'spec/factories/packages/debian/file_metadatum.rb'
     - 'spec/frontend/fixtures/autocomplete_sources.rb'
     - 'spec/graphql/types/ci/detailed_status_type_spec.rb'
     - 'spec/helpers/groups/observability_helper_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 382b9d29ca8..c549dd2b56d 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -3534,7 +3534,6 @@ Layout/LineLength:
     - 'spec/factories/keys.rb'
     - 'spec/factories/namespaces.rb'
     - 'spec/factories/notes.rb'
-    - 'spec/factories/packages/debian/file_metadatum.rb'
     - 'spec/factories/packages/package_files.rb'
     - 'spec/factories/project_members.rb'
     - 'spec/factories/projects.rb'
@@ -4667,7 +4666,6 @@ Layout/LineLength:
     - 'spec/models/packages/composer/metadatum_spec.rb'
     - 'spec/models/packages/conan/metadatum_spec.rb'
     - 'spec/models/packages/debian/file_entry_spec.rb'
-    - 'spec/models/packages/debian/file_metadatum_spec.rb'
     - 'spec/models/packages/debian/publication_spec.rb'
     - 'spec/models/packages/dependency_link_spec.rb'
     - 'spec/models/packages/dependency_spec.rb'
diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml
index 537b32d856d..da56c283180 100644
--- a/.rubocop_todo/lint/symbol_conversion.yml
+++ b/.rubocop_todo/lint/symbol_conversion.yml
@@ -84,7 +84,6 @@ Lint/SymbolConversion:
     - 'spec/controllers/jira_connect/branches_controller_spec.rb'
     - 'spec/factories/ci/reports/codequality_degradations.rb'
     - 'spec/factories/evidences.rb'
-    - 'spec/factories/packages/debian/file_metadatum.rb'
     - 'spec/factories/packages/helm/file_metadatum.rb'
     - 'spec/factories/packages/npm/metadata.rb'
     - 'spec/features/file_uploads/graphql_add_design_spec.rb'
@@ -140,7 +139,6 @@ Lint/SymbolConversion:
     - 'spec/lib/service_ping/devops_report_spec.rb'
     - 'spec/models/integrations/prometheus_spec.rb'
     - 'spec/models/merge_request_diff_commit_spec.rb'
-    - 'spec/models/packages/debian/file_metadatum_spec.rb'
     - 'spec/models/packages/helm/file_metadatum_spec.rb'
     - 'spec/models/packages/npm/metadatum_spec.rb'
     - 'spec/presenters/packages/npm/package_presenter_spec.rb'
diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml
index aa2f0169006..bf3bde843af 100644
--- a/.rubocop_todo/lint/unused_block_argument.yml
+++ b/.rubocop_todo/lint/unused_block_argument.yml
@@ -374,7 +374,6 @@ Lint/UnusedBlockArgument:
     - 'spec/models/concerns/each_batch_spec.rb'
     - 'spec/models/container_repository_spec.rb'
     - 'spec/models/network/graph_spec.rb'
-    - 'spec/models/packages/debian/file_metadatum_spec.rb'
     - 'spec/requests/api/ci/pipeline_schedules_spec.rb'
     - 'spec/requests/api/graphql/gitlab_schema_spec.rb'
     - 'spec/requests/api/internal/container_registry/migration_spec.rb'
diff --git a/.rubocop_todo/naming/heredoc_delimiter_naming.yml b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
index b92d316b693..b4586ecf414 100644
--- a/.rubocop_todo/naming/heredoc_delimiter_naming.yml
+++ b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
@@ -54,7 +54,6 @@ Naming/HeredocDelimiterNaming:
     - 'rubocop/cop/gitlab/predicate_memoization.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
     - 'spec/deprecation_toolkit_env.rb'
-    - 'spec/factories/packages/debian/file_metadatum.rb'
     - 'spec/features/projects/commit/user_comments_on_commit_spec.rb'
     - 'spec/features/task_lists_spec.rb'
     - 'spec/initializers/100_patch_omniauth_oauth2_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 5768ce2fefe..f925b637173 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -2303,7 +2303,6 @@ RSpec/ContextWording:
     - 'spec/models/notification_setting_spec.rb'
     - 'spec/models/operations/feature_flag_spec.rb'
     - 'spec/models/packages/conan/file_metadatum_spec.rb'
-    - 'spec/models/packages/debian/file_metadatum_spec.rb'
     - 'spec/models/packages/dependency_link_spec.rb'
     - 'spec/models/packages/dependency_spec.rb'
     - 'spec/models/packages/package_file_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 5a7d81848e8..72336d8d0c4 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -5264,7 +5264,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/models/packages/conan/file_metadatum_spec.rb'
     - 'spec/models/packages/conan/metadatum_spec.rb'
     - 'spec/models/packages/debian/file_entry_spec.rb'
-    - 'spec/models/packages/debian/file_metadatum_spec.rb'
     - 'spec/models/packages/debian/group_architecture_spec.rb'
     - 'spec/models/packages/debian/group_component_file_spec.rb'
     - 'spec/models/packages/debian/group_component_spec.rb'
diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml
index c49901db696..4485a5df956 100644
--- a/.rubocop_todo/style/class_and_module_children.yml
+++ b/.rubocop_todo/style/class_and_module_children.yml
@@ -285,7 +285,6 @@ Style/ClassAndModuleChildren:
     - 'app/models/packages/build_info.rb'
     - 'app/models/packages/conan/file_metadatum.rb'
     - 'app/models/packages/conan/metadatum.rb'
-    - 'app/models/packages/debian/file_metadatum.rb'
     - 'app/models/packages/debian/group_architecture.rb'
     - 'app/models/packages/debian/group_component.rb'
     - 'app/models/packages/debian/group_component_file.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 4dab861ec68..3019d72ae6f 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-c9c3f444b7d9e54f706552e199f7b9239b0027c5
+140ee5c9aa5f4fb7dd4a0017677788ee88ce7149
diff --git a/app/assets/javascripts/boards/components/board_filtered_search.vue b/app/assets/javascripts/boards/components/board_filtered_search.vue
index 2e14afad963..46612320136 100644
--- a/app/assets/javascripts/boards/components/board_filtered_search.vue
+++ b/app/assets/javascripts/boards/components/board_filtered_search.vue
@@ -22,7 +22,7 @@ import {
   TOKEN_TYPE_WEIGHT,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
-import { AssigneeFilterType } from '~/boards/constants';
+import { AssigneeFilterType, GroupByParamType } from 'ee_else_ce/boards/constants';
 import { TYPENAME_ITERATION } from '~/graphql_shared/constants';
 import eventHub from '../eventhub';
 
@@ -33,6 +33,11 @@ export default {
   components: { FilteredSearch },
   inject: ['initialFilterParams', 'isApolloBoard'],
   props: {
+    isSwimlanesOn: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     tokens: {
       type: Array,
       required: true,
@@ -321,6 +326,7 @@ export default {
           release_tag: releaseTag,
           confidential,
           health_status: healthStatus,
+          group_by: this.isSwimlanesOn ? GroupByParamType.epic : undefined,
         },
         (value) => {
           if (value || value === false) {
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index 9ea801dc9a2..604e71f5993 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -226,12 +226,10 @@ export default {
           }
           this.cancel();
 
-          if (!this.isApolloBoard) {
-            const param = getParameterByName('group_by')
-              ? `?group_by=${getParameterByName('group_by')}`
-              : '';
-            updateHistory({ url: `${this.boardBaseUrl}/${getIdFromGraphQLId(board.id)}${param}` });
-          }
+          const param = getParameterByName('group_by')
+            ? `?group_by=${getParameterByName('group_by')}`
+            : '';
+          updateHistory({ url: `${this.boardBaseUrl}/${getIdFromGraphQLId(board.id)}${param}` });
         } catch {
           this.setError({ message: this.$options.i18n.saveErrorMessage });
         } finally {
diff --git a/app/assets/javascripts/boards/components/board_top_bar.vue b/app/assets/javascripts/boards/components/board_top_bar.vue
index fad57758be1..c186346b2ac 100644
--- a/app/assets/javascripts/boards/components/board_top_bar.vue
+++ b/app/assets/javascripts/boards/components/board_top_bar.vue
@@ -98,6 +98,7 @@ export default {
         <issue-board-filtered-search
           v-if="isIssueBoard"
           :board="board"
+          :is-swimlanes-on="isSwimlanesOn"
           @setFilters="$emit('setFilters', $event)"
         />
         <epic-board-filtered-search
diff --git a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
index cdcc7b8e5a6..3c056f296e1 100644
--- a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
+++ b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue
@@ -52,6 +52,11 @@ export default {
       required: false,
       default: () => {},
     },
+    isSwimlanesOn: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     tokensCE() {
@@ -203,6 +208,7 @@ export default {
     data-testid="issue-board-filtered-search"
     :tokens="tokens"
     :board="board"
+    :is-swimlanes-on="isSwimlanesOn"
     @setFilters="$emit('setFilters', $event)"
   />
 </template>
diff --git a/app/assets/javascripts/diffs/i18n.js b/app/assets/javascripts/diffs/i18n.js
index 0f44eb06cb3..d8812de12d4 100644
--- a/app/assets/javascripts/diffs/i18n.js
+++ b/app/assets/javascripts/diffs/i18n.js
@@ -1,6 +1,9 @@
 import { __, s__ } from '~/locale';
 
 export const GENERIC_ERROR = __('Something went wrong on our end. Please try again!');
+export const LOAD_SINGLE_DIFF_FAILED = s__(
+  'MergeRequest|Encountered an issue while trying to fetch the single file diff.',
+);
 
 export const DIFF_FILE_HEADER = {
   optionsDropdownTitle: __('Options'),
diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js
index 29b77431f7d..6c461021f86 100644
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -50,6 +50,7 @@ import {
   TRACKING_SINGLE_FILE_MODE,
   TRACKING_MULTIPLE_FILES_MODE,
 } from '../constants';
+import { LOAD_SINGLE_DIFF_FAILED } from '../i18n';
 import eventHub from '../event_hub';
 import { isCollapsed } from '../utils/diff_file';
 import { markFileReview, setReviewsForMergeRequest } from '../utils/file_reviews';
@@ -590,6 +591,31 @@ export const setCurrentFileHash = ({ commit }, hash) => {
   commit(types.SET_CURRENT_DIFF_FILE, hash);
 };
 
+export const goToFile = ({ state, commit, dispatch, getters }, { path }) => {
+  if (!state.viewDiffsFileByFile) {
+    dispatch('scrollToFile', { path });
+  } else {
+    if (!state.treeEntries[path]) return;
+
+    const { fileHash } = state.treeEntries[path];
+
+    commit(types.SET_CURRENT_DIFF_FILE, fileHash);
+
+    if (!getters.isTreePathLoaded(path)) {
+      document.location.hash = fileHash;
+      dispatch('fetchFileByFile')
+        .then(() => {
+          dispatch('scrollToFile', { path });
+        })
+        .catch(() => {
+          createAlert({
+            message: LOAD_SINGLE_DIFF_FAILED,
+          });
+        });
+    }
+  }
+};
+
 export const scrollToFile = ({ state, commit, getters }, { path }) => {
   if (!state.treeEntries[path]) return;
 
diff --git a/app/assets/javascripts/graphql_shared/issuable_client.js b/app/assets/javascripts/graphql_shared/issuable_client.js
index 2f2a4b3a474..f482fabc5f6 100644
--- a/app/assets/javascripts/graphql_shared/issuable_client.js
+++ b/app/assets/javascripts/graphql_shared/issuable_client.js
@@ -126,6 +126,26 @@ export const config = {
                 };
               },
             },
+            Group: {
+              fields: {
+                projects: {
+                  keyArgs: ['includeSubgroups', 'search'],
+                },
+                descendantGroups: {
+                  keyArgs: ['includeSubgroups', 'search'],
+                },
+              },
+            },
+            ProjectConnection: {
+              fields: {
+                nodes: concatPagination(),
+              },
+            },
+            GroupConnection: {
+              fields: {
+                nodes: concatPagination(),
+              },
+            },
             Board: {
               fields: {
                 epics: {
diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue
index 96995d2597f..4b3f4b58816 100644
--- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue
@@ -199,7 +199,7 @@ export default {
         <p class="gl-ml-3 gl-align-self-end gl-line-height-32">{{ __('UTC') }}</p>
       </div>
     </div>
-    <gl-form-group v-if="glFeatures.incidentEventTags">
+    <gl-form-group>
       <label class="gl-display-flex gl-align-items-center gl-gap-3" for="timeline-input-tags">
         {{ $options.i18n.tagsLabel }}
         <timeline-events-tags-popover />
diff --git a/app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js b/app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js
new file mode 100644
index 00000000000..fd08d34a80e
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js
@@ -0,0 +1,78 @@
+import Vue from 'vue';
+import { createApolloProvider } from '@vue/apollo-option';
+import { ApolloMutation } from '@vue/apollo-components';
+
+export { ApolloMutation };
+
+const installed = new WeakMap();
+
+function callLifecycle(hookName, ...extraArgs) {
+  const { GITLAB_INTERNAL_ADDED_MIXINS: addedMixins } = this.$;
+  if (!addedMixins) {
+    return [];
+  }
+
+  return addedMixins.map((m) => m[hookName]?.apply(this, extraArgs));
+}
+
+function createMixinForLateInit({ install, shouldInstall }) {
+  return {
+    created() {
+      callLifecycle.call(this, 'created');
+    },
+    // @vue/compat normalizez lifecycle hook names so there is no error here
+    destroyed() {
+      callLifecycle.call(this, 'unmounted');
+    },
+
+    data(...args) {
+      const extraData = callLifecycle.call(this, 'data', ...args);
+      if (!extraData.length) {
+        return {};
+      }
+
+      return Object.assign({}, ...extraData);
+    },
+
+    beforeCreate() {
+      if (shouldInstall(this)) {
+        const { mixins } = this.$.appContext;
+        const globalMixinsBeforeInit = new Set(mixins);
+        install(this);
+
+        this.$.GITLAB_INTERNAL_ADDED_MIXINS = mixins.filter((m) => !globalMixinsBeforeInit.has(m));
+
+        callLifecycle.call(this, 'beforeCreate');
+      }
+    },
+  };
+}
+
+export default class VueCompatApollo {
+  constructor(...args) {
+    // eslint-disable-next-line no-constructor-return
+    return createApolloProvider(...args);
+  }
+
+  static install() {
+    Vue.mixin(
+      createMixinForLateInit({
+        shouldInstall: (vm) =>
+          vm.$options.apolloProvider &&
+          !installed.get(vm.$.appContext.app)?.has(vm.$options.apolloProvider),
+        install: (vm) => {
+          const { app } = vm.$.appContext;
+          const { apolloProvider } = vm.$options;
+
+          if (!installed.has(app)) {
+            installed.set(app, new WeakSet());
+          }
+
+          installed.get(app).add(apolloProvider);
+
+          vm.$.appContext.app.use(vm.$options.apolloProvider);
+        },
+      }),
+    );
+  }
+}
diff --git a/app/assets/javascripts/pages/projects/blob/show/index.js b/app/assets/javascripts/pages/projects/blob/show/index.js
index a0f391c912b..c4f806f1723 100644
--- a/app/assets/javascripts/pages/projects/blob/show/index.js
+++ b/app/assets/javascripts/pages/projects/blob/show/index.js
@@ -43,6 +43,7 @@ const initRefSwitcher = () => {
         props: {
           projectId,
           value: ref,
+          queryParams: { sort: 'updated_desc' },
         },
         on: {
           input(selectedRef) {
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
index b0abe7ac463..dbcb77b67f3 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
@@ -187,6 +187,7 @@ export default {
       :roles="pushAccessLevels.roles"
       :users="pushAccessLevels.users"
       :groups="pushAccessLevels.groups"
+      data-qa-selector="allowed_to_push_content"
     />
 
     <!-- Allowed to merge -->
@@ -197,6 +198,7 @@ export default {
       :roles="mergeAccessLevels.roles"
       :users="mergeAccessLevels.users"
       :groups="mergeAccessLevels.groups"
+      data-qa-selector="allowed_to_merge_content"
     />
 
     <!-- Force push -->
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue
index 721248e53e3..3a5b3409596 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue
@@ -101,7 +101,13 @@ export default {
 
       <div v-if="statusCheckUrl" class="gl-ml-7 gl-flex-grow-1">{{ statusCheckUrl }}</div>
 
-      <div v-for="(item, index) in accessLevels" :key="index" data-testid="access-level">
+      <div
+        v-for="(item, index) in accessLevels"
+        :key="index"
+        data-testid="access-level"
+        data-qa-selector="access_level_content"
+        :data-qa-role="item.accessLevelDescription"
+      >
         <span v-if="commaSeparateList && index > 0" data-testid="comma-separator">,</span>
         {{ item.accessLevelDescription }}
       </div>
diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
index 7709419b6f8..dcf5155644d 100644
--- a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
+++ b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue
@@ -69,9 +69,14 @@ export default {
 
     <div v-if="!branchRules.length" data-testid="empty">{{ $options.i18n.emptyState }}</div>
 
-    <gl-button v-gl-modal="$options.modalId" class="gl-mt-5" category="secondary" variant="info">{{
-      $options.i18n.addBranchRule
-    }}</gl-button>
+    <gl-button
+      v-gl-modal="$options.modalId"
+      class="gl-mt-5"
+      data-qa-selector="add_branch_rule_button"
+      category="secondary"
+      variant="info"
+      >{{ $options.i18n.addBranchRule }}</gl-button
+    >
 
     <gl-modal
       :ref="$options.modalId"
diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue
index b565bda247d..a5ff478a826 100644
--- a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue
+++ b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue
@@ -153,7 +153,11 @@ export default {
 </script>
 
 <template>
-  <div class="gl-border-b gl-pt-5 gl-pb-5 gl-display-flex gl-justify-content-space-between">
+  <div
+    class="gl-border-b gl-pt-5 gl-pb-5 gl-display-flex gl-justify-content-space-between"
+    data-qa-selector="branch_content"
+    :data-qa-branch-name="name"
+  >
     <div>
       <strong class="gl-font-monospace">{{ name }}</strong>
 
@@ -169,7 +173,7 @@ export default {
         <li v-for="(detail, index) in approvalDetails" :key="index">{{ detail }}</li>
       </ul>
     </div>
-    <gl-button class="gl-align-self-start" :href="detailsPath">
+    <gl-button class="gl-align-self-start" data-qa-selector="details_button" :href="detailsPath">
       {{ $options.i18n.detailsButtonLabel }}</gl-button
     >
   </div>
diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue
index 9826124912b..9a84726d42f 100644
--- a/app/assets/javascripts/ref/components/ref_selector.vue
+++ b/app/assets/javascripts/ref/components/ref_selector.vue
@@ -42,6 +42,11 @@ export default {
       required: false,
       default: '',
     },
+    queryParams: {
+      type: Object,
+      required: false,
+      default: () => {},
+    },
     refType: {
       type: String,
       required: false,
@@ -93,6 +98,7 @@ export default {
       matches: (state) => state.matches,
       lastQuery: (state) => state.query,
       selectedRef: (state) => state.selectedRef,
+      params: (state) => state.params,
     }),
     ...mapGetters(['isLoading', 'isQueryPossiblyASha']),
     i18n() {
@@ -186,6 +192,7 @@ export default {
     this.debouncedSearch = debounce(this.search, SEARCH_DEBOUNCE_MS);
 
     this.setProjectId(this.projectId);
+    this.setParams(this.queryParams);
 
     this.$watch(
       'enabledRefTypes',
@@ -206,6 +213,7 @@ export default {
     ...mapActions([
       'setEnabledRefTypes',
       'setUseSymbolicRefNames',
+      'setParams',
       'setProjectId',
       'setSelectedRef',
     ]),
diff --git a/app/assets/javascripts/ref/stores/actions.js b/app/assets/javascripts/ref/stores/actions.js
index a6019f21e73..3d6b46abf52 100644
--- a/app/assets/javascripts/ref/stores/actions.js
+++ b/app/assets/javascripts/ref/stores/actions.js
@@ -5,6 +5,8 @@ import * as types from './mutation_types';
 export const setEnabledRefTypes = ({ commit }, refTypes) =>
   commit(types.SET_ENABLED_REF_TYPES, refTypes);
 
+export const setParams = ({ commit }, params) => commit(types.SET_PARAMS, params);
+
 export const setUseSymbolicRefNames = ({ commit }, useSymbolicRefNames) =>
   commit(types.SET_USE_SYMBOLIC_REF_NAMES, useSymbolicRefNames);
 
@@ -29,7 +31,7 @@ export const search = ({ state, dispatch, commit }, query) => {
 export const searchBranches = ({ commit, state }) => {
   commit(types.REQUEST_START);
 
-  Api.branches(state.projectId, state.query)
+  Api.branches(state.projectId, state.query, state.params)
     .then((response) => {
       commit(types.RECEIVE_BRANCHES_SUCCESS, response);
     })
diff --git a/app/assets/javascripts/ref/stores/mutation_types.js b/app/assets/javascripts/ref/stores/mutation_types.js
index 4c602908cae..6178106fe00 100644
--- a/app/assets/javascripts/ref/stores/mutation_types.js
+++ b/app/assets/javascripts/ref/stores/mutation_types.js
@@ -1,5 +1,6 @@
 export const SET_ENABLED_REF_TYPES = 'SET_ENABLED_REF_TYPES';
 export const SET_USE_SYMBOLIC_REF_NAMES = 'SET_USE_SYMBOLIC_REF_NAMES';
+export const SET_PARAMS = 'SET_PARAMS';
 
 export const SET_PROJECT_ID = 'SET_PROJECT_ID';
 export const SET_SELECTED_REF = 'SET_SELECTED_REF';
diff --git a/app/assets/javascripts/ref/stores/mutations.js b/app/assets/javascripts/ref/stores/mutations.js
index 9846ac0adb7..43c4318ad6c 100644
--- a/app/assets/javascripts/ref/stores/mutations.js
+++ b/app/assets/javascripts/ref/stores/mutations.js
@@ -10,6 +10,9 @@ export default {
   [types.SET_USE_SYMBOLIC_REF_NAMES](state, useSymbolicRefNames) {
     state.useSymbolicRefNames = useSymbolicRefNames;
   },
+  [types.SET_PARAMS](state, params) {
+    state.params = params;
+  },
   [types.SET_PROJECT_ID](state, projectId) {
     state.projectId = projectId;
   },
diff --git a/app/assets/javascripts/ref/stores/state.js b/app/assets/javascripts/ref/stores/state.js
index 3affa8f8d03..1619b43c02e 100644
--- a/app/assets/javascripts/ref/stores/state.js
+++ b/app/assets/javascripts/ref/stores/state.js
@@ -15,5 +15,6 @@ export default () => ({
     commits: createRefTypeState(),
   },
   selectedRef: null,
+  params: null,
   requestCount: 0,
 });
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 6cedc606a37..60ec93fb73e 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -137,6 +137,7 @@ export default function setupVueRepositoryList() {
           props: {
             projectId,
             value: ref,
+            queryParams: { sort: 'updated_desc' },
           },
           on: {
             input(selectedRef) {
diff --git a/app/assets/javascripts/super_sidebar/components/user_menu.vue b/app/assets/javascripts/super_sidebar/components/user_menu.vue
index acc0452ee31..f68587f610b 100644
--- a/app/assets/javascripts/super_sidebar/components/user_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_menu.vue
@@ -14,10 +14,10 @@ import PersistentUserCallout from '~/persistent_user_callout';
 import UserNameGroup from './user_name_group.vue';
 
 export default {
-  feedbackUrl: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391533',
+  feedbackUrl: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403059',
   i18n: {
     newNavigation: {
-      badgeLabel: s__('NorthstarNavigation|Alpha'),
+      badgeLabel: s__('NorthstarNavigation|Beta'),
       sectionTitle: s__('NorthstarNavigation|Navigation redesign'),
     },
     setStatus: s__('SetStatusModal|Set status'),
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index b66af09a8df..a7381f99bae 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -610,10 +610,6 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
         padding: 0;
         vertical-align: top;
         white-space: normal;
-
-        // Fixes subpixel rounding issue https://gitlab.com/gitlab-org/gitlab-foss/issues/53973
-        // background-color is needed for dark code preference
-        padding-bottom: 1px;
         background-color: $white;
 
         &.parallel {
@@ -640,6 +636,14 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio;
       }
     }
   }
+
+  .diff-grid-comments:last-child {
+    .notes-content {
+      border-bottom-width: 0;
+      border-bottom-left-radius: #{$border-radius-default - 1px};
+      border-bottom-right-radius: #{$border-radius-default - 1px};
+    }
+  }
 }
 
 .diffs {
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb
index 8e4fbf24ca2..3842a88d15b 100644
--- a/app/controllers/projects/incidents_controller.rb
+++ b/app/controllers/projects/incidents_controller.rb
@@ -10,7 +10,6 @@ class Projects::IncidentsController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc, @project&.work_items_mvc_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc_2, @project&.work_items_mvc_2_feature_flag_enabled?)
-    push_frontend_feature_flag(:incident_event_tags, project)
   end
 
   feature_category :incident_management
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index f4eeee96813..8192084b8b0 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -66,7 +66,6 @@ class Projects::IssuesController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items_mvc, project&.work_items_mvc_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc_2, project&.work_items_mvc_2_feature_flag_enabled?)
     push_frontend_feature_flag(:epic_widget_edit_confirmation, project)
-    push_frontend_feature_flag(:incident_event_tags, project)
     push_frontend_feature_flag(:real_time_issue_due_date, project)
   end
 
diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb
index c743d3f2084..9006f104c64 100644
--- a/app/models/namespaces/traversal/linear.rb
+++ b/app/models/namespaces/traversal/linear.rb
@@ -125,7 +125,7 @@ module Namespaces
           elsif parent_id.nil?
             # There is no parent, so we are the root ancestor.
             self
-          elsif traversal_ids.present?
+          else
             Namespace.find_by(id: traversal_ids.first)
           end
         end
diff --git a/app/models/packages/debian.rb b/app/models/packages/debian.rb
index 887a5695530..2b8d0a4f51e 100644
--- a/app/models/packages/debian.rb
+++ b/app/models/packages/debian.rb
@@ -12,6 +12,8 @@ module Packages
 
     EMPTY_FILE_SHA256 = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'.freeze
 
+    INCOMING_PACKAGE_NAME = 'incoming'
+
     def self.table_name_prefix
       'packages_debian_'
     end
diff --git a/app/models/packages/debian/file_metadatum.rb b/app/models/packages/debian/file_metadatum.rb
index 77ce8e265ff..325ae0c468e 100644
--- a/app/models/packages/debian/file_metadatum.rb
+++ b/app/models/packages/debian/file_metadatum.rb
@@ -1,59 +1,69 @@
 # frozen_string_literal: true
 
-class Packages::Debian::FileMetadatum < ApplicationRecord
-  self.primary_key = :package_file_id
+module Packages
+  module Debian
+    class FileMetadatum < ApplicationRecord
+      include UpdatedAtFilterable
 
-  belongs_to :package_file, inverse_of: :debian_file_metadatum
+      self.primary_key = :package_file_id
 
-  validates :package_file, presence: true
-  validate :valid_debian_package_type
+      belongs_to :package_file, inverse_of: :debian_file_metadatum
 
-  enum file_type: {
-    unknown: 1, source: 2, dsc: 3, deb: 4, udeb: 5, buildinfo: 6, changes: 7, ddeb: 8
-  }
+      validates :package_file, presence: true
+      validate :valid_debian_package_type
 
-  validates :file_type, presence: true
-  validates :file_type, inclusion: { in: %w[unknown] },
-                        if: -> { package_file&.package&.debian_incoming? || package_file&.package&.processing? }
-  validates :file_type,
-    inclusion: { in: %w[source dsc deb udeb buildinfo changes ddeb] },
-    if: -> { package_file&.package&.debian_package? && !package_file&.package&.processing? }
+      enum file_type: {
+        unknown: 1, source: 2, dsc: 3, deb: 4, udeb: 5, buildinfo: 6, changes: 7, ddeb: 8
+      }
 
-  validates :component,
-    presence: true,
-    format: { with: Gitlab::Regex.debian_component_regex },
-    if: :requires_component?
-  validates :component, absence: true, unless: :requires_component?
+      validates :file_type, presence: true
+      validates :file_type, inclusion: { in: %w[unknown] },
+        if: -> { package_file&.package&.debian_incoming? || package_file&.package&.processing? }
+      validates :file_type,
+        inclusion: { in: %w[source dsc deb udeb buildinfo changes ddeb] },
+        if: -> { package_file&.package&.debian_package? && !package_file&.package&.processing? }
 
-  validates :architecture,
-    presence: true,
-    format: { with: Gitlab::Regex.debian_architecture_regex },
-    if: :requires_architecture?
-  validates :architecture, absence: true, unless: :requires_architecture?
+      validates :component,
+        presence: true,
+        format: { with: Gitlab::Regex.debian_component_regex },
+        if: :requires_component?
+      validates :component, absence: true, unless: :requires_component?
 
-  validates :fields,
-    presence: true,
-    json_schema: { filename: "debian_fields" },
-    if: :requires_fields?
-  validates :fields, absence: true, unless: :requires_fields?
+      validates :architecture,
+        presence: true,
+        format: { with: Gitlab::Regex.debian_architecture_regex },
+        if: :requires_architecture?
+      validates :architecture, absence: true, unless: :requires_architecture?
 
-  private
+      validates :fields,
+        presence: true,
+        json_schema: { filename: "debian_fields" },
+        if: :requires_fields?
+      validates :fields, absence: true, unless: :requires_fields?
 
-  def valid_debian_package_type
-    return if package_file&.package&.debian?
+      scope :with_file_type, ->(file_type) do
+        where(file_type: file_type)
+      end
 
-    errors.add(:package_file, _('Package type must be Debian'))
-  end
+      private
 
-  def requires_architecture?
-    deb? || udeb? || ddeb?
-  end
+      def valid_debian_package_type
+        return if package_file&.package&.debian?
 
-  def requires_component?
-    source? || dsc? || requires_architecture? || buildinfo?
-  end
+        errors.add(:package_file, _('Package type must be Debian'))
+      end
 
-  def requires_fields?
-    dsc? || requires_architecture? || buildinfo? || changes?
+      def requires_architecture?
+        deb? || udeb? || ddeb?
+      end
+
+      def requires_component?
+        source? || dsc? || requires_architecture? || buildinfo?
+      end
+
+      def requires_fields?
+        dsc? || requires_architecture? || buildinfo? || changes?
+      end
+    end
   end
 end
diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index 2e497dfdcbb..348e5486f41 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -86,7 +86,7 @@ class Packages::Package < ApplicationRecord
   validates :name, format: { with: Gitlab::Regex.nuget_package_name_regex }, if: :nuget?
   validates :name, format: { with: Gitlab::Regex.terraform_module_package_name_regex }, if: :terraform_module?
   validates :name, format: { with: Gitlab::Regex.debian_package_name_regex }, if: :debian_package?
-  validates :name, inclusion: { in: %w[incoming] }, if: :debian_incoming?
+  validates :name, inclusion: { in: [Packages::Debian::INCOMING_PACKAGE_NAME] }, if: :debian_incoming?
   validates :version, format: { with: Gitlab::Regex.nuget_version_regex }, if: :nuget?
   validates :version, format: { with: Gitlab::Regex.conan_recipe_component_regex }, if: :conan?
   validates :version, format: { with: Gitlab::Regex.maven_version_regex }, if: -> { version? && maven? }
diff --git a/app/models/packages/package_file.rb b/app/models/packages/package_file.rb
index e1486c11298..c164d150bce 100644
--- a/app/models/packages/package_file.rb
+++ b/app/models/packages/package_file.rb
@@ -85,6 +85,13 @@ class Packages::PackageFile < ApplicationRecord
       .where(packages_debian_file_metadata: { architecture: architecture_name })
   end
 
+  scope :with_debian_unknown_since, ->(updated_before) do
+    file_metadata = Packages::Debian::FileMetadatum.with_file_type(:unknown)
+                                                   .updated_before(updated_before)
+                                                   .where('packages_package_files.id = packages_debian_file_metadata.package_file_id')
+    where('EXISTS (?)', file_metadata.select(1))
+  end
+
   scope :with_conan_package_reference, ->(conan_package_reference) do
     joins(:conan_file_metadatum)
       .where(packages_conan_file_metadata: { conan_package_reference: conan_package_reference })
diff --git a/app/services/packages/debian/find_or_create_incoming_service.rb b/app/services/packages/debian/find_or_create_incoming_service.rb
index 2d29ba5f3c3..fae87f09d41 100644
--- a/app/services/packages/debian/find_or_create_incoming_service.rb
+++ b/app/services/packages/debian/find_or_create_incoming_service.rb
@@ -4,7 +4,7 @@ module Packages
   module Debian
     class FindOrCreateIncomingService < ::Packages::CreatePackageService
       def execute
-        find_or_create_package!(:debian, name: 'incoming', version: nil)
+        find_or_create_package!(:debian, name: ::Packages::Debian::INCOMING_PACKAGE_NAME, version: nil)
       end
     end
   end
diff --git a/app/views/notify/reassigned_issue_email.text.erb b/app/views/notify/reassigned_issue_email.text.erb
index dc0d8fc80b0..f37c8ffa515 100644
--- a/app/views/notify/reassigned_issue_email.text.erb
+++ b/app/views/notify/reassigned_issue_email.text.erb
@@ -2,5 +2,5 @@ Reassigned Issue <%= @issue.iid %>
 
 <%= url_for([@issue.project, @issue, { only_path: false }]) %>
 
-Assignee changed <%= "from #{sanitize_name(@previous_assignees.map(&:name).to_sentence)}" if @previous_assignees.any? -%>
+Assignee changed<%= " from #{sanitize_name(@previous_assignees.map(&:name).to_sentence)}" if @previous_assignees.any? -%>
  to <%= "#{@issue.assignees.any? ? @issue.assignee_list : 'Unassigned'}" %>
diff --git a/app/views/projects/branch_rules/_show.html.haml b/app/views/projects/branch_rules/_show.html.haml
index 6e70dc42776..605715e2899 100644
--- a/app/views/projects/branch_rules/_show.html.haml
+++ b/app/views/projects/branch_rules/_show.html.haml
@@ -3,7 +3,7 @@
 - show_status_checks = @project.licensed_feature_available?(:external_status_checks)
 - show_approvers = @project.licensed_feature_available?(:merge_request_approvers)
 
-%section.settings.no-animate#branch-rules{ class: ('expanded' if expanded) }
+%section.settings.no-animate#branch-rules{ class: ('expanded' if expanded), data: { qa_selector: 'branch_rules_content' } }
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Branch rules')
     = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do
diff --git a/app/views/projects/merge_requests/_mr_box.html.haml b/app/views/projects/merge_requests/_mr_box.html.haml
index 901a2ebfd1e..6f662b81dd7 100644
--- a/app/views/projects/merge_requests/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/_mr_box.html.haml
@@ -1,3 +1,3 @@
-.detail-page-description.py-2.gl-display-flex.gl-align-items-center.gl-flex-wrap{ class: "#{'is-merge-request' if moved_mr_sidebar_enabled? && !fluid_layout}" }
+.detail-page-description.gl-pt-2.gl-pb-4.gl-display-flex.gl-align-items-center.gl-flex-wrap{ class: "#{'is-merge-request' if moved_mr_sidebar_enabled? && !fluid_layout}" }
   = render 'shared/issuable/status_box', issuable: @merge_request
   = merge_request_header(@project, @merge_request)
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index eef6309f2fc..aee746100ea 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -12,7 +12,7 @@
       = c.body do
         = _('The source project of this merge request has been removed.')
 
-  .detail-page-header.border-bottom-0.pb-0.gl-display-block{ class: "gl-md-display-flex! #{'is-merge-request' if moved_mr_sidebar_enabled? && !fluid_layout}" }
+  .detail-page-header.border-bottom-0.gl-display-block.gl-pt-5{ class: "gl-md-display-flex! #{'is-merge-request' if moved_mr_sidebar_enabled? && !fluid_layout}" }
     .detail-page-header-body
       .issuable-meta.gl-display-flex
         #js-issuable-header-warnings{ data: { hidden: @merge_request.hidden?.to_s } }
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 6f86c3b939e..2a2b4a927d9 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -579,6 +579,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: cronjob:packages_debian_cleanup_dangling_package_files
+  :worker_name: Packages::Debian::CleanupDanglingPackageFilesWorker
+  :feature_category: :package_registry
+  :has_external_dependencies: false
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: cronjob:pages_domain_removal_cron
   :worker_name: PagesDomainRemovalCronWorker
   :feature_category: :pages
diff --git a/app/workers/packages/debian/cleanup_dangling_package_files_worker.rb b/app/workers/packages/debian/cleanup_dangling_package_files_worker.rb
new file mode 100644
index 00000000000..03b272db026
--- /dev/null
+++ b/app/workers/packages/debian/cleanup_dangling_package_files_worker.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Packages
+  module Debian
+    class CleanupDanglingPackageFilesWorker
+      include ApplicationWorker
+      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
+
+      data_consistency :always
+
+      deduplicate :until_executed
+      idempotent!
+
+      feature_category :package_registry
+
+      THREE_HOUR = 3.hours.freeze
+      BATCH_TIMEOUT = 250.seconds.freeze
+
+      def perform
+        return unless Feature.enabled?(:debian_packages)
+
+        package_files = Packages::PackageFile.with_debian_unknown_since(THREE_HOUR.ago)
+                                             .installable
+
+        Packages::MarkPackageFilesForDestructionService.new(package_files)
+          .execute(batch_deadline: Time.zone.now + BATCH_TIMEOUT)
+      rescue StandardError => e
+        Gitlab::ErrorTracking.log_exception(e)
+      end
+    end
+  end
+end
diff --git a/app/workers/packages/debian/process_package_file_worker.rb b/app/workers/packages/debian/process_package_file_worker.rb
index e9d6ad57749..8e7f0b3b987 100644
--- a/app/workers/packages/debian/process_package_file_worker.rb
+++ b/app/workers/packages/debian/process_package_file_worker.rb
@@ -26,7 +26,8 @@ module Packages
         ::Packages::Debian::ProcessPackageFileService.new(package_file, distribution_name, component_name).execute
       rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e, package_file_id: @package_file_id,
-                                               distribution_name: @distribution_name, component_name: @component_name)
+          distribution_name: @distribution_name, component_name: @component_name)
+        package_file.update_column(:status, :error)
         package_file.package.update_column(:status, :error)
       end
 
diff --git a/config/feature_flags/development/incident_event_tags.yml b/config/feature_flags/development/incident_event_tags.yml
deleted file mode 100644
index 69a7b67a186..00000000000
--- a/config/feature_flags/development/incident_event_tags.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: incident_event_tags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107194
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387647
-milestone: '15.8'
-type: development
-group: group::respond
-default_enabled: true
diff --git a/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml b/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml
index 45661638432..f4b5812726c 100644
--- a/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml
+++ b/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390664
 milestone: '15.9'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8bcf376b8ca..24e5a93581a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -682,6 +682,9 @@ Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker']['job
 Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker']['cron'] ||= '36 4 * * *'
 Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker']['job_class'] = 'Ci::Runners::StaleMachinesCleanupCronWorker'
+Settings.cron_jobs['cleanup_dangling_debian_package_files_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['cron'] ||= '20 21 * * *'
+Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['job_class'] = 'Packages::Debian::CleanupDanglingPackageFilesWorker'
 
 Gitlab.ee do
   Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 4a8904e3d68..1b2d87e453d 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -324,6 +324,7 @@ if (USE_VUE3) {
   Object.assign(alias, {
     vue: '@vue/compat',
     vuex: path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vuex.js'),
+    'vue-apollo': path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js'),
   });
 
   vueLoaderOptions.compiler = require.resolve('./vue3migration/compiler');
diff --git a/db/migrate/20230329194244_add_index_packages_debian_file_metadata_when_unknown.rb b/db/migrate/20230329194244_add_index_packages_debian_file_metadata_when_unknown.rb
new file mode 100644
index 00000000000..9b87f1319f3
--- /dev/null
+++ b/db/migrate/20230329194244_add_index_packages_debian_file_metadata_when_unknown.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddIndexPackagesDebianFileMetadataWhenUnknown < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'i_pkgs_deb_file_meta_on_updated_at_package_file_id_when_unknown'
+  UNKNOWN = 1
+
+  def up
+    add_concurrent_index :packages_debian_file_metadata, [:updated_at, :package_file_id],
+      where: "file_type = #{UNKNOWN}", name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :packages_debian_file_metadata, name: INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20230327125705_add_index_to_vulnerability_finding_signatures_on_signature_sha.rb b/db/post_migrate/20230327125705_add_index_to_vulnerability_finding_signatures_on_signature_sha.rb
new file mode 100644
index 00000000000..1b2f156ce3c
--- /dev/null
+++ b/db/post_migrate/20230327125705_add_index_to_vulnerability_finding_signatures_on_signature_sha.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddIndexToVulnerabilityFindingSignaturesOnSignatureSha < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'index_vulnerability_finding_signatures_on_signature_sha'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :vulnerability_finding_signatures, :signature_sha, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :vulnerability_finding_signatures, name: INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20230329100222_drop_software_licenses_temp_index.rb b/db/post_migrate/20230329100222_drop_software_licenses_temp_index.rb
new file mode 100644
index 00000000000..3013de7c31b
--- /dev/null
+++ b/db/post_migrate/20230329100222_drop_software_licenses_temp_index.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DropSoftwareLicensesTempIndex < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  TABLE_NAME = :software_licenses
+  INDEX_NAME = 'tmp_index_for_software_licenses_spdx_identifier_cleanup'
+
+  def up
+    remove_concurrent_index_by_name(TABLE_NAME, INDEX_NAME)
+  end
+
+  def down
+    add_concurrent_index TABLE_NAME, :spdx_identifier, where: 'spdx_identifier IS NULL', name: INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20230327125705 b/db/schema_migrations/20230327125705
new file mode 100644
index 00000000000..5b193987b11
--- /dev/null
+++ b/db/schema_migrations/20230327125705
@@ -0,0 +1 @@
+dd965c40fa107f487bda00d71dfdf40aabd013dd2cb05a4d9621cb1aa87d8060
\ No newline at end of file
diff --git a/db/schema_migrations/20230329100222 b/db/schema_migrations/20230329100222
new file mode 100644
index 00000000000..5ca5919dadd
--- /dev/null
+++ b/db/schema_migrations/20230329100222
@@ -0,0 +1 @@
+70c83ed052082e1f37bd46c5abcb0b1b101ea08b719a68d8f39cb7545da97e61
\ No newline at end of file
diff --git a/db/schema_migrations/20230329194244 b/db/schema_migrations/20230329194244
new file mode 100644
index 00000000000..58b50705305
--- /dev/null
+++ b/db/schema_migrations/20230329194244
@@ -0,0 +1 @@
+9e9f4b2ed1a56fb3dd780cd22f82eab741639bb972c524984741d4f8cd799e5c
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5ec5e1b6117..b4473fab752 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -29059,6 +29059,8 @@ CREATE INDEX i_dast_profiles_tags_on_scanner_profiles_id ON dast_profiles_tags U
 
 CREATE INDEX i_dast_scanner_profiles_tags_on_scanner_profiles_id ON dast_scanner_profiles_tags USING btree (dast_scanner_profile_id);
 
+CREATE INDEX i_pkgs_deb_file_meta_on_updated_at_package_file_id_when_unknown ON packages_debian_file_metadata USING btree (updated_at, package_file_id) WHERE (file_type = 1);
+
 CREATE UNIQUE INDEX i_pm_licenses_on_spdx_identifier ON pm_licenses USING btree (spdx_identifier);
 
 CREATE UNIQUE INDEX i_pm_package_version_licenses_join_ids ON pm_package_version_licenses USING btree (pm_package_version_id, pm_license_id);
@@ -32479,6 +32481,8 @@ CREATE INDEX index_vulnerability_feedback_on_pipeline_id ON vulnerability_feedba
 
 CREATE INDEX index_vulnerability_finding_signatures_on_finding_id ON vulnerability_finding_signatures USING btree (finding_id);
 
+CREATE INDEX index_vulnerability_finding_signatures_on_signature_sha ON vulnerability_finding_signatures USING btree (signature_sha);
+
 CREATE INDEX index_vulnerability_findings_remediations_on_remediation_id ON vulnerability_findings_remediations USING btree (vulnerability_remediation_id);
 
 CREATE UNIQUE INDEX index_vulnerability_findings_remediations_on_unique_keys ON vulnerability_findings_remediations USING btree (vulnerability_occurrence_id, vulnerability_remediation_id);
@@ -32755,8 +32759,6 @@ CREATE INDEX tmp_index_for_null_member_namespace_id ON members USING btree (memb
 
 CREATE INDEX tmp_index_for_project_namespace_id_migration_on_routes ON routes USING btree (id) WHERE ((namespace_id IS NULL) AND ((source_type)::text = 'Project'::text));
 
-CREATE INDEX tmp_index_for_software_licenses_spdx_identifier_cleanup ON software_licenses USING btree (spdx_identifier) WHERE (spdx_identifier IS NULL);
-
 CREATE INDEX tmp_index_members_on_state ON members USING btree (state) WHERE (state = 2);
 
 CREATE INDEX tmp_index_migrated_container_registries ON container_repositories USING btree (project_id) WHERE ((migration_state = 'import_done'::text) OR (created_at >= '2022-01-23 00:00:00'::timestamp without time zone));
diff --git a/doc/architecture/blueprints/database_testing/index.md b/doc/architecture/blueprints/database_testing/index.md
index f0e3f49f280..21d22574302 100644
--- a/doc/architecture/blueprints/database_testing/index.md
+++ b/doc/architecture/blueprints/database_testing/index.md
@@ -1,5 +1,5 @@
 ---
-status: accepted
+status: implemented
 creation-date: "2021-02-08"
 authors: [ "@abrandl" ]
 coach: "@glopezfernandez"
@@ -10,6 +10,11 @@ participating-stages: []
 
 # Database Testing
 
+**Notice:** This blueprints has been partially implemented. We still plan to
+iterate on the tooling. The content below is a historical version of the
+blueprint, written prior to incorporating database testing into our development
+workflow.
+
 We have identified [common themes of reverted migrations](https://gitlab.com/gitlab-org/gitlab/-/issues/233391) and discovered failed migrations breaking in both production and staging even when successfully tested in a developer environment. We have also experienced production incidents even with successful testing in staging. These failures are quite expensive: they can have a significant effect on availability, block deployments, and generate incident escalations. These escalations must be triaged and either reverted or fixed forward. Often, this can take place without the original author's involvement due to time zones and/or the criticality of the escalation. With our increased deployment speeds and stricter uptime requirements, the need for improving database testing is critical, particularly earlier in the development process (shift left).
 
 From a developer's perspective, it is hard, if not unfeasible, to validate a migration on a large enough dataset before it goes into production.
diff --git a/doc/ci/jobs/ci_job_token.md b/doc/ci/jobs/ci_job_token.md
index db916d8d125..78db064e4fd 100644
--- a/doc/ci/jobs/ci_job_token.md
+++ b/doc/ci/jobs/ci_job_token.md
@@ -78,7 +78,8 @@ see [epic 3559](https://gitlab.com/groups/gitlab-org/-/epics/3559).
 
 ### Allow access to your project with a job token
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/346298/) in GitLab 15.9. [Deployed behind the `:inbound_ci_scoped_job_token` feature flag](../../user/feature_flags.md), enabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/346298/) in GitLab 15.9. [Deployed behind the `:inbound_ci_scoped_job_token` feature flag](../../user/feature_flags.md), enabled by default.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/346298/) in GitLab 15.10.
 
 Create an **inbound** allowlist of projects which can access your project through
 their `CI_JOB_TOKEN`.
diff --git a/doc/operations/incident_management/incident_timeline_events.md b/doc/operations/incident_management/incident_timeline_events.md
index 7913e4668eb..fdbb4844bb7 100644
--- a/doc/operations/incident_management/incident_timeline_events.md
+++ b/doc/operations/incident_management/incident_timeline_events.md
@@ -113,10 +113,7 @@ Alternatively:
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/8741) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) named `incident_event_tags`. Disabled by default.
 > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/387647) in GitLab 15.9.
 > - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/387647) in GitLab 15.10.
-
-FLAG:
-On self-managed GitLab, by default this feature is available. To hide the feature, ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `incident_event_tags`.
-On GitLab.com, this feature is available.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/387647) in GitLab 15.11. Feature flag `incident_event_tags` removed.
 
 [When creating an event using the form](#using-the-form) or editing it,
 you can specify incident tags to capture relevant incident timestamps.
diff --git a/doc/tutorials/index.md b/doc/tutorials/index.md
index d81b667e700..6e185bd2a88 100644
--- a/doc/tutorials/index.md
+++ b/doc/tutorials/index.md
@@ -35,16 +35,17 @@ the most out of GitLab.
 | [Take advantage of Git rebase](https://about.gitlab.com/blog/2022/10/06/take-advantage-of-git-rebase/)| Learn how to use the `rebase` command in your workflow. | |
 | [Git cheat sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf) | Download a PDF of common Git commands. | |
 
-## Plan your work in projects
+## Plan and track your work
 
-Your work takes place in a project, from creating code, to planning,
-collaborating, and more.
+Create a project to host your code, and plan your work using
+issues, epics, and more.
 
 | Topic | Description | Good for beginners |
 |-------|-------------|--------------------|
 | [Create a project from a template](https://gitlab.com/projects/new#create_from_template) | Choose a project template and create a project with files to get you started. | |
 | [Migrate to GitLab](../user/project/import/index.md) | If you are coming to GitLab from another platform, you can import or convert your projects. | |
 | [Run an agile iteration](agile_sprint.md) | Use group, projects, and iterations to run an agile development iteration. |
+| [Epics and Issue Boards](https://www.youtube.com/watch?v=I1bFIAQBHB8) | Find out how to use epics and issue boards for project management. | |
 
 ## Use CI/CD pipelines
 
diff --git a/doc/user/analytics/value_streams_dashboard.md b/doc/user/analytics/value_streams_dashboard.md
index fd4cdd0d65f..550b5e2d1df 100644
--- a/doc/user/analytics/value_streams_dashboard.md
+++ b/doc/user/analytics/value_streams_dashboard.md
@@ -4,7 +4,7 @@ group: Optimize
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Value Streams Dashboard **(ULTIMATE)**
+# Value Streams Dashboard (Beta) **(ULTIMATE)**
 
 > Introduced in GitLab 15.8 as a Closed [Beta](../../policy/alpha-beta-support.md#beta-features) feature [with a flag](../../administration/feature_flags.md) named `group_analytics_dashboards_page`. Disabled by default.
 
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index 7f1dca0f89f..d108c291200 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -137,7 +137,7 @@ Create the group you want to import to and connect the source GitLab instance:
 1. Enter the [personal access token](../../../user/profile/personal_access_tokens.md) for your source GitLab instance.
 1. Select **Connect instance**.
 
-### Select the groups to import
+### Select the groups and projects to import
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/385689) in GitLab 15.8, option to import groups with or without projects.
 
@@ -220,12 +220,15 @@ Group items that are migrated to the destination GitLab instance include:
    - Already exists in the destination GitLab instance.
    - Has a public email in the source GitLab instance that matches a confirmed email in the destination GitLab instance.
 
-### Migrated project items (beta)
+### Migrated project items (Beta)
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/267945) in GitLab 14.4 [with a flag](../../feature_flags.md) named `bulk_import_projects`. Disabled by default.
 > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/339941) in GitLab 15.6.
 > - `bulk_import_projects` feature flag [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/339941) in GitLab 15.10.
 
+If you choose to migrate projects when you [select groups to migrate](#select-the-groups-and-projects-to-import),
+project items are migrated with the projects.
+
 The project items that are migrated depends on the version of GitLab you use on the destination. To determine if a
 specific project item is migrated:
 
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index 1aea718d7a8..02233e096a2 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -124,21 +124,50 @@ You can install a package from a GitLab project or instance:
 - **Instance-level**: Use when you have many npm packages in different GitLab groups or in their own namespace.
 - **Project-level**: Use when you have few npm packages and they are not in the same GitLab group.
 
+### Authenticate to the Package Registry
+
+You must authenticate to the Package Registry to install a package from a private project.
+No authentication is needed if the project is public.
+
+To authenticate with `npm`:
+
+```shell
+npm config set -- //your_domain_name/:_authToken=your_token
+```
+
+With npm version 7 or earlier, use the full URL to the endpoint.
+
+If you're installing:
+
+- From the instance level:
+
+  ```shell
+  npm config set -- //your_domain_name/api/v4/packages/npm/:_authToken=your_token
+  ```
+
+  From the project level:
+
+  ```shell
+  npm config set -- //your_domain_name/api/v4/projects/your_project_id/packages/npm/:_authToken=your_token
+  ```
+
+In these examples:
+
+- Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
+- Replace `your_project_id` is your project ID, found on the project's home page.
+- Replace `your_token` with a deploy token, group access token, project access token, or personal access token.
+
+NOTE:
+Starting with npm version 8, you can [use a URI fragment instead of a full URL](https://docs.npmjs.com/cli/v8/configuring-npm/npmrc?v=true#auth-related-configuration)
+in the `_authToken` parameter. However, [group-level endpoints](https://gitlab.com/gitlab-org/gitlab/-/issues/299834)
+are not supported.
+
 ### Install from the instance level
 
 WARNING:
 To install a package from the instance level, the package must have been published following the scoped [naming convention](#naming-convention).
 
-1. Authenticate to the Package Registry
-
-   If you would like to install a package from a private project, you would have to authenticate to the Package Registry. Skip this step if the project is not private.
-
-   ```shell
-   npm config set -- //your_domain_name/api/v4/packages/npm/:_authToken=your_token
-   ```
-
-   - Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
-   - Replace `your_token` with a deploy token, group access token, project access token, or personal access token.
+1. [Authenticate to the Package Registry](#authenticate-to-the-package-registry).
 
 1. Set the registry
 
@@ -158,17 +187,7 @@ To install a package from the instance level, the package must have been publish
 
 ### Install from the project level
 
-1. Authenticate to the Package Registry
-
-   If you would like to install a package from a private project, you would have to authenticate to the Package Registry. Skip this step if the project is not private.
-
-   ```shell
-   npm config set -- //your_domain_name/api/v4/projects/your_project_id/packages/npm/:_authToken=your_token
-   ```
-
-   - Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
-   - Replace `your_project_id` is your project ID, found on the project's home page.
-   - Replace `your_token` with a deploy token, group access token, project access token, or personal access token.
+1. [Authenticate to the Package Registry](#authenticate-to-the-package-registry).
 
 1. Set the registry
 
diff --git a/doc/user/product_analytics/index.md b/doc/user/product_analytics/index.md
index 64889fc75c3..69fcf5f7629 100644
--- a/doc/user/product_analytics/index.md
+++ b/doc/user/product_analytics/index.md
@@ -4,7 +4,7 @@ group: Product Analytics
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Product analytics **(ULTIMATE)**
+# Product analytics (Alpha) **(ULTIMATE)**
 
 > - Introduced in GitLab 15.4 as an [Alpha](../../policy/alpha-beta-support.md#alpha-features) feature [with a flag](../../administration/feature_flags.md) named `cube_api_proxy`. Disabled by default.
 > - `cube_api_proxy` revised to only reference the [Product Analytics API](../../api/product_analytics.md) in GitLab 15.6.
diff --git a/jest.config.base.js b/jest.config.base.js
index f3a58ff0769..3394d8c7742 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -43,6 +43,7 @@ module.exports = (path, options = {}) => {
 
       // Library wrappers
       '^vuex$': '<rootDir>/app/assets/javascripts/lib/utils/vue3compat/vuex.js',
+      '^vue-apollo$': '<rootDir>/app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js',
     });
     Object.assign(globals, {
       'vue-jest': {
diff --git a/lib/sidebars/groups/super_sidebar_menus/analyze_menu.rb b/lib/sidebars/groups/super_sidebar_menus/analyze_menu.rb
new file mode 100644
index 00000000000..65393336797
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/analyze_menu.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class AnalyzeMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('Navigation|Analyze')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'chart'
+        end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :cycle_analytics,
+            :ci_cd_analytics,
+            :contribution_analytics,
+            :devops_adoption,
+            :insights,
+            :issues_analytics,
+            :productivity_analytics,
+            :repository_analytics
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_menus/build_menu.rb b/lib/sidebars/groups/super_sidebar_menus/build_menu.rb
new file mode 100644
index 00000000000..988f3d498b9
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/build_menu.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class BuildMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('Navigation|Build')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'rocket'
+        end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :runners
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_menus/manage_menu.rb b/lib/sidebars/groups/super_sidebar_menus/manage_menu.rb
new file mode 100644
index 00000000000..71214c42bf5
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/manage_menu.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class ManageMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('Navigation|Manage')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'users'
+        end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :activity,
+            :members,
+            :labels,
+            :milestones,
+            :iterations
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_menus/monitor_menu.rb b/lib/sidebars/groups/super_sidebar_menus/monitor_menu.rb
new file mode 100644
index 00000000000..8ee0aaaa808
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/monitor_menu.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class MonitorMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('Navigation|Monitor')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'monitor'
+        end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :explore,
+            :datasources
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb b/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb
index 195718e0681..fe17ada69e4 100644
--- a/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb
+++ b/lib/sidebars/groups/super_sidebar_menus/operations_menu.rb
@@ -6,13 +6,23 @@ module Sidebars
       class OperationsMenu < ::Sidebars::Menu
         override :title
         def title
-          _('Operations')
+          s_('Navigation|Operate')
         end
 
         override :sprite_icon
         def sprite_icon
           'deployments'
         end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :dependency_proxy,
+            :packages_registry,
+            :container_registry,
+            :group_kubernetes_clusters
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
       end
     end
   end
diff --git a/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb b/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
index 8a90974c0d4..da357253b8f 100644
--- a/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
+++ b/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
@@ -6,13 +6,25 @@ module Sidebars
       class PlanMenu < ::Sidebars::Menu
         override :title
         def title
-          _('Plan')
+          s_('Navigation|Plan')
         end
 
         override :sprite_icon
         def sprite_icon
           'planning'
         end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :issue_boards,
+            :epic_boards,
+            :roadmap,
+            :group_wiki,
+            :crm_contacts,
+            :crm_organizations
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
       end
     end
   end
diff --git a/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb b/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb
new file mode 100644
index 00000000000..bc4c69c461a
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/secure_menu.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Sidebars
+  module Groups
+    module SuperSidebarMenus
+      class SecureMenu < ::Sidebars::Menu
+        override :title
+        def title
+          s_('Navigation|Secure')
+        end
+
+        override :sprite_icon
+        def sprite_icon
+          'shield'
+        end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :audit_events,
+            :security_dashboard,
+            :vulnerability_report,
+            :compliance,
+            :scan_policies
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/sidebars/groups/super_sidebar_panel.rb b/lib/sidebars/groups/super_sidebar_panel.rb
index 620f6e78eda..3a9d8304183 100644
--- a/lib/sidebars/groups/super_sidebar_panel.rb
+++ b/lib/sidebars/groups/super_sidebar_panel.rb
@@ -13,15 +13,16 @@ module Sidebars
         @menus = []
 
         add_menu(Sidebars::StaticMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::ManageMenu.new(context))
         add_menu(Sidebars::Groups::SuperSidebarMenus::PlanMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::BuildMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::SecureMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::OperationsMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::MonitorMenu.new(context))
+        add_menu(Sidebars::Groups::SuperSidebarMenus::AnalyzeMenu.new(context))
 
         pick_from_old_menus(old_menus)
 
-        insert_menu_before(
-          Sidebars::Groups::Menus::ObservabilityMenu,
-          Sidebars::Groups::SuperSidebarMenus::OperationsMenu.new(context)
-        )
-
         insert_menu_before(
           Sidebars::Groups::Menus::SettingsMenu,
           Sidebars::UncategorizedMenu.new(context)
diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb
index 333112e13b6..caaa4e21de2 100644
--- a/lib/sidebars/projects/menus/monitor_menu.rb
+++ b/lib/sidebars/projects/menus/monitor_menu.rb
@@ -38,9 +38,9 @@ module Sidebars
           { controller: [:user, :gcp] }
         end
 
-        override :pick_into_super_sidebar?
-        def pick_into_super_sidebar?
-          true
+        override :serialize_as_menu_item_args
+        def serialize_as_menu_item_args
+          nil
         end
 
         private
@@ -57,6 +57,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Metrics'),
             link: project_metrics_dashboard_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
             active_routes: { path: 'metrics_dashboard#show' },
             container_html_options: { class: 'shortcuts-metrics' },
             item_id: :metrics
@@ -71,6 +72,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Error Tracking'),
             link: project_error_tracking_index_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
             active_routes: { controller: :error_tracking },
             item_id: :error_tracking
           )
@@ -84,6 +86,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Alerts'),
             link: project_alert_management_index_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
             active_routes: { controller: :alert_management },
             item_id: :alert_management
           )
@@ -97,6 +100,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Incidents'),
             link: project_incidents_path(context.project),
+            super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
             active_routes: { controller: [:incidents, :incident_management] },
             item_id: :incidents
           )
diff --git a/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb b/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb
index 40981813cb6..af621a0f46f 100644
--- a/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb
+++ b/lib/sidebars/projects/super_sidebar_menus/monitor_menu.rb
@@ -13,6 +13,18 @@ module Sidebars
         def sprite_icon
           'monitor'
         end
+
+        override :configure_menu_items
+        def configure_menu_items
+          [
+            :metrics,
+            :error_tracking,
+            :alert_management,
+            :incidents,
+            :on_call_schedules,
+            :escalation_policies
+          ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+        end
       end
     end
   end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a646e0a0515..4360f3a5644 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -27313,6 +27313,9 @@ msgstr ""
 msgid "MergeRequest|Compare %{target} and %{source}"
 msgstr ""
 
+msgid "MergeRequest|Encountered an issue while trying to fetch the single file diff."
+msgstr ""
+
 msgid "MergeRequest|Error dismissing suggestion popover. Please try again."
 msgstr ""
 
@@ -29225,6 +29228,9 @@ msgstr ""
 msgid "NorthstarNavigation|Alpha"
 msgstr ""
 
+msgid "NorthstarNavigation|Beta"
+msgstr ""
+
 msgid "NorthstarNavigation|Could not update the new navigation preference. Please try again later."
 msgstr ""
 
diff --git a/package.json b/package.json
index dc95e9b3294..612d0688de8 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,8 @@
     "@tiptap/pm": "^2.0.0-beta.220",
     "@tiptap/suggestion": "^2.0.0-beta.220",
     "@tiptap/vue-2": "2.0.0-beta.220",
+    "@vue/apollo-components": "^4.0.0-beta.4",
+    "@vue/apollo-option": "^4.0.0-beta.4",
     "apollo-upload-client": "15.0.0",
     "apollo3-cache-persist": "^0.14.1",
     "autosize": "^5.0.1",
diff --git a/qa/qa/page/project/settings/branch_rules.rb b/qa/qa/page/project/settings/branch_rules.rb
new file mode 100644
index 00000000000..b01f493addf
--- /dev/null
+++ b/qa/qa/page/project/settings/branch_rules.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      module Settings
+        class BranchRules < Page::Base
+          view 'app/assets/javascripts/projects/settings/repository/branch_rules/app.vue' do
+            element :add_branch_rule_button
+          end
+
+          view 'app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue' do
+            element :branch_content
+            element :details_button
+          end
+
+          def click_add_branch_rule
+            click_element(:add_branch_rule_button)
+            click_button('Create protected branch')
+          end
+
+          def navigate_to_branch_rules_details(branch_name)
+            within_element(:branch_content, branch_name: branch_name) do
+              click_element(:details_button)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+QA::Page::Project::Settings::BranchRules.prepend_mod_with('Page::Project::Settings::BranchRules', namespace: QA)
diff --git a/qa/qa/page/project/settings/branch_rules_details.rb b/qa/qa/page/project/settings/branch_rules_details.rb
new file mode 100644
index 00000000000..f6806a30efa
--- /dev/null
+++ b/qa/qa/page/project/settings/branch_rules_details.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      module Settings
+        class BranchRulesDetails < Page::Base
+          view 'app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue' do
+            element :allowed_to_push_content
+            element :allowed_to_merge_content
+          end
+
+          view 'app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue' do
+            element :access_level_content
+          end
+
+          def has_allowed_to_push?(role)
+            within_element(:allowed_to_push_content) do
+              has_element?(:access_level_content, role: role)
+            end
+          end
+
+          def has_allowed_to_merge?(role)
+            within_element(:allowed_to_merge_content) do
+              has_element?(:access_level_content, role: role)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+QA::Page::Project::Settings::BranchRulesDetails.prepend_mod_with( # rubocop:disable Cop/InjectEnterpriseEditionModule
+  'Page::Project::Settings::BranchRulesDetails', namespace: QA)
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index 6931d26b259..d9aaacbde32 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -27,6 +27,10 @@ module QA
             element :protected_tag_settings_content
           end
 
+          view 'app/views/projects/branch_rules/_show.html.haml' do
+            element :branch_rules_content
+          end
+
           def expand_deploy_tokens(&block)
             expand_content(:deploy_tokens_settings_content) do
               Settings::DeployTokens.perform(&block)
@@ -57,6 +61,10 @@ module QA
             end
           end
 
+          def expand_branch_rules
+            expand_content(:branch_rules_content)
+          end
+
           def expand_default_branch(&block)
             within('#branch-defaults-settings') do
               find('.btn-default').click do
diff --git a/qa/qa/specs/features/api/1_manage/group_access_token_spec.rb b/qa/qa/specs/features/api/1_manage/group_access_token_spec.rb
index e0db758dde3..fc400fbb9c7 100644
--- a/qa/qa/specs/features/api/1_manage/group_access_token_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/group_access_token_spec.rb
@@ -26,6 +26,9 @@ module QA
             file.name = "text-#{SecureRandom.hex(8)}.txt"
             file.content = 'New file'
           end
+        rescue StandardError => e
+          QA::Runtime::Logger.error("Full failure message: #{e.message}")
+          raise
         end.not_to raise_error
       end
 
@@ -42,6 +45,9 @@ module QA
             commit.commit_message = 'Add new file'
             commit.add_files([{ file_path: "text-#{SecureRandom.hex(8)}.txt", content: 'new file' }])
           end
+        rescue StandardError => e
+          QA::Runtime::Logger.error("Full failure message: #{e.message}")
+          raise
         end.not_to raise_error
       end
     end
diff --git a/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb b/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
index d693bbd43ff..eeeb78e17d7 100644
--- a/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
@@ -24,6 +24,9 @@ module QA
               file.name = "text-#{SecureRandom.hex(8)}.txt"
               file.content = 'New file'
             end
+          rescue StandardError => e
+            QA::Runtime::Logger.error("Full failure message: #{e.message}")
+            raise
           end.not_to raise_error
         end
 
@@ -37,6 +40,9 @@ module QA
               commit.commit_message = 'Add new file'
               commit.add_files([{ file_path: "text-#{SecureRandom.hex(8)}.txt", content: 'new file' }])
             end
+          rescue StandardError => e
+            QA::Runtime::Logger.error("Full failure message: #{e.message}")
+            raise
           end.not_to raise_error
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_new_branch_rule_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_new_branch_rule_spec.rb
new file mode 100644
index 00000000000..de6723e5579
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_new_branch_rule_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Create' do
+    describe 'Branch Rules Overview', product_group: :source_code, feature_flag: {
+      name: 'branch_rules',
+      scope: :project
+    } do
+      let(:branch_name) { 'new-branch' }
+      let(:allowed_to_push_role) { Resource::ProtectedBranch::Roles::NO_ONE }
+      let(:allowed_to_merge_role) { Resource::ProtectedBranch::Roles::MAINTAINERS }
+      let(:project) do
+        Resource::Project.fabricate_via_api! do |project|
+          project.name = 'branch-rule-project'
+          project.initialize_with_readme = true
+        end
+      end
+
+      before do
+        Runtime::Feature.enable(:branch_rules, project: project)
+
+        Flow::Login.sign_in
+
+        Resource::Repository::Commit.fabricate_via_api! do |commit|
+          commit.project = project
+          commit.branch = branch_name
+          commit.start_branch = project.default_branch
+          commit.commit_message = 'First commit'
+          commit.add_files([{ file_path: 'new_file.rb', content: '# new content' }])
+        end
+      end
+
+      after do
+        Runtime::Feature.disable(:branch_rules, project: project)
+      end
+
+      it 'adds a new branch rule', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/397587' do
+        project.visit!
+
+        Page::Project::Menu.perform(&:go_to_repository_settings)
+
+        Page::Project::Settings::Repository.perform(&:expand_branch_rules)
+
+        Page::Project::Settings::BranchRules.perform(&:click_add_branch_rule)
+
+        Page::Project::Settings::ProtectedBranches.perform do |settings|
+          settings.select_branch(branch_name)
+          settings.select_allowed_to_push(roles: allowed_to_push_role)
+          settings.select_allowed_to_merge(roles: allowed_to_merge_role)
+          settings.protect_branch
+        end
+
+        Page::Project::Settings::Repository.perform(&:expand_branch_rules)
+
+        Page::Project::Settings::BranchRules.perform do |rules|
+          expect(rules).to have_content(branch_name)
+          rules.navigate_to_branch_rules_details(branch_name)
+        end
+
+        Page::Project::Settings::BranchRulesDetails.perform do |details|
+          aggregate_failures 'branch rules details' do
+            expect(details).to have_allowed_to_push(allowed_to_push_role[:description])
+            expect(details).to have_allowed_to_merge(allowed_to_merge_role[:description])
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/factories/packages/debian/file_metadatum.rb b/spec/factories/packages/debian/file_metadatum.rb
index ef6c4e1f222..42729b25087 100644
--- a/spec/factories/packages/debian/file_metadatum.rb
+++ b/spec/factories/packages/debian/file_metadatum.rb
@@ -6,7 +6,7 @@ FactoryBot.define do
     file_type { 'deb' }
     component { 'main' }
     architecture { 'amd64' }
-    fields { { 'a': 'b' } }
+    fields { { 'a' => 'b' } }
 
     trait(:unknown) do
       file_type { 'unknown' }
@@ -32,19 +32,20 @@ FactoryBot.define do
           'Source' => package_file.package.name,
           'Binary' => 'sample-dev, libsample0, sample-udeb, sample-ddeb',
           'Architecture' => 'any',
-          'Version': package_file.package.version,
+          'Version' => package_file.package.version,
           'Maintainer' => "#{FFaker::Name.name} <#{FFaker::Internet.email}>",
           'Homepage' => FFaker::Internet.http_url,
           'Standards-Version' => '4.5.0',
           'Build-Depends' => 'debhelper-compat (= 13)',
-          'Package-List' => <<~EOF.rstrip,
-           libsample0 deb libs optional arch=any',
-           'sample-ddeb deb libs optional arch=any',
-           sample-dev deb libdevel optional arch=any',
-           sample-udeb udeb libs optional arch=any',
-          EOF
+          'Package-List' => <<~PACKAGELIST.rstrip,
+          libsample0 deb libs optional arch=any
+          sample-ddeb deb libs optional arch=any
+          sample-dev deb libdevel optional arch=any
+          sample-udeb udeb libs optional arch=any
+          PACKAGELIST
           'Checksums-Sha1' => "\n4a9cb2a7c77a68dc0fe54ba8ecef133a7c949e9d 964 sample_1.2.3~alpha2.tar.xz",
-          'Checksums-Sha256' => "\nc9d05185ca158bb804977fa9d7b922e8a0f644a2da41f99d2787dd61b1e2e2c5 964 sample_1.2.3~alpha2.tar.xz",
+          'Checksums-Sha256' =>
+            "\nc9d05185ca158bb804977fa9d7b922e8a0f644a2da41f99d2787dd61b1e2e2c5 964 sample_1.2.3~alpha2.tar.xz",
           'Files' => "\nadc69e57cda38d9bb7c8d59cacfb6869 964 sample_1.2.3~alpha2.tar.xz"
         }
       end
@@ -56,22 +57,22 @@ FactoryBot.define do
       architecture { 'amd64' }
       fields do
         {
-        'Package' => 'libsample0',
-        'Source' => package_file.package.name,
-        'Version' => package_file.package.version,
-        'Architecture' => 'amd64',
-        'Maintainer' => "#{FFaker::Name.name} <#{FFaker::Internet.email}>",
-        'Installed-Size' => '7',
-        'Section' => 'libs',
-        'Priority' => 'optional',
-        'Multi-Arch' => 'same',
-        'Homepage' => FFaker::Internet.http_url,
-        'Description' => <<~EOF.rstrip
-        Some mostly empty lib
-        Used in GitLab tests.
+          'Package' => 'libsample0',
+          'Source' => package_file.package.name,
+          'Version' => package_file.package.version,
+          'Architecture' => 'amd64',
+          'Maintainer' => "#{FFaker::Name.name} <#{FFaker::Internet.email}>",
+          'Installed-Size' => '7',
+          'Section' => 'libs',
+          'Priority' => 'optional',
+          'Multi-Arch' => 'same',
+          'Homepage' => FFaker::Internet.http_url,
+          'Description' => <<~DESCRIPTION.rstrip
+          Some mostly empty lib
+          Used in GitLab tests.
 
-        Testing another paragraph.
-        EOF
+          Testing another paragraph.
+          DESCRIPTION
         }
       end
     end
@@ -93,12 +94,12 @@ FactoryBot.define do
           'Priority' => 'optional',
           'Multi-Arch' => 'same',
           'Homepage' => FFaker::Internet.http_url,
-          'Description' => <<~EOF.rstrip
+          'Description' => <<~DESCRIPTION.rstrip
           Some mostly empty development files
           Used in GitLab tests.
 
           Testing another paragraph.
-          EOF
+          DESCRIPTION
         }
       end
     end
@@ -107,28 +108,28 @@ FactoryBot.define do
       file_type { 'udeb' }
       component { 'main' }
       architecture { 'amd64' }
-      fields { { 'a': 'b' } }
+      fields { { 'a' => 'b' } }
     end
 
     trait(:ddeb) do
       file_type { 'ddeb' }
       component { 'main' }
       architecture { 'amd64' }
-      fields { { 'a': 'b' } }
+      fields { { 'a' => 'b' } }
     end
 
     trait(:buildinfo) do
       file_type { 'buildinfo' }
       component { 'main' }
       architecture { nil }
-      fields { { 'Architecture': 'amd64 source' } }
+      fields { { 'Architecture' => 'amd64 source' } }
     end
 
     trait(:changes) do
       file_type { 'changes' }
       component { nil }
       architecture { nil }
-      fields { { 'Architecture': 'source amd64' } }
+      fields { { 'Architecture' => 'source amd64' } }
     end
   end
 end
diff --git a/spec/factories/packages/package_files.rb b/spec/factories/packages/package_files.rb
index ababa8fa7f5..4a2d412832c 100644
--- a/spec/factories/packages/package_files.rb
+++ b/spec/factories/packages/package_files.rb
@@ -215,6 +215,7 @@ FactoryBot.define do
       end
 
       trait(:keep) do
+        # do not override attributes
       end
     end
 
diff --git a/spec/features/incidents/incident_timeline_events_spec.rb b/spec/features/incidents/incident_timeline_events_spec.rb
index a4449ee2608..4d51ed652c9 100644
--- a/spec/features/incidents/incident_timeline_events_spec.rb
+++ b/spec/features/incidents/incident_timeline_events_spec.rb
@@ -43,9 +43,7 @@ RSpec.describe 'Incident timeline events', :js, feature_category: :incident_mana
       expect(page).to have_content(s_('Incident|No timeline items have been added yet.'))
     end
 
-    it 'submits event data on save with feature flag on' do
-      stub_feature_flags(incident_event_tags: true)
-
+    it 'submits event data on save' do
       # Add event
       click_button(s_('Incident|Add new timeline event'))
 
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 33edfc5352b..d990c57fbf1 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -294,7 +294,9 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
       end
     end
 
-    context 'with valid username/password' do
+    # Freeze time to prevent failures when time between code being entered and
+    # validated greater than otp_allowed_drift
+    context 'with valid username/password', :freeze_time do
       let(:user) { create(:user, :two_factor) }
 
       before do
@@ -321,8 +323,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
       end
 
       context 'using one-time code' do
-        it 'allows login with valid code',
-          quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/402322' do
+        it 'allows login with valid code' do
           expect(authentication_metrics)
             .to increment(:user_authenticated_counter)
             .and increment(:user_two_factor_authenticated_counter)
@@ -348,8 +349,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
           expect(page).to have_content('Invalid two-factor code')
         end
 
-        it 'allows login with invalid code, then valid code',
-          quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/402322' do
+        it 'allows login with invalid code, then valid code' do
           expect(authentication_metrics)
             .to increment(:user_authenticated_counter)
             .and increment(:user_two_factor_authenticated_counter)
@@ -363,8 +363,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
           expect(page).to have_current_path root_path, ignore_query: true
         end
 
-        it 'triggers ActiveSession.cleanup for the user',
-          quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/402322' do
+        it 'triggers ActiveSession.cleanup for the user' do
           expect(authentication_metrics)
             .to increment(:user_authenticated_counter)
             .and increment(:user_two_factor_authenticated_counter)
@@ -421,8 +420,10 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
         end
       end
 
-      context 'when two factor authentication is required' do
-        it 'shows 2FA prompt after OAuth login', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/402615' do
+      # Freeze time to prevent failures when time between code being entered and
+      # validated greater than otp_allowed_drift
+      context 'when two factor authentication is required', :freeze_time do
+        it 'shows 2FA prompt after OAuth login' do
           expect(authentication_metrics)
             .to increment(:user_authenticated_counter)
             .and increment(:user_two_factor_authenticated_counter)
@@ -613,23 +614,21 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
         end
 
         context 'within the grace period' do
-          it 'redirects to two-factor configuration page' do
-            freeze_time do
-              expect(authentication_metrics)
-                .to increment(:user_authenticated_counter)
+          it 'redirects to two-factor configuration page', :freeze_time do
+            expect(authentication_metrics)
+              .to increment(:user_authenticated_counter)
 
-              gitlab_sign_in(user)
+            gitlab_sign_in(user)
 
-              expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
-              expect(page).to have_content(
-                'The group settings for Group 1 and Group 2 require you to enable '\
-                'Two-Factor Authentication for your account. '\
-                'You can leave Group 1 and leave Group 2. '\
-                'You need to do this '\
-                'before '\
-                "#{(Time.zone.now + 2.days).strftime("%a, %d %b %Y %H:%M:%S %z")}"
-              )
-            end
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
+            expect(page).to have_content(
+              'The group settings for Group 1 and Group 2 require you to enable '\
+              'Two-Factor Authentication for your account. '\
+              'You can leave Group 1 and leave Group 2. '\
+              'You need to do this '\
+              'before '\
+              "#{(Time.zone.now + 2.days).strftime("%a, %d %b %Y %H:%M:%S %z")}"
+            )
           end
 
           it 'allows skipping two-factor configuration', :js do
diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js
index 8ef41cc83f2..351e62fb6e0 100644
--- a/spec/frontend/diffs/store/actions_spec.js
+++ b/spec/frontend/diffs/store/actions_spec.js
@@ -10,6 +10,7 @@ import {
   INLINE_DIFF_VIEW_TYPE,
   PARALLEL_DIFF_VIEW_TYPE,
 } from '~/diffs/constants';
+import { LOAD_SINGLE_DIFF_FAILED } from '~/diffs/i18n';
 import * as diffActions from '~/diffs/store/actions';
 import * as types from '~/diffs/store/mutation_types';
 import * as utils from '~/diffs/store/utils';
@@ -994,6 +995,87 @@ describe('DiffsStoreActions', () => {
     });
   });
 
+  describe('goToFile', () => {
+    const getters = {};
+    const file = { path: 'path' };
+    const fileHash = 'test';
+    let state;
+    let dispatch;
+    let commit;
+
+    beforeEach(() => {
+      getters.isTreePathLoaded = () => false;
+      state = {
+        viewDiffsFileByFile: true,
+        treeEntries: {
+          path: {
+            fileHash,
+          },
+        },
+      };
+      commit = jest.fn();
+      dispatch = jest.fn().mockResolvedValue();
+    });
+
+    it('immediately defers to scrollToFile if the app is not in file-by-file mode', () => {
+      state.viewDiffsFileByFile = false;
+
+      diffActions.goToFile({ state, dispatch }, file);
+
+      expect(dispatch).toHaveBeenCalledWith('scrollToFile', file);
+    });
+
+    describe('when the app is in fileByFile mode', () => {
+      it('commits SET_CURRENT_DIFF_FILE', () => {
+        diffActions.goToFile({ state, commit, dispatch, getters }, file);
+
+        expect(commit).toHaveBeenCalledWith(types.SET_CURRENT_DIFF_FILE, fileHash);
+      });
+
+      it('does nothing more if the path has already been loaded', () => {
+        getters.isTreePathLoaded = () => true;
+
+        diffActions.goToFile({ state, dispatch, getters, commit }, file);
+
+        expect(commit).toHaveBeenCalledWith(types.SET_CURRENT_DIFF_FILE, fileHash);
+        expect(dispatch).toHaveBeenCalledTimes(0);
+      });
+
+      describe('when the tree entry has not been loaded', () => {
+        it('updates location hash', () => {
+          diffActions.goToFile({ state, commit, getters, dispatch }, file);
+
+          expect(document.location.hash).toBe('#test');
+        });
+
+        it('loads the file and then scrolls to it', async () => {
+          diffActions.goToFile({ state, commit, getters, dispatch }, file);
+
+          // Wait for the fetchFileByFile dispatch to return, to trigger scrollToFile
+          await waitForPromises();
+
+          expect(dispatch).toHaveBeenCalledWith('fetchFileByFile');
+          expect(dispatch).toHaveBeenCalledWith('scrollToFile', file);
+          expect(dispatch).toHaveBeenCalledTimes(2);
+        });
+
+        it('shows an alert when there was an error fetching the file', async () => {
+          dispatch = jest.fn().mockRejectedValue();
+
+          diffActions.goToFile({ state, commit, getters, dispatch }, file);
+
+          // Wait for the fetchFileByFile dispatch to return, to trigger the catch
+          await waitForPromises();
+
+          expect(createAlert).toHaveBeenCalledTimes(1);
+          expect(createAlert).toHaveBeenCalledWith({
+            message: expect.stringMatching(LOAD_SINGLE_DIFF_FAILED),
+          });
+        });
+      });
+    });
+  });
+
   describe('scrollToFile', () => {
     let commit;
     const getters = { isVirtualScrollingEnabled: false };
diff --git a/spec/frontend/issues/show/components/incidents/create_timeline_events_form_spec.js b/spec/frontend/issues/show/components/incidents/create_timeline_events_form_spec.js
index 6b68e7a0da6..b13a1041eda 100644
--- a/spec/frontend/issues/show/components/incidents/create_timeline_events_form_spec.js
+++ b/spec/frontend/issues/show/components/incidents/create_timeline_events_form_spec.js
@@ -86,7 +86,6 @@ describe('Create Timeline events', () => {
       provide: {
         fullPath: 'group/project',
         issuableId: '1',
-        glFeatures: { incidentEventTags: true },
       },
       apolloProvider,
     });
diff --git a/spec/frontend/issues/show/components/incidents/timeline_events_form_spec.js b/spec/frontend/issues/show/components/incidents/timeline_events_form_spec.js
index af01fd34336..500d0b0909e 100644
--- a/spec/frontend/issues/show/components/incidents/timeline_events_form_spec.js
+++ b/spec/frontend/issues/show/components/incidents/timeline_events_form_spec.js
@@ -113,17 +113,7 @@ describe('Timeline events form', () => {
     ]);
   });
 
-  describe('with incident_event_tag feature flag enabled', () => {
-    beforeEach(() => {
-      mountComponent(
-        {},
-        {},
-        {
-          incidentEventTags: true,
-        },
-      );
-    });
-
+  describe('Event Tags', () => {
     describe('event tags listbox', () => {
       it('should render option list from provided array', () => {
         expect(findTagsListbox().props('items')).toEqual(mockTags);
diff --git a/spec/frontend/ref/components/ref_selector_spec.js b/spec/frontend/ref/components/ref_selector_spec.js
index 6b90827f9c2..5e15ba26ece 100644
--- a/spec/frontend/ref/components/ref_selector_spec.js
+++ b/spec/frontend/ref/components/ref_selector_spec.js
@@ -35,6 +35,7 @@ describe('Ref selector component', () => {
   const projectId = '8';
   const totalBranchesCount = 123;
   const totalTagsCount = 456;
+  const queryParams = { sort: 'updated_desc' };
 
   let wrapper;
   let branchesApiCallSpy;
@@ -738,4 +739,25 @@ describe('Ref selector component', () => {
       expect(lastCallProps.matches).toMatchObject(expectedMatches);
     });
   });
+  describe('when queryParam prop is present', () => {
+    it('passes params to a branches API call', () => {
+      createComponent({ propsData: { queryParams } });
+
+      return waitForRequests().then(() => {
+        expect(branchesApiCallSpy).toHaveBeenCalledWith(
+          expect.objectContaining({ params: { per_page: 20, search: '', sort: queryParams.sort } }),
+        );
+      });
+    });
+
+    it('does not pass params to tags API call', () => {
+      createComponent({ propsData: { queryParams } });
+
+      return waitForRequests().then(() => {
+        expect(tagsApiCallSpy).toHaveBeenCalledWith(
+          expect.objectContaining({ params: { per_page: 20, search: '' } }),
+        );
+      });
+    });
+  });
 });
diff --git a/spec/frontend/ref/stores/actions_spec.js b/spec/frontend/ref/stores/actions_spec.js
index 099ce062a3a..c6aac8c9c98 100644
--- a/spec/frontend/ref/stores/actions_spec.js
+++ b/spec/frontend/ref/stores/actions_spec.js
@@ -52,6 +52,13 @@ describe('Ref selector Vuex store actions', () => {
     });
   });
 
+  describe('setParams', () => {
+    it(`commits ${types.SET_PARAMS} with the provided params`, () => {
+      const params = { sort: 'updated_asc' };
+      testAction(actions.setParams, params, state, [{ type: types.SET_PARAMS, payload: params }]);
+    });
+  });
+
   describe('search', () => {
     it(`commits ${types.SET_QUERY} with the new search query`, () => {
       const query = 'hello';
diff --git a/spec/frontend/ref/stores/mutations_spec.js b/spec/frontend/ref/stores/mutations_spec.js
index 37eee18dc10..8f16317b751 100644
--- a/spec/frontend/ref/stores/mutations_spec.js
+++ b/spec/frontend/ref/stores/mutations_spec.js
@@ -34,6 +34,7 @@ describe('Ref selector Vuex store mutations', () => {
             error: null,
           },
         },
+        params: null,
         selectedRef: null,
         requestCount: 0,
       });
@@ -56,6 +57,15 @@ describe('Ref selector Vuex store mutations', () => {
     });
   });
 
+  describe(`${types.SET_PARAMS}`, () => {
+    it('sets the additional query params', () => {
+      const params = { sort: 'updated_desc' };
+      mutations[types.SET_PARAMS](state, params);
+
+      expect(state.params).toBe(params);
+    });
+  });
+
   describe(`${types.SET_PROJECT_ID}`, () => {
     it('updates the project ID', () => {
       const newProjectId = '4';
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/analyze_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/analyze_menu_spec.rb
new file mode 100644
index 00000000000..3d3d304a5a0
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/analyze_menu_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::AnalyzeMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Analyze"))
+    expect(subject.sprite_icon).to eq("chart")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :cycle_analytics,
+      :ci_cd_analytics,
+      :contribution_analytics,
+      :devops_adoption,
+      :insights,
+      :issues_analytics,
+      :productivity_analytics,
+      :repository_analytics
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/build_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/build_menu_spec.rb
new file mode 100644
index 00000000000..9437e11c1b6
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/build_menu_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::BuildMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Build"))
+    expect(subject.sprite_icon).to eq("rocket")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :runners
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/manage_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/manage_menu_spec.rb
new file mode 100644
index 00000000000..cde9ab0d6fe
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/manage_menu_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::ManageMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Manage"))
+    expect(subject.sprite_icon).to eq("users")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :activity,
+      :members,
+      :labels,
+      :milestones,
+      :iterations
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/monitor_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/monitor_menu_spec.rb
new file mode 100644
index 00000000000..759975856b8
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/monitor_menu_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::MonitorMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Monitor"))
+    expect(subject.sprite_icon).to eq("monitor")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :explore,
+      :datasources
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb
new file mode 100644
index 00000000000..e9c2701021c
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::OperationsMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Operate"))
+    expect(subject.sprite_icon).to eq("deployments")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :dependency_proxy,
+      :packages_registry,
+      :container_registry,
+      :group_kubernetes_clusters
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb
new file mode 100644
index 00000000000..d289295d119
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::PlanMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Plan"))
+    expect(subject.sprite_icon).to eq("planning")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :issue_boards,
+      :epic_boards,
+      :roadmap,
+      :group_wiki,
+      :crm_contacts,
+      :crm_organizations
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/secure_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/secure_menu_spec.rb
new file mode 100644
index 00000000000..3640a4d8655
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/secure_menu_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::SecureMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Secure"))
+    expect(subject.sprite_icon).to eq("shield")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :audit_events,
+      :security_dashboard,
+      :vulnerability_report,
+      :compliance,
+      :scan_policies
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb b/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
index beaf3875f1c..55830a877ec 100644
--- a/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
+++ b/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
@@ -26,10 +26,15 @@ RSpec.describe Sidebars::Groups::SuperSidebarPanel, feature_category: :navigatio
     let(:category_menu) do
       [
         Sidebars::StaticMenu,
+        Sidebars::Groups::SuperSidebarMenus::ManageMenu,
         Sidebars::Groups::SuperSidebarMenus::PlanMenu,
+        Sidebars::Groups::SuperSidebarMenus::BuildMenu,
+        Sidebars::Groups::SuperSidebarMenus::SecureMenu,
+        Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
+        Sidebars::Groups::SuperSidebarMenus::MonitorMenu,
+        Sidebars::Groups::SuperSidebarMenus::AnalyzeMenu,
         Sidebars::Groups::Menus::CiCdMenu,
         (Sidebars::Groups::Menus::SecurityComplianceMenu if Gitlab.ee?),
-        Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
         Sidebars::Groups::Menus::ObservabilityMenu,
         (Sidebars::Groups::Menus::AnalyticsMenu if Gitlab.ee?),
         Sidebars::UncategorizedMenu,
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb
index 6398e20efd0..5c7f11bafe5 100644
--- a/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/monitor_menu_spec.rb
@@ -5,8 +5,22 @@ require 'spec_helper'
 RSpec.describe Sidebars::Projects::SuperSidebarMenus::MonitorMenu, feature_category: :navigation do
   subject { described_class.new({}) }
 
+  let(:items) { subject.instance_variable_get(:@items) }
+
   it 'has title and sprite_icon' do
     expect(subject.title).to eq(s_("Navigation|Monitor"))
     expect(subject.sprite_icon).to eq("monitor")
   end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :metrics,
+      :error_tracking,
+      :alert_management,
+      :incidents,
+      :on_call_schedules,
+      :escalation_policies
+    ])
+  end
 end
diff --git a/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb b/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
index e56dcb920d6..25554bba6f1 100644
--- a/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
@@ -34,7 +34,6 @@ RSpec.describe Sidebars::Projects::SuperSidebarPanel, feature_category: :navigat
         Sidebars::Projects::SuperSidebarMenus::OperationsMenu,
         Sidebars::Projects::SuperSidebarMenus::MonitorMenu,
         Sidebars::Projects::SuperSidebarMenus::AnalyzeMenu,
-        Sidebars::Projects::Menus::MonitorMenu,
         Sidebars::UncategorizedMenu,
         Sidebars::Projects::Menus::SettingsMenu
       ]
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index b1c2e6f3809..38b83a1bb64 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -78,7 +78,7 @@ RSpec.describe Notify do
       end
     end
 
-    context 'for issues' do
+    context 'for issues', feature_category: :team_planning do
       describe 'that are new' do
         subject { described_class.new_issue_email(issue.assignees.first.id, issue.id) }
 
@@ -154,6 +154,9 @@ RSpec.describe Notify do
             is_expected.to have_body_text("Assignee changed from <strong>#{previous_assignee.name}</strong> to <strong>#{assignee.name}</strong>")
             is_expected.to have_body_text(%(<a href="#{project_issue_url(project, issue)}">view it on GitLab</a>))
             is_expected.to have_body_text("You're receiving this email because of your account")
+            is_expected.to have_plain_text_content("Assignee changed from #{previous_assignee.name} to #{assignee.name}")
+            is_expected.to have_plain_text_content("view it on GitLab: #{project_issue_url(project, issue)}")
+            is_expected.to have_plain_text_content("You're receiving this email because of your account")
           end
         end
 
@@ -164,6 +167,11 @@ RSpec.describe Notify do
 
           it 'uses "Unassigned" placeholder' do
             is_expected.to have_body_text("Assignee changed from <strong>#{previous_assignee.name}</strong> to <strong>Unassigned</strong>")
+            is_expected.to have_body_text(%(<a href="#{project_issue_url(project, issue)}">view it on GitLab</a>))
+            is_expected.to have_body_text("You're receiving this email because of your account")
+            is_expected.to have_plain_text_content("Assignee changed from #{previous_assignee.name} to Unassigned")
+            is_expected.to have_plain_text_content("view it on GitLab: #{project_issue_url(project, issue)}")
+            is_expected.to have_plain_text_content("You're receiving this email because of your account")
           end
         end
 
@@ -172,6 +180,11 @@ RSpec.describe Notify do
 
           it 'uses short text' do
             is_expected.to have_body_text("Assignee changed to <strong>#{assignee.name}</strong>")
+            is_expected.to have_body_text(%(<a href="#{project_issue_url(project, issue)}">view it on GitLab</a>))
+            is_expected.to have_body_text("You're receiving this email because of your account")
+            is_expected.to have_plain_text_content("Assignee changed to #{assignee.name}")
+            is_expected.to have_plain_text_content("view it on GitLab: #{project_issue_url(project, issue)}")
+            is_expected.to have_plain_text_content("You're receiving this email because of your account")
           end
         end
 
@@ -2367,4 +2380,19 @@ RSpec.describe Notify do
       expect(mail.body.parts.first.to_s).to include('Start a GitLab Ultimate trial today in less than one minute, no credit card required.')
     end
   end
+
+  # can be replaced with https://github.com/email-spec/email-spec/pull/196 in the future
+  RSpec::Matchers.define :have_plain_text_content do |expected_text|
+    match do |actual_email|
+      plain_text_body(actual_email).include? expected_text
+    end
+
+    failure_message do |actual_email|
+      "Expected email\n#{plain_text_body(actual_email).indent(2)}\nto contain\n#{expected_text.indent(2)}"
+    end
+
+    def plain_text_body(email)
+      email.text_part.body.to_s
+    end
+  end
 end
diff --git a/spec/migrations/20230329100222_drop_software_licenses_temp_index_spec.rb b/spec/migrations/20230329100222_drop_software_licenses_temp_index_spec.rb
new file mode 100644
index 00000000000..d4d276980f8
--- /dev/null
+++ b/spec/migrations/20230329100222_drop_software_licenses_temp_index_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe DropSoftwareLicensesTempIndex, feature_category: :security_policy_management do
+  it 'correctly migrates up and down' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(ActiveRecord::Base.connection.indexes('software_licenses').map(&:name))
+          .to include(described_class::INDEX_NAME)
+      }
+
+      migration.after -> {
+        expect(ActiveRecord::Base.connection.indexes('software_licenses').map(&:name))
+          .not_to include(described_class::INDEX_NAME)
+      }
+    end
+  end
+end
diff --git a/spec/models/packages/debian/file_metadatum_spec.rb b/spec/models/packages/debian/file_metadatum_spec.rb
index 8cbd83c3e2d..e86c0a71c9a 100644
--- a/spec/models/packages/debian/file_metadatum_spec.rb
+++ b/spec/models/packages/debian/file_metadatum_spec.rb
@@ -2,15 +2,15 @@
 
 require 'spec_helper'
 
-RSpec.describe Packages::Debian::FileMetadatum, type: :model do
-  RSpec.shared_context 'Debian file metadatum' do |factory, trait|
-    let_it_be_with_reload(:debian_package_file) { create(factory, trait) }
+RSpec.describe Packages::Debian::FileMetadatum, type: :model, feature_category: :package_registry do
+  RSpec.shared_context 'with Debian file metadatum' do |package_file_trait|
+    let_it_be_with_reload(:debian_package_file) { create(:debian_package_file, package_file_trait) }
     let(:debian_file_metadatum) { debian_package_file.debian_file_metadatum }
 
     subject { debian_file_metadatum }
   end
 
-  RSpec.shared_examples 'Test Debian file metadatum' do |has_component, has_architecture, has_fields, has_outdated|
+  RSpec.shared_examples 'Test Debian file metadatum' do |has_component, has_architecture, has_fields|
     describe 'relationships' do
       it { is_expected.to belong_to(:package_file) }
     end
@@ -51,8 +51,8 @@ RSpec.describe Packages::Debian::FileMetadatum, type: :model do
       describe '#fields' do
         if has_fields
           it { is_expected.to validate_presence_of(:fields) }
-          it { is_expected.to allow_value({ 'a': 'b' }).for(:fields) }
-          it { is_expected.not_to allow_value({ 'a': { 'b': 'c' } }).for(:fields) }
+          it { is_expected.to allow_value({ a: 'b' }).for(:fields) }
+          it { is_expected.not_to allow_value({ a: { b: 'c' } }).for(:fields) }
         else
           it { is_expected.to validate_absence_of(:fields) }
         end
@@ -69,24 +69,35 @@ RSpec.describe Packages::Debian::FileMetadatum, type: :model do
         end
       end
     end
+
+    describe 'scopes' do
+      describe '.with_file_type' do
+        subject { described_class.with_file_type(package_file_trait) }
+
+        it 'returns the matching file metadatum' do
+          expect(subject).to match_array([debian_file_metadatum])
+        end
+      end
+    end
   end
 
   using RSpec::Parameterized::TableSyntax
 
-  where(:factory, :trait, :has_component, :has_architecture, :has_fields) do
-    :debian_package_file      | :unknown   | false | false | false
-    :debian_package_file      | :source    | true  | false | false
-    :debian_package_file      | :dsc       | true  | false | true
-    :debian_package_file      | :deb       | true  | true  | true
-    :debian_package_file      | :udeb      | true  | true  | true
-    :debian_package_file      | :ddeb      | true  | true  | true
-    :debian_package_file      | :buildinfo | true  | false | true
-    :debian_package_file      | :changes   | false | false | true
+  where(:package_file_trait, :has_component, :has_architecture, :has_fields) do
+    :unknown   | false | false | false
+    :source    | true  | false | false
+    :dsc       | true  | false | true
+    :deb       | true  | true  | true
+    :udeb      | true  | true  | true
+    :ddeb      | true  | true  | true
+    :buildinfo | true  | false | true
+    :changes   | false | false | true
   end
 
   with_them do
-    include_context 'Debian file metadatum', params[:factory], params[:trait] do
-      it_behaves_like 'Test Debian file metadatum', params[:has_component], params[:has_architecture], params[:has_fields], params[:has_outdated]
+    include_context 'with Debian file metadatum', params[:package_file_trait] do
+      it_behaves_like 'Test Debian file metadatum',
+        params[:has_component], params[:has_architecture], params[:has_fields]
     end
   end
 end
diff --git a/spec/models/packages/package_file_spec.rb b/spec/models/packages/package_file_spec.rb
index d80f8247261..c9db1efc64a 100644
--- a/spec/models/packages/package_file_spec.rb
+++ b/spec/models/packages/package_file_spec.rb
@@ -178,6 +178,17 @@ RSpec.describe Packages::PackageFile, type: :model do
     describe '#with_debian_architecture_name' do
       it { expect(described_class.with_debian_architecture_name('mipsel')).to contain_exactly(debian_mipsel) }
     end
+
+    describe '#with_debian_unknown_since' do
+      let_it_be(:incoming) { create(:debian_incoming, project: project) }
+
+      before do
+        incoming.package_files.first.debian_file_metadatum.update! updated_at: 1.day.ago
+        incoming.package_files.second.update! updated_at: 1.day.ago, status: :error
+      end
+
+      it { expect(described_class.with_debian_unknown_since(1.hour.ago)).to contain_exactly(incoming.package_files.first) }
+    end
   end
 
   describe '.for_helm_with_channel' do
diff --git a/spec/workers/packages/debian/cleanup_dangling_package_files_worker_spec.rb b/spec/workers/packages/debian/cleanup_dangling_package_files_worker_spec.rb
new file mode 100644
index 00000000000..b6373dbda95
--- /dev/null
+++ b/spec/workers/packages/debian/cleanup_dangling_package_files_worker_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::Debian::CleanupDanglingPackageFilesWorker, type: :worker,
+  feature_category: :package_registry do
+  describe '#perform' do
+    let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file, codename: 'unstable') }
+    let_it_be(:incoming) { create(:debian_incoming, project: distribution.project) }
+    let_it_be(:package) { create(:debian_package, project: distribution.project) }
+
+    subject { described_class.new.perform }
+
+    context 'when debian_packages flag is disabled' do
+      before do
+        stub_feature_flags(debian_packages: false)
+      end
+
+      it 'does nothing' do
+        expect(::Packages::MarkPackageFilesForDestructionService).not_to receive(:new)
+
+        subject
+      end
+    end
+
+    context 'with mocked service returning success' do
+      it 'calls MarkPackageFilesForDestructionService' do
+        expect(Gitlab::ErrorTracking).not_to receive(:log_exception)
+        expect_next_instance_of(::Packages::MarkPackageFilesForDestructionService) do |service|
+          expect(service).to receive(:execute)
+            .with(batch_deadline: an_instance_of(ActiveSupport::TimeWithZone))
+            .and_return(ServiceResponse.success)
+        end
+
+        subject
+      end
+    end
+
+    context 'with mocked service returning error' do
+      it 'ignore error' do
+        expect(Gitlab::ErrorTracking).not_to receive(:log_exception)
+        expect_next_instance_of(::Packages::MarkPackageFilesForDestructionService) do |service|
+          expect(service).to receive(:execute)
+            .with(batch_deadline: an_instance_of(ActiveSupport::TimeWithZone))
+            .and_return(ServiceResponse.error(message: 'Custom error'))
+        end
+
+        subject
+      end
+    end
+
+    context 'when the service raises an error' do
+      it 'logs exception' do
+        expect(Gitlab::ErrorTracking).to receive(:log_exception).with(
+          instance_of(ArgumentError)
+        )
+        expect_next_instance_of(::Packages::MarkPackageFilesForDestructionService) do |service|
+          expect(service).to receive(:execute)
+            .and_raise(ArgumentError, 'foobar')
+        end
+
+        subject
+      end
+    end
+
+    context 'with valid parameters' do
+      it_behaves_like 'an idempotent worker' do
+        before do
+          incoming.package_files.first.debian_file_metadatum.update! updated_at: 1.day.ago
+          incoming.package_files.second.update! updated_at: 1.day.ago, status: :error
+        end
+
+        it 'mark dangling package files as pending destruction', :aggregate_failures do
+          expect(Gitlab::ErrorTracking).not_to receive(:log_exception)
+
+          # Using subject inside this block will process the job multiple times
+          expect { subject }
+            .to not_change { distribution.project.package_files.count }
+            .and change { distribution.project.package_files.pending_destruction.count }.from(0).to(1)
+            .and not_change { distribution.project.packages.count }
+        end
+      end
+    end
+  end
+end
diff --git a/spec/workers/packages/debian/process_package_file_worker_spec.rb b/spec/workers/packages/debian/process_package_file_worker_spec.rb
index 44769ec6a14..6010f4eac27 100644
--- a/spec/workers/packages/debian/process_package_file_worker_spec.rb
+++ b/spec/workers/packages/debian/process_package_file_worker_spec.rb
@@ -64,6 +64,7 @@ RSpec.describe Packages::Debian::ProcessPackageFileWorker, type: :worker, featur
               .to not_change(Packages::Package, :count)
               .and not_change { Packages::PackageFile.count }
               .and not_change { package.package_files.count }
+              .and change { package_file.reload.status }.to('error')
               .and change { package.reload.status }.from('processing').to('error')
           end
         end
diff --git a/yarn.lock b/yarn.lock
index 9a36f701ca0..6602ca465bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2434,6 +2434,20 @@
     "@typescript-eslint/types" "5.38.0"
     eslint-visitor-keys "^3.3.0"
 
+"@vue/apollo-components@^4.0.0-beta.4":
+  version "4.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@vue/apollo-components/-/apollo-components-4.0.0-beta.4.tgz#cc2510cf22636c5b13fb42470578031631af6c51"
+  integrity sha512-a3Jwx49a8/0WsCPih4qj836DbbKnbX/9F+5B/paXAm7A2ajAJJ8PoPqqrFTCGZWExc4dMjAKQM6EOu6LIurjMg==
+  dependencies:
+    "@vue/apollo-option" "^4.0.0-beta.4"
+
+"@vue/apollo-option@^4.0.0-beta.4":
+  version "4.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@vue/apollo-option/-/apollo-option-4.0.0-beta.4.tgz#b81a16327d98770c42b37cbed8fa0ff004a13afb"
+  integrity sha512-eGONgeLBzy4PqYytxF+5ivRGjLQ7TqUF/qVK3vi1xTdnW7+3Oy02cfDrxL8ErWUG/tNIaZF7Qm1N/HIvPfaxIg==
+  dependencies:
+    throttle-debounce "^3.0.1"
+
 "@vue/compat@^3.2.47":
   version "3.2.47"
   resolved "https://registry.yarnpkg.com/@vue/compat/-/compat-3.2.47.tgz#315c9708a46ce13a1d81e7ff0bec33060a210741"