diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-07 22:15:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 22:15:44 +0200 |
| commit | 11c28abcfebcf8827f99a86540076347f1a1edff (patch) | |
| tree | b5d615001967cf102e88fac86b8ddb3227600109 /app/controllers/accounts_controller.rb | |
| parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
| parent | aec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff) | |
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/accounts_controller.rb')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index fcdebb47f..051b6ecbd 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -47,8 +47,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 |