Skip to content
Snippets Groups Projects
Commit 108be8a6 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Update to accomodate devise deprecations and backward incompatible changes.

parent 1e3fce1a
No related branches found
No related tags found
No related merge requests found
Loading
@@ -246,8 +246,8 @@ class ApplicationController < ActionController::Base
Loading
@@ -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)
Loading
Loading
Loading
@@ -6,4 +6,4 @@
Loading
@@ -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>
Loading
@@ -2,7 +2,7 @@
Loading
@@ -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>
Loading
@@ -4,4 +4,4 @@
Loading
@@ -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>
Loading
@@ -25,6 +25,9 @@ en:
Loading
@@ -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
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment