diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:35 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-24 01:55:35 +0100 |
| commit | 8cdb75808198bf579e14d0fcdd1d2a51b3233add (patch) | |
| tree | 9bf4bb54e4175bc805d407e2b5e3bc42bf1d0dd8 /actionpack/lib/action_dispatch/middleware/callbacks.rb | |
| parent | 3822673151cd0f53e0e4e671988e35603bf2901c (diff) | |
| parent | 6974c595fd480dc0ae3311ef60920fa87c5ff9d0 (diff) | |
| download | rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.gz rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.tar.bz2 rails-8cdb75808198bf579e14d0fcdd1d2a51b3233add.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/callbacks.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/callbacks.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb index 5776a7bb27..4d038c29f2 100644 --- a/actionpack/lib/action_dispatch/middleware/callbacks.rb +++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/module/delegation' + module ActionDispatch # Provide callbacks to be executed before and after the request dispatch. class Callbacks @@ -5,10 +7,8 @@ module ActionDispatch define_callbacks :call, :rescuable => true - def self.to_prepare(*args, &block) - ActiveSupport::Deprecation.warn "ActionDispatch::Callbacks.to_prepare is deprecated. " << - "Please use ActionDispatch::Reloader.to_prepare instead." - ActionDispatch::Reloader.to_prepare(*args, &block) + class << self + delegate :to_prepare, :to_cleanup, :to => "ActionDispatch::Reloader" end def self.before(*args, &block) |