From fa206403d6b6a501488b70173ba873189776edc6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 3 Mar 2021 22:28:55 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-9-stable-ee --- config/initializers/warden.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb index 2517c0cf5c2..88f2a13df60 100644 --- a/config/initializers/warden.rb +++ b/config/initializers/warden.rb @@ -42,8 +42,7 @@ Rails.application.configure do |config| activity = Gitlab::Auth::Activity.new(opts) tracker = Gitlab::Auth::BlockedUserTracker.new(user, auth) - # TODO: switch to `auth.request.session.id.private_id` in 13.7 - ActiveSession.destroy_with_rack_session_id(user, auth.request.session.id) + ActiveSession.destroy_session(user, auth.request.session.id.private_id) if auth.request.session.id activity.user_session_destroyed! ## -- cgit v1.2.3