From: Tom Hughes Date: Tue, 8 Dec 2020 15:30:59 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2997' into master X-Git-Tag: live~3128 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fec3b35762cab056611590702f03d27ef8d3914f?hp=1985142ff5c4dbca888403f5e9ac3015e7cb88bb Merge remote-tracking branch 'upstream/pull/2997' into master --- diff --git a/app/views/user_mailer/message_notification.html.erb b/app/views/user_mailer/message_notification.html.erb index fd49c6723..4095b5e59 100644 --- a/app/views/user_mailer/message_notification.html.erb +++ b/app/views/user_mailer/message_notification.html.erb @@ -2,7 +2,7 @@ <%= t ".hi", :to_user => @to_user %>

- <%= t ".header", + <%= t ".header_html", :from_user => link_to_user(@from_user), :subject => tag.em(@title) %>