chore: merge upstream/main into the fork - #7
Merged
Merged
Conversation
…asia#389) Co-authored-by: Andrew Poluosmak <poluosmak.a@gmail.com>
Upstream squashed the fork's Plane import/export work as croffasia#389 and then built on it (croffasia#419, croffasia#420), so the same files arrive from both sides. Conflicts are resolved toward upstream for that shared code and toward the fork for the instance customisations. - docker-compose.coolify.yml: keep the configurable S3 endpoint and credentials - settings/service.ts: keep the Locale import alongside upstream's comment - import/export UI and its messages: take upstream's tabbed source picker
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Merges
upstream/main(croffasia/itsaplan, 8 commits since1a743218) into the fork.Upstream squash-merged the fork's Plane import/export work as croffasia#389 and then built on
top of it (croffasia#419 subtask progress, croffasia#420 tabbed import/export with a source picker), so
that code arrives from both sides. All 13 conflicts sit in that shared area.
Conflicts resolved:
docker-compose.coolify.ymlS3_ENDPOINT/S3_ACCESS_KEY_IDdefaults stayapps/api/src/modules/settings/service.tsLocaleimport alongside upstream's commentimport-export/*.tsx, 9 ×messages/*/settings.jsonimport/source/sourceHint/comingSoonkeys over the already-squashed contributionThe only files removed relative to the fork's
mainaredocs/pr-screenshots/*.png,upstream's own cleanup in croffasia#418. Instance branding, the god overrides, the external S3
setting and the es-ES translations are all unchanged.
Why
Keep the fork current with upstream without losing the instance customisations.
How to test
Merge this with a merge commit, not a squash. Squashing discards the merge
lineage, so the next upstream sync would re-resolve every one of these conflicts.
Checklist
bun run typecheckpassesbun run lintandbun run format:checkpassbun run db:generateand committed — no schema change beyond what upstream already carries.env.exampleREADME.mdor the relevantAGENTS.md)Screenshots
Upstream's croffasia#420 changes the Import/Export settings page (two tabs and a source
picker). I did not look at the merged UI — no screenshots were taken of it.