summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Fix develop because I broke it :( (#3535)Amber Brown2018-07-143-2/+5
* Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-1418-165/+102
|\
| * fix sytestsAmber Brown2018-07-141-1/+1
| * add changelogKrombel2018-07-132-1/+2
| * rename assert_params_in_request to assert_params_in_dictKrombel2018-07-1311-33/+33
| * Use parse_{int,str} and assert from http.servletKrombel2018-07-1314-155/+91
* | Make auth & transactions more testable (#3499)Amber Brown2018-07-1410-98/+97
|/
* Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queueRichard van der Hoff2018-07-133-10/+25
|\
| * better changelogRichard van der Hoff2018-07-131-1/+1
| * changelogRichard van der Hoff2018-07-131-0/+1
| * Fix unit testsRichard van der Hoff2018-07-131-0/+1
| * Make FederationRateLimiter queue requests properlyRichard van der Hoff2018-07-131-10/+23
* | typoMatthew Hodgson2018-07-131-3/+3
|/
* Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cacheRichard van der Hoff2018-07-122-8/+13
|\
| * changelogRichard van der Hoff2018-07-121-0/+1
| * Reduce set building in get_entities_changedRichard van der Hoff2018-07-121-8/+12
* | Merge pull request #3316 from matrix-org/rav/enforce_report_apiRichard van der Hoff2018-07-122-2/+25
|\ \ | |/ |/|
| * changelogRichard van der Hoff2018-07-121-0/+1
| * Merge branch 'develop' into rav/enforce_report_apiRichard van der Hoff2018-07-12370-2555/+5185
| |\ | |/ |/|
* | Merge pull request #3505 from matrix-org/erikj/receipts_cahceErik Johnston2018-07-123-7/+21
|\ \
| * | Update return value docstringErik Johnston2018-07-121-1/+1
| * | Use 'is not None' and add commentsErik Johnston2018-07-101-2/+6
| * | NewsfileErik Johnston2018-07-101-0/+1
| * | Use stream cache in get_linearized_receipts_for_roomErik Johnston2018-07-102-5/+14
* | | Merge pull request #3498 from OlegGirko/fix_attrs_syntaxAmber Brown2018-07-112-1/+1
|\ \ \
| * | | changelog entryAmber Brown2018-07-111-0/+0
| * | | Use more portable syntax using attrs package.Oleg Girko2018-07-101-1/+1
* | | | s/becuase/because/gMatthew Hodgson2018-07-103-4/+4
| |/ / |/| |
* | | Attempt to include db threads in cpu usage stats (#3496)Richard van der Hoff2018-07-104-20/+39
* | | Refactor logcontext resource usage tracking (#3501)Richard van der Hoff2018-07-105-130/+146
* | | another typoMatthew Hodgson2018-07-101-1/+1
* | | typo (i think)Matthew Hodgson2018-07-101-1/+1
* | | Merge pull request #3497 from matrix-org/rav/measure_fetch_event_loopRichard van der Hoff2018-07-102-19/+33
|\ \ \ | |/ / |/| |
| * | changelogRichard van der Hoff2018-07-091-0/+1
| * | Add CPU metrics for _fetch_event_listRichard van der Hoff2018-07-091-19/+32
|/ /
* | Merge pull request #3464 from matrix-org/hawkowl/isort-runRichard van der Hoff2018-07-09335-1528/+1609
|\ \
| * | changelogAmber Brown2018-07-091-0/+0
| * | run isortAmber Brown2018-07-09334-1528/+1609
|/ /
* | Add an isort configuration (#3463)Amber Brown2018-07-092-0/+12
* | changelog v0.32.2 github/release-v0.32.2 release-v0.32.2Amber Brown2018-07-072-1/+9
* | versionAmber Brown2018-07-071-1/+1
* | Correct attrs package name in requirements (#3492)Amber Brown2018-07-073-1/+3
* | Merge tag 'v0.32.1'Richard van der Hoff2018-07-063-4/+11
|\ \
| * | Prepare 0.32.1 release v0.32.1 github/release-v0.32.1 release-v0.32.1Richard van der Hoff2018-07-063-2/+10
| * | Merge pull request #3488 from matrix-org/rav/fix-netaddr-depRichard van der Hoff2018-07-062-3/+2
|/| |
| * | Add explicit dependency on netaddrRichard van der Hoff2018-07-062-3/+2
|/ /
* | 0.32.0 version bump, update changelog v0.32.0 github/release-v0.32.0 release-v0.32.0Neil Johnson2018-07-062-1/+5
* | changelog v0.32.0rc1Amber Brown2018-07-0529-19/+47
* | ACL changelogAmber Brown2018-07-051-0/+1
* | bump version to 0.32.0rc1Amber Brown2018-07-051-1/+1
* | Merge remote-tracking branch 'hera/rav/server_acls' into developNeil Johnson2018-07-055-4/+213
|\ \
| * | Implementation of server_aclsRichard van der Hoff2018-07-045-4/+213
* | | Merge pull request #3483 from matrix-org/rav/more_server_name_validationErik Johnston2018-07-055-13/+68
|\| |
| * | More server_name validationRichard van der Hoff2018-07-045-13/+68
* | | Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_testRichard van der Hoff2018-07-042-2/+16
|\ \ \ | |/ / |/| |
| * | Reinstate lost run_on_reactor in unit testRichard van der Hoff2018-07-042-2/+16
* | | Merge pull request #3473 from matrix-org/erikj/thread_cacheErik Johnston2018-07-042-1/+3
|\ \ \
| * | | Correct newsfileErik Johnston2018-07-022-0/+1
| * | | NewsfileErik Johnston2018-07-021-0/+0
| * | | Invalidate cache on correct threadErik Johnston2018-07-021-1/+2
* | | | Merge pull request #3474 from matrix-org/erikj/py3_authErik Johnston2018-07-042-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | NewsfileErik Johnston2018-07-021-0/+0
| * | | Avoid relying on int vs None comparisonErik Johnston2018-07-021-1/+5
| * | | Ensure that we define sender_domainErik Johnston2018-07-021-0/+1
| |/ /
* | | Reject invalid server names (#3480)Richard van der Hoff2018-07-035-25/+122
* | | Merge pull request #3470 from matrix-org/matthew/fix-utf8-loggingRichard van der Hoff2018-07-022-2/+18
|\ \ \ | |/ / |/| |
| * | news snippetMatthew Hodgson2018-07-021-0/+1
| * | replace invalid utf8 with \ufffdMatthew Hodgson2018-07-021-2/+2
| * | a fix which doesn't NPE everywhereMatthew Hodgson2018-07-011-9/+17
| * | don't mix unicode strings with utf8-in-byte-stringsMatthew Hodgson2018-07-011-2/+9
|/ /
* | Merge pull request #3467 from matrix-org/hawkowl/contributor-requirementsMatthew Hodgson2018-06-302-5/+9
|\ \
| * | topfileAmber Brown2018-06-291-0/+0
| * | clarification on what "real names" areAmber Brown2018-06-291-5/+9
* | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-295-30/+319
|\ \ \
| * | | topfile updateAmber Brown2018-06-281-2/+1
| * | | topfileAmber Brown2018-06-271-0/+2
| * | | try and clean upAmber Brown2018-06-271-3/+6
| * | | pep8Amber Brown2018-06-272-11/+6
| * | | cleanupsAmber Brown2018-06-271-1/+4
| * | | cleanupsAmber Brown2018-06-271-13/+15
| * | | stylistic cleanupAmber Brown2018-06-271-6/+18
| * | | cleanupsAmber Brown2018-06-271-7/+6
| * | | handle federation not telling us about prev_eventsAmber Brown2018-06-274-27/+301
* | | | Merge pull request #3465 from matrix-org/matthew/as_ip_lockMatthew Hodgson2018-06-285-5/+69
|\ \ \ \ | |_|/ / |/| | |
| * | | add testMatthew Hodgson2018-06-281-0/+33
| * | | add towncrier snippetMatthew Hodgson2018-06-281-0/+1
| * | | fix testsMatthew Hodgson2018-06-282-3/+16
| * | | add ip_range_whitelist parameter to limit where ASes can connect fromMatthew Hodgson2018-06-283-2/+19
|/ / /
* | | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-2840-62/+79
* | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454)Amber Brown2018-06-282-2/+4
|/ /
* | Better testing framework for homeserver-using things (#3446)Amber Brown2018-06-273-0/+309
* | Merge pull request #3452 from matrix-org/revert-3451-hawkowl/sorteddict-apiMatthew Hodgson2018-06-262-4/+2
|\ \
| * | Revert "Try to not use as much CPU in the StreamChangeCache"Matthew Hodgson2018-06-262-4/+2
|/ /
* | Merge pull request #3451 from matrix-org/hawkowl/sorteddict-apiMatthew Hodgson2018-06-262-2/+4
|\ \
| * | fixesAmber Brown2018-06-261-2/+2
| * | fixesAmber Brown2018-06-262-2/+2
| * | try and make loading items from the cache fasterAmber Brown2018-06-261-2/+4
* | | Merge pull request #3449 from matrix-org/dbkr/fix_deactivate_account_multiple...Matthew Hodgson2018-06-261-1/+3
|\ \ \
| * | | Fix error on deleting users pending deactivationDavid Baker2018-06-261-1/+3
|/ / /
* | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-apiMatthew Hodgson2018-06-263-3/+28
|\ \ \ | |/ / |/| |
| * | update doc for deactivate APIMatthew Hodgson2018-06-262-3/+16
| * | add GDPR erase param to deactivate APIMatthew Hodgson2018-06-262-1/+13
* | | Merge pull request #3438 from turt2live/travis/dont-print-access-tokens-in-logsAmber Brown2018-06-261-2/+2
|\ \ \
| * | | Don't print invalid access tokens in the logsTravis Ralston2018-06-241-2/+2
* | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-partsErik Johnston2018-06-251-2/+6
|\ \ \ \
| * | | | allow non-consented users to still part rooms (to let us autopart them)Matthew Hodgson2018-06-251-2/+6
| | |/ / | |/| |
* | | | Merge pull request #3443 from matrix-org/erikj/fast_filter_serversErik Johnston2018-06-251-0/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Actually fix itErik Johnston2018-06-251-3/+3
| * | | CommentErik Johnston2018-06-251-0/+8
| * | | Fix bug with assuming wrong typeErik Johnston2018-06-251-2/+2
| * | | Add fast path to _filter_events_for_serverErik Johnston2018-06-251-1/+34
|/ / /
* | | typosMatthew Hodgson2018-06-251-1/+1
* | | typoMatthew Hodgson2018-06-251-1/+1
* | | Need to pass reactor to endpoint facErik Johnston2018-06-251-1/+1
* | | Use towncrier to build the changelog (#3425)Amber Brown2018-06-2520-1/+55
* | | Merge pull request #3441 from matrix-org/erikj/redo_erasureErik Johnston2018-06-259-26/+216
|\ \ \
| * | | Add UserErasureWorkerStore to workersErik Johnston2018-06-251-0/+2
| * | | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-258-26/+214
| |/ /
* / / Remove all global reactor imports & pass it around explicitly (#3424)Amber Brown2018-06-259-22/+29
|/ /
* | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-228-214/+26
* | Merge pull request #3435 from matrix-org/rav/fix_event_push_actions_tablescanRichard van der Hoff2018-06-221-1/+8
|\ \
| * | Deleting from event_push_actions needs to use an indexMark Haines2018-06-221-1/+8
* | | Merge pull request #3434 from matrix-org/rav/search_loggingRichard van der Hoff2018-06-221-0/+14
|\ \ \ | |/ / |/| |
| * | Also log number of events for serach contextErik Johnston2018-06-221-0/+5
| * | Add some logging to search queriesErik Johnston2018-06-221-0/+9
|/ /
* | Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterableRichard van der Hoff2018-06-221-1/+1
|\ \
| * | Make _get_joined_hosts_cache cache non-iterableErik Johnston2018-06-221-1/+1
* | | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotationRichard van der Hoff2018-06-221-3/+5
|\ \ \ | |/ / |/| |
| * | Make push actions rotation configurableErik Johnston2018-06-221-3/+5
* | | Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-228-26/+214
|\ \ \
| * | | Filter out erased messagesRichard van der Hoff2018-06-122-22/+68
| * | | mark accounts as erased when requestedRichard van der Hoff2018-06-123-4/+20
| * | | UserErasureStoreRichard van der Hoff2018-06-123-0/+126
* | | | Merge pull request #3428 from matrix-org/erikj/persisted_pduErik Johnston2018-06-222-30/+27
|\| | |
| * | | simplify get_persisted_pduRichard van der Hoff2018-06-122-30/+27
* | | | Merge pull request #3427 from matrix-org/erikj/remove_filtersErik Johnston2018-06-223-92/+35
|\| | | | |/ / |/| |
| * | remove dead filter_events_for_clientsRichard van der Hoff2018-06-123-92/+35
* | | Merge pull request #3383 from matrix-org/rav/hacky_speedup_state_group_cacheRichard van der Hoff2018-06-223-32/+61
|\ \ \
| * | | Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-223-32/+61
|/ / /
* | | Merge pull request #3382 from matrix-org/rav/optimise_state_groupsRichard van der Hoff2018-06-221-5/+1
|\ \ \
| * | | Optimise state_group_cache updateRichard van der Hoff2018-06-111-5/+1
* | | | Merge pull request #3419 from matrix-org/rav/events_per_requestRichard van der Hoff2018-06-223-1/+23
|\ \ \ \
| * | | | Indirect evt_count updates via method callRichard van der Hoff2018-06-222-1/+12
| * | | | Log number of events fetched from DBRichard van der Hoff2018-06-213-1/+12
* | | | | Merge pull request #3418 from matrix-org/rav/fix_metric_descAmber Brown2018-06-221-1/+1
|\ \ \ \ \
| * | | | | Fix description of "python_gc_time" metricRichard van der Hoff2018-06-211-1/+1
* | | | | | Pass around the reactor explicitly (#3385)Amber Brown2018-06-2225-93/+141
* | | | | | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386)Amber Brown2018-06-211-3/+7
* | | | | | Fix tcp protocol metrics naming (#3410)Amber Brown2018-06-211-18/+35
| |/ / / / |/| | | |
* | | | | Merge pull request #3416 from matrix-org/rav/restart_indicatorRichard van der Hoff2018-06-202-12/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Write a clear restart indicator in logsRichard van der Hoff2018-06-202-12/+19
* | | | | Merge pull request #3399 from costacruise/masterRichard van der Hoff2018-06-201-2/+6
|\ \ \ \ \
| * | | | | Add error code to room creation errorMichael Wagner2018-06-141-2/+6
* | | | | | Fix inflight requests metric (incorrect name & traceback) (#3413)Amber Brown2018-06-201-3/+7
| |/ / / / |/| | | |
* | | | | spell gauge correctlyMatthew Hodgson2018-06-161-1/+1
* | | | | Merge branch 'master' into developRichard van der Hoff2018-06-146-47/+243
|\ \ \ \ \
| * \ \ \ \ Merge tag 'v0.31.2'Richard van der Hoff2018-06-146-47/+243
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | link to spec proposal from changelog v0.31.2 github/release-v0.31.2 release-v0.31.2Richard van der Hoff2018-06-141-0/+3
| | * | | | v0.31.2Richard van der Hoff2018-06-141-1/+2
| | * | | | changelog for 0.31.2Richard van der Hoff2018-06-141-0/+6
| | * | | | Merge pull request #3397 from matrix-org/rav/adjust_auth_rulesRichard van der Hoff2018-06-144-46/+232
| | |\ \ \ \
| | | * | | | 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-142-20/+167
| | | * | | | Clarify interface for event_authRichard van der Hoff2018-06-141-18/+16
| | | * | | | Refactor get_send_level to take a power_levels eventRichard van der Hoff2018-06-142-8/+39
| | | |/ / /
* | | | | | add a last seen metric (#3396)Amber Brown2018-06-141-0/+21
* | | | | | Remove run_on_reactor (#3395)Amber Brown2018-06-1413-63/+6
* | | | | | Merge pull request #3368 from matrix-org/rav/fix_federation_client_hostRichard van der Hoff2018-06-131-14/+51
|\ \ \ \ \ \
| * | | | | | Fix federation_client to send the right HostRichard van der Hoff2018-06-121-14/+51
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3389 from turt2live/travis/name_metricsAmber Brown2018-06-1311-11/+11
|\ \ \ \ \ \
| * | | | | | The flag is named enable_metrics, not collect_metricsTravis Ralston2018-06-1211-11/+11
| |/ / / / /
* | | | | | Merge pull request #3390 from turt2live/travis/appsvc-metricsAmber Brown2018-06-131-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the RegistryProxy for appservices tooTravis Ralston2018-06-121-1/+2
|/ / / / /
* | | | | Merge pull request #3276 from matrix-org/dbkr/unbindDavid Baker2018-06-116-16/+115
|\ \ \ \ \
| * | | | | pep8David Baker2018-06-061-3/+3
| * | | | | More doc fixesDavid Baker2018-06-061-2/+2
| * | | | | fix pep8David Baker2018-06-051-3/+5
| * | | | | doc fixesDavid Baker2018-06-052-7/+7
| * | | | | DocstringDavid Baker2018-06-041-0/+14
| * | | | | Fix commentDavid Baker2018-06-041-1/+1
| * | | | | Missing yieldDavid Baker2018-06-041-1/+1
| * | | | | docstringDavid Baker2018-06-041-1/+9
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/unbindDavid Baker2018-05-2424-74/+485
| |\ \ \ \ \
| * | | | | | pep8David Baker2018-05-244-8/+13
| * | | | | | commentDavid Baker2018-05-241-0/+4
| * | | | | | Unbind 3pids when they're deleted tooDavid Baker2018-05-242-3/+18
| * | | | | | Hit the 3pid unbind endpoint on deactivationDavid Baker2018-05-234-12/+63
* | | | | | | fix idiotic typo in state resMatthew Hodgson2018-06-111-2/+2
* | | | | | | Merge branch 'master' into developNeil Johnson2018-06-082-1/+13
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge tag 'v0.31.1'Neil Johnson2018-06-083-5/+20
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | tweak changelog v0.31.1 github/release-v0.31.1 release-v0.31.1Neil Johnson2018-06-081-2/+4
| | * | | | | Update CHANGES.rstNeil Johnson2018-06-081-1/+1
| | * | | | | changelog a bump versionNeil Johnson2018-06-082-1/+11
| | | |_|/ / | | |/| | |
| | * | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| | * | | | fix various changelog bugs and typosMatthew Hodgson2018-06-081-4/+3
* | | | | | Merge pull request #3372 from matrix-org/rav/better_verification_loggingDavid Baker2018-06-081-6/+25
|\ \ \ \ \ \
| * | | | | | Try to log more helpful info when a sig verification failsRichard van der Hoff2018-06-081-6/+25
* | | | | | | Merge pull request #3371 from matrix-org/rav/fix_get_missing_eventsDavid Baker2018-06-081-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| |/ / / / / /
* / / / / / / fix various changelog bugs and typosMatthew Hodgson2018-06-071-4/+3
|/ / / / / /
* | | | | | Merge pull request #3344 from Half-Shot/hs/as-metricsWill Hunt2018-06-071-0/+22
|\ \ \ \ \ \
| * | | | | | Let's try labels instead of label, that might workWill Hunt2018-06-051-3/+3
| * | | | | | Add metrics to track appservice transactionsWill Hunt2018-06-051-0/+22
* | | | | | | Merge pull request #3363 from matrix-org/rav/fix_purgeRichard van der Hoff2018-06-071-7/+5
|\ \ \ \ \ \ \
| * | | | | | | fix logRichard van der Hoff2018-06-071-1/+1
| * | | | | | | Fix event-purge-by-ts admin APIRichard van der Hoff2018-06-071-6/+4
* | | | | | | | Merge pull request #3355 from matrix-org/rav/fix_federation_backfillRichard van der Hoff2018-06-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix sql error in _get_state_groups_from_groupsRichard van der Hoff2018-06-061-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3356 from matrix-org/rav/add_missing_attr_depAmber Brown2018-06-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing dependency on attrRichard van der Hoff2018-06-061-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into developNeil Johnson2018-06-062-1/+59
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge tag 'v0.31.0'Neil Johnson2018-06-06113-1642/+1426
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | 7 char sha in changelog v0.31.0 github/release-v0.31.0 release-v0.31.0Neil Johnson2018-06-061-3/+3
| | * | | | | | Update CHANGES.rstNeil Johnson2018-06-061-4/+4
| | * | | | | | bump version and changelogNeil Johnson2018-06-062-3/+12
| | * | | | | | Fix metric documentation tables (#3341)Amber Brown2018-06-061-20/+30
| | * | | | | | Add note to changelog on prometheus metricsRichard van der Hoff2018-06-061-1/+4
| | * | | | | | Merge commit 'b7e7fd2' into release-v0.31.0Richard van der Hoff2018-06-062-5/+8
| | |\ \ \ \ \ \
| | * | | | | | | bump version and changelog v0.31.0-rc1Neil Johnson2018-06-042-1/+47
* | | | | | | | | Merge pull request #3349 from t3chguy/redact_as_request_tokenRichard van der Hoff2018-06-062-3/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | also redact __str__ of ApplicationService used for loggingMichael Telatynski2018-06-061-1/+5
| * | | | | | | | redact_uri in two missed log pathsMichael Telatynski2018-06-061-2/+2
* | | | | | | | | Merge pull request #3347 from krombel/py3_extend_tox_2Amber Brown2018-06-061-11/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update tox.ini to cover 292 succeeding testsKrombel2018-06-051-11/+19
* | | | | | | | | | Merge pull request #3348 from intelfx/fix-sortedcontainersAmber Brown2018-06-061-27/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDictIvan Shapovalov2018-06-061-27/+22
| |/ / / / / / / / /
* / / / / / / / / / Fix metric documentation tables (#3341)Amber Brown2018-06-061-20/+30
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3327 from t3chguy/redact_as_request_tokenRichard van der Hoff2018-06-053-9/+18
|\| | | | | | | |
| * | | | | | | | factor out uri redaction into a method on httpMichael Telatynski2018-06-053-13/+17
| * | | | | | | | Strip `access_token` from outgoing requests using existing regexMichael Telatynski2018-06-021-1/+6
* | | | | | | | | Merge pull request #3340 from ArchangeGabriel/patch-1Richard van der Hoff2018-06-051-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc/postgres.rest: fix displaying of the last command blockBruno Pagani2018-06-041-9/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-06-051-0/+3
|\| | | | | | | |
| * | | | | | | | Merge pull request #3290 from rubo77/patch-7Richard van der Hoff2018-05-301-0/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove trailing whitespaceRichard van der Hoff2018-05-301-2/+2
| | * | | | | | | | fix english and wrap commentRichard van der Hoff2018-05-301-1/+2
| | * | | | | | | | add link to thorough instruction how to configure consentRuben Barkow2018-05-251-0/+2
| |/ / / / / / / /
* | | | | / / / / Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-066-35/+241
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_methodRichard van der Hoff2018-06-041-26/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove was_forgotten_atRichard van der Hoff2018-06-011-26/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3334 from matrix-org/rav/cache_factor_overrideRichard van der Hoff2018-06-044-4/+18
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add hacky cache factor override systemErik Johnston2018-06-044-4/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Fix replication metricsRichard van der Hoff2018-06-041-2/+2
* | | | | | | Hopefully, fix LaterGuage error handlingRichard van der Hoff2018-06-041-3/+6
|/ / / / / /
* | | | | | Put python's logs into Trial when running unit tests (#3319)Amber Brown2018-06-041-13/+27
* | | | | | Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usageAmber Brown2018-06-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | federation/send_queue.py: fix usage of LaterGaugeIvan Shapovalov2018-06-031-1/+1
|/ / / / /
* | | | | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam...Richard van der Hoff2018-06-011-0/+3
|\ \ \ \ \
| * | | | | Add private IPv6 addresses to preview blacklist #3312Felix Schäfer2018-06-011-0/+3
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 16:39:57 +0000