diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ba834e847c..cecbdad57c 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Remove the extraneous AR::Base.threaded_connections setting from the webrick server. [Jeremy Kemper] + * Add integration test support to app generation and testing [Jamis Buck] * Added namespaces to all tasks, so for example load_fixtures is now db:fixtures:load. All the old task names are still valid, they just point to the new namespaced names. "rake -T" will only show the namespaced ones, though [DHH] diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index cbaa1cb791..679fd1f617 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -8,8 +8,6 @@ include WEBrick ABSOLUTE_RAILS_ROOT = File.expand_path(RAILS_ROOT) -ActiveRecord::Base.threaded_connections = false - class CGI #:nodoc: def stdinput @stdin || $stdin |