chore: sync with upstream getfider/fider (764 commits)#1537
Closed
DevScyu wants to merge 10 commits into
Closed
Conversation
chore: Update from Upstream
Merges all upstream changes since September 2022 sync. Resolved conflicts in docker-compose.yml (took upstream dev stack) and SignInModal.tsx (took upstream rewrite).
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
1 participant
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.
Summary
Conflicts resolved
docker-compose.yml— Upstream restructured from a production stack to a dev-only compose (smtp, pgdev, pgtest, s3test). Took upstream version.public/components/SignInModal.tsx— Upstream rewrote the component (modernized toReact.FC, addedTenantLogo,HStack,VStack, updated lingui import). Took upstream version.Notes
The only Wynntils-specific commit (
6b4933dd chore: allow failed webhooks to still be triggered, touchingapp/services/sqlstore/postgres/webhook.go) merged cleanly with no conflicts.