Merge pull request #1316 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

2 files changed, 1 insertions, 12 deletions

diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 08a8f1093..0f211f272 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -276,7 +276,7 @@ module Mastodon
       preload_map = Hash.new { |hash, key| hash[key] = [] }
 
       objects.map do |object|
-        segments   = object.key.split('/').first
+        segments   = object.key.split('/')
         model_name = segments.first.classify
         record_id  = segments[2..-2].join.to_i
 
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index d9ec0159a..ce5780557 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -14,17 +14,6 @@ module Paperclip
       end
     end
 
-    def reprocess_original!
-      old_original_path = path(:original)
-      reprocess!(:original)
-      new_original_path = path(:original)
-
-      if new_original_path != old_original_path
-        @queued_for_delete << old_original_path
-        flush_deletes
-      end
-    end
-
     def variant?(other_filename)
       return true  if original_filename == other_filename
       return false if original_filename.nil?