Merge pull request #1663 from dsander/fix-smtp-config-regression

Fix SMTP config regression when not using authentication
huginn · Sep 3, 2016 · 15dd513 · 15dd513
2 parents 6bb6106 + 7e43e07
commit 15dd513
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
@@ -4,8 +4,8 @@
   domain: ENV['SMTP_DOMAIN'],
   authentication: ENV['SMTP_AUTHENTICATION'] || "plain",
   enable_starttls_auto: ENV['SMTP_ENABLE_STARTTLS_AUTO'] == 'true',
-  user_name: ENV['SMTP_USER_NAME'] || "",
-  password: ENV['SMTP_PASSWORD'] || "",
+  user_name: ENV['SMTP_USER_NAME'].presence,
+  password: ENV['SMTP_PASSWORD'].presence,
   openssl_verify_mode: ENV['SMTP_OPENSSL_VERIFY_MODE'].presence,
   ca_path: ENV['SMTP_OPENSSL_CA_PATH'].presence,
   ca_file: ENV['SMTP_OPENSSL_CA_FILE'].presence