diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-20 21:58:22 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-20 21:58:22 +1100 |
| commit | 8b37fee201bb3f41d3bc4557422c5f8b344f456c (patch) | |
| tree | 5c24f3f85f10976b3407f557517dcccf0343cd72 /activemodel/lib | |
| parent | c04baed627c85e586e337896d64f61f397554a46 (diff) | |
| parent | 8a1be228491f433fa8d20be4f485e2159f5ebe59 (diff) | |
| download | rails-8b37fee201bb3f41d3bc4557422c5f8b344f456c.tar.gz rails-8b37fee201bb3f41d3bc4557422c5f8b344f456c.tar.bz2 rails-8b37fee201bb3f41d3bc4557422c5f8b344f456c.zip | |
Merge branch 'master' of git://github.com/rails/rails
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/lint.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb index 0be82aa180..1330bf7042 100644 --- a/activemodel/lib/active_model/lint.rb +++ b/activemodel/lib/active_model/lint.rb @@ -53,6 +53,8 @@ module ActiveModel assert_kind_of String, model_name assert_kind_of String, model_name.human assert_kind_of String, model_name.partial_path + assert_kind_of String, model_name.singular + assert_kind_of String, model_name.plural end # errors |