Merge branch 'bugfix/pleroma-email-naming' into 'develop'

Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
This commit is contained in:
lambda 2019-04-12 10:41:09 +00:00
commit 184ae60b21
15 changed files with 39 additions and 22 deletions

View file

@ -318,7 +318,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
refute token_record.used
Swoosh.TestAssertions.assert_email_sent(
Pleroma.UserEmail.user_invitation_email(
Pleroma.Emails.UserEmail.user_invitation_email(
user,
token_record,
recipient_email,