diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
| commit | 0994d11f26c318e63dd4189ea2dfec409132e529 (patch) | |
| tree | 885415e88c615376a7385abba887699f04b3a172 /actionpack/lib/action_controller | |
| parent | c77e6ace66b34390e9c1e173c580d86e88915267 (diff) | |
| parent | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (diff) | |
| download | rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.gz rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.bz2 rails-0994d11f26c318e63dd4189ea2dfec409132e529.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index f3e173004a..2d5e80f0bb 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -23,7 +23,6 @@ module ActionController if defined?(ActiveRecord) after_dispatch :checkin_connections - before_dispatch { ActiveRecord::Base.verify_active_connections! } to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers } end |