diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-05 13:51:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-05 13:51:50 +0100 |
| commit | bcfd6e3bb48f6e0eb88f7f3a650832842ab69166 (patch) | |
| tree | 0e2bb7334c7954bee2962ed78565046e3b974725 /config/application.rb | |
| parent | 22daf24600d8e99e4569740ee5836d25c70c1e8b (diff) | |
| parent | 83359fef2b04e81b35b047510ddb0c79bcf8ddaa (diff) | |
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index e1f7ae707..58e59fd51 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,6 +7,7 @@ require 'rails/all' Bundler.require(*Rails.groups) require_relative '../app/lib/exceptions' +require_relative '../app/middleware/handle_bad_encoding_middleware' require_relative '../lib/paperclip/lazy_thumbnail' require_relative '../lib/paperclip/gif_transcoder' require_relative '../lib/paperclip/video_transcoder' @@ -118,6 +119,7 @@ module Mastodon config.active_job.queue_adapter = :sidekiq + config.middleware.insert_before Rack::Runtime, HandleBadEncodingMiddleware config.middleware.use Rack::Attack config.middleware.use Rack::Deflater |