Merge remote-tracking branch 'origin/master' into gs-master

2017-10-26 09:18:27 -05:00
parent a2612d0d38 d556be2968
commit dd28b94cf0
5 changed files with 36 additions and 18 deletions
--- a/lib/paperclip/gif_transcoder.rb
+++ b/lib/paperclip/gif_transcoder.rb
@@ -10,6 +10,7 @@ module Paperclip
      unless options[:style] == :original && num_frames > 1
        tmp_file = Paperclip::TempfileFactory.new.generate(attachment.instance.file_file_name)
        tmp_file << file.read
+        tmp_file.flush
        return tmp_file
      end