diff options
| author | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
|---|---|---|
| committer | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
| commit | bb6988a7ac319c08776d8c07204232a67f992671 (patch) | |
| tree | 4a53349374bc4a871a6ce74b786a8e747803155c /lib/paperclip/gif_transcoder.rb | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | e668180044560e28bdc5eef94744c210013efcda (diff) | |
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
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] |