summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-03 22:28:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-03 22:29:18 +0000
commitfa206403d6b6a501488b70173ba873189776edc6 (patch)
tree747df0d0c32d9f0624b5a9c84dfbfc09265adc49 /config
parent5fc81825b645b13c3ecd49ec727bdf2162d15922 (diff)
downloadgitlab-ce-fa206403d6b6a501488b70173ba873189776edc6.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-9-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/initializers/warden.rb3
1 files changed, 1 insertions, 2 deletions
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!
##