diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-22 22:11:32 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:08 +0200 |
| commit | a132229d7b4382d9ffe8847fa58f469cb8f2ecfc (patch) | |
| tree | 0ee1db3d25a6d3319ba5f4d575c9c9f39ab6aea9 /railties/lib/rails/application.rb | |
| parent | abeb0ff2cc99967b852c509e5d3bd186fa8a184c (diff) | |
| download | rails-a132229d7b4382d9ffe8847fa58f469cb8f2ecfc.tar.gz rails-a132229d7b4382d9ffe8847fa58f469cb8f2ecfc.tar.bz2 rails-a132229d7b4382d9ffe8847fa58f469cb8f2ecfc.zip | |
Added ability to set asset_path for engines
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 300d4c6ab9..7c590b701e 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -124,16 +124,12 @@ module Rails alias :build_middleware_stack :app - def call(env) - env["action_dispatch.routes"] = routes - app.call(env.reverse_merge!(env_defaults)) - end - - def env_defaults - @env_defaults ||= { + def env_config + @env_config ||= super.merge({ "action_dispatch.parameter_filter" => config.filter_parameters, - "action_dispatch.secret_token" => config.secret_token - } + "action_dispatch.secret_token" => config.secret_token, + "action_dispatch.asset_path" => nil + }) end def initializers |