From ba2e44c6a4ede1df1dc020618d640e0ddf809ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 16 Jun 2012 15:50:13 +0200 Subject: [PATCH] Release 2.1.1 --- CHANGELOG.rdoc | 7 +++++-- lib/devise/version.rb | 2 +- lib/generators/templates/devise.rb | 5 ++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 36e37ecb..e3de1949 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,4 +1,9 @@ +== 2.1.1 + +Notes: https://github.com/plataformatec/devise/wiki/How-to:-upgrade-to-devise-2.1 + * enhancements + * `sign_out_all_scopes` now locks warden and does not allow new logins in the same action * `Devise.omniauth_path_prefix` is available to configure omniauth path prefix * Redirect to sign in page when trying to access password#edit without a token (by @gbataille) * Allow a lambda in authenticate(d) routes helpers to further select the scope @@ -14,8 +19,6 @@ == 2.1.0 -Notes: https://github.com/plataformatec/devise/wiki/How-to:-upgrade-to-devise-2.1 - * enhancements * Add `check_fields!(model_class)` method on Devise::Models to check if the model includes the fields that Devise uses * Add `skip_reconfirmation!` to skip reconfirmation diff --git a/lib/devise/version.rb b/lib/devise/version.rb index ad9b1a7f..e321eeb8 100644 --- a/lib/devise/version.rb +++ b/lib/devise/version.rb @@ -1,3 +1,3 @@ module Devise - VERSION = "2.1.0".freeze + VERSION = "2.1.1".freeze end diff --git a/lib/generators/templates/devise.rb b/lib/generators/templates/devise.rb index 258d0434..751a4568 100644 --- a/lib/generators/templates/devise.rb +++ b/lib/generators/templates/devise.rb @@ -184,9 +184,8 @@ Devise.setup do |config| # devise role declared in your routes (usually :user). # config.default_scope = :user - # Configure sign_out behavior. - # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope). - # The default is true, which means any logout action will sign out all active scopes. + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. # config.sign_out_all_scopes = true # ==> Navigation configuration