diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 80df8f2fc2..461ad42ac7 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -281,12 +281,12 @@ const ( PlainGitService // 1 plain git service GithubService // 2 github.com GiteaService // 3 gitea service - GitlabService // 4 gitlab service - GogsService // 5 gogs service - OneDevService // 6 onedev service - GitBucketService // 7 gitbucket service - CodebaseService // 8 codebase service - ForgejoService // 9 forgejo service + ForgejoService // 4 forgejo service + GitlabService // 5 gitlab service + GogsService // 6 gogs service + OneDevService // 7 onedev service + GitBucketService // 8 gitbucket service + CodebaseService // 9 codebase service ) // Name represents the service type's name @@ -302,6 +302,8 @@ func (gt GitServiceType) Title() string { return "GitHub" case GiteaService: return "Gitea" + case ForgejoService: + return "Forgejo" case GitlabService: return "GitLab" case GogsService: @@ -314,8 +316,6 @@ func (gt GitServiceType) Title() string { return "Codebase" case PlainGitService: return "Git" - case ForgejoService: - return "Forgejo" } return "" } @@ -366,12 +366,12 @@ func (gt GitServiceType) TokenAuth() bool { var SupportedFullGitService = []GitServiceType{ GithubService, GitlabService, + ForgejoService, GiteaService, GogsService, OneDevService, GitBucketService, CodebaseService, - ForgejoService, } // RepoTransfer represents a pending repo transfer diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 30fa899c9d..a166af2477 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1080,6 +1080,7 @@ migrate.migrating_failed_no_addr = Migration failed. migrate.github.description = Migrate data from github.com or other GitHub instances. migrate.git.description = Migrate a repository only from any Git service. migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances. +migrate.forgejo.description = Migrate data from codeberg.org or other Forgejo instances. migrate.gitea.description = Migrate data from gitea.com or other Gitea instances. migrate.gogs.description = Migrate data from notabug.org or other Gogs instances. migrate.onedev.description = Migrate data from code.onedev.io or other OneDev instances. diff --git a/public/assets/img/svg/gitea-forgejo.svg b/public/assets/img/svg/gitea-forgejo.svg new file mode 100644 index 0000000000..ef617c00f3 --- /dev/null +++ b/public/assets/img/svg/gitea-forgejo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/web_src/svg/gitea-forgejo.svg b/web_src/svg/gitea-forgejo.svg index 8b8a7b5fed..e00e5963cf 100644 --- a/web_src/svg/gitea-forgejo.svg +++ b/web_src/svg/gitea-forgejo.svg @@ -1 +1,9 @@ - \ No newline at end of file +