[Merge] 3.x into 4.x (May 26th 2026)#1134
Merged
RichardAnderson merged 22 commits intoMay 27, 2026
Merged
Conversation
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
* throw error instead of suppressing * Add error message from generic error * fixes * fix naming issue align with interface
* dns improvements * copilot fixes
* edit-dns-provider * fixes
* cd to home directory * fixes
* fixes issues * Updated tests
…g multi-host accounts (vitodeploy#1075) SyncDatabaseUsers previously matched existing database_users rows by username only. MySQL and MariaDB treat 'user'@'localhost' and 'user'@'127.0.0.1' as independent accounts with potentially different passwords and grants, so collapsing them onto a single row caused silent data corruption: the databases column was overwritten in an order-dependent way, additional host variants were never inserted, and the stored host no longer matched the grants shown under it. The lookup now scopes by (username, host) whenever the handler returns a non-empty host, aligning sync with CreateDatabaseUser, UpdateDatabaseUser and DeleteDatabaseUser. PostgreSQL keeps the original username-only match because its get-users-list view returns an empty host (roles are host-agnostic); an unconditional composite filter would miss the existing UI-created row and insert a duplicate (rolname, '') record on every sync. Adds regression tests covering MySQL multi-host sync, MySQL sync idempotency and the PostgreSQL no-duplicate-row invariant.
Co-authored-by: Saeed Vaziry <61919774+saeedvaziry@users.noreply.github.com>
saeedvaziry
approved these changes
May 26, 2026
Member
|
We might need run npm audits and composer updates again on 4.x |
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
3 participants
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.
Merges 3.x changes into 4.x.
Ensure merge commits and not squash to preserve mergeability support for any future 3.x updates.