Joren/qbz
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update HANDOFF to reflect workflow changes and merge status

Browse Source 
Clarified that previous 14 commits are already in main.
This merge only adds workflow cleanup (remove API key injection).
This commit is contained in:
vicrodh committed 2026-01-17 16:56:57 -06:00
1 parent b182d2d6d5
commit 7631462522
1 file changed
+14 -17
Download Patch File Download Diff File Expand all files Collapse all files
HANDOFF-MERGE.md
+14 -17
View File
@@ -4,7 +4,7 @@
**Branch:** `feature/api-keys-refactor` **Branch:** `feature/api-keys-refactor`
**Status:** ✅ Ready for merge to `main` **Status:** ✅ Ready for merge to `main`
**Working Tree:** Clean (verified) **Working Tree:** Clean (verified)
**Commits:** 14 commits ahead of main **New commits to merge:** 1 commit (removes API key injection from workflows)
--- ---
@@ -25,7 +25,7 @@ git status
# Verify commits ready # Verify commits ready
git log --oneline origin/main..HEAD git log --oneline origin/main..HEAD
# Should show 14 commits # Should show 3 commits (1 new + 1 merge + 1 doc update)
``` ```
**All checks passed:** ✅ **All checks passed:** ✅
@@ -49,25 +49,22 @@ git log --oneline origin/main..HEAD
--- ---
## 📋 Commits to Merge (14 total) ## 📋 Current Status
**Previous merge (already in main):** 14 commits with API keys refactor, Discogs UI, and catalog number support ✅
**New commits to merge:**
``` ```
59e7562 Add merge handoff document with copy-pasteable commands b182d2d Remove API key injection from GitHub workflows
34ab753 Add post-merge cleanup instructions for API Keys UI 76ed4e0 Merge main into feature/api-keys-refactor (brings audio config updates)
7d07f9a Add merge preparation documentation 2495636 Update HANDOFF document to emphasize API Keys UI cleanup requirement
81b65bd Add comprehensive CHANGELOG for API keys refactor
80ba2bf Fix Discogs artwork selection UI issues
732a489 Improve Discogs artwork selection with multi-release images
279d433 Add catalog number support for precise Discogs searches
2a5c181 Fix Discogs artwork selection to show unique images
dab5c28 Add Discogs artwork selection UI in album edit modal
dd70f0a Refactor Discogs integration to use Cloudflare Workers proxy
9099123 Refactor Spotify and Tidal playlist import to use proxy
179a6b7 Refactor Last.fm integration to use Cloudflare Workers proxy
3a49e3f Remove embedded Last.fm API secret for Flathub compliance
b7048fa feat: register qbz:// URI scheme for OAuth callbacks
``` ```
**What this merge will add to main:**
- Removal of API key injection from GitHub workflows (release-linux.yml, release-flatpak.yml)
- Updated HANDOFF documentation
--- ---
## 🎯 Merge Commands (Copy & Paste) ## 🎯 Merge Commands (Copy & Paste)