Merge branch 'master' into glitch-soc/merge-upstream

2019-02-28 21:35:53 +01:00
parent 76ed481aa7 ee7d79c0ce
commit 2267eee356
22 changed files with 417 additions and 21 deletions
--- a/app/presenters/activitypub/collection_presenter.rb
+++ b/app/presenters/activitypub/collection_presenter.rb
@ -1,5 +1,5 @@
 # frozen_string_literal: true

 class ActivityPub::CollectionPresenter < ActiveModelSerializers::Model
-  attributes :id, :type, :size, :items, :part_of, :first, :last, :next, :prev
+  attributes :id, :type, :size, :items, :page, :part_of, :first, :last, :next, :prev
 end