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

Merge master into dinsic #339

Merged
merged 13 commits into from
Apr 13, 2021
Merged

Merge master into dinsic #339

merged 13 commits into from
Apr 13, 2021

Conversation

babolivier
Copy link
Contributor

@babolivier babolivier commented Apr 13, 2021

Opening this as a PR so that CI can run and hopefully spot any issue.

anoadragon453 and others added 12 commits September 10, 2020 11:24
…har (#317)

This is a duplicate of #316 for mainline which fixed the same bug on `dinsic`. The bug originally stemmed from #311.
Install prometheus_client in the Docker image.
This allows a request to specify a brand hint which sydent attempts
to use to render different email templates.
Switch Docker images from Alpine -> Debian.
This disables the JSON extensions which Python supports by default (parsing of
`Infinity` / `-Infinity` and `NaN`). These shouldn't be accepted since they're
not technically valid JSON and other languages won't be able to interpret it
properly.

This isn't expected to have any observable effects, since no
correctly-operating endpoint should be returning this invalid JSON anyway.
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

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

We'll want to be sure that our email templates are still pointing to the right web addresses after this change.

lgtm to merge as is though, this is just some things to be aware of.

sydent/sydent.py Show resolved Hide resolved
@babolivier
Copy link
Contributor Author

We'll want to be sure that our email templates are still pointing to the right web addresses after this change.

I've checked that and it should be fine.

@babolivier babolivier merged commit 056be28 into dinsic Apr 13, 2021
@babolivier babolivier deleted the babolivier/merge-dinsic branch April 13, 2021 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants