projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index dc2d3b80c85739ce828cec1a44e18a43d186cc8f..567780987d253f3b41b548871a6f22e6e83fb206 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-29,7
+29,8
@@
config :pleroma, :instance,
email: "admin@example.com",
notify_email: "noreply@example.com",
skip_thread_containment: false,
email: "admin@example.com",
notify_email: "noreply@example.com",
skip_thread_containment: false,
- federating: false
+ federating: false,
+ external_user_synchronization: false
config :pleroma, :activitypub, sign_object_fetches: false
config :pleroma, :activitypub, sign_object_fetches: false
@@
-70,7
+71,8
@@
config :pleroma, Pleroma.ScheduledActivity,
config :pleroma, :rate_limit,
search: [{1000, 30}, {1000, 30}],
app_account_creation: {10_000, 5},
config :pleroma, :rate_limit,
search: [{1000, 30}, {1000, 30}],
app_account_creation: {10_000, 5},
- password_reset: {1000, 30}
+ password_reset: {1000, 30},
+ ap_routes: nil
config :pleroma, :http_security, report_uri: "https://endpoint.com"
config :pleroma, :http_security, report_uri: "https://endpoint.com"
@@
-84,11
+86,10
@@
config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
-
try
do
+
if File.exists?("./config/test.secret.exs")
do
import_config "test.secret.exs"
import_config "test.secret.exs"
-rescue
- _ ->
- IO.puts(
- "You may want to create test.secret.exs to declare custom database connection parameters."
- )
+else
+ IO.puts(
+ "You may want to create test.secret.exs to declare custom database connection parameters."
+ )
end
end