Merge remote-tracking branch 'upstream/pull/2470'

[rails.git] / config / initializers / active_storage.rb

diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index bc909108058cf927dc623dab7b515aead9aedd8d..361e2edee8a8bfd2820c2e6ce1f1d2f0340d9150 100644 (file)
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -1,5 +1,5 @@
-Rails.application.config.active_storage.queue = :storage
-Rails.application.config.active_storage.variable_content_types << "image/bmp"
+Rails.application.config.active_storage.queues.analysis = :storage
+Rails.application.config.active_storage.queues.purge = :storage
 
 Rails.configuration.after_initialize do
   require "active_storage/service/s3_service"
@@ -32,5 +32,5 @@ Rails.configuration.after_initialize do
     ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   end
 
-  ActiveStorage::Service.url_expires_in = 1.week
+  ActiveStorage.service_urls_expire_in = 1.week
 end