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

2019-11-30 17:29:44 +01:00
parent 93b8aec7b7 b532ead798
commit 2b7158427f
22 changed files with 611 additions and 494 deletions
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true

 class StatusRelationshipsPresenter
-  attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map
+  attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map,
+              :bookmarks_map

  def initialize(statuses, current_account_id = nil, **options)
    if current_account_id.nil?