diff options
| author | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
| commit | fee3abd1dce8f437e3514cb03816ae50862b3c4c (patch) | |
| tree | 72e19e9e748edce7024737cfb70f9088346058bd /app/controllers/emojis_controller.rb | |
| parent | 9148c3e8479e59df9f9a4889ef58a959f60f6606 (diff) | |
| parent | 08325db62bcc4d5d530513c615bc1c733f166239 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/emojis_controller.rb')
| -rw-r--r-- | app/controllers/emojis_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb index fe4c19cad..41f1e1c5c 100644 --- a/app/controllers/emojis_controller.rb +++ b/app/controllers/emojis_controller.rb @@ -8,7 +8,7 @@ class EmojisController < ApplicationController respond_to do |format| format.json do expires_in 3.minutes, public: true - render json: @emoji, content_type: 'application/activity+json', serializer: ActivityPub::EmojiSerializer, adapter: ActivityPub::Adapter + render_with_cache json: @emoji, content_type: 'application/activity+json', serializer: ActivityPub::EmojiSerializer, adapter: ActivityPub::Adapter end end end |