diff options
author | Ryan Bigg <radarlistener@gmail.com> | 2008-11-18 10:40:50 +1030 |
---|---|---|
committer | Ryan Bigg <radarlistener@gmail.com> | 2008-11-18 10:40:50 +1030 |
commit | 9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b (patch) | |
tree | a88985f50190dad0f26044b2db0cf7b1a92355e5 /actionpack/lib/action_controller/dispatcher.rb | |
parent | 451969f57a6dfee8537fb10d179514e011559111 (diff) | |
parent | c62f973c749beac8947ff5119af43fbde2547eb1 (diff) | |
download | rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.tar.gz rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.tar.bz2 rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.zip |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
-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 |