diff options
| author | lain <lain@soykaf.club> | 2019-05-01 18:40:41 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-01 18:40:41 +0200 |
| commit | 45f790becc2cc63ac000c6432fe8c84e0b589822 (patch) | |
| tree | 724d0e8ce5f10807cc25efc2434454bf38c5a52c /config/test.exs | |
| parent | 4908e0eeee2ecb58b204198c20720d52548b6f4a (diff) | |
| parent | d107919b3d8b2275ddb7b17846cab182682098a7 (diff) | |
| download | pleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.tar.gz pleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.zip | |
Merge remote-tracking branch 'origin/develop' into conversations_three
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 894fa8d3d..f93bc5994 100644 --- a/config/test.exs +++ b/config/test.exs @@ -21,7 +21,11 @@ config :pleroma, Pleroma.Upload, filters: [], link_name: false config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" -config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test + +config :pleroma, :instance, + email: "admin@example.com", + notify_email: "noreply@example.com" # Configure your database config :pleroma, Pleroma.Repo, |