Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Clarify the account_validity and email sections of the sample configuration. #6685

Merged
merged 8 commits into from
Jan 17, 2020

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jan 12, 2020

No description provided.

@richvdh richvdh force-pushed the rav/config_cleanups branch from f97e359 to f152e34 Compare January 12, 2020 14:28
make this match the conventions in the rest of the file, and try to document
the default behaviour better
Generally try to make this more comprehensible, and make it match the
conventions.

I've removed the documentation for all the settings which allow you to change
the names of the template files, because I can't really see why they are
useful.
@richvdh richvdh force-pushed the rav/config_cleanups branch from f152e34 to 112cfaa Compare January 12, 2020 14:48
@richvdh richvdh requested a review from a team January 12, 2020 21:58
@erikjohnston
Copy link
Member

Looks good to me, but don't know if @babolivier wants to have a quick look to make sure that things are fine?

Copy link
Contributor

@babolivier babolivier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few bits and questions but looks good to me otherwise.

synapse/config/push.py Show resolved Hide resolved
synapse/config/emailconfig.py Show resolved Hide resolved
synapse/config/emailconfig.py Outdated Show resolved Hide resolved
synapse/config/emailconfig.py Outdated Show resolved Hide resolved
synapse/config/emailconfig.py Outdated Show resolved Hide resolved
synapse/config/emailconfig.py Outdated Show resolved Hide resolved
synapse/config/registration.py Show resolved Hide resolved
synapse/config/registration.py Outdated Show resolved Hide resolved
Copy link
Contributor

@babolivier babolivier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, forgot one. Consistency ftw.

synapse/config/emailconfig.py Outdated Show resolved Hide resolved
@richvdh
Copy link
Member Author

richvdh commented Jan 17, 2020

@babolivier: thanks for catching the inconsistencies here; all good catches. I'm going to take it from your green tick that you're happy with this landing now.

@richvdh richvdh merged commit 5ce0b17 into develop Jan 17, 2020
nim65s added a commit to nim65s/oxyta.net that referenced this pull request Apr 12, 2020
@richvdh richvdh deleted the rav/config_cleanups branch December 1, 2020 12:34
babolivier pushed a commit that referenced this pull request Sep 1, 2021
…figuration. (#6685)

* commit '5ce0b17e3':
  Clarify the `account_validity` and `email` sections of the sample configuration. (#6685)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants