fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 08:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FEAT] add Forgero Git Service

Browse source 
Signed-off-by: cassiozareck <cassiomilczareck@gmail.com>
(cherry picked from commit a878adfe62)

Adding description and Forgejo SVG

(cherry picked from commit 13738c0380)

Undo reordering and tmpl redirection

(cherry picked from commit 9ae51c46f4)
(cherry picked from commit 70fffdc61d)
(cherry picked from commit c0ebfa9da3)
This commit is contained in:
cassiozareck 2023-08-14 16:52:44 -03:00 committed by Earl Warren
parent e80abbe2cd
commit 9922c92787
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
7 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/structs/repo.go
View file

@ -286,6 +286,7 @@ const (
OneDevService // 6 onedev service OneDevService // 6 onedev service
GitBucketService // 7 gitbucket service GitBucketService // 7 gitbucket service
CodebaseService // 8 codebase service CodebaseService // 8 codebase service
ForgejoService // 9 forgejo service
) )
// Name represents the service type's name // Name represents the service type's name
@ -311,6 +312,8 @@ func (gt GitServiceType) Title() string {
return "GitBucket" return "GitBucket"
case CodebaseService: case CodebaseService:
return "Codebase" return "Codebase"
case ForgejoService:
return "Forgejo"
case PlainGitService: case PlainGitService:
return "Git" return "Git"
} }
@ -352,7 +355,7 @@ type MigrateRepoOptions struct {
// TokenAuth represents whether a service type supports token-based auth // TokenAuth represents whether a service type supports token-based auth
func (gt GitServiceType) TokenAuth() bool { func (gt GitServiceType) TokenAuth() bool {
switch gt { switch gt {
case GithubService, GiteaService, GitlabService: case GithubService, GiteaService, GitlabService, ForgejoService:
return true return true
} }
return false return false
@ -363,6 +366,7 @@ func (gt GitServiceType) TokenAuth() bool {
var SupportedFullGitService = []GitServiceType{ var SupportedFullGitService = []GitServiceType{
GithubService, GithubService,
GitlabService, GitlabService,
ForgejoService,
GiteaService, GiteaService,
GogsService, GogsService,
OneDevService, OneDevService,

1
options/locale/locale_en-US.ini
View file

@ -1083,6 +1083,7 @@ migrate.migrating_failed_no_addr = Migration failed.
migrate.github.description = Migrate data from github.com or other GitHub instances. migrate.github.description = Migrate data from github.com or other GitHub instances.
migrate.git.description = Migrate a repository only from any Git service. migrate.git.description = Migrate a repository only from any Git service.
migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances. 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.gitea.description = Migrate data from gitea.com or other Gitea instances.
migrate.gogs.description = Migrate data from notabug.org or other Gogs 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. migrate.onedev.description = Migrate data from code.onedev.io or other OneDev instances.

9
public/assets/img/svg/gitea-forgejo.svg generated Normal file
View file

@ -0,0 +1,9 @@
<svg width="32" height="32" viewBox="-15 0 256 256" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(28,28)">
<path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
<path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
<circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
<circle cx="142" cy="88" r="18" fill="none" stroke="#d40000" stroke-width="15" />
<circle cx="58" cy="180" r="18" fill="none" stroke="#d40000" stroke-width="15" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 595 B

2
services/convert/utils.go
View file

@ -36,6 +36,8 @@ func ToGitServiceType(value string) structs.GitServiceType {
return structs.OneDevService return structs.OneDevService
case "gitbucket": case "gitbucket":
return structs.GitBucketService return structs.GitBucketService
case "forgejo":
return structs.ForgejoService
default: default:
return structs.PlainGitService return structs.PlainGitService
} }

2
services/convert/utils_test.go
View file

@ -28,6 +28,8 @@ func TestToGitServiceType(t *testing.T) {
typ: "gitlab", enum: 4, typ: "gitlab", enum: 4,
}, { }, {
typ: "gogs", enum: 5, typ: "gogs", enum: 5,
}, {
typ: "forgejo", enum: 9,
}, { }, {
typ: "trash", enum: 1, typ: "trash", enum: 1,
}} }}

1
templates/repo/migrate/forgejo.tmpl Normal file
View file

@ -0,0 +1 @@
{{template "repo/migrate/gitea" .}}

9
web_src/svg/gitea-forgejo.svg Normal file
View file

@ -0,0 +1,9 @@
<svg width="64" height="64" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" class="forgejo-logo" aria-hidden="true">
<g transform="translate(28,28)">
<path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
<path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
<circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
<circle cx="142" cy="88" r="18" fill="none" stroke="#d40000" stroke-width="15" />
<circle cx="58" cy="180" r="18" fill="none" stroke="#d40000" stroke-width="15" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 633 B