Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b064a412

Commit b064a412 authored 5 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release-v1.8.0' into develop

parents cff1cb86 7caaa29d

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/6563.bugfix 1 addition, 0 deletions

changelog.d/6563.bugfix
changelog.d/6657.bugfix 1 addition, 0 deletions

changelog.d/6657.bugfix
synapse/rest/key/v2/remote_key_resource.py 8 additions, 22 deletions

synapse/rest/key/v2/remote_key_resource.py
synapse/storage/data_stores/main/__init__.py 2 additions, 2 deletions

synapse/storage/data_stores/main/__init__.py
tests/rest/admin/test_admin.py 41 additions, 0 deletions

tests/rest/admin/test_admin.py
tests/rest/key/__init__.py 0 additions, 0 deletions

tests/rest/key/__init__.py
tests/rest/key/v2/__init__.py 0 additions, 0 deletions

tests/rest/key/v2/__init__.py
tests/rest/key/v2/test_remote_key_resource.py 131 additions, 4 deletions

tests/rest/key/v2/test_remote_key_resource.py

with 184 additions and 28 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