diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
| commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
| tree | 766214b52ed217903ae821285391f8e2d4b5f545 /app/controllers/auth/confirmations_controller.rb | |
| parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
| parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'app/controllers/auth/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/auth/confirmations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index f3e0ae257..322f8683e 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -17,7 +17,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController return unless request.patch? && params[:user] if @user.update(user_params) @user.skip_reconfirmation! - sign_in(@user, bypass: true) + bypass_sign_in(@user) redirect_to root_path, notice: I18n.t('devise.confirmations.send_instructions') else @show_errors = true |