diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-06 17:04:34 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-06 17:10:39 +0100 |
| commit | 0db93941a4b24338c04dac7b17ebddae6c0f95d4 (patch) | |
| tree | f3ccf1f8ef66718ed4c2f9d0dc3071f51b5a1645 | |
| parent | 3853b73bf8535efcf55f573f4b269e1082c3d5cd (diff) | |
| download | rails-0db93941a4b24338c04dac7b17ebddae6c0f95d4.tar.gz rails-0db93941a4b24338c04dac7b17ebddae6c0f95d4.tar.bz2 rails-0db93941a4b24338c04dac7b17ebddae6c0f95d4.zip | |
We should finalize the routes as soon as possible and not wait for the controller to be loaded.
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/application/routes_reloader.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 9d0a3e9993..2c21887220 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -533,7 +533,6 @@ module ActionDispatch end def url_for(options) - finalize! options = (options || {}).reverse_merge!(default_url_options) handle_positional_args(options) @@ -559,7 +558,6 @@ module ActionDispatch end def call(env) - finalize! @router.call(env) end diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb index ef7e733ce4..6f9a200aa9 100644 --- a/railties/lib/rails/application/routes_reloader.rb +++ b/railties/lib/rails/application/routes_reloader.rb @@ -42,7 +42,7 @@ module Rails def finalize! route_sets.each do |routes| - ActiveSupport.on_load(:action_controller) { routes.finalize! } + routes.finalize! end end |