From 71221554dd9ddf30f73035c89f78164e001aa96d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 4 Dec 2019 21:07:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/active_session.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/models/active_session.rb') diff --git a/app/models/active_session.rb b/app/models/active_session.rb index a6d5fc1137d..3ecc3137157 100644 --- a/app/models/active_session.rb +++ b/app/models/active_session.rb @@ -146,8 +146,9 @@ class ActiveSession # remove sessions if there are more than ALLOWED_NUMBER_OF_ACTIVE_SESSIONS. sessions = active_session_entries(session_ids, user.id, redis) sessions.sort_by! {|session| session.updated_at }.reverse! - sessions = sessions[ALLOWED_NUMBER_OF_ACTIVE_SESSIONS..-1].map { |session| session.session_id } - destroy_sessions(redis, user, sessions) + sessions = sessions.drop(ALLOWED_NUMBER_OF_ACTIVE_SESSIONS) + sessions = sessions.map { |session| session.session_id } + destroy_sessions(redis, user, sessions) if sessions.any? end def self.cleaned_up_lookup_entries(redis, user) -- cgit v1.2.1