summary refs log tree commit diff
path: root/synapse/rest/saml2/response_resource.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:08:31 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:08:31 -0700
commit60a96e42323ec4b2f4b2ed021ad18b033641ba1d (patch)
treec0af76d131472e338d87a49b31944d4a1960c18a /synapse/rest/saml2/response_resource.py
parentMerge commit 'e8c36e527' into dinsic (diff)
parentMerge different Resource implementation classes (#7732) (diff)
downloadsynapse-60a96e42323ec4b2f4b2ed021ad18b033641ba1d.tar.xz
Merge commit '5cdca53aa' into dinsic
* commit '5cdca53aa':
  Merge different Resource implementation classes (#7732)
  Fix inconsistent handling of upper and lower cases of email addresses. (#7021)
  Allow YAML config file to contain None (#7779)
  Fix a typo.
  Move 1.15.2 after 1.16.0rc2.
  1.16.0rc2
  Remove an extraneous space.
  Add links to the fixes.
  Fix tense in the release notes.
  Hack to add push priority to push notifications (#7765)
  Add early returns to `_check_for_soft_fail` (#7769)
  Use symbolic names for replication stream names (#7768)
  Type checking for `FederationHandler` (#7770)
  Fix new metric where we used ms instead of seconds (#7771)
  Fix incorrect error message when database CTYPE was set incorrectly. (#7760)
  Pin link in CHANGES.md
  Fixes to CHANGES.md
Diffstat (limited to 'synapse/rest/saml2/response_resource.py')
-rw-r--r--synapse/rest/saml2/response_resource.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/saml2/response_resource.py b/synapse/rest/saml2/response_resource.py

index 75e58043b4..c10188a5d7 100644 --- a/synapse/rest/saml2/response_resource.py +++ b/synapse/rest/saml2/response_resource.py
@@ -16,10 +16,10 @@ from twisted.python import failure from synapse.api.errors import SynapseError -from synapse.http.server import DirectServeResource, return_html_error +from synapse.http.server import DirectServeHtmlResource, return_html_error -class SAML2ResponseResource(DirectServeResource): +class SAML2ResponseResource(DirectServeHtmlResource): """A Twisted web resource which handles the SAML response""" isLeaf = 1