app/mailers/emails/projects.rb

@@ -48,6 +48,25 @@ def repository_cleanup_failure_email(project, user, error)
       mail_with_locale(to: user.notification_email_for(project.group), subject: subject("Project cleanup failure"))
     end
 
+    def repository_rewrite_history_success_email(project, user)
+      @project = project
+
+      email_with_layout(
+        to: user.notification_email_for(project.group),
+        subject: subject("Project history rewrite has completed")
+      )
+    end
+
+    def repository_rewrite_history_failure_email(project, user, error)
+      @project = project
+      @error = error
+
+      email_with_layout(
+        to: user.notification_email_for(project.group),
+        subject: subject("Project history rewrite failure")
+      )
+    end
+
     def repository_push_email(project_id, opts = {})
       @message =
         Gitlab::Email::Message::RepositoryPush.new(self, project_id, opts)

app/mailers/previews/notify_preview.rb

@@ -379,6 +379,14 @@ def import_source_user_rejected
     Notify.import_source_user_rejected(source_user.id)
   end
 
+  def repository_rewrite_history_success_email
+    Notify.repository_rewrite_history_success_email(project, user)
+  end
+
+  def repository_rewrite_history_failure_email
+    Notify.repository_rewrite_history_failure_email(project, user, 'Error message')
+  end
+
   private
 
   def project

app/models/concerns/enums/package_metadata.rb

