Merge branch 'develop'5.1-beta1

2 files changed, 7 insertions, 4 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd34e4f..e677834 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
+
+  # Enable caching for development
   config.action_controller.perform_caching = false
+  CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
@@ -37,7 +40,7 @@ Gemeinschaft42c::Application.configure do
 
   # Enable Hirb:
   extend Hirb::Console
-  Hirb::View.enable  
+  Hirb::View.enable
 end
 
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4e5bdd8..344f8f8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -30,14 +30,14 @@ Gemeinschaft42c::Application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Show only warnings in log files
+  config.log_level = :warn
 
   # Use a different logger for distributed setups
   # config.logger = SyslogLogger.new
 
   # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
+  config.cache_store = :dalli_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"