diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
| commit | ed60021f39f7913537dcad181e4061e423dc6c3d (patch) | |
| tree | 86532c43aabe9125422f84b48a899f2672900bf5 /railties/lib/rails/test_unit/railtie.rb | |
| parent | c6af337d2d6c86792cdc8132224ebe9294d35774 (diff) | |
| parent | b3a028259f373fd58fea2171a1e9e8b2fe3e253a (diff) | |
| download | rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.gz rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.bz2 rails-ed60021f39f7913537dcad181e4061e423dc6c3d.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activemodel/lib/active_model/state_machine.rb
Diffstat (limited to 'railties/lib/rails/test_unit/railtie.rb')
| -rw-r--r-- | railties/lib/rails/test_unit/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb index f93dace9bb..21b9dbc074 100644 --- a/railties/lib/rails/test_unit/railtie.rb +++ b/railties/lib/rails/test_unit/railtie.rb @@ -11,7 +11,7 @@ module Rails end rake_tasks do - load "rails/tasks/testing.rake" - end + load "rails/test_unit/testing.rake" + end end end
\ No newline at end of file |