Merge branch 'main' of https://github.com/mastodon/mastodon

.github/workflows/build-image.yml

@@ -1,5 +1,6 @@
 name: Build container image
 on:
+  workflow_dispatch:
   push:
     branches:
       - "main"

lib/paperclip/response_with_limit_adapter.rb

@@ -17,9 +17,9 @@ module Paperclip
 
     def cache_current_values
       @original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
-      @size = @target.response.content_length
       @tempfile = copy_to_tempfile(@target)
       @content_type = ContentTypeDetector.new(@tempfile.path).detect
+      @size = File.size(@tempfile)
     end
 
     def copy_to_tempfile(source)