aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index fb975dcfc3..6917be7efc 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,6 +1,10 @@
## Rails 4.0.0 (unreleased) ##
-* Introduce assert_not to replace warty 'assert !foo'. *Jeremy Kemper*
+* Remove meaningless `ActiveSupport::FrozenObjectError`, which was just an alias of `RuntimeError`.
+
+ *Akira Matsuda*
+
+* Introduce `assert_not` to replace warty `assert !foo`. *Jeremy Kemper*
* Prevent `Callbacks#set_callback` from setting the same callback twice.
@@ -11,7 +15,7 @@
*Dmitriy Kiriyenko*
-* Add ActiveSupport::Logger#silence that works the same as the old Logger#silence extension.
+* Add `ActiveSupport::Logger#silence` that works the same as the old `Logger#silence` extension.
*DHH*