diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-05 14:02:59 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-19 16:37:33 -0600 |
| commit | 176b48c6dc2e67b935996ef2ada1e71fb36f9f87 (patch) | |
| tree | 7b22cce24366be8f4faec9669e8d5987d4ed8408 /app/controllers/activitypub | |
| parent | 86d8fba8556804010745fe93ff57bc6e2657dafa (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/activitypub')
| -rw-r--r-- | app/controllers/activitypub/collections_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb index fb7976a39..e2274ee1a 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, diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index 1da8b5913..1fe043d5e 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -10,10 +10,7 @@ class ActivityPub::OutboxesController < Api::BaseController before_action :set_cache_headers def show - unless page_requested? - skip_session! - expires_in 1.minute, public: true - end + expires_in 1.minute, public: true unless page_requested? render json: outbox_presenter, serializer: ActivityPub::OutboxSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' end |