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

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

diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 3d2c91265698304e7ac1bdf823a411c1c74d8d9d..6bcaf895fdd480f10e833dee29c784fc3313fef0 100644 (file)
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -1,31 +1,6 @@
-Rails.configuration.after_initialize do
-  require "active_storage/service/s3_service"
-  require_dependency "active_storage/variant"
-
-  module OpenStreetMap
-    module ActiveStorage
-      module Variant
-        private
-
-        def upload(image)
-          File.open(image.path, "r") { |file| service.upload(key, file, :content_type => content_type) }
-        end
-      end
+Rails.application.config.active_storage.queues.analysis = :storage
+Rails.application.config.active_storage.queues.purge = :storage
 
-      module S3Service
-        def upload(key, io, content_type:, **options)
-          @upload_options[:content_type] = content_type
-          super(key, io, **options)
-          @upload_options.delete(:content_type)
-        end
-      end
-    end
-  end
-
-  ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
-  ActiveStorage::Service::S3Service.prepend(OpenStreetMap::ActiveStorage::S3Service)
-
-  ActiveSupport::Reloader.to_complete do
-    ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
-  end
+Rails.configuration.after_initialize do
+  ActiveStorage.service_urls_expire_in = 1.week
 end