diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
commit | 2ca965c704075467226dbf798e13ac8e0e62cc15 (patch) | |
tree | c437e1f4993a6337759eb09157c78cd8134fd774 /spec/mailers | |
parent | 2b2de41bc7ecec15aa73650da153e50f0e16f16b (diff) | |
parent | 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/previews/user_mailer_preview.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb index 6ed0090f4..8d2a9368d 100644 --- a/spec/mailers/previews/user_mailer_preview.rb +++ b/spec/mailers/previews/user_mailer_preview.rb @@ -29,4 +29,9 @@ class UserMailerPreview < ActionMailer::Preview def reset_password_instructions UserMailer.reset_password_instructions(User.first, 'spec') end + + # Preview this email at http://localhost:3000/rails/mailers/user_mailer/welcome + def welcome + UserMailer.welcome(User.first) + end end |