diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-03-26 16:22:41 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-03-26 16:22:41 +0000 |
| commit | c26ee64b9211c92f4826fb935c615fbfa9d35821 (patch) | |
| tree | 904b671d14bb1bc57e001c8156cac76d0c51553a /activerecord | |
| parent | 8635706ba370327d2ce694e9879bc8d13a14baa8 (diff) | |
| parent | 194edcf67e69f618ba4250e483ba303a8437af2a (diff) | |
| download | rails-c26ee64b9211c92f4826fb935c615fbfa9d35821.tar.gz rails-c26ee64b9211c92f4826fb935c615fbfa9d35821.tar.bz2 rails-c26ee64b9211c92f4826fb935c615fbfa9d35821.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/4_0_release_notes.md
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index cc03e37a12..93550a69f1 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -258,7 +258,7 @@ module ActiveRecord #:nodoc: # <tt>attributes=</tt> method. The +errors+ property of this exception contains an array of # AttributeAssignmentError # objects that should be inspected to determine which attributes triggered the errors. - # * RecordInvalid - raised by save! and create! when the record is invalid. + # * RecordInvalid - raised by <tt>save!</tt> and <tt>create!</tt> when the record is invalid. # * RecordNotFound - No record responded to the +find+ method. Either the row with the given ID doesn't exist # or the row didn't meet the additional restrictions. Some +find+ calls do not raise this exception to signal # nothing was found, please check its documentation for further details. |