Merge branch 'feature/rate-limiter' into 'develop'

Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
index 95a0e99726a4abbea6e40409680ff26dcb7aee1b,3d2c6d48e6f21ae453d1327e7ee179da4d190307..0642ee3c36a3e357ae0d2166b7e0efb09aec7ced
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -244,11 -244,9 +244,9 @@@ config :pleroma, :instance
    safe_dm_mentions: false,
    healthcheck: false,
    remote_post_retention_days: 90,
 -  skip_thread_containment: false,
 +  skip_thread_containment: true,
    limit_unauthenticated_to_local_content: true
  
- config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
- 
  config :pleroma, :markup,
    # XXX - unfortunately, inline images must be enabled by default right now, because
    # of custom emoji.  Issue #275 discusses defanging that somehow.

diff --cc config/test.exs
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge