From: Tom Hughes <tom@compton.nu>
Date: Wed, 13 May 2020 21:42:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2626'
X-Git-Tag: live~2550
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fc6a4d442c1afb519264dbf15e64a4977a68b840?hp=7485b49a3afb5c414249bc288d38396dce49ba15

Merge remote-tracking branch 'upstream/pull/2626'
---

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index c60dff84b..cebb46939 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -192,7 +192,12 @@ class Notifier < ApplicationMailer
   def user_avatar_file(user)
     avatar = user&.avatar
     if avatar&.attached?
-      avatar.variant(:resize => "50x50>").blob.download
+      if avatar.variable?
+        image = avatar.variant(:resize => "50x50>").processed
+        image.service.download(image.key)
+      else
+        avatar.blob.download
+      end
     else
       File.read(Rails.root.join("app/assets/images/avatar_small.png"))
     end