[ARVADOS] updated: 1.3.0-3247-g50697add7

[Git user]

Summary of changes:
 apps/workbench/app/controllers/trash_items_controller.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

       via  50697add78b23c03bd43d99dc35b8b1b64a83bb1 (commit)
      from  06b0aba33e9d1b7a382f2d929a4f990ab4560f0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 50697add78b23c03bd43d99dc35b8b1b64a83bb1
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Fri Oct 2 18:08:13 2020 -0300

    16750: Simplified query.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/apps/workbench/app/controllers/trash_items_controller.rb b/apps/workbench/app/controllers/trash_items_controller.rb
index ad874533f..09437659f 100644
--- a/apps/workbench/app/controllers/trash_items_controller.rb
+++ b/apps/workbench/app/controllers/trash_items_controller.rb
@@ -97,12 +97,9 @@ class TrashItemsController < ApplicationController
         @not_trashed = {}
         federated_reqs = [User]
         [Group, User].each do |owner_class|
-          owners_lst = owner_class.filter([["uuid", "in", owner_uuids]]).with_count("none").include_trash(true)
-          if !Rails.configuration.Login.LoginCluster.empty? && federated_reqs.include?(owner_class)
-            # Federated reqs avoid using 'offset' & 'limit' params
-            owners_lst = owners_lst.fetch_multiple_pages(false)
-          end
-          owners_lst.each do |owner|
+          owner_class.filter([["uuid", "in", owner_uuids]]).with_count("none")
+            .include_trash(true).fetch_multiple_pages(false)
+            .each do |owner|
             @owners[owner.uuid] = owner
           end
         end

-----------------------------------------------------------------------


hooks/post-receive
--