diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-23 17:21:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 17:21:55 +0200 |
| commit | 08325db62bcc4d5d530513c615bc1c733f166239 (patch) | |
| tree | 13cffcc0c8d6ed258928a89c1b328a055c54f2d3 /app/controllers/accounts_controller.rb | |
| parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
| parent | 48c68eafb73d2e697dab25ec55c235da4daf1cf8 (diff) | |
Merge pull request #1174 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, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index ff684e31e..1aed1af8d 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -42,7 +42,7 @@ class AccountsController < ApplicationController format.json do expires_in 3.minutes, public: !(authorized_fetch_mode? && signed_request_account.present?) - render json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, fields: restrict_fields_to + render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, fields: restrict_fields_to end end end |