diff options
author | ThibG <thib@sitedethib.com> | 2019-06-05 14:02:59 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-05 14:02:59 +0200 |
commit | cac9110533374d5d508b62ab5d35136e859b944c (patch) | |
tree | 2e4498816885fcfe1cf651d5459fef3d60fba40b /app/controllers/emojis_controller.rb | |
parent | 7fa23ec697e9e2c5f0434b9682de7017133df8dc (diff) |
Cleanup various controllers (#10972)
* Remove skip_session! as it is not supported in Rails 5 * Minor cleanup in StreamEntriesController * Remove redundant mark_cacheable! calls
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 |