diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-19 14:34:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 14:34:08 +0100 |
| commit | c7f04961b6dcb1b7e12136deadcf65076c130c40 (patch) | |
| tree | 20788cbb86d4ae8d38ce539325205e5f0a1ee344 /app/mailers | |
| parent | ba22398c38067e05f141a0dddeb20bf68913988a (diff) | |
| parent | 3b7b607300d662aa1f25d459ca12aec89ab550e8 (diff) | |
Merge pull request #1513 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notification_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/user_mailer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 54db892cc..9e683b6a1 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -4,7 +4,7 @@ class NotificationMailer < ApplicationMailer helper :accounts helper :statuses - add_template_helper RoutingHelper + helper RoutingHelper def mention(recipient, notification) @me = recipient diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 95996ba3f..68d1c4507 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -8,7 +8,7 @@ class UserMailer < Devise::Mailer helper :instance helper :statuses - add_template_helper RoutingHelper + helper RoutingHelper def confirmation_instructions(user, token, **) @resource = user |