@@ -9,7 +9,8 @@ class PackageMetadata
 
     DATA_TYPES = {
       advisories: 1,
-      licenses: 2
+      licenses: 2,
+      cve_enrichment: 3
     }.with_indifferent_access.freeze
 
     VERSION_FORMATS = {

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/models/user.rb

@@ -415,7 +415,6 @@ def update_tracked_fields!(request)
     :tab_width, :tab_width=,
     :sourcegraph_enabled, :sourcegraph_enabled=,
     :gitpod_enabled, :gitpod_enabled=,
-    :use_web_ide_extension_marketplace, :use_web_ide_extension_marketplace=,
     :extensions_marketplace_opt_in_status, :extensions_marketplace_opt_in_status=,
     :organization_groups_projects_sort, :organization_groups_projects_sort=,
     :organization_groups_projects_display, :organization_groups_projects_display=,

app/models/user_preference.rb

 # frozen_string_literal: true
 
 class UserPreference < ApplicationRecord
-  include IgnorableColumns
-
-  ignore_column :use_web_ide_extension_marketplace, remove_with: '17.4', remove_after: '2024-08-15'
-
   # We could use enums, but Rails 4 doesn't support multiple
   # enum options with same name for multiple fields, also it creates
   # extra methods that aren't really needed here.
@@ -43,7 +39,6 @@ class UserPreference < ApplicationRecord
   attribute :render_whitespace_in_code, default: false
   attribute :project_shortcut_buttons, default: true
   attribute :keyboard_shortcuts_enabled, default: true
-  attribute :use_web_ide_extension_marketplace, default: false
   attribute :dpop_enabled, default: false
 
   enum :visibility_pipeline_id_type, { id: 0, iid: 1 }, scopes: false

app/models/work_items/widgets/start_and_due_date.rb

@@ -5,32 +5,52 @@ module Widgets
     class StartAndDueDate < Base
       include ::Gitlab::Utils::StrongMemoize
 
-      def self.quick_action_commands
-        [:due, :remove_due_date]
+      class << self
+        def quick_action_commands
+          %i[due remove_due_date]
+        end
+
+        def quick_action_params
+          %i[due_date]
+        end
       end
 
-      def self.quick_action_params
-        [:due_date]
+      # rubocop:disable Gitlab/NoCodeCoverageComment -- overridden and tested in EE
+      # :nocov:
+      def fixed?
+        true
       end
 
-      def start_date
-        return dates_source.start_date_fixed if dates_source.present?
+      def can_rollup?
+        false
+      end
+      # :nocov:
+      # rubocop:enable Gitlab/NoCodeCoverageComment
 
-        work_item&.start_date
+      def start_date
+        dates_source.start_date_fixed
       end
 
       def due_date
-        return dates_source.due_date_fixed if dates_source.present?
-
-        work_item&.due_date
+        dates_source.due_date_fixed
       end
 
       private
 
       def dates_source
-        work_item&.dates_source
+        return DatesSource.new if work_item.blank?
+        return work_item.dates_source if work_item.dates_source.present?
+
+        work_item.build_dates_source(
+          start_date_is_fixed: true,
+          due_date_is_fixed: true,
+          start_date_fixed: work_item.start_date,
+          due_date_fixed: work_item.due_date
+        )
       end
       strong_memoize_attr :dates_source
     end
   end
 end
+
+WorkItems::Widgets::StartAndDueDate.prepend_mod

app/serializers/note_user_entity.rb

@@ -4,6 +4,8 @@ class NoteUserEntity < UserEntity
   unexpose :web_url
 
   expose :bot?, as: :bot
+
+  expose :user_type
 end
 
 NoteUserEntity.prepend_mod_with('NoteUserEntity')

app/services/ci/list_config_variables_service.rb

@@ -24,21 +24,12 @@ def execute(ref)
       with_reactive_cache(sha, ref) { |result| result }
     end
 
-    # Changing parameters in an `calculate_reactive_cache` method is like changing parameters in a Sidekiq worker.
-    # So, we need to follow the same rules: https://docs.gitlab.com/ee/development/sidekiq/compatibility_across_updates.html#add-an-argument
-    # That's why `ref` is an optional parameter for now.
-    def calculate_reactive_cache(sha, ref = nil) # rubocop:disable Lint/UnusedMethodArgument -- explained above
+    def calculate_reactive_cache(sha, ref)
       config = ::Gitlab::Ci::ProjectConfig.new(project: project, sha: sha)
 
       return {} unless config.exists?
 
-      # Because of the same reason as above, we need to check if `ref` is nil or not for backward compatibility.
-      # In the next iteration, we can remove this check and make `ref` a required parameter.
-      result = if ref.nil?
-                 legacy_calculation(sha, config)
-               else
-                 new_calculation(sha, ref, config)
-               end
+      result = execute_yaml_processor(sha, ref, config)
 
       result.valid? ? result.root_variables_with_prefill_data : {}
     end
@@ -50,20 +41,7 @@ def id
 
     private
 
-    def legacy_calculation(sha, config)
-      ref_name = Gitlab::Ci::RefFinder.new(project).find_by_sha(sha)
-
-      Gitlab::Ci::YamlProcessor.new(
-        config.content,
-        project: project,
-        user: current_user,
-        sha: sha,
-        ref: ref_name,
-        verify_project_sha: true
-      ).execute
-    end
-
-    def new_calculation(sha, ref, config)
+    def execute_yaml_processor(sha, ref, config)
       # The `ref` parameter should be branch or tag name. However, the API also accepts a commit SHA and we can't
       # change it to not introduce breaking changes. Instead, here we're checking if a commit SHA is passed
       # as `ref`. If so, we should verify the sha whether it belongs to the project in YamlProcessor.

app/services/notification_service.rb

@@ -700,6 +700,18 @@ def repository_cleanup_failure(project, user, error)
     mailer.send(:repository_cleanup_failure_email, project, user, error).deliver_later
   end
 
+  def repository_rewrite_history_success(project, user)
+    return if project.emails_disabled?
+
+    mailer.repository_rewrite_history_success_email(project, user).deliver_later
+  end
+
+  def repository_rewrite_history_failure(project, user, error)
+    return if project.emails_disabled?
+
+    mailer.repository_rewrite_history_failure_email(project, user, error).deliver_later
+  end
+
   def remote_mirror_update_failed(remote_mirror)
     recipients = project_maintainers_recipients(remote_mirror, action: 'update_failed')
 

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?

app/views/groups/show.html.haml

@@ -19,7 +19,7 @@
 
 = render partial: 'flash_messages'
 
-= render_if_exists 'subscriptions/trials/alert', namespace: @group
+= render_if_exists 'gitlab_subscriptions/trials/alert', namespace: @group
 
 = render 'groups/home_panel'
 

app/views/notify/repository_rewrite_history_failure_email.html.haml

+%p
+  = s_('Notify|Repository history rewrite failed on %{project_url}.') % { project_url: @project.web_url }
+%p
+  = @error

app/views/notify/repository_rewrite_history_failure_email.text.erb

+Repository history rewrite failed on <%= @project.web_url %>
+
+<%= @error %>

app/views/notify/repository_rewrite_history_success_email.html.haml

+%p
+  = s_('Notify|Repository history rewrite succeeded on %{project_url}.') % { project_url: @project.web_url }
+%p
+  = s_('Notify|Repository size is now %{repository_size} MiB.') % { repository_size: "%.1f" % (@project.repository.size || 0) }

app/views/notify/repository_rewrite_history_success_email.text.erb

+Repository history rewrite succeeded on <%= @project.web_url %>
+
+Repository size is now <%= "%.1f" % (@project.repository.size || 0) %> MiB

app/views/projects/commits/_commit.html.haml

@@ -24,8 +24,8 @@
 - add_page_specific_style 'page_bundles/commit_description'
 
 %li{ class: ["commit flex-row", ("js-toggle-container" if collapsible)], id: "commit-#{commit.short_id}" }
-  .avatar-cell.gl-my-2
-    = author_avatar(commit, size: 32, has_tooltip: false, css_class: 'gl-inline-block')
+  .gl-self-start.gl-hidden.sm:gl-block
+    = author_avatar(commit, size: 40, has_tooltip: false)
 
   .commit-detail.flex-list.gl-flex.gl-justify-between.gl-items-center.gl-grow.gl-min-w-0
     .commit-content{ data: { testid: 'commit-content' } }

ee/config/events/value_streams_dashboard_metric_link_clicked.yml → config/events/disabled_auto_close_incident.yml

 ---
-description: Triggered when any drill-down link on the Value Stream dashboard is clicked.
-internal_events: true
-action: value_streams_dashboard_metric_link_clicked
-extra_properties:
+description: Triggered when automatic closing of incidents is disabled in Incident Management
+action: disabled_auto_close_incident
 identifiers:
-- project
-- user
-- namespace
-product_group: optimize
-milestone: "16.7"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138553
+product_group: respond
+milestone: "<13.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40379
 distributions:
+- ce
 - ee
 tiers:
+- free
+- premium
 - ultimate