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

Fix typo in generated config #7890

Merged
merged 1 commit into from
Jul 20, 2020
Merged

Conversation

ThiefMaster
Copy link
Contributor

No description provided.

@gary-kim
Copy link
Contributor

It seems like your pull request is currently missing a changelog file and a sign off. You can find out about the changelog file here and sign off here.

@ThiefMaster
Copy link
Contributor Author

ThiefMaster commented Jul 18, 2020

It's a simple typo that has no technical effect whatsoever. I don't think this needs a changelog. But feel free to amend my commit with a changelog. Maintainer pushs are enabled for the branch.

Regarding the signoff, this was a quick commit done via the GitHub web interface. I don't think I can amend my commit there to include a sign-off in the message, and to be honest, for a typo fix I don't really want to clone the repo locally... Feel free to amend my commit and include this sign-off: Signed-off-by: Adrian Moennich <adrian@planetcoding.net>

@ThiefMaster
Copy link
Contributor Author

OK, this PR has a nice consecutive number (7890), so I don't want it to end up closed. Updated with signoff and changelog...

@gary-kim
Copy link
Contributor

Looks like you also need to regenerate the sample config according to the CI

docs/sample_config.yaml is not up-to-date. Regenerate it with `scripts-dev/generate_sample_config`.

Signed-off-by: Adrian Moennich <adrian@planetcoding.net>
@ThiefMaster
Copy link
Contributor Author

Updated. The remaining CI failures seem to be unrelated.

@clokep clokep requested a review from a team July 20, 2020 11:12
@clokep
Copy link
Member

clokep commented Jul 20, 2020

Yeah, the CI failure is unrelated. Thanks for your contribution!

@clokep clokep merged commit 64d2280 into matrix-org:develop Jul 20, 2020
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'de119063f': (31 commits)
  Convert room list handler to async/await. (#7912)
  Element CSS and logo in email templates (#7919)
  Lint the contrib/ directory in CI and linting scripts, add synctl to linting script (#7914)
  Remove unused code from synapse.logging.utils. (#7897)
  Fix a typo in the sample config. (#7890)
  Fix deprecation warning: import ABC from collections.abc (#7892)
  Change sample config's postgres user to synapse_user (#7889)
  Fix deprecation warning due to invalid escape sequences (#7895)
  Remove Ubuntu Eoan that is now EOL (#7888)
  Fix the trace function for async functions. (#7872)
  Add help for creating a user via docker (#7885)
  Switch to Debian:Slim from Alpine for the docker image (#7839)
  Stop using 'device_max_stream_id' (#7882)
  Fix TypeError in synapse.notifier (#7880)
  Add a default limit (of 100) to get/sync operations. (#7858)
  Change "unknown room ver" logging to warning. (#7881)
  Convert device handler to async/await (#7871)
  Convert synapse.app to async/await. (#7868)
  Convert _base, profile, and _receipts handlers to async/await (#7860)
  Add admin endpoint to get members in a room. (#7842)
  ...
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