diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-25 21:52:59 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-25 21:52:59 +0530 |
| commit | 1e25d6217cfac78e0ca1c1e97c539b05dc472dd6 (patch) | |
| tree | b3959eaf6df01645d1f84472a40cbe18586d807a /activerecord/lib | |
| parent | 29054ba173c16d675545b719f018b28c6f8eef7e (diff) | |
| parent | 7940976dfd545f7691b63956b067533f9c769339 (diff) | |
| download | rails-1e25d6217cfac78e0ca1c1e97c539b05dc472dd6.tar.gz rails-1e25d6217cfac78e0ca1c1e97c539b05dc472dd6.tar.bz2 rails-1e25d6217cfac78e0ca1c1e97c539b05dc472dd6.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionmailer/CHANGELOG.md
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/aggregations.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb index 5a8addc4e4..c39284539c 100644 --- a/activerecord/lib/active_record/aggregations.rb +++ b/activerecord/lib/active_record/aggregations.rb @@ -46,7 +46,7 @@ module ActiveRecord # # def <=>(other_money) # if currency == other_money.currency - # amount <=> amount + # amount <=> other_money.amount # else # amount <=> other_money.exchange_to(currency).amount # end diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index d468663084..4bafadc666 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -78,7 +78,7 @@ module ActiveRecord # When <tt>:autosave</tt> is not declared new children are saved when their parent is saved: # # class Post - # has_many :comments # :autosave option is no declared + # has_many :comments # :autosave option is not declared # end # # post = Post.new(:title => 'ruby rocks') @@ -93,7 +93,8 @@ module ActiveRecord # post.comments.create(:body => 'hello world') # post.save # => saves both post and comment # - # When <tt>:autosave</tt> is true all children is saved, no matter whether they are new records: + # When <tt>:autosave</tt> is true all children are saved, no matter whether they + # are new records or not: # # class Post # has_many :comments, :autosave => true |