Merge branch 'develop' into gun

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
index 82012dc107200e0b963562c0a3d0d344c8434587,2cd741213da5394e8ba320c33649801c11cfc73d..7c94a0f26bfaad6115fe58d92778604462982997
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -602,51 -624,10 +602,53 @@@ config :pleroma, :modules, runtime_dir
  
  config :pleroma, configurable_from_database: false
  
- config :pleroma, Pleroma.Repo, parameters: [gin_fuzzy_search_limit: "500"]
+ config :pleroma, Pleroma.Repo,
+   parameters: [gin_fuzzy_search_limit: "500"],
+   prepare: :unnamed
  
 +config :pleroma, :connections_pool,
 +  receive_connection_timeout: 250,
 +  max_connections: 250,
 +  retry: 0,
 +  retry_timeout: 100,
 +  await_up_timeout: 5_000
 +
 +config :pleroma, :pools,
 +  federation: [
 +    size: 50,
 +    max_overflow: 10,
 +    timeout: 150_000
 +  ],
 +  media: [
 +    size: 50,
 +    max_overflow: 10,
 +    timeout: 150_000
 +  ],
 +  upload: [
 +    size: 25,
 +    max_overflow: 5,
 +    timeout: 300_000
 +  ],
 +  default: [
 +    size: 10,
 +    max_overflow: 2,
 +    timeout: 10_000
 +  ]
 +
 +config :pleroma, :hackney_pools,
 +  federation: [
 +    max_connections: 50,
 +    timeout: 150_000
 +  ],
 +  media: [
 +    max_connections: 50,
 +    timeout: 150_000
 +  ],
 +  upload: [
 +    max_connections: 25,
 +    timeout: 300_000
 +  ]
 +
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/mix/tasks/pleroma/emoji.ex
Simple merge

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

diff --cc lib/pleroma/config/config_db.ex
Simple merge

diff --cc lib/pleroma/config/transfer_task.ex
Simple merge

diff --cc lib/pleroma/object/fetcher.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
Simple merge

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

diff --cc lib/pleroma/web/rich_media/parser.ex
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/config/config_db_test.exs
Simple merge

diff --cc test/http/request_builder_test.exs
Simple merge

diff --cc test/notification_test.exs
Simple merge

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

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge

diff --cc test/web/common_api/common_api_utils_test.exs
Simple merge