diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:06 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:12 +0200 |
| commit | 9757bfff9b7fff21697228dd0920d8ea93fae969 (patch) | |
| tree | 2bc0c9acc5f17cb03b111d9448c2e100979bd0e2 /railties/lib | |
| parent | e20012b64b2063b75cbf1acc57195f0c410987de (diff) | |
| parent | e909afccc996293ec6b7ba2d1c6c078fe807956b (diff) | |
| download | rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.gz rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.bz2 rails-9757bfff9b7fff21697228dd0920d8ea93fae969.zip | |
Merge remote branch 'drogus/remove_deprecated_routes'
This merge removes the deprecated routes mapper from Rails and update its tests.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/engine.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index c749fdfbe8..d46824704b 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -399,17 +399,6 @@ module Rails end end - # DEPRECATED: Remove in 3.1 - initializer :add_routing_namespaces do |app| - paths.app.controllers.to_a.each do |load_path| - load_path = File.expand_path(load_path) - Dir["#{load_path}/*/**/*_controller.rb"].collect do |path| - namespace = File.dirname(path).sub(/#{Regexp.escape(load_path)}\/?/, '') - app.routes.controller_namespaces << namespace unless namespace.empty? - end - end - end - # I18n load paths are a special case since the ones added # later have higher priority. initializer :add_locales do |