aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-06-20 14:53:20 +0930
committerMatthew Draper <matthew@trebex.net>2014-06-20 14:53:20 +0930
commitedc0f271978585635153068c708d62f5243dafe0 (patch)
tree7e103d6c573bb43b9b672a1ad5c79aa8c4566103 /actionpack/lib/action_controller
parenteeb9a7c122a97e6d5061768443eb22b8678d4b15 (diff)
parent5cc789930f323d2c1a5aa3506d64ab50123f862c (diff)
downloadrails-edc0f271978585635153068c708d62f5243dafe0.tar.gz
rails-edc0f271978585635153068c708d62f5243dafe0.tar.bz2
rails-edc0f271978585635153068c708d62f5243dafe0.zip
Merge pull request #15537 from tgxworld/fix_state_leak
Fix state leak.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_case.rb1
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 849286a4a9..b117170514 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -593,7 +593,6 @@ module ActionController
unless @controller.respond_to?(:recycle!)
@controller.extend(Testing::Functional)
- @controller.class.class_eval { include Testing }
end
@request.recycle!