diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-05 02:17:29 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-05 02:35:43 +0200 |
| commit | 87c57bb88f0eb1462ed31733ebcf3d9a535d8f16 (patch) | |
| tree | b1ec2f62e4629d7bf3d5fdfa5483055f5eca6989 /actionpack/lib/sprockets/assets.rake | |
| parent | ee2be435b1e5c0e94a4ee93a1a310e0471a77d07 (diff) | |
| download | rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.tar.gz rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.tar.bz2 rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.zip | |
Fix the lame config.action_controller.present? check scattered throughout assets_path.
Conflicts:
actionpack/test/template/sprockets_helper_test.rb
Diffstat (limited to 'actionpack/lib/sprockets/assets.rake')
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index a801050084..80c3d4d0b8 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -39,12 +39,13 @@ namespace :assets do config = Rails.application.config config.assets.compile = true config.assets.digest = digest unless digest.nil? - config.assets.digests = {} - env = Rails.application.assets + env = Rails.application.assets + env.context_class.send :include, ::Sprockets::Helpers::PrecompileHelper + target = File.join(Rails.public_path, config.assets.prefix) - compiler = Sprockets::StaticCompiler.new(env, + compiler = Sprockets::StaticCompiler.new(env, target, config.assets.precompile, :manifest_path => config.assets.manifest, |