merge branch V2_5

1 files changed, 5 insertions, 4 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0d33ac03c..3d7819639 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -69,10 +69,11 @@ ChouetteIhm::Application.configure do
   # Configure the e-mail address which will be shown in Devise::Maile
   config.mailer_sender = "appli@chouette.mobi"
 
-  ActionMailer::Base.smtp_settings = {
-    :address        => "smtp.samle.com",
-    :domain         => "sample.com"
-  }
+ config.action_mailer.delivery_method = :sendmail 
+  # change to true to allow email to be sent during development
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default :charset => "utf-8"
 
   # api key to geoportail IGN (development key 3 month validity)
   # config.geoportail_api_key = "f1t6wihbh98njlbaf5cuzxy4"