X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c162c065c6f6db5dc584599f5639b296b627a165..40809825e8ff920cbce685360b7dce8296a29399:/app/mailers/notifier.rb diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index bd2c83b56..6e0c81a39 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -1,6 +1,8 @@ class Notifier < ActionMailer::Base include ActionView::Helpers::AssetUrlHelper + self.delivery_job = ActionMailer::MailDeliveryJob + default :from => Settings.email_from, :return_path => Settings.email_return_path, :auto_submitted => "auto-generated" @@ -187,16 +189,7 @@ class Notifier < ActionMailer::Base if avatar&.attached? return avatar.variant(:resize => "50x50>").blob.download else - return File.read(user_avatar_file_path(user)) - end - end - - def user_avatar_file_path(user) - image = user&.image - if image&.file? - return image.path(:small) - else - return Rails.root.join("app", "assets", "images", "avatar_small.png") + return File.read(Rails.root.join("app", "assets", "images", "avatar_small.png")) end end