diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-07 22:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 22:26:10 +0200 |
| commit | fce885f271f8651702d606406e21677280071e40 (patch) | |
| tree | 2ebb76c77088edf0662ef333523ef0f0a03b6c4e /app/models/concerns | |
| parent | e5f4d83e60305e2f502f18f507ad79d8fbccfe77 (diff) | |
| parent | 5ff9970c8d4acfb69b4696a3b5ce8e2a9580e370 (diff) | |
Merge pull request #1152 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 24f5968de..7c78bb456 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -60,7 +60,9 @@ module Attachmentable end def calculated_content_type(attachment) - Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp + content_type = Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp + content_type = 'video/mp4' if content_type == 'video/x-m4v' + content_type rescue Terrapin::CommandLineError '' end |