Skip to content

Commit 869a13d

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix repository adoption on Windows (go-gitea#21646) Refactor docs (go-gitea#21627) Update "email usage" page to current ver. (1.18) (go-gitea#21649) Fix opaque background on mermaid diagrams (go-gitea#21642) Merge db.Iterate and IterateObjects (go-gitea#21641) Deal with markdown template without metadata (go-gitea#21639) [skip ci] Updated translations via Crowdin
2 parents c79db93 + f211d23 commit 869a13d

37 files changed

+141
-249
lines changed

cmd/migrate_storage.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,43 +83,43 @@ var CmdMigrateStorage = cli.Command{
8383
}
8484

8585
func migrateAttachments(ctx context.Context, dstStorage storage.ObjectStorage) error {
86-
return db.IterateObjects(ctx, func(attach *repo_model.Attachment) error {
86+
return db.Iterate(ctx, nil, func(ctx context.Context, attach *repo_model.Attachment) error {
8787
_, err := storage.Copy(dstStorage, attach.RelativePath(), storage.Attachments, attach.RelativePath())
8888
return err
8989
})
9090
}
9191

9292
func migrateLFS(ctx context.Context, dstStorage storage.ObjectStorage) error {
93-
return db.IterateObjects(ctx, func(mo *git_model.LFSMetaObject) error {
93+
return db.Iterate(ctx, nil, func(ctx context.Context, mo *git_model.LFSMetaObject) error {
9494
_, err := storage.Copy(dstStorage, mo.RelativePath(), storage.LFS, mo.RelativePath())
9595
return err
9696
})
9797
}
9898

9999
func migrateAvatars(ctx context.Context, dstStorage storage.ObjectStorage) error {
100-
return db.IterateObjects(ctx, func(user *user_model.User) error {
100+
return db.Iterate(ctx, nil, func(ctx context.Context, user *user_model.User) error {
101101
_, err := storage.Copy(dstStorage, user.CustomAvatarRelativePath(), storage.Avatars, user.CustomAvatarRelativePath())
102102
return err
103103
})
104104
}
105105

106106
func migrateRepoAvatars(ctx context.Context, dstStorage storage.ObjectStorage) error {
107-
return db.IterateObjects(ctx, func(repo *repo_model.Repository) error {
107+
return db.Iterate(ctx, nil, func(ctx context.Context, repo *repo_model.Repository) error {
108108
_, err := storage.Copy(dstStorage, repo.CustomAvatarRelativePath(), storage.RepoAvatars, repo.CustomAvatarRelativePath())
109109
return err
110110
})
111111
}
112112

113113
func migrateRepoArchivers(ctx context.Context, dstStorage storage.ObjectStorage) error {
114-
return db.IterateObjects(ctx, func(archiver *repo_model.RepoArchiver) error {
114+
return db.Iterate(ctx, nil, func(ctx context.Context, archiver *repo_model.RepoArchiver) error {
115115
p := archiver.RelativePath()
116116
_, err := storage.Copy(dstStorage, p, storage.RepoArchives, p)
117117
return err
118118
})
119119
}
120120

121121
func migratePackages(ctx context.Context, dstStorage storage.ObjectStorage) error {
122-
return db.IterateObjects(ctx, func(pb *packages_model.PackageBlob) error {
122+
return db.Iterate(ctx, nil, func(ctx context.Context, pb *packages_model.PackageBlob) error {
123123
p := packages_module.KeyToRelativePath(packages_module.BlobHash256Key(pb.HashSHA256))
124124
_, err := storage.Copy(dstStorage, p, storage.Packages, p)
125125
return err

docs/content/doc/advanced/hacking-on-gitea.zh-cn.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

docs/content/doc/advanced/make.fr-fr.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

docs/content/doc/advanced/make.zh-cn.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

docs/content/doc/advanced/third-party-tools.zh-cn.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

docs/content/doc/developers.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ draft: false
88
menu:
99
sidebar:
1010
name: "开发者"
11-
weight: 50
11+
weight: 55
1212
identifier: "developers"
1313
---

docs/content/doc/installation/from-source.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ To build from source, the following programs must be present on the system:
8787

8888
- `go` {{< min-go-version >}} or higher, see [here](https://golang.org/dl/)
8989
- `node` {{< min-node-version >}} or higher with `npm`, see [here](https://nodejs.org/en/download/)
90-
- `make`, see <a href='{{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make'>here</a>
90+
- `make`, see [here]({{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make)
9191

9292
Various [make tasks](https://github.com/go-gitea/gitea/blob/main/Makefile)
9393
are provided to keep the build process as simple as possible.

0 commit comments

Comments
 (0)