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

Backport 502 improvements to Community #1510

Closed
mtlynch opened this issue Jul 18, 2023 · 0 comments · Fixed by #1514
Closed

Backport 502 improvements to Community #1510

mtlynch opened this issue Jul 18, 2023 · 0 comments · Fixed by #1514
Assignees
Labels
enhancement New feature or request

Comments

@mtlynch
Copy link
Contributor

mtlynch commented Jul 18, 2023

All the guidance for HTTP 502 errors that we've added in https://github.com/tiny-pilot/tinypilot-pro/pull/967 apply to Community as well, so we should backport the changes to this repo.

Implementation notes

The easy way

The simplest way to backport these changes is just to copy 502.html from Pro, paste it on top of 502.html in this repo, and then commit the changes.

The fancier git way

Another way we could do it is the more git-native way:

  1. Add TinyPilot Pro as a git remote to your copy of the Community repo
  2. Use git cherry-pick to grab the specific commit associated with the 502 error message changes from Pro in a new Community branch
  3. Create a PR for the new branch

That doesn't really win us anything because we're squashing the commit in the Community PR. If we didn't do squashed PRs, we could go this route to make things a little tidier in the commit history, but it's not a big deal.

@mtlynch mtlynch added the enhancement New feature or request label Jul 18, 2023
@db39 db39 linked a pull request Jul 19, 2023 that will close this issue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants