aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-07-23 17:50:43 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-07-23 17:50:43 -0700
commit06c52d6ac93cb263abce6abfbef91a7a3a3e3d6a (patch)
tree9bc527d935ccbc5899f791f9a8c8ccda42162d5c
parent410e75419d2ffdee56a465eb551f868af7063176 (diff)
parentbb3b3e306252129f24e69eede9793cfc131c766e (diff)
downloadrails-06c52d6ac93cb263abce6abfbef91a7a3a3e3d6a.tar.gz
rails-06c52d6ac93cb263abce6abfbef91a7a3a3e3d6a.tar.bz2
rails-06c52d6ac93cb263abce6abfbef91a7a3a3e3d6a.zip
Merge pull request #2226 from dmathieu/perform_caching
rake assets:precompile should always perform caching - Closes #2199
-rw-r--r--actionpack/lib/sprockets/assets.rake1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index a68f0e84f8..424eeae35c 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -10,6 +10,7 @@ namespace :assets do
Sprockets::Helpers::RailsHelper
assets = Rails.application.config.assets.precompile
+ Rails.application.config.action_controller.perform_caching = true
Rails.application.assets.precompile(*assets)
end