Merge branch 'develop' into gun

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc config/test.exs
index bce9dd4aa839a8478bc352f0bf3a9e567d1dc818,b8ea63c9435f785321e943e47ff455a587f43287..040e67e4ab9917cc5d64dc9bf13aea11f516c728
--- 1/config/test.exs
--- 2/config/test.exs
+++ b/config/test.exs
@@@ -90,10 -90,10 +90,12 @@@ config :pleroma, Pleroma.ReverseProxy.C
  
  config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
  
 +config :pleroma, Pleroma.Gun, Pleroma.GunMock
 +
  config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
  
+ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+ 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else

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

diff --cc lib/pleroma/reverse_proxy/reverse_proxy.ex
index 35b973b564a3b373f0be96c5bb0b0e6f507c136a,8b713b8f4a09e78853effaa72304510fe0d75ca1..4bbeb493cab5c9b0b41b8028d7ffe08796ed2b4a
--- 1/lib/pleroma/reverse_proxy/reverse_proxy.ex
--- 2/lib/pleroma/reverse_proxy/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex
@@@ -3,9 -3,11 +3,9 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.ReverseProxy do
 -  alias Pleroma.HTTP
 -
    @keep_req_headers ~w(accept user-agent accept-encoding cache-control if-modified-since) ++
                        ~w(if-unmodified-since if-none-match if-range range)
-   @resp_cache_headers ~w(etag date last-modified cache-control)
+   @resp_cache_headers ~w(etag date last-modified)
    @keep_resp_headers @resp_cache_headers ++
                         ~w(content-type content-disposition content-encoding content-range) ++
                         ~w(accept-ranges vary)

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/activity/ir/topics_test.exs
Simple merge

diff --cc test/reverse_proxy/reverse_proxy_test.exs
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