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/abstract_controller | |
| 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/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb index 9ca2fb742f..ad14cd6d87 100644 --- a/actionpack/lib/abstract_controller/asset_paths.rb +++ b/actionpack/lib/abstract_controller/asset_paths.rb @@ -3,7 +3,7 @@ module AbstractController extend ActiveSupport::Concern included do - config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir + config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir, :use_sprockets end end -end
\ No newline at end of file +end |