diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-27 14:01:34 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-27 14:01:34 -0700 |
| commit | 4bcb05de2d512cfa8c35e130c4b11f961f1b6e29 (patch) | |
| tree | 81d060bd7b82540f1887f0421109eaf7654acff9 /railties/lib/rails/engine.rb | |
| parent | a0960ec2d4476763d6975e3df6806cf99f24ead9 (diff) | |
| parent | 024bed387b067519de64af5b89ce2b534c99155f (diff) | |
| download | rails-4bcb05de2d512cfa8c35e130c4b11f961f1b6e29.tar.gz rails-4bcb05de2d512cfa8c35e130c4b11f961f1b6e29.tar.bz2 rails-4bcb05de2d512cfa8c35e130c4b11f961f1b6e29.zip | |
Merge pull request #1870 from chriseppstein/asset_urls_master
Asset urls master
Diffstat (limited to 'railties/lib/rails/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 52c89274e7..bf57a034b2 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -538,15 +538,9 @@ module Rails end initializer :append_assets_path do |app| - if app.config.assets.respond_to?(:prepend_path) - app.config.assets.prepend_path(*paths["vendor/assets"].existent) - app.config.assets.prepend_path(*paths["lib/assets"].existent) - app.config.assets.prepend_path(*paths["app/assets"].existent) - else - app.config.assets.paths.unshift(*paths["vendor/assets"].existent) - app.config.assets.paths.unshift(*paths["lib/assets"].existent) - app.config.assets.paths.unshift(*paths["app/assets"].existent) - end + app.config.assets.paths.unshift(*paths["vendor/assets"].existent) + app.config.assets.paths.unshift(*paths["lib/assets"].existent) + app.config.assets.paths.unshift(*paths["app/assets"].existent) end initializer :prepend_helpers_path do |app| |