diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-04 22:17:10 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-04 23:02:24 +0100 |
| commit | caf5b8e9757679b93b9a34b0c55f43cb47910201 (patch) | |
| tree | 6d1dde88a9e086190dea20a3d8b7935afe8ae71c /config | |
| parent | 4cbeb9a7eb4d24cfa1fd2ce6e4a2e731c486925d (diff) | |
Fix #431 - convert gif to webm during upload. Web UI treats them like it did
before. In the API, attachments now can be either image, video or gifv. Gifv is to be treated like images in terms of behaviour, but are videos by file type.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 1ea65619c..30ed608c5 100644 --- a/config/application.rb +++ b/config/application.rb @@ -2,12 +2,13 @@ require_relative 'boot' require 'rails/all' -require_relative '../app/lib/exceptions' - # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) +require_relative '../app/lib/exceptions' +require_relative '../lib/paperclip/gif_transcoder' + Dotenv::Railtie.load module Mastodon |