Merge branch 'release/0.15' into wdtk

Conflicts:
	lib/tasks/stats.rake

1 files changed, 8 insertions, 3 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 54ab2977f..a912dd5de 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,9 +16,14 @@ Alaveteli::Application.configure do
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
   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 }
+
+  if AlaveteliConfiguration::use_mailcatcher_in_development
+    # 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 }
+  else
+    config.action_mailer.delivery_method = :sendmail
+  end
 
   # Writes useful log files to debug memory leaks, of the sort where have
   # unintentionally kept references to objects, especially strings.