Commit 0c8eb756ce48d2b014f9436d81c619be0999d96b

Authored by Brian van Burken
1 parent 1ddf7150
Exists in master and in 1 other branch production

Fixed incompatible password reset token changes in Devise >= 3.1

app/views/devise/mailer/reset_password_instructions.html.haml
... ... @@ -10,7 +10,7 @@
10 10 %p
11 11 We hear you'd like to change your password. You can do that by visiting the link below:
12 12 %p
13   - = edit_password_url @resource, :reset_password_token => @resource.reset_password_token
  13 + = edit_password_url @resource, :reset_password_token => @token
14 14 %tr
15 15 %td.content(valign="top")
16 16 %div
... ...
app/views/devise/mailer/reset_password_instructions.text.erb
... ... @@ -2,7 +2,7 @@ Hello,
2 2  
3 3 We hear you'd like to change your password. You can do that by visiting the link below:
4 4  
5   - <%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
  5 + <%= edit_password_url(@resource, :reset_password_token => @token) %>
6 6  
7 7 If you didn't request this, please ignore this email. Your password won't change unless you access the link above and create a new one.
8 8  
... ...