Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

40e53968

Commit 40e53968 authored 8 years ago by Richard van der Hoff Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload

Make the device id on e2e key upload optional

parents c38b7c41 ccec25e2

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/device.py 4 additions, 0 deletions

synapse/handlers/device.py
synapse/rest/client/v2_alpha/keys.py 37 additions, 11 deletions

synapse/rest/client/v2_alpha/keys.py
synapse/storage/end_to_end_keys.py 15 additions, 0 deletions

synapse/storage/end_to_end_keys.py
synapse/storage/schema/delta/33/devices_for_e2e_keys.sql 19 additions, 0 deletions

synapse/storage/schema/delta/33/devices_for_e2e_keys.sql

with 75 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment