diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
| commit | b9f351d8455f672137a34ea0ea0b1050fba3464b (patch) | |
| tree | 4a2dd275ddecf46760ccb8140fac5f6cb21ac766 /lib | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | 5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/paperclip/media_type_spoof_detector_extensions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/media_type_spoof_detector_extensions.rb b/lib/paperclip/media_type_spoof_detector_extensions.rb index 363934d8d..43337cc68 100644 --- a/lib/paperclip/media_type_spoof_detector_extensions.rb +++ b/lib/paperclip/media_type_spoof_detector_extensions.rb @@ -18,7 +18,7 @@ module Paperclip @type_from_mime_magic ||= begin begin File.open(@file.path) do |file| - MimeMagic.by_magic(file)&.type + MimeMagic.by_magic(file)&.type || '' end rescue Errno::ENOENT '' |