diff options
author | Xavier Noria <fxn@hashref.com> | 2010-12-20 20:13:34 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-12-20 20:13:34 +0100 |
commit | 880f8419c41db0aea4b7cf3abd74fe5d32fa04a7 (patch) | |
tree | 0c21b8e0829136b6fb33a136caf3085f2a78c857 /activemodel/lib/active_model | |
parent | 0cbfd6c28d327304432f7d0c067662b5c1e41a78 (diff) | |
parent | 6909fb6cff49e11574909b55864af8673d044eb7 (diff) | |
download | rails-880f8419c41db0aea4b7cf3abd74fe5d32fa04a7.tar.gz rails-880f8419c41db0aea4b7cf3abd74fe5d32fa04a7.tar.bz2 rails-880f8419c41db0aea4b7cf3abd74fe5d32fa04a7.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r-- | activemodel/lib/active_model/serialization.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 37739b98a1..f659419293 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -15,7 +15,7 @@ module ActiveModel # attr_accessor :name # # def attributes - # @attributes ||= {'name' => 'nil'} + # @attributes ||= {'name' => nil} # end # # end @@ -45,7 +45,7 @@ module ActiveModel # attr_accessor :name # # def attributes - # @attributes ||= {'name' => 'nil'} + # @attributes ||= {'name' => nil} # end # # end |