From 99694fd1593b43017ee48317bb1a0bc51cfb7e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 7 Jan 2010 22:37:47 +0100 Subject: [PATCH] Updated CHANGELOG. --- CHANGELOG.rdoc | 3 ++- generators/devise_install/templates/devise.rb | 8 ++++---- lib/devise/test_helpers.rb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index dffa838c..18f1828d 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,6 +1,7 @@ * enhancements * Warden 0.8.0 compatibility - * Add an easy for map.connect 'sign_in', :controller => "sessions", :action => "new" to work + * Add an easy for map.connect "sign_in", :controller => "sessions", :action => "new" to work + * Added :bcrypt encryptor (by github.com/capotej) * deprecation * Removed DeviseMailer.sender diff --git a/generators/devise_install/templates/devise.rb b/generators/devise_install/templates/devise.rb index dfc8eb88..bf295eb4 100644 --- a/generators/devise_install/templates/devise.rb +++ b/generators/devise_install/templates/devise.rb @@ -21,10 +21,10 @@ Devise.setup do |config| # config.stretches = 10 # Define which will be the encryption algorithm. Supported algorithms are :sha1 - # (default) and :sha512. Devise also supports encryptors from others authentication - # frameworks as :clearance_sha1, :authlogic_sha512 (then you should set stretches - # above to 20 for default behavior) and :restful_authentication_sha1 (then you - # should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper) + # (default), :sha512 and :bcrypt. Devise also supports encryptors from others + # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set + # stretches above to 20 for default behavior) and :restful_authentication_sha1 + # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper) # config.encryptor = :sha1 # Configure which keys are used when authenticating an user. By default is diff --git a/lib/devise/test_helpers.rb b/lib/devise/test_helpers.rb index 208c875b..6a639e7d 100644 --- a/lib/devise/test_helpers.rb +++ b/lib/devise/test_helpers.rb @@ -7,7 +7,7 @@ module Devise end # This is a Warden::Proxy customized for functional tests. It's meant to - # some of Warden::Manager resposnabilities, as retrieving configuration + # some of Warden::Manager responsibilities, as retrieving configuration # options and calling the FailureApp. class TestWarden < Warden::Proxy #:nodoc: attr_reader :controller