diff options
| author | Reverite <github@reverite.sh> | 2019-06-09 16:54:21 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-09 16:54:21 -0700 |
| commit | 3614718bc91f90a6dc19dd80ecf3bc191283c24e (patch) | |
| tree | ad35f4dbe92fdbc3f95881d6be3d4f9b29d4a704 /app/controllers/emojis_controller.rb | |
| parent | 846a09a7435fb9eb435e9950175ee0e696ed4909 (diff) | |
| parent | e16c8fbc7a2b5a866960a87bc8c950ad0d38f61b (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, 0 insertions, 2 deletions
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb index 5d306e600..3feb08132 100644 --- a/app/controllers/emojis_controller.rb +++ b/app/controllers/emojis_controller.rb @@ -7,8 +7,6 @@ class EmojisController < ApplicationController def show respond_to do |format| format.json do - skip_session! - render_cached_json(['activitypub', 'emoji', @emoji], content_type: 'application/activity+json') do ActiveModelSerializers::SerializableResource.new(@emoji, serializer: ActivityPub::EmojiSerializer, adapter: ActivityPub::Adapter) end |