diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-24 17:28:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 17:28:22 +0100 |
| commit | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (patch) | |
| tree | 2eaa85c899033aab9bd1b2f9da2d727ce5788e16 /config/application.rb | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | bdc1581556b86ba25a385c9309db714eeaba1ca1 (diff) | |
Merge pull request #1265 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, 0 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index c1bc18a30..bf25fa0d9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,7 +7,6 @@ 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' @@ -120,7 +119,6 @@ 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 |