<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -79,6 +79,20 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :user_observer
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method = :smtp
+  
+  config.action_mailer.smtp_settings = { 
+    :enable_starttls_auto =&gt; :true, 
+    :address =&gt; &quot;smtp.gmail.com&quot;, 
+    :port =&gt; 587, 
+    :domain =&gt; &quot;echowaves.local&quot;, 
+    :authentication =&gt; :plain, 
+    :user_name =&gt; &quot;user@echowaves.local&quot;, 
+    :password =&gt; &quot;**********&quot;, 
+    :tls =&gt; :true 
+  } 
+  config.action_mailer.perform_deliveries = :true 
+  config.action_mailer.raise_delivery_errors = :true 
+  config.action_mailer.default_charset = &quot;utf-8&quot;
 end
 
 ActiveSupport::JSON.backend = 'JSONGem'
@@ -98,14 +112,6 @@ Workling::Remote.dispatcher = Workling::Remote::Runners::ClientRunner.new
 # First, specify the Host that we will be using later for user_notifier.rb
 HOST = 'http://localhost:3000'
 
-ActionMailer::Base.delivery_method = :smtp
-# Third, add your SMTP settings
-ActionMailer::Base.smtp_settings = {
-  :address =&gt; &quot;mail.rmgapps.com&quot;,
-  :port =&gt; 25,
-  :domain =&gt; &quot;rmg-ny.com&quot;
-}
-
 # emails sent from echowaves will use these parameters
 BCC         = &quot;dmitry@rootlocusinc.com&quot; # email monitoring log
 FROM        = &quot;support@echowaves.com&quot;</diff>
      <filename>config/environment.rb-sample</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>vendor/plugins/action_mailer_optional_tls/README</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/action_mailer_optional_tls/Rakefile</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/action_mailer_optional_tls/init.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/action_mailer_optional_tls/lib/action_mailer_tls.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/action_mailer_optional_tls/lib/smtp_tls.rb</filename>
    </removed>
    <removed>
      <filename>vendor/plugins/action_mailer_optional_tls/test/tls_test.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>43402dbb7c06f431f14d95f0ed10b866162e57c4</id>
    </parent>
  </parents>
  <author>
    <name>Claudio Perez Gamayo</name>
    <email>crossblaim@gmail.com</email>
  </author>
  <url>http://github.com/dmitryame/echowaves/commit/d428b60d1023f0352fa66f807488418bcb66716f</url>
  <id>d428b60d1023f0352fa66f807488418bcb66716f</id>
  <committed-date>2009-09-30T14:22:03-07:00</committed-date>
  <authored-date>2009-09-30T14:22:03-07:00</authored-date>
  <message>remove action_mailer_optional_tls plugin</message>
  <tree>a2fc6e732a037a59f45beeb2d83473cdccb301ae</tree>
  <committer>
    <name>Claudio Perez Gamayo</name>
    <email>crossblaim@gmail.com</email>
  </committer>
</commit>
