diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 078e16f7..c073dc79 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -2,9 +2,10 @@ * enhancements * Rememberable module allows user to be remembered across browsers and is enabled by default (by github.com/trevorturk) + * Rememberable module allows you to activate the period the remember me token is extended (by github.com/trevorturk) * devise_for can now be used together with scope method in routes but with a few limitations (check the documentation) - * Support :as or :devise_scope in the router to specify controller access scope - * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option. (by github.com/pellja) + * Support `as` or `devise_scope` in the router to specify controller access scope + * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option (by github.com/pellja) * bug fix * Fix a bug in Devise::TestHelpers where current_user was returning a Response object for non active accounts diff --git a/Gemfile.lock b/Gemfile.lock index d7120a2c..09dbae25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,13 +44,13 @@ PATH activerecord (= 3.0.0.beta4) activeresource (= 3.0.0.beta4) activesupport (= 3.0.0.beta4) - bundler (>= 1.0.0.beta.5) + bundler (>= 1.0.0.beta.10) railties (= 3.0.0.beta4) railties (3.0.0.beta4) actionpack (= 3.0.0.beta4) activesupport (= 3.0.0.beta4) rake (>= 0.8.3) - thor (~> 0.13.7) + thor (~> 0.14.0) GEM remote: http://rubygems.org/ @@ -90,7 +90,7 @@ GEM ruby-debug-base (0.10.3) linecache (>= 0.3) sqlite3-ruby (1.3.1) - thor (0.13.8) + thor (0.14.0) treetop (1.4.8) polyglot (>= 0.3.1) tzinfo (0.3.22)