diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
| commit | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (patch) | |
| tree | bebf99e031bc1a3408baf32c2d16bc870637b913 /actionpack/lib/action_controller | |
| parent | 983dc8078708fff5d99fc31eb5eac8b532e950b3 (diff) | |
| parent | d20955f889223b6035dbc7d61acba9091bf7b7ed (diff) | |
| download | rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.gz rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.bz2 rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.zip | |
Merge branch 'master' of git@github.com:rails/rails
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 |