| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | | | | | | | | | | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 2 | -54/+1 |
| | * | | | | | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 9 | -64/+63 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | * | | | | | | | | | | | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 |
| | | * | | | | | | | | | | | Use a producer to stream back responses | Richard van der Hoff | 2018-08-15 | 1 | -4/+13 |
| | * | | | | | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producers | Richard van der Hoff | 2018-08-17 | 3 | -92/+180 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | Refactor request logging code | Richard van der Hoff | 2018-08-15 | 2 | -92/+179 |
| | | | | | | | | | | | | * | | Update notice format | Erik Johnston | 2018-08-22 | 3 | -8/+24 |
| | | | | | | | | | | | | * | | rename error code | Neil Johnson | 2018-08-18 | 4 | -8/+8 |
| | | | | | | | | | | | | * | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 |
| | | | | | | | | | | | | * | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 2 | -1/+9 |
| | | | | | | | | | | | | * | | clean up, no functional changes | Neil Johnson | 2018-08-17 | 3 | -56/+64 |
| | | | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 9 | -24/+75 |
| | | | | | | | | | | | | |\ \
| | |_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge pull request #3707 from matrix-org/neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 9 | -24/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse in... | Neil Johnson | 2018-08-17 | 12 | -4/+36 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 11 | -4/+35 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | server limits config docs | Neil Johnson | 2018-08-17 | 1 | -0/+26 |
| | | |/ / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 8 | -24/+47 |
| | | | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 11 | -4/+34 |
| | | | | | | | | | | | | |\ \
| | |_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... | Neil Johnson | 2018-08-17 | 7 | -3/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | remove errant yield | Neil Johnson | 2018-08-17 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | For resource limit blocked users, prevent writing into rooms | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 4 | -2/+19 |
| | | * | | | | | | | | | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| | | | |_|_|/ / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge pull request #3712 from matrix-org/travis/register-admin-docs | Amber Brown | 2018-08-17 | 2 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Create 3712.misc | Travis Ralston | 2018-08-17 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | Update the admin register documentation to return a real user ID | Travis Ralston | 2018-08-17 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker | Erik Johnston | 2018-08-16 | 2 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / /
| |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-16 | 1 | -0/+1 |
| | | * | | | | | | | | | | | Fix inbound federation on reader worker | Erik Johnston | 2018-08-16 | 1 | -0/+2 |
| | |/ / / / / / / / / / / |
|
| | | | | | | | | | | * | | flake8 | Neil Johnson | 2018-08-16 | 1 | -3/+2 |
| | | | | | | | | | | * | | refactor for readability, and reuse caching for setting tags | Neil Johnson | 2018-08-16 | 3 | -68/+115 |
| | | | | | | | | | | * | | add room tagging | Neil Johnson | 2018-08-16 | 1 | -9/+5 |
| | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-16 | 6 | -3/+98 |
| | | | | | | | | | | |\ \
| | |_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 3 | -1/+51 |
| | * | | | | | | | | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 3 | -2/+47 |
| | | | | | | | | | | * | | check for room state before deciding on action | Neil Johnson | 2018-08-16 | 3 | -87/+58 |
| | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-16 | 7 | -28/+169 |
| | | | | | | | | | | |\ \
| | |_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 6 | -18/+159 |
| | * | | | | | | | | | | | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs | Richard van der Hoff | 2018-08-15 | 1 | -10/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | Changelog should link to PRs | Richard van der Hoff | 2018-08-13 | 1 | -10/+10 |
| | | | | | | | | | | | * | | WIP impl commiting to get feedback | Neil Johnson | 2018-08-16 | 1 | -6/+74 |
| | | | | | | | | | | | * | | fix case where empty string state check is evaulated as False | Neil Johnson | 2018-08-16 | 1 | -1/+2 |
| | | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 10 | -23/+231 |
| | | | | | | | | | | | |\ \
| | |_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 4 | -4/+59 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Fix mau blocking calulation bug on login | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-15 | 31 | -186/+615 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-14 | 5 | -4/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | fix off by 1 errors | Neil Johnson | 2018-08-14 | 2 | -3/+14 |
| | | * | | | | | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-14 | 2 | -5/+4 |
| | | * | | | | | | | | | | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 3 | -7/+50 |
| | | * | | | | | | | | | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 8 | -22/+46 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... | Neil Johnson | 2018-08-14 | 7 | -20/+111 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Remove incorrectly re-added changelog files | Richard van der Hoff | 2018-08-15 | 2 | -2/+0 |
| | * | | | | | | | | | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 8 | -19/+174 |
| | | |_|_|_|_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 163 | -2853/+2949 |
| | | | | | | | | | | | | | | | |\ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 16 | -138/+512 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-15 | 217 | -2760/+2605 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 2 | -48/+10 |
| | | * | | | | | | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStore | Erik Johnston | 2018-08-15 | 6 | -11/+11 |
| | | * | | | | | | | | | | | | | | | | Update docs/workers.rst | Erik Johnston | 2018-08-09 | 1 | -0/+13 |
| | | * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 2 | -2/+49 |
| | | * | | | | | | | | | | | | | | | | Fixup doc comments | Erik Johnston | 2018-08-09 | 2 | -0/+28 |
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-09 | 67 | -408/+1156 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|/ / / / /
| | | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 2 | -1/+2 |
| | | * | | | | | | | | | | | | | | | | Move necessary storage functions to worker classes | Erik Johnston | 2018-08-06 | 3 | -98/+100 |
| | | * | | | | | | | | | | | | | | | | Import all functions from TransactionStore | Erik Johnston | 2018-08-06 | 1 | -11/+2 |
| | | * | | | | | | | | | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 4 | -13/+62 |
| | | * | | | | | | | | | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 4 | -10/+290 |
| | | | |_|_|_|_|_|_|_|_|_|/ / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 9 | -30/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 |
| | | * | | | | | | | | | | | | | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| | | * | | | | | | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap... | Neil Johnson | 2018-08-15 | 4 | -6/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | | | * | | | | | | | | | | | | | | | update resource limit error codes | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 2 | -4/+3 |
| | | * | | | | | | | | | | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 2 | -2/+2 |
| | | |/ / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 5 | -11/+11 |
| | | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 18 | -76/+373 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | | |_|_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | | |_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 7 | -22/+45 |
| | | | |_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 2 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro... | Neil Johnson | 2018-08-14 | 8 | -22/+115 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / /
| | | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Rename MAU prometheus metric | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 |
| | | | |_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 6 | -20/+79 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | | * | | | | | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 6 | -20/+77 |
| | * | | | | | | | | | | | | | Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... | Neil Johnson | 2018-08-14 | 4 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved... | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | adding missing yield | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 7 | -20/+112 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| | | | |_|_|_|/ / / / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 4 | -0/+53 |
| | * | | | | | | | | | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres | Amber Brown | 2018-08-14 | 2 | -16/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po... | Amber Brown | 2018-08-14 | 56 | -292/+404 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 3 | -37/+174 |
| | * | | | | | | | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base | Jan Christian Grünhage | 2018-08-14 | 2 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|/ / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 2 | -1/+2 |
| | | | |_|_|_|_|_|/ / / / /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | | Name changelog after PR, not bug | Richard van der Hoff | 2018-08-13 | 1 | -0/+0 |
| | * | | | | | | | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 3 | -196/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 3 | -196/+2 |
| | | | |_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 7 | -45/+22 |
| | * | | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 7 | -22/+45 |
| | * | | | | | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 49 | -59/+227 |
| | | | | * | | | | | | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 1 | -0/+1 |
| | | | | * | | | | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 |
| | | |_|/ / / / / / / /
| |/| | | | | | | | | |
|
| | * | | | | | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests | Amber Brown | 2018-08-11 | 76 | -2280/+1631 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 |
| | | * | | | | | | | | | | changelog | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| | | * | | | | | | | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 |
| | * | | | | | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 2 | -43/+69 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| | | * | | | | | | | | | | | Fix linearizer cancellation on twisted < 18.7 | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 |
| | | | |/ / / / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 |
| | | |/ / / / / / / / /
| |/| | | | | | | | | |
|
| | * | | | | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 33 | -34/+35 |
| | * | | | | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 15 | -16/+113 |
| | |\ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / /
| |/| | | | | | | | | |
|
| | | * | | | | | | | | | more generic conversion of str/bytes to unicode | Jeroen | 2018-08-09 | 1 | -1/+1 |
| | | * | | | | | | | | | include private functions from twisted | Jeroen | 2018-08-09 | 1 | -2/+35 |
| | | * | | | | | | | | | updated docstring for ServerContextFactory | Jeroen | 2018-08-08 | 1 | -1/+1 |
| | | * | | | | | | | | | fix isort | Jeroen | 2018-07-29 | 1 | -2/+3 |
| | | * | | | | | | | | | fix accidental removal of hs | Jeroen | 2018-07-27 | 1 | -1/+1 |
| | | * | | | | | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 156 | -5187/+7015 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... | Jeroen | 2018-07-14 | 347 | -1985/+2111 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 88 | -205/+1673 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 |
| | | * | | | | | | | | | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 |
| | | * | | | | | | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 15 | -13/+71 |
| | | | | | | | | | | | | * | | wip cut at sending resource server notices | Neil Johnson | 2018-08-15 | 2 | -44/+55 |
| | | | | | | | | | | | | * | | add new event types | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | | | * | | backout ability to pass in event type to server notices | Neil Johnson | 2018-08-14 | 3 | -4/+5 |
| | | | | | | | | | | | | * | | support server notice state events for resource limits | Neil Johnson | 2018-08-14 | 4 | -8/+22 |
| | | | | | | | | | | | | * | | fix typo | Neil Johnson | 2018-08-13 | 1 | -1/+1 |
| | | | | | | | | | | | | * | | server notices for resource limit blocking | Neil Johnson | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | | | | * | | implementation of server notices to alert on hitting resource limits | Neil Johnson | 2018-08-10 | 3 | -45/+190 |
| | | | | | | | | | | | | * | | wip at implementing MSC 7075 | Neil Johnson | 2018-08-09 | 1 | -0/+84 |
| | | | | | | | | |_|_|_|/ /
| | | | | | | |/| | | | | |
|
| | | | | | | | * | | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 4 | -18/+19 |
| | | | | | | | * | | | | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | * | | | | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | * | | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 3 | -12/+48 |
| | | | | | | | * | | | | | | Where server is disabled, block ability for locked out users to read new mess... | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | * | | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 2 | -13/+18 |
| | | | | | | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 6 | -1/+22 |
| | | | | | | | |\ \ \ \ \ \
| | |_|_|_|_|_|/ / / / / /
| |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 6 | -1/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| | | * | | | | | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 14 | -22/+245 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 6 | -7/+115 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Ability to disable client/server Synapse via conf toggle | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 16 | -157/+226 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 5 | -1/+21 |
| | | | | | | | | | | | | | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 98 | -405/+819 |
| | | | | | | | | | | | | | | |\ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 61 | -56/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | / / /
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 6 | -274/+396 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 2 | -2/+2 |
| | | * | | | | | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 |
| | | * | | | | | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 |
| | | * | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 67 | -647/+1073 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-31 | 1 | -0/+0 |
| | | * | | | | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 |
| | | * | | | | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 |
| | | * | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 |
| | * | | | | | | | | | | | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 14 | -52/+71 |
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 4 | -1/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 |
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 14 | -22/+244 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 |
| | | * | | | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 |
| | | * | | | | | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 |
| | | * | | | | | | | | | | | | | | | | | | sanity check response from make_join | Richard van der Hoff | 2018-08-03 | 1 | -1/+3 |
| | | * | | | | | | | | | | | | | | | | | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 3 | -4/+63 |
| | | * | | | | | | | | | | | | | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 7 | -5/+83 |
| | | * | | | | | | | | | | | | | | | | | | Docstrings for BaseFederationServlet | Richard van der Hoff | 2018-08-03 | 1 | -0/+47 |
| | | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | * | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 2 | -5/+53 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge pull request #3662 from matrix-org/neilj/reserved_users | Neil Johnson | 2018-08-08 | 6 | -7/+115 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/ / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... | Neil Johnson | 2018-08-08 | 16 | -156/+225 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 18 | -163/+414 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | typos | Neil Johnson | 2018-08-08 | 2 | -3/+3 |
| | | | |_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_met... | Richard van der Hoff | 2018-08-07 | 2 | -3/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metric | Richard van der Hoff | 2018-08-07 | 1 | -3/+8 |
| | | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * / | | | | | | | | | | | | | | | fix event lag graph | Richard van der Hoff | 2018-08-07 | 1 | -8/+16 |
| | |/ / / / / / / / / / / / / / / |
|
| | | | * | | | | | | | | | | | | | Ability to whitelist specific threepids against monthly active user limiting | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | | | mock config.max_mau_value | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | | | prevent total number of reserved users being too large | Neil Johnson | 2018-08-07 | 1 | -1/+3 |
| | | | * | | | | | | | | | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 4 | -13/+99 |
| | | | * | | | | | | | | | | | | | WIP building out mau reserved users | Neil Johnson | 2018-08-06 | 1 | -1/+15 |
| | | | * | | | | | | | | | | | | | add default mau_limits_reserved_threepids | Neil Johnson | 2018-08-06 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | | | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 |
| | | |/ / / / / / / / / / / / / |
|
| | | * | | | | | / / / / / / / | Fix postgres compatibility bug | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| | | | |_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| | | | |_|_|_|/ / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | make use of _simple_select_one_onecol, improved comments | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| | | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | * | | | | | | | | | | remove unused import | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | * | | | | | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 5 | -27/+10 |
| | | * | | | | | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 5 | -53/+66 |
| | | * | | | | | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 3 | -3/+3 |
| | | * | | | | | | | | | | fix py3 test failure | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | | * | | | | | | | | | | Add ability to limit number of monthly active users on the server | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | | * | | | | | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 3 | -62/+80 |
| | | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 25 | -379/+450 |
| | | |\| | | | | | | | | |
|
| | | * | | | | | | | | | | update generate_monthly_active_users, and reap_monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -2/+2 |
| | | * | | | | | | | | | | typo | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | * | | | | | | | | | | wip attempt at caching | Neil Johnson | 2018-08-02 | 1 | -9/+47 |
| | | * | | | | | | | | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 7 | -61/+97 |
| | | * | | | | | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 2 | -90/+0 |
| | | * | | | | | | | | | | fix test, update constructor call | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | * | | | | | | | | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 5 | -11/+99 |
| | | * | | | | | | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-02 | 2 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | self.db_conn unused | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | * | | | | | | | | | | normalise reaping query | Neil Johnson | 2018-08-01 | 1 | -3/+38 |
| | | * | | | | | | | | | | | Revert "change monthly_active_users table to be a single column" | Neil Johnson | 2018-08-02 | 3 | -7/+13 |
| | | |/ / / / / / / / / / |
|
| | | * | | | | | | | | | | change monthly_active_users table to be a single column | Neil Johnson | 2018-08-01 | 3 | -13/+7 |
| | | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 48 | -279/+625 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | clean up | Neil Johnson | 2018-08-01 | 1 | -15/+3 |
| | | * | | | | | | | | | | | fix comment | Neil Johnson | 2018-08-01 | 1 | -1/+1 |
| | | * | | | | | | | | | | | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 6 | -2/+160 |
| * | | | | | | | | | | | | | allow session_data to be any JSON instead of just a string | Hubert Chathi | 2018-08-21 | 1 | -2/+4 |
| * | | | | | | | | | | | | | allow auth_data to be any JSON instead of a string | Hubert Chathi | 2018-08-21 | 1 | -2/+5 |
| * | | | | | | | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -0/+1 |
| * | | | | | | | | | | | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| * | | | | | | | | | | | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 2 | -16/+57 |
| * | | | | | | | | | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| * | | | | | | | | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 2 | -9/+14 |
| * | | | | | | | | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 4 | -33/+287 |
| * | | | | | | | | | | | | | linting | Matthew Hodgson | 2018-08-12 | 1 | -25/+23 |
| * | | | | | | | | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 3 | -11/+15 |
| * | | | | | | | | | | | | | first cut at a UT | Matthew Hodgson | 2018-08-12 | 1 | -0/+141 |
| * | | | | | | | | | | | | | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| * | | | | | | | | | | | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| * | | | | | | | | | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| * | | | | | | | | | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 2 | -4/+6 |
