diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-07 22:15:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 22:15:44 +0200 |
| commit | 11c28abcfebcf8827f99a86540076347f1a1edff (patch) | |
| tree | b5d615001967cf102e88fac86b8ddb3227600109 /app/controllers/follower_accounts_controller.rb | |
| parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
| parent | aec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff) | |
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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, |