Merge branch 'captcha' into 'develop'

Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/application.ex
Simple merge

diff --cc lib/pleroma/captcha/captcha.ex
index 133a9fd68cf67a73a79e5c2704bc12d4b341626a,424ad4add2c78cca8fd418323bb61aedfe8b8c0b..0207bcbea6261df88c000bb8d7b9d27d9c42ab2e
--- 1/lib/pleroma/captcha/captcha.ex
--- 2/lib/pleroma/captcha/captcha.ex
+++ b/lib/pleroma/captcha/captcha.ex
@@@ -1,11 -1,9 +1,13 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
  defmodule Pleroma.Captcha do
-   use GenServer
+   alias Plug.Crypto.KeyGenerator
+   alias Plug.Crypto.MessageEncryptor
+   alias Calendar.DateTime
  
-   @ets_options [:ordered_set, :private, :named_table, {:read_concurrency, true}]
+   use GenServer
  
    @doc false
    def start_link() do

diff --cc lib/pleroma/captcha/captcha_service.ex
Simple merge

diff --cc lib/pleroma/captcha/kocaptcha.ex
index 66f9ce7544bcd7260ade66c49f77902294175773,cd0eb6f2141d0360c69f710ad7a5ed9bd2649d27..34a6114928eb47ae782e546e0d8fad5b7722ad17
--- 1/lib/pleroma/captcha/kocaptcha.ex
--- 2/lib/pleroma/captcha/kocaptcha.ex
+++ b/lib/pleroma/captcha/kocaptcha.ex
@@@ -1,10 -1,4 +1,8 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
  defmodule Pleroma.Captcha.Kocaptcha do
-   alias Calendar.DateTime
- 
    alias Pleroma.Captcha.Service
    @behaviour Service
  

diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge

diff --cc test/captcha_test.exs
Simple merge

diff --cc test/support/captcha_mock.ex
Simple merge