hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks

Browse source 
# Conflicts:
#	test/web/admin_api/admin_api_controller_test.exs
This commit is contained in:
Ivan Tashkinov 2020-02-18 17:52:31 +03:00
commit 226f4d5ef9
49 changed files with 371 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/mastodon_api/views/status_view_test.exs
View file

@ -491,7 +491,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
title: "Example website"
}
%{provider_name: "Example site name"} =
%{provider_name: "example.com"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end
@ -506,7 +506,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
description: "Example description"
}
%{provider_name: "Example site name"} =
%{provider_name: "example.com"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end
end