diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-04-12 22:35:24 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-04-12 22:35:24 -0500 |
| commit | f004c8868196f62a6810bc7e693b407fd27a5fa7 (patch) | |
| tree | 53b05e2adf195880080e4758254dcccf49219611 /actionpack/lib/action_controller/railtie.rb | |
| parent | 1b5b53da5e4beb24dc7d41a1e9e5d72b82586985 (diff) | |
| parent | a4518517f77055cea0d9fe552d2df393140679de (diff) | |
| download | rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.tar.gz rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.tar.bz2 rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.zip | |
Merge branch 'sprockets'
Diffstat (limited to 'actionpack/lib/action_controller/railtie.rb')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index f0c29825ba..0dd13fa9bf 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -21,6 +21,7 @@ module ActionController paths = app.config.paths options = app.config.action_controller + 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 |