aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2013-07-29 01:12:34 +0530
committerVipul A M <vipulnsward@gmail.com>2013-12-03 17:48:14 +0530
commit1ed81e85ca1d2518400b56c167f3c196c51afede (patch)
treef35ba3e98f3fe87ea55a8630f5c45f27a72ccd3e /activerecord/CHANGELOG.md
parentb6f189e2f0bcc8f36f52c83e8ac2255d5e578a42 (diff)
downloadrails-1ed81e85ca1d2518400b56c167f3c196c51afede.tar.gz
rails-1ed81e85ca1d2518400b56c167f3c196c51afede.tar.bz2
rails-1ed81e85ca1d2518400b56c167f3c196c51afede.zip
Currently, we clear query_cache in cache block finish, even if we may already have cache true.
This commit takes into account the last cache_enabled value, before clearing query_cache.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 58222e8111..59d409d04d 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Fix `QueryCache` to work with nested blocks, so that it will only clear the existing cache
+ after leaving the outer block instead of clearing it right after the inner block is finished.
+
+ *Vipul A M*
+
* The ERB in fixture files is no longer evaluated in the context of the main
object. Helper methods used by multiple fixtures should be defined on the
class object returned by `ActiveRecord::FixtureSet.context_class`.