diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-01 11:42:37 +0545 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-01 11:42:37 +0545 |
| commit | ad5263c647aea65dbeb4c329825671895e0a8863 (patch) | |
| tree | 6217011a3fd2ea943498ce296de07cefe1206b87 /config/test.exs | |
| parent | 5534d4c67675901ab272ee47355ad43dfae99033 (diff) | |
| parent | f1890d2cacfa09dd22b06a8d041c04dbeba9e138 (diff) | |
| download | pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.tar.gz pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.zip | |
Merge remote-tracking branch 'upstream/develop' into admin-create-users
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index a0c90c371..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 @@ -61,6 +59,14 @@ config :pleroma, Pleroma.ScheduledActivity, 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 |