mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-04 23:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #397 from Skud/devisetoken

Browse Source 
Updated devise tokens in emails for devise 3.2
This commit is contained in:
Skud
2014-08-31 17:56:15 +10:00
parent ecbeb986c3 474b56cf6b
commit 07fcdf9bb7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/devise/mailer/confirmation_instructions.html.haml
View File

@@ -5,7 +5,7 @@
Your account on #{site_name} has been created. You just need to confirm
your email address through the link below:
%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token)
%p
Once you're confirmed, you can sign in with your login name

2
app/views/devise/mailer/reset_password_instructions.html.haml
View File

@@ -5,7 +5,7 @@
Someone has requested a link to reset your password on #{site_name}.
We presume this was you, in which case you can do so through this link:
%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token)
%p
If it wasn't you, then someone's made a typo or has been messing

2
app/views/devise/mailer/unlock_instructions.html.haml
View File

@@ -8,7 +8,7 @@
forgotten your password. In either case, use the link below to unlock
your account:
%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token)
%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token)
%p
If you have actually forgotten your password, you can