From cac9110533374d5d508b62ab5d35136e859b944c Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 5 Jun 2019 14:02:59 +0200 Subject: Cleanup various controllers (#10972) * Remove skip_session! as it is not supported in Rails 5 * Minor cleanup in StreamEntriesController * Remove redundant mark_cacheable! calls --- app/controllers/activitypub/collections_controller.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/controllers/activitypub/collections_controller.rb') diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb index 853f4f907..012c3c538 100644 --- a/app/controllers/activitypub/collections_controller.rb +++ b/app/controllers/activitypub/collections_controller.rb @@ -9,8 +9,6 @@ class ActivityPub::CollectionsController < Api::BaseController before_action :set_cache_headers def show - skip_session! - render_cached_json(['activitypub', 'collection', @account, params[:id]], content_type: 'application/activity+json') do ActiveModelSerializers::SerializableResource.new( collection_presenter, -- cgit