diff options
| author | lain <lain@soykaf.club> | 2019-05-04 15:00:45 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-04 15:00:45 +0200 |
| commit | 6ad8ddfd290f0239956874ccc9dc181167e84647 (patch) | |
| tree | 83c5b59d055d3b98c1ebbba66351b7cbdb49bd99 /config/test.exs | |
| parent | 629ad1766ce5da434bf095f6baa81a460334e1b2 (diff) | |
| parent | d089ff24600455fefc17e91807c61ddc61ba107a (diff) | |
| download | pleroma-6ad8ddfd290f0239956874ccc9dc181167e84647.tar.gz pleroma-6ad8ddfd290f0239956874ccc9dc181167e84647.zip | |
Merge remote-tracking branch 'origin/develop' into feature/bbs
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 6a7b9067e..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, @@ -50,6 +54,11 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock config :pleroma_job_queue, disabled: true +config :pleroma, Pleroma.ScheduledActivity, + daily_user_limit: 2, + total_user_limit: 3, + enabled: false + try do import_config "test.secret.exs" rescue |