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

[rails.git] / config / initializers / query_cache.rb

diff --git a/config/initializers/query_cache.rb b/config/initializers/query_cache.rb
index 83d42feecc29b941e25c0a4f9f7d269a400a5623..bb9c8b0245854243a3a047c887eaf2134696ebb5 100644 (file)
--- a/config/initializers/query_cache.rb
+++ b/config/initializers/query_cache.rb
@@ -1,10 +1 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module QueryCache
-      private
-        def cache_sql(sql)
-         yield
-        end
-    end
-  end
-end
+Rails.configuration.middleware.delete ActiveRecord::QueryCache