Merge branch '18376-nfs-readdirent'

[arvados.git] / services / api / lib / trashable.rb

diff --git a/services/api/lib/trashable.rb b/services/api/lib/trashable.rb
index f7faabc4c262c990ee20ee60a9cdc829b1bf8214..c99b08513b64a57b046dccea7905ca032bd3b916 100644 (file)
--- a/services/api/lib/trashable.rb
+++ b/services/api/lib/trashable.rb
@@ -65,7 +65,7 @@ module Trashable
       earliest_delete = [
         @validation_timestamp,
         trash_at_was,
-      ].compact.min + Rails.configuration.Collections.BlobSigningTTL.seconds
+      ].compact.min + Rails.configuration.Collections.BlobSigningTTL
 
       # The previous value of delete_at is also an upper bound on the
       # longest-lived permission token. For example, if TTL=14,
@@ -96,7 +96,7 @@ module TrashableController
       @object.update_attributes!(trash_at: db_current_time)
     end
     earliest_delete = (@object.trash_at +
-                       Rails.configuration.Collections.BlobSigningTTL.seconds)
+                       Rails.configuration.Collections.BlobSigningTTL)
     if @object.delete_at > earliest_delete
       @object.update_attributes!(delete_at: earliest_delete)
     end