From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- app/models/packages/package.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/models/packages/package.rb') diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb index 10c98f03804..2067a800ad5 100644 --- a/app/models/packages/package.rb +++ b/app/models/packages/package.rb @@ -112,6 +112,7 @@ class Packages::Package < ApplicationRecord scope :order_project_name_desc, -> { joins(:project).reorder('projects.name DESC') } scope :order_project_path, -> { joins(:project).reorder('projects.path ASC, id ASC') } scope :order_project_path_desc, -> { joins(:project).reorder('projects.path DESC, id DESC') } + scope :order_by_package_file, -> { joins(:package_files).order('packages_package_files.created_at ASC') } def self.for_projects(projects) return none unless projects.any? @@ -199,6 +200,12 @@ class Packages::Package < ApplicationRecord debian? && !version.nil? end + def package_settings + strong_memoize(:package_settings) do + project.namespace.package_settings + end + end + private def composer_tag_version? -- cgit v1.2.1