summaryrefslogtreecommitdiffstats
path: root/app/models/mailer.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-05-25 06:50:25 +0000
committerGo MAEDA <maeda@farend.jp>2019-05-25 06:50:25 +0000
commitb0e17e8199bb40d0b1bed2c3dded355f439d8b3a (patch)
tree694b9ccde636af70a5aa515b62d1020a5eac9e62 /app/models/mailer.rb
parenta12b7bcf2931045e63093adcd765d7c6e022fa05 (diff)
downloadredmine-b0e17e8199bb40d0b1bed2c3dded355f439d8b3a.tar.gz
redmine-b0e17e8199bb40d0b1bed2c3dded355f439d8b3a.zip
Don't rescue Exception class (#31387).
Patch by Go MAEDA and Pavel Rosický. git-svn-id: http://svn.redmine.org/redmine/trunk@18197 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r--app/models/mailer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index c0a30d35a..8ab43e9b6 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -705,7 +705,7 @@ class Mailer < ActionMailer::Base
# Log errors when raise_delivery_errors is set to false, Rails does not
mail.raise_delivery_errors = true
super
- rescue Exception => e
+ rescue => e
if ActionMailer::Base.raise_delivery_errors
raise e
else