diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-10-01 20:11:57 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-10-01 20:11:57 +0300 |
| commit | d5cc1255b64367c04f208150dbafa0be7b50dc45 (patch) | |
| tree | de52cd1ea513079768947ba3a96c5d10545b3006 /app/channels | |
| parent | c90be62bdefdb6bb67c73a9c4a6d164c9f78a28d (diff) | |
| parent | b08b36dccc3857641fe4e170b11c30cfb47c49e1 (diff) | |
Merge remote-tracking branch 'dev/13-4-stable' into 13-4-stable
Diffstat (limited to 'app/channels')
| -rw-r--r-- | app/channels/application_cable/connection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb index 1361269f2a2..b2d98d243f9 100644 --- a/app/channels/application_cable/connection.rb +++ b/app/channels/application_cable/connection.rb @@ -15,7 +15,7 @@ module ApplicationCable private def find_user_from_session_store - session = ActiveSession.sessions_from_ids([session_id]).first + session = ActiveSession.sessions_from_ids([session_id.private_id]).first Warden::SessionSerializer.new('rack.session' => session).fetch(:user) end |