# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1353521792 0
# Node ID 413d1d9c3efa6a3cc53c4daebce41553e5425baa
# Parent  b98e55985cb71e1638b55343a1ccd6581e77601d# Parent  b665182d9dd90f1de04adf414d979e1db65ea516
Merge

diff -r b98e55985cb7 -r 413d1d9c3efa config/environment.rb
--- a/config/environment.rb	Wed Nov 21 16:04:55 2012 +0000
+++ b/config/environment.rb	Wed Nov 21 18:16:32 2012 +0000
@@ -36,7 +36,10 @@
 
   # Enable page/fragment caching by setting a file-based store
   # (remember to create the caching directory and make it readable to the application)
-  # config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+  config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+
+  # And for direct uses of the cache
+  config.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector