From 85c16334009a9974c310c6428eea097a31dfef89 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 4 Sep 2018 11:51:47 +0300 Subject: [PATCH] Fix a regression, where `user_session_timeout` setting in `application.yml` is not respected. Introduced in ebe831e78247bde3eb50347969b46622ee24db21 --- config/initializers/devise.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index c2f89e691..56791c45d 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -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.