aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-29 20:35:46 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-29 20:35:46 +0000
commitaf98d883b91aad78cd8183f8abbdf27bd740ff66 (patch)
treebdecff2fab52766af3dde2d752d716b85446e9f6 /activerecord/CHANGELOG
parent32b307bc32e12626b0e6ae493cc3ab34b4c5ea37 (diff)
downloadrails-af98d883b91aad78cd8183f8abbdf27bd740ff66.tar.gz
rails-af98d883b91aad78cd8183f8abbdf27bd740ff66.tar.bz2
rails-af98d883b91aad78cd8183f8abbdf27bd740ff66.zip
Raise an exception if both attr_protected and attr_accessible are declared. Closes #8507, #6004.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6896 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0ae8cbdd93..945c2238df 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Raise an exception if both attr_protected and attr_accessible are declared. #8507 [stellsmi]
+
* SQLite, MySQL, PostgreSQL, Oracle: quote column names in column migration SQL statements. #8466 [marclove, lorenjohnson]
* Allow nil serialized attributes with a set class constraint. #7293 [sandofsky]