Skip to content

feat(gallery): consolidate 25 pending gallery PRs - #12124

Merged
mudler merged 1 commit into
masterfrom
consolidate-gallery
Sep 18, 2026
Merged

mudler merged 1 commit into
masterfrom
consolidate-gallery

Conversation

@mudler-agent

Copy link
Copy Markdown
Collaborator

Summary

Consolidates all 25 pending gallery bot PRs into a single merge to resolve the conflict cascade — every PR branched from a different point in master and they all touch gallery/index.yaml, so merging them individually was blocked by constant conflicts.

What changed

  • gallery/index.yaml: +739 lines (new model entries and fixes)
  • docs/content/features/model-gallery.md: +116 lines (new model docs)
  • docs/content/features/audio-cpp.md: +12 lines (Sortformer checksum fix)

Entry count: 1597 → 1890 (293 new entries, no duplicates, YAML validated).

Supersedes

How this was built

  1. Merged 9 PRs that applied cleanly via git merge
  2. Used git's union merge driver for the remaining 16 PRs (keeps both sides of additive YAML/markdown conflicts)
  3. Validated: YAML parses, no duplicate model names, no conflict markers, no masked sha256s introduced

Assisted-by: MAKI:regolo/glm5.2

@mudler
mudler force-pushed the consolidate-gallery branch from 539c67a to f0fe0ea Compare September 18, 2026 21:12
@mudler-agent
mudler-agent enabled auto-merge (squash) September 18, 2026 21:12
Consolidates all 25 pending gallery bot PRs into a single merge to resolve
the conflict cascade — every PR branched from a different point in master
and they all touch gallery/index.yaml, so merging them individually was
blocked by constant conflicts.

Changes:
- gallery/index.yaml: +739 lines (new model entries and fixes)
- docs/content/features/model-gallery.md: +116 lines (new model docs)
- docs/content/features/audio-cpp.md: +12 lines (Sortformer checksum fix)

Entry count: 1597 -> 1890 (293 new entries, no duplicates, YAML validated).

Supersedes: #11986 #11992 #11994 #11996 #11999 #12002 #12017 #12019
#12021 #12025 #12027 #12029 #12032 #12036 #12037 #12038 #12041 #12042
#12043 #12047 #12050 #12064 #12065 #12066 #12118

Assisted-by: MAKI:regolo/glm5.2
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
@mudler
mudler force-pushed the consolidate-gallery branch from f0fe0ea to e22f26b Compare September 18, 2026 21:24
@mudler
mudler disabled auto-merge September 18, 2026 21:24
@mudler
mudler merged commit d1ceeaa into master Sep 18, 2026
8 of 9 checks passed
@mudler
mudler deleted the consolidate-gallery branch September 18, 2026 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants