aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2014-06-01 11:46:37 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2014-06-01 11:46:37 +0000
commit4ae90a7dd8f9857f5d8c90c0135dd873f90e6957 (patch)
tree59af5d115cf2cafa7ad401ed288fee5c363e4612 /activerecord/lib/active_record
parent26c38fe022227536489482cd07de623554546b21 (diff)
parent1913f1ef90e44f0977e1278cfafd8131f9fa58a3 (diff)
downloadrails-4ae90a7dd8f9857f5d8c90c0135dd873f90e6957.tar.gz
rails-4ae90a7dd8f9857f5d8c90c0135dd873f90e6957.tar.bz2
rails-4ae90a7dd8f9857f5d8c90c0135dd873f90e6957.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/attribute_assignment.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb
index 816fb51942..c4cf084a04 100644
--- a/activerecord/lib/active_record/attribute_assignment.rb
+++ b/activerecord/lib/active_record/attribute_assignment.rb
@@ -13,9 +13,9 @@ module ActiveRecord
# exception is raised.
#
# cat = Cat.new(name: "Gorby", status: "yawning")
- # cat.attributes # => { "name" => "Gorby", "status" => "yawning" }
+ # cat.attributes # => { "name" => "Gorby", "status" => "yawning", "created_at" => nil, "updated_at" => nil}
# cat.assign_attributes(status: "sleeping")
- # cat.attributes # => { "name" => "Gorby", "status" => "sleeping" }
+ # cat.attributes # => { "name" => "Gorby", "status" => "sleeping", "created_at" => nil, "updated_at" => nil }
#
# New attributes will be persisted in the database when the object is saved.
#