From cd5b3f1cc443b7c46ddd7ea43ce0a14889cd128b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 10 Dec 2022 00:09:22 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/omniauth_callbacks_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers/omniauth_callbacks_controller.rb') diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 0d6f289f5f5..8650b6cbc6f 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -119,6 +119,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController identity_linker ||= auth_module::IdentityLinker.new(current_user, oauth, session) link_identity(identity_linker) + set_remember_me(current_user) if identity_linker.changed? redirect_identity_linked -- cgit v1.2.3