chore: merge upstream immich-app/immich (2026-03-10)#64
Merged
Conversation
It's not being used right now; can always add it back :P
Videos have recently been changed to support zooming, but this can make the controls in the centre of the screen unergonomic as they will either stay in the centre when dismissing, or stick to the video when zooming. Neither is great. We should align the behaviour with other apps which has the play/pause toggle at the bottom of the screen with the seeker bar instead. Co-authored-by: Alex <alex.tran1502@gmail.com>
immich-app#26807) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
After migrating factory.asset() to AssetFactory.create(), the factory import from small.factory was no longer used in this file.
Deeds67
force-pushed
the
worktree-upstream-merge
branch
from
737ca77 to
e0a1155
Compare
Replace factory.asset() with AssetFactory.create() and factory.memory() with MemoryFactory.create() in fork-specific test code that wasn't updated during rebase.
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
6 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.
Summary
Merges 26 upstream commits from immich-app/immich (2026-03-01 to 2026-03-09).
Key upstream changes
Conflicts resolved
server/test/small.factory.ts— upstream refactored test factories into dedicated files (test/factories/). Kept fork-specificSharedSpaceandSharedSpaceMemberimports and factory methods. Removed staleStackimport (moved toStackFactory).Fork compatibility fixes
factory.asset()→AssetFactory.create()andfactory.memory()→MemoryFactory.create()in fork-specific test code (asset.service.spec.ts,memory.service.spec.ts,plugin.service.spec.ts) to match upstream's new factory pattern.Fork features verified intact
ghcr.io/open-noodle/gallery-*image refs preserved ✓@aws-sdk/*packages retained ✓Test plan
🤖 Generated with Claude Code