summary refs log tree commit diff
path: root/synapse/storage/registration.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-24 17:03:50 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-24 17:03:50 +0100
commit9b7c4f40782b09000141d7311fc39d387336350a (patch)
tree0c64c6ace7581c2f4e83c6b79159a11d35fc20e1 /synapse/storage/registration.py
parentMerge remote-tracking branch 'origin/develop' into rav/saml_mapping_work (diff)
parentremove unused parameter to get_user_id_by_threepid (#6099) (diff)
downloadsynapse-9b7c4f40782b09000141d7311fc39d387336350a.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work
Diffstat (limited to 'synapse/storage/registration.py')
-rw-r--r--synapse/storage/registration.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index c7783151f6..ee5e85db84 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -516,7 +516,7 @@ class RegistrationWorkerStore(SQLBaseStore):
         )
 
     @defer.inlineCallbacks
-    def get_user_id_by_threepid(self, medium, address, require_verified=False):
+    def get_user_id_by_threepid(self, medium, address):
         """Returns user id from threepid
 
         Args: