diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-18 11:18:46 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-18 11:18:46 -0300 |
| commit | a04dedd5634cbb602cf48938cee0ff11c046b4c2 (patch) | |
| tree | 66c51731cc283310362db57503d4952e0a0213bb /activeresource/test/base/custom_methods_test.rb | |
| parent | 0048897a417774f7e5a0c8c9e82fc8684f94ebc1 (diff) | |
| parent | 27de7f150b57a18d4ccdd274f6f8b621b58108c6 (diff) | |
| download | rails-a04dedd5634cbb602cf48938cee0ff11c046b4c2.tar.gz rails-a04dedd5634cbb602cf48938cee0ff11c046b4c2.tar.bz2 rails-a04dedd5634cbb602cf48938cee0ff11c046b4c2.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/migration.rb
activerecord/test/cases/helper.rb
Diffstat (limited to 'activeresource/test/base/custom_methods_test.rb')
| -rw-r--r-- | activeresource/test/base/custom_methods_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activeresource/test/base/custom_methods_test.rb b/activeresource/test/base/custom_methods_test.rb index 61887f4ec7..2d81549a65 100644 --- a/activeresource/test/base/custom_methods_test.rb +++ b/activeresource/test/base/custom_methods_test.rb @@ -1,6 +1,7 @@ require 'abstract_unit' require 'fixtures/person' require 'fixtures/street_address' +require 'active_support/core_ext/hash/conversions' class CustomMethodsTest < Test::Unit::TestCase def setup |