diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-07-27 14:30:23 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-07-27 14:30:23 +0000 |
| commit | 9d17f882eee6a2e037e4da81a933d37289d0bf8a (patch) | |
| tree | 2f3e77f1ebcac2c03aa9a44326f75e7958de1e44 /actionpack | |
| parent | 7692191f5ab207ff76cc2558f2a02e299cd51392 (diff) | |
| download | rails-9d17f882eee6a2e037e4da81a933d37289d0bf8a.tar.gz rails-9d17f882eee6a2e037e4da81a933d37289d0bf8a.tar.bz2 rails-9d17f882eee6a2e037e4da81a933d37289d0bf8a.zip | |
Update integration.rb to require test_process explicitly instead of via Dependencies
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4624 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 56b59862a4..c8106f0df8 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar] + * Fixed that you can still access the flash after the flash has been reset in reset_session. Closes #5584 [lmarlow@yahoo.com] * Allow form_for and fields_for to work with indexed form inputs. [Jeremy Kemper, Matt Lyon] diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 865a7ae4c0..d988731531 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -1,6 +1,7 @@ require 'dispatcher' require 'stringio' require 'uri' +require 'action_controller/test_process' module ActionController module Integration #:nodoc: |