Merge tag 'v2.9.2' into instance_only_statuses

2019-06-25 19:44:59 +02:00
parent 1e5b17b88a 66ac1bd063
commit f0a512c7ca
534 changed files with 12629 additions and 7877 deletions
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -46,8 +46,6 @@ class AccountsController < ApplicationController
      end

      format.json do
-        mark_cacheable!
-
        render_cached_json(['activitypub', 'actor', @account], content_type: 'application/activity+json') do
          ActiveModelSerializers::SerializableResource.new(@account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter)
        end