kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Merge pull request #2674 from jessy/master

Browse source 
Fix #2673 email templates generated with the good @token
This commit is contained in:
José Valim 2013-10-08 02:28:30 -07:00
commit e947a9cbec
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/generators/templates/markerb/confirmation_instructions.markerb
View file

@ -2,4 +2,4 @@ Welcome <%= @email %>!
You can confirm your account through the link below:
<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %>

2
lib/generators/templates/markerb/reset_password_instructions.markerb
View file

@ -2,7 +2,7 @@ Hello <%= @resource.email %>!
Someone has requested a link to change your password, and you can do this through the link below.
<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>
If you didn't request this, please ignore this email.
Your password won't change until you access the link above and create a new one.

2
lib/generators/templates/markerb/unlock_instructions.markerb
View file

@ -4,4 +4,4 @@ Your account has been locked due to an excessive number of unsuccessful sign in
Click the link below to unlock your account:
<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>
<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>