cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop monkey patch that is no longer needed with rails 6

Browse source
This commit is contained in:
Tom Hughes 2021-05-10 20:17:15 +01:00
parent 1ba10fa9ac
commit 4d164df5b8
1 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
config/initializers/active_storage.rb
View file

@ -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