IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2784 from chancancode/upgrade-to-rails-master-4-2

Browse Source 
[WIP] Upgrade to rails master/4.2
This commit is contained in:
Sam
2014-11-11 09:46:02 +11:00
parent 37aada7e6a 5cc9f5bff5
commit 1a775aa784
15 changed files with 208 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/email/sender.rb
View File

@@ -115,7 +115,7 @@ module Email
end
begin
@message.deliver
@message.deliver_now
rescue *SMTP_CLIENT_ERRORS => e
return skip(e.message)
end