summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix warnings about losing log context during UI auth. (#7688)Patrick Cloke2020-06-121-1/+1
* Fix bug in account data replication stream. (#7656)Erik Johnston2020-06-093-1/+19
* async/await get_user_id_by_threepid (#7620)Andrew Morgan2020-06-032-23/+24
* Improve performance of _get_state_groups_from_groups_txn (#7567)Dagfinn Ilmari Mannsåker2020-06-011-6/+6
* Use upsert when inserting read receipts (#7607)Dagfinn Ilmari Mannsåker2020-06-011-9/+4
* Fix incorrect placeholder syntax in database prepartion code (#7575)Andrew Morgan2020-05-271-3/+2
* Replace device_27_unique_idx bg update with a fg one (#7562)Richard van der Hoff2020-05-265-62/+94
* Simplify reap_monthly_active_users (#7558)Richard van der Hoff2020-05-231-59/+41
* Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-221-8/+20
* Add option to move event persistence off master (#7517)Erik Johnston2020-05-226-43/+60
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-222-3/+5
* Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-211-12/+22
* Fix bug in persist events when dealing with non member types. (#7548)Erik Johnston2020-05-211-2/+2
* Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-186-55/+17
|\
| * remove `builtins.buffer` code from storage codeRichard van der Hoff2020-05-153-24/+3
| * remove to_asciiRichard van der Hoff2020-05-152-19/+11
| * Remove `exception_to_unicode`Richard van der Hoff2020-05-151-12/+3
* | Fix limit logic for AccountDataStream (#7384)Richard van der Hoff2020-05-151-19/+43
* | Fix a couple of small typosAndrew Morgan2020-05-151-2/+2
* | Add a worker store for search insertion. (#7516)Erik Johnston2020-05-151-47/+49
* | Prevent 0-member/null room_version rooms from appearing in group room queries...Andrew Morgan2020-05-151-14/+78
* | Move event stream handling out of slave store. (#7491)Erik Johnston2020-05-155-19/+160
* | Fix a small typo in the arguments of simple_update in update_remote_profile_c...Andrew Morgan2020-05-151-1/+1
|/
* Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-141-1/+2
|\
| * Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-141-1/+2
| * Fix new flake8 errors (#7489)Patrick Cloke2020-05-131-2/+2
* | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-131-6/+1
* | SpellingErik Johnston2020-05-132-2/+2
* | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-1317-1234/+1373
* | Fix new flake8 errors (#7470)Erik Johnston2020-05-121-2/+2
* | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-113-7/+7
* | Remove unused store method get_hosts_in_room (#7448)Andrew Morgan2020-05-111-10/+0
* | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-0/+21
|\|
| * Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-0/+21
* | Add room details admin endpoint (#7317)Manuel Stahl2020-05-071-0/+31
* | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-075-42/+92
* | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-061-2/+2
|\|
| * Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-052-4/+7
| |\
| * | Speed up fetching device lists changes in sync.Erik Johnston2020-05-051-2/+2
* | | Merge pull request #7428 from matrix-org/rav/cross_signing_keys_cacheRichard van der Hoff2020-05-061-77/+21
|\ \ \
| * | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulkRichard van der Hoff2020-05-061-54/+6
| * | | Fix batching for fetching cross-signing keysRichard van der Hoff2020-05-061-23/+15
| | |/ | |/|
* | | Merge branch 'develop' into rav/upsert_for_device_listRichard van der Hoff2020-05-063-6/+174
|\ \ \
| * | | Add MultiWriterIdGenerator. (#7281)Erik Johnston2020-05-041-2/+167
| |/ /
| * | Wait for current_state_events_membership before populate_stats_process_rooms ...Richard van der Hoff2020-05-011-1/+5
| * | async/await is_server_admin (#7363)Andrew Morgan2020-05-011-3/+2
| |/
* | use an upsert to update device_lists_outbound_last_successRichard van der Hoff2020-05-063-18/+71
* | Better type annotations for simple_upsert_txnRichard van der Hoff2020-05-061-30/+43
|/
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-304-0/+318
* Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-291-4/+60
* Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-281-29/+39
* Fix EventsStream raising assertions when it falls behindRichard van der Hoff2020-04-241-12/+34
* Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-221-4/+74
* Fix a potentially-huge sql query (#7274)Richard van der Hoff2020-04-151-7/+16
* typosMatthew Hodgson2020-04-111-1/+1
* bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-074-13/+181
* Convert delete_url_cache_media to async/await. (#7241)Patrick Cloke2020-04-071-2/+2
* Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-072-2/+23
* Fix race in replication (#7226)Erik Johnston2020-04-071-20/+20
* Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-061-2/+0
* Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-033-59/+76
|\
| * Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| * review commentRichard van der Hoff2020-04-021-1/+1
| * Only run one background update at a timeRichard van der Hoff2020-03-313-27/+68
| * Make do_next_background_update return a boolRichard van der Hoff2020-03-311-7/+5
| * Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-4/+3
| * Remove unused `start_background_update`Richard van der Hoff2020-03-311-21/+0
* | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-2/+8
|/
* Fill in the 'default' field for user-defined push rules (#6639)Karlinde2020-03-311-0/+1
* Only setdefault for signatures if device has key_json (#7177)Andrew Morgan2020-03-311-10/+14
* Fix use of async/await in media code (#7184)Patrick Cloke2020-03-311-2/+2
* Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-13/+58
* Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-301-3/+23
* Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-271-1/+2
* Only import sqlite3 when type checking (#7155)David Vo2020-03-271-2/+5
* Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-255-199/+201
* Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-242-8/+7
* Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-203-16/+31
* Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-192-65/+72
|\
| * Comments from reviewErik Johnston2020-03-181-8/+19
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devi...Erik Johnston2020-03-021-1/+3
| |\
| * | Remove handling of multiple rows per IDErik Johnston2020-02-281-34/+1
| * | Change device list replication to match new semantics.Erik Johnston2020-02-281-6/+9
| * | Change device lists stream to have one row per id.Erik Johnston2020-02-281-18/+41
| * | Add 'device_lists_outbound_pokes' as extra table.Erik Johnston2020-02-281-1/+4
* | | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-181-1/+149
* | | Populate the room version from state events (#7070)Brendan Abolivier2020-03-162-0/+62
* | | Hopefully mypy is happy nowBrendan Abolivier2020-03-101-2/+8
* | | Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act...Brendan Abolivier2020-03-091-17/+17
|\ \ \
| * | | Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`Brendan Abolivier2020-03-091-17/+17
* | | | Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-091-2/+8
* | | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-061-1/+31
|/ / /
* | / Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-16/+68
| |/ |/|
* | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-021-1/+3
|/
* Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-281-6/+10
* Add some type annotations in `synapse.storage` (#6987)Richard van der Hoff2020-02-276-82/+266
* Store room version on invite (#6983)Richard van der Hoff2020-02-261-0/+20
* Updated warning for incorrect database collation/ctype (#6985)Uday Bansal2020-02-261-3/+7
* Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-252-17/+32
* Merge worker apps into one. (#6964)Erik Johnston2020-02-251-78/+78
* Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-241-0/+17
* Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-2119-55/+56
* don't insert into the device table for remote cross-signing keys (#6956)Hubert Chathi2020-02-201-15/+18
* Add some clarifications to README.md in the database schema directory. (#6615)Ruben Barkow-Kuder2020-02-201-8/+16
* Minor perf fixes to `get_auth_chain_ids`.Erik Johnston2020-02-192-7/+5
* Reduce auth chains fetched during v2 state res. (#6952)Erik Johnston2020-02-191-5/+23
* Revert `get_auth_chain_ids` changes (#6951)Erik Johnston2020-02-191-28/+0
* Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Erik Johnston2020-02-192-15/+59
* Limit size of get_auth_chain_ids query (#6947)Erik Johnston2020-02-191-18/+23
* Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Erik Johnston2020-02-181-0/+23
* wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-171-2/+5
* Remove unused `get_room_stats_state` method. (#6869)Richard van der Hoff2020-02-071-25/+0
* Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-071-359/+361
* Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-062-3/+3
* Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-061-2/+2
|\
| * Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fedHubert Chathi2020-02-051-0/+10
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-041-2/+2
* | Reduce performance logging to DEBUG (#6833)Michael Kaye2020-02-051-1/+1
* | Database updates to populate rooms.room_version (#6847)Richard van der Hoff2020-02-042-0/+57
* | add device signatures to device key query resultsHubert Chathi2020-02-041-0/+10
|/
* Fix deleting of stale marker for device lists (#6819)Erik Johnston2020-01-311-7/+7
* Add `get_room_version` methodRichard van der Hoff2020-01-311-1/+24
* s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-312-2/+2
* Log when we delete room in bg update (#6816)Erik Johnston2020-01-301-0/+2
* Backgroud update to clean out rooms from current state (#6802)Erik Johnston2020-01-302-2/+125
* When server leaves room check for stale device lists. (#6801)Erik Johnston2020-01-302-6/+82
* When a client asks for remote keys check if should resync. (#6797)Erik Johnston2020-01-301-3/+29
* Delete current state when server leaves a room (#6792)Erik Johnston2020-01-292-75/+197
* Detect unknown remote devices and mark cache as stale (#6776)Erik Johnston2020-01-282-5/+49
* Warn if postgres database has non-C locale. (#6734)Erik Johnston2020-01-283-0/+52
* Merge branch 'master' into developErik Johnston2020-01-281-1/+7
|\
| * Fix setting `mau_limit_reserved_threepids` config (#6793)Erik Johnston2020-01-281-1/+7
* | Add `rooms.room_version` column (#6729)Erik Johnston2020-01-273-18/+134
* | Propagate cache invalidates from workers to other workers. (#6748)Erik Johnston2020-01-271-1/+21
* | Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-232-2/+2
* | Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-221-1/+1
|/
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-1/+124
* Allow monthly active user limiting support for worker mode, fixes #4639. (#6742)Neil Johnson2020-01-221-82/+83
* Allow streaming cache invalidate all to workers. (#6749)Erik Johnston2020-01-222-9/+36
* Add a DeltaState to track changes to be made to current state (#6716)Erik Johnston2020-01-202-99/+111
* Fix syntax error in run_upgrade for schema 57 (#6728)Satsuki Yanagi2020-01-171-3/+4
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-171-5/+5
|\
| * Fixup diffBrendan Abolivier2020-01-161-6/+7
| * Remove get_room_event_after_stream_ordering entirelyBrendan Abolivier2020-01-161-57/+12
| * LintBrendan Abolivier2020-01-161-6/+12
| * Correctly order when selecting before stream orderingBrendan Abolivier2020-01-151-2/+5
| * Fix typoBrendan Abolivier2020-01-151-1/+1
| * Fix instantiation of message retention purge jobsBrendan Abolivier2020-01-151-12/+47
* | move batch_iter to a separate moduleRichard van der Hoff2020-01-166-6/+6
* | Add StateMap type alias (#6715)Erik Johnston2020-01-163-43/+55
* | Fix purge_room admin API (#6711)Erik Johnston2020-01-151-1/+1
* | Add `local_current_membership` table (#6655)Erik Johnston2020-01-154-80/+238
|/
* Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-131-1/+115
* Refuse to start if sqlite is older than 3.11.0Richard van der Hoff2020-01-092-4/+7
* Check postgres version in check_databaseRichard van der Hoff2020-01-091-13/+12
* Modify check_database to take a connection rather than a cursorRichard van der Hoff2020-01-093-10/+11
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-0/+2
* Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-081-120/+128
|\
| * Shuffle the codeErik Johnston2020-01-081-25/+16
| * CommentsErik Johnston2020-01-081-0/+3
| * Do not rely on streaming events, as media repo doesn'tErik Johnston2020-01-081-12/+26
| * Move media admin store functions to worker storeErik Johnston2020-01-081-120/+120
* | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-2/+2
|/
* Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-071-1/+1
|\
| * Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-071-1/+1
* | Add a background update to clear tombstoned rooms from the directory (#6648)Richard van der Hoff2020-01-074-1/+100
* | Async/await for background updates (#6647)Richard van der Hoff2020-01-071-16/+20
* | Merge pull request #6645 from matrix-org/rav/fix_synchrotron_errorRichard van der Hoff2020-01-071-9/+35
|\ \
| * | Clarify documentation on get_event* methodsRichard van der Hoff2020-01-061-9/+35
* | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-061-53/+17
|\ \ \ | |/ / |/| |
| * | Remove unused get_latest_event_ids_and_hashes_in_roomRichard van der Hoff2020-01-061-42/+0
| * | Remove unused get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-30/+0
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ...Richard van der Hoff2020-01-061-0/+35
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-2/+3
| |/
* | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-061-2/+2
* | Add experimental 'databases' config (#6580)Erik Johnston2020-01-061-0/+21
|/
* Split state groups into a separate data store (#6296)Erik Johnston2019-12-2023-1157/+1147
* Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-202-2/+2
* Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-191-0/+18
* Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-191-1/+4
* Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-181-17/+8
* Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-183-15/+23
* Add database config class (#6513)Erik Johnston2019-12-186-19/+93
* Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-161-0/+29
* look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-4/+213
* Fix redacted events being returned in search results ordered by "recent" (#6522)Andrew Morgan2019-12-121-3/+8
* Merge tag 'v1.7.0rc2' into developErik Johnston2019-12-111-0/+5
|\
| * Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-115-11/+41
| |\
| * | Give the server config to the RoomWorkerStoreBrendan Abolivier2019-12-101-0/+5
* | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-112-38/+67
* | | Add dev script to generate full SQL schema files (#6394)Andrew Morgan2019-12-112-19/+13
* | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-111-5/+13
* | | Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-3/+5
| |/ |/|
* | Drop unused indexErik Johnston2019-12-104-13/+18
* | Convert _censor_redactions to async since it awaits on coroutinesErik Johnston2019-12-101-11/+9
* | Only start censor background job after indices are createdErik Johnston2019-12-102-2/+9
* | Fix support for SQLite 3.7.Erik Johnston2019-12-093-2/+22
|/
* Merge pull request #6487 from matrix-org/erikj/pass_in_dbErik Johnston2019-12-0929-122/+162
|\
| * Fix commentErik Johnston2019-12-091-1/+1
| * Fix port db scriptErik Johnston2019-12-061-1/+1
| * Move start up DB checks to main data store.Erik Johnston2019-12-061-0/+7
| * Pass Database into the data storeErik Johnston2019-12-064-26/+23
| * Move are_all_users_on_domain checks to main data store.Erik Johnston2019-12-062-13/+23
| * Change DataStores to accept 'database' param.Erik Johnston2019-12-0625-82/+108
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-092-3/+3
|\ \ | |/ |/|
| * Fixup functions to consistently return deferredsErik Johnston2019-12-062-3/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-063-47/+71
|\ \
| * | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-053-44/+71
| |/
* | Remove unused varErik Johnston2019-12-061-2/+0
* | Move background update handling out of storeErik Johnston2019-12-0517-146/+163
* | CommentsErik Johnston2019-12-053-5/+16
* | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-0544-2192/+2271
|/
* Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseErik Johnston2019-12-0543-507/+508
|\
| * Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0443-500/+492
| * Don't call SQLBaseStore methods from outside storesErik Johnston2019-12-042-8/+17
* | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failureBrendan Abolivier2019-12-041-2/+10
|\ \
| * | Fix background updates for synapse_port_dbBrendan Abolivier2019-12-041-2/+10
| |/
* / get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-34/+0
|/
* Merge pull request #6454 from matrix-org/erikj/clean_base_StoreErik Johnston2019-12-047-190/+218
|\
| * Revert "Move get_user_count_txn out of base store"Erik Johnston2019-12-042-12/+12
| * _CURRENT_STATE_CACHE_NAME is publicErik Johnston2019-12-041-3/+3
| * Move get_user_count_txn out of base storeErik Johnston2019-12-042-12/+12
| * Move cache invalidation to main data storeErik Johnston2019-12-045-112/+141
| * Move event fetch vars to EventWorkStoreErik Johnston2019-12-044-14/+15
| * Move account validity bg updates to registration storeErik Johnston2019-12-042-66/+64
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-041-0/+3
|\ \ | |/ |/|
| * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0422-305/+1024
| |\
| * | Update copyrightsBrendan Abolivier2019-11-051-0/+3
* | | Merge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_indexErik Johnston2019-12-042-1/+24
|\ \ \
| * | | apply changes from reviewHubert Chathi2019-12-031-1/+2
| * | | make cross signing signature index non-uniqueHubert Chathi2019-12-022-1/+23
| | |/ | |/|
* | | Fix exception when a cross-signed device is deleted (#6462)Richard van der Hoff2019-12-041-4/+19
* | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-032-6/+141
|/ /
* | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+13
* | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-272-66/+177
* | Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-2618-239/+547
|\ \
| * | Don't construct a setErik Johnston2019-11-261-6/+3
| * | Fix find_next_generated_user_id_localpartErik Johnston2019-11-261-10/+7
| * | Prevent account_data content from being sent over TCP replication (#6333)Andrew Morgan2019-11-261-3/+3
| |\ \
| | * | Remove content from being sent for account data rdata streamAndrew Morgan2019-11-081-3/+3
| * | | Make sure that we close cursors before returning from a query (#6408)Richard van der Hoff2019-11-252-10/+43
| * | | Merge tag 'v1.6.0rc2' into developRichard van der Hoff2019-11-251-18/+25
| |\ \ \
| | * | | Fix exceptions from background database update for event labels. (#6407)Richard van der Hoff2019-11-251-18/+25
| * | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-2110-22/+16
| |/ / /
| * | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363)Andrew Morgan2019-11-151-2/+15
| * | | Fix guest -> real account upgrade with account validity enabled (#6359)Andrew Morgan2019-11-141-6/+3
| |/ /
| * | Merge pull request #6340 from matrix-org/babolivier/pagination_queryBrendan Abolivier2019-11-081-8/+32
| |\ \
| | * | Incorporate reviewBrendan Abolivier2019-11-081-12/+12
| | * | LintBrendan Abolivier2019-11-071-2/+2
| | * | Only join on event_labels if we're filtering on labelsBrendan Abolivier2019-11-071-9/+24