Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

config/environments/development.rb

@@ -8,12 +8,10 @@ RedmineApp::Application.configure do
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils        = true
   config.logger = Logger.new('log/development.log', 'daily') # daily, weekly or monthly
-
-
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
-  config.action_controller.perform_caching             = true
-  config.cache_store = :dalli_store
+  config.action_controller.perform_caching             = false
+  config.cache_store = :file_store,  "#{Rails.root }/public/tmp/"
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true
 

config/environments/production.rb

@@ -3,7 +3,7 @@ RedmineApp::Application.configure do
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
-  config.cache_store = :dalli_store
+
   #####
   # Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
   #