Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spelling in server notices admin API docs #5142

Merged
merged 2 commits into from May 6, 2019

Conversation

Projects
None yet
3 participants
@turt2live
Copy link
Member

commented May 6, 2019

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off

turt2live added some commits May 6, 2019

@turt2live turt2live requested a review from matrix-org/synapse-core May 6, 2019

@turt2live

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

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

I'm assuming this is not my problem to solve

@t3chguy

t3chguy approved these changes May 6, 2019

Copy link
Contributor

left a comment

LGTM other than the failures which I no comprehend

@richvdh

This comment has been minimized.

Copy link
Member

commented May 6, 2019

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

Oops, my bad for merging #5134 without waiting for the CI to complete :/. Fixed on develop.

@richvdh

This comment has been minimized.

Copy link
Member

commented May 6, 2019

Thanks @turt2live !

@richvdh richvdh merged commit 3fdff14 into develop May 6, 2019

20 of 22 checks passed

buildkite/synapse Build #1252 failed (23 minutes, 19 seconds)
Details
buildkite/synapse/check-sample-config Failed (exit status 1)
Details
buildkite/synapse/isort Passed (18 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (15 seconds)
Details
buildkite/synapse/packaging Passed (20 seconds)
Details
buildkite/synapse/pep-8 Passed (56 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (12 minutes)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 1 second)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (8 minutes, 29 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (8 minutes, 8 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (12 minutes, 58 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (13 minutes, 42 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (9 minutes, 28 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (8 minutes, 21 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (12 minutes, 45 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 24 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 1 second)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details

@turt2live turt2live deleted the travis/spelling-1 branch May 6, 2019

anoadragon453 added a commit that referenced this pull request May 10, 2019

Merge branch 'develop' into anoa/blacklist_ip_ranges
* develop: (45 commits)
  URL preview blacklisting fixes (#5155)
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
  Fix bogus imports in tests (#5154)
  add options to require an access_token to GET /profile and /publicRooms on CS API (#5083)
  Do checks on aliases for incoming m.room.aliases events (#5128)
  Remove the requirement to authenticate for /admin/server_version. (#5122)
  Fix spelling in server notices admin API docs (#5142)
  Fix sample config
  0.99.3.2
  include disco in deb build target list
  changelog
  Debian: we now need libpq-dev.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.