diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-04-30 00:16:10 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-04-30 00:16:10 -0700 |
| commit | 88b5f943e67745e38b903d4a4cb0afe121b46857 (patch) | |
| tree | f2b845cf9c9b02bf4b6ce3175c447664b39228d2 /actionpack/lib/action_controller | |
| parent | 4cff1a28095ca93f865eaaa7b4ce0132b5256340 (diff) | |
| parent | 5638adfd87dbec20183443204793c1de41ee9bb7 (diff) | |
| download | rails-88b5f943e67745e38b903d4a4cb0afe121b46857.tar.gz rails-88b5f943e67745e38b903d4a4cb0afe121b46857.tar.bz2 rails-88b5f943e67745e38b903d4a4cb0afe121b46857.zip | |
Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every_request_master
Fix the Flash middleware loading the session on every request
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index d2581296cf..21997c4d79 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -479,7 +479,6 @@ module ActionController @request.session.update(session) if session @request.session["flash"] = @request.flash.update(flash || {}) - @request.session["flash"].sweep @controller.request = @request build_request_uri(action, parameters) |