Permalink
Browse files

Kill legacy dispatcher.

  • Loading branch information...
1 parent 25f7c03 commit 0c3cde404ac45d59439c324a4a13ec239c582a5c @josevalim josevalim committed May 18, 2010
Showing with 0 additions and 26 deletions.
  1. +0 −2 actionpack/lib/action_dispatch/railtie.rb
  2. +0 −24 railties/lib/rails/dispatcher.rb
View
2 actionpack/lib/action_dispatch/railtie.rb
@@ -10,8 +10,6 @@ class Railtie < Rails::Railtie
# Prepare dispatcher callbacks and run 'prepare' callbacks
initializer "action_dispatch.prepare_dispatcher" do |app|
- # TODO: This used to say unless defined?(Dispatcher). Find out why and fix.
- require 'rails/dispatcher'
ActionDispatch::Callbacks.to_prepare { app.routes_reloader.reload_if_changed }
end
end
View
24 railties/lib/rails/dispatcher.rb
@@ -1,24 +0,0 @@
-#--
-# Copyright (c) 2004-2010 David Heinemeier Hansson
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-require 'action_controller/deprecated/dispatcher'
-Dispatcher = ActionController::Dispatcher

0 comments on commit 0c3cde4

Please sign in to comment.