Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a6781450

Unverified Commit a6781450 authored 6 years ago by Richard van der Hoff Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'develop' into rav/logcontext_fixes

parents cf2d15c6 d436ad33

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3555.feature 1 addition, 0 deletions

changelog.d/3555.feature
changelog.d/3590.misc 1 addition, 0 deletions

changelog.d/3590.misc
docs/workers.rst 4 additions, 0 deletions

docs/workers.rst
synapse/api/auth.py 34 additions, 0 deletions

synapse/api/auth.py
synapse/app/client_reader.py 13 additions, 1 deletion

synapse/app/client_reader.py
synapse/handlers/__init__.py 0 additions, 4 deletions

synapse/handlers/__init__.py
synapse/handlers/message.py 12 additions, 259 deletions

synapse/handlers/message.py
synapse/handlers/pagination.py 265 additions, 0 deletions

synapse/handlers/pagination.py
synapse/handlers/room.py 5 additions, 1 deletion

synapse/handlers/room.py
synapse/rest/client/v1/admin.py 4 additions, 4 deletions

synapse/rest/client/v1/admin.py
synapse/rest/client/v1/room.py 11 additions, 13 deletions

synapse/rest/client/v1/room.py
synapse/server.py 15 additions, 2 deletions

synapse/server.py
synapse/storage/events.py 21 additions, 11 deletions

synapse/storage/events.py

with 386 additions and 295 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