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 develop into staging, 2024 Apr 10 edition #1404

Merged
merged 86 commits into from
May 1, 2024
Merged

Conversation

dchiller
Copy link
Contributor

@dchiller dchiller commented Apr 10, 2024

This PR contains only the contents of #1386.

When this is merged to staging, we'll begin to use the new staging server.

Jacob deGroot-Maggetti and others added 24 commits March 22, 2024 07:36
Take CSRF_TRUSTED_ORIGINS setting from host variable
Use CANTUSDB_HOST for ALLOWED_HOSTS and CSRF_TRUSTED_ORIGINS settings
Prepare repo for use of ansible deployment
Rename Office -> Service in public-facing views
@annamorphism
Copy link

just confirming that a1d98b1 does, in fact, rename Office to Service and not Server...!

@dchiller
Copy link
Contributor Author

just confirming that a1d98b1 does, in fact, rename Office to Service and not Server...!

Yeah, it is correct in the code!

jacobdgm and others added 28 commits April 23, 2024 19:56
Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.0.4 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.0.4...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.4.4 to 0.5.0.
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](andialbrecht/sqlparse@0.4.4...0.5.0)

---
updated-dependencies:
- dependency-name: sqlparse
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [idna](https://github.com/kjd/idna) from 2.10 to 3.7.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v2.10...v3.7)

---
updated-dependencies:
- dependency-name: idna
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Dylan Hillerbrand <[email protected]>
Co-authored-by: Dylan Hillerbrand <[email protected]>
by removing several patches around self.client.post, and adding a patch around a self.client.get that had been missing one
…eck for ValueError

which should be raised when a path without a leading slash is passed into the function
Chant Create: Reimplement Suggested Chants feature
views.chant: Remove unused function
@lucasmarchd01 lucasmarchd01 merged commit 5dca1b9 into staging May 1, 2024
53 checks passed
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.

6 participants