projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/matstodon-statuses-by-name
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index 012021f2a137269feb71b08624388a825f3946cd..96ecf3592447c5c4b55546b97ae2fcfd523ec86d 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-23,7
+23,7
@@
config :pleroma, Pleroma.Upload, filters: [], link_name: false
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
-config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
, enabled: true
config :pleroma, :instance,
email: "admin@example.com",
config :pleroma, :instance,
email: "admin@example.com",
@@
-65,7
+65,9
@@
config :pleroma, Pleroma.ScheduledActivity,
total_user_limit: 3,
enabled: false
total_user_limit: 3,
enabled: false
-config :pleroma, :rate_limit, app_account_creation: {10_000, 5}
+config :pleroma, :rate_limit,
+ search: [{1000, 30}, {1000, 30}],
+ app_account_creation: {10_000, 5}
config :pleroma, :http_security, report_uri: "https://endpoint.com"
config :pleroma, :http_security, report_uri: "https://endpoint.com"
@@
-75,6
+77,8
@@
rum_enabled = System.get_env("RUM_ENABLED") == "true"
config :pleroma, :database, rum_enabled: rum_enabled
IO.puts("RUM enabled: #{rum_enabled}")
config :pleroma, :database, rum_enabled: rum_enabled
IO.puts("RUM enabled: #{rum_enabled}")
+config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
+
try do
import_config "test.secret.exs"
rescue
try do
import_config "test.secret.exs"
rescue