aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-06-12 00:30:48 +0200
committerXavier Noria <fxn@hashref.com>2010-06-12 00:30:48 +0200
commitf2991fc9ccc379003081172c108d46977801915b (patch)
tree771bc9cef05e551180c372de07c35624fa5292ea /activemodel
parentb731948bda27c50793c4d2ef249fee7ae625064c (diff)
parent4278e7f2b34b12a9107baf9d5da0fa75384fbfa1 (diff)
downloadrails-f2991fc9ccc379003081172c108d46977801915b.tar.gz
rails-f2991fc9ccc379003081172c108d46977801915b.tar.bz2
rails-f2991fc9ccc379003081172c108d46977801915b.zip
Merge remote branch 'docrails/master'
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/conversion.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 585c20dcdf..23724b2d95 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -30,7 +30,7 @@ module ActiveModel
self
end
- # Returns an Enumerable of all (primary) key attributes or nil if persisted? is fakse
+ # Returns an Enumerable of all (primary) key attributes or nil if persisted? is false
def to_key
persisted? ? [id] : nil
end