diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-29 21:23:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-29 21:23:05 -0500 |
| commit | 651d371a247b0c473fb35a62076e480d95d84a35 (patch) | |
| tree | 543d153f64a5efb278b791b155857eecbe31bf34 /actionpack/lib/action_controller | |
| parent | 612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f (diff) | |
| download | rails-651d371a247b0c473fb35a62076e480d95d84a35.tar.gz rails-651d371a247b0c473fb35a62076e480d95d84a35.tar.bz2 rails-651d371a247b0c473fb35a62076e480d95d84a35.zip | |
Rename option to config.asset_pipeline
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 0f87295d47..175b7744d7 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -21,7 +21,7 @@ module ActionController paths = app.config.paths options = app.config.action_controller - options.use_sprockets ||= app.config.use_sprockets + options.use_sprockets ||= app.config.asset_pipeline options.assets_dir ||= paths["public"].first options.javascripts_dir ||= paths["public/javascripts"].first options.stylesheets_dir ||= paths["public/stylesheets"].first |