diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-23 15:05:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 15:05:00 -0600 |
| commit | f53953d28a24fe65f1ca66d85a1416ba30dcda86 (patch) | |
| tree | 4e9e2214629b46ddc98fdce358abc812112f13fa /lib/paperclip/gif_transcoder.rb | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | f2f19e1f8a3a048cf0a0041ae54d912acfea7742 (diff) | |
Merge pull request #369 from KnzkDev/merge-upstream
Merge with upstream @ e668180044560e28bdc5eef94744c210013efcda
Diffstat (limited to 'lib/paperclip/gif_transcoder.rb')
| -rw-r--r-- | lib/paperclip/gif_transcoder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/gif_transcoder.rb b/lib/paperclip/gif_transcoder.rb index 629e37581..62787983c 100644 --- a/lib/paperclip/gif_transcoder.rb +++ b/lib/paperclip/gif_transcoder.rb @@ -16,7 +16,7 @@ module Paperclip final_file = Paperclip::Transcoder.make(file, options, attachment) - attachment.instance.file_file_name = 'media.mp4' + attachment.instance.file_file_name = File.basename(attachment.instance.file_file_name, '.*') + '.mp4' attachment.instance.file_content_type = 'video/mp4' attachment.instance.type = MediaAttachment.types[:gifv] |