aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-19 15:14:26 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-19 15:14:26 +0200
commitb22c11fa533fd523e8cadd36e75dd76b6a9f0488 (patch)
treef0e15df8674bb3057bf70db7ab8ea737ef7106e1 /activemodel
parent70f7ba3e3bf10e1a646ef6ace09da7b2918ba75d (diff)
downloadrails-b22c11fa533fd523e8cadd36e75dd76b6a9f0488.tar.gz
rails-b22c11fa533fd523e8cadd36e75dd76b6a9f0488.tar.bz2
rails-b22c11fa533fd523e8cadd36e75dd76b6a9f0488.zip
Add missing entries and tidy up CHANGELOG.
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG5
1 files changed, 5 insertions, 0 deletions
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index a5e7f300d9..33602657f5 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -1,3 +1,8 @@
+*Rails 3.0.0 [Release Candidate] (unreleased)*
+
+* Added ActiveModel::MassAssignmentSecurity [Eric Chapweske, Josh Kalderimis]
+
+
*Rails 3.0.0 [beta 4] (June 8th, 2010)*
* JSON supports a custom root option: to_json(:root => 'custom') #4515 [Jatinder Singh]