diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-20 21:07:59 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-20 23:12:46 +0200 |
| commit | a63566dda8246bd57e80032a1213532d0dc2ae0b (patch) | |
| tree | aeffe39e11dfc6e0bfb1dc407ab65d6ac7b04998 /actionpack/lib/action_dispatch/routing.rb | |
| parent | 978c49ea6a969fe040ad15dbda78e43ca5afc069 (diff) | |
| download | rails-a63566dda8246bd57e80032a1213532d0dc2ae0b.tar.gz rails-a63566dda8246bd57e80032a1213532d0dc2ae0b.tar.bz2 rails-a63566dda8246bd57e80032a1213532d0dc2ae0b.zip | |
Moved PolymorphicRoutes to ActionDispatch::Routing
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch/routing.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb index da62b14f9b..b7e09b99d1 100644 --- a/actionpack/lib/action_dispatch/routing.rb +++ b/actionpack/lib/action_dispatch/routing.rb @@ -1,6 +1,5 @@ require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/regexp' -require 'action_controller/polymorphic_routes' module ActionDispatch # = Routing @@ -217,13 +216,14 @@ module ActionDispatch autoload :Route, 'action_dispatch/routing/route' autoload :RouteSet, 'action_dispatch/routing/route_set' autoload :UrlFor, 'action_dispatch/routing/url_for' + autoload :PolymorphicRoutes, 'action_dispatch/routing/polymorphic_routes' SEPARATORS = %w( / . ? ) #:nodoc: HTTP_METHODS = [:get, :head, :post, :put, :delete, :options] #:nodoc: # A helper module to hold URL related helpers. module Helpers #:nodoc: - include ActionController::PolymorphicRoutes + include PolymorphicRoutes end end end |