projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9918: Merge branch 'master' into 9918-index-timeout
[arvados.git]
/
services
/
api
/
app
/
models
/
collection.rb
diff --git
a/services/api/app/models/collection.rb
b/services/api/app/models/collection.rb
index a088d48e68f466a6b36ad4d663a031008cc95fd7..4772768c8fe086f1e3bc2a25ca7a134cef8d436c 100644
(file)
--- a/
services/api/app/models/collection.rb
+++ b/
services/api/app/models/collection.rb
@@
-3,7
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0
require 'arvados/keep'
# SPDX-License-Identifier: AGPL-3.0
require 'arvados/keep'
-require 'sweep_trashed_
collection
s'
+require 'sweep_trashed_
object
s'
require 'trashable'
class Collection < ArvadosModel
require 'trashable'
class Collection < ArvadosModel
@@
-448,7
+448,7
@@
class Collection < ArvadosModel
end
def self.where *args
end
def self.where *args
- SweepTrashed
Collection
s.sweep_if_stale
+ SweepTrashed
Object
s.sweep_if_stale
super
end
super
end