From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 2 Mar 2021 05:26:30 +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=882dd4684381a06395abd262363858011f06327d;p=akkoma

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

882dd4684381a06395abd262363858011f06327d
diff --cc CHANGELOG.md
index 974925e4f,812816f48..35f68d2fe
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -37,9 -37,9 +37,10 @@@ The format is based on [Keep a Changelo
  - **Breaking:** AdminAPI `GET /api/pleroma/admin/instances/:instance/statuses` changed response format and added the number of total users posts.
  - Admin API: Reports now ordered by newest
  - Pleroma API: `GET /api/v1/pleroma/chats` is deprecated in favor of `GET /api/v2/pleroma/chats`.
+ - Pleroma API: Reroute `/api/pleroma/*` to `/api/v1/pleroma/*`
  
  </details>
 +- Improved hashtag timeline performance (requires a background migration). 
  
  ### Added
  
diff --cc test/pleroma/web/mastodon_api/views/status_view_test.exs
index 48f5f0dd0,2de3afc4f..4172cc294
--- a/test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@@ -262,14 -262,11 +262,11 @@@ 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: "http://localhost:4001/tag/#{hd(object_data["tag"])}"
          }
        ],
-       application: %{
-         name: "Web",
-         website: nil
-       },
+       application: nil,
        language: nil,
        emojis: [
          %{