From: Maksim Pechnikov <parallel588@gmail.com>
Date: Sat, 14 Dec 2019 18:44:10 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=67cb46e15dd5fa16da257a9b0e5166266d10c694;p=akkoma

Merge branch 'develop' into issue/1383
---

67cb46e15dd5fa16da257a9b0e5166266d10c694
diff --cc config/config.exs
index bca1f78ac,370ddd855..a737c98af
--- a/config/config.exs
+++ b/config/config.exs
@@@ -51,10 -51,24 +51,10 @@@ config :pleroma, Pleroma.Repo
    telemetry_event: [Pleroma.Repo.Instrumenter],
    migration_lock: nil
  
 -scheduled_jobs =
 -  with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
 -       true <- digest_config[:active] do
 -    [{digest_config[:schedule], {Pleroma.Daemons.DigestEmailDaemon, :perform, []}}]
 -  else
 -    _ -> []
 -  end
 -
 -config :pleroma, Pleroma.Scheduler,
 -  global: true,
 -  overlap: true,
 -  timezone: :utc,
 -  jobs: scheduled_jobs
 -
  config :pleroma, Pleroma.Captcha,
-   enabled: false,
+   enabled: true,
    seconds_valid: 60,
-   method: Pleroma.Captcha.Kocaptcha
+   method: Pleroma.Captcha.Native
  
  config :pleroma, :hackney_pools,
    federation: [