diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-28 00:10:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-28 00:10:09 +0000 |
| commit | 0c4afb9f5620604d74f88b52bfff6a3dce459429 (patch) | |
| tree | 0e2f338f772b2d051c2769a8c3b1d5996995e297 /app/finders | |
| parent | 69eadbe425dc040e72a173a6d96a22dd8836031b (diff) | |
| download | gitlab-ce-0c4afb9f5620604d74f88b52bfff6a3dce459429.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 | 2 | ||||
| -rw-r--r-- | app/finders/packages/package_finder.rb | 2 | ||||
| -rw-r--r-- | app/finders/packages/packages_finder.rb | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/finders/packages/group_packages_finder.rb b/app/finders/packages/group_packages_finder.rb index 3ac5f00d518..093deb43c41 100644 --- a/app/finders/packages/group_packages_finder.rb +++ b/app/finders/packages/group_packages_finder.rb @@ -22,7 +22,7 @@ module Packages def packages_for_group_projects(installable_only: false) packages = ::Packages::Package - .including_build_info + .load_pipelines .including_project_route .including_tags .for_projects(group_projects_visible_to_current_user.select(:id)) diff --git a/app/finders/packages/package_finder.rb b/app/finders/packages/package_finder.rb index ee96896e350..f4463bf0726 100644 --- a/app/finders/packages/package_finder.rb +++ b/app/finders/packages/package_finder.rb @@ -9,7 +9,7 @@ module Packages def execute @project .packages - .including_build_info + .load_pipelines .including_project_route .including_tags .displayable diff --git a/app/finders/packages/packages_finder.rb b/app/finders/packages/packages_finder.rb index 552468ecfd1..29ec3645633 100644 --- a/app/finders/packages/packages_finder.rb +++ b/app/finders/packages/packages_finder.rb @@ -14,9 +14,10 @@ module Packages def execute packages = project.packages - .including_build_info + .load_pipelines .including_project_route .including_tags + packages = filter_with_version(packages) packages = filter_by_package_type(packages) packages = filter_by_package_name(packages) |