diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
| commit | 91ce8d8b7f4e7ab93dda159595debadd4f659ab9 (patch) | |
| tree | 88e7592f0191eec5a66cdf45375b114d01018fcc /actionpack/lib/action_controller/metal/testing.rb | |
| parent | cf9d6a95e805bdddfa9c6b541631d51b3165bf23 (diff) | |
| parent | 29c8a43056f40759a8c64cbcbd4e71d4283b233d (diff) | |
| download | rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.gz rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.bz2 rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal/testing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/testing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb index a4a1116d9e..c193a5eff4 100644 --- a/actionpack/lib/action_controller/metal/testing.rb +++ b/actionpack/lib/action_controller/metal/testing.rb @@ -2,7 +2,7 @@ module ActionController module Testing extend ActiveSupport::Concern - include RackConvenience + include RackDelegation # OMG MEGA HAX def process_with_new_base_test(request, response) |