kotovalexarian-likes-github
/
heartcombo--devise
mirror of https://github.com/heartcombo/devise.git
1
0
Fork 0
Code Releases Activity

Update CHANGELOG, rename method.

This commit is contained in:
José Valim 2011-12-10 23:27:23 +01:00
parent 006400905b
commit cc839caba5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rdoc
View File

@ -2,6 +2,7 @@
* enhancements
* Add support for e-mail reconfirmation on change (by github.com/Mandaryn and github.com/heimidal)
* Redirect users to sign in page after unlock (by github.com/nashby)
* deprecation
* Devise.apply_schema is deprecated

4
lib/devise/models/recoverable.rb
View File

@ -40,7 +40,7 @@ module Devise
# Resets reset password token and send reset password instructions by email
def send_reset_password_instructions
generate_reset_password_token! if should_generate_token?
generate_reset_password_token! if should_generate_reset_token?
self.devise_mailer.reset_password_instructions(self).deliver
end
@ -70,7 +70,7 @@ module Devise
protected
def should_generate_token?
def should_generate_reset_token?
reset_password_token.nil? || !reset_password_period_valid?
end