Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,955 Commits 930 Branches 724 Tags 440 MiB
Commit Graph

10955 Commits

Author SHA1 Message Date
Amber Brown febe0ec8fd
Run Prometheus on a different port, optionally. (#3274) 2018-05-31 19:04:50 +10:00
Amber Brown c936a52a9e
Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307) 2018-05-31 19:03:47 +10:00
Amber Brown 872cf43516
Merge pull request #3303 from NotAFile/py3-memoryview 
use memoryview in py3
 2018-05-30 12:51:42 +10:00
Amber Brown debff7ae09
Merge pull request #3281 from NotAFile/py3-six-isinstance 
remaining isintance fixes
 2018-05-30 12:44:46 +10:00
Richard van der Hoff 34b85df7f5 Update some comments and docstrings in SyncHandler 2018-05-29 22:31:18 +01:00
Richard van der Hoff 711f61a31d
Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr 
Exempt AS-registered users from doing gdpr
 2018-05-29 20:25:12 +01:00
Richard van der Hoff a995fdae39 fix tests 2018-05-29 20:19:29 +01:00
Richard van der Hoff 4a9cbdbc15 Exempt AS-registered users from doing gdpr 2018-05-29 19:54:32 +01:00
Richard van der Hoff db2e4608ab
Merge pull request #3302 from krombel/py3_extend_tox_testing 
extend tox testing for py3 to avoid regressions
 2018-05-29 17:37:52 +01:00
Adrian Tschira 4b9d0cde97 add remaining memoryview changes 2018-05-29 17:42:43 +02:00
Adrian Tschira 7873cde526 pep8 2018-05-29 17:35:55 +02:00
Adrian Tschira 1afafb3497 use memoryview in py3 
Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-05-29 17:14:34 +02:00
Krombel d6cd55532b extend tox testing for py3 to avoid regressions 2018-05-29 16:02:41 +02:00
Amber Brown 235b53263a
Merge pull request #3299 from matrix-org/matthew/macos-fixes 
disable CPUMetrics if no /proc/self/stat
 2018-05-29 11:45:45 +10:00
Matthew Hodgson ff1bc0a279 pep8 2018-05-29 02:32:15 +01:00
Matthew Hodgson adb6bac4d5 fix another dumb typo 2018-05-29 02:29:22 +01:00
Matthew Hodgson 0a240ad36e disable CPUMetrics if no /proc/self/stat 
fixes build on macOS again
 2018-05-29 02:23:30 +01:00
Matthew Hodgson 284e36ad04 fix dumb typo 2018-05-29 02:23:11 +01:00
Amber Brown 81717e8515
Merge pull request #3256 from matrix-org/3218-official-prom 
Switch to the Python Prometheus library
 2018-05-28 23:30:09 +10:00
Amber Brown 57ad76fa4a fix up tests 2018-05-28 19:51:53 +10:00
Amber Brown 3ef5cd74a6 update to more consistently use seconds in any metrics or logging 2018-05-28 19:39:27 +10:00
Amber Brown 5c40ce3777 invalid syntax :( 2018-05-28 19:16:09 +10:00
Amber Brown 357c74a50f add comment about why unreg 2018-05-28 19:14:41 +10:00
Amber Brown a2eb5db4a0 update metrics to be in seconds 2018-05-28 19:10:27 +10:00
Amber Brown 754826a830 Merge remote-tracking branch 'origin/develop' into 3218-official-prom 2018-05-28 18:57:23 +10:00
Richard van der Hoff 60f09b1e11
Merge pull request #3288 from matrix-org/rav/no_spam_guests 
Avoid sending consent notice to guest users
 2018-05-25 11:44:45 +01:00
Richard van der Hoff 66bdae986f Fix default for send_server_notice_to_guests 
bool("False") == True...
 2018-05-25 11:42:05 +01:00
Richard van der Hoff ba1b163590 Avoid sending consent notice to guest users 
we think it makes sense not to send the notices to guest users.
 2018-05-25 11:36:43 +01:00
Richard van der Hoff 41921ac01b
Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room 
Let users leave the server notice room after joining
 2018-05-25 11:15:45 +01:00
Richard van der Hoff 757ed27258 Let users leave the server notice room after joining 
They still can't reject invites, but we let them leave it.
 2018-05-25 11:07:21 +01:00
Adrian Tschira 4ee4450d66 fix recursion error 2018-05-24 21:44:10 +02:00
Amber Brown 9c36c150e7
Merge pull request #3283 from NotAFile/py3-state 
py3-ize state.py
 2018-05-24 14:23:33 -05:00
Amber Brown cc1349c06a
Merge pull request #3279 from NotAFile/py3-more-iteritems 
more six iteritems
 2018-05-24 14:23:13 -05:00
Amber Brown 5b788aba90
Merge pull request #3280 from NotAFile/py3-more-misc 
More Misc. py3 fixes
 2018-05-24 14:22:59 -05:00
Adrian Tschira 0e61705661 py3-ize state.py 2018-05-24 20:59:00 +02:00
Adrian Tschira dd068ca979 remaining isintance fixes 
Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-05-24 20:55:08 +02:00
Adrian Tschira 17a70cf6e9 Misc. py3 fixes 
Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-05-24 20:20:33 +02:00
Adrian Tschira 6c16a4ec1b more iteritems 2018-05-24 20:19:06 +02:00
Amber Brown 7ea07c7305
Merge pull request #3278 from NotAFile/py3-storage-base 
Py3 storage/_base.py
 2018-05-24 13:08:09 -05:00
Amber Brown 1f69693347
Merge pull request #3244 from NotAFile/py3-six-4 
replace some iteritems with six
 2018-05-24 13:04:07 -05:00
Amber Brown c4fb15a06c
Merge pull request #3246 from NotAFile/py3-repr-string 
use repr, not str
 2018-05-24 13:00:20 -05:00
Amber Brown 36501068d8
Merge pull request #3247 from NotAFile/py3-misc 
Misc Python3 fixes
 2018-05-24 12:58:37 -05:00
Amber Brown 2aff6eab6d
Merge pull request #3245 from NotAFile/batch-iter 
Add batch_iter to utils
 2018-05-24 12:54:12 -05:00
Adrian Tschira 095292304f Py3 storage/_base.py 
Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-05-24 18:24:12 +02:00
David Baker ecc4b88bd1
Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir 
Remove users from user directory on deactivate
 2018-05-24 16:12:12 +01:00
Erik Johnston 46345187cc
Merge pull request #3243 from NotAFile/py3-six-3 
Replace some more comparisons with six
 2018-05-24 16:08:57 +01:00
Neil Johnson 037c6db85d Merge branch 'master' into develop 2018-05-24 16:03:44 +01:00
David Baker 7a1af504d7 Remove users from user directory on deactivate 2018-05-24 15:59:58 +01:00
Neil Johnson 14ca678674
Update CHANGES.rst 2018-05-24 15:54:02 +01:00
Neil Johnson 6f67163c63
Update CHANGES.rst 2018-05-24 15:04:41 +01:00