diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
| commit | b3bf32a21e4dfc43737f50f15d3f258c16d0cf83 (patch) | |
| tree | 37daa7d7725d3676115eea2c4d4a215bdd95c06d /spec/mailers | |
| parent | 430d4427916b44e6a7c16db1899dfef2eec140fc (diff) | |
| parent | 14f436c457560862fafabd753eb314c8b8a8e674 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.
Diffstat (limited to 'spec/mailers')
| -rw-r--r-- | spec/mailers/previews/user_mailer_preview.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb index 6d87fd706..69b9b971e 100644 --- a/spec/mailers/previews/user_mailer_preview.rb +++ b/spec/mailers/previews/user_mailer_preview.rb @@ -79,7 +79,7 @@ class UserMailerPreview < ActionMailer::Preview # Preview this email at http://localhost:3000/rails/mailers/user_mailer/warning def warning - UserMailer.warning(User.first, AccountWarning.new(text: '', action: :silence), [Status.first.id]) + UserMailer.warning(User.first, AccountWarning.last) end # Preview this email at http://localhost:3000/rails/mailers/user_mailer/sign_in_token |