Update to accomodate devise deprecations and backward incompatible changes.
This commit is contained in:
parent
1e3fce1a82
commit
108be8a666
|
@ -246,8 +246,8 @@ class ApplicationController < ActionController::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def configure_permitted_parameters
|
def configure_permitted_parameters
|
||||||
devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me) }
|
devise_parameter_sanitizer.sanitize(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me) }
|
||||||
devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:username, :email, :name, :password, :password_confirmation) }
|
devise_parameter_sanitizer.sanitize(:sign_up) { |u| u.permit(:username, :email, :name, :password, :password_confirmation) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def hexdigest(string)
|
def hexdigest(string)
|
||||||
|
|
|
@ -6,4 +6,4 @@
|
||||||
<p>You can confirm your account through the link below:</p>
|
<p>You can confirm your account through the link below:</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @resource.confirmation_token) %></p>
|
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
|
<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
|
||||||
|
|
||||||
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @resource.reset_password_token) %></p>
|
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
|
||||||
|
|
||||||
<p>If you didn't request this, please ignore this email.</p>
|
<p>If you didn't request this, please ignore this email.</p>
|
||||||
<p>Your password won't change until you access the link above and create a new one.</p>
|
<p>Your password won't change until you access the link above and create a new one.</p>
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
|
|
||||||
<p>Click the link below to unlock your account:</p>
|
<p>Click the link below to unlock your account:</p>
|
||||||
|
|
||||||
<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>
|
<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
|
||||||
|
|
|
@ -25,6 +25,9 @@ en:
|
||||||
sessions:
|
sessions:
|
||||||
signed_in: 'Signed in successfully.'
|
signed_in: 'Signed in successfully.'
|
||||||
signed_out: 'Signed out successfully.'
|
signed_out: 'Signed out successfully.'
|
||||||
|
users_sessions:
|
||||||
|
user:
|
||||||
|
signed_in: 'Signed in successfully.'
|
||||||
passwords:
|
passwords:
|
||||||
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
|
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
|
||||||
updated: 'Your password was changed successfully. You are now signed in.'
|
updated: 'Your password was changed successfully. You are now signed in.'
|
||||||
|
|
Loading…
Reference in New Issue