immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-07-25 14:00:45 +03:00
Code Issues 783 Packages Projects Releases 22 Wiki Activity

[PR #6504] [MERGED] revert smart merge #11210

New Issue
Closed
opened 2026-02-05 14:35:25 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-05 14:35:25 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/immich-app/immich/pull/6504
Author: @alextran1502
Created: 1/19/2024
Status: ✅ Merged
Merged: 1/19/2024
Merged by: @alextran1502

Base: main ← Head: revert-smartmerge

📝 Commits (5)

📊 Changes

8 files changed (+74 additions, -147 deletions)

View changed files

📝 server/src/domain/person/person.service.spec.ts (+3 -30)
📝 server/src/domain/person/person.service.ts (+2 -14)
📝 server/test/fixtures/person.stub.ts (+0 -14)
📝 web/src/lib/components/admin-page/settings/setting-switch.svelte (+64 -2)
➖ web/src/lib/components/elements/slider.svelte (+0 -72)
📝 web/src/lib/components/faces-page/merge-face-selector.svelte (+3 -4)
📝 web/src/routes/(user)/people/+page.svelte (+0 -4)
📝 web/src/routes/(user)/people/[personId]/+page.svelte (+2 -7)

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/immich-app/immich/pull/6504 **Author:** [@alextran1502](https://github.com/alextran1502) **Created:** 1/19/2024 **Status:** ✅ Merged **Merged:** 1/19/2024 **Merged by:** [@alextran1502](https://github.com/alextran1502) **Base:** `main` ← **Head:** `revert-smartmerge` --- ### 📝 Commits (5) - [`2b07945`](https://github.com/immich-app/immich/commit/2b07945eabc3c27761b5950cbb2e8dd1fdccb640) revert smart merge - [`7e8742d`](https://github.com/immich-app/immich/commit/7e8742d04a09d11027b963b43761fe3ee473cd98) fix test - [`5db2895`](https://github.com/immich-app/immich/commit/5db28957cfa44ed9275143bbfe9e1fff7a4725ce) fix test - [`ac1a836`](https://github.com/immich-app/immich/commit/ac1a8368ef7a079f78a0f32e6c5028dbe3f7c767) Merge branch 'main' of github.com:immich-app/immich into revert-smartmerge - [`ecb405f`](https://github.com/immich-app/immich/commit/ecb405f186afb2d7ba3df1b43954e7f0f68358fb) Remove Slider file ### 📊 Changes **8 files changed** (+74 additions, -147 deletions) <details> <summary>View changed files</summary> 📝 `server/src/domain/person/person.service.spec.ts` (+3 -30) 📝 `server/src/domain/person/person.service.ts` (+2 -14) 📝 `server/test/fixtures/person.stub.ts` (+0 -14) 📝 `web/src/lib/components/admin-page/settings/setting-switch.svelte` (+64 -2) ➖ `web/src/lib/components/elements/slider.svelte` (+0 -72) 📝 `web/src/lib/components/faces-page/merge-face-selector.svelte` (+3 -4) 📝 `web/src/routes/(user)/people/+page.svelte` (+0 -4) 📝 `web/src/routes/(user)/people/[personId]/+page.svelte` (+2 -7) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-05 14:35:25 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
accessibility
changelog:enhancement
changelog:security
changelog:skip
changelog:translation
cli
date-time
dependencies
documentation
external-library
format
good first issue
mobile-beta
mobile-beta
mobile-beta
needs-answer
nice to have
pull-request
Mirrored from GitHub Pull Request
 sharing
tech-debt
📱mobile
🖥️web
🗄️server
🧠machine-learning
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: immich-app/immich#11210
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?