diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 00:09:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 00:09:08 +0000 |
| commit | dc965b8cc88f8dadf879c0d80214864c699ebf1f (patch) | |
| tree | f6f23524912c004102a60cbd944e77ca2049ed2d /app/finders | |
| parent | 692f4b734f1976b690dccb5458c198b5205c51b5 (diff) | |
| download | gitlab-ce-dc965b8cc88f8dadf879c0d80214864c699ebf1f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/packages/group_packages_finder.rb | 3 | ||||
| -rw-r--r-- | app/finders/packages/package_finder.rb | 3 | ||||
| -rw-r--r-- | app/finders/packages/packages_finder.rb | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/finders/packages/group_packages_finder.rb b/app/finders/packages/group_packages_finder.rb index ffc8c35fbcc..8b948bb056d 100644 --- a/app/finders/packages/group_packages_finder.rb +++ b/app/finders/packages/group_packages_finder.rb @@ -22,6 +22,9 @@ module Packages def packages_for_group_projects packages = ::Packages::Package + .including_build_info + .including_project_route + .including_tags .for_projects(group_projects_visible_to_current_user) .processed .has_version diff --git a/app/finders/packages/package_finder.rb b/app/finders/packages/package_finder.rb index 0e911491da2..f1874b77845 100644 --- a/app/finders/packages/package_finder.rb +++ b/app/finders/packages/package_finder.rb @@ -9,6 +9,9 @@ module Packages def execute @project .packages + .including_build_info + .including_project_route + .including_tags .processed .find(@package_id) end diff --git a/app/finders/packages/packages_finder.rb b/app/finders/packages/packages_finder.rb index c533cb266a2..519e8bf9c34 100644 --- a/app/finders/packages/packages_finder.rb +++ b/app/finders/packages/packages_finder.rb @@ -13,7 +13,12 @@ module Packages end def execute - packages = project.packages.processed.has_version + packages = project.packages + .including_build_info + .including_project_route + .including_tags + .processed + .has_version packages = filter_by_package_type(packages) packages = filter_by_package_name(packages) packages = order_packages(packages) |