From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Jun 2020 16:09:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2637'
X-Git-Tag: live~2967
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0bd6f889c5a4f8f13decd96d6ef478c29b0e388a?hp=49a576a390c60abf24f8a98889eef1590e981f0a

Merge remote-tracking branch 'upstream/pull/2637'
---

diff --git a/config/initializers/query_cache.rb b/config/initializers/query_cache.rb
deleted file mode 100644
index bb9c8b024..000000000
--- a/config/initializers/query_cache.rb
+++ /dev/null
@@ -1 +0,0 @@
-Rails.configuration.middleware.delete ActiveRecord::QueryCache