X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7a66c6d4eb65a5ad6438970375cf3ea6ac4e3cfc..159ef16601b7b7157ce9d766db97c4189d145e42:/app/mailers/user_mailer.rb diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index bb43bc962..7bbe65ec5 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -12,7 +12,7 @@ class UserMailer < ApplicationMailer def signup_confirm(user, token) with_recipient_locale user do - @url = url_for(:controller => "users", :action => "confirm", + @url = url_for(:controller => "confirmations", :action => "confirm", :display_name => user.display_name, :confirm_string => token.token) @@ -24,7 +24,7 @@ class UserMailer < ApplicationMailer def email_confirm(user, token) with_recipient_locale user do @address = user.new_email - @url = url_for(:controller => "users", :action => "confirm_email", + @url = url_for(:controller => "confirmations", :action => "confirm_email", :confirm_string => token.token) mail :to => user.new_email, @@ -194,8 +194,7 @@ class UserMailer < ApplicationMailer avatar = user&.avatar if avatar&.attached? if avatar.variable? - image = avatar.variant(:resize => "50x50>").processed - image.service.download(image.key) + avatar.variant(:resize_to_limit => [50, 50]).download else avatar.blob.download end