diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
commit | 34b8346e7f1274d40734f9da3100a4343cf9f81c (patch) | |
tree | 1a851db65a949df937de0a3eb4fce1e9f83e5301 /app/controllers/concerns/account_controller_concern.rb | |
parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
parent | a60364ca7d26c82c9353980d0966d37e9aa66014 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
Diffstat (limited to 'app/controllers/concerns/account_controller_concern.rb')
-rw-r--r-- | app/controllers/concerns/account_controller_concern.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb index 4f28941ae..1c422096c 100644 --- a/app/controllers/concerns/account_controller_concern.rb +++ b/app/controllers/concerns/account_controller_concern.rb @@ -70,7 +70,6 @@ module AccountControllerConcern def check_account_suspension if @account.suspended? - skip_session! expires_in(3.minutes, public: true) gone end |