Add latest changes from gitlab-org/gitlab@master

6 files changed, 2 insertions, 6 deletions

diff --git a/app/finders/packages/group_packages_finder.rb b/app/finders/packages/group_packages_finder.rb
index cce2e054459..e753fa4d455 100644
--- a/app/finders/packages/group_packages_finder.rb
+++ b/app/finders/packages/group_packages_finder.rb
@@ -26,7 +26,6 @@ module Packages
         .including_project_route
         .including_tags
         .for_projects(group_projects_visible_to_current_user.select(:id))
-        .processed
         .sort_by_attribute("#{params[:order_by]}_#{params[:sort]}")
 
       packages = filter_with_version(packages)
diff --git a/app/finders/packages/nuget/package_finder.rb b/app/finders/packages/nuget/package_finder.rb
index f5eb60f2931..9ae52745bb2 100644
--- a/app/finders/packages/nuget/package_finder.rb
+++ b/app/finders/packages/nuget/package_finder.rb
@@ -14,7 +14,6 @@ module Packages
       def packages
         result = base.nuget
                      .has_version
-                     .processed
                      .with_name_like(@params[:package_name])
         result = result.with_version(@params[:package_version]) if @params[:package_version].present?
         result
diff --git a/app/finders/packages/package_finder.rb b/app/finders/packages/package_finder.rb
index 368d2028cb5..ee96896e350 100644
--- a/app/finders/packages/package_finder.rb
+++ b/app/finders/packages/package_finder.rb
@@ -13,7 +13,6 @@ module Packages
         .including_project_route
         .including_tags
         .displayable
-        .processed
         .find(@package_id)
     end
   end
diff --git a/app/finders/packages/packages_finder.rb b/app/finders/packages/packages_finder.rb
index 840cbbf7b9d..552468ecfd1 100644
--- a/app/finders/packages/packages_finder.rb
+++ b/app/finders/packages/packages_finder.rb
@@ -17,7 +17,6 @@ module Packages
                         .including_build_info
                         .including_project_route
                         .including_tags
-                        .processed
       packages = filter_with_version(packages)
       packages = filter_by_package_type(packages)
       packages = filter_by_package_name(packages)
diff --git a/app/finders/packages/pypi/package_finder.rb b/app/finders/packages/pypi/package_finder.rb
index 3bb484b34f2..574e9770363 100644
--- a/app/finders/packages/pypi/package_finder.rb
+++ b/app/finders/packages/pypi/package_finder.rb
@@ -10,7 +10,7 @@ module Packages
       private
 
       def packages
-        base.pypi.has_version.processed
+        base.pypi.has_version
       end
     end
   end
diff --git a/app/finders/packages/pypi/packages_finder.rb b/app/finders/packages/pypi/packages_finder.rb
index 223caecb4dc..642ca2cf2e6 100644
--- a/app/finders/packages/pypi/packages_finder.rb
+++ b/app/finders/packages/pypi/packages_finder.rb
@@ -13,7 +13,7 @@ module Packages
       private
 
       def packages
-        base.pypi.has_version.processed
+        base.pypi.has_version
       end
     end
   end