6ec9d8ba0a
Merge pull request #4045 from matrix-org/rav/fix_get_missing_events
...
Fix incorrect truncation in get_missing_events
2018-10-17 11:40:03 +01:00
c6584f4b5f
clean up config error logic and imports
2018-10-17 11:36:41 +01:00
fc0f13dd03
Fix incorrect truncation in get_missing_events
...
It's quite important that get_missing_events returns the *latest* events in the
room; however we were pulling event ids out of the database until we got *at
least* 10, and then taking the *earliest* of the results.
We also shouldn't really be relying on depth, and should be checking the
room_id.
2018-10-16 21:10:04 +01:00
017eb9d17a
changelog
2018-10-16 16:31:47 +01:00
fc954960e9
Newsfile
2018-10-16 16:28:42 +01:00
b8a5b0097c
Various cleanups in the federation client code ( #4031 )
...
- Improve logging: log things in the right order, include destination and txids
in all log lines, don't log successful responses twice
- Fix the docstring on TransportLayerClient.send_transaction
- Don't use treq.request, which is overcomplicated for our purposes: just use a
twisted.web.client.Agent.
- simplify the logic for setting up the bodyProducer
- fix bytes/str confusions
2018-10-16 10:44:49 +01:00
f293d124b6
Merge branch 'develop' into travis/login-terms
2018-10-15 14:44:32 -06:00
24bc15eab4
update changelog
2018-10-15 22:23:13 +11:00
4e50fe3edb
update changelog
2018-10-15 22:22:49 +11:00
03c11032c3
Merge pull request #4019 from matrix-org/dbkr/e2e_backups
...
E2E backups
2018-10-15 10:19:43 +01:00
c187638ee9
Add information about the matrix-docker-ansible-deploy playbook
...
Signed-off-by: Slavi Pantaleev <slavi@devture.com>
2018-10-14 21:50:18 +03:00
06bc8d2fe5
synapse/app: frontend_proxy.py: actually make workers work on py3
2018-10-14 20:08:39 +03:00
fb216a22db
synapse/visibility.py: fix SyntaxError on py3.7
2018-10-14 20:08:17 +03:00
7ede650956
Merge branch 'develop' into travis/login-terms
2018-10-12 16:24:07 -06:00
e3586f7c06
Merge branch 'develop' into travis/fix-federated-group-requests
2018-10-12 14:49:58 -06:00
a2bfb778c8
improve auto room join logic, comments and tests
2018-10-12 18:17:36 +01:00
381d2cfdf0
Make workers work on Py3 ( #4027 )
2018-10-13 00:14:08 +11:00
49840f5ab2
Update newsfile
2018-10-10 11:31:02 +01:00
20733857ab
Newsfile
2018-10-09 14:18:16 +01:00
d34657e1f2
Add changelog
2018-10-09 11:15:54 +01:00
9eb1a79100
Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions
...
Log looping call exceptions
2018-10-09 10:12:10 +01:00
495975e231
Optimisation for filter_events_for_server
...
We're better off hashing just the event_id than the whole ((type, state_key),
event_id) tuple - so use a dict instead of a set.
Also, iteritems > items.
2018-10-08 13:46:52 +01:00
8164f6daf3
Newsfile
2018-10-05 11:25:09 +01:00
ed82043efb
Merge branch 'develop' into matthew/autocreate_autojoin
2018-10-04 17:26:59 +01:00
c6dbd216e6
Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers
...
Fix bug in forward_extremity update logic
2018-10-04 16:27:05 +01:00
d9f3db5081
Newsfile
2018-10-04 16:03:08 +01:00
d86794325f
Merge branch 'master' into develop
2018-10-04 22:41:52 +10:00
92faeb2a3f
changelog
2018-10-04 22:38:10 +10:00
158d6c75b6
Changelog
2018-10-03 17:54:08 -06:00
a59d899668
Pin to prometheus_client<0.4 to avoid renaming all of our metrics
2018-10-03 17:20:15 +01:00
8935ec5a93
Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion
...
Fix handling of rejected threepid invites
2018-10-03 14:47:41 +01:00
81e2813948
Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration
...
Fix exception in background metrics collection
2018-10-03 14:14:38 +01:00
93a8603904
Newsfile
2018-10-03 11:59:05 +01:00
6e0c66f651
Newsfile
2018-10-03 11:40:02 +01:00
c69faf8c4a
Newsfile
2018-10-03 11:29:44 +01:00
2a4ea3baa8
fix newsfile name
2018-10-03 07:09:25 +01:00
ae61ade891
Fix bug in forward_extremity update logic
...
An event does not stop being a forward_extremity just because an outlier or
rejected event refers to it.
2018-10-02 23:36:08 +01:00
ccce6f26a6
changelog
2018-10-03 02:16:21 +10:00
25baf3b2ac
Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache
...
Fix bug when invalidating destination retry timings
2018-10-02 16:42:28 +01:00
058a4c665e
Remove Jenkins & other old dev junk ( #3988 )
2018-10-03 00:59:11 +10:00
8f614f842d
Newsfile
2018-10-02 15:54:31 +01:00
2b8d28b095
Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error
...
Fix error handling for missing auth_event
2018-10-02 13:57:54 +01:00
7232917f12
Disable frozen dicts by default ( #3987 )
2018-10-02 22:53:47 +10:00
eeb755d17b
Newsfile
2018-10-02 12:06:25 +01:00
8c41b0ca66
Merge pull request #3989 from matrix-org/rav/better_stacktraces
...
Avoid reraise, to improve stacktraces
2018-10-02 10:47:38 +01:00
bc29946809
Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state
...
Fix lazy loaded sync with rejected state events
2018-10-02 11:38:35 +02:00
8174c6725b
Avoid reraise, to improve stacktraces
2018-10-01 18:50:34 +01:00
5908a8f6f5
Merge branch 'develop' into rav/fix_missing_create_event_error
2018-10-01 17:16:20 +01:00
abdc141c2b
Update instructions to point to pip install ( #3985 )
2018-10-02 01:08:38 +10:00
b5b93f45d5
Merge pull request #3968 from matrix-org/rav/fix_federation_errors
...
Fix exceptions when handling incoming transactions
2018-10-01 15:54:24 +01:00
6e05fd032c
Fix userconsent on Python 3 ( #3938 )
2018-10-02 00:11:58 +10:00
5fa27eac78
Newsfile
2018-10-01 14:24:41 +01:00
8f5c23d0cd
Merge pull request #3933 from matrix-org/erikj/destination_retry_cache
...
Add a five minute cache to get_destination_retry_timings
2018-10-01 14:20:30 +02:00
53c5fa4e6c
Further reduce the size of the docker image ( #3972 )
...
Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need.
2018-10-01 12:29:17 +01:00
faa462ef79
changelog
2018-09-29 02:21:01 +01:00
9a8bbc9a59
add --no-admin flag to registration script ( #3836 )
2018-09-28 13:36:56 +01:00
3deaad2fb4
Merge pull request #3964 from matrix-org/rav/remove_localhost_checks
...
remove spurious federation checks on localhost
2018-09-28 13:35:47 +01:00
26557c9db4
Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call
...
Remove redundant call to start_get_pdu_cache
2018-09-28 13:13:19 +01:00
5304449738
build python 3 docker images on circle CI ( #3976 )
2018-09-28 12:36:35 +01:00
19475cf337
Remove redundant call to start_get_pdu_cache
...
I think this got forgotten in #3932 . We were getting away with it because it
was the last call in this function.
2018-09-28 12:01:23 +01:00
9c8cec5dab
Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache
2018-09-28 10:51:09 +01:00
f094f715cf
Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors
2018-09-27 15:18:21 +01:00
36c62a67c4
Merge pull request #3794 from matrix-org/erikj/faster_typing
...
Improve performance of getting typing updates for replication
2018-09-27 15:14:26 +01:00
b5c976347b
Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload
...
Build and push docker image to hub automatically
2018-09-27 15:07:41 +01:00
e1e3e77bfd
Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups
...
Clarifications in FederationHandler
2018-09-27 15:06:59 +01:00
6de3884e5e
Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process
...
Run notify_app_services as a bg process
2018-09-27 23:40:30 +10:00
a512e637ac
Merge pull request #3970 from schnuffle/develop-py3
...
Replaced all occurences of e.message with str(e)
2018-09-27 23:39:45 +10:00
b3064532d0
Run our oldest supported configuration in CI ( #3952 )
2018-09-27 23:21:54 +10:00
861c063ebc
Update 3970.bugfix
2018-09-27 22:47:01 +10:00
a873896096
Added changelog fragment
2018-09-27 14:01:44 +02:00
51d33d5178
Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts
...
fix #3854 MAU transaction errors
2018-09-27 12:31:37 +01:00
74bbdd0412
Do the changelog.d dance
2018-09-27 12:01:43 +01:00
948a6d8776
changelog
2018-09-27 11:37:39 +01:00
ad8e137062
changelog
2018-09-27 11:31:51 +01:00
92abd3d6d6
Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2
...
Logging improvements
2018-09-27 11:27:46 +01:00
4a15a3e4d5
Include eventid in log lines when processing incoming federation transactions ( #3959 )
...
when processing incoming transactions, it can be hard to see what's going on,
because we process a bunch of stuff in parallel, and because we may end up
recursively working our way through a chain of three or four events.
This commit creates a way to use logcontexts to add the relevant event ids to
the log lines.
2018-09-27 11:25:34 +01:00
ae6ad4cf41
docstrings and unittests for storage.state ( #3958 )
...
I spent ages trying to figure out how I was going mad...
2018-09-27 11:22:25 +01:00
2a7b3439de
Changelog
2018-09-26 13:51:34 -06:00
e70b4ce069
Logging improvements
...
Some logging tweaks to help with debugging incoming federation transactions
2018-09-26 17:36:14 +01:00
3c37c7e45b
changelog
2018-09-26 17:01:30 +01:00
0c4a99ea2d
changelog
2018-09-26 16:54:54 +01:00
ab59f3d8da
changelog
2018-09-26 16:52:24 +01:00
d514608b5c
towncrier
2018-09-26 16:19:53 +01:00
d4e0861ff9
Reduce the load on our CI ( #3957 )
...
* changelog
* reduce circleci config
* plus a handy script
* fix regex
2018-09-27 00:23:21 +10:00
a5e70b31a1
changelog
2018-09-26 14:41:14 +01:00
4e8276a34a
Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len
...
Fix ExpiringCache.__len__ to be accurate
2018-09-26 13:10:13 +01:00
5b4028fa78
Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache
2018-09-26 12:55:53 +01:00
66a1d57adb
Merge pull request #3948 from matrix-org/rav/no_symlink_synctl
...
Move synctl into top dir to avoid a symlink
2018-09-26 21:41:58 +10:00
c2185f14d7
Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu
...
Comments and interface cleanup for on_receive_pdu
2018-09-26 21:41:26 +10:00
8ac9fa7375
changelog
2018-09-26 12:35:10 +01:00
f65163627f
Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3
...
make python 3 work in the docker container
2018-09-25 15:18:09 +01:00
a1cd37390f
Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache
2018-09-25 12:03:54 +01:00
4c3e7eeec5
Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches
...
Fix some instances of ExpiringCache not expiring cache items
2018-09-25 12:02:57 +01:00
6cf261930a
added "media-src: 'self'" to CSP for resources ( #3578 )
...
Synapse doesn’t allow for media resources to be played directly from
Chrome. It is a problem for users on other networks (e.g. IRC)
communicating with Matrix users through a gateway. The gateway sends
them the raw URL for the resource when a Matrix user uploads a video
and the video cannot be played directly in Chrome using that URL.
Chrome argues it is not authorized to play the video because of the
Content Security Policy. Chrome checks for the "media-src" policy which
is missing, and defauts to the "default-src" policy which is "none".
As Synapse already sends "object-src: 'self'" I thought it wouldn’t be
a problem to add "media-src: 'self'" to the CSP to fix this problem.
2018-09-25 11:55:02 +01:00
94f7befc31
Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered
...
Fix spurious exceptions when client closes conncetion
2018-09-25 11:52:06 +01:00
bd469adaa9
changelog
2018-09-25 11:22:17 +01:00
45a1053d44
changelog
2018-09-25 10:45:34 +01:00
787d22ed6c
Only lazy load self-members on initial sync
...
Given we have disabled lazy loading for incr syncs in #3840 , we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline.
2018-09-25 00:49:26 +01:00
04eed80a73
Merge branch 'master' into develop
2018-09-24 23:42:25 +10:00
5230bc1471
Newsfile
2018-09-21 15:05:37 +01:00
d3f80cbc9c
Newsfile
2018-09-21 14:24:39 +01:00
ad53a5497d
Merge pull request #3927 from matrix-org/erikj/handle_background_errors
...
Handle exceptions thrown by background tasks
2018-09-21 09:26:30 +01:00
a2ddaa90f2
Always LL ourselves if we're in a room to simplify clients ( #3916 )
...
Should fix https://github.com/vector-im/riot-web/issues/7209
2018-09-20 21:21:54 +01:00
168491c412
Newsfile
2018-09-20 16:16:52 +01:00
3af7a95a9d
add changelog
2018-09-20 14:55:11 +02:00
13f6f1624b
Newsfile
2018-09-20 13:52:09 +01:00
23b53b4ef8
Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links
...
Neilj/fix room invite mail links
2018-09-20 13:32:38 +01:00
6bb9a4b1d6
changelog
2018-09-20 13:15:20 +01:00
1f3f5fcf52
Fix client IPs being broken on Python 3 ( #3908 )
2018-09-20 20:14:34 +10:00
3fd68d533b
Merge pull request #3914 from matrix-org/erikj/remove_retry_cache
...
Remove get_destination_retry_timings cache
2018-09-20 10:54:49 +01:00
741571cf22
Add a way to run tests in PostgreSQL in Docker ( #3699 )
2018-09-20 18:12:45 +10:00
aeca5a5ed5
Add a regression test for logging on failed connections ( #3912 )
2018-09-20 16:28:18 +10:00
642199570c
Improve the logging when handling a federation transaction ( #3904 )
...
Let's try to rationalise the logging that happens when we are processing an
incoming transaction, to make it easier to figure out what is going wrong when
they take ages. In particular:
- make everything start with a [room_id event_id] prefix
- make sure we log a warning when catching exceptions rather than just turning
them into other, more cryptic, exceptions.
2018-09-19 17:28:18 +01:00
ce846bb620
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing
2018-09-19 15:08:36 +01:00
1a24d4effa
Newsfile
2018-09-19 15:03:05 +01:00
bbab6ebfd9
Fix up changelog and remove spurious comment
2018-09-19 14:45:14 +01:00
83ee5592a5
Newsfile
2018-09-19 14:22:59 +01:00
80d2d50f47
Fixup
2018-09-19 11:19:47 +01:00
6bbe3d5732
Newsfile
2018-09-19 10:43:13 +01:00
05b9937cd7
update changelog for #3909
2018-09-19 09:17:54 +01:00
47c02e6332
Merge pull request #3909 from turt2live/travis/fix-logging-1
...
Fix matrixfederationclient.py logging: Destination is a string
2018-09-19 18:14:47 +10:00
3f0d8e6b09
Remove documentation referencing Cygwin ( #3873 )
2018-09-19 18:14:30 +10:00
3d6b24fb1b
Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name
...
Set SNI to the server_name, not whatever was in the SRV record
2018-09-19 17:59:33 +10:00
f773ecbd61
Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout
...
Bump timeout on get_missing_events request
2018-09-19 17:57:48 +10:00
13b31a9baf
Changelog
2018-09-18 15:30:25 -06:00
38ead946a9
Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links
2018-09-18 19:02:45 +01:00
a219ce8726
Use directory server for room joins ( #3899 )
...
When we do a join, always try the server we used for the alias lookup first.
Fixes #2418
2018-09-18 18:27:37 +01:00
31c15dcb80
Refactor matrixfederationclient to fix logging ( #3906 )
...
We want to wait until we have read the response body before we log the request
as complete, otherwise a confusing thing happens where the request appears to
have completed, but we later fail it.
To do this, we factor the salient details of a request out to a separate
object, which can then keep track of the txn_id, so that it can be logged.
2018-09-18 18:17:15 +01:00
c600886d47
Merge pull request #3894 from matrix-org/hs/phone_home_py_version
...
Add python_version phone home stat
2018-09-19 02:40:04 +10:00
edabc18938
changelog
2018-09-18 17:04:20 +01:00
8565d9a9fe
changelog
2018-09-18 15:05:26 +01:00
286d6930b7
Merge pull request #3879 from matrix-org/matthew/fix-autojoin
...
don't ratelimit autojoins
2018-09-18 13:07:01 +01:00
892432c818
Merge pull request #3882 from SimmyD/max_upload_docker_var
...
Add variable for changing the max upload size in Docker container
2018-09-18 13:05:09 +01:00
1e09a1d48a
Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias
...
Return a 404 when deleting unknown room alias
2018-09-18 12:59:30 +01:00
ad95ec12ca
Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics
...
Fix more b'abcd' noise in metrics
2018-09-18 12:58:49 +01:00
505abb38f0
Add changelog
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-09-17 22:07:19 -05:00
2b41f2ed76
Create 3894.feature
2018-09-17 17:48:48 +01:00
06f2dbbb5d
changelog
2018-09-17 17:18:26 +01:00
0cb7afff35
changelog
2018-09-17 16:17:25 +01:00
c1ae6b1bce
changelog
2018-09-17 13:21:08 +01:00
2a8996b67d
changelog
2018-09-17 11:51:38 +01:00
0e46ff6904
Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.
...
Signed-off-by: Simon Dwyer <simon@thedwyers.co>
2018-09-16 13:33:33 +10:00
c71b93f2a4
changelog
2018-09-15 22:28:28 +01:00
9d13ff4da8
missing changelog
2018-09-15 21:04:10 +01:00
335b23a078
Newsfile
2018-09-14 19:25:58 +01:00
024be6cf18
don't filter membership events based on history visibility ( #3874 )
...
don't filter membership events based on history visibility
as we will already have filtered the messages in the timeline, and state events
are always visible.
and because @erikjohnston said so.
2018-09-14 18:12:52 +01:00
3e6e94fe9f
Merge pull request #3872 from matrix-org/hawkowl/timeouts-2
...
timeouts 2: electric boogaloo
2018-09-14 16:58:44 +01:00
90f8e606e2
changelog
2018-09-15 00:23:55 +10:00
941ac0f085
Newsfile
2018-09-14 15:08:37 +01:00
bef1d6f3bf
towncrier
2018-09-13 22:53:35 +01:00
984db8bb08
Create 3860.misc
2018-09-13 12:06:04 -06:00
7c27c4d51c
merge ( #3576 )
2018-09-14 03:11:11 +10:00
6c0f8d9d50
Merge pull request #3856 from matrix-org/erikj/speed_up_purge
...
Make purge history slightly faster
2018-09-13 16:14:46 +01:00
cb64fe2cb7
Merge pull request #3859 from matrix-org/erikj/add_iterkeys
...
Fix handling of redacted events from federation
2018-09-14 01:06:44 +10:00
13193a6e2b
Newsfile
2018-09-13 15:46:45 +01:00
3126b88d35
fix circleci merged builds ( #3858 )
...
* fix
* changelog
2018-09-14 00:44:31 +10:00
bfa0b759e0
Attempt to figure out what's going on with timeouts ( #3857 )
2018-09-14 00:15:51 +10:00
93139a1fb8
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_purge
2018-09-13 12:57:09 +01:00
e7cd7cb0f0
Newsfile
2018-09-13 12:55:40 +01:00
b7d2fb5eb9
Remove some superfluous logging ( #3855 )
2018-09-13 19:59:32 +10:00
f30a303590
Merge pull request #3846 from matrix-org/neilj/expose-registered-users
...
expose number of real reserved users
2018-09-12 17:14:04 +01:00
2ac1abbc7e
show heroes if a room has a 'deleted' name/canonical_alias ( #3851 )
2018-09-12 17:11:05 +01:00
fa0d464fa4
Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time
...
Log outbound requests when we retry
2018-09-12 16:55:40 +01:00
3db016b641
Newsfile
2018-09-12 16:25:18 +01:00
8decd6233d
improve naming
2018-09-12 16:22:15 +01:00
54f8616d2c
Merge pull request #3841 from matrix-org/erikj/manhole_key_length
...
Change the manhole SSH key to have more bits
2018-09-12 14:33:39 +01:00
65cd8ccc79
Add JUnit summaries to CircleCI as well as merged runs ( #3704 )
2018-09-12 23:29:21 +10:00
7ca097f77e
Port federation/ to py3 ( #3847 )
2018-09-12 23:23:32 +10:00
5cea4e16c7
towncrier
2018-09-12 12:03:31 +01:00
546aee7e52
Merge pull request #3835 from krombel/fix_3821
...
fix VOIP crashes under Python 3
2018-09-12 20:44:18 +10:00
33716c4aea
Merge pull request #3826 from matrix-org/rav/logging_for_keyring
...
add some logging for the keyring queue
2018-09-12 20:43:47 +10:00
bc635026c5
Merge pull request #3824 from matrix-org/rav/fix_jwt_import
...
Fix jwt import check
2018-09-12 20:41:57 +10:00
02aa41809b
Port rest/ to Python 3 ( #3823 )
2018-09-12 20:41:31 +10:00
8fd93b5eea
Port crypto/ to Python 3 ( #3822 )
2018-09-12 20:16:31 +10:00
649c647955
Newsfile
2018-09-12 11:03:42 +01:00
b041115415
Speed up lazy loading ( #3827 )
...
* speed up room summaries by pulling their data from room_memberships rather than room state
* disable LL for incr syncs, and log incr sync stats (#3840 )
2018-09-12 00:50:39 +01:00
f8825748dd
changelog.d entry somehow got lost
2018-09-11 12:56:31 +02:00
9a68778ac2
Newsfile
2018-09-11 10:44:40 +01:00
e957428a15
Newsfile
2018-09-10 14:53:05 +00:00
3572a206d3
add changelog
2018-09-10 14:33:08 +02:00
1e4c7fff5f
changelog
2018-09-07 16:37:30 +01:00
9a5ea511b5
Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join
...
Send existing room tags down sync on join
2018-09-07 23:28:42 +10:00
edda9f5cac
changelog
2018-09-07 14:23:35 +01:00
771d213ac5
Merge branch 'master' into develop
2018-09-07 21:45:38 +10:00
b60749a1ec
changelog
2018-09-07 21:41:57 +10:00
52ec6e9dfa
Port tests/ to Python 3 ( #3808 )
2018-09-07 02:58:18 +10:00
c5440b2ca0
Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count
...
guest users should not be part of mau total
2018-09-06 17:45:55 +01:00
7298efd361
Newsfile
2018-09-06 17:13:33 +01:00
654324eded
Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus
...
Limit the number of PDUs/EDUs per fedreation transaction
2018-09-07 01:33:31 +10:00
1d371fc5b3
Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis
...
Only start postgres instance for postgres tests on Travis CI
2018-09-07 01:06:21 +10:00
b07a2cbee9
Spelling
2018-09-06 15:53:02 +01:00
70fd75cd1d
Merge pull request #3788 from matrix-org/erikj/remove_conn_id
...
Remove conn_id from repl prometheus metrics
2018-09-07 00:48:19 +10:00
5d848992bf
Newsfile
2018-09-06 15:28:46 +01:00
28f5bfdcf7
Newsfile
2018-09-06 15:25:58 +01:00
ee7c8bd2b5
Merge pull request #3795 from matrix-org/erikj/faster_sync_state
...
User iter* during sync state calculations
2018-09-07 00:24:43 +10:00
135f3b4390
Merge pull request #3804 from matrix-org/rav/fix_openssl_dep
...
bump dep on pyopenssl to 16.x
2018-09-07 00:23:39 +10:00
2608ebc04c
Port handlers/ to Python 3 ( #3803 )
2018-09-07 00:22:23 +10:00
b3c2ebba32
changelog
2018-09-06 12:55:17 +01:00
af3125226d
Create 3802.misc
2018-09-06 10:46:00 +02:00
92657be7d0
towncrier
2018-09-05 22:33:45 +01:00
Richard van der Hoff