Permalink
Browse files

Updated CHANGELOG.

  • Loading branch information...
josevalim committed Jan 7, 2010
1 parent 3916033 commit 99694fd1593b43017ee48317bb1a0bc51cfb7e59
Showing with 7 additions and 6 deletions.
  1. +2 −1 CHANGELOG.rdoc
  2. +4 −4 generators/devise_install/templates/devise.rb
  3. +1 −1 lib/devise/test_helpers.rb
View
@@ -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
@@ -21,10 +21,10 @@
# 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
@@ -7,7 +7,7 @@ def self.included(base)
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

0 comments on commit 99694fd

Please sign in to comment.