From de52ad0fbc305e49b98ccaa3879eb7f04209a664 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 08:34:14 -0500 Subject: [PATCH] fix(build): permanent fixes for recurring build errors - AI migration 339: replaced with noopMigration placeholder - feed/file.go: add missing comma in struct literal - license_key.go: remove unused org_model import These were being applied as server-side hotfixes on every deploy. Now committed to dev so they persist through merges. Co-Authored-By: Claude Opus 4.6 (1M context) --- models/licenses/license_key.go | 1 - models/migrations/migrations.go | 2 +- routers/web/feed/file.go | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/models/licenses/license_key.go b/models/licenses/license_key.go index d4eeb7a9f7..5344e660a0 100644 --- a/models/licenses/license_key.go +++ b/models/licenses/license_key.go @@ -13,7 +13,6 @@ import ( "strings" "code.mokoconsulting.tech/MokoConsulting/MokoGitea/models/db" - org_model "code.mokoconsulting.tech/MokoConsulting/MokoGitea/models/organization" "code.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/json" "code.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/timeutil" ) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index f50876b3a7..d781732175 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -416,7 +416,7 @@ func prepareMigrationTasks() []*migration { newMigration(336, "Add update stream config table", v1_27.AddUpdateStreamConfigTable), newMigration(337, "Add key_plain column to license_key", v1_27.AddKeyPlainToLicenseKey), newMigration(338, "Add platform and require_key to update_stream_config", v1_27.AddPlatformAndRequireKeyToStreamConfig), - newMigration(339, "Add AI assistant tables", v1_27.AddAITables), + newMigration(339, "Placeholder for AI tables", noopMigration), newMigration(340, "Sync license system columns (key_raw, payment_ref, heartbeat, archive, metadata)", v1_27.SyncLicenseSystemColumns), newMigration(341, "Add parent_org_id to user table for enterprise sub-org hierarchy", v1_27.AddParentOrgIDToUser), } diff --git a/routers/web/feed/file.go b/routers/web/feed/file.go index d507cfea54..01f467c92a 100644 --- a/routers/web/feed/file.go +++ b/routers/web/feed/file.go @@ -22,7 +22,7 @@ func ShowFileFeed(ctx *context.Context, repo *repo.Repository, formatType string } commits, err := ctx.Repo.GitRepo.CommitsByFileAndRange( git.CommitsByFileAndRangeOptions{ - Revision: ctx.Repo.RefFullName.String() + Revision: ctx.Repo.RefFullName.String(), File: fileName, Page: 1, }) -- 2.52.0