aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-11-14 12:23:43 +0000
committerJon Leighton <j@jonathanleighton.com>2011-11-14 12:23:43 +0000
commitca3b4689375f0f65275407f28981c58a15d50193 (patch)
tree59a45494c1b13e4d1039bd7fa45964ebfc51e900 /actionpack
parent4d8081b6e7ffa88b4fc74187fb1599ef9b27e6ed (diff)
downloadrails-ca3b4689375f0f65275407f28981c58a15d50193.tar.gz
rails-ca3b4689375f0f65275407f28981c58a15d50193.tar.bz2
rails-ca3b4689375f0f65275407f28981c58a15d50193.zip
Sync changelog entry
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 3e2dbe4e13..4c265c41d8 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -64,6 +64,8 @@
## Rails 3.1.2 (unreleased) ##
+* Upgrade sprockets dependency to ~> 2.1.0
+
* Ensure that the format isn't applied twice to the cache key, else it becomes impossible
to target with expire_action.