diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-06-03 09:12:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-06-03 09:12:17 -0500 |
| commit | f4e2595592ccca6cedd64669baef7bdd2a6547d0 (patch) | |
| tree | 6806a79345c7599b0d436df8b6c46e75b54d1292 /config/test.exs | |
| parent | 3c4cab9be18ff543d025177b418ddd0b16050e68 (diff) | |
| parent | 9789e000b05621435dc0c03833f564481e0b80e6 (diff) | |
| download | pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.tar.gz pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.zip | |
Merge branch 'develop' into update-oauth-template
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index f93bc5994..41cddb9bd 100644 --- a/config/test.exs +++ b/config/test.exs @@ -39,8 +39,6 @@ config :pleroma, Pleroma.Repo, # Reduce hash rounds for testing config :pbkdf2_elixir, rounds: 1 -config :pleroma, :websub, Pleroma.Web.WebsubMock -config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :tesla, adapter: Tesla.Mock config :pleroma, :rich_media, enabled: false @@ -59,6 +57,16 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false +config :pleroma, :app_account_creation, max_requests: 5 + +config :pleroma, :http_security, report_uri: "https://endpoint.com" + +config :pleroma, :http, send_user_agent: false + +rum_enabled = System.get_env("RUM_ENABLED") == "true" +config :pleroma, :database, rum_enabled: rum_enabled +IO.puts("RUM enabled: #{rum_enabled}") + try do import_config "test.secret.exs" rescue |