Merge branch 'captcha' into 'develop'

Captcha

See merge request pleroma/pleroma!550

diff --cc config/config.exs
Simple merge

diff --cc config/test.exs
index 8f4a2dc17bf5ab5f7e35012c0851db17167f5839,5670e11a0411b4de661a251baa06d8b06aea7b0f..51aace4077debd3dfa1d567dc8968825388ad473
--- 1/config/test.exs
--- 2/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