Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee

2 files changed, 8 insertions, 1 deletions

diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index 52dd0aba43b..1b2c3e25283 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -25,7 +25,7 @@ class Packages::Package < ApplicationRecord
     terraform_module: 12
   }
 
-  enum status: { default: 0, hidden: 1, processing: 2, error: 3 }
+  enum status: { default: 0, hidden: 1, processing: 2, error: 3, pending_destruction: 4 }
 
   belongs_to :project
   belongs_to :creator, class_name: 'User'
@@ -304,6 +304,12 @@ class Packages::Package < ApplicationRecord
     build_infos.find_or_create_by!(pipeline: build.pipeline)
   end
 
+  def mark_package_files_for_destruction
+    return unless pending_destruction?
+
+    ::Packages::MarkPackageFilesForDestructionWorker.perform_async(id)
+  end
+
   private
 
   def composer_tag_version?
diff --git a/app/models/packages/package_file.rb b/app/models/packages/package_file.rb
index 072ff4a3a5f..190081c4e8e 100644
--- a/app/models/packages/package_file.rb
+++ b/app/models/packages/package_file.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 class Packages::PackageFile < ApplicationRecord
+  include EachBatch
   include UpdateProjectStatistics
   include FileStoreMounter
   include Packages::Installable