Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

95481e7b

Commit 95481e7b authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

Merge pull request #571 from matrix-org/daniel/asids

Mark AS users with their AS's ID

parents b139e510 76336059

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

scripts/synapse_port_db 7 additions, 2 deletions

scripts/synapse_port_db
synapse/app/homeserver.py 1 addition, 1 deletion

synapse/app/homeserver.py
synapse/storage/appservice.py 21 additions, 13 deletions

synapse/storage/appservice.py
synapse/storage/engines/__init__.py 3 additions, 2 deletions

synapse/storage/engines/__init__.py
synapse/storage/engines/postgres.py 3 additions, 2 deletions

synapse/storage/engines/postgres.py
synapse/storage/engines/sqlite3.py 3 additions, 2 deletions

synapse/storage/engines/sqlite3.py
synapse/storage/prepare_database.py 7 additions, 6 deletions

synapse/storage/prepare_database.py
synapse/storage/schema/delta/30/as_users.py 59 additions, 0 deletions

synapse/storage/schema/delta/30/as_users.py
tests/storage/test_base.py 2 additions, 1 deletion

tests/storage/test_base.py
tests/utils.py 14 additions, 6 deletions

tests/utils.py

with 120 additions and 35 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