Merge tag 'v3.2.0rc2'

2026-02-19 16:53:16 +00:00 · 2020-07-25 08:33:42 +08:00 · 2020-07-25 08:33:42 +08:00 · 65c907a448
commit 65c907a448
parent 3843d6fe55 d1a6f8d5a8
126 changed files with 1343 additions and 509 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      'rc1'
+      'rc2'
    end

    def suffix
--- 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
          ''