diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 16:38:18 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 16:38:18 +0100 |
| commit | 5d6e3a2c8363563c9bb73449e3fd5876282a046d (patch) | |
| tree | e0596d91a45c84923a423fd59651ea79a1e49da0 | |
| parent | lint (diff) | |
| download | synapse-5d6e3a2c8363563c9bb73449e3fd5876282a046d.tar.xz | |
Remove debug logging and make diff nicer
| -rw-r--r-- | changelog.d/5308.feature | 1 | ||||
| -rw-r--r-- | changelog.d/5345.feature | 1 | ||||
| -rw-r--r-- | changelog.d/5368.feature | 1 | ||||
| -rw-r--r-- | docs/sample_config.yaml | 2 | ||||
| -rw-r--r-- | synapse/config/emailconfig.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/changelog.d/5308.feature b/changelog.d/5308.feature deleted file mode 100644 index 6aae41847a..0000000000 --- a/changelog.d/5308.feature +++ /dev/null @@ -1 +0,0 @@ -Add ability to perform password reset via email without trusting the identity server. diff --git a/changelog.d/5345.feature b/changelog.d/5345.feature deleted file mode 100644 index 6aae41847a..0000000000 --- a/changelog.d/5345.feature +++ /dev/null @@ -1 +0,0 @@ -Add ability to perform password reset via email without trusting the identity server. diff --git a/changelog.d/5368.feature b/changelog.d/5368.feature deleted file mode 100644 index 6aae41847a..0000000000 --- a/changelog.d/5368.feature +++ /dev/null @@ -1 +0,0 @@ -Add ability to perform password reset via email without trusting the identity server. diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index d8cf540f95..2392a11dce 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1025,7 +1025,7 @@ password_config: # smtp_pass variables should be used # #email: -# enable_notifs: False +# enable_notifs: false # smtp_host: "localhost" # smtp_port: 25 # SSL: 465, STARTTLS: 587 # smtp_user: "exampleusername" diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index 19d38d7d89..ae04252906 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -231,7 +231,7 @@ class EmailConfig(Config): # smtp_pass variables should be used # #email: - # enable_notifs: False + # enable_notifs: false # smtp_host: "localhost" # smtp_port: 25 # SSL: 465, STARTTLS: 587 # smtp_user: "exampleusername" diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 75822823c3..e4c63b69b9 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -176,7 +176,6 @@ class EmailPasswordRequestTokenRestServlet(RestServlet): token_expires = (self.hs.clock.time_msec() + self.config.email_validation_token_lifetime) - logger.info("lifetime: %s", self.config.email_validation_token_lifetime) yield self.datastore.start_or_continue_validation_session( "email", email, session_id, client_secret, send_attempt, |