diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index f7e5f2c53ab..c77fe40f038 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -400,7 +400,7 @@ func prepareMigrationTasks() []*migration { newMigration(323, "Add support for actions concurrency", v1_26.AddActionsConcurrency), // to modify later - newMigration(999, "Add size limit on repository", v1_26.AddSizeLimitOnRepo), + newMigration(324, "Add size limit on repository", v1_26.AddSizeLimitOnRepo), } return preparedMigrations } diff --git a/tests/integration/git_general_test.go b/tests/integration/git_general_test.go index 05bdced071f..ba8e26a3409 100644 --- a/tests/integration/git_general_test.go +++ b/tests/integration/git_general_test.go @@ -66,8 +66,6 @@ func testGitGeneral(t *testing.T, u *url.URL) { dstPath := t.TempDir() - dstForkedPath := t.TempDir() - t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, false)) t.Run("AddUserAsCollaborator", doAPIAddCollaborator(forkedUserCtx, httpContext.Username, perm.AccessModeRead)) @@ -88,6 +86,7 @@ func testGitGeneral(t *testing.T, u *url.URL) { mediaTest(t, &httpContext, pushedFilesStandard[0], pushedFilesStandard[1], pushedFilesLFS[0], pushedFilesLFS[1]) t.Run("SizeLimit", func(t *testing.T) { + dstForkedPath := t.TempDir() setting.SaveGlobalRepositorySetting(true, 0) t.Run("Under", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -120,7 +119,6 @@ func testGitGeneral(t *testing.T, u *url.URL) { }) }) t.Run("CreateAgitFlowPull", doCreateAgitFlowPull(dstPath, &httpContext, "test/head")) - t.Run("CreateAgitFlowPull", doCreateAgitFlowPull(dstPath, &httpContext, "test/head")) t.Run("CreateProtectedBranch", doCreateProtectedBranch(&httpContext, dstPath)) t.Run("BranchProtectMerge", doBranchProtectPRMerge(&httpContext, dstPath)) t.Run("AutoMerge", doAutoPRMerge(&httpContext, dstPath))