From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Fri, 22 Jan 2021 07:05:28 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=218c51960606454577a12fb6e417d66ab46f3965;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
#	test/pleroma/web/mastodon_api/views/status_view_test.exs
---

218c51960606454577a12fb6e417d66ab46f3965
diff --cc test/pleroma/web/mastodon_api/views/status_view_test.exs
index eb84cc173,ed59cf285..48f5f0dd0
--- a/test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@@ -262,8 -262,8 +262,8 @@@ defmodule Pleroma.Web.MastodonAPI.Statu
        mentions: [],
        tags: [
          %{
 -          name: "#{object_data["tag"]}",
 -          url: "http://localhost:4001/tag/#{object_data["tag"]}"
 +          name: "#{hd(object_data["tag"])}",
-           url: "/tag/#{hd(object_data["tag"])}"
++          url: "http://localhost:4001/tag/#{hd(object_data["tag"])}"
          }
        ],
        application: %{