Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 3 deletions

diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index c5da647eea5..970538b45e7 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -162,7 +162,8 @@ class Packages::Package < ApplicationRecord
   scope :preload_files, -> { preload(:installable_package_files) }
   scope :preload_nuget_files, -> { preload(:installable_nuget_package_files) }
   scope :preload_pipelines, -> { preload(pipelines: :user) }
-  scope :last_of_each_version, -> { where(id: all.select('MAX(id) AS id').group(:version)) }
+  scope :last_of_each_version, -> { where(id: all.last_of_each_version_ids) }
+  scope :last_of_each_version_ids, -> { select('MAX(id) AS id').unscope(where: :id).group(:version) }
   scope :limit_recent, ->(limit) { order_created_desc.limit(limit) }
   scope :select_distinct_name, -> { select(:name).distinct }
 
diff --git a/app/models/packages/tag.rb b/app/models/packages/tag.rb
index 14a1ae98ed4..9c17a147bf4 100644
--- a/app/models/packages/tag.rb
+++ b/app/models/packages/tag.rb
@@ -10,8 +10,8 @@ class Packages::Tag < ApplicationRecord
   scope :preload_package, -> { preload(:package) }
   scope :with_name, -> (name) { where(name: name) }
 
-  def self.for_packages(packages)
-    where(package_id: packages.select(:id))
+  def self.for_package_ids(package_ids)
+    where(package_id: package_ids)
       .order(updated_at: :desc)
       .limit(FOR_PACKAGES_TAGS_LIMIT)
   end
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 36166bdbc9a..bb8527d8c01 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -2,6 +2,9 @@
 
 class SystemNoteMetadata < ApplicationRecord
   include Importable
+  include IgnorableColumns
+
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-05-22'
 
   # These notes's action text might contain a reference that is external.
   # We should always force a deep validation upon references that are found