diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 21:06:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 21:06:51 +0000 |
| commit | a19a376bf35b2009566e86b8190662c21ed7e2ba (patch) | |
| tree | 46d3ea7f44a0a732b96fcbae0cf09d3cfd8ec9dc /app/models/active_session.rb | |
| parent | 556c79d6cc3d7b24ecbba3a79f8432eb3fcf5c7e (diff) | |
| download | gitlab-ce-a19a376bf35b2009566e86b8190662c21ed7e2ba.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/active_session.rb b/app/models/active_session.rb index 08352caca07..a6d5fc1137d 100644 --- a/app/models/active_session.rb +++ b/app/models/active_session.rb @@ -133,7 +133,7 @@ class ActiveSession entry_keys = raw_active_session_entries(redis, session_ids, user_id) - entry_keys.map do |raw_session| + entry_keys.compact.map do |raw_session| Marshal.load(raw_session) # rubocop:disable Security/MarshalLoad end end |