Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-28 10:29:08 -05:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update dependency kt-paperclip to v8 (#39667)

Browse Source 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Pia B <pia.bregulla@web.de>
This commit is contained in:
renovate[bot]
2026-07-06 10:21:04 +02:00
committed by GitHub
parent 163f96cee4
commit 07bd3932b0
4 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -19,7 +19,7 @@ gem 'blurhash', '~> 0.1'
gem 'fog-core', '<= 2.6.0'
gem 'fog-openstack', '~> 1.0', require: false
gem 'jd-paperclip-azure', '~> 3.0', require: false
gem 'kt-paperclip', '~> 7.2'
gem 'kt-paperclip', '~> 8.0'
gem 'ruby-vips', '~> 2.2', require: false
gem 'active_model_serializers', '~> 0.10'

10
Gemfile.lock
View File

@@ -392,12 +392,12 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kt-paperclip (7.3.0)
kt-paperclip (8.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
marcel (~> 1.0.1)
marcel (>= 1.0.1)
mime-types
terrapin (>= 0.6.0, < 2.0)
terrapin (>= 0.6.0)
language_server-protocol (3.17.0.5)
launchy (3.1.1)
addressable (~> 2.8)
@@ -438,7 +438,7 @@ GEM
net-imap
net-pop
net-smtp
marcel (1.0.4)
marcel (1.2.1)
mario-redis-lock (1.2.1)
redis (>= 3.0.5)
matrix (0.4.3)
@@ -1007,7 +1007,7 @@ DEPENDENCIES
json-ld-preloaded (~> 3.2)
json-schema (~> 6.0)
kaminari (~> 1.2)
kt-paperclip (~> 7.2)
kt-paperclip (~> 8.0)
letter_opener (~> 1.8)
letter_opener_web (~> 3.0)
link_header (~> 0.0)

1
config/application.rb
View File

@@ -28,7 +28,6 @@ require_relative '../lib/paperclip/url_generator_extensions'
require_relative '../lib/paperclip/attachment_extensions'
require_relative '../lib/paperclip/gif_transcoder'
require_relative '../lib/paperclip/media_type_spoof_detector_extensions'
require_relative '../lib/paperclip/transcoder'
require_relative '../lib/paperclip/type_corrector'
require_relative '../lib/paperclip/response_with_limit_adapter'

24
lib/paperclip/media_type_spoof_detector_extensions.rb
View File

@@ -1,24 +0,0 @@
# frozen_string_literal: true
module Paperclip
module MediaTypeSpoofDetectorExtensions
MARCEL_MIME_TYPES = %w(audio/mpeg image/avif).freeze
def calculated_content_type
return @calculated_content_type if defined?(@calculated_content_type)
@calculated_content_type = type_from_file_command.chomp
# The `file` command fails to recognize some MP3 files as such
@calculated_content_type = type_from_marcel if @calculated_content_type == 'application/octet-stream' && type_from_marcel.in?(MARCEL_MIME_TYPES)
@calculated_content_type
end
def type_from_marcel
@type_from_marcel ||= Marcel::MimeType.for Pathname.new(@file.path),
name: @file.path
end
end
end
Paperclip::MediaTypeSpoofDetector.prepend(Paperclip::MediaTypeSpoofDetectorExtensions)