Commit 60fe3a6a authored by Andy Soiron's avatar Andy Soiron

Merge branch '340586-ascending-ordering-package-files-API' into 'master'

Ascending ordering the package file API

See merge request gitlab-org/gitlab!81426
parents 423eb472 46013188
...@@ -49,6 +49,7 @@ class Packages::PackageFile < ApplicationRecord ...@@ -49,6 +49,7 @@ class Packages::PackageFile < ApplicationRecord
scope :preload_conan_file_metadata, -> { preload(:conan_file_metadatum) } scope :preload_conan_file_metadata, -> { preload(:conan_file_metadatum) }
scope :preload_debian_file_metadata, -> { preload(:debian_file_metadatum) } scope :preload_debian_file_metadata, -> { preload(:debian_file_metadatum) }
scope :preload_helm_file_metadata, -> { preload(:helm_file_metadatum) } scope :preload_helm_file_metadata, -> { preload(:helm_file_metadatum) }
scope :order_id_asc, -> { order(id: :asc) }
scope :for_rubygem_with_file_name, ->(project, file_name) do scope :for_rubygem_with_file_name, ->(project, file_name) do
joins(:package).merge(project.packages.rubygems).with_file_name(file_name) joins(:package).merge(project.packages.rubygems).with_file_name(file_name)
......
...@@ -29,7 +29,7 @@ module API ...@@ -29,7 +29,7 @@ module API
.new(user_project, params[:package_id]).execute .new(user_project, params[:package_id]).execute
package_files = package.installable_package_files package_files = package.installable_package_files
.preload_pipelines .preload_pipelines.order_id_asc
present paginate(package_files), with: ::API::Entities::PackageFile present paginate(package_files), with: ::API::Entities::PackageFile
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment