diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 21:56:15 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 21:56:15 -0500 |
| commit | 28fee29e383258c38649e20dc9508188010020c8 (patch) | |
| tree | f2cbc6faa5a7993839271f0557a0f647397d3f21 /actionpack | |
| parent | 56a5da89dbcdd6d73f26f5c1be6221b684574b2b (diff) | |
| download | rails-28fee29e383258c38649e20dc9508188010020c8.tar.gz rails-28fee29e383258c38649e20dc9508188010020c8.tar.bz2 rails-28fee29e383258c38649e20dc9508188010020c8.zip | |
Unify sprockets config options
Diffstat (limited to 'actionpack')
| -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 175b7744d7..0dd13fa9bf 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.asset_pipeline + options.use_sprockets ||= app.config.assets.enabled options.assets_dir ||= paths["public"].first options.javascripts_dir ||= paths["public/javascripts"].first options.stylesheets_dir ||= paths["public/stylesheets"].first |