Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 2 insertions, 4 deletions

diff --git a/app/models/packages/composer/cache_file.rb b/app/models/packages/composer/cache_file.rb
index ecd7596b989..5222101d171 100644
--- a/app/models/packages/composer/cache_file.rb
+++ b/app/models/packages/composer/cache_file.rb
@@ -9,15 +9,13 @@ module Packages
 
       mount_file_store_uploader Packages::Composer::CacheUploader
 
-      belongs_to :group, -> { where(type: 'Group') }, foreign_key: 'namespace_id'
+      belongs_to :group, -> { where(type: Group.sti_name) }, foreign_key: 'namespace_id'
       belongs_to :namespace
 
       validates :namespace, presence: true
 
       scope :with_namespace, ->(namespace) { where(namespace: namespace) }
       scope :with_sha, ->(sha) { where(file_sha256: sha) }
-      scope :expired, -> { where("delete_at <= ?", Time.current) }
-      scope :without_namespace, -> { where(namespace_id: nil) }
     end
   end
 end
diff --git a/app/models/packages/helm/file_metadatum.rb b/app/models/packages/helm/file_metadatum.rb
index 1771003d1f9..dfa4ab6df82 100644
--- a/app/models/packages/helm/file_metadatum.rb
+++ b/app/models/packages/helm/file_metadatum.rb
@@ -12,7 +12,7 @@ module Packages
 
       validates :channel,
         presence: true,
-        length: { maximum: 63 },
+        length: { maximum: 255 },
         format: { with: Gitlab::Regex.helm_channel_regex }
 
       validates :metadata,