95ad128851
Merge pull request #4081 from matrix-org/neilj/fix_mau_init
...
fix race condiftion in calling initialise_reserved_users
2018-10-25 16:33:40 +01:00
fcbd488e9a
add new line
2018-10-25 16:13:43 +01:00
b94a43d5b5
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list
2018-10-25 15:25:31 +01:00
e5481b22aa
Use allow/deny
2018-10-25 15:25:21 +01:00
c99b6c66bf
Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin
...
Autocreate autojoin rooms
2018-10-25 15:00:40 +01:00
f8fe98812b
improve comments
2018-10-25 14:58:59 +01:00
f7f487e14c
Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin
2018-10-25 14:40:06 +01:00
edd2d82809
oops, run the check_isort build
2018-10-25 01:06:39 +01:00
46f98a6a29
Only cache the wheels
2018-10-25 01:00:58 +01:00
fc33e81323
Combine the pep8 and check_isort builds into one
...
there's really no point spinning up two separate jobs for these.
2018-10-25 00:59:49 +01:00
77d3b5772f
disable coverage checking
...
I don't think we ever use this, and it slows things down. If we want to use it,
we should just do so on a couple of builds rather than all of them.
2018-10-25 00:36:00 +01:00
a5468eaadf
pep8
2018-10-24 13:54:38 -06:00
81880beff4
It helps to import things
2018-10-24 13:32:13 -06:00
4acb6fe8a3
Move test to where the other integration tests are
2018-10-24 13:24:24 -06:00
9283987f7e
Fix test
...
Debug tests
Try printing the channel
fix
Import and use six
Remove debugging
Disable captcha
Add some mocks
Define the URL
Fix the clock?
Less rendering?
use the other render
Complete the dummy auth stage
Fix last stage of the test
Remove mocks we don't need
2018-10-24 13:23:08 -06:00
54def42c19
Merge branch 'develop' into travis/login-terms
2018-10-24 13:22:59 -06:00
ea69a84bbb
fix style inconsistencies
2018-10-24 17:18:08 +01:00
663d9db8e7
commit transaction before closing
2018-10-24 17:17:30 +01:00
07126e43a4
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
2018-10-24 16:25:39 +01:00
9ec2186586
isort
2018-10-24 16:09:21 +01:00
9532caf6ef
remove trailing whiter space
2018-10-24 16:08:25 +01:00
83d9ca7122
only fetch develop for check-newsfragments
2018-10-24 15:32:18 +01:00
480d98c91f
Disable newsfragment checks on branch builds
2018-10-24 15:31:00 +01:00
ab96ee29c9
reduce git clone depth
2018-10-24 15:30:54 +01:00
0f4fb537ce
fix branch regexp
2018-10-24 15:09:05 +01:00
3e438bfec8
also build on release branches
2018-10-24 15:04:55 +01:00
56a05583ae
Disable travis-ci branch builds for most branches
...
(We really don't need to kick off 10 builds for the branch as well as 10 for
the PR)
2018-10-24 14:43:55 +01:00
94a49e0636
fix tuple
...
Co-Authored-By: neilisfragile <neil@matrix.org>
2018-10-24 14:39:23 +01:00
9f72c209ee
Update changelog.d/3975.feature
...
Co-Authored-By: neilisfragile <neil@matrix.org>
2018-10-24 14:37:36 +01:00
78e8d4c3a5
Merge pull request #4083 from matrix-org/rav/fix_event_filter_validation
...
Allow backslashes in event field filters
2018-10-24 12:05:19 +01:00
3ad359e5be
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
2018-10-24 11:23:49 +01:00
7328039117
Merge pull request #4082 from matrix-org/rav/fix_pep8
...
Fix a number of flake8 errors
2018-10-24 11:23:35 +01:00
3904cbf307
Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase
...
Add v2 state resolution algorithm
2018-10-24 11:12:12 +01:00
7e07d25ed6
Allow backslashes in event field filters
...
Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which
meant that single backslashes were not allowed in event field filters.
The intention here is to allow single-backslashes, but disallow
double-backslashes.
2018-10-24 11:11:24 +01:00
ef771cc4c2
Fix a number of flake8 errors
...
Broadly three things here:
* disable W504 which seems a bit whacko
* remove a bunch of `as e` expressions from exception handlers that don't use
them
* use `r""` for strings which include backslashes
Also, we don't use pep8 any more, so we can get rid of the duplicate config
there.
2018-10-24 10:39:03 +01:00
b313b9b009
isort
2018-10-24 10:02:41 +01:00
47a9ba435d
Use match rather than search
2018-10-24 09:54:57 +01:00
e0b9d5f0af
Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts
...
Clean up the way logcontexts and threads work in the pushers
2018-10-24 09:53:57 +01:00
dacbeb2e03
Comment
2018-10-24 09:47:49 +01:00
810715f79a
Rename resolve_events_with_factory
2018-10-24 09:44:22 +01:00
cb23aa4c42
Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation
...
Clean up room alias creation
2018-10-24 09:40:27 +01:00
c573794b22
Fix start_pushers vs _start_pushers confusion
2018-10-24 09:24:55 +01:00
e564306e31
sanity-check the is_processing flag
...
... and rename it, for even more sanity
2018-10-24 09:23:33 +01:00
a67d8ace9b
remove errant exception and style
2018-10-23 17:44:39 +01:00
43c3f0b02f
Merge pull request #3969 from turt2live/travis/fix-federated-group-requests
...
Handle HttpResponseException more safely for federated groups
2018-10-23 10:41:04 -06:00
3e704822be
Comments help
2018-10-23 10:25:31 -06:00
329d18b39c
remove white space
2018-10-23 15:27:20 +01:00
6105c6101f
fix race condiftion in calling initialise_reserved_users
2018-10-23 15:24:58 +01:00
b3f6dddad2
Give some more things logcontexts ( #4077 )
2018-10-23 14:29:17 +01:00
5c445114d3
Correctly account for cpu usage by background threads ( #4074 )
...
Wrap calls to deferToThread() in a thing which uses a child logcontext to
attribute CPU usage to the right request.
While we're in the area, remove the logcontext_tracer stuff, which is never
used, and afaik doesn't work.
Fixes #4064
2018-10-23 13:12:32 +01:00
Neil Johnson