projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'remove-swift' into 'develop'
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index 73a8b82a1fb622bc5a70a3e0862b7579c52147dc..63443dde0115a1127df6133a645b329a01810be4 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-28,7
+28,8
@@
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
config :pleroma, :instance,
email: "admin@example.com",
notify_email: "noreply@example.com",
config :pleroma, :instance,
email: "admin@example.com",
notify_email: "noreply@example.com",
- skip_thread_containment: false
+ skip_thread_containment: false,
+ federating: false
# Configure your database
config :pleroma, Pleroma.Repo,
# Configure your database
config :pleroma, Pleroma.Repo,
@@
-43,7
+44,11
@@
config :pleroma, Pleroma.Repo,
config :pbkdf2_elixir, rounds: 1
config :tesla, adapter: Tesla.Mock
config :pbkdf2_elixir, rounds: 1
config :tesla, adapter: Tesla.Mock
-config :pleroma, :rich_media, enabled: false
+
+config :pleroma, :rich_media,
+ enabled: false,
+ ignore_hosts: [],
+ ignore_tld: ["local", "localdomain", "lan"]
config :web_push_encryption, :vapid_details,
subject: "mailto:administrator@example.com",
config :web_push_encryption, :vapid_details,
subject: "mailto:administrator@example.com",
@@
-70,6
+75,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