[#534] Merged `upstream/develop`.

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
Simple merge

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

diff --cc lib/pleroma/web/ostatus/ostatus_controller.ex
Simple merge

diff --cc test/support/http_request_mock.ex
index 3d6efd52c2e999ff14ee48fa9012785703325a19,3043d2be6953b31686f04ceb2f5ebbf920829c37..bcdf2e00655c81178a60b216ba74ee8197ab4e18
--- 1/test/support/http_request_mock.ex
--- 2/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@@ -653,14 -653,14 +653,22 @@@ defmodule HttpRequestMock d
      {:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)}
    end
  
+   def get("http://example.com/ogp", _, _, _) do
+     {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}}
+   end
+ 
+   def get("http://example.com/empty", _, _, _) do
+     {:ok, %Tesla.Env{status: 200, body: "hello"}}
+   end
+ 
 +  def get("http://404.site" <> _, _, _, _) do
 +    {:ok,
 +     %Tesla.Env{
 +       status: 404,
 +       body: ""
 +     }}
 +  end
 +
    def get(url, query, body, headers) do
      {:error,
       "Not implemented the mock response for get #{inspect(url)}, #{query}, #{inspect(body)}, #{

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/ostatus/ostatus_controller_test.exs
Simple merge