aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-12-24 01:55:35 +0100
committerXavier Noria <fxn@hashref.com>2010-12-24 01:55:35 +0100
commit8cdb75808198bf579e14d0fcdd1d2a51b3233add (patch)
tree9bf4bb54e4175bc805d407e2b5e3bc42bf1d0dd8 /activerecord/CHANGELOG
parent3822673151cd0f53e0e4e671988e35603bf2901c (diff)
parent6974c595fd480dc0ae3311ef60920fa87c5ff9d0 (diff)
downloadrails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.gz
rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.bz2
rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index fd571c4ca4..8ebc87145c 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,8 @@
*Rails 3.1.0 (unreleased)*
+* Removed support for interpolated SQL conditions. Please use scoping
+along with attribute conditionals as a replacement.
+
* Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword) to encapsulate dead-simple password usage with BCrypt encryption and salting [DHH]. Example:
# Schema: User(name:string, password_digest:string, password_salt:string)