diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-01-22 15:13:47 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-22 15:13:47 -0600 |
| commit | cc0b5fa9930dcc60914e21b518b3c54109243cfa (patch) | |
| tree | 3b5c65d8d0329388730542093314028630b0945a /railties/lib/test_help.rb | |
| parent | e57cb2629ac4971a5dcb1cf8bb2f6d0509317928 (diff) | |
| parent | ccda96093a3bf3fb360f7c6d61bbbf341b2ae034 (diff) | |
| download | rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.tar.gz rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.tar.bz2 rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.zip | |
Merge branch 'master' into 3-0-unstable
Conflicts:
ci/cruise_config.rb
Diffstat (limited to 'railties/lib/test_help.rb')
| -rw-r--r-- | railties/lib/test_help.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb index b5c92c1790..ee24ea3a45 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -3,7 +3,6 @@ silence_warnings { RAILS_ENV = "test" } require 'test/unit' -require 'active_support/test_case' require 'action_controller/test_case' require 'action_view/test_case' require 'action_controller/integration' |