projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index 40db66170f2af4ed98f5f92d051fb043bf13f92e..41cddb9bd8938b52b7d1f4c70e1fae552cb2b2a6 100644
(file)
--- 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
# 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
config :tesla, adapter: Tesla.Mock
config :pleroma, :rich_media, enabled: false
@@
-63,6
+61,12
@@
config :pleroma, :app_account_creation, max_requests: 5
config :pleroma, :http_security, report_uri: "https://endpoint.com"
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
try do
import_config "test.secret.exs"
rescue