Merge pull request #966 from internetee/restore-configurable-session-timeout

Fix a regression, where `user_session_timeout` setting in `application.yml` is not respected.
This commit is contained in:
Timo Võhmar 2018-09-19 15:09:13 +03:00 committed by GitHub
commit 8229f17e40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -173,7 +173,7 @@ Devise.setup do |config|
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again. Default is 30 minutes.
# config.timeout_in = 30.minutes
config.timeout_in = ENV['user_session_timeout'].to_i.seconds if ENV['user_session_timeout']
# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.