diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-17 16:17:10 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-17 16:17:10 +0000 |
| commit | aa2bf07281ba1e41c9e32a760684c15081524a7c (patch) | |
| tree | a5ae679254948e9825676c87aca2ca4d164806c3 /app/mailers | |
| parent | 60ff0869603c80fbaae407e492e0e7f60e2e40e6 (diff) | |
| parent | fbe7756da6e817c3de633f624f5a28bc133e78c8 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notification_mailer.rb | 4 | ||||
| -rw-r--r-- | app/mailers/user_mailer.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 07992102d..9fed4a636 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true class NotificationMailer < ApplicationMailer - layout 'plain_mailer' - helper :stream_entries + add_template_helper RoutingHelper + def mention(recipient, notification) @me = recipient @status = notification.target_status 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 |