From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 17 Dec 2018 19:45:14 +0000 (+0000)
Subject: Merge branch 'captcha' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=52ac7dce5c460d27d946d26070eb123e89af2914;p=akkoma

Merge branch 'captcha' into 'develop'

Captcha

See merge request pleroma/pleroma!550
---

52ac7dce5c460d27d946d26070eb123e89af2914
diff --cc config/test.exs
index 8f4a2dc17,5670e11a0..51aace407
--- a/config/test.exs
+++ b/config/test.exs
@@@ -4,9 -4,14 +4,15 @@@ use Mix.Confi
  # you can enable the server option below.
  config :pleroma, Pleroma.Web.Endpoint,
    http: [port: 4001],
 -  server: false
 +  url: [port: 4001],
 +  server: true
  
+ # Disable captha for tests
+ config :pleroma, Pleroma.Captcha,
+   enabled: true,
+   # A fake captcha service for tests
+   method: Pleroma.Captcha.Mock
+ 
  # Print only warnings and errors during test
  config :logger, level: :warn