aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-08-31 01:52:43 -0700
committerXavier Noria <fxn@hashref.com>2011-08-31 01:52:43 -0700
commitd7be97ec31f5d972e01fb11b05ca4b36f581c779 (patch)
treedf438eb1b5e16ca0753dd826264b4c4bc0b89b2c
parent73263f6c81936b199f7410991a23ea380a58e005 (diff)
downloadrails-d7be97ec31f5d972e01fb11b05ca4b36f581c779.tar.gz
rails-d7be97ec31f5d972e01fb11b05ca4b36f581c779.tar.bz2
rails-d7be97ec31f5d972e01fb11b05ca4b36f581c779.zip
release notes: adds a couple of blank lines to get the markup right
-rw-r--r--railties/guides/source/3_1_release_notes.textile2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/guides/source/3_1_release_notes.textile b/railties/guides/source/3_1_release_notes.textile
index 087926f98d..9ca77d0657 100644
--- a/railties/guides/source/3_1_release_notes.textile
+++ b/railties/guides/source/3_1_release_notes.textile
@@ -346,6 +346,7 @@ has_many :things, :conditions => proc { "foo = #{bar}" } # after
Inside the proc, +self+ is the object which is the owner of the association, unless you are eager loading the association, in which case +self+ is the class which the association is within.
You can have any "normal" conditions inside the proc, so the following will work too:
+
<ruby>
has_many :things, :conditions => proc { ["foo = ?", bar] }
</ruby>
@@ -353,6 +354,7 @@ has_many :things, :conditions => proc { ["foo = ?", bar] }
* Previously +:insert_sql+ and +:delete_sql+ on +has_and_belongs_to_many+ association allowed you to call 'record' to get the record being inserted or deleted. This is now passed as an argument to the proc.
* Added <tt>ActiveRecord::Base#has_secure_password</tt> (via <tt>ActiveModel::SecurePassword</tt>) to encapsulate dead-simple password usage with BCrypt encryption and salting.
+
<ruby>
# Schema: User(name:string, password_digest:string, password_salt:string)
class User < ActiveRecord::Base