Merge remote-tracking branch 'upstream/pull/3225'
This commit is contained in:
commit
086f31f291
1 changed files with 1 additions and 1 deletions
|
@ -66,7 +66,7 @@ class ConfirmationsController < ApplicationController
|
||||||
flash[:error] = t "confirmations.confirm_resend.failure", :name => params[:display_name]
|
flash[:error] = t "confirmations.confirm_resend.failure", :name => params[:display_name]
|
||||||
else
|
else
|
||||||
UserMailer.signup_confirm(user, user.tokens.create).deliver_later
|
UserMailer.signup_confirm(user, user.tokens.create).deliver_later
|
||||||
flash[:notice] = t "confirmations.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email
|
flash[:notice] = t "confirmations.confirm_resend.success_html", :email => user.email, :sender => Settings.email_from
|
||||||
end
|
end
|
||||||
|
|
||||||
redirect_to login_path
|
redirect_to login_path
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue