Merge remote-tracking branch 'origin/release/0.6.8' into wdtk

Conflicts:
  config/general.yml-example

1 files changed, 6 insertions, 3 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index f21f27ab6..c43cdb049 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -12,13 +12,16 @@ config.whiny_nils = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = true
+config.action_controller.perform_caching             = false
 config.action_view.debug_rjs                         = true
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
-config.action_mailer.perform_deliveries = false
-config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors
+config.action_mailer.perform_deliveries = true
+# Use mailcatcher in development
+config.action_mailer.delivery_method = :smtp # so is queued, rather than giving immediate errors
+config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+
 
 # Writes useful log files to debug memory leaks, of the sort where have
 # unintentionally kept references to objects, especially strings.