aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorScott Bronson <brons_git@rinspin.com>2016-02-06 18:24:10 -0800
committerScott Bronson <brons_git@rinspin.com>2016-02-06 18:24:10 -0800
commit73d1975810cf83351f3c72e3aaa2ea43a64d08b9 (patch)
treeaa9987f3c84a49e55a4dc0f9f24b5d48ad2388db /actionpack
parent8526e9bed21a119266e886c3316d3fe10c9af5ce (diff)
downloadrails-73d1975810cf83351f3c72e3aaa2ea43a64d08b9.tar.gz
rails-73d1975810cf83351f3c72e3aaa2ea43a64d08b9.tar.bz2
rails-73d1975810cf83351f3c72e3aaa2ea43a64d08b9.zip
fix 'method redefined' warnings
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/test_case.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index ac45b2e363..0c4b661214 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -17,6 +17,7 @@ module ActionController
# the database on the main thread, so they could open a txn, then the
# controller thread will open a new connection and try to access data
# that's only visible to the main thread's txn. This is the problem in #23483
+ remove_method :new_controller_thread
def new_controller_thread # :nodoc:
yield
end