aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/test/application/configuration_test.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index da4beedecf..4342cf6968 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,7 @@
* Raise an error when "recyclable cache keys" are being used by a cache store
- that does not explicitly support it.
+ that does not explicitly support it. Custom cache keys that do support this feature
+ can bypass this error by implementing the `supports_cache_versioning?` method on their
+ class and returning a truthy value.
*Richard Schneeman*
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 386b4f76e6..8c10413525 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -133,7 +133,7 @@ module ApplicationTests
app "production"
end
- assert_match(/You're using a cache store/, error.message)
+ assert_match(/You're using a cache/, error.message)
end
test "a renders exception on pending migration" do