From: lain <lain@soykaf.club>
Date: Fri, 20 Mar 2020 16:57:51 +0000 (+0000)
Subject: Merge branch 'fix-feed-pagination' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d74405fc1a27bb3d13f4ead2bc2369f23827a781;p=akkoma

Merge branch 'fix-feed-pagination' into 'develop'

Fix for feed page pagination

Closes #1605

See merge request pleroma/pleroma!2281
---

d74405fc1a27bb3d13f4ead2bc2369f23827a781
diff --cc test/web/feed/tag_controller_test.exs
index 1ec39ec5d,da1caf049..e863df86b
--- a/test/web/feed/tag_controller_test.exs
+++ b/test/web/feed/tag_controller_test.exs
@@@ -8,9 -8,11 +8,11 @@@ defmodule Pleroma.Web.Feed.TagControlle
    import Pleroma.Factory
    import SweetXml
  
+   alias Pleroma.Object
+   alias Pleroma.Web.CommonAPI
    alias Pleroma.Web.Feed.FeedView
  
 -  clear_config([:feed])
 +  setup do: clear_config([:feed])
  
    test "gets a feed (ATOM)", %{conn: conn} do
      Pleroma.Config.put(