diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 21:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-04 21:07:31 +0000 |
| commit | 71221554dd9ddf30f73035c89f78164e001aa96d (patch) | |
| tree | c56e0b2fc3dd16602183b78cb3f68aed211c5e77 /app/models/active_session.rb | |
| parent | b41cd8cb92d53454b2b160ba922d33801933a9cf (diff) | |
| download | gitlab-ce-71221554dd9ddf30f73035c89f78164e001aa96d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/active_session.rb')
| -rw-r--r-- | app/models/active_session.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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) |