aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-28 15:20:17 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-28 15:20:17 -0500
commita4c358f84c183743edec0c5d6ef113d8e1a5500f (patch)
treeb5ecc198897f4ef970f7e41d6ad64d382fa33b61 /railties/lib
parent9eb72ac78f15078c362cb4bc6cc42ddda182127b (diff)
downloadrails-a4c358f84c183743edec0c5d6ef113d8e1a5500f.tar.gz
rails-a4c358f84c183743edec0c5d6ef113d8e1a5500f.tar.bz2
rails-a4c358f84c183743edec0c5d6ef113d8e1a5500f.zip
Assets cache shouldn't be shared between different environments
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/configuration.rb2
-rw-r--r--railties/lib/rails/tasks/tmp.rake4
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 613c5b25f0..a7a35c2685 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -57,7 +57,7 @@ module Rails
@assets.debug = false
@assets.compile = true
@assets.digest = false
- @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
+ @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/#{Rails.env}/" ]
@assets.js_compressor = nil
@assets.css_compressor = nil
@assets.initialize_on_precompile = true
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 0968765b4f..0bb64ced95 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -6,7 +6,9 @@ namespace :tmp do
'tmp/cache',
'tmp/sockets',
'tmp/pids',
- 'tmp/cache/assets' ]
+ 'tmp/cache/assets/development',
+ 'tmp/cache/assets/test',
+ 'tmp/cache/assets/production' ]
tmp_dirs.each { |d| directory d }