From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 12 Dec 2019 18:51:52 +0000 (+0700)
Subject: Merge branch 'develop' into feature/custom-runtime-modules
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7528322f83d5bee92a030e2e626436dab327df9b;p=akkoma

Merge branch 'develop' into feature/custom-runtime-modules
---

7528322f83d5bee92a030e2e626436dab327df9b
diff --cc CHANGELOG.md
index e2249f897,c133cd9ec..22f199b3d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -51,8 -51,8 +52,9 @@@ The format is based on [Keep a Changelo
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  - MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
  - User notification settings: Add `privacy_option` option.
 +- Support for custom Elixir modules (such as MRF policies)
  - User settings: Add _This account is a_ option.
+ - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
  <details>
    <summary>API Changes</summary>
  
diff --cc config/test.exs
index 8b9bf5c77,b48b89c8f..6f6ab733e
--- a/config/test.exs
+++ b/config/test.exs
@@@ -93,8 -95,8 +95,10 @@@ config :joken, default_signer: "yU8uHKq
  
  config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
  
 +config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
 +
+ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+ 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else