diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
commit | b368c7502931aa06121ecad8a97193b1f17cf90a (patch) | |
tree | 2b598363926388d30a4c5c6197436b46f6d4610a /spec/mailers/previews/user_mailer_preview.rb | |
parent | 00c9363f07081e0149533023992fba47dd905384 (diff) | |
parent | dd4c156f33a24b8bb89b45b2697aa4036c3ae5be (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.
Diffstat (limited to 'spec/mailers/previews/user_mailer_preview.rb')
-rw-r--r-- | spec/mailers/previews/user_mailer_preview.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb index 8de7d8669..95712e6cf 100644 --- a/spec/mailers/previews/user_mailer_preview.rb +++ b/spec/mailers/previews/user_mailer_preview.rb @@ -87,8 +87,8 @@ class UserMailerPreview < ActionMailer::Preview UserMailer.appeal_approved(User.first, Appeal.last) end - # Preview this email at http://localhost:3000/rails/mailers/user_mailer/sign_in_token - def sign_in_token - UserMailer.sign_in_token(User.first.tap { |user| user.generate_sign_in_token }, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc) + # Preview this email at http://localhost:3000/rails/mailers/user_mailer/suspicious_sign_in + def suspicious_sign_in + UserMailer.suspicious_sign_in(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc) end end |