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

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

diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index cf53f7918051d5f842d3921961a3f0f1406bfe39..bc909108058cf927dc623dab7b515aead9aedd8d 100644 (file)
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -1,4 +1,5 @@
 Rails.application.config.active_storage.queue = :storage
+Rails.application.config.active_storage.variable_content_types << "image/bmp"
 
 Rails.configuration.after_initialize do
   require "active_storage/service/s3_service"
@@ -30,4 +31,6 @@ Rails.configuration.after_initialize do
   ActiveSupport::Reloader.to_complete do
     ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   end
+
+  ActiveStorage::Service.url_expires_in = 1.week
 end