diff options
author | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
commit | 915f108d6a47b9c29e11ebe0b140ef017eb015b0 (patch) | |
tree | ae0c42330a9fbdc8395f8a5bae4605ef455c18c1 /actionpack/lib/action_controller/testing | |
parent | aee63a12f2cfd110725c74686ae1eed58e18fda7 (diff) | |
parent | b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff) | |
download | rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.gz rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.bz2 rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/testing')
-rw-r--r-- | actionpack/lib/action_controller/testing/performance_test.rb (renamed from actionpack/lib/action_controller/testing/performance.rb) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/testing/performance.rb b/actionpack/lib/action_controller/testing/performance_test.rb index d88180087d..d88180087d 100644 --- a/actionpack/lib/action_controller/testing/performance.rb +++ b/actionpack/lib/action_controller/testing/performance_test.rb |