diff options
| author | José Valim <jose.valim@gmail.com> | 2010-05-18 02:07:59 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-05-18 02:07:59 +0200 |
| commit | 0c3cde404ac45d59439c324a4a13ec239c582a5c (patch) | |
| tree | 46274100352f2d7b2524500062b14383d6df390e | |
| parent | 25f7c030e4ea440ea6c2a84c92118299753392d9 (diff) | |
| download | rails-0c3cde404ac45d59439c324a4a13ec239c582a5c.tar.gz rails-0c3cde404ac45d59439c324a4a13ec239c582a5c.tar.bz2 rails-0c3cde404ac45d59439c324a4a13ec239c582a5c.zip | |
Kill legacy dispatcher.
| -rw-r--r-- | actionpack/lib/action_dispatch/railtie.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/dispatcher.rb | 24 |
2 files changed, 0 insertions, 26 deletions
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb index 004c254e55..38da44d7e7 100644 --- a/actionpack/lib/action_dispatch/railtie.rb +++ b/actionpack/lib/action_dispatch/railtie.rb @@ -10,8 +10,6 @@ module ActionDispatch # 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 diff --git a/railties/lib/rails/dispatcher.rb b/railties/lib/rails/dispatcher.rb deleted file mode 100644 index 75ee4de140..0000000000 --- a/railties/lib/rails/dispatcher.rb +++ /dev/null @@ -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 |