summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* more logging improvementsRichard van der Hoff2019-04-251-8/+11
* remove extraneous exception loggingRichard van der Hoff2019-04-252-18/+34
* Clarify logging when PDU signature checking failsRichard van der Hoff2019-04-252-3/+20
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-04-251-0/+2
|\
| * add gpg key fingerprintRichard van der Hoff2019-04-221-0/+2
* | Merge pull request #5098 from matrix-org/rav/fix_pep_517Richard van der Hoff2019-04-253-2/+8
|\ \
| * | ChangelogRichard van der Hoff2019-04-251-0/+1
| * | Add --no-pep-517 to README instructionsRichard van der Hoff2019-04-251-2/+2
| * | set PIP_USE_PEP517 = False for testsRichard van der Hoff2019-04-251-0/+5
* | | Fix handling of SYNAPSE_NO_TLS in docker image (#5005)*=0=1=4=*2019-04-253-2/+16
|/ /
* | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-258-17/+158
* | Remove log error for .well-known/matrix/client (#4972)Michael Kaye2019-04-242-1/+2
* | Prevent "producer not unregistered" message (#5009)Amber Brown2019-04-242-0/+5
* | Merge pull request #5077 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-182-2/+7
|\ \
| * | Don't crash on lack of expiry templatesBrendan Abolivier2019-04-182-2/+7
* | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-04-171-4/+24
|\ \ \ | | |/ | |/|
| * | Update debian install docs for new key and repo (#5074)Richard van der Hoff2019-04-171-5/+25
* | | Merge pull request #5073 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-178-26/+246
|\ \ \ | | |/ | |/|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-17216-10038/+5057
| |\ \ | |/ / |/| |
* | | Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-1717-43/+699
|\ \ \
* \ \ \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-172-0/+19
|\ \ \ \
| * | | | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-172-0/+19
| | |_|/ | |/| |
* | | | Merge pull request #5070 from matrix-org/erikj/postpathErik Johnston2019-04-172-8/+9
|\ \ \ \
| * | | | NewsfileErik Johnston2019-04-161-0/+1
| * | | | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
* | | | | Merge pull request #5065 from matrix-org/erikj/fix_versionsErik Johnston2019-04-162-1/+2
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-04-151-0/+1
| * | | | | VersionRestServlet doesn't take a paramErik Johnston2019-04-151-1/+1
* | | | | | Use packages.matrix.org for packages (#5067)Travis Ralston2019-04-162-3/+4
* | | | | | Add systemd-python to optional dependencies (#4339)Silke Hofstra2019-04-164-10/+13
|/ / / / /
* | | | | Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-154-4/+21
|\| | | |
| * | | | Only handle GET requests for /push_rulesErik Johnston2019-04-152-0/+10
| * | | | NewsfileErik Johnston2019-04-151-0/+1
| * | | | Move some rest endpoints to client readerErik Johnston2019-04-152-4/+10
* | | | | update grafana dashboardRichard van der Hoff2019-04-131-5211/+1
* | | | | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-1112-11/+12
* | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_deltaErik Johnston2019-04-102-1/+4
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-04-091-0/+1
| * | | | | Fix schema upgrade when dropping tablesErik Johnston2019-04-091-1/+3
* | | | | | Fix disappearing exceptions in manhole. (#5035)Richard van der Hoff2019-04-102-2/+58
* | | | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-099-3/+143
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_kRichard van der Hoff2019-04-095-91/+136
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2019-04-091-0/+1
| * | | | | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-093-52/+113
| * | | | | | Rewrite test_keys as a HomeserverTestCaseRichard van der Hoff2019-04-081-19/+15
| * | | | | | Replace SlavedKeyStore with a shimRichard van der Hoff2019-04-081-14/+4
| * | | | | | Remove redundant merged_keys dictRichard van der Hoff2019-04-081-8/+5
* | | | | | | Bump psycopg requirement (#5032)Richard van der Hoff2019-04-092-1/+4
|/ / / / / /
* | | | | | Remove unused server_tls_certificates functions (#5028)Richard van der Hoff2019-04-086-63/+7
* | | | | | add context to phonehome stats (#5020)Neil Johnson2019-04-084-1/+9
* | | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeysRichard van der Hoff2019-04-083-1/+3
|\ \ \ \ \ \
| * | | | | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-083-1/+3
* | | | | | | drop tables listed in #1830 (#4992)Neil Johnson2019-04-0826-757/+43
|/ / / / / /
* | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-084-33/+181
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2019-04-041-0/+1
| * | | | | | Hoist server_name check out of process_v2_responseRichard van der Hoff2019-04-041-13/+7
| * | | | | | Clean up Keyring.process_v2_responseRichard van der Hoff2019-04-041-23/+46
| * | | | | | test for get_keys_from_perspectivesRichard van der Hoff2019-04-041-0/+67
| * | | | | | add a test for get_keys_from_serverRichard van der Hoff2019-04-041-0/+63
| * | | | | | Fix docstring on get_server_keys_jsonRichard van der Hoff2019-04-041-2/+2
* | | | | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-046-1/+81
| |_|/ / / / |/| | | | |
* | | | | | Clean up the database pagination code (#5007)Amber Brown2019-04-053-67/+64
* | | | | | Merge pull request #5002 from matrix-org/erikj/delete_groupErik Johnston2019-04-046-0/+275
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-04-031-0/+1
| * | | | | | Add unit test for deleting groupsErik Johnston2019-04-031-0/+124
| * | | | | | Add admin API for group deletionErik Johnston2019-04-032-0/+40
| * | | | | | Add functions to delete a groupErik Johnston2019-04-032-0/+110
* | | | | | | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-042-0/+10
* | | | | | | Avoid redundant URL encoding (#4555)Marcel Krüger2019-04-042-1/+2
* | | | | | | Merge pull request #5004 from ajensenwaud/developErik Johnston2019-04-042-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix issue #4596Anders2019-04-032-1/+2
* | | | | | | | Correct default POSTGRES_USER in Docker README (#4987)*=0=1=4=*2019-04-042-2/+4
| |/ / / / / / |/| | | | | |
* | | | | | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-0313-20/+32
| |/ / / / / |/| | | | |
* | | | | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-032-107/+105
* | | | | | Remove presence lists (#4989)Neil Johnson2019-04-039-456/+23
* | | | | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-037-17/+216
|\ \ \ \ \ \
| * | | | | | Correctly handle id_server paramErik Johnston2019-04-021-0/+1
| * | | | | | Remove threepid binding if id server returns 400/404/501Erik Johnston2019-04-021-9/+10
| * | | | | | Fixup docstringsErik Johnston2019-04-023-7/+9
| * | | | | | NewsfileErik Johnston2019-04-011-0/+1
| * | | | | | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| * | | | | | Grandfather in existing user threepidsErik Johnston2019-04-012-0/+37
| * | | | | | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-014-8/+20
| * | | | | | For unbind poke IS used during binding of 3PIDErik Johnston2019-04-011-9/+35
| * | | | | | Track IS used to bind 3PIDsErik Johnston2019-04-013-0/+119
* | | | | | | Run black on the rest of the storage module (#4996)Amber Brown2019-04-0342-2455/+2131
* | | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startupErik Johnston2019-04-025-8/+74
|\ \ \ \ \ \ \
| * | | | | | | s/misc/feature/Erik Johnston2019-04-021-0/+0
| * | | | | | | NewsfileErik Johnston2019-04-021-0/+1
| * | | | | | | Make starting pushers faster during start upErik Johnston2019-04-024-8/+73
* | | | | | | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-023-0/+3
* | | | | | | | Add config.signing_key_path. (#4974)Richard van der Hoff2019-04-022-1/+3
|/ / / / / / /
* | / / / / / Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-027-69/+237
| |/ / / / / |/| | | | |
* | | | | | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-012-0/+33
* | | | | | Merge pull request #4981 from matrix-org/manuroe/demo_bypass_account_rate_lim...manuroe2019-04-012-5/+16
|\ \ \ \ \ \
| * | | | | | start.sh: Fix the --no-rate-limit option for messages and make it bypass rate...manuroe2019-04-012-5/+16
* | | | | | | Merge branch 'master' into developNeil Johnson2019-04-0188-89/+107
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-0128-168/+222
| |/ / / / |/| | | |
* | | | | Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.mdRichard van der Hoff2019-03-292-2/+4
|\ \ \ \ \
| * | | | | Add changelog.d entryJurrie Overgoor2019-03-291-0/+1
| * | | | | Add -p argument for docker run command exampleJurrie Overgoor2019-03-291-0/+1
| * | | | | Fix typo in TLS filenamesJurrie Overgoor2019-03-291-2/+2
|/ / / / /
* | | | | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-289-49/+141
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | | | Combine the CurrentStateDeltaStream into the EventStreamRichard van der Hoff2019-03-275-33/+43
| * | | | | Make EventStream rows have a typeRichard van der Hoff2019-03-274-17/+98
* | | | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_rowRichard van der Hoff2019-03-284-5/+22
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_rowRichard van der Hoff2019-03-283-380/+336
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | changelogRichard van der Hoff2019-03-271-0/+1
| * | | | | | Skip building a ROW_TYPE when building updatesRichard van der Hoff2019-03-271-2/+2
| * | | | | | Add parse_row method to replication stream classRichard van der Hoff2019-03-273-3/+19
* | | | | | | remove log line for password (#4965)Neil Johnson2019-03-282-2/+1
* | | | | | | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-283-4/+23
* | | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-285-33/+412
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use an assertErik Johnston2019-03-281-2/+1
| * | | | | | Review commentsErik Johnston2019-03-282-49/+71
| * | | | | | NewsfileErik Johnston2019-03-271-0/+1
| * | | | | | Add unit testsErik Johnston2019-03-271-1/+171
| * | | | | | Use event streams to calculate presenceErik Johnston2019-03-273-32/+219
* | | | | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streamsRichard van der Hoff2019-03-288-77/+136
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | changelogRichard van der Hoff2019-03-271-0/+2
| * | | | | | move FederationStream out to its own fileRichard van der Hoff2019-03-274-23/+43
| * | | | | | move EventsStream out to its own fileRichard van der Hoff2019-03-273-23/+42
| * | | | | | Move replication.tcp.streams into a packageRichard van der Hoff2019-03-274-35/+53
* | | | | | | Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-293-380/+336
|/ / / / / /
* / / / / / Fix/improve some docstrings in the replication code. (#4949)Richard van der Hoff2019-03-273-7/+20
|/ / / / /
| | | | * Add management endpoints for account validityBrendan Abolivier2019-04-178-26/+246
| | | |/
| | | * Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-1717-43/+699
| | |/
| | * Add account expiration featureBrendan Abolivier2019-04-0910-4/+144
| |/
| * 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3Neil Johnson2019-04-013-3/+13
| * convert rst link to mdNeil Johnson2019-04-011-1/+1
| * 0.99.3rc1 v0.99.3rc1Neil Johnson2019-03-2785-85/+93
| * bump versionNeil Johnson2019-03-271-1/+1
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-268-26/+137
* Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-272-8/+21
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-265-11/+13
* Fix ClientReplicationStreamProtocol.__str__ (#4929)Richard van der Hoff2019-03-253-4/+6
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-258-12/+179
* Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-252-18/+17
* Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-252-1/+2
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-255-110/+152
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-228-11/+12
|\
| * NewsfileErik Johnston2019-03-221-0/+1
| * Use yaml safe_loadErik Johnston2019-03-227-11/+11
* | Allow newsfragments to end with exclamation marks! (#4912)Richard van der Hoff2019-03-212-2/+3
* | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-225-230/+124
* | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-215-17/+191
|\ \ | |/ |/|
| * Clean up backoff_on_404 and metehod callsAndrew Morgan2019-03-211-9/+13
| * kwargs doesn't like commas on calling funcs either. TILAndrew Morgan2019-03-201-2/+2
| * lintAndrew Morgan2019-03-202-3/+7
| * New test, fix issuesAndrew Morgan2019-03-202-49/+73
| * Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-202-6/+6
| * Just return if not doing any trailing slash shennanigansAndrew Morgan2019-03-201-0/+2
| * Federation test fixed!Andrew Morgan2019-03-201-2/+5
| * lintAndrew Morgan2019-03-181-1/+1
| * Better exception handlingAndrew Morgan2019-03-182-20/+18
| * Correct var nameAndrew Morgan2019-03-132-2/+56
| * receiving a 400 caused an exception. handle itAndrew Morgan2019-03-131-5/+12
| * is this what purgatory feels likeAndrew Morgan2019-03-131-3/+3
| * i should have given up x3Andrew Morgan2019-03-131-39/+0
| * i should have given up x2Andrew Morgan2019-03-132-18/+52
| * i should have given upAndrew Morgan2019-03-131-1/+1
| * there comes a time when you should give up. but you dontAndrew Morgan2019-03-131-1/+1
| * as aboveAndrew Morgan2019-03-131-2/+4
| * no kwargs todayAndrew Morgan2019-03-131-7/+12
| * Or perhaps I was the one who was drunkAndrew Morgan2019-03-131-6/+3
| * go home python, you're drunkAndrew Morgan2019-03-131-4/+2
| * Syntax checker is borkAndrew Morgan2019-03-131-6/+5
| * Destructure againAndrew Morgan2019-03-131-7/+8
| * Are you happy nowAndrew Morgan2019-03-131-2/+2
| * Syntax testAndrew Morgan2019-03-131-6/+5
| * Remove testing codeAndrew Morgan2019-03-131-3/+0
| * Add missing docstring detailAndrew Morgan2019-03-131-1/+1
| * Fix syntax issuesAndrew Morgan2019-03-131-7/+10
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-133-39/+78
| * Retry on 400:M_UNRECOGNIZEDAndrew Morgan2019-03-131-6/+10
| * Fix paranthesis indentAndrew Morgan2019-03-131-1/+2
| * Add workaround noteAndrew Morgan2019-03-131-10/+4
| * Correct argument nameAndrew Morgan2019-03-121-2/+2
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-123-70/+66
| * and againAndrew Morgan2019-03-111-1/+1
| * Fix syntax errorAndrew Morgan2019-03-111-1/+1
| * We're calling different functions nowAndrew Morgan2019-03-111-2/+2
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-115-12/+14
| |\
| * \ Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-118-19/+57
| |\ \
| * | | lintAndrew Morgan2019-03-081-1/+3
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| * | | Retry certain federation requests on 404Andrew Morgan2019-03-082-5/+50
| * | | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
* | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-214-3/+77
|\ \ \ \
| * | | | Update changelog.d/4908.bugfixRichard van der Hoff2019-03-211-1/+1
| * | | | isortErik Johnston2019-03-211-1/+1
| * | | | NewsfileErik Johnston2019-03-211-0/+1
| * | | | Deny peeking into rooms that have been blockedErik Johnston2019-03-213-3/+76
* | | | | Update Apache Setup To Remove Location Syntax (#4870)Colin W2019-03-212-9/+6
* | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-218-25/+137
|\ \ \ \ \
| * | | | | Fix typo and add descriptionErik Johnston2019-03-211-1/+5
| |/ / / /
| * | | | Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
| * | | | Remove debugErik Johnston2019-03-211-1/+0
| * | | | Add testsErik Johnston2019-03-211-1/+66
| * | | | Fix upsertErik Johnston2019-03-211-0/+1
| * | | | Revert spurious deleteErik Johnston2019-03-201-0/+4
| * | | | comment block_roomErik Johnston2019-03-201-0/+9
| * | | | Use flagsErik Johnston2019-03-205-15/+17
| * | | | Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| * | | | NewsfileErik Johnston2019-03-201-0/+1
| * | | | Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| * | | | Log new room IDErik Johnston2019-03-201-1/+6
| * | | | Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
| * | | | Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
* | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-217-3/+97
|\ \ \ \ \
| * | | | | Add testErik Johnston2019-03-202-3/+58
| * | | | | Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| * | | | | Pull out config optionErik Johnston2019-03-201-3/+3
| * | | | | Return before we logErik Johnston2019-03-201-4/+5
| * | | | | Fix up config commentsErik Johnston2019-03-202-6/+8
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| * | | | | Add option to disable search room listsErik Johnston2019-03-193-0/+27
* | | | | | Log requests which are simulated by the unit tests. (#4905)Richard van der Hoff2019-03-202-8/+2
* | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-205-0/+73
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add testErik Johnston2019-03-201-0/+52
| * | | | | Fix up sample configErik Johnston2019-03-202-4/+8
| * | | | | Update synapse/config/user_directory.pyRichard van der Hoff2019-03-201-1/+1
| * | | | | Update sample configErik Johnston2019-03-191-0/+3
| * | | | | NewsfileErik Johnston2019-03-191-0/+1
| * | | | | Add option to disable searching in the user dirErik Johnston2019-03-192-0/+13
| |/ / / /
* | | | | Batching in the user directory import (#4900)Amber Brown2019-03-212-0/+14
* | | | | Add a config option for torture-testing worker replication. (#4902)Richard van der Hoff2019-03-203-1/+23
* | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-207-22/+308
|/ / / /
* | | | Merge pull request #4894 from matrix-org/erikj/postgres_tuningErik Johnston2019-03-192-2/+21
|\ \ \ \
| * | | | NewsfileErik Johnston2019-03-191-0/+1
| * | | | Add note on tuning postgresErik Johnston2019-03-191-2/+20
|/ / / /
* | | | Merge pull request #4879 from matrix-org/erikj/test_old_depsErik Johnston2019-03-193-1/+21
|\ \ \ \
| * | | | Add comment back inErik Johnston2019-03-191-0/+1
| * | | | Update newsfileErik Johnston2019-03-191-1/+1
| * | | | Revert changesErik Johnston2019-03-191-12/+2
| * | | | Bring py27-old into line with other test envsErik Johnston2019-03-181-0/+14
| * | | | Add coverage to py27-oldErik Johnston2019-03-181-3/+6
| * | | | NewsfileErik Johnston2019-03-181-0/+1
| * | | | Add py27-old test case to buildkiteErik Johnston2019-03-181-0/+11
* | | | | Merge pull request #4889 from matrix-org/rav/test_real_configRichard van der Hoff2019-03-198-18/+44
|\ \ \ \ \
| * | | | | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
| * | | | | changelogRichard van der Hoff2019-03-191-0/+1
| * | | | | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-193-13/+25
| * | | | | Fix resource limits testsRichard van der Hoff2019-03-191-2/+5
| * | | | | Fix registration testRichard van der Hoff2019-03-191-1/+2
| * | | | | Fix email testRichard van der Hoff2019-03-191-0/+2
| * | | | | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-1910-11/+45
| |\ \ \ \ \
* | | | | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hsRichard van der Hoff2019-03-193-3/+24
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-193-3/+24
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-28 21:48:43 +0000