diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2016-02-08 17:19:15 -0500 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2016-02-08 17:19:15 -0500 |
| commit | 98ed722039f19639b014a9d9d229e0da2926946f (patch) | |
| tree | 9833b996a69354bef42df95d7997cd8edf055904 /actionpack | |
| parent | 6c785f0df7fd2964c04e04eb1e0948277d994e4b (diff) | |
| parent | 73d1975810cf83351f3c72e3aaa2ea43a64d08b9 (diff) | |
| download | rails-98ed722039f19639b014a9d9d229e0da2926946f.tar.gz rails-98ed722039f19639b014a9d9d229e0da2926946f.tar.bz2 rails-98ed722039f19639b014a9d9d229e0da2926946f.zip | |
Merge pull request #23534 from bronson/fix-redefined-warning
fix 'method redefined' warnings
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
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 |