about summary refs log tree commit diff
path: root/app/controllers/following_accounts_controller.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-05 14:02:59 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-06-05 14:02:59 +0200
commitcac9110533374d5d508b62ab5d35136e859b944c (patch)
tree2e4498816885fcfe1cf651d5459fef3d60fba40b /app/controllers/following_accounts_controller.rb
parent7fa23ec697e9e2c5f0434b9682de7017133df8dc (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/following_accounts_controller.rb')
-rw-r--r--app/controllers/following_accounts_controller.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 1bfd901cf..948725664 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -19,10 +19,7 @@ class FollowingAccountsController < ApplicationController
       format.json do
         raise Mastodon::NotPermittedError if params[:page].present? && @account.user_hides_network?
 
-        if params[:page].blank?
-          skip_session!
-          expires_in 3.minutes, public: true
-        end
+        expires_in 3.minutes, public: true if params[:page].blank?
 
         render json: collection_presenter,
                serializer: ActivityPub::CollectionSerializer,