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 (file)
index bb9c8b0..0000000
--- a/config/initializers/query_cache.rb
+++ /dev/null
@@ -1 +0,0 @@
-Rails.configuration.middleware.delete ActiveRecord::QueryCache