aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-01-03 12:10:59 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-01-03 12:10:59 -0800
commitcaa6cdeba11c16d09eb0259150343eb7aff71e3d (patch)
treee174e0c77cb03d0db3205f741b3aa3faa6c0b751
parent8c129f18d2f3fdacfb932ef9bfa52604084a670f (diff)
parent337ac054dbe01bdc16db25a8e5503c80b7f953be (diff)
downloadrails-caa6cdeba11c16d09eb0259150343eb7aff71e3d.tar.gz
rails-caa6cdeba11c16d09eb0259150343eb7aff71e3d.tar.bz2
rails-caa6cdeba11c16d09eb0259150343eb7aff71e3d.zip
Merge pull request #4281 from lest/3-2-changelog
add CHANGELOG entry for AS::Base64 deprecation
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index d32c094b13..fe4c64aed0 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,7 +1,9 @@
## Rails 3.2.0 (unreleased) ##
-* Module#synchronize is deprecated with no replacement. Please use `monitor`
- from ruby's standard library.
+* ActiveSupport::Base64 is deprecated in favor of ::Base64. *Sergey Nartimov*
+
+* Module#synchronize is deprecated with no replacement. Please use `monitor`
+ from ruby's standard library.
* (Date|DateTime|Time)#beginning_of_week accept an optional argument to
be able to set the day at which weeks are assumed to start.