diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /config/application.rb | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
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 |