A regression here worries me too much

This commit is contained in:
Sam 2014-05-14 11:27:29 +10:00
parent 810eda448f
commit 97373535c8
1 changed files with 3 additions and 2 deletions

View File

@ -36,10 +36,11 @@ Discourse::Application.configure do
user_name: GlobalSetting.smtp_user_name,
password: GlobalSetting.smtp_password,
authentication: GlobalSetting.smtp_authentication,
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls,
openssl_verify_mode: GlobalSetting.smtp_openssl_verify_mode
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
}
settings[:openssl_verify_mode] = GlobalSetting.smtp_openssl_verify_mode if GlobalSetting.smtp_openssl_verify_mode
config.action_mailer.smtp_settings = settings.reject{|x,y| y.nil?}
else
config.action_mailer.delivery_method = :sendmail