From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Fri, 21 Feb 2020 07:02:37 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=13918cb545d583decfb728300850b307c59e2031;p=akkoma

Merge branch 'develop' into gun
---

13918cb545d583decfb728300850b307c59e2031
diff --cc CHANGELOG.md
index e4bce5c02,90791d7bd..3eb4f0bdf
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -72,8 -72,9 +72,10 @@@ The format is based on [Keep a Changelo
  - User notification settings: Add `privacy_option` option.
  - Support for custom Elixir modules (such as MRF policies)
  - User settings: Add _This account is a_ option.
+ - A new users admin digest email
  - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
 +- New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
+ - Add an option `authorized_fetch_mode` to require HTTP signatures for AP fetches.
  <details>
    <summary>API Changes</summary>
  
diff --cc config/config.exs
index 27091393b,641b2c867..853a53fc9
--- a/config/config.exs
+++ b/config/config.exs
@@@ -49,7 -49,7 +49,8 @@@ config :pleroma, ecto_repos: [Pleroma.R
  config :pleroma, Pleroma.Repo,
    types: Pleroma.PostgresTypes,
    telemetry_event: [Pleroma.Repo.Instrumenter],
--  migration_lock: nil
++  migration_lock: nil,
++  parameters: [gin_fuzzy_search_limit: "500"]
  
  config :pleroma, Pleroma.Captcha,
    enabled: true,
diff --cc config/test.exs
index 83783cf8f,6bea09380..d4c641eef
--- a/config/test.exs
+++ b/config/test.exs
@@@ -94,8 -94,8 +94,10 @@@ config :pleroma, Pleroma.ReverseProxy.C
  
  config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
  
 +config :pleroma, Pleroma.Gun.API, Pleroma.Gun.API.Mock
 +
+ config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
+ 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else
diff --cc test/http/request_builder_test.exs
index 27ca651be,113158c9f..70946a932
--- a/test/http/request_builder_test.exs
+++ b/test/http/request_builder_test.exs
@@@ -11,9 -9,10 +11,10 @@@ defmodule Pleroma.HTTP.RequestBuilderTe
  
    describe "headers/2" do
      clear_config([:http, :send_user_agent])
+     clear_config([:http, :user_agent])
  
      test "don't send pleroma user agent" do
 -      assert RequestBuilder.headers(%{}, []) == %{headers: []}
 +      assert RequestBuilder.headers(%Request{}, []) == %Request{headers: []}
      end
  
      test "send pleroma user agent" do