From ae00e0bb208085f4d0ef5a4215fe601b7589968b Mon Sep 17 00:00:00 2001 From: Rodrigo Rosenfeld Rosas Date: Fri, 21 Nov 2014 17:33:58 -0200 Subject: [PATCH] Remove old references to removed remember_across_browsers option --- lib/devise/models/rememberable.rb | 2 +- test/rails_app/config/initializers/devise.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/devise/models/rememberable.rb b/lib/devise/models/rememberable.rb index 2f75290b..e016fd78 100644 --- a/lib/devise/models/rememberable.rb +++ b/lib/devise/models/rememberable.rb @@ -46,7 +46,7 @@ module Devise end # Generate a new remember token and save the record without validations - # unless remember_across_browsers is true and the user already has a valid token. + # if remember expired (token is no longer valid) or extend_remember_period is true def remember_me!(extend_period=false) self.remember_token = self.class.remember_token if generate_remember_token? self.remember_created_at = Time.now.utc if generate_remember_timestamp?(extend_period) diff --git a/test/rails_app/config/initializers/devise.rb b/test/rails_app/config/initializers/devise.rb index 9be1e9a1..ef9a556b 100644 --- a/test/rails_app/config/initializers/devise.rb +++ b/test/rails_app/config/initializers/devise.rb @@ -83,9 +83,6 @@ Devise.setup do |config| # The time the user will be remembered without asking for credentials again. # config.remember_for = 2.weeks - # If true, a valid remember token can be re-used between multiple browsers. - # config.remember_across_browsers = true - # If true, extends the user's remember period when remembered via cookie. # config.extend_remember_period = false