summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2022-01-18 16:09:04 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2022-01-18 16:09:04 +0000
commitab12c909a20d626cd39f615d1df218d574f826a7 (patch)
tree21096336f89365781e76c57214f0d0846bdec8a5
parentPartially revert #11602 to prevent webclient overriding client resource (#11764) (diff)
downloadsynapse-ab12c909a20d626cd39f615d1df218d574f826a7.tar.xz
1.50.1
-rw-r--r--CHANGES.md13
-rw-r--r--changelog.d/11764.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 20 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 8029a9d21c..ea8b15dcee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,19 @@
+Synapse 1.50.1 (2022-01-18)
+===========================
+
+This release fixes a bug in Synapse 1.50.0 that could prevent clients from being able to connect to Synapse if the `webclient` resource was enabled. Further details are available in [this issue](https://github.com/matrix-org/synapse/issues/11763).
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled. ([\#11764](https://github.com/matrix-org/synapse/issues/11764))
+
+
 Synapse 1.50.0 (2022-01-18)
 ===========================
 
+**This release has a critical bug that may prevent clients from being able to connect. As such, we do not recommend upgrading to 1.50.0, and instead upgrading straight to 1.50.1. Further details are in [this issue](https://github.com/matrix-org/synapse/issues/11763).**
+
 Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life.
 
 No significant changes since 1.50.0rc2.
diff --git a/changelog.d/11764.bugfix b/changelog.d/11764.bugfix
deleted file mode 100644
index 1de5b9c609..0000000000
--- a/changelog.d/11764.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index f1245cd3af..18983f5da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.50.1) stable; urgency=medium
+
+  * New synapse release 1.50.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Jan 2022 16:06:26 +0000
+
 matrix-synapse-py3 (1.50.0) stable; urgency=medium
 
   * New synapse release 1.50.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 201925e91d..5ec9f94174 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.50.0"
+__version__ = "1.50.1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when