summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Move test to where the other integration tests areTravis Ralston2018-10-242-97/+109
* Fix testTravis Ralston2018-10-241-25/+50
* Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-245-4/+677
|\
| * Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-244-3/+666
| |\
| | * Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-242-3/+3
| | |\
| | | * Fix a number of flake8 errorsRichard van der Hoff2018-10-242-3/+3
| | * | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-242-0/+663
| | |\ \ | | | |/ | | |/|
| | | * isortErik Johnston2018-10-241-4/+1
| | | * Rename resolve_events_with_factoryErik Johnston2018-10-241-2/+2
| | | * Add some state res v2 testsErik Johnston2018-10-162-0/+666
| * | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-1/+11
| |/ /
* | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
* | | Test for terms UI authTravis Ralston2018-10-181-0/+70
|/ /
* / Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-171-0/+39
|/
* Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0938-985/+1879
|\
| * Add testsErik Johnston2018-10-021-0/+45
| * Disable frozen dicts by default (#3987)Amber Brown2018-10-022-2/+7
| * Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-106/+0
| |\
| | * Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-271-1/+1
| | |\
| | * | Remove redundant, failing, testRichard van der Hoff2018-09-271-106/+0
| * | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-024-95/+238
| | |/ | |/|
| * | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-271-1/+1
| |\ \ | | |/ | |/|
| | * Replaced all occurences of e.message with str(e)Schnuffle2018-09-271-1/+1
| * | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-272-12/+21
| * | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-0/+39
| |/
| * Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-251-1/+0
| |\
| | * Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-211-1/+0
| * | Merge branch 'master' into developAmber Brown2018-09-251-2/+2
| |\ \ | | |/ | |/|
| | * Fix compatibility issue with older Twisted in tests.Oleg Girko2018-09-251-2/+2
| * | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-204-42/+202
| * | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-202-3/+74
| * | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-183-37/+122
| |/
| * TestsErik Johnston2018-09-141-0/+81
| * Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-142-1/+198
| * improve namingNeil Johnson2018-09-121-3/+3
| * expose number of real reserved usersNeil Johnson2018-09-121-0/+31
| * Port tests/ to Python 3 (#3808)Amber Brown2018-09-0711-430/+348
| * Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-063-5/+48
| |\
| | * ensure guests never enter mau listNeil Johnson2018-09-063-4/+7
| | * guest users should not be part of mau totalNeil Johnson2018-09-051-2/+42
| * | Merge branch 'master' into developRichard van der Hoff2018-09-062-14/+17
| |\ \ | | |/ | |/|
| | * Fix origin handling for pushed transactionsRichard van der Hoff2018-09-052-14/+17
| * | Fix tests on postgresql (#3740)Amber Brown2018-09-0416-337/+355
| * | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-0/+6
| * | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-311-0/+17
| * | Port storage/ to Python 3 (#3725)Amber Brown2018-08-314-4/+129
| * | Fix up testsRichard van der Hoff2018-08-283-6/+10
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-241-0/+1
| |\ \
| | * | Fix checking if service notice room is already taggedErik Johnston2018-08-241-0/+1
| * | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-243-5/+5
| |/ /
* | | try to make flake8 and isort happyHubert Chathi2018-09-061-4/+5
* | | update to newer Synapse APIsHubert Chathi2018-08-241-0/+1
* | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2489-2601/+3251
|\| |
| * | Unit testsErik Johnston2018-08-232-3/+227
| * | Implement trail usersErik Johnston2018-08-231-0/+1
| * | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-231-0/+66
| * | Actually run the testsErik Johnston2018-08-231-0/+0
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-2219-127/+395
| |\ \
| | * \ Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-2/+2
| | |\ \
| | | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1782-2374/+2146
| | | |\ \
| | | * | | Split ProfileHandler into master and workerErik Johnston2018-08-171-2/+2
| | * | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-226-6/+48
| | |\ \ \ \
| | | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2085-2483/+2389
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Fix testsErik Johnston2018-08-096-5/+46
| | * | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-11/+94
| | | |/ / / | | |/| | |
| | * | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-186-50/+204
| | * | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-177-60/+49
| | |\ \ \ \
| | | * | | | Fix the testsAmber Brown2018-08-157-60/+49
| * | | | | | Update notice formatErik Johnston2018-08-221-3/+9
| * | | | | | rename error codeNeil Johnson2018-08-182-4/+4
| * | | | | | special case server_notices_mxidNeil Johnson2018-08-181-0/+8
| * | | | | | clean up, no functional changesNeil Johnson2018-08-171-15/+17
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-175-18/+19
| |\| | | | |
| | * | | | | Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-171-0/+13
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | add new error type ResourceLimitNeil Johnson2018-08-165-18/+19
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-171-0/+13
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-161-0/+13
| | |/ / / /
| * | | | | refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-161-0/+1
| * | | | | check for room state before deciding on actionNeil Johnson2018-08-161-20/+32
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-153-3/+57
| |\| | | |
| | * | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-152-2/+56
| | |\ \ \ \
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-153-7/+7
| | | |\| | |
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-142-2/+2
| | | |\ \ \ \
| | | * | | | | fix off by 1 errorsNeil Johnson2018-08-142-3/+14
| | | * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-141-4/+4
| | | * | | | | fix off by 1s on mauNeil Johnson2018-08-142-5/+48
| | | * | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-143-5/+10
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-143-12/+84
| | | |\ \ \ \ \ \
| | * | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-151-1/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1582-2362/+1984
| |\| | | | | | |
| | * | | | | | | update error codesNeil Johnson2018-08-151-2/+2
| | * | | | | | | update error codes for resource limitingNeil Johnson2018-08-151-2/+2
| | * | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-152-3/+3
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-145-50/+258
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | |
| | | * | | | | fix setup_test_homeserver to be postgres compatibleNeil Johnson2018-08-141-1/+1
| | | * | | | | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| | | * | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-143-12/+84
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
| | | * | | | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-142-37/+173
| | * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-133-5/+10
| | |/ / / /
| | * | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-133-10/+5
| | * | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-133-5/+10
| | * | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1344-58/+187
| | * | | | fix up a forced long lineAmber Brown2018-08-111-1/+2
| | * | | | Run black.black2018-08-1075-2280/+1629
| | * | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-103-3/+3
| | * | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-101-0/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2723-1161/+2080
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-1476-218/+279
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0910-6/+731
| | | |\ \ \ \ \
| | | * | | | | | send SNI for federation requestsJeroen2018-06-241-0/+2
| * | | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-101-0/+125
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-092-12/+13
| * | | | | | | fix importsNeil Johnson2018-08-091-1/+1
| * | | | | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-091-9/+31
| * | | | | | | block sync if auth checks failNeil Johnson2018-08-091-6/+13
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-092-1/+12
| |\| | | | | |
| | * | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-092-1/+12
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+4
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-082-1/+60
| | | |\ \ \ \ \ \
| | | * | | | | | | disable HS from configNeil Johnson2018-08-042-1/+12
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0913-52/+74
| |\| | | | | | | |
| | * | | | | | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-0913-52/+70
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-081-0/+4
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Basic support for room versioningRichard van der Hoff2018-08-031-0/+4
| * | | | | | | | sync auth blockingNeil Johnson2018-08-081-0/+42
| |/ / / / / / /
| * | | | | | | mock config.max_mau_valueNeil Johnson2018-08-081-0/+1
| * | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-071-1/+58
| * | | | | | | add default mau_limits_reserved_threepidsNeil Johnson2018-08-061-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | remove unused importNeil Johnson2018-08-031-1/+1
| * | | | | | bug fixesNeil Johnson2018-08-032-8/+3
| * | | | | | wip commit - tests failingNeil Johnson2018-08-032-13/+13
| * | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-032-1/+1
| * | | | | | fix py3 test failureNeil Johnson2018-08-031-0/+1
| * | | | | | fix caching and testsNeil Johnson2018-08-031-13/+37
| * | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-023-42/+68
| * | | | | | remove unused count_monthly_usersNeil Johnson2018-08-021-65/+0
| * | | | | | fix test, update constructor callNeil Johnson2018-08-021-1/+1
| * | | | | | insertion into monthly_active_usersNeil Johnson2018-08-021-3/+63
| * | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-021-3/+3
| * | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-011-3/+3
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-017-32/+310
| |\| | | | |
| * | | | | | api into monthly_active_users tableNeil Johnson2018-07-311-0/+42
| | |_|_|_|/ | |/| | | |
* | | | | | 404 nicely if you try to interact with a missing current versionMatthew Hodgson2018-08-121-0/+22
* | | | | | flake8Matthew Hodgson2018-08-121-8/+13
* | | | | | implement remaining tests and make them workMatthew Hodgson2018-08-121-25/+251
* | | | | | lintingMatthew Hodgson2018-08-121-25/+23
* | | | | | fix idiocies and so make tests passMatthew Hodgson2018-08-121-8/+11
* | | | | | first cut at a UTMatthew Hodgson2018-08-121-0/+141
| |/ / / / |/| | | |
* | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-013-12/+184
|\ \ \ \ \
| * | | | | fix isortNeil Johnson2018-08-011-1/+0
| * | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-012-1/+101
| |\ \ \ \ \
| * | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| * | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-012-21/+28
| * | | | | | coding styleNeil Johnson2018-07-312-3/+2
| * | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| * | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| * | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-302-1/+97
| | |/ / / / | |/| | | |
* | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-19/+25
| |/ / / / |/| | | |
* | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-011-0/+101
|\ \ \ \ \
| * | | | | fix invalidationRichard van der Hoff2018-07-271-1/+41
| * | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-0/+61
| |/ / / /
* / / / / Remove pdu_failures from transactionsTravis Ralston2018-07-301-1/+0
|/ / / /
* | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-251-7/+30
|\ \ \ \
| * | | | Fix unit testsRichard van der Hoff2018-07-251-7/+30
* | | | | flake8Matthew Hodgson2018-07-251-12/+12
* | | | | add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
* | | | | incorporate more reviewMatthew Hodgson2018-07-241-0/+9
* | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-237-87/+427
|\| | | |
| * | | | Fix unit testsErik Johnston2018-07-232-15/+40
| * | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-211-2/+1
| * | | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-201-0/+31
| * | | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-202-70/+47
| |\ \ \ \
| | * | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-202-70/+47
| | * | | | Add a sleep to the Limiter to fix stack overflows.Richard van der Hoff2018-07-201-4/+4
| * | | | | Admin API for creating new users (#3415)Amber Brown2018-07-202-0/+308
| |/ / / /
* | | | | make test workMatthew Hodgson2018-07-191-37/+46
* | | | | first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
|/ / / /
* | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-191-52/+4
|\ \ \ \
| * | | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-181-52/+4
* | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460)Amber Brown2018-07-195-86/+27
|/ / / /
* | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-171-0/+63
* | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-171-0/+261
|\ \ \ \
| * | | | fix importsRichard van der Hoff2018-07-171-0/+1
| * | | | Add a test which profiles filter_events_for_server in a large roomRichard van der Hoff2018-07-161-2/+155
| * | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-161-0/+107
* | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-1710-931/+935
* | | | | Add unit testErik Johnston2018-07-171-0/+16
* | | | | Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-171-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixup unit testErik Johnston2018-07-131-3/+3
| |/ / /
* | | | Make auth & transactions more testable (#3499)Amber Brown2018-07-141-1/+4
* | | | Fix unit testsRichard van der Hoff2018-07-131-0/+1
|/ / /
* | | Use more portable syntax using attrs package.Oleg Girko2018-07-101-1/+1
* | | run isortAmber Brown2018-07-0976-216/+273
| |/ |/|
* | Merge remote-tracking branch 'hera/rav/server_acls' into developNeil Johnson2018-07-052-0/+57
|\ \
| * | Implementation of server_aclsRichard van der Hoff2018-07-042-0/+57
* | | Merge pull request #3483 from matrix-org/rav/more_server_name_validationErik Johnston2018-07-051-4/+13
|\| |
| * | More server_name validationRichard van der Hoff2018-07-041-4/+13
* | | Reinstate lost run_on_reactor in unit testRichard van der Hoff2018-07-041-2/+15
|/ /
* | Reject invalid server names (#3480)Richard van der Hoff2018-07-032-0/+46
* | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-292-1/+247
|\ \
| * | pep8Amber Brown2018-06-271-5/+2
| * | cleanupsAmber Brown2018-06-271-1/+4
| * | stylistic cleanupAmber Brown2018-06-271-6/+18
| * | cleanupsAmber Brown2018-06-271-7/+6
| * | handle federation not telling us about prev_eventsAmber Brown2018-06-272-1/+236
* | | add testMatthew Hodgson2018-06-281-0/+33
* | | fix testsMatthew Hodgson2018-06-281-3/+15
|/ /
* / Better testing framework for homeserver-using things (#3446)Amber Brown2018-06-272-0/+309
|/
* Merge pull request #3427 from matrix-org/erikj/remove_filtersErik Johnston2018-06-221-8/+0
|\
| * remove dead filter_events_for_clientsRichard van der Hoff2018-06-121-8/+0
* | Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-221-6/+6
* | Pass around the reactor explicitly (#3385)Amber Brown2018-06-227-21/+30
* | Merge branch 'master' into developRichard van der Hoff2018-06-142-2/+165
|\ \
| * | Fix broken unit testRichard van der Hoff2018-06-141-2/+14
| * | remove spurious debugRichard van der Hoff2018-06-141-2/+0
| * | Make default state_default 50Richard van der Hoff2018-06-141-0/+153
* | | Remove run_on_reactor (#3395)Amber Brown2018-06-142-4/+0
| |/ |/|
* | Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-061-0/+198
|/
* Put python's logs into Trial when running unit tests (#3319)Amber Brown2018-06-041-13/+27
* fix testsRichard van der Hoff2018-05-291-0/+1
* fix another dumb typoMatthew Hodgson2018-05-291-2/+2
* fix dumb typoMatthew Hodgson2018-05-291-4/+4
* Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-224-5/+87
|\
| * Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-221-0/+1
| * Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-221-1/+1
| * Send users a server notice about consentRichard van der Hoff2018-05-222-3/+9
| * Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-211-0/+21
| * Stop the transaction cache caching failuresRichard van der Hoff2018-05-211-0/+54
| * Use stream rather depth ordering for push actionsErik Johnston2018-05-111-2/+2
* | rest of the changesAmber Brown2018-05-212-192/+0
* | replacing portionsAmber Brown2018-05-211-0/+3
|/
* Merge pull request #3161 from NotAFile/remove-v1authRichard van der Hoff2018-05-034-13/+18
|\
| * Burminate v1authAdrian Tschira2018-04-304-13/+18
* | Merge pull request #3175 from matrix-org/erikj/escape_metric_valuesErik Johnston2018-05-031-1/+20
|\ \
| * | Escape label values in prometheus metricsErik Johnston2018-05-021-1/+20
* | | Merge branch 'develop' into rav/more_logcontext_leaksRichard van der Hoff2018-05-023-3/+47
|\ \ \
| * | | Fix a couple of logcontext leaks in unit testsRichard van der Hoff2018-05-022-3/+9
| |/ /
| * / Fix incorrect reference to StringIORichard van der Hoff2018-05-021-0/+38
| |/
* | Remove spurious unittest.DEBUGRichard van der Hoff2018-05-021-1/+0
* | Fix a class of logcontext leaksRichard van der Hoff2018-05-021-11/+56
|/
* Merge pull request #3108 from NotAFile/py3-six-urlparseRichard van der Hoff2018-04-302-10/+9
|\
| * Use six.moves.urlparseAdrian Tschira2018-04-152-10/+9
* | Merge branch 'develop' into rav/deferred_timeoutRichard van der Hoff2018-04-275-5/+6
|\ \
| * \ Merge pull request #3109 from NotAFile/py3-tests-fixRichard van der Hoff2018-04-235-5/+6
| |\ \
| | * | Make tests py3 compatibleAdrian Tschira2018-04-165-5/+6
| | |/
* | / Use deferred.addTimeout instead of time_bound_deferredRichard van der Hoff2018-04-231-33/+0
|/ /
* | Merge pull request #3104 from NotAFile/py3-unittest-configRichard van der Hoff2018-04-201-0/+4
|\ \
| * | Add some more variables to the unittest configAdrian Tschira2018-04-151-0/+4
| |/
* | Merge pull request #3103 from NotAFile/py3-baseexcepton-messageRichard van der Hoff2018-04-201-6/+6
|\ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-24 08:48:42 +0000