summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-10 13:37:55 +0100
committerspag <spag@golwen.net>2013-01-10 13:37:55 +0100
commit490e3f9bcda2943d1bff77ec5cfaa0a9b7d13458 (patch)
tree9d9e2a1e5b1da7e301675e2767acfa5ca954ea38 /config
parent6ce81a29e0918b3494a08fa47190b2cea59d1a84 (diff)
parentae296748501982bac71525507ff9c1fdfefb8ad2 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
-rw-r--r--config/environments/development.rb5
-rw-r--r--config/environments/production.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd34e4f..5076f48 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -11,7 +11,10 @@ Gemeinschaft42c::Application.configure do
# Show full error reports and disable caching
config.consider_all_requests_local = true
- config.action_controller.perform_caching = false
+
+ # Enable caching for development
+ config.action_controller.perform_caching = true
+ CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4e5bdd8..26b2f35 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,7 +37,7 @@ Gemeinschaft42c::Application.configure do
# config.logger = SyslogLogger.new
# Use a different cache store in production
- # config.cache_store = :mem_cache_store
+ config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and JavaScripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"