diff options
| author | Zachary Scott <e@zzak.io> | 2014-12-29 15:52:08 -0800 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-12-29 15:52:08 -0800 |
| commit | c0329b3d4961b7978738663dd75f03edd7d69811 (patch) | |
| tree | 397e78024e67b8ad72aa7742c7ff451794763770 | |
| parent | b80a6cd0d3df7c09f34a86167251528a57ea13bf (diff) | |
| parent | 298ec6de55e3adb7d012ba6a9db8b4dd5fd95779 (diff) | |
| download | rails-c0329b3d4961b7978738663dd75f03edd7d69811.tar.gz rails-c0329b3d4961b7978738663dd75f03edd7d69811.tar.bz2 rails-c0329b3d4961b7978738663dd75f03edd7d69811.zip | |
Merge branch 'master' of github.com:rails/rails [ci skip]
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index ded190c111..f53c5f17ef 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -109,6 +109,10 @@ module ActiveRecord # validate: false, validations are bypassed altogether. See # ActiveRecord::Validations for more information. # + # By default, #save also sets the +updated_at+/+updated_on+ attributes to + # the current time. However, if you supply <tt>touch: false</tt>, these + # timestamps will not be updated. + # # There's a series of callbacks associated with +save+. If any of the # <tt>before_*</tt> callbacks return +false+ the action is cancelled and # +save+ returns +false+. See ActiveRecord::Callbacks for further @@ -131,6 +135,10 @@ module ActiveRecord # ActiveRecord::RecordInvalid gets raised. See ActiveRecord::Validations # for more information. # + # By default, #save! also sets the +updated_at+/+updated_on+ attributes to + # the current time. However, if you supply <tt>touch: false</tt>, these + # timestamps will not be updated. + # # There's a series of callbacks associated with <tt>save!</tt>. If any of # the <tt>before_*</tt> callbacks return +false+ the action is cancelled # and <tt>save!</tt> raises ActiveRecord::RecordNotSaved. See |