diff options
| -rw-r--r-- | app/mailers/user_mailer.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/mailer.html.haml | 4 | ||||
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/email_changed.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/password_change.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/reconfirmation_instructions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/reset_password_instructions.html.haml | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 7821be32b..a7efa73c1 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -5,6 +5,8 @@ class UserMailer < Devise::Mailer helper :instance + add_template_helper RoutingHelper + def confirmation_instructions(user, token, **) @resource = user @token = token diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 8a7ce4369..e41b91069 100644 --- a/app/views/layouts/mailer.html.haml +++ b/app/views/layouts/mailer.html.haml @@ -24,7 +24,7 @@ %tr %td.column-cell = link_to root_url do - = image_tag asset_pack_path('logo_full.svg'), height: 34, class: 'logo' + = image_tag full_pack_url('logo_full.svg'), alt: 'Mastodon', height: 34, class: 'logo' = yield @@ -52,4 +52,4 @@ %tbody %td.column-cell.text-right = link_to root_url do - = image_tag asset_pack_path('logo_transparent.svg'), height: 24 + = image_tag full_pack_url('logo_transparent.svg'), alt: 'Mastodon', height: 24 diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml index 7a148ec72..0f999bcbc 100644 --- a/app/views/user_mailer/confirmation_instructions.html.haml +++ b/app/views/user_mailer/confirmation_instructions.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag asset_pack_path('icon_email.svg') + = image_tag full_pack_url('icon_email.svg'), alt: '' %h1= t 'devise.mailer.confirmation_instructions.title' diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml index e526f3a2c..45dc06650 100644 --- a/app/views/user_mailer/email_changed.html.haml +++ b/app/views/user_mailer/email_changed.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag asset_pack_path('icon_email.svg') + = image_tag full_pack_url('icon_email.svg'), alt: '' %h1= t 'devise.mailer.email_changed.title' %p.lead= t 'devise.mailer.email_changed.explanation' diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml index a0afd5930..2e9377dff 100644 --- a/app/views/user_mailer/password_change.html.haml +++ b/app/views/user_mailer/password_change.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag asset_pack_path('icon_lock_open.svg') + = image_tag full_pack_url('icon_lock_open.svg'), alt: '' %h1= t 'devise.mailer.password_change.title' %p.lead= t 'devise.mailer.password_change.explanation' diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml index 52855e223..3ae226093 100644 --- a/app/views/user_mailer/reconfirmation_instructions.html.haml +++ b/app/views/user_mailer/reconfirmation_instructions.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag asset_pack_path('icon_email.svg') + = image_tag full_pack_url('icon_email.svg'), alt: '' %h1= t 'devise.mailer.reconfirmation_instructions.title' %p.lead= t 'devise.mailer.reconfirmation_instructions.explanation' diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml index c6a9d4bf6..c0e6775d4 100644 --- a/app/views/user_mailer/reset_password_instructions.html.haml +++ b/app/views/user_mailer/reset_password_instructions.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag asset_pack_path('icon_lock_open.svg') + = image_tag full_pack_url('icon_lock_open.svg'), alt: '' %h1= t 'devise.mailer.reset_password_instructions.title' %p.lead= t 'devise.mailer.reset_password_instructions.explanation' |