diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-10 03:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-10 03:09:22 +0300 |
| commit | cd5b3f1cc443b7c46ddd7ea43ce0a14889cd128b (patch) | |
| tree | 915594db59f3cfc52470cc1cbe8e979324db88e7 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 94a2edbe7984384df4c3fb7efa308af2e0f42d8c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |