diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2011-04-25 14:56:58 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2011-04-25 14:56:58 +0200 |
| commit | 820c0feda33495cfe68add8c3f25adc515ab3e04 (patch) | |
| tree | b4f5d1c6dd59f4a71bb6ae4dbc2c304fd2e48915 | |
| parent | e38b4436a57c43d2db78a4c8a647a09fe0e5d2c5 (diff) | |
| download | rails-820c0feda33495cfe68add8c3f25adc515ab3e04.tar.gz rails-820c0feda33495cfe68add8c3f25adc515ab3e04.tar.bz2 rails-820c0feda33495cfe68add8c3f25adc515ab3e04.zip | |
Explicitly define main_app proxy
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index b28f6c2297..1d09091dc7 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -275,8 +275,7 @@ module ActionDispatch module MountedHelpers end - def mounted_helpers(name = :main_app) - define_mounted_helper(name) if name + def mounted_helpers MountedHelpers end diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index bf865ce466..028c8814c4 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -41,6 +41,10 @@ module Rails ActionDispatch::Reloader.prepare! end + initializer :define_main_app_helper do |app| + app.routes.define_mounted_helper(:main_app) + end + initializer :eager_load! do if config.cache_classes && !$rails_rake_task ActiveSupport.run_load_hooks(:before_eager_load, self) |