From 4d164df5b8a0d6571f738f2d10b49da1aeaafdcd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 10 May 2021 20:17:15 +0100 Subject: [PATCH] Drop monkey patch that is no longer needed with rails 6 --- config/initializers/active_storage.rb | 30 --------------------------- 1 file changed, 30 deletions(-) diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb index 042d78695..6bcaf895f 100644 --- a/config/initializers/active_storage.rb +++ b/config/initializers/active_storage.rb @@ -1,36 +1,6 @@ Rails.application.config.active_storage.queues.analysis = :storage Rails.application.config.active_storage.queues.purge = :storage -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 - - 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 - Rails.configuration.after_initialize do - require "active_storage/service/s3_service" - require_dependency "active_storage/variant" - - 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 - ActiveStorage.service_urls_expire_in = 1.week end -- 2.39.5