zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Replace bypass option with bypass_sign_in (#7867)

This commit is contained in:
Shuhei Kitagawa 2018-06-21 10:41:49 +09:00 committed by Yamagishi Kazutoshi
parent 459394a020
commit 7f59206944
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/auth/confirmations_controller.rb
View File

@ -10,7 +10,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
return unless request.patch? && params[:user] return unless request.patch? && params[:user]
if @user.update(user_params) if @user.update(user_params)
@user.skip_reconfirmation! @user.skip_reconfirmation!
sign_in(@user, bypass: true) bypass_sign_in(@user)
redirect_to root_path, notice: I18n.t('devise.confirmations.send_instructions') redirect_to root_path, notice: I18n.t('devise.confirmations.send_instructions')
else else
@show_errors = true @show_errors = true