diff options
| -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: |