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/follower_accounts_controller.rb | |
| parent | 846a09a7435fb9eb435e9950175ee0e696ed4909 (diff) | |
| parent | e16c8fbc7a2b5a866960a87bc8c950ad0d38f61b (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/follower_accounts_controller.rb')
| -rw-r--r-- | app/controllers/follower_accounts_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb index 1462b94fc..fab9c8462 100644 --- a/app/controllers/follower_accounts_controller.rb +++ b/app/controllers/follower_accounts_controller.rb @@ -20,10 +20,7 @@ class FollowerAccountsController < 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, |