.gitlab/CODEOWNERS

@@ -555,6 +555,7 @@ lib/gitlab/checks/**
 /doc/administration/custom_html_header_tags.md @eread
 /doc/administration/custom_project_templates.md @brendan777
 /doc/administration/dedicated/ @lyspin
+/doc/administration/dedicated/hosted_runners.md @ashrafkhamis
 /doc/administration/diff_limits.md @brendan777
 /doc/administration/docs_self_host.md @axil
 /doc/administration/encrypted_configuration.md @axil
@@ -562,7 +563,7 @@ lib/gitlab/checks/**
 /doc/administration/external_pipeline_validation.md @marcel.amirault @lyspin
 /doc/administration/external_users.md @jglassman1
 /doc/administration/feature_flags.md @axil
-/doc/administration/file_hooks.md @eread
+/doc/administration/file_hooks.md @ashrafkhamis
 /doc/administration/geo/ @axil
 /doc/administration/geo_sites.md @axil
 /doc/administration/get_started.md @kpaizee
@@ -596,7 +597,7 @@ lib/gitlab/checks/**
 /doc/administration/merge_request_diffs.md @brendan777
 /doc/administration/merge_requests_approvals.md @brendan777
 /doc/administration/moderate_users.md @jglassman1
-/doc/administration/monitoring/github_imports.md @eread
+/doc/administration/monitoring/github_imports.md @ashrafkhamis
 /doc/administration/monitoring/ip_allowlist.md @jglassman1
 /doc/administration/monitoring/performance/ @jglassman1
 /doc/administration/monitoring/prometheus/gitlab_exporter.md @jglassman1
@@ -638,18 +639,19 @@ lib/gitlab/checks/**
 /doc/administration/settings/git_http_rate_limits.md @brendan777
 /doc/administration/settings/git_lfs_rate_limits.md @brendan777
 /doc/administration/settings/gitaly_timeouts.md @eread
-/doc/administration/settings/import_and_export_settings.md @eread
-/doc/administration/settings/import_export_rate_limits.md @eread
+/doc/administration/settings/import_and_export_settings.md @ashrafkhamis
+/doc/administration/settings/import_export_rate_limits.md @ashrafkhamis
 /doc/administration/settings/instance_template_repository.md @brendan777
-/doc/administration/settings/jira_cloud_app.md @eread
-/doc/administration/settings/jira_cloud_app_troubleshooting.md @eread
+/doc/administration/settings/jira_cloud_app.md @ashrafkhamis
+/doc/administration/settings/jira_cloud_app_troubleshooting.md @ashrafkhamis
 /doc/administration/settings/package_registry_rate_limits.md @phillipwells
-/doc/administration/settings/project_integration_management.md @eread
+/doc/administration/settings/project_integration_management.md @ashrafkhamis
 /doc/administration/settings/push_event_activities_limit.md @brendan777
 /doc/administration/settings/rate_limit_on_groups_api.md @lciutacu
 /doc/administration/settings/rate_limit_on_issues_creation.md @msedlakjakubowski
 /doc/administration/settings/rate_limit_on_members_api.md @lciutacu
 /doc/administration/settings/rate_limit_on_notes_creation.md @msedlakjakubowski
+/doc/administration/settings/rate_limit_on_organizations_api.md @lciutacu
 /doc/administration/settings/rate_limit_on_pipelines_creation.md @marcel.amirault @lyspin
 /doc/administration/settings/rate_limit_on_projects_api.md @lciutacu
 /doc/administration/settings/rate_limit_on_users_api.md @jglassman1
@@ -657,7 +659,7 @@ lib/gitlab/checks/**
 /doc/administration/settings/scim_setup.md @jglassman1
 /doc/administration/settings/security_and_compliance.md @rdickenson @phillipwells
 /doc/administration/settings/security_contact_information.md @eread
-/doc/administration/settings/slack_app.md @eread
+/doc/administration/settings/slack_app.md @ashrafkhamis
 /doc/administration/settings/terraform_limits.md @phillipwells
 /doc/administration/settings/third_party_offers.md @lciutacu
 /doc/administration/settings/visibility_and_access_controls.md @brendan777
@@ -667,7 +669,7 @@ lib/gitlab/checks/**
 /doc/administration/smime_signing_email.md @axil
 /doc/administration/snippets/ @brendan777
 /doc/administration/static_objects_external_storage.md @ashrafkhamis
-/doc/administration/system_hooks.md @eread
+/doc/administration/system_hooks.md @ashrafkhamis
 /doc/administration/terraform_state.md @phillipwells
 /doc/administration/timezone.md @axil
 /doc/administration/troubleshooting/ @axil
@@ -675,15 +677,16 @@ lib/gitlab/checks/**
 /doc/administration/user_settings.md @jglassman1
 /doc/administration/wikis/ @msedlakjakubowski
 /doc/api/access_requests.md @jglassman1
+/doc/api/admin/ @jglassman1
 /doc/api/admin_sidekiq_queues.md @axil
-/doc/api/api_resources.md @eread
+/doc/api/api_resources.md @ashrafkhamis
 /doc/api/appearance.md @jglassman1
 /doc/api/applications.md @jglassman1
 /doc/api/audit_events.md @eread
 /doc/api/avatar.md @jglassman1
 /doc/api/boards.md @msedlakjakubowski
 /doc/api/branches.md @brendan777
-/doc/api/bulk_imports.md @eread
+/doc/api/bulk_imports.md @ashrafkhamis
 /doc/api/chat.md @sselhorn @jglassman1 @fneill
 /doc/api/cluster_agents.md @phillipwells
 /doc/api/code_suggestions.md @jglassman1
@@ -712,9 +715,15 @@ lib/gitlab/checks/**
 /doc/api/geo_nodes.md @axil
 /doc/api/geo_sites.md @axil
 /doc/api/google_cloud_integration.md @jglassman1
-/doc/api/graphql/ @eread
+/doc/api/graphql/audit_event_streaming_groups.md @eread
+/doc/api/graphql/audit_event_streaming_instances.md @eread
+/doc/api/graphql/audit_report.md @eread
 /doc/api/graphql/branch_rules.md @brendan777
 /doc/api/graphql/custom_emoji.md @msedlakjakubowski
+/doc/api/graphql/getting_started.md @ashrafkhamis
+/doc/api/graphql/index.md @ashrafkhamis
+/doc/api/graphql/reference/ @ashrafkhamis
+/doc/api/graphql/removed_items.md @ashrafkhamis
 /doc/api/graphql/sample_issue_boards.md @msedlakjakubowski
 /doc/api/graphql/users_example.md @jglassman1
 /doc/api/group_access_tokens.md @jglassman1
@@ -723,24 +732,29 @@ lib/gitlab/checks/**
 /doc/api/group_boards.md @msedlakjakubowski
 /doc/api/group_clusters.md @phillipwells
 /doc/api/group_epic_boards.md @msedlakjakubowski
-/doc/api/group_import_export.md @eread
+/doc/api/group_import_export.md @ashrafkhamis
 /doc/api/group_iterations.md @msedlakjakubowski
 /doc/api/group_labels.md @msedlakjakubowski
+/doc/api/group_ldap_links.md @lciutacu
 /doc/api/group_level_variables.md @marcel.amirault @lyspin
+/doc/api/group_markdown_uploads.md @msedlakjakubowski
 /doc/api/group_milestones.md @msedlakjakubowski
 /doc/api/group_protected_branches.md @brendan777
 /doc/api/group_protected_environments.md @phillipwells
-/doc/api/group_relations_export.md @eread
+/doc/api/group_push_rules.md @brendan777
+/doc/api/group_relations_export.md @ashrafkhamis
 /doc/api/group_releases.md @phillipwells
 /doc/api/group_repository_storage_moves.md @ashrafkhamis
+/doc/api/group_service_accounts.md @jglassman1
 /doc/api/group_ssh_certificates.md @brendan777
+/doc/api/group_webhooks.md @ashrafkhamis
 /doc/api/group_wikis.md @msedlakjakubowski
 /doc/api/groups.md @lciutacu
-/doc/api/import.md @eread
-/doc/api/index.md @eread
+/doc/api/import.md @ashrafkhamis
+/doc/api/index.md @ashrafkhamis
 /doc/api/instance_clusters.md @phillipwells
 /doc/api/instance_level_ci_variables.md @marcel.amirault @lyspin
-/doc/api/integrations.md @eread
+/doc/api/integrations.md @ashrafkhamis
 /doc/api/invitations.md @lciutacu
 /doc/api/issue_links.md @msedlakjakubowski
 /doc/api/issues.md @msedlakjakubowski
@@ -762,11 +776,13 @@ lib/gitlab/checks/**
 /doc/api/merge_trains.md @marcel.amirault @lyspin
 /doc/api/metadata.md @phillipwells
 /doc/api/milestones.md @msedlakjakubowski
+/doc/api/model_registry.md @sselhorn @jglassman1 @fneill
 /doc/api/namespaces.md @jglassman1
 /doc/api/notes.md @msedlakjakubowski
 /doc/api/notification_settings.md @sselhorn
 /doc/api/oauth2.md @jglassman1
-/doc/api/openapi/ @eread
+/doc/api/openapi/ @ashrafkhamis
+/doc/api/organizations.md @lciutacu
 /doc/api/packages.md @phillipwells
 /doc/api/packages/ @phillipwells
 /doc/api/pages.md @msedlakjakubowski
@@ -782,16 +798,19 @@ lib/gitlab/checks/**
 /doc/api/project_badges.md @brendan777
 /doc/api/project_clusters.md @phillipwells
 /doc/api/project_container_registry_protection_rules.md @marcel.amirault
-/doc/api/project_import_export.md @eread
+/doc/api/project_import_export.md @ashrafkhamis
 /doc/api/project_job_token_scopes.md @marcel.amirault
 /doc/api/project_level_variables.md @marcel.amirault @lyspin
+/doc/api/project_markdown_uploads.md @msedlakjakubowski
 /doc/api/project_packages_protection_rules.md @phillipwells
-/doc/api/project_relations_export.md @eread
+/doc/api/project_push_rules.md @brendan777
+/doc/api/project_relations_export.md @ashrafkhamis
 /doc/api/project_repository_storage_moves.md @eread
 /doc/api/project_snippets.md @brendan777
 /doc/api/project_statistics.md @brendan777
 /doc/api/project_templates.md @brendan777
 /doc/api/project_vulnerabilities.md @rdickenson
+/doc/api/project_webhooks.md @ashrafkhamis
 /doc/api/projects.md @lciutacu
 /doc/api/protected_branches.md @brendan777
 /doc/api/protected_environments.md @phillipwells
@@ -807,7 +826,7 @@ lib/gitlab/checks/**
 /doc/api/resource_milestone_events.md @msedlakjakubowski
 /doc/api/resource_state_events.md @msedlakjakubowski
 /doc/api/resource_weight_events.md @msedlakjakubowski
-/doc/api/rest/ @eread
+/doc/api/rest/ @ashrafkhamis
 /doc/api/runners.md @ashrafkhamis
 /doc/api/saml.md @jglassman1
 /doc/api/scim.md @jglassman1
@@ -821,7 +840,7 @@ lib/gitlab/checks/**
 /doc/api/statistics.md @jglassman1
 /doc/api/status_checks.md @rdickenson
 /doc/api/suggestions.md @brendan777
-/doc/api/system_hooks.md @eread
+/doc/api/system_hooks.md @ashrafkhamis
 /doc/api/tags.md @brendan777
 /doc/api/templates/dockerfiles.md @brendan777
 /doc/api/templates/gitignores.md @brendan777
@@ -829,11 +848,16 @@ lib/gitlab/checks/**
 /doc/api/templates/licenses.md @rdickenson @phillipwells
 /doc/api/todos.md @sselhorn
 /doc/api/topics.md @lciutacu
+/doc/api/user_keys.md @jglassman1
+/doc/api/user_moderation.md @jglassman1
+/doc/api/user_service_accounts.md @jglassman1
+/doc/api/user_tokens.md @jglassman1
 /doc/api/users.md @jglassman1
 /doc/api/version.md @phillipwells
 /doc/api/vulnerabilities.md @rdickenson
 /doc/api/vulnerability_exports.md @rdickenson
 /doc/api/vulnerability_findings.md @rdickenson
+/doc/api/web_commits.md @brendan777
 /doc/api/wikis.md @msedlakjakubowski
 /doc/ci/ @marcel.amirault @lyspin
 /doc/ci/chatops/ @phillipwells
@@ -841,22 +865,22 @@ lib/gitlab/checks/**
 /doc/ci/cloud_services/ @marcel.amirault
 /doc/ci/docker/using_docker_images.md @ashrafkhamis
 /doc/ci/environments/ @phillipwells
-/doc/ci/examples/authenticating-with-hashicorp-vault/ @marcel.amirault
 /doc/ci/examples/deployment/ @phillipwells
 /doc/ci/examples/semantic-release.md @phillipwells
 /doc/ci/gitlab_google_cloud_integration/ @marcel.amirault
 /doc/ci/interactive_web_terminal/ @ashrafkhamis
 /doc/ci/jobs/ci_job_token.md @marcel.amirault
+/doc/ci/jobs/ssh_keys.md @marcel.amirault
 /doc/ci/pipelines/pipeline_security.md @marcel.amirault
 /doc/ci/resource_groups/ @phillipwells
 /doc/ci/runners/ @ashrafkhamis
+/doc/ci/runners/git_submodules.md @marcel.amirault @lyspin
 /doc/ci/secrets/ @marcel.amirault
 /doc/ci/secure_files/ @marcel.amirault
 /doc/ci/services/ @ashrafkhamis
-/doc/ci/ssh_keys/ @marcel.amirault
 /doc/ci/steps/ @ashrafkhamis
 /doc/ci/test_cases/ @msedlakjakubowski
-/doc/ci/testing/code_quality.md @rdickenson
+/doc/ci/testing/code_quality.md @rdickenson @phillipwells
 /doc/ci/testing/code_quality_troubleshooting.md @rdickenson @phillipwells
 /doc/ci/yaml/ci_job_log_timestamps.md @ashrafkhamis
 /doc/ci/yaml/signing_examples.md @marcel.amirault
@@ -897,24 +921,22 @@ lib/gitlab/checks/**
 /doc/downgrade_ee_to_ce/ @axil
 /doc/drawers/ @ashrafkhamis
 /doc/editor_extensions/ @aqualls
-/doc/gitlab-basics/ @brendan777
 /doc/install/ @axil
 /doc/integration/ @jglassman1
 /doc/integration/advanced_search/ @ashrafkhamis
 /doc/integration/datadog.md @ashrafkhamis
 /doc/integration/diffblue_cover.md @marcel.amirault @lyspin
 /doc/integration/exact_code_search/ @ashrafkhamis
-/doc/integration/external-issue-tracker.md @eread
+/doc/integration/external-issue-tracker.md @ashrafkhamis
 /doc/integration/gitpod.md @ashrafkhamis
-/doc/integration/gmail_action_buttons_for_gitlab.md @eread
-/doc/integration/index.md @eread
+/doc/integration/gmail_action_buttons_for_gitlab.md @ashrafkhamis
+/doc/integration/index.md @ashrafkhamis
 /doc/integration/jenkins.md @marcel.amirault @lyspin
-/doc/integration/jira/ @eread
+/doc/integration/jira/ @ashrafkhamis
 /doc/integration/mattermost/ @axil
-/doc/integration/partner_marketplace.md @fneill
 /doc/integration/snowflake.md @eread
 /doc/integration/sourcegraph.md @brendan777
-/doc/integration/trello_power_up.md @eread
+/doc/integration/trello_power_up.md @ashrafkhamis
 /doc/integration/vault.md @phillipwells
 /doc/operations/ @phillipwells
 /doc/policy/ @axil
@@ -924,7 +946,7 @@ lib/gitlab/checks/**
 /doc/security/ @jglassman1
 /doc/solutions/ @jfullam @brianwald @Darwinjs
 /doc/solutions/integrations/index.md @jfullam @brianwald @Darwinjs
-/doc/solutions/integrations/servicenow.md @eread
+/doc/solutions/integrations/servicenow.md @ashrafkhamis
 /doc/subscriptions/ @fneill
 /doc/subscriptions/gitlab_dedicated/ @lyspin
 /doc/topics/ @msedlakjakubowski
@@ -956,6 +978,7 @@ lib/gitlab/checks/**
 /doc/tutorials/scrum_events/ @msedlakjakubowski
 /doc/tutorials/setup_steps/ @ashrafkhamis
 /doc/tutorials/update_commit_messages/ @brendan777
+/doc/tutorials/update_git_remote_url/ @brendan777
 /doc/tutorials/website_project_with_analytics/ @lciutacu
 /doc/update/ @axil
 /doc/user/analytics/ @lciutacu
@@ -974,6 +997,7 @@ lib/gitlab/checks/**
 /doc/user/compliance/license_scanning_of_cyclonedx_files/ @rdickenson @phillipwells
 /doc/user/crm/ @msedlakjakubowski
 /doc/user/discussions/ @aqualls
+/doc/user/duo_workflow/ @sselhorn @jglassman1 @fneill
 /doc/user/emoji_reactions.md @msedlakjakubowski
 /doc/user/enterprise_user/ @jglassman1
 /doc/user/get_started/get_started_managing_code.md @brendan777
@@ -990,12 +1014,11 @@ lib/gitlab/checks/**
 /doc/user/group/custom_project_templates.md @brendan777
 /doc/user/group/devops_adoption/ @lciutacu
 /doc/user/group/epics/ @msedlakjakubowski
-/doc/user/group/import/ @eread
+/doc/user/group/import/ @ashrafkhamis
 /doc/user/group/index.md @lciutacu
 /doc/user/group/issues_analytics/ @lciutacu
 /doc/user/group/iterations/ @msedlakjakubowski
 /doc/user/group/manage.md @lciutacu
-/doc/user/group/planning_hierarchy/ @msedlakjakubowski
 /doc/user/group/repositories_analytics/ @marcel.amirault @lyspin
 /doc/user/group/roadmap/ @msedlakjakubowski
 /doc/user/group/saml_sso/ @jglassman1
@@ -1037,11 +1060,12 @@ lib/gitlab/checks/**
 /doc/user/project/deploy_tokens/ @phillipwells
 /doc/user/project/description_templates.md @msedlakjakubowski
 /doc/user/project/file_lock.md @brendan777
-/doc/user/project/import/ @eread
+/doc/user/project/import/ @ashrafkhamis
 /doc/user/project/import/jira.md @msedlakjakubowski
+/doc/user/project/import/jira_migration_options.md @msedlakjakubowski
 /doc/user/project/index.md @lciutacu
 /doc/user/project/insights/ @lciutacu
-/doc/user/project/integrations/ @eread
+/doc/user/project/integrations/ @ashrafkhamis
 /doc/user/project/integrations/bamboo.md @marcel.amirault @lyspin
 /doc/user/project/integrations/beyond_identity.md @brendan777
 /doc/user/project/integrations/git_guardian.md @brendan777
@@ -1051,7 +1075,7 @@ lib/gitlab/checks/**
 /doc/user/project/integrations/matrix.md @sselhorn
 /doc/user/project/issue_board.md @msedlakjakubowski
 /doc/user/project/issues/ @msedlakjakubowski
-/doc/user/project/issues/csv_import.md @eread
+/doc/user/project/issues/csv_import.md @ashrafkhamis
 /doc/user/project/labels.md @msedlakjakubowski
 /doc/user/project/members/ @lciutacu
 /doc/user/project/merge_requests/ @aqualls
@@ -1068,22 +1092,21 @@ lib/gitlab/checks/**
 /doc/user/project/organize_work_with_projects.md @lciutacu
 /doc/user/project/pages/ @msedlakjakubowski
 /doc/user/project/project_topics.md @lciutacu
-/doc/user/project/repository/branches/protected.md @brendan777
 /doc/user/project/protected_tags.md @brendan777
 /doc/user/project/quick_actions.md @msedlakjakubowski
 /doc/user/project/releases/ @phillipwells
 /doc/user/project/releases/release_evidence.md @eread
 /doc/user/project/remote_development/ @ashrafkhamis
 /doc/user/project/repository/ @brendan777
-/doc/user/project/repository/code_explain.md @aqualls
+/doc/user/project/repository/code_explain.md @jglassman1
 /doc/user/project/repository/code_suggestions/ @jglassman1
 /doc/user/project/repository/files/index.md @ashrafkhamis
 /doc/user/project/repository/monorepos/ @eread
 /doc/user/project/repository/web_editor.md @ashrafkhamis
 /doc/user/project/requirements/ @msedlakjakubowski
 /doc/user/project/service_desk/ @msedlakjakubowski
-/doc/user/project/settings/import_export.md @eread
-/doc/user/project/settings/import_export_troubleshooting.md @eread
+/doc/user/project/settings/import_export.md @ashrafkhamis
+/doc/user/project/settings/import_export_troubleshooting.md @ashrafkhamis
 /doc/user/project/settings/index.md @lciutacu
 /doc/user/project/settings/migrate_projects.md @lciutacu
 /doc/user/project/settings/project_access_tokens.md @jglassman1

.rubocop_todo/layout/empty_line_after_magic_comment.yml

@@ -508,8 +508,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'spec/models/packages/npm_spec.rb'
     - 'spec/models/packages/package_file_build_info_spec.rb'
     - 'spec/models/packages/package_file_spec.rb'
-    - 'spec/models/packages/package_spec.rb'
-    - 'spec/models/packages/pypi/metadatum_spec.rb'
     - 'spec/models/packages/rpm/metadatum_spec.rb'
     - 'spec/models/packages/rpm/repository_file_spec.rb'
     - 'spec/policies/design_management/design_policy_spec.rb'

app/assets/javascripts/work_items/components/create_work_item_modal.vue

@@ -153,6 +153,7 @@ export default {
           text: __('View details'),
           onClick: () => {
             if (
+              !this.asDropdownItem &&
               this.$router &&
               this.$router.options.routes.some((route) => route.name === 'workItem')
             ) {

app/finders/concerns/packages/finder_helper.rb

@@ -10,7 +10,7 @@ module FinderHelper
     private
 
     def packages_for_project(project)
-      project.packages.installable
+      packages_class.for_projects(project).installable
     end
 
     # /!\ This function doesn't check user permissions
@@ -29,13 +29,13 @@ def packages_for(user, within_group:)
     end
 
     def packages_visible_to_user(user, within_group:, with_package_registry_enabled: false)
-      return ::Packages::Package.none unless within_group
-      return ::Packages::Package.none unless Ability.allowed?(user, :read_group, within_group)
+      return packages_class.none unless within_group
+      return packages_class.none unless Ability.allowed?(user, :read_group, within_group)
 
       projects = projects_visible_to_reporters(user, within_group: within_group)
       projects = projects.with_package_registry_enabled if with_package_registry_enabled
 
-      ::Packages::Package.for_projects(projects.select(:id)).installable
+      packages_class.for_projects(projects.select(:id)).installable
     end
 
     def packages_visible_to_user_including_public_registries(user, within_group:)
@@ -114,5 +114,9 @@ def filter_by_status(packages)
 
       packages.with_status(params[:status])
     end
+
+    def packages_class
+      ::Packages::Package
+    end
   end
 end

app/finders/packages/group_or_project_package_finder.rb

@@ -30,7 +30,7 @@ def base
       elsif group?
         group_packages
       else
-        ::Packages::Package.none
+        packages_class.none
       end
     end
 
@@ -49,5 +49,9 @@ def project_packages
     def group_packages
       packages_visible_to_user(@current_user, within_group: @project_or_group)
     end
+
+    def packages_class
+      @params.fetch(:packages_class, ::Packages::Package)
+    end
   end
 end

app/finders/packages/pypi/package_finder.rb

@@ -3,6 +3,16 @@
 module Packages
   module Pypi
     class PackageFinder < ::Packages::GroupOrProjectPackageFinder
+      extend ::Gitlab::Utils::Override
+
+      def initialize(current_user, project_or_group, params = {})
+        if Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+          params[:packages_class] = ::Packages::Pypi::Package
+        end
+
+        super
+      end
+
       def execute
         packages.by_file_name_and_sha256(@params[:filename], @params[:sha256])
       end
@@ -10,15 +20,20 @@ def execute
       private
 
       def packages
-        base.pypi.has_version
+        if Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+          base.has_version
+        else
+          base.pypi.has_version
+        end
       end
 
+      override :group_packages
       def group_packages
         # PyPI finds packages without checking permissions.
         # The package download endpoint uses obfuscation to secure the file
         # instead of authentication. This is behavior the PyPI package
         # manager defines and is not something GitLab controls.
-        ::Packages::Package.for_projects(
+        packages_class.for_projects(
           @project_or_group.all_projects.select(:id)
         ).installable
       end

app/finders/packages/pypi/packages_finder.rb

@@ -5,6 +5,14 @@ module Pypi
     class PackagesFinder < ::Packages::GroupOrProjectPackageFinder
       extend ::Gitlab::Utils::Override
 
+      def initialize(current_user, project_or_group, params = {})
+        if Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+          params[:packages_class] = ::Packages::Pypi::Package
+        end
+
+        super
+      end
+
       def execute
         return packages unless @params[:package_name]
 
@@ -14,7 +22,11 @@ def execute
       private
 
       def packages
-        base.pypi.has_version
+        if Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+          base.has_version
+        else
+          base.pypi.has_version
+        end
       end
 
       override :group_packages

app/graphql/resolvers/merge_requests_resolver.rb

@@ -101,6 +101,10 @@ def self.accept_reviewer
     argument :deployment_id, GraphQL::Types::String,
       required: false,
       description: 'ID of the deployment.'
+    argument :environment_name, GraphQL::Types::String,
+      as: :environment,
+      required: false,
+      description: 'Environment merge requests have been deployed to.'
     argument :updated_after, Types::TimeType,
       required: false,
       description: 'Merge requests updated after the timestamp.'

app/models/packages/package.rb

@@ -43,7 +43,11 @@ class Packages::Package < ApplicationRecord
   has_many :installable_nuget_package_files, -> { installable.with_nuget_format }, class_name: 'Packages::PackageFile', inverse_of: :package
   has_many :dependency_links, inverse_of: :package, class_name: 'Packages::DependencyLink'
   has_many :tags, inverse_of: :package, class_name: 'Packages::Tag'
+
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
   has_one :pypi_metadatum, inverse_of: :package, class_name: 'Packages::Pypi::Metadatum'
+
   has_one :maven_metadatum, inverse_of: :package, class_name: 'Packages::Maven::Metadatum'
   has_one :nuget_metadatum, inverse_of: :package, class_name: 'Packages::Nuget::Metadatum'
   has_many :nuget_symbols, inverse_of: :package, class_name: 'Packages::Nuget::Symbol'
@@ -74,7 +78,11 @@ class Packages::Package < ApplicationRecord
   validates :name, format: { with: Gitlab::Regex.terraform_module_package_name_regex }, if: :terraform_module?
   validates :version, format: { with: Gitlab::Regex.nuget_version_regex }, if: :nuget?
   validates :version, format: { with: Gitlab::Regex.maven_version_regex }, if: -> { version? && maven? }
+
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
   validates :version, format: { with: Gitlab::Regex.pypi_version_regex }, if: :pypi?
+
   validates :version, format: { with: Gitlab::Regex.semver_regex, message: Gitlab::Regex.semver_regex_message },
     if: -> { npm? || terraform_module? }
 
@@ -82,6 +90,8 @@ class Packages::Package < ApplicationRecord
   scope :with_name, ->(name) { where(name: name) }
   scope :with_name_like, ->(name) { where(arel_table[:name].matches(name)) }
 
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
   scope :with_normalized_pypi_name, ->(name) do
     where(
       "LOWER(regexp_replace(name, ?, '-', 'g')) = ?",
@@ -124,6 +134,9 @@ class Packages::Package < ApplicationRecord
 
   scope :preload_npm_metadatum, -> { preload(:npm_metadatum) }
   scope :preload_nuget_metadatum, -> { preload(:nuget_metadatum) }
+
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
   scope :preload_pypi_metadatum, -> { preload(:pypi_metadatum) }
 
   scope :with_npm_scope, ->(scope) do
@@ -176,7 +189,7 @@ class Packages::Package < ApplicationRecord
   def self.inheritance_column = 'package_type'
 
   def self.inheritance_column_to_class_map
-    {
+    hash = {
       ml_model: 'Packages::MlModel::Package',
       golang: 'Packages::Go::Package',
       rubygems: 'Packages::Rubygems::Package',
@@ -186,7 +199,13 @@ def self.inheritance_column_to_class_map
       composer: 'Packages::Composer::Package',
       helm: 'Packages::Helm::Package',
       generic: 'Packages::Generic::Package'
-    }.freeze
+    }
+
+    if Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+      hash[:pypi] = 'Packages::Pypi::Package'
+    end
+
+    hash
   end
 
   def self.only_maven_packages_with_path(path, use_cte: false)
@@ -310,6 +329,9 @@ def mark_package_files_for_destruction
     ::Packages::MarkPackageFilesForDestructionWorker.perform_async(id)
   end
 
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
+  #
   # As defined in PEP 503 https://peps.python.org/pep-0503/#normalized-names
   def normalized_pypi_name
     return name unless pypi?

app/models/packages/pypi/metadatum.rb

 # frozen_string_literal: true
 
 class Packages::Pypi::Metadatum < ApplicationRecord
+  include Gitlab::Utils::StrongMemoize
+
   self.primary_key = :package_id
 
   MAX_REQUIRED_PYTHON_LENGTH = 255
@@ -11,9 +13,20 @@ class Packages::Pypi::Metadatum < ApplicationRecord
   MAX_DESCRIPTION_LENGTH = 4000
   MAX_DESCRIPTION_CONTENT_TYPE_LENGTH = 128
 
-  belongs_to :package, -> { where(package_type: :pypi) }, inverse_of: :pypi_metadatum
+  belongs_to :package, class_name: 'Packages::Pypi::Package', inverse_of: :pypi_metadatum
+
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
+  belongs_to :legacy_package, -> {
+    where(package_type: :pypi)
+  }, inverse_of: :pypi_metadatum, class_name: 'Packages::Package', foreign_key: :package_id
+
+  validates :package, presence: true, if: -> { pypi_extract_pypi_package_model_enabled? }
+
+  # TODO: Remove with the rollout of the FF pypi_extract_pypi_package_model
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/480692
+  validates :legacy_package, presence: true, unless: -> { pypi_extract_pypi_package_model_enabled? }
 
-  validates :package, presence: true
   with_options allow_nil: true do
     validates :keywords, length: { maximum: MAX_KEYWORDS_LENGTH }
     validates :metadata_version, length: { maximum: MAX_METADATA_VERSION_LENGTH }
@@ -24,13 +37,18 @@ class Packages::Pypi::Metadatum < ApplicationRecord
   end
   validates :required_python, length: { maximum: MAX_REQUIRED_PYTHON_LENGTH }, allow_nil: false
 
-  validate :pypi_package_type
+  validate :pypi_package_type, unless: -> { pypi_extract_pypi_package_model_enabled? }
 
   private
 
   def pypi_package_type
-    unless package&.pypi?
+    unless legacy_package&.pypi?
       errors.add(:base, _('Package type must be PyPi'))
     end
   end
+
+  def pypi_extract_pypi_package_model_enabled?
+    Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+  end
+  strong_memoize_attr :pypi_extract_pypi_package_model_enabled?
 end

app/models/packages/pypi/package.rb

+# frozen_string_literal: true
+
+module Packages
+  module Pypi
+    class Package < Packages::Package
+      self.allow_legacy_sti_class = true
+
+      has_one :pypi_metadatum, inverse_of: :package, class_name: 'Packages::Pypi::Metadatum'
+
+      validates :version, format: { with: Gitlab::Regex.pypi_version_regex }
+
+      scope :with_normalized_pypi_name, ->(name) do
+        where(
+          "LOWER(regexp_replace(name, ?, '-', 'g')) = ?",
+          Gitlab::Regex::Packages::PYPI_NORMALIZED_NAME_REGEX_STRING,
+          name.downcase
+        )
+      end
+
+      scope :preload_pypi_metadatum, -> { preload(:pypi_metadatum) }
+
+      # As defined in PEP 503 https://peps.python.org/pep-0503/#normalized-names
+      def normalized_pypi_name
+        return name unless pypi?
+
+        name.gsub(/#{Gitlab::Regex::Packages::PYPI_NORMALIZED_NAME_REGEX_STRING}/o, '-').downcase
+      end
+    end
+  end
+end

app/services/packages/pypi/create_package_service.rb

@@ -8,7 +8,6 @@ class CreatePackageService < ::Packages::CreatePackageService
       def execute
         ::Packages::Package.transaction do
           meta = Packages::Pypi::Metadatum.new(
-            package: created_package,
             required_python: params[:requires_python] || '',
             metadata_version: params[:metadata_version],
             author_email: params[:author_email],
@@ -18,6 +17,12 @@ def execute
             keywords: params[:keywords]
           )
 
+          if Feature.enabled?(:pypi_extract_pypi_package_model, Feature.current_request)
+            meta.package = created_package
+          else
+            meta.legacy_package = created_package
+          end
+
           truncate_fields(meta)
 
           raise ActiveRecord::RecordInvalid, meta unless meta.valid?

config/feature_flags/gitlab_com_derisk/pypi_extract_pypi_package_model.yml

+---
+name: pypi_extract_pypi_package_model
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435827
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165694
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/480692
+milestone: '17.5'
+group: group::package registry
+type: gitlab_com_derisk
+default_enabled: false

db/migrate/20240918141921_add_used_storage_bytes_to_zoekt_indices.rb

+# frozen_string_literal: true
+
+class AddUsedStorageBytesToZoektIndices < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def up
+    add_column :zoekt_indices, :used_storage_bytes, :bigint, default: 0, null: false
+  end
+
+  def down
+    remove_column :zoekt_indices, :used_storage_bytes
+  end
+end

db/schema_migrations/20240918141921

+19604733fae5c112cbd08679fbef6ba02917c5d1d624aeaac4f1a39c3619efe7
\ No newline at end of file

db/structure.sql

@@ -21012,7 +21012,8 @@ CREATE TABLE zoekt_indices (
     updated_at timestamp with time zone NOT NULL,
     state smallint DEFAULT 0 NOT NULL,
     zoekt_replica_id bigint,
-    reserved_storage_bytes bigint DEFAULT '10737418240'::bigint
+    reserved_storage_bytes bigint DEFAULT '10737418240'::bigint,
+    used_storage_bytes bigint DEFAULT 0 NOT NULL
 );
 CREATE SEQUENCE zoekt_indices_id_seq

doc/update/versions/gitlab_17_changes.md

@@ -216,6 +216,11 @@ Check the [GitLab documentation for the upgrade to OpenSSL 3](https://docs.gitla
 NOTE:
 The OpenSSL 3 upgrade has been postponed to GitLab 17.7.0.
 
+- S3 object storage access for the GitLab Runner distributed cache is now handled by the
+  [AWS SDK v2 for Go](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4987) instead of the MinIO client.
+  You can enable the MinIO client again by setting the `FF_USE_LEGACY_S3_CACHE_ADAPTER`
+  [GitLab Runner feature flag](https://docs.gitlab.com/runner/configuration/feature-flags.html) to `true`.
+
 ## 17.4.0
 
 - Starting with GitLab 17.4, new GitLab installations have a different database schema regarding ID columns.
@@ -229,8 +234,6 @@ The OpenSSL 3 upgrade has been postponed to GitLab 17.7.0.
 - Git 2.46.0 and later is required by Gitaly. For installations from source, you should use the [Git version provided by Gitaly](../../install/installation.md#git).
 - S3 object storage uploads in Workhorse are now handled by default using the [AWS SDK v2 for Go](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164597). If you experience issues
   with S3 object storage uploads, you can downgrade to v1 of by disabling the `workhorse_use_aws_sdk_v2` [feature flag](../../administration/feature_flags.md#enable-or-disable-the-feature).
-- GitLab Runner v17.4.0 also [switched from the MinIO S3 client to the AWS SDK v2 for Go](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4987) for distributed cache access.
-  The MinIO client can be enabled again by setting the `FF_USE_LEGACY_S3_CACHE_ADAPTER` [GitLab Runner feature flag](https://docs.gitlab.com/runner/configuration/feature-flags.html) to `true`.
 
 ## 17.3.0
 

ee/spec/finders/security/findings_finder_spec.rb

@@ -6,7 +6,7 @@
   it_behaves_like 'security findings finder' do
     it_behaves_like 'when the pipeline has security findings' do
       let(:findings) { service_object.execute.findings }
-      let(:query_limit) { 27 } # https://gitlab.com/gitlab-org/gitlab/-/issues/478421
+      let(:query_limit) { 16 }
 
       describe '#findings' do
         context 'when the `security_findings` records have `overridden_uuid`s' do