summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 17:44:46 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 17:44:46 +0100
commit19b433e3f42d29bbc22ccf919b5dbdb0e88e5fdc (patch)
tree6b3fc312c783390b2d984ddf30310a996ddd276e /changelog.d
parentremove blank line (diff)
parentMerge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff)
downloadsynapse-19b433e3f42d29bbc22ccf919b5dbdb0e88e5fdc.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/3660.misc1
-rw-r--r--changelog.d/3669.misc1
-rw-r--r--changelog.d/3670.feature1
-rw-r--r--changelog.d/3681.bugfix1
-rw-r--r--changelog.d/3684.misc1
-rw-r--r--changelog.d/3692.bugfix1
6 files changed, 6 insertions, 0 deletions
diff --git a/changelog.d/3660.misc b/changelog.d/3660.misc
new file mode 100644
index 0000000000..acd814c273
--- /dev/null
+++ b/changelog.d/3660.misc
@@ -0,0 +1 @@
+Sytests can now be run inside a Docker container.
diff --git a/changelog.d/3669.misc b/changelog.d/3669.misc
new file mode 100644
index 0000000000..fc579ddc60
--- /dev/null
+++ b/changelog.d/3669.misc
@@ -0,0 +1 @@
+Update docker base image from alpine 3.7 to 3.8.
diff --git a/changelog.d/3670.feature b/changelog.d/3670.feature
new file mode 100644
index 0000000000..ba00f2d2ec
--- /dev/null
+++ b/changelog.d/3670.feature
@@ -0,0 +1 @@
+Where server is disabled, block ability for locked out users to read new messages
diff --git a/changelog.d/3681.bugfix b/changelog.d/3681.bugfix
new file mode 100644
index 0000000000..d18a69cd0c
--- /dev/null
+++ b/changelog.d/3681.bugfix
@@ -0,0 +1 @@
+Fixes test_reap_monthly_active_users so it passes under postgres
diff --git a/changelog.d/3684.misc b/changelog.d/3684.misc
new file mode 100644
index 0000000000..4c013263c4
--- /dev/null
+++ b/changelog.d/3684.misc
@@ -0,0 +1 @@
+Implemented a new testing base class to reduce test boilerplate.
diff --git a/changelog.d/3692.bugfix b/changelog.d/3692.bugfix
new file mode 100644
index 0000000000..f44e13dca1
--- /dev/null
+++ b/changelog.d/3692.bugfix
@@ -0,0 +1 @@
+Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users