summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
-rw-r--r--config/test.exs2
2 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 9cbac35eb..61e2648a9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -48,7 +48,8 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
config :pleroma, Pleroma.Repo,
types: Pleroma.PostgresTypes,
- telemetry_event: [Pleroma.Repo.Instrumenter]
+ telemetry_event: [Pleroma.Repo.Instrumenter],
+ migration_lock: nil
config :pleroma, Pleroma.Captcha,
enabled: false,
diff --git a/config/test.exs b/config/test.exs
index a0c90c371..40db66170 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -61,6 +61,8 @@ config :pleroma, Pleroma.ScheduledActivity,
config :pleroma, :app_account_creation, max_requests: 5
+config :pleroma, :http_security, report_uri: "https://endpoint.com"
+
try do
import_config "test.secret.exs"
rescue