Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 0 deletions

diff --git a/app/models/issue_user_mention.rb b/app/models/issue_user_mention.rb
index 3eadd580f7f..bb13b83d3ba 100644
--- a/app/models/issue_user_mention.rb
+++ b/app/models/issue_user_mention.rb
@@ -3,4 +3,7 @@
 class IssueUserMention < UserMention
   belongs_to :issue
   belongs_to :note
+  include IgnorableColumns
+
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-05-22'
 end
diff --git a/app/models/note_diff_file.rb b/app/models/note_diff_file.rb
index 67a6d5d6d6b..4238de0a2f8 100644
--- a/app/models/note_diff_file.rb
+++ b/app/models/note_diff_file.rb
@@ -2,6 +2,9 @@
 
 class NoteDiffFile < ApplicationRecord
   include DiffFile
+  include IgnorableColumns
+
+  ignore_column :diff_note_id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-05-22'
 
   scope :referencing_sha, -> (oids, project_id:) do
     joins(:diff_note).where(notes: { project_id: project_id, commit_id: oids })
diff --git a/app/models/packages/composer/metadatum.rb b/app/models/packages/composer/metadatum.rb
index 363858a3ed1..8b0b71ca86f 100644
--- a/app/models/packages/composer/metadatum.rb
+++ b/app/models/packages/composer/metadatum.rb
@@ -10,8 +10,18 @@ module Packages
 
       validates :package, :target_sha, :composer_json, presence: true
 
+      validate :composer_package_type
+
       scope :for_package, ->(name, project_id) { joins(:package).where(packages_packages: { name: name, project_id: project_id, package_type: Packages::Package.package_types[:composer] }) }
       scope :locked_for_update, -> { lock('FOR UPDATE') }
+
+      private
+
+      def composer_package_type
+        return if package&.composer?
+
+        errors.add(:base, _('Package type must be Composer'))
+      end
     end
   end
 end