diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-22 04:40:34 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-22 04:40:34 -0700 |
commit | 09fa80dd262f6f1f3c767125e8b1150f9022d546 (patch) | |
tree | 7e20290d780f46896bc23f55ae6a19e26cebf74a /railties | |
parent | 62d9c831be16e70826540ab938227b4d1e6b4c9d (diff) | |
parent | b85694ff9825f77c5deceaebacc870ecf2df6a33 (diff) | |
download | rails-09fa80dd262f6f1f3c767125e8b1150f9022d546.tar.gz rails-09fa80dd262f6f1f3c767125e8b1150f9022d546.tar.bz2 rails-09fa80dd262f6f1f3c767125e8b1150f9022d546.zip |
Merge pull request #1193 from arunagw/railties_tests
Loading action_controller twice removed.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/test/rails_info_controller_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 9d194f41a6..8a9363fb80 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,5 +1,4 @@ require 'abstract_unit' -require 'action_controller' module ActionController class Base |