diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-08-15 16:35:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-15 16:35:15 +0200 |
commit | aba0032f540407d88144ac637a59fce69625546f (patch) | |
tree | 4ce630b36a8b36c51b1224d87b97e198e63c2edf /config/application.rb | |
parent | 3f15326a05a926e9f001800a48ac2addbd3aa833 (diff) | |
parent | 41fa50ac8655e0c15cf5e93fa14f9ce847aec88f (diff) |
Merge pull request #1825 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 06360832c..2e54eb6f6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -165,7 +165,6 @@ module Mastodon config.active_job.queue_adapter = :sidekiq config.middleware.use Rack::Attack - config.middleware.use Rack::Deflater config.middleware.use Mastodon::RackMiddleware config.to_prepare do |