From d61f84ca7f26e771ff15b03446521febb74f21c3 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 26 Mar 2025 09:58:05 +0000 Subject: [PATCH 001/568] chore(cleanup): remove comment from README Codeberg is prominently mentioned as a public instance on https://forgejo.org already. --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 0c4becacc4..f95aebadeb 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,6 @@ Our promise: **Independent Free/Libre Software forever!** ## What does Forgejo offer? - - If you like any of the following, Forgejo is literally meant for you: - Lightweight: Forgejo can easily be hosted on nearly **every machine**. From 6d7b4c80000a914c3b0f6d951c24902866c95643 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 26 Mar 2025 12:47:35 +0000 Subject: [PATCH 002/568] Update dependency mermaid to v11.6.0 (forgejo) (#7339) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7339 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfd359b31b..6e597bc511 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.21", - "mermaid": "11.5.0", + "mermaid": "11.6.0", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", "monaco-editor": "0.52.2", @@ -1634,12 +1634,12 @@ } }, "node_modules/@mermaid-js/parser": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.3.0.tgz", - "integrity": "sha512-HsvL6zgE5sUPGgkIDlmAWR1HTNHz2Iy11BAWPTa4Jjabkpguy4Ze2gzfLrg6pdRuBvFwgUYyxiaNqZwrEEXepA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.4.0.tgz", + "integrity": "sha512-wla8XOWvQAwuqy+gxiZqY+c7FokraOTHRWMsbB4AgRx9Sy7zKslNyejy7E+a77qHfey5GXw/ik3IXv/NHMJgaA==", "license": "MIT", "dependencies": { - "langium": "3.0.0" + "langium": "3.3.1" } }, "node_modules/@napi-rs/wasm-runtime": { @@ -9361,9 +9361,9 @@ "license": "MIT" }, "node_modules/langium": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/langium/-/langium-3.0.0.tgz", - "integrity": "sha512-+Ez9EoiByeoTu/2BXmEaZ06iPNXM6thWJp02KfBO/raSMyCJ4jw7AkWWa+zBCTm0+Tw1Fj9FOxdqSskyN5nAwg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/langium/-/langium-3.3.1.tgz", + "integrity": "sha512-QJv/h939gDpvT+9SiLVlY7tZC3xB2qK57v0J04Sh9wpMb6MP1q8gB21L3WIo8T5P1MSMg3Ep14L7KkDCFG3y4w==", "license": "MIT", "dependencies": { "chevrotain": "~11.0.3", @@ -9847,14 +9847,14 @@ } }, "node_modules/mermaid": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.5.0.tgz", - "integrity": "sha512-IYhyukID3zzDj1EihKiN1lp+PXNImoJ3Iyz73qeDAgnus4BNGsJV1n471P4PyeGxPVONerZxignwGxGTSwZnlg==", + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.6.0.tgz", + "integrity": "sha512-PE8hGUy1LDlWIHWBP05SFdqUHGmRcCcK4IzpOKPE35eOw+G9zZgcnMpyunJVUEOgb//KBORPjysKndw8bFLuRg==", "license": "MIT", "dependencies": { "@braintree/sanitize-url": "^7.0.4", "@iconify/utils": "^2.1.33", - "@mermaid-js/parser": "^0.3.0", + "@mermaid-js/parser": "^0.4.0", "@types/d3": "^7.4.3", "cytoscape": "^3.29.3", "cytoscape-cose-bilkent": "^4.1.0", diff --git a/package.json b/package.json index 75739b3be0..a903935464 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.21", - "mermaid": "11.5.0", + "mermaid": "11.6.0", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", "monaco-editor": "0.52.2", From e84d3a0f53dcfea75561e60dfa3da8254ee5b5bb Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 26 Mar 2025 13:08:03 +0000 Subject: [PATCH 003/568] fix(ui): Do not check for `vertical-align` (#7344) - This makes the `repo-settings` e2e testing happy. - There's no point into checking `vertical-align`; it has no effect when `position: absolute` is set, which is is currently set unconditionally for checkboxes and radios on forms. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7344 Reviewed-by: Michael Kriese Co-authored-by: Gusted Co-committed-by: Gusted --- tests/e2e/shared/forms.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e/shared/forms.ts b/tests/e2e/shared/forms.ts index fc608489b0..adb5b6e3cb 100644 --- a/tests/e2e/shared/forms.ts +++ b/tests/e2e/shared/forms.ts @@ -18,7 +18,6 @@ export async function validate_form({page}: {page: Page}, scope: 'form' | 'field for (const b of await boxes.all()) { await expect(b).toHaveCSS('margin-left', '0px'); await expect(b).toHaveCSS('margin-top', '0px'); - await expect(b).toHaveCSS('vertical-align', 'baseline'); } // assert no (trailing) colon is used in labels From 0a6a6d351dce0a087d53a720a114df22f27e5b4a Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Wed, 26 Mar 2025 13:47:17 +0000 Subject: [PATCH 004/568] [v11.0/forgejo] fix(ui): Do not check for `vertical-align` (#7345) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7344 - This makes the `repo-settings` e2e testing happy. - There's no point into checking `vertical-align`; it has no effect when `position: absolute` is set, which is is currently set unconditionally for checkboxes and radios on forms. Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7345 Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- tests/e2e/shared/forms.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e/shared/forms.ts b/tests/e2e/shared/forms.ts index fc608489b0..adb5b6e3cb 100644 --- a/tests/e2e/shared/forms.ts +++ b/tests/e2e/shared/forms.ts @@ -18,7 +18,6 @@ export async function validate_form({page}: {page: Page}, scope: 'form' | 'field for (const b of await boxes.all()) { await expect(b).toHaveCSS('margin-left', '0px'); await expect(b).toHaveCSS('margin-top', '0px'); - await expect(b).toHaveCSS('vertical-align', 'baseline'); } // assert no (trailing) colon is used in labels From d0a5531ebcbc734726604cbea01059f1719534e2 Mon Sep 17 00:00:00 2001 From: Ellen Emilia Anna Zscheile Date: Wed, 26 Mar 2025 14:06:44 +0000 Subject: [PATCH 005/568] feat(build): lint-locale-usage should detect more Tr functions (#7278) Followup to https://codeberg.org/forgejo/forgejo/pulls/7109 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7278 Reviewed-by: Gusted Co-authored-by: Ellen Emilia Anna Zscheile Co-committed-by: Ellen Emilia Anna Zscheile --- build/lint-locale-usage/lint-locale-usage.go | 157 ++++++++++++------ .../lint-locale-usage_test.go | 22 ++- modules/translation/translation.go | 4 + 3 files changed, 121 insertions(+), 62 deletions(-) diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go index f42bc59cbb..e1d04da301 100644 --- a/build/lint-locale-usage/lint-locale-usage.go +++ b/build/lint-locale-usage/lint-locale-usage.go @@ -26,8 +26,6 @@ import ( // this works by first gathering all valid source string IDs from `en-US` reference files // and then checking if all used source strings are actually defined -type OnMsgidHandler func(fset *token.FileSet, pos token.Pos, msgid string) - type LocatedError struct { Location string Kind string @@ -49,8 +47,24 @@ func (e LocatedError) Error() string { return sb.String() } -func isLocaleTrFunction(funcname string) bool { - return funcname == "Tr" || funcname == "TrN" +func InitLocaleTrFunctions() map[string][]uint { + ret := make(map[string][]uint) + + f0 := []uint{0} + ret["Tr"] = f0 + ret["TrString"] = f0 + ret["TrHTML"] = f0 + + ret["TrPluralString"] = []uint{1} + ret["TrN"] = []uint{1, 2} + + return ret +} + +type Handler struct { + OnMsgid func(fset *token.FileSet, pos token.Pos, msgid string) + OnUnexpectedInvoke func(fset *token.FileSet, pos token.Pos, funcname string, argc int) + LocaleTrFunctions map[string][]uint } // the `Handle*File` functions follow the following calling convention: @@ -58,7 +72,7 @@ func isLocaleTrFunction(funcname string) bool { // * `src` is either `nil` (then the function invokes `ReadFile` to read the file) // or the contents of the file as {`[]byte`, or a `string`} -func (omh OnMsgidHandler) HandleGoFile(fname string, src any) error { +func (handler Handler) HandleGoFile(fname string, src any) error { fset := token.NewFileSet() node, err := goParser.ParseFile(fset, fname, src, goParser.SkipObjectResolution) if err != nil { @@ -70,31 +84,47 @@ func (omh OnMsgidHandler) HandleGoFile(fname string, src any) error { } ast.Inspect(node, func(n ast.Node) bool { - // search for function calls of the form `anything.Tr(any-string-lit)` + // search for function calls of the form `anything.Tr(any-string-lit, ...)` call, ok := n.(*ast.CallExpr) - if !ok || len(call.Args) != 1 { + if !ok || len(call.Args) < 1 { return true } funSel, ok := call.Fun.(*ast.SelectorExpr) - if (!ok) || !isLocaleTrFunction(funSel.Sel.Name) { + if !ok { return true } - argLit, ok := call.Args[0].(*ast.BasicLit) - if (!ok) || argLit.Kind != token.STRING { + ltf, ok := handler.LocaleTrFunctions[funSel.Sel.Name] + if !ok { return true } - // extract string content - arg, err := strconv.Unquote(argLit.Value) - if err != nil { - return true + var gotUnexpectedInvoke *int + + for _, argNum := range ltf { + if len(call.Args) >= int(argNum+1) { + argLit, ok := call.Args[int(argNum)].(*ast.BasicLit) + if !ok || argLit.Kind != token.STRING { + continue + } + + // extract string content + arg, err := strconv.Unquote(argLit.Value) + if err == nil { + // found interesting strings + handler.OnMsgid(fset, argLit.ValuePos, arg) + } + } else { + argc := len(call.Args) + gotUnexpectedInvoke = &argc + } } - // found interesting string - omh(fset, argLit.ValuePos, arg) + if gotUnexpectedInvoke != nil { + handler.OnUnexpectedInvoke(fset, funSel.Sel.NamePos, funSel.Sel.Name, *gotUnexpectedInvoke) + } return true }) @@ -103,33 +133,33 @@ func (omh OnMsgidHandler) HandleGoFile(fname string, src any) error { } // derived from source: modules/templates/scopedtmpl/scopedtmpl.go, L169-L213 -func (omh OnMsgidHandler) handleTemplateNode(fset *token.FileSet, node tmplParser.Node) { +func (handler Handler) handleTemplateNode(fset *token.FileSet, node tmplParser.Node) { switch node.Type() { case tmplParser.NodeAction: - omh.handleTemplatePipeNode(fset, node.(*tmplParser.ActionNode).Pipe) + handler.handleTemplatePipeNode(fset, node.(*tmplParser.ActionNode).Pipe) case tmplParser.NodeList: nodeList := node.(*tmplParser.ListNode) - omh.handleTemplateFileNodes(fset, nodeList.Nodes) + handler.handleTemplateFileNodes(fset, nodeList.Nodes) case tmplParser.NodePipe: - omh.handleTemplatePipeNode(fset, node.(*tmplParser.PipeNode)) + handler.handleTemplatePipeNode(fset, node.(*tmplParser.PipeNode)) case tmplParser.NodeTemplate: - omh.handleTemplatePipeNode(fset, node.(*tmplParser.TemplateNode).Pipe) + handler.handleTemplatePipeNode(fset, node.(*tmplParser.TemplateNode).Pipe) case tmplParser.NodeIf: nodeIf := node.(*tmplParser.IfNode) - omh.handleTemplateBranchNode(fset, nodeIf.BranchNode) + handler.handleTemplateBranchNode(fset, nodeIf.BranchNode) case tmplParser.NodeRange: nodeRange := node.(*tmplParser.RangeNode) - omh.handleTemplateBranchNode(fset, nodeRange.BranchNode) + handler.handleTemplateBranchNode(fset, nodeRange.BranchNode) case tmplParser.NodeWith: nodeWith := node.(*tmplParser.WithNode) - omh.handleTemplateBranchNode(fset, nodeWith.BranchNode) + handler.handleTemplateBranchNode(fset, nodeWith.BranchNode) case tmplParser.NodeCommand: nodeCommand := node.(*tmplParser.CommandNode) - omh.handleTemplateFileNodes(fset, nodeCommand.Args) + handler.handleTemplateFileNodes(fset, nodeCommand.Args) - if len(nodeCommand.Args) != 2 { + if len(nodeCommand.Args) < 2 { return } @@ -138,54 +168,66 @@ func (omh OnMsgidHandler) handleTemplateNode(fset *token.FileSet, node tmplParse return } - nodeString, ok := nodeCommand.Args[1].(*tmplParser.StringNode) + nodeIdent, ok := nodeChain.Node.(*tmplParser.IdentifierNode) + if !ok || nodeIdent.Ident != "ctx" || len(nodeChain.Field) != 2 || nodeChain.Field[0] != "Locale" { + return + } + + ltf, ok := handler.LocaleTrFunctions[nodeChain.Field[1]] if !ok { return } - nodeIdent, ok := nodeChain.Node.(*tmplParser.IdentifierNode) - if !ok || nodeIdent.Ident != "ctx" { - return + var gotUnexpectedInvoke *int + + for _, argNum := range ltf { + if len(nodeCommand.Args) >= int(argNum+2) { + nodeString, ok := nodeCommand.Args[int(argNum+1)].(*tmplParser.StringNode) + if ok { + // found interesting strings + // the column numbers are a bit "off", but much better than nothing + handler.OnMsgid(fset, token.Pos(nodeString.Pos), nodeString.Text) + } + } else { + argc := len(nodeCommand.Args) - 1 + gotUnexpectedInvoke = &argc + } } - if len(nodeChain.Field) != 2 || nodeChain.Field[0] != "Locale" || !isLocaleTrFunction(nodeChain.Field[1]) { - return + if gotUnexpectedInvoke != nil { + handler.OnUnexpectedInvoke(fset, token.Pos(nodeChain.Pos), nodeChain.Field[1], *gotUnexpectedInvoke) } - // found interesting string - // the column numbers are a bit "off", but much better than nothing - omh(fset, token.Pos(nodeString.Pos), nodeString.Text) - default: } } -func (omh OnMsgidHandler) handleTemplatePipeNode(fset *token.FileSet, pipeNode *tmplParser.PipeNode) { +func (handler Handler) handleTemplatePipeNode(fset *token.FileSet, pipeNode *tmplParser.PipeNode) { if pipeNode == nil { return } // NOTE: we can't pass `pipeNode.Cmds` to handleTemplateFileNodes due to incompatible argument types for _, node := range pipeNode.Cmds { - omh.handleTemplateNode(fset, node) + handler.handleTemplateNode(fset, node) } } -func (omh OnMsgidHandler) handleTemplateBranchNode(fset *token.FileSet, branchNode tmplParser.BranchNode) { - omh.handleTemplatePipeNode(fset, branchNode.Pipe) - omh.handleTemplateFileNodes(fset, branchNode.List.Nodes) +func (handler Handler) handleTemplateBranchNode(fset *token.FileSet, branchNode tmplParser.BranchNode) { + handler.handleTemplatePipeNode(fset, branchNode.Pipe) + handler.handleTemplateFileNodes(fset, branchNode.List.Nodes) if branchNode.ElseList != nil { - omh.handleTemplateFileNodes(fset, branchNode.ElseList.Nodes) + handler.handleTemplateFileNodes(fset, branchNode.ElseList.Nodes) } } -func (omh OnMsgidHandler) handleTemplateFileNodes(fset *token.FileSet, nodes []tmplParser.Node) { +func (handler Handler) handleTemplateFileNodes(fset *token.FileSet, nodes []tmplParser.Node) { for _, node := range nodes { - omh.handleTemplateNode(fset, node) + handler.handleTemplateNode(fset, node) } } -func (omh OnMsgidHandler) HandleTemplateFile(fname string, src any) error { +func (handler Handler) HandleTemplateFile(fname string, src any) error { var tmplContent []byte switch src2 := src.(type) { case nil: @@ -222,7 +264,7 @@ func (omh OnMsgidHandler) HandleTemplateFile(fname string, src any) error { Err: err, } } - omh.handleTemplateFileNodes(fset, tmplParsed.Tree.Root.Nodes) + handler.handleTemplateFileNodes(fset, tmplParsed.Tree.Root.Nodes) return nil } @@ -289,12 +331,19 @@ func main() { gotAnyMsgidError := false - omh := OnMsgidHandler(func(fset *token.FileSet, pos token.Pos, msgid string) { - if !msgids.Contains(msgid) { + handler := Handler{ + OnMsgid: func(fset *token.FileSet, pos token.Pos, msgid string) { + if !msgids.Contains(msgid) { + gotAnyMsgidError = true + fmt.Printf("%s:\tmissing msgid: %s\n", fset.Position(pos).String(), msgid) + } + }, + OnUnexpectedInvoke: func(fset *token.FileSet, pos token.Pos, funcname string, argc int) { gotAnyMsgidError = true - fmt.Printf("%s:\tmissing msgid: %s\n", fset.Position(pos).String(), msgid) - } - }) + fmt.Printf("%s:\tunexpected invocation of %s with %d arguments\n", fset.Position(pos).String(), funcname, argc) + }, + LocaleTrFunctions: InitLocaleTrFunctions(), + } if err := filepath.WalkDir(".", func(fpath string, d fs.DirEntry, err error) error { if err != nil { @@ -308,15 +357,15 @@ func main() { if name == "docker" || name == ".git" || name == "node_modules" { return fs.SkipDir } - } else if name == "bindata.go" { + } else if name == "bindata.go" || fpath == "modules/translation/i18n/i18n_test.go" { // skip false positives } else if strings.HasSuffix(name, ".go") { - onError(omh.HandleGoFile(fpath, nil)) + onError(handler.HandleGoFile(fpath, nil)) } else if strings.HasSuffix(name, ".tmpl") { if strings.HasPrefix(fpath, "tests") && strings.HasSuffix(name, ".ini.tmpl") { // skip false positives } else { - onError(omh.HandleTemplateFile(fpath, nil)) + onError(handler.HandleTemplateFile(fpath, nil)) } } return nil diff --git a/build/lint-locale-usage/lint-locale-usage_test.go b/build/lint-locale-usage/lint-locale-usage_test.go index 3b3b746053..e573fb196e 100644 --- a/build/lint-locale-usage/lint-locale-usage_test.go +++ b/build/lint-locale-usage/lint-locale-usage_test.go @@ -11,21 +11,27 @@ import ( "github.com/stretchr/testify/require" ) +func buildHandler(ret *[]string) Handler { + return Handler{ + OnMsgid: func(fset *token.FileSet, pos token.Pos, msgid string) { + *ret = append(*ret, msgid) + }, + OnUnexpectedInvoke: func(fset *token.FileSet, pos token.Pos, funcname string, argc int) {}, + LocaleTrFunctions: InitLocaleTrFunctions(), + } +} + func HandleGoFileWrapped(t *testing.T, fname, src string) []string { var ret []string - omh := OnMsgidHandler(func(fset *token.FileSet, pos token.Pos, msgid string) { - ret = append(ret, msgid) - }) - require.NoError(t, omh.HandleGoFile(fname, src)) + handler := buildHandler(&ret) + require.NoError(t, handler.HandleGoFile(fname, src)) return ret } func HandleTemplateFileWrapped(t *testing.T, fname, src string) []string { var ret []string - omh := OnMsgidHandler(func(fset *token.FileSet, pos token.Pos, msgid string) { - ret = append(ret, msgid) - }) - require.NoError(t, omh.HandleTemplateFile(fname, src)) + handler := buildHandler(&ret) + require.NoError(t, handler.HandleTemplateFile(fname, src)) return ret } diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 7be77536ca..3ecf8715a3 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -27,6 +27,10 @@ type contextKey struct{} var ContextKey any = &contextKey{} // Locale represents an interface to translation +// +// If this gets modified, remember to also adjust +// build/lint-locale-usage/lint-locale-usage.go's InitLocaleTrFunctions(), +// which requires to know in what argument positions `trKey`'s are given. type Locale interface { Language() string TrString(string, ...any) string From 372a3dad83dbea80660a6aa702cad860927acb59 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 27 Mar 2025 07:35:27 +0000 Subject: [PATCH 006/568] i18n: update of translations from Codeberg Translate (#7275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7275 Reviewed-by: Earl Warren Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_da.ini | 570 +++++++++++++++++++++++++- options/locale/locale_fr-FR.ini | 16 +- options/locale/locale_lv-LV.ini | 4 +- options/locale/locale_ru-RU.ini | 2 +- options/locale_next/locale_pt-BR.json | 7 +- 5 files changed, 579 insertions(+), 20 deletions(-) diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index 87bd4dae2b..5bbd535b2a 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -158,7 +158,7 @@ exact_tooltip = Medtag kun resultater, der matcher den nøjagtige søgeterm regexp = RegExp regexp_tooltip = Fortolk søgetermen som et regulært udtryk org_kind = Søg i organisationer… -team_kind = Søg efter hold… +team_kind = Søg efter teams… code_kind = Søg kode… code_search_by_git_grep = Aktuelle kodesøgeresultater leveres af "git grep". Der kan være bedre resultater, hvis webstedsadministratoren aktiverer kodeindeksering. package_kind = Søg pakker… @@ -186,7 +186,7 @@ number_of_contributions_in_the_last_12_months = %s bidrag inden for de sidste 12 contributions_zero = Ingen bidrag contributions_format = {contributions} på {month} {day}, {year} contributions_one = bidrag -contributions_few = bidragene +contributions_few = bidrag less = Mindre more = Mere @@ -200,7 +200,7 @@ buttons.link.tooltip = Tilføj et link buttons.list.unordered.tooltip = Tilføj en punktliste buttons.list.task.tooltip = Tilføj en liste over opgaver buttons.list.ordered.tooltip = Tilføj en nummereret liste -buttons.mention.tooltip = Nævn en bruger eller et hold +buttons.mention.tooltip = Nævn en bruger eller et team buttons.ref.tooltip = Henvis til et problem eller pull-anmodning buttons.enable_monospace_font = Aktiver monospace-skrifttype buttons.disable_monospace_font = Deaktiver monospace-skrifttype @@ -363,7 +363,7 @@ my_repos = Depoter my_orgs = Organisationer view_home = Se %s filter = Andre filtre -filter_by_team_repositories = Filtrer efter holddepoter +filter_by_team_repositories = Filtrer efter team depoter feed_of = Feed af "%s" show_archived = Arkiveret show_both_archived_unarchived = Viser både arkiveret og ikke-arkiveret @@ -530,7 +530,7 @@ repo.collaborator.added.subject = %s føjede dig til %s som samarbejdspartner repo.collaborator.added.text = Du er blevet tilføjet som samarbejdspartner til depotet: team_invite.subject = %[1]s har inviteret dig til at deltage i %[2]s organisationen team_invite.text_1 = %[1]s har inviteret dig til at deltage i teamet %[2]s i organisationen %[3]s. -team_invite.text_2 = Klik venligst på følgende link for at blive medlem af holdet: +team_invite.text_2 = Klik venligst på følgende link for at blive medlem af teamet: team_invite.text_3 = Note: Denne invitation var beregnet til %[1]s. Hvis du ikke forventede denne invitation, kan du ignorere denne e-mail. [modal] @@ -553,7 +553,7 @@ Email = E-mailadresse Password = Adgangskode Retype = Bekræft adgangskode PayloadUrl = Payload URL -TeamName = Holdnavn +TeamName = Team navn AuthName = Autorisationsnavn AdminEmail = Admin email To = Gren navn @@ -2525,10 +2525,216 @@ settings.ignore_stale_approvals_desc = Tæl ikke godkendelser, der er foretaget settings.require_signed_commits = Kræv underskrevne commits settings.remove_protected_branch_success = Grenbeskyttelse for reglen "%s" er blevet fjernet. settings.enforce_on_admins = Håndhæv denne regel for depotadministratorer +settings.matrix.homeserver_url = Hjemmeserver URL +settings.matrix.room_id = Rum ID +branch.branch_name_conflict = Gren navn "%s" er i konflikt med den allerede eksisterende gren "%s". +release.tag_name_protected = Tagnavnet er beskyttet. +branch.name = Gren navn +settings.archive.error = Der opstod en fejl under forsøg på at arkivere depotet. Se loggen for flere detaljer. +settings.archive.error_ismirror = Du kan ikke arkivere et spejlet depot. +settings.unarchive.button = Fjern arkivering af depot +settings.unarchive.header = Fjern arkivering af dette depot +settings.lfs = LFS +settings.lfs_filelist = LFS-filer gemt i dette depot +settings.lfs_no_lfs_files = Ingen LFS-filer gemt i dette depot +settings.lfs_locks = Låse +settings.lfs_findcommits = Find commits +settings.lfs_lfs_file_no_commits = Ingen commits fundet for denne LFS-fil +settings.lfs_noattribute = Denne sti har ikke den låsbare attribut i standardgrenen +settings.lfs_delete = Slet LFS-fil med OID %s +settings.lfs_delete_warning = Sletning af en LFS-fil kan forårsage "objekt findes ikke"-fejl ved checkout. Er du sikker? +settings.lfs_findpointerfiles = Find pointer-filer +diff.download_patch = Download patch-fil +diff.whitespace_ignore_at_eol = Ignorer ændringer i blanke mellemrum på EOL +diff.stats_desc = %d ændrede filer med %d tilføjelser og %d sletninger +diff.stats_desc_file = %d ændringer: %d tilføjelser og %d sletninger +diff.bin = BIN +diff.file_suppressed = Filforskellen er undertrykt, fordi den er for stor +diff.generated = genereret +diff.vendored = forhandlet +diff.comment.add_line_comment = Tilføj linjekommentar +diff.comment.placeholder = Efterlad en kommentar +diff.comment.markdown_info = Styling med Markdown understøttes. +diff.comment.add_single_comment = Tilføj en enkelt kommentar +diff.comment.add_review_comment = Tilføj kommentar +diff.has_escaped = Denne linje har skjulte Unicode-tegn +release.tag_name = Tag navn +release.tag_helper_new = Nyt tag. Dette tag vil blive oprettet fra målet. +release.deletion_tag_desc = Vil slette dette tag fra depotet. Depotindhold og -historik forbliver uændret. Vil du fortsætte? +release.tag_already_exist = Dette tagnavn findes allerede. +release.add_tag_msg = Brug udgivelsens titel og indhold som tagmeddelelse. +release.tags_for = Tags for %s +release.asset_external_url = Ekstern URL +release.add_external_asset = Tilføj eksternt aktiv +branch.already_exists = En gren med navnet "%s" eksisterer allerede. +branch.tag_collision = Gren "%s" kan ikke oprettes, da et tag med samme navn allerede eksisterer i depotet. +releases.desc = Spor projektversioner og downloads. +release.detail = Udgivelsesdetaljer +release.tags = Tags +release.new_release = Ny udgivelse +release.stable = Stabil +release.compare = Sammenlign +release.deletion_desc = Sletning af en udgivelse fjerner den kun fra Forgejo. Det vil ikke påvirke Git-tagget, indholdet af dit depot eller dets historie. Vil du fortsætte? +release.deletion_tag_success = Tagget er blevet slettet. +release.tag_name_already_exist = Der findes allerede en udgivelse med dette tagnavn. +release.tag_name_invalid = Tagnavnet er ikke gyldigt. +release.downloads = Downloads +release.system_generated = Denne vedhæftede fil genereres automatisk. +release.invalid_external_url = Ugyldig ekstern URL: "%s" +branch.deleted_by = Slettet af %s +diff.comment.start_review = Start anmeldelse +diff.comment.reply = Svar +diff.review.comment = Kommentar +diff.review.approve = Godkend +diff.review.self_reject = Forfattere af pull-anmodninger kan ikke anmode om ændringer på deres egen pull-anmodning +diff.review.reject = Anmod om ændringer +diff.review.self_approve = Forfattere af pull-anmodninger kan ikke godkende deres egen pull-anmodning +diff.committed_by = committed af +diff.protected = Beskyttet +diff.image.side_by_side = Side om side +diff.image.swipe = Swipe +diff.image.overlay = Overlejring +release.prerelease = Forhåndsudgivelse +settings.tags.protection.allowed.teams = Tilladte hold +settings.tags.protection.create = Tilføj regel +settings.tags.protection.none = Der er ingen beskyttede tags. +settings.tags.protection.pattern.description = Du kan bruge et enkelt navn eller et globmønster eller regulært udtryk til at matche flere tags. Læs mere i guiden til beskyttede tags. +settings.thread_id = Thread ID +settings.matrix.message_type = Meddelelsestype +settings.matrix.access_token_helper = Det anbefales at opsætte en dedikeret Matrix-konto til dette. Adgangstokenet kan hentes fra Element-webklienten (i en privat/inkognito-fane) > Brugermenu (øverst til venstre) > Alle indstillinger > Hjælp og om > Avanceret > Adgangstoken (lige under hjemmeserverens URL). Luk privat-/inkognitofanen (logging ud ville ugyldiggøre tokenet). +settings.lfs_invalid_locking_path = Ugyldig sti: %s +settings.lfs_invalid_lock_directory = Kan ikke låse mappe: %s +diff.options_button = Diff muligheder +release.hide_archive_links = Skjul automatisk genererede arkiver +release.hide_archive_links_helper = Skjul automatisk genererede kildekodearkiver for denne udgivelse. For eksempel hvis du uploader din egen. +release.add_tag = Opret tag +release.releases_for = Udgivelser for %s +branch.delete_branch_has_new_commits = Gren "%s" kan ikke slettes, fordi nye commits er blevet tilføjet efter fletning. +branch.create_branch = Opret gren %s +branch.create_from = fra "%s" +branch.create_success = Gren "%s" er blevet oprettet. +branch.branch_already_exists = Gren "%s" findes allerede i dette depot. +release.releases = Udgivelser +release.draft = Udkast +release.type_attachment = Vedhæftning +release.type_external_asset = Eksternt aktiv +release.asset_name = Aktivets navn +release.tag_helper_existing = Eksisterende tag. +release.title_empty = Titel må ikke være tom. +release.message = Beskriv denne udgivelse +settings.bot_token = Bot token +settings.chat_id = Chat ID +diff.show_file_tree = Vis filtræ +diff.hide_file_tree = Skjul filtræ +release.ahead.commits = %d commits +release.ahead.target = til %s siden denne udgivelse +release.source_code = Kildekode +release.edit_subheader = Udgivelser organiserer projektversioner. +release.tag_helper = Vælg et eksisterende tag, eller opret et nyt tag. +release.target = Mål +tag.ahead.target = til %s siden dette tag +release.new_subheader = Udgivelser organiserer projektversioner. +release.title = Udgivelsestitel +release.prerelease_desc = Markér som pre-release +release.prerelease_helper = Marker denne udgivelse uegnet til produktionsbrug. +release.deletion_success = Udgivelsen er blevet slettet. +release.summary_card_alt = Oversigtskort for en udgivelse med titlen "%s" i depots %s +settings.unarchive.text = Fjernelse af arkivering af depotet vil genoprette dens evne til at modtage commits og push, såvel som nye problemer og pull-anmodninger. +settings.unarchive.success = Depotet blev fjernet fra arkivet. +settings.unarchive.error = Der opstod en fejl under forsøg på at fjerne depotet fra arkivet. Se loggen for flere detaljer. +settings.update_avatar_success = Depot avataren er blevet opdateret. +branch.restore_success = Gren "%s" er blevet gendannet. +branch.restore_failed = Kunne ikke gendanne grenen "%s". +branch.protected_deletion_failed = Gren "%s" er beskyttet. Det kan ikke slettes. +branch.default_deletion_failed = Gren "%s" er standardgrenen. Det kan ikke slettes. +tag.create_tag_operation = Opret tag +tag.confirm_create_tag = Opret tag +settings.tags.protection.allowed.noone = Ingen +settings.archive.header = Arkivere dette depot +settings.matrix.room_id_helper = Rum-id'et kan hentes fra Element-webklienten > Rumindstillinger > Avanceret > Internt rum-id. Eksempel: %s. +settings.archive.text = Arkivering af depotet vil gøre den fuldstændig skrivebeskyttet. Det vil blive skjult fra dashboardet. Ingen (ikke engang dig!) vil være i stand til at foretage nye commits eller åbne nogen problemer eller pull-anmodninger. +settings.archive.success = Depotet blev arkiveret. +settings.archive.button = Arkivere depot +settings.rename_branch_success = Grenen %s blev omdøbt til %s. +diff.whitespace_ignore_amount_changes = Ignorer ændringer i mængden af blanke mellemrum +diff.download_diff = Download diff fil +diff.show_split_view = Opdelt visning +diff.show_unified_view = Samlet visning +diff.whitespace_button = Blanke mellemrum +diff.whitespace_show_everything = Vis alle ændringer +diff.whitespace_ignore_all_whitespace = Ignorer blanke mellemrum, når du sammenligner linjer +diff.too_many_files = Nogle filer blev ikke vist, fordi der er ændret for mange filer i denne diff +diff.show_more = Vis mere +diff.load = Load diff +settings.archive.branchsettings_unavailable = Indstillinger for gren er ikke tilgængelige i arkiverede depoter. +settings.archive.tagsettings_unavailable = Tag-indstillinger er ikke tilgængelige i arkiverede depoter. +settings.archive.mirrors_unavailable = Spejle er ikke tilgængelige i arkiverede depoter. +settings.lfs_lock_already_exists = Låsen findes allerede: %s +settings.lfs_pointers.associateAccessible = Tilknyt tilgængelige %d OID'er +settings.rename_branch_failed_protected = Kan ikke omdøbe grenen %s, fordi den er en beskyttet gren. +settings.rename_branch_failed_exist = Kan ikke omdøbe grenen, fordi målgrenen %s eksisterer. +settings.rename_branch_failed_not_exist = Kan ikke omdøbe grenen %s, fordi den ikke eksisterer. +settings.rename_branch = Omdøb gren +diff.browse_source = Gennemse kilde +diff.parent = forælder +diff.commit = commit +diff.git-notes = Noter +diff.git-notes.add = Tilføj note +diff.git-notes.remove-header = Fjern note +diff.git-notes.remove-body = Denne note vil blive fjernet. +diff.data_not_available = Diff-indhold er ikke tilgængeligt +diff.bin_not_shown = Binær fil vises ikke. +diff.view_file = Se fil +diff.file_before = Før +diff.file_after = Efter +diff.file_image_width = Bredde +diff.file_image_height = Højde +diff.file_byte_size = Størrelse +diff.file_suppressed_line_too_long = Filforskellen er undertrykt, fordi en eller flere linjer er for lange +diff.review = Afslut gennemgangen +diff.review.header = Send anmeldelse +diff.review.placeholder = Gennemgå kommentar +release.download_count_one = %s download +release.download_count_few = %s downloads +topic.format_prompt = Emner skal starte med et bogstav eller tal, kan indeholde bindestreger ("-") og prikker ("."), kan være op til 35 tegn lange. Bogstaver skal være små. +branch.warning_rename_default_branch = Du omdøber standardgrenen. +topic.done = Færdig +topic.count_prompt = Du kan ikke vælge mere end 25 emner +find_file.go_to_file = Find en fil +find_file.no_matching = Ingen matchende fil fundet +topic.manage_topics = Administrer emner +tag.create_tag_from = Opret nyt tag fra "%s" +tag.create_success = Tag "%s" er blevet oprettet. +branch.restore = Gendan grenen "%s" +branch.new_branch_from = Opret ny gren fra "%s" +branch.create_branch_operation = Opret gren +branch.renamed = Gren %s blev omdøbt til %s. +branch.new_branch = Opret ny gren +tag.create_tag = Opret tag %s +error.csv.too_large = Denne fil kan ikke gengives, fordi den er for stor. +error.csv.unexpected = Denne fil kan ikke gengives, fordi den indeholder et uventet tegn i linje %d og kolonne %d. +error.csv.invalid_field_count = Denne fil kan ikke gengives, fordi den har et forkert antal felter i linje %d. +branch.download = Download gren "%s" +branch.rename = Omdøb grenen "%s" +branch.included_desc = Denne gren er en del af standardgrenen +branch.included = Inkluderet +error.broken_git_hook = Git hooks af dette depot ser ud til at være brudt. Følg venligst dokumentationen for at rette dem, og push derefter på nogle commits for at opdatere statussen. +branch.create_new_branch = Opret en gren fra gren: +branch.confirm_create_branch = Opret gren +branch.rename_branch_to = Omdøb "%s" til: [notification] watching = Overvåger read = Læs +notifications = Notifikationer +no_unread = Ingen ulæste notifikationer. +unread = Ulæst +mark_as_read = Markér som læst +no_read = Ingen læste notifikationer. +mark_all_as_read = Markér alle som læste +mark_as_unread = Markér som ulæst +subscriptions = Abonnementer +no_subscriptions = Ingen abonnementer [action] watched_repo = begyndte at overvåge %[2]s @@ -2561,6 +2767,93 @@ settings.location = Lokation settings.permission = Tilladelser settings.visibility = Synlighed members.remove = Slet +org_name_holder = Organisationens navn +create_team = Opret team +org_full_name_holder = Organisationens fulde navn +open_dashboard = Åbn dashboard +lower_repositories = depoter +team_unit_desc = Tillad adgang til depotsektioner +follow_blocked_user = Du kan ikke følge denne organisation, fordi denne organisation har blokeret dig. +org_name_helper = Organisationsnavne skal være korte og mindeværdige. +create_org = Opret organisation +form.name_reserved = Organisationsnavnet "%s" er reserveret. +create_new_team = Nyt team +team_unit_disabled = (Deaktiveret) +code = Kode +team_name = Team navn +team_name_helper = Team navne skal være korte og mindeværdige. +team_desc_helper = Beskriv teamets formål eller rolle. +team_access_desc = Depot adgang +team_permission_desc = Tilladelse +members.member = Medlem +settings.change_orgname_prompt = Bemærk: Ændring af organisationens navn vil også ændre din organisations URL og frigøre det gamle navn. +settings.change_orgname_redirect_prompt = Det gamle navn vil omdirigere, indtil det gøres krav på. +settings.change_orgname_redirect_prompt.with_cooldown.one = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dag, du kan stadig kræve det gamle navn tilbage i nedkølingsperioden. +settings.change_orgname_redirect_prompt.with_cooldown.few = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dage, du kan stadig kræve det gamle navn tilbage i . +settings.update_avatar_success = Organisationens avatar er blevet opdateret. +members.public_helper = Gør skjult +members.private = Skjult +members.private_helper = Gør synlig +members.member_role = Medlemsrolle: +members.remove.detail = Vil du fjerne %[1]s fra %[2]s? +members.invite_desc = Tilføj et nyt medlem til %s: +teams.read_permission_desc = Dette team giver læse adgang: medlemmer kan se og klone teamdepoter. +teams.remove_all_repos_title = Slet alle team depoter +members.leave.detail = Er du sikker på, at du vil forlade organisationen "%s"? +settings.email = Kontakt email +settings.delete_account = Slet denne organisation +teams.can_create_org_repo_helper = Medlemmer kan oprette nye arkiver i organisationen. Skaberen får administratoradgang til det nye lager. +teams.remove_all_repos_desc = Dette vil slette alle depoter fra teamet +teams.add_all_repos_title = Tilføj alle depoter +settings.update_settings = Opdater indstillinger +settings.update_setting_success = Organisationsindstillingerne er blevet opdateret. +settings.delete = Slet organisation +members.invite_now = Inviter nu +teams.members = Team medlemmer +teams.owners_permission_desc = Ejere har fuld adgang til alle depoter og har administratoradgang til organisationen. +teams.update_settings = Opdater indstillinger +settings.labels_desc = Tilføj etiketter, som kan bruges til problemer for alle lagre under denne organisation. +members.membership_visibility = Medlemskabs synlighed: +members.public = Synlig +settings.delete_prompt = Organisationen fjernes permanent. Dette KAN IKKE fortrydes! +settings.confirm_delete_account = Bekræft sletning +settings.delete_org_title = Slet organisation +settings.delete_org_desc = Denne organisation vil blive slettet permanent. Vil du fortsætte? +settings.hooks_desc = Tilføj webhooks, som vil blive udløst for alle lagre under denne organisation. +teams.leave.detail = Er du sikker på, at du vil forlade teamet "%s"? +teams.can_create_org_repo = Opret depoter +teams.general_access_helper = Medlemmers tilladelser bestemmes af nedenstående tilladelsestabell. +teams.delete_team = Slet team +teams.add_team_member = Slet team +form.name_pattern_not_allowed = Mønsteret "%s" er ikke tilladt i et organisationsnavn. +form.create_org_not_allowed = Du har ikke tilladelse til at oprette en organisation. +teams.none_access = Ingen adgang +teams.none_access_helper = Muligheden "ingen adgang" har kun effekt på private arkiver. +teams.general_access = Brugerdefineret adgang +members.leave = Forlad +teams.leave = Forlad +teams.join = Deltag +teams.delete_team_success = Teamet er blevet slettet. +teams.write_permission_desc = Dette team giver Skrive adgang: medlemmer kan læse fra og skubbe til teamdepoter. +teams.invite_team_member = Inviter til %s +teams.invite_team_member.list = Afventende invitationer +teams.admin_permission_desc = Dette team giver Administrator adgang: medlemmer kan læse fra, skubbe til og tilføje samarbejdspartnere til teamdepoter. +teams.create_repo_permission_desc = Derudover giver dette team tilladelse til Opret depot: medlemmer kan oprette nye lagre i organisationen. +teams.delete_team_title = Slet team +teams.repositories = Team depoter +teams.delete_team_desc = Sletning af et team tilbagekalder depotadgang fra dets medlemmer. Vil du fortsætte? +teams.add_all_repos_desc = Dette vil tilføje alle organisationens depoter til teamet. +teams.add_nonexistent_repo = Depotet, du forsøger at tilføje, eksisterer ikke, opret det først. +teams.invite.by = Inviteret af %s +teams.all_repositories_helper = Teamet har adgang til alle depoter. Hvis du vælger dette, føjes alle eksisterende depoter til teamet. +teams.invite.title = Du er blevet inviteret til at deltage i teamet %s i organisationen %s. +teams.add_duplicate_users = Brugeren er allerede et teammedlem. +teams.repos.none = Ingen depoter kunne tilgås af dette team. +teams.members.none = Ingen medlemmer på dette team. +teams.specific_repositories = Specifikke depoter +teams.specific_repositories_helper = Medlemmer vil kun have adgang til depoter, der udtrykkeligt er føjet til teamet. Hvis du vælger dette vil det ikke automatisk fjerne depoter, der allerede er tilføjet med Alle depoter. +teams.all_repositories = Alle depoter +teams.invite.description = Klik venligst på knappen nedenfor for at blive medlem af teamet. [admin] orgs.members = Medlemmer @@ -2601,6 +2894,207 @@ config.allow_dots_in_usernames = Tillad brugere at bruge prikker i deres brugern auths.oauth2_icon_url = Icon URL users.edit = Redigere users.auth_source = Godkendelseskilde +monitor.queue.settings.maxnumberworkers.placeholder = I øjeblikket %[1]d +monitor.queue.settings.submit = Opdater indstillinger +monitor.queue.settings.changed = Indstillinger opdateret +monitor.queue.settings.remove_all_items = Slet alle +monitor.queue.settings.remove_all_items_done = Alle varer i køen er blevet fjernet. +notices.system_notice_list = Systemmeddelelser +dashboard.delete_repo_archives = Slet alle depoters arkiver (ZIP, TAR.GZ osv..) +organizations = Organisationer +dashboard.delete_repo_archives.started = Slet alle repository arkiver opgave startet. +dashboard.statistic = Oversigt +dashboard.task.finished = Opgave: %[1]s startet af %[2]s er afsluttet +dashboard.task.unknown = Ukendt opgave: %[1]s +dashboard.cron.error = Fejl i Cron: %s: %[3]s +dashboard.operation_name = Operations navn +dashboard.delete_missing_repos.started = Slet alle depoter, der mangler deres Git-filopgave startet. +dashboard.delete_generated_repository_avatars = Slet genererede depot avatarer +dashboard.sync_repo_branches = Synkroniser mistede grene fra Git-data til databasen +dashboard.sync_repo_tags = Synkroniser tags fra Git-data til database +dashboard.archive_cleanup = Slet gamle depotarkiver +dashboard.deleted_branches_cleanup = Ryd op i slettede grene +dashboard = Dashboard +self_check = Selvtjek +assets = Kode aktiver +repositories = Depoter +authentication = Godkendelseskilder +emails = Bruger e-mails +monitor = Overvågning +settings = Admin indstillinger +dashboard.new_version_hint = Forgejo %s er nu tilgængelig, du kører %s. Tjek bloggen for flere detaljer. +dashboard.operation_switch = Skift +dashboard.operation_run = Kør +dashboard.clean_unbind_oauth = Rens ubundne OAuth-forbindelser +dashboard.delete_inactive_accounts.started = Slet alle uaktiverede konti opgave startet. +dashboard.delete_missing_repos = Slet alle depoter, der mangler deres Git-filer +dashboard.update_migration_poster_id = Opdater migrationsplakat-id'er +dashboard.memory_obtained = Hukommelse opnået +dashboard.pointer_lookup_times = Pointer-opslagstider +hooks = Webhooks +dashboard.cron.finished = Cron: %[1]s er færdig +dashboard.delete_inactive_accounts = Slet alle uaktiverede konti +config = Konfiguration +notices = Systemmeddelelser +config_summary = Oversigt +dashboard.system_status = System status +dashboard.update_mirrors = Opdater spejle +dashboard.server_uptime = Server oppetid +dashboard.current_goroutine = Nuværende goroutiner +dashboard.current_memory_usage = Aktuel hukommelsesbrug +dashboard.total_memory_allocated = Samlet hukommelse tildelt +integrations = Integrationer +dashboard.operations = Vedligeholdelses operationer +dashboard.repo_health_check = Sundhedstjek alle depoter +dashboard.check_repo_stats = Tjek alle depotstatistikker +dashboard.git_gc_repos = Samle alt affald fra alle depoter +dashboard.resync_all_sshkeys = Opdater filen ".ssh/authorized_keys" med Forgejo SSH-nøgler. +dashboard.resync_all_sshprincipals = Opdater ".ssh/authorized_principals" filen med Forgejo SSH principals. +users = Brugerkonti +identity_access = Identitet og adgang +first_page = Først +last_page = Sidst +dashboard.task.process = Opgave: %[1]s +total = Total: %d +dashboard.cron.started = Startede Cron: %[1]s +dashboard.cron.process = Cron: %[1]s +dashboard.cron.cancelled = Cron: %[1]s annulleret: %[3]s +dashboard.clean_unbind_oauth_success = Alle ubundne OAuth-forbindelser er blevet slettet. +dashboard.task.started = Startet opgave: %[1]s +dashboard.task.cancelled = Opgave: %[1]s annulleret: %[3]s +dashboard.task.error = Fejl i Opgave: %[1]s: %[3]s +dashboard.resync_all_hooks = Gensynkroniser pre-receive, update og post-receive hooks for alle depoter +dashboard.reinit_missing_repos = Geninitialiser alle manglende Git-depoter, som der findes poster for +dashboard.sync_external_users = Synkroniser eksterne brugerdata +dashboard.cleanup_hook_task_table = Oprydning hook_task tabel +dashboard.cleanup_packages = Ryd udløbne pakker +dashboard.cleanup_actions = Oprydning af udløbne logfiler og artefakter fra handlinger +users.remote = Remote +users.password_helper = Lad adgangskoden være tom for at bevare den uændret. +dashboard.cancel_abandoned_jobs = Annuller forladte handlingsjob +users.activated.description = Afslutning af e-mailbekræftelse. Ejeren af en uaktiveret konto vil ikke være i stand til at logge ind, før e-mailbekræftelsen er gennemført. +users.admin.description = Giv denne bruger fuld adgang til alle administrative funktioner, der er tilgængelige via web-UI og API. +users.update_profile = Opdater brugerkonto +users.still_has_org = Denne bruger er medlem af en organisation. Fjern først brugeren fra enhver organisation. +users.purge_help = Tvangsslet brugeren og eventuelle depoter, organisationer og pakker, der ejes af brugeren. Alle kommentarer og problemer indsendt af denne bruger vil også blive slettet. +users.is_admin = Administrator konto +dashboard.mspan_structures_obtained = Mspan strukturer opnået +dashboard.mcache_structures_usage = MCache strukturer brug +dashboard.mspan_structures_usage = MSpan strukturer brug +dashboard.mcache_structures_obtained = MCache-strukturer opnået +dashboard.profiling_bucket_hash_table_obtained = Profilering bucket hash tabel opnået +dashboard.gc_metadata_obtained = GC-metadata opnået +dashboard.other_system_allocation_obtained = Anden systemallokering opnået +dashboard.next_gc_recycle = Næste GC genbrug +dashboard.total_gc_pause = Total GC-pause +dashboard.last_gc_time = Tid siden sidste GC +dashboard.delete_old_system_notices = Slet alle gamle systemmeddelelser fra databasen +dashboard.gc_lfs = Affaldssamler LFS-metaobjekter +dashboard.start_schedule_tasks = Start planlæg handlingsopgaver +dashboard.sync_branch.started = Gren synkronisering startede +dashboard.sync_tag.started = Tag-synkronisering er startet +dashboard.rebuild_issue_indexer = Genopbyg problemindekser +users.update_profile_success = Brugerkontoen er blevet opdateret. +users.created = Oprettet +users.max_repo_creation = Maksimalt antal depoter +users.prohibit_login = Suspenderet konto +users.is_restricted = Begrænset konto +dashboard.memory_allocate_times = Hukommelsestildelinger +dashboard.memory_free_times = Hukommelses frigørelse +dashboard.current_heap_usage = Nuværende heap-brug +dashboard.heap_memory_obtained = Heap-hukommelse opnået +dashboard.heap_objects = Heap genstande +dashboard.bootstrap_stack_usage = Brug af bootstrap-stak +dashboard.update_checker = Opdateringskontrol +dashboard.delete_old_actions.started = Slet alle gamle aktiviteter fra den påbegyndte database. +dashboard.stop_zombie_tasks = Stop zombiehandlingsopgaver +dashboard.stop_endless_tasks = Stop endeløse handlingsopgaver +users.2fa = 2FA +users.last_login = Sidst logget ind +users.never_login = Aldrig logget ind +users.new_success = Brugerkontoen "%s" er blevet oprettet. +users.local_import.description = Tillad import af depoter fra serverens lokale filsystem. Dette kan være et sikkerhedsproblem. +users.organization_creation.description = Tillad oprettelse af nye organisationer. +users.delete_account = Slet brugerkonto +users.cannot_delete_self = Du kan ikke slette dig selv +users.still_own_repo = Denne bruger ejer stadig et eller flere arkiver. Slet eller overfør disse depoter først. +users.list_status_filter.is_admin = Admin +users.block.description = Bloker denne bruger i at interagere med denne tjeneste via deres konto, og forbyd at logge ind. +users.restricted.description = Tillad kun interaktion med de depoter og organisationer, hvor denne bruger er tilføjet som en samarbejdspartner. Dette forhindrer adgang til offentlige arkiver i denne instans. +users.list_status_filter.menu_text = Filter +dashboard.heap_memory_idle = Heap hukommelse inaktiv +dashboard.heap_memory_in_use = Heap hukommelse i brug +dashboard.heap_memory_released = Heap-hukommelse frigivet +dashboard.stack_memory_obtained = Stakhukommelse opnået +dashboard.last_gc_pause = Sidste GC-pause +dashboard.gc_times = GC times +dashboard.delete_old_actions = Slet alle gamle aktiviteter fra databasen +users.allow_create_organization = Kan skabe organisationer +users.list_status_filter.not_admin = Ikke admin +users.allow_import_local = Kan importere lokale depoter +users.send_register_notify = Giv besked om tilmelding via e-mail +users.local = Lokal +users.auth_login_name = Godkendelses-loginnavn +users.allow_git_hook = Kan skabe Git hooks +users.allow_git_hook_tooltip = Git hooks udføres som OS-brugeren, der kører Forgejo og vil have samme niveau af værtsadgang. Som et resultat kan brugere med dette specielle Git hook-privilegium få adgang til og ændre alle Forgejo-depoter såvel som databasen, der bruges af Forgejo. Derfor er de også i stand til at opnå Forgejo-administratorrettigheder. +users.repos = Depoter +users.still_own_packages = Denne bruger ejer stadig en eller flere pakker, slet disse pakker først. +users.deletion_success = Brugerkontoen er blevet slettet. +users.reset_2fa = Nulstil 2FA +users.max_repo_creation_desc = (Indtast -1 for at bruge den globale standardgrænse.) +users.is_activated = Aktiveret konto +users.edit_account = Rediger brugerkonto +packages.version = Version +users.list_status_filter.reset = Nulstil +users.list_status_filter.is_active = Aktiv +users.list_status_filter.not_active = Inaktiv +users.purge = Udrens bruger +users.user_manage_panel = Administrer brugerkonti +users.new_account = Opret brugerkonto +users.admin = Admin +users.restricted = Begrænset +users.reserved = Reserveret +users.bot = Bot +emails.primary = Primær +emails.updated = E-mail opdateret +emails.not_updated = Kunne ikke opdatere den anmodede e-mailadresse: %v +packages.package_manage_panel = Administrer pakker +packages.total_size = Samlet størrelse: %s +packages.unreferenced_size = Ikke-referencestørrelse: %s +users.list_status_filter.is_2fa_enabled = 2FA aktiveret +users.list_status_filter.not_2fa_enabled = 2FA deaktiveret +emails.filter_sort.email_reverse = E-mail (omvendt) +emails.filter_sort.name_reverse = Brugernavn (omvendt) +emails.delete = Slet e-mail +emails.delete_desc = Er du sikker på, at du vil slette denne e-mailadresse? +emails.deletion_success = E-mailadressen er blevet slettet. +users.list_status_filter.is_restricted = Begrænset +emails.duplicate_active = Denne e-mailadresse er allerede aktiv for en anden bruger. +emails.change_email_header = Opdater e-mail-egenskaber +emails.change_email_text = Er du sikker på, at du vil opdatere denne e-mailadresse? +repos.issues = Problemer +repos.size = Størrelse +repos.lfs_size = LFS størrelse +users.list_status_filter.not_restricted = Ikke begrænset +users.details = Brugeroplysninger +emails.email_manage_panel = Administrer bruger-e-mails +users.list_status_filter.is_prohibit_login = Forbyd login +users.list_status_filter.not_prohibit_login = Tillad login +emails.delete_primary_email_error = Du kan ikke slette den primære e-mail. +orgs.org_manage_panel = Administrer organisationer +repos.repo_manage_panel = Administrer depoter +repos.unadopted = Ikke-adopterede depoter +repos.unadopted.no_more = Ingen ikke-adopterede depoter fundet. +auths.domain = Domæne +auths.port = Port +auths.host = Host +packages.size = Størrelse +auths.security_protocol = Sikkerhedsprotokol +auths.updated = Opdateret +auths.type = Type +auths.syncenabled = Slå brugersynkronisering til +packages.published = Offentliggjort +packages.type = Type [packages] arch.version.description = Beskrivelse @@ -2646,15 +3140,77 @@ rpm.repository = Depot info rpm.repository.architectures = Arkitekturer alt.registry = Konfigurer dette register fra kommandolinjen: alt.repository = Depot info +alpine.repository.repositories = Depoter +search_in_external_registry = Søg i %s +dependency.version = Version +alpine.registry = Konfigurer dette register ved at tilføje url'en i din /etc/apk/repositories fil: +alpine.registry.key = Download den offentlige RSA-nøgle til registreringsdatabasen i mappen /etc/apk/keys/ for at bekræfte indekssignaturen: +alpine.registry.info = Vælg $branch og $repository fra listen nedenfor. [actions] runners.description = Beskrivelse runners.labels = Etiketter runners.name = Navn runners.task_list.repository = Depot +runners.status.active = Aktiv +runners.status.offline = Offline +runners.version = Version [tool] 1d = 1 dag 1w = 1 uge 1mon = 1 måned -1y = 1 år \ No newline at end of file +1y = 1 år +months = %d måneder +years = %d år +raw_seconds = sekunder +raw_minutes = minutter +future = fremtid +1h = 1 time +seconds = %d sekunder +minutes = %d minutter +hours = %d timer +weeks = %d uger +1s = 1 sekund +1m = 1 minut +days = %d dage + +[repo.permissions] +actions.read = Læs: Se integrerede CI/CD-pipelines og deres logfiler. +releases.write = Skriv: Udgiv, rediger og slet udgivelser og deres aktiver. +wiki.read = Læs: Læs den integrerede wiki og dens historie. +wiki.write = Skriv: Opret, opdater og slet sider i den integrerede wiki. +actions.write = Skriv: Udløs, genstart, annuller eller godkend afventende CI/CD-pipelines manuelt. +ext_issues = Få adgang til linket til en ekstern problemsporing. Tilladelserne administreres eksternt. +issues.write = Skriv: Luk problemer og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder. +releases.read = Læs: Se og download udgivelser. +projects.read = Læs: Få adgang til depot-projekttavler. +projects.write = Skriv: Opret projekter og kolonner, og rediger dem. +packages.read = Læs: Se og download pakker, der er tildelt depotet. +packages.write = Skriv: Udgiv og slet pakker, der er tildelt depotet. +ext_wiki = Få adgang til linket til en ekstern wiki. Tilladelserne administreres eksternt. +pulls.read = Læs: Læsning og oprettelse af pull-anmodninger. +pulls.write = Skriv: Luk pull-anmodninger og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder. +code.read = Læs: Få adgang til og klon koden for depotet. +code.write = Skriv: Skub til depotet, opret filialer og tags. +issues.read = Læs: Læs og opret problemer og kommentarer. + +[graphs] +component_failed_to_load = Der skete en uventet fejl. +code_frequency.what = kode frekvens +contributors.what = bidrag +component_loading = Indlæser %s… +component_loading_info = Dette kan tage lidt tid… +recent_commits.what = nylige commits +component_loading_failed = Kunne ikke indlæse %s + +[secrets] +creation.name_placeholder = uafhængig af store og små bogstaver, alfanumeriske tegn eller understregninger, kan ikke starte med GITEA_ eller GITHUB_ +creation.value_placeholder = Indtast ethvert indhold. Mellemrum i starten og slutningen vil blive udeladt. + +[dropzone] +invalid_input_type = Filer af denne type må ikke uploades. +remove_file = Fjern fil + +[gpg] +default_key = Underskrevet med standardnøglen \ No newline at end of file diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 42f05bb0c7..1e78443b89 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -3978,7 +3978,7 @@ submodule=Sous-module [search] -search = Rechercher... +search = Rechercher… type_tooltip = Type de recherche fuzzy = Approximatif code_search_by_git_grep = Les résultats de recherche dans le code sont fournis par "git grep". Les résultats pourraient être plus pertinents si l'administrateur du site active les indexeurs de code source. @@ -3988,14 +3988,14 @@ keyword_search_unavailable = La recherche par mot-clé n'est pas disponible actu fuzzy_tooltip = Inclure les résultats proches des termes recherchés match = Correspondance match_tooltip = Uniquement inclure les résultats correspondant exactement aux termes recherchés -repo_kind = Chercher dans les dépôts... -user_kind = Chercher les utilisateurs... -org_kind = Chercher les organisations... -team_kind = Chercher les équipes... -code_kind = Chercher le code... +repo_kind = Chercher dans les dépôts… +user_kind = Chercher les utilisateurs… +org_kind = Chercher les organisations… +team_kind = Chercher les équipes… +code_kind = Chercher le code… code_search_unavailable = La recherche dans le code n'est pas disponible. Veuillez contacter l'administrateur du site. -package_kind = Chercher les paquets... -project_kind = Chercher les projets... +package_kind = Chercher les paquets… +project_kind = Chercher les projets… branch_kind = Chercher les branches... commit_kind = Chercher les commits... exact = Exact diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 2e2a165f1f..7f4ae4262b 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1571,7 +1571,7 @@ issues.self_assign_at=`piešķīra sev %s` issues.add_assignee_at=`%s piešķīra %s` issues.remove_assignee_at=`%s noņēma %s` issues.remove_self_assignment=`noņēma sev %s` -issues.change_title_at=`nomainīts nosaukums no %s uz %s %s` +issues.change_title_at=`nomainīja nosaukumu no %s uz %s %s` issues.change_ref_at=`nomainīta atsauce no %s uz %s %s` issues.remove_ref_at=`noņēma atsauci no %s %s` issues.add_ref_at=`pievienoja atsauci uz %s %s` @@ -3658,7 +3658,7 @@ raw_seconds=sekundes raw_minutes=minūtes [dropzone] -default_message=Jāievelk datnes vai jāklikšķina šeit, lai augšupielādētu. +default_message=Ievilkt datnes vai klikšķināt šeit, lai augšupielādētu. invalid_input_type=Šī veida datnes nevar augšupielādēt. file_too_big=Datnes izmērs ({{filesize}} MB) pārsniedz pieļaujamo izmēru ({{maxFilesize}} MB). remove_file=Noņemt datni diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 5830a32285..e0f8065063 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -4060,7 +4060,7 @@ filepreview.lines = Строки с %[1]d по %[2]d в %[3]s filepreview.truncated = Предпросмотр был обрезан [translation_meta] -test = Forgejo! +test = Forgejo [repo.permissions] code.write = Запись: отправка изменений в репозиторий, создание веток и тегов. diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json index a66d679e96..218669787d 100644 --- a/options/locale_next/locale_pt-BR.json +++ b/options/locale_next/locale_pt-BR.json @@ -9,11 +9,14 @@ "many": "quer mesclar %[1]d commits de %[2]s em %[3]s", "other": "" }, - "search.milestone_kind": "Pesquisar marcos...", + "search.milestone_kind": "Pesquisar marcos…", "home.welcome.no_activity": "Sem atividade", "home.welcome.activity_hint": "Ainda não tem nada no seu feed. Suas ações e atividade dos seus repositórios vigiados aparecerão aqui.", "home.explore_repos": "Explorar repositórios", "home.explore_users": "Explorar usuários", "home.explore_orgs": "Explorar organizações", - "incorrect_root_url": "Esta instância do Forgejo está configurada para o endereço \"%s\". Você está atualmente vendo o Forgejo através de uma URL diferente, o que pode causar erros em algumas partes da aplicação. A URL oficial é controlada pela administração do Forgejo através da configuração ROOT_URL no arquivo app.ini." + "incorrect_root_url": "Esta instância do Forgejo está configurada para o endereço \"%s\". Você está atualmente vendo o Forgejo através de uma URL diferente, o que pode causar erros em algumas partes da aplicação. A URL oficial é controlada pela administração do Forgejo através da configuração ROOT_URL no arquivo app.ini.", + "themes.names.forgejo-auto": "Forgejo (usar o tema do sistema)", + "themes.names.forgejo-light": "Forgejo claro", + "themes.names.forgejo-dark": "Forgejo escuro" } From 2457f5ff2293f69e6de5cc7d608dd210f6b8e27a Mon Sep 17 00:00:00 2001 From: Gusted Date: Thu, 27 Mar 2025 19:40:14 +0000 Subject: [PATCH 007/568] chore: branding import path (#7337) - Massive replacement of changing `code.gitea.io/gitea` to `forgejo.org`. - Resolves forgejo/discussions#258 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7337 Reviewed-by: Earl Warren Reviewed-by: Michael Kriese Reviewed-by: Beowulf Reviewed-by: Panagiotis "Ivory" Vasilopoulos Co-authored-by: Gusted Co-committed-by: Gusted --- .deadcode-out | 108 ++-- .forgejo/testdata/build-release/go.mod | 2 +- .gitignore | 1 + .golangci.yml | 2 +- Dockerfile | 16 +- Dockerfile.rootless | 16 +- Makefile | 42 +- build/backport-locales.go | 4 +- build/code-batch-process.go | 2 +- build/codeformat/formatimports.go | 4 +- build/codeformat/formatimports_test.go | 8 +- build/generate-emoji.go | 2 +- build/generate-gitignores.go | 2 +- build/generate-go-licenses.go | 6 +- build/generate-licenses.go | 2 +- build/lint-locale-usage/lint-locale-usage.go | 8 +- build/lint-locale/lint-locale.go | 2 +- cmd/actions.go | 4 +- cmd/admin.go | 12 +- cmd/admin_auth.go | 6 +- cmd/admin_auth_ldap.go | 4 +- cmd/admin_auth_ldap_test.go | 4 +- cmd/admin_auth_oauth.go | 4 +- cmd/admin_auth_stmp.go | 6 +- cmd/admin_regenerate.go | 6 +- cmd/admin_user_change_password.go | 10 +- cmd/admin_user_create.go | 12 +- cmd/admin_user_delete.go | 6 +- cmd/admin_user_generate_access_token.go | 4 +- cmd/admin_user_list.go | 2 +- cmd/admin_user_must_change_password.go | 2 +- cmd/cmd.go | 8 +- cmd/doctor.go | 14 +- cmd/doctor_convert.go | 6 +- cmd/doctor_test.go | 4 +- cmd/dump.go | 12 +- cmd/dump_repo.go | 16 +- cmd/embedded.go | 14 +- cmd/forgejo/actions.go | 8 +- cmd/forgejo/actions_test.go | 2 +- cmd/forgejo/f3.go | 14 +- cmd/forgejo/forgejo.go | 8 +- cmd/generate.go | 2 +- cmd/hook.go | 12 +- cmd/hook_test.go | 4 +- cmd/keys.go | 4 +- cmd/mailer.go | 4 +- cmd/main.go | 6 +- cmd/main_test.go | 6 +- cmd/manager.go | 2 +- cmd/manager_logging.go | 4 +- cmd/migrate.go | 8 +- cmd/migrate_storage.go | 22 +- cmd/migrate_storage_test.go | 20 +- cmd/restore_repo.go | 4 +- cmd/serv.go | 24 +- cmd/web.go | 16 +- cmd/web_acme.go | 8 +- cmd/web_graceful.go | 6 +- cmd/web_https.go | 6 +- .../environment-to-ini/environment-to-ini.go | 4 +- go.mod | 2 +- main.go | 16 +- models/actions/artifact.go | 6 +- models/actions/forgejo.go | 6 +- models/actions/forgejo_test.go | 6 +- models/actions/main_test.go | 2 +- models/actions/run.go | 18 +- models/actions/run_job.go | 8 +- models/actions/run_job_list.go | 6 +- models/actions/run_list.go | 12 +- models/actions/runner.go | 18 +- models/actions/runner_list.go | 8 +- models/actions/runner_test.go | 6 +- models/actions/runner_token.go | 10 +- models/actions/runner_token_test.go | 4 +- models/actions/schedule.go | 12 +- models/actions/schedule_spec.go | 6 +- models/actions/schedule_spec_list.go | 6 +- models/actions/status.go | 2 +- models/actions/task.go | 14 +- models/actions/task_list.go | 6 +- models/actions/task_output.go | 2 +- models/actions/task_step.go | 4 +- models/actions/tasks_version.go | 6 +- models/actions/utils.go | 6 +- models/actions/utils_test.go | 2 +- models/actions/variable.go | 6 +- models/activities/action.go | 28 +- models/activities/action_list.go | 12 +- models/activities/action_test.go | 14 +- models/activities/main_test.go | 8 +- models/activities/notification.go | 16 +- models/activities/notification_list.go | 16 +- models/activities/notification_test.go | 10 +- models/activities/repo_activity.go | 12 +- models/activities/repo_activity_test.go | 6 +- models/activities/statistic.go | 24 +- models/activities/user_heatmap.go | 10 +- models/activities/user_heatmap_test.go | 12 +- models/admin/task.go | 20 +- models/asymkey/error.go | 2 +- models/asymkey/gpg_key.go | 6 +- models/asymkey/gpg_key_add.go | 4 +- models/asymkey/gpg_key_commit_verification.go | 6 +- models/asymkey/gpg_key_import.go | 2 +- models/asymkey/gpg_key_list.go | 2 +- models/asymkey/gpg_key_object_verification.go | 12 +- models/asymkey/gpg_key_tag_verification.go | 2 +- models/asymkey/gpg_key_test.go | 10 +- models/asymkey/gpg_key_verify.go | 8 +- models/asymkey/main_test.go | 2 +- models/asymkey/ssh_key.go | 14 +- models/asymkey/ssh_key_authorized_keys.go | 8 +- .../asymkey/ssh_key_authorized_principals.go | 8 +- models/asymkey/ssh_key_deploy.go | 6 +- models/asymkey/ssh_key_fingerprint.go | 10 +- models/asymkey/ssh_key_object_verification.go | 6 +- .../ssh_key_object_verification_test.go | 12 +- models/asymkey/ssh_key_parse.go | 8 +- models/asymkey/ssh_key_principals.go | 10 +- models/asymkey/ssh_key_test.go | 6 +- models/asymkey/ssh_key_verify.go | 4 +- models/auth/access_token.go | 8 +- models/auth/access_token_scope.go | 2 +- models/auth/access_token_test.go | 6 +- models/auth/auth_token.go | 6 +- models/auth/main_test.go | 14 +- models/auth/oauth2.go | 10 +- models/auth/oauth2_list.go | 2 +- models/auth/oauth2_test.go | 8 +- models/auth/session.go | 4 +- models/auth/session_test.go | 8 +- models/auth/source.go | 10 +- models/auth/source_test.go | 8 +- models/auth/twofactor.go | 8 +- models/auth/webauthn.go | 6 +- models/auth/webauthn_test.go | 6 +- models/avatars/avatar.go | 8 +- models/avatars/avatar_test.go | 10 +- models/avatars/main_test.go | 8 +- models/db/collation.go | 6 +- models/db/common.go | 4 +- models/db/context_test.go | 4 +- models/db/convert.go | 4 +- models/db/engine.go | 4 +- models/db/engine_test.go | 16 +- models/db/error.go | 2 +- models/db/index.go | 2 +- models/db/index_test.go | 4 +- models/db/install/db.go | 4 +- models/db/iterate.go | 2 +- models/db/iterate_test.go | 6 +- models/db/list.go | 2 +- models/db/list_test.go | 6 +- models/db/log.go | 2 +- models/db/main_test.go | 6 +- models/db/name.go | 2 +- models/db/paginator/main_test.go | 2 +- models/db/paginator/paginator_test.go | 4 +- models/db/sequence.go | 2 +- models/db/sql_postgres_with_schema.go | 2 +- models/dbfs/dbfile.go | 2 +- models/dbfs/dbfs.go | 2 +- models/dbfs/dbfs_test.go | 2 +- models/dbfs/main_test.go | 2 +- models/error.go | 6 +- models/forgefed/federationhost.go | 4 +- models/forgefed/federationhost_repository.go | 4 +- models/forgefed/federationhost_test.go | 2 +- models/forgefed/nodeinfo.go | 2 +- models/forgefed/nodeinfo_test.go | 2 +- models/forgejo/semver/main_test.go | 10 +- models/forgejo/semver/semver.go | 2 +- models/forgejo/semver/semver_test.go | 4 +- models/forgejo_migrations/main_test.go | 2 +- models/forgejo_migrations/migrate.go | 12 +- models/forgejo_migrations/migrate_test.go | 2 +- models/forgejo_migrations/v14.go | 2 +- models/forgejo_migrations/v15.go | 2 +- models/forgejo_migrations/v1_20/v1.go | 2 +- models/forgejo_migrations/v1_20/v3.go | 2 +- models/forgejo_migrations/v1_22/main_test.go | 2 +- models/forgejo_migrations/v1_22/v11.go | 2 +- models/forgejo_migrations/v1_22/v8_test.go | 2 +- models/forgejo_migrations/v25.go | 10 +- models/forgejo_migrations/v25_test.go | 8 +- models/forgejo_migrations/v27.go | 2 +- models/git/branch.go | 16 +- models/git/branch_list.go | 8 +- models/git/branch_test.go | 14 +- models/git/commit_status.go | 20 +- models/git/commit_status_summary.go | 6 +- models/git/commit_status_test.go | 18 +- models/git/lfs.go | 20 +- models/git/lfs_lock.go | 16 +- models/git/lfs_lock_list.go | 6 +- models/git/lfs_test.go | 8 +- models/git/main_test.go | 10 +- models/git/protected_branch.go | 20 +- models/git/protected_branch_list.go | 4 +- models/git/protected_tag.go | 6 +- models/git/protected_tag_test.go | 6 +- models/issues/action_aggregator.go | 4 +- models/issues/assignees.go | 6 +- models/issues/assignees_test.go | 8 +- models/issues/comment.go | 32 +- models/issues/comment_code.go | 8 +- models/issues/comment_list.go | 10 +- models/issues/comment_list_test.go | 8 +- models/issues/comment_test.go | 12 +- models/issues/content_history.go | 10 +- models/issues/content_history_test.go | 8 +- models/issues/dependency.go | 8 +- models/issues/dependency_test.go | 8 +- models/issues/issue.go | 20 +- models/issues/issue_index.go | 2 +- models/issues/issue_index_test.go | 8 +- models/issues/issue_label.go | 6 +- models/issues/issue_label_test.go | 8 +- models/issues/issue_list.go | 10 +- models/issues/issue_list_test.go | 10 +- models/issues/issue_lock.go | 4 +- models/issues/issue_project.go | 12 +- models/issues/issue_project_test.go | 16 +- models/issues/issue_search.go | 14 +- models/issues/issue_stats.go | 2 +- models/issues/issue_stats_test.go | 6 +- models/issues/issue_test.go | 12 +- models/issues/issue_update.go | 28 +- models/issues/issue_user.go | 4 +- models/issues/issue_user_test.go | 8 +- models/issues/issue_watch.go | 8 +- models/issues/issue_watch_test.go | 6 +- models/issues/issue_xref.go | 12 +- models/issues/issue_xref_test.go | 12 +- models/issues/label.go | 10 +- models/issues/label_test.go | 12 +- models/issues/main_test.go | 14 +- models/issues/milestone.go | 12 +- models/issues/milestone_list.go | 4 +- models/issues/milestone_test.go | 16 +- models/issues/pull.go | 22 +- models/issues/pull_list.go | 16 +- models/issues/pull_test.go | 14 +- models/issues/reaction.go | 14 +- models/issues/reaction_test.go | 12 +- models/issues/review.go | 20 +- models/issues/review_list.go | 10 +- models/issues/review_test.go | 10 +- models/issues/stopwatch.go | 10 +- models/issues/stopwatch_test.go | 12 +- models/issues/tracked_time.go | 10 +- models/issues/tracked_time_test.go | 10 +- models/main_test.go | 16 +- models/migrations/base/db.go | 4 +- models/migrations/base/db_test.go | 4 +- models/migrations/base/main_test.go | 2 +- models/migrations/migrations.go | 46 +- models/migrations/migrations_test.go | 2 +- models/migrations/test/tests.go | 16 +- models/migrations/v1_10/v96.go | 4 +- models/migrations/v1_10/v99.go | 2 +- models/migrations/v1_11/v102.go | 2 +- models/migrations/v1_11/v104.go | 2 +- models/migrations/v1_11/v112.go | 4 +- models/migrations/v1_11/v115.go | 8 +- models/migrations/v1_12/v127.go | 2 +- models/migrations/v1_12/v128.go | 6 +- models/migrations/v1_12/v130.go | 4 +- models/migrations/v1_12/v134.go | 6 +- models/migrations/v1_12/v136.go | 8 +- models/migrations/v1_12/v139.go | 2 +- models/migrations/v1_13/v140.go | 4 +- models/migrations/v1_13/v142.go | 2 +- models/migrations/v1_13/v143.go | 2 +- models/migrations/v1_13/v144.go | 2 +- models/migrations/v1_13/v145.go | 2 +- models/migrations/v1_13/v146.go | 2 +- models/migrations/v1_13/v147.go | 2 +- models/migrations/v1_13/v149.go | 2 +- models/migrations/v1_13/v150.go | 4 +- models/migrations/v1_13/v151.go | 4 +- models/migrations/v1_13/v154.go | 2 +- models/migrations/v1_14/main_test.go | 2 +- models/migrations/v1_14/v156.go | 6 +- models/migrations/v1_14/v158.go | 4 +- models/migrations/v1_14/v159.go | 4 +- models/migrations/v1_14/v161.go | 2 +- models/migrations/v1_14/v162.go | 2 +- models/migrations/v1_14/v163.go | 2 +- models/migrations/v1_14/v165.go | 2 +- models/migrations/v1_14/v172.go | 2 +- models/migrations/v1_14/v175.go | 4 +- models/migrations/v1_14/v176_test.go | 2 +- models/migrations/v1_14/v177_test.go | 4 +- models/migrations/v1_15/main_test.go | 2 +- models/migrations/v1_15/v179.go | 2 +- models/migrations/v1_15/v180.go | 4 +- models/migrations/v1_15/v181_test.go | 2 +- models/migrations/v1_15/v182_test.go | 2 +- models/migrations/v1_15/v183.go | 2 +- models/migrations/v1_15/v184.go | 4 +- models/migrations/v1_15/v186.go | 2 +- models/migrations/v1_15/v187.go | 2 +- models/migrations/v1_16/main_test.go | 2 +- models/migrations/v1_16/v189.go | 4 +- models/migrations/v1_16/v189_test.go | 4 +- models/migrations/v1_16/v191.go | 2 +- models/migrations/v1_16/v192.go | 2 +- models/migrations/v1_16/v193_test.go | 2 +- models/migrations/v1_16/v195_test.go | 2 +- models/migrations/v1_16/v198.go | 2 +- models/migrations/v1_16/v205.go | 2 +- models/migrations/v1_16/v210.go | 2 +- models/migrations/v1_16/v210_test.go | 4 +- models/migrations/v1_17/main_test.go | 2 +- models/migrations/v1_17/v212.go | 2 +- models/migrations/v1_17/v215.go | 4 +- models/migrations/v1_17/v217.go | 2 +- models/migrations/v1_17/v218.go | 4 +- models/migrations/v1_17/v219.go | 4 +- models/migrations/v1_17/v220.go | 4 +- models/migrations/v1_17/v221.go | 2 +- models/migrations/v1_17/v221_test.go | 2 +- models/migrations/v1_17/v222.go | 4 +- models/migrations/v1_17/v223.go | 6 +- models/migrations/v1_18/main_test.go | 2 +- models/migrations/v1_18/v225.go | 2 +- models/migrations/v1_18/v227.go | 2 +- models/migrations/v1_18/v228.go | 2 +- models/migrations/v1_18/v229.go | 2 +- models/migrations/v1_18/v229_test.go | 4 +- models/migrations/v1_18/v230_test.go | 2 +- models/migrations/v1_19/main_test.go | 2 +- models/migrations/v1_19/v232.go | 2 +- models/migrations/v1_19/v233.go | 8 +- models/migrations/v1_19/v233_test.go | 10 +- models/migrations/v1_19/v234.go | 2 +- models/migrations/v1_19/v236.go | 2 +- models/migrations/v1_19/v238.go | 2 +- models/migrations/v1_19/v240.go | 4 +- models/migrations/v1_19/v242.go | 2 +- models/migrations/v1_20/main_test.go | 2 +- models/migrations/v1_20/v245.go | 4 +- models/migrations/v1_20/v247.go | 2 +- models/migrations/v1_20/v249.go | 2 +- models/migrations/v1_20/v250.go | 2 +- models/migrations/v1_20/v251.go | 2 +- models/migrations/v1_20/v252.go | 2 +- models/migrations/v1_20/v253.go | 2 +- models/migrations/v1_20/v255.go | 2 +- models/migrations/v1_20/v257.go | 2 +- models/migrations/v1_20/v259.go | 2 +- models/migrations/v1_20/v259_test.go | 2 +- models/migrations/v1_21/main_test.go | 2 +- models/migrations/v1_21/v260.go | 2 +- models/migrations/v1_21/v261.go | 2 +- models/migrations/v1_21/v264.go | 4 +- models/migrations/v1_21/v267.go | 2 +- models/migrations/v1_21/v271.go | 2 +- models/migrations/v1_21/v273.go | 2 +- models/migrations/v1_21/v274.go | 2 +- models/migrations/v1_21/v276.go | 4 +- models/migrations/v1_22/main_test.go | 2 +- models/migrations/v1_22/v281.go | 2 +- models/migrations/v1_22/v283_test.go | 2 +- models/migrations/v1_22/v286.go | 4 +- models/migrations/v1_22/v286_test.go | 2 +- models/migrations/v1_22/v288.go | 2 +- models/migrations/v1_22/v290.go | 4 +- models/migrations/v1_22/v290_test.go | 6 +- models/migrations/v1_22/v293.go | 4 +- models/migrations/v1_22/v293_test.go | 6 +- models/migrations/v1_22/v294_test.go | 2 +- models/migrations/v1_23/main_test.go | 2 +- models/migrations/v1_23/v302.go | 2 +- models/migrations/v1_23/v303.go | 2 +- models/migrations/v1_23/v303_test.go | 2 +- models/migrations/v1_6/v70.go | 2 +- models/migrations/v1_6/v71.go | 6 +- models/migrations/v1_6/v72.go | 2 +- models/migrations/v1_8/v76.go | 2 +- models/migrations/v1_8/v78.go | 2 +- models/migrations/v1_8/v79.go | 2 +- models/migrations/v1_9/v82.go | 4 +- models/migrations/v1_9/v83.go | 2 +- models/migrations/v1_9/v85.go | 8 +- models/org.go | 8 +- models/org_team.go | 20 +- models/org_team_test.go | 14 +- models/org_test.go | 8 +- models/organization/main_test.go | 16 +- models/organization/org.go | 22 +- models/organization/org_list.go | 8 +- models/organization/org_list_test.go | 8 +- models/organization/org_repo.go | 4 +- models/organization/org_test.go | 16 +- models/organization/org_user.go | 8 +- models/organization/org_user_test.go | 10 +- models/organization/team.go | 14 +- models/organization/team_invite.go | 8 +- models/organization/team_invite_test.go | 8 +- models/organization/team_list.go | 8 +- models/organization/team_repo.go | 6 +- models/organization/team_test.go | 10 +- models/organization/team_unit.go | 6 +- models/organization/team_user.go | 4 +- models/packages/alpine/search.go | 4 +- models/packages/alt/search.go | 4 +- models/packages/conan/references.go | 10 +- models/packages/conan/search.go | 8 +- models/packages/conda/search.go | 6 +- models/packages/container/search.go | 10 +- models/packages/cran/search.go | 6 +- models/packages/debian/search.go | 8 +- models/packages/debian/search_test.go | 24 +- models/packages/descriptor.go | 48 +- models/packages/nuget/search.go | 4 +- models/packages/package.go | 4 +- models/packages/package_blob.go | 14 +- models/packages/package_blob_upload.go | 6 +- models/packages/package_cleanup_rule.go | 6 +- models/packages/package_file.go | 6 +- models/packages/package_property.go | 2 +- models/packages/package_test.go | 18 +- models/packages/package_version.go | 8 +- models/packages/rpm/search.go | 4 +- models/perm/access/access.go | 10 +- models/perm/access/access_test.go | 12 +- models/perm/access/main_test.go | 14 +- models/perm/access/repo_permission.go | 14 +- models/project/column.go | 8 +- models/project/column_test.go | 4 +- models/project/issue.go | 6 +- models/project/main_test.go | 4 +- models/project/project.go | 16 +- models/project/project_test.go | 6 +- models/pull/automerge.go | 8 +- models/pull/review_state.go | 6 +- models/quota/default.go | 2 +- models/quota/group.go | 6 +- models/quota/quota.go | 4 +- models/quota/quota_group_test.go | 2 +- models/quota/quota_rule_test.go | 2 +- models/quota/rule.go | 2 +- models/quota/used.go | 8 +- models/repo.go | 16 +- models/repo/archive_download_count.go | 6 +- models/repo/archive_download_count_test.go | 8 +- models/repo/archiver.go | 8 +- models/repo/attachment.go | 12 +- models/repo/attachment_test.go | 6 +- models/repo/avatar.go | 10 +- models/repo/collaboration.go | 10 +- models/repo/collaboration_test.go | 12 +- models/repo/following_repo.go | 2 +- models/repo/following_repo_test.go | 2 +- models/repo/fork.go | 6 +- models/repo/fork_test.go | 6 +- models/repo/git.go | 2 +- models/repo/issue.go | 6 +- models/repo/language_stats.go | 4 +- models/repo/main_test.go | 16 +- models/repo/mirror.go | 8 +- models/repo/pushmirror.go | 16 +- models/repo/pushmirror_test.go | 8 +- models/repo/redirect.go | 4 +- models/repo/redirect_test.go | 6 +- models/repo/release.go | 14 +- models/repo/release_list.go | 2 +- models/repo/release_list_test.go | 2 +- models/repo/release_test.go | 4 +- models/repo/repo.go | 24 +- models/repo/repo_flags.go | 2 +- models/repo/repo_flags_test.go | 6 +- models/repo/repo_indexer.go | 2 +- models/repo/repo_list.go | 18 +- models/repo/repo_list_test.go | 14 +- models/repo/repo_repository.go | 4 +- models/repo/repo_test.go | 18 +- models/repo/repo_unit.go | 14 +- models/repo/repo_unit_test.go | 6 +- models/repo/search.go | 2 +- models/repo/star.go | 6 +- models/repo/star_test.go | 6 +- models/repo/topic.go | 6 +- models/repo/topic_test.go | 6 +- models/repo/update.go | 8 +- models/repo/upload.go | 8 +- models/repo/user_repo.go | 12 +- models/repo/user_repo_test.go | 8 +- models/repo/watch.go | 8 +- models/repo/watch_test.go | 8 +- models/repo/wiki.go | 6 +- models/repo/wiki_test.go | 6 +- models/repo_test.go | 6 +- models/repo_transfer.go | 12 +- models/repo_transfer_test.go | 6 +- models/secret/secret.go | 16 +- models/shared/types/ownertype.go | 2 +- models/system/appstate.go | 2 +- models/system/main_test.go | 12 +- models/system/notice.go | 10 +- models/system/notice_test.go | 6 +- models/system/setting.go | 8 +- models/system/setting_test.go | 6 +- models/unit/unit.go | 8 +- models/unit/unit_test.go | 2 +- models/unittest/consistency.go | 2 +- models/unittest/fixtures.go | 6 +- models/unittest/mock_http.go | 2 +- models/unittest/testdb.go | 18 +- models/unittest/unit_tests.go | 2 +- models/user/avatar.go | 12 +- models/user/avatar_test.go | 10 +- models/user/badge.go | 2 +- models/user/block.go | 4 +- models/user/block_test.go | 6 +- models/user/email_address.go | 10 +- models/user/email_address_test.go | 8 +- models/user/error.go | 2 +- models/user/external_login_user.go | 4 +- models/user/federated_user.go | 2 +- models/user/federated_user_test.go | 2 +- models/user/follow.go | 4 +- models/user/follow_test.go | 6 +- models/user/list.go | 4 +- models/user/main_test.go | 10 +- models/user/must_change_password.go | 4 +- models/user/openid.go | 4 +- models/user/openid_test.go | 6 +- models/user/redirect.go | 8 +- models/user/redirect_test.go | 6 +- models/user/search.go | 8 +- models/user/setting.go | 8 +- models/user/setting_test.go | 6 +- models/user/user.go | 28 +- models/user/user_repository.go | 6 +- models/user/user_system.go | 4 +- models/user/user_test.go | 28 +- models/user/user_update.go | 2 +- models/webhook/hooktask.go | 12 +- models/webhook/main_test.go | 2 +- models/webhook/webhook.go | 18 +- models/webhook/webhook_system.go | 2 +- models/webhook/webhook_test.go | 12 +- modules/actions/github.go | 2 +- modules/actions/github_test.go | 2 +- modules/actions/log.go | 8 +- modules/actions/task_state.go | 2 +- modules/actions/task_state_test.go | 2 +- modules/actions/workflows.go | 8 +- modules/actions/workflows_test.go | 6 +- modules/activitypub/client.go | 8 +- modules/activitypub/client_test.go | 10 +- modules/activitypub/main_test.go | 10 +- modules/activitypub/user_settings.go | 4 +- modules/activitypub/user_settings_test.go | 8 +- modules/assetfs/layered.go | 8 +- modules/auth/common.go | 4 +- modules/auth/password/hash/argon2.go | 2 +- modules/auth/password/hash/common.go | 2 +- modules/auth/password/hash/hash.go | 2 +- modules/auth/password/hash/pbkdf2.go | 2 +- modules/auth/password/hash/scrypt.go | 2 +- modules/auth/password/password.go | 4 +- modules/auth/password/pwn.go | 4 +- modules/auth/password/pwn/pwn.go | 2 +- modules/auth/webauthn/webauthn.go | 8 +- modules/auth/webauthn/webauthn_test.go | 2 +- modules/avatar/avatar.go | 4 +- modules/avatar/avatar_test.go | 2 +- modules/avatar/hash_test.go | 2 +- modules/base/tool.go | 4 +- modules/cache/cache.go | 2 +- modules/cache/cache_redis.go | 4 +- modules/cache/cache_test.go | 2 +- modules/cache/cache_twoqueue.go | 2 +- modules/cache/context.go | 2 +- modules/card/card.go | 6 +- modules/card/card_test.go | 4 +- modules/charset/ambiguous.go | 2 +- modules/charset/ambiguous/generate.go | 2 +- modules/charset/charset.go | 6 +- modules/charset/charset_test.go | 2 +- modules/charset/escape.go | 6 +- modules/charset/escape_stream.go | 2 +- modules/charset/escape_test.go | 6 +- modules/csv/csv.go | 6 +- modules/csv/csv_test.go | 6 +- modules/eventsource/event.go | 2 +- modules/eventsource/manager_run.go | 18 +- modules/forgefed/activity_like.go | 2 +- modules/forgefed/activity_like_test.go | 2 +- modules/forgefed/activity_undo_like.go | 2 +- modules/forgefed/activity_undo_like_test.go | 2 +- .../activity_validateandcheckerror_test.go | 2 +- modules/forgefed/actor.go | 2 +- modules/forgefed/actor_test.go | 4 +- modules/forgefed/repository_test.go | 2 +- modules/generate/generate.go | 2 +- modules/git/batch_reader.go | 2 +- modules/git/blame.go | 4 +- modules/git/blob.go | 6 +- modules/git/command.go | 8 +- modules/git/commit.go | 4 +- modules/git/commit_info.go | 2 +- modules/git/diff.go | 2 +- modules/git/error.go | 2 +- modules/git/foreachref/format_test.go | 2 +- modules/git/foreachref/parser_test.go | 4 +- modules/git/git.go | 4 +- modules/git/git_test.go | 4 +- modules/git/grep.go | 4 +- modules/git/hook.go | 4 +- modules/git/last_commit_cache.go | 4 +- modules/git/log_name_status.go | 2 +- modules/git/notes.go | 2 +- modules/git/notes_test.go | 4 +- modules/git/parse.go | 2 +- modules/git/pipeline/catfile.go | 4 +- modules/git/pipeline/lfs.go | 2 +- modules/git/pipeline/namerev.go | 2 +- modules/git/pipeline/revlist.go | 4 +- modules/git/ref.go | 2 +- modules/git/remote.go | 2 +- modules/git/repo.go | 6 +- modules/git/repo_attribute.go | 2 +- modules/git/repo_attribute_test.go | 2 +- modules/git/repo_base.go | 2 +- modules/git/repo_branch.go | 2 +- modules/git/repo_commit.go | 6 +- modules/git/repo_commit_test.go | 4 +- modules/git/repo_compare.go | 2 +- modules/git/repo_gpg.go | 2 +- modules/git/repo_index.go | 4 +- modules/git/repo_language_stats.go | 6 +- modules/git/repo_ref.go | 2 +- modules/git/repo_stats.go | 2 +- modules/git/repo_tag.go | 6 +- modules/git/signature.go | 4 +- modules/git/tag.go | 4 +- modules/git/tree_entry.go | 2 +- modules/gitrepo/branch.go | 2 +- modules/gitrepo/gitrepo.go | 4 +- modules/gitrepo/walk.go | 2 +- modules/graceful/manager.go | 6 +- modules/graceful/manager_unix.go | 8 +- modules/graceful/net_unix.go | 6 +- modules/graceful/server.go | 6 +- modules/graceful/server_hooks.go | 2 +- modules/hcaptcha/hcaptcha.go | 4 +- modules/highlight/highlight.go | 8 +- modules/httpcache/httpcache.go | 2 +- modules/httplib/serve.go | 14 +- modules/httplib/url.go | 2 +- modules/httplib/url_test.go | 4 +- modules/indexer/code/bleve/bleve.go | 24 +- .../code/elasticsearch/elasticsearch.go | 26 +- modules/indexer/code/git.go | 10 +- modules/indexer/code/indexer.go | 20 +- modules/indexer/code/indexer_test.go | 20 +- modules/indexer/code/internal/indexer.go | 6 +- modules/indexer/code/internal/model.go | 2 +- modules/indexer/code/internal/util.go | 2 +- modules/indexer/code/search.go | 8 +- modules/indexer/internal/bleve/indexer.go | 4 +- modules/indexer/internal/bleve/metadata.go | 2 +- modules/indexer/internal/bleve/query.go | 2 +- modules/indexer/internal/bleve/util.go | 4 +- modules/indexer/internal/db/indexer.go | 2 +- .../indexer/internal/elasticsearch/indexer.go | 2 +- .../indexer/internal/elasticsearch/util.go | 2 +- modules/indexer/internal/meilisearch/util.go | 2 +- modules/indexer/internal/paginator.go | 2 +- modules/indexer/issues/bleve/bleve.go | 6 +- modules/indexer/issues/bleve/bleve_test.go | 2 +- modules/indexer/issues/db/db.go | 10 +- modules/indexer/issues/db/options.go | 10 +- modules/indexer/issues/dboptions.go | 6 +- .../issues/elasticsearch/elasticsearch.go | 8 +- .../elasticsearch/elasticsearch_test.go | 2 +- modules/indexer/issues/indexer.go | 26 +- modules/indexer/issues/indexer_test.go | 20 +- modules/indexer/issues/internal/indexer.go | 2 +- modules/indexer/issues/internal/model.go | 6 +- .../indexer/issues/internal/tests/tests.go | 8 +- .../indexer/issues/meilisearch/meilisearch.go | 6 +- .../issues/meilisearch/meilisearch_test.go | 4 +- modules/indexer/issues/util.go | 12 +- modules/indexer/stats/db.go | 14 +- modules/indexer/stats/indexer.go | 8 +- modules/indexer/stats/indexer_test.go | 18 +- modules/indexer/stats/queue.go | 10 +- modules/issue/template/template.go | 4 +- modules/issue/template/template_test.go | 4 +- modules/issue/template/unmarshal.go | 10 +- modules/keying/keying_test.go | 2 +- modules/label/parser.go | 2 +- modules/lfs/content_store.go | 4 +- modules/lfs/endpoint.go | 4 +- modules/lfs/filesystem_client.go | 2 +- modules/lfs/http_client.go | 8 +- modules/lfs/http_client_test.go | 6 +- modules/lfs/pointer_scanner.go | 4 +- modules/lfs/shared.go | 2 +- modules/lfs/transferadapter.go | 4 +- modules/lfs/transferadapter_test.go | 2 +- modules/log/event_writer_buffer_test.go | 2 +- modules/log/event_writer_file.go | 2 +- modules/log/flags.go | 2 +- modules/log/flags_test.go | 2 +- modules/log/init.go | 4 +- modules/log/level.go | 2 +- modules/log/level_test.go | 2 +- modules/log/logger_impl.go | 4 +- modules/markup/asciicast/asciicast.go | 4 +- modules/markup/camo.go | 4 +- modules/markup/camo_test.go | 2 +- modules/markup/console/console.go | 4 +- modules/markup/console/console_test.go | 4 +- modules/markup/csv/csv.go | 10 +- modules/markup/csv/csv_test.go | 4 +- modules/markup/external/external.go | 12 +- modules/markup/file_preview.go | 10 +- modules/markup/html.go | 22 +- modules/markup/html_internal_test.go | 6 +- modules/markup/html_test.go | 20 +- modules/markup/markdown/callout/github.go | 2 +- .../markup/markdown/callout/github_legacy.go | 2 +- modules/markup/markdown/goldmark.go | 4 +- modules/markup/markdown/markdown.go | 14 +- modules/markup/markdown/markdown_test.go | 16 +- modules/markup/markdown/prefixed_id.go | 6 +- modules/markup/markdown/renderconfig.go | 2 +- modules/markup/markdown/toc.go | 4 +- modules/markup/markdown/transform_codespan.go | 4 +- modules/markup/markdown/transform_heading.go | 6 +- modules/markup/markdown/transform_image.go | 4 +- modules/markup/markdown/transform_link.go | 6 +- modules/markup/markdown/transform_list.go | 2 +- modules/markup/mdstripper/mdstripper.go | 6 +- modules/markup/orgmode/orgmode.go | 10 +- modules/markup/orgmode/orgmode_test.go | 8 +- modules/markup/renderer.go | 6 +- modules/markup/sanitizer.go | 2 +- modules/mcaptcha/mcaptcha.go | 2 +- modules/metrics/collector.go | 6 +- modules/migration/downloader.go | 2 +- modules/migration/file_format.go | 4 +- modules/migration/options.go | 2 +- modules/migration/pullrequest.go | 2 +- modules/nosql/manager.go | 2 +- modules/nosql/manager_leveldb.go | 2 +- modules/nosql/manager_redis.go | 2 +- modules/optional/option_test.go | 2 +- modules/optional/serialization.go | 2 +- modules/optional/serialization_test.go | 4 +- modules/options/base.go | 4 +- modules/options/dynamic.go | 4 +- modules/options/static.go | 2 +- modules/packages/alpine/metadata.go | 4 +- modules/packages/arch/metadata.go | 6 +- modules/packages/arch/metadata_test.go | 2 +- modules/packages/cargo/parser.go | 4 +- modules/packages/chef/metadata.go | 6 +- modules/packages/composer/metadata.go | 6 +- modules/packages/composer/metadata_test.go | 2 +- modules/packages/conan/conaninfo_parser.go | 2 +- modules/packages/conan/reference.go | 4 +- modules/packages/conda/metadata.go | 8 +- modules/packages/conda/metadata_test.go | 2 +- modules/packages/container/metadata.go | 6 +- modules/packages/container/metadata_test.go | 2 +- modules/packages/content_store.go | 6 +- modules/packages/cran/metadata.go | 2 +- modules/packages/debian/metadata.go | 6 +- modules/packages/debian/metadata_test.go | 2 +- modules/packages/goproxy/metadata.go | 2 +- modules/packages/hashed_buffer.go | 2 +- modules/packages/helm/metadata.go | 4 +- modules/packages/maven/metadata.go | 4 +- modules/packages/npm/creator.go | 6 +- modules/packages/npm/creator_test.go | 2 +- modules/packages/nuget/metadata.go | 4 +- modules/packages/nuget/symbol_extractor.go | 4 +- modules/packages/pub/metadata.go | 4 +- modules/packages/rpm/metadata.go | 4 +- modules/packages/rubygems/marshal.go | 2 +- modules/packages/rubygems/metadata.go | 4 +- modules/packages/swift/metadata.go | 6 +- modules/packages/vagrant/metadata.go | 4 +- modules/packages/vagrant/metadata_test.go | 2 +- modules/pprof/pprof.go | 2 +- modules/private/actions.go | 2 +- modules/private/hook.go | 8 +- modules/private/internal.go | 10 +- modules/private/key.go | 2 +- modules/private/mail.go | 2 +- modules/private/manager.go | 2 +- modules/private/request.go | 4 +- modules/private/restore_repo.go | 2 +- modules/private/serv.go | 8 +- modules/proxy/proxy.go | 4 +- modules/proxyprotocol/conn.go | 2 +- modules/public/public.go | 12 +- modules/public/public_test.go | 2 +- modules/public/serve_dynamic.go | 4 +- modules/public/serve_static.go | 4 +- modules/queue/base_channel.go | 2 +- modules/queue/base_levelqueue.go | 4 +- modules/queue/base_levelqueue_common.go | 2 +- modules/queue/base_levelqueue_test.go | 4 +- modules/queue/base_levelqueue_unique.go | 4 +- modules/queue/base_redis.go | 6 +- modules/queue/base_redis_test.go | 4 +- modules/queue/base_redis_with_server_test.go | 4 +- modules/queue/config.go | 2 +- modules/queue/manager.go | 4 +- modules/queue/manager_test.go | 2 +- modules/queue/mock/redisuniversalclient.go | 4 +- modules/queue/queue.go | 2 +- modules/queue/workergroup.go | 2 +- modules/queue/workerqueue.go | 8 +- modules/queue/workerqueue_test.go | 4 +- modules/recaptcha/recaptcha.go | 6 +- modules/references/references.go | 8 +- modules/references/references_test.go | 2 +- modules/regexplru/regexplru.go | 2 +- modules/repository/branch.go | 16 +- modules/repository/branch_test.go | 8 +- modules/repository/collaborator.go | 10 +- modules/repository/collaborator_test.go | 16 +- modules/repository/commits.go | 14 +- modules/repository/commits_test.go | 10 +- modules/repository/create.go | 32 +- modules/repository/create_test.go | 8 +- modules/repository/delete.go | 6 +- modules/repository/env.go | 6 +- modules/repository/fork.go | 6 +- modules/repository/hooks.go | 4 +- modules/repository/init.go | 16 +- modules/repository/license.go | 2 +- modules/repository/main_test.go | 6 +- modules/repository/push.go | 2 +- modules/repository/repo.go | 22 +- modules/repository/repo_test.go | 2 +- modules/repository/temp.go | 6 +- modules/session/db.go | 6 +- modules/session/redis.go | 4 +- modules/session/virtual.go | 4 +- modules/setting/admin.go | 2 +- modules/setting/admin_test.go | 2 +- modules/setting/api.go | 2 +- modules/setting/cache.go | 2 +- modules/setting/camo.go | 2 +- modules/setting/config.go | 4 +- modules/setting/config/value.go | 6 +- modules/setting/config_env.go | 2 +- modules/setting/config_provider.go | 4 +- modules/setting/f3.go | 2 +- modules/setting/federation.go | 2 +- modules/setting/git.go | 2 +- modules/setting/incoming_email.go | 2 +- modules/setting/indexer.go | 2 +- modules/setting/lfs.go | 2 +- modules/setting/log.go | 4 +- modules/setting/log_test.go | 4 +- modules/setting/mailer.go | 2 +- modules/setting/markup.go | 2 +- modules/setting/mirror.go | 2 +- modules/setting/oauth2.go | 4 +- modules/setting/oauth2_test.go | 4 +- modules/setting/other.go | 2 +- modules/setting/path.go | 2 +- modules/setting/proxy.go | 2 +- modules/setting/queue.go | 4 +- modules/setting/repository.go | 2 +- modules/setting/security.go | 8 +- modules/setting/server.go | 6 +- modules/setting/server_test.go | 2 +- modules/setting/service.go | 4 +- modules/setting/service_test.go | 2 +- modules/setting/session.go | 4 +- modules/setting/setting.go | 6 +- modules/setting/setting_test.go | 2 +- modules/setting/ssh.go | 4 +- modules/setting/time.go | 2 +- modules/setting/ui.go | 4 +- modules/setting/webhook.go | 2 +- modules/ssh/init.go | 4 +- modules/ssh/ssh.go | 12 +- modules/ssh/ssh_graceful.go | 6 +- modules/storage/local.go | 6 +- modules/storage/local_test.go | 2 +- modules/storage/minio.go | 6 +- modules/storage/minio_test.go | 2 +- modules/storage/storage.go | 4 +- modules/storage/storage_test.go | 2 +- modules/structs/attachment.go | 2 +- modules/structs/hook.go | 2 +- modules/structs/user.go | 2 +- modules/svg/svg.go | 6 +- modules/sync/status_pool.go | 2 +- modules/system/appstate_test.go | 4 +- modules/system/db.go | 6 +- modules/templates/base.go | 4 +- modules/templates/dynamic.go | 4 +- modules/templates/eval/eval.go | 2 +- modules/templates/helper.go | 16 +- modules/templates/htmlrenderer.go | 12 +- modules/templates/htmlrenderer_test.go | 2 +- modules/templates/mailer.go | 6 +- modules/templates/main_test.go | 10 +- modules/templates/static.go | 4 +- modules/templates/util_avatar.go | 14 +- modules/templates/util_date.go | 6 +- modules/templates/util_date_test.go | 6 +- modules/templates/util_dict.go | 6 +- modules/templates/util_json.go | 2 +- modules/templates/util_misc.go | 16 +- modules/templates/util_render.go | 16 +- modules/templates/util_render_test.go | 8 +- modules/templates/util_string.go | 2 +- modules/test/logchecker.go | 2 +- modules/test/logchecker_test.go | 2 +- modules/test/utils.go | 2 +- modules/testlogger/testlogger.go | 6 +- modules/timeutil/executable.go | 2 +- modules/timeutil/since.go | 2 +- modules/timeutil/since_test.go | 4 +- modules/timeutil/timestamp.go | 2 +- modules/timeutil/timestampnano.go | 2 +- modules/translation/i18n/dummy_test.go | 2 +- modules/translation/i18n/errors.go | 2 +- modules/translation/i18n/localestore.go | 8 +- modules/translation/plural_rules.go | 4 +- modules/translation/translation.go | 10 +- modules/translation/translation_test.go | 2 +- modules/turnstile/turnstile.go | 4 +- modules/typesniffer/typesniffer.go | 2 +- modules/updatechecker/update_checker.go | 8 +- modules/util/rotatingfilewriter/writer.go | 4 +- modules/util/util.go | 2 +- modules/util/util_test.go | 6 +- modules/validation/binding.go | 6 +- modules/validation/email.go | 4 +- modules/validation/helpers.go | 2 +- modules/validation/helpers_test.go | 2 +- modules/validation/validatable.go | 2 +- modules/validation/validatable_test.go | 2 +- modules/web/handler.go | 6 +- modules/web/middleware/binding.go | 8 +- modules/web/middleware/cookie.go | 4 +- modules/web/middleware/data.go | 2 +- modules/web/middleware/locale.go | 4 +- modules/web/route.go | 2 +- modules/web/routemock.go | 2 +- modules/web/routemock_test.go | 2 +- modules/web/routing/logger.go | 4 +- modules/web/routing/logger_manager.go | 4 +- routers/api/actions/actions.go | 6 +- routers/api/actions/artifacts.go | 24 +- routers/api/actions/artifacts_chunks.go | 8 +- routers/api/actions/artifacts_utils.go | 6 +- routers/api/actions/artifactsv4.go | 20 +- routers/api/actions/ping/ping.go | 2 +- routers/api/actions/runner/interceptor.go | 10 +- routers/api/actions/runner/main_test.go | 4 +- routers/api/actions/runner/runner.go | 14 +- routers/api/forgejo/v1/api.go | 4 +- routers/api/forgejo/v1/forgejo.go | 4 +- routers/api/packages/alpine/alpine.go | 20 +- routers/api/packages/alt/alt.go | 24 +- routers/api/packages/api.go | 62 +-- routers/api/packages/arch/arch.go | 18 +- routers/api/packages/cargo/cargo.go | 28 +- routers/api/packages/chef/auth.go | 8 +- routers/api/packages/chef/chef.go | 20 +- routers/api/packages/composer/api.go | 4 +- routers/api/packages/composer/composer.go | 22 +- routers/api/packages/conan/auth.go | 8 +- routers/api/packages/conan/conan.go | 28 +- routers/api/packages/conan/search.go | 10 +- routers/api/packages/conda/conda.go | 20 +- routers/api/packages/container/auth.go | 8 +- routers/api/packages/container/blob.go | 16 +- routers/api/packages/container/container.go | 28 +- routers/api/packages/container/manifest.go | 22 +- routers/api/packages/cran/cran.go | 16 +- routers/api/packages/debian/debian.go | 20 +- routers/api/packages/generic/generic.go | 12 +- routers/api/packages/goproxy/goproxy.go | 16 +- routers/api/packages/helm/helm.go | 22 +- routers/api/packages/helper/helper.go | 8 +- routers/api/packages/maven/api.go | 4 +- routers/api/packages/maven/maven.go | 18 +- routers/api/packages/npm/api.go | 6 +- routers/api/packages/npm/npm.go | 26 +- routers/api/packages/nuget/api_v2.go | 4 +- routers/api/packages/nuget/api_v3.go | 4 +- routers/api/packages/nuget/auth.go | 10 +- routers/api/packages/nuget/nuget.go | 24 +- routers/api/packages/pub/pub.go | 20 +- routers/api/packages/pypi/pypi.go | 16 +- routers/api/packages/rpm/rpm.go | 24 +- routers/api/packages/rubygems/rubygems.go | 16 +- routers/api/packages/swift/swift.go | 22 +- routers/api/packages/vagrant/vagrant.go | 14 +- routers/api/shared/middleware.go | 10 +- routers/api/v1/activitypub/actor.go | 10 +- routers/api/v1/activitypub/person.go | 8 +- routers/api/v1/activitypub/repository.go | 12 +- routers/api/v1/activitypub/repository_test.go | 2 +- routers/api/v1/activitypub/reqsignature.go | 10 +- routers/api/v1/activitypub/response.go | 8 +- routers/api/v1/admin/adopt.go | 12 +- routers/api/v1/admin/cron.go | 12 +- routers/api/v1/admin/email.go | 10 +- routers/api/v1/admin/hooks.go | 16 +- routers/api/v1/admin/org.go | 16 +- routers/api/v1/admin/quota.go | 6 +- routers/api/v1/admin/quota_group.go | 12 +- routers/api/v1/admin/quota_rule.go | 10 +- routers/api/v1/admin/repo.go | 8 +- routers/api/v1/admin/runners.go | 4 +- routers/api/v1/admin/user.go | 40 +- routers/api/v1/api.go | 60 +-- routers/api/v1/misc/gitignore.go | 10 +- routers/api/v1/misc/label_templates.go | 8 +- routers/api/v1/misc/licenses.go | 12 +- routers/api/v1/misc/markup.go | 12 +- routers/api/v1/misc/markup_test.go | 10 +- routers/api/v1/misc/nodeinfo.go | 10 +- routers/api/v1/misc/signing.go | 4 +- routers/api/v1/misc/version.go | 6 +- routers/api/v1/notify/notifications.go | 10 +- routers/api/v1/notify/repo.go | 10 +- routers/api/v1/notify/threads.go | 10 +- routers/api/v1/notify/user.go | 10 +- routers/api/v1/org/action.go | 22 +- routers/api/v1/org/avatar.go | 8 +- routers/api/v1/org/hook.go | 10 +- routers/api/v1/org/label.go | 14 +- routers/api/v1/org/member.go | 16 +- routers/api/v1/org/org.go | 30 +- routers/api/v1/org/quota.go | 4 +- routers/api/v1/org/team.go | 32 +- routers/api/v1/packages/package.go | 18 +- routers/api/v1/repo/action.go | 24 +- routers/api/v1/repo/avatar.go | 8 +- routers/api/v1/repo/blob.go | 4 +- routers/api/v1/repo/branch.go | 32 +- routers/api/v1/repo/collaborators.go | 24 +- routers/api/v1/repo/commits.go | 16 +- routers/api/v1/repo/compare.go | 10 +- routers/api/v1/repo/download.go | 8 +- routers/api/v1/repo/file.go | 34 +- routers/api/v1/repo/flags.go | 6 +- routers/api/v1/repo/fork.go | 26 +- routers/api/v1/repo/git_hook.go | 10 +- routers/api/v1/repo/git_ref.go | 8 +- routers/api/v1/repo/hook.go | 26 +- routers/api/v1/repo/hook_test.go | 6 +- routers/api/v1/repo/issue.go | 34 +- routers/api/v1/repo/issue_attachment.go | 22 +- routers/api/v1/repo/issue_comment.go | 24 +- .../api/v1/repo/issue_comment_attachment.go | 22 +- routers/api/v1/repo/issue_dependency.go | 18 +- routers/api/v1/repo/issue_label.go | 12 +- routers/api/v1/repo/issue_pin.go | 8 +- routers/api/v1/repo/issue_reaction.go | 16 +- routers/api/v1/repo/issue_stopwatch.go | 8 +- routers/api/v1/repo/issue_subscription.go | 12 +- routers/api/v1/repo/issue_tracked_time.go | 18 +- routers/api/v1/repo/key.go | 24 +- routers/api/v1/repo/label.go | 14 +- routers/api/v1/repo/language.go | 6 +- routers/api/v1/repo/main_test.go | 6 +- routers/api/v1/repo/migrate.go | 44 +- routers/api/v1/repo/milestone.go | 18 +- routers/api/v1/repo/mirror.go | 30 +- routers/api/v1/repo/notes.go | 10 +- routers/api/v1/repo/patch.go | 16 +- routers/api/v1/repo/pull.go | 58 +-- routers/api/v1/repo/pull_review.go | 24 +- routers/api/v1/repo/release.go | 24 +- routers/api/v1/repo/release_attachment.go | 18 +- routers/api/v1/repo/release_tags.go | 10 +- routers/api/v1/repo/repo.go | 52 +- routers/api/v1/repo/repo_test.go | 10 +- routers/api/v1/repo/star.go | 10 +- routers/api/v1/repo/status.go | 16 +- routers/api/v1/repo/subscriber.go | 10 +- routers/api/v1/repo/tag.go | 22 +- routers/api/v1/repo/teams.go | 10 +- routers/api/v1/repo/topic.go | 14 +- routers/api/v1/repo/transfer.go | 26 +- routers/api/v1/repo/tree.go | 4 +- routers/api/v1/repo/wiki.go | 22 +- routers/api/v1/settings/settings.go | 6 +- routers/api/v1/shared/quota.go | 8 +- routers/api/v1/shared/runners.go | 10 +- routers/api/v1/swagger/action.go | 2 +- routers/api/v1/swagger/activity.go | 2 +- routers/api/v1/swagger/activitypub.go | 2 +- routers/api/v1/swagger/app.go | 2 +- routers/api/v1/swagger/cron.go | 2 +- routers/api/v1/swagger/issue.go | 2 +- routers/api/v1/swagger/key.go | 2 +- routers/api/v1/swagger/misc.go | 2 +- routers/api/v1/swagger/nodeinfo.go | 2 +- routers/api/v1/swagger/notify.go | 2 +- routers/api/v1/swagger/options.go | 6 +- routers/api/v1/swagger/org.go | 2 +- routers/api/v1/swagger/package.go | 2 +- routers/api/v1/swagger/quota.go | 2 +- routers/api/v1/swagger/repo.go | 2 +- routers/api/v1/swagger/settings.go | 2 +- routers/api/v1/swagger/user.go | 4 +- routers/api/v1/user/action.go | 18 +- routers/api/v1/user/app.go | 14 +- routers/api/v1/user/avatar.go | 8 +- routers/api/v1/user/email.go | 14 +- routers/api/v1/user/follower.go | 10 +- routers/api/v1/user/gpg_key.go | 18 +- routers/api/v1/user/helper.go | 4 +- routers/api/v1/user/hook.go | 10 +- routers/api/v1/user/key.go | 24 +- routers/api/v1/user/quota.go | 4 +- routers/api/v1/user/repo.go | 14 +- routers/api/v1/user/runners.go | 4 +- routers/api/v1/user/settings.go | 12 +- routers/api/v1/user/star.go | 18 +- routers/api/v1/user/user.go | 12 +- routers/api/v1/user/watch.go | 16 +- routers/api/v1/utils/block.go | 8 +- routers/api/v1/utils/git.go | 8 +- routers/api/v1/utils/hook.go | 20 +- routers/api/v1/utils/page.go | 6 +- routers/common/auth.go | 8 +- routers/common/compare.go | 6 +- routers/common/db.go | 12 +- routers/common/errpage.go | 18 +- routers/common/errpage_test.go | 6 +- routers/common/markup.go | 10 +- routers/common/middleware.go | 12 +- routers/common/middleware_test.go | 2 +- routers/common/redirect.go | 2 +- routers/common/serve.go | 10 +- routers/init.go | 88 ++-- routers/install/install.go | 38 +- routers/install/routes.go | 12 +- routers/install/routes_test.go | 2 +- routers/private/actions.go | 16 +- routers/private/default_branch.go | 8 +- routers/private/hook_post_receive.go | 38 +- routers/private/hook_post_receive_test.go | 18 +- routers/private/hook_pre_receive.go | 32 +- routers/private/hook_proc_receive.go | 14 +- routers/private/hook_verification.go | 6 +- routers/private/hook_verification_test.go | 4 +- routers/private/internal.go | 10 +- routers/private/internal_repo.go | 10 +- routers/private/key.go | 8 +- routers/private/mail.go | 16 +- routers/private/main_test.go | 2 +- routers/private/manager.go | 20 +- routers/private/manager_process.go | 8 +- routers/private/manager_unix.go | 4 +- routers/private/restore_repo.go | 8 +- routers/private/serv.go | 26 +- routers/private/ssh_log.go | 10 +- routers/web/admin/admin.go | 28 +- routers/web/admin/admin_test.go | 10 +- routers/web/admin/applications.go | 12 +- routers/web/admin/auths.go | 28 +- routers/web/admin/config.go | 22 +- routers/web/admin/diagnosis.go | 4 +- routers/web/admin/emails.go | 16 +- routers/web/admin/hooks.go | 10 +- routers/web/admin/main_test.go | 2 +- routers/web/admin/notice.go | 12 +- routers/web/admin/orgs.go | 14 +- routers/web/admin/packages.go | 16 +- routers/web/admin/queue.go | 6 +- routers/web/admin/queue_tester.go | 10 +- routers/web/admin/repos.go | 20 +- routers/web/admin/runners.go | 4 +- routers/web/admin/stacktrace.go | 6 +- routers/web/admin/users.go | 40 +- routers/web/admin/users_test.go | 14 +- routers/web/auth/2fa.go | 16 +- routers/web/auth/auth.go | 48 +- routers/web/auth/auth_test.go | 4 +- routers/web/auth/linkaccount.go | 24 +- routers/web/auth/main_test.go | 2 +- routers/web/auth/oauth.go | 46 +- routers/web/auth/oauth_test.go | 12 +- routers/web/auth/openid.go | 20 +- routers/web/auth/password.go | 28 +- routers/web/auth/webauthn.go | 16 +- routers/web/base.go | 12 +- routers/web/devtest/devtest.go | 6 +- routers/web/events/events.go | 10 +- routers/web/explore/code.go | 12 +- routers/web/explore/org.go | 12 +- routers/web/explore/repo.go | 14 +- routers/web/explore/topic.go | 10 +- routers/web/explore/user.go | 20 +- routers/web/feed/branch.go | 4 +- routers/web/feed/convert.go | 20 +- routers/web/feed/file.go | 8 +- routers/web/feed/profile.go | 8 +- routers/web/feed/release.go | 6 +- routers/web/feed/render.go | 2 +- routers/web/feed/repo.go | 6 +- routers/web/githttp.go | 8 +- routers/web/goget.go | 8 +- routers/web/healthcheck/check.go | 10 +- routers/web/home.go | 26 +- routers/web/metrics.go | 2 +- routers/web/misc/markup.go | 8 +- routers/web/misc/misc.go | 10 +- routers/web/misc/swagger-forgejo.go | 4 +- routers/web/misc/swagger.go | 4 +- routers/web/nodeinfo.go | 4 +- routers/web/org/home.go | 24 +- routers/web/org/main_test.go | 2 +- routers/web/org/members.go | 14 +- routers/web/org/org.go | 18 +- routers/web/org/org_labels.go | 14 +- routers/web/org/projects.go | 28 +- routers/web/org/projects_test.go | 6 +- routers/web/org/setting.go | 38 +- routers/web/org/setting/blocked_users.go | 10 +- routers/web/org/setting/runners.go | 2 +- routers/web/org/setting/storage_overview.go | 6 +- routers/web/org/setting_oauth2.go | 14 +- routers/web/org/setting_packages.go | 10 +- routers/web/org/teams.go | 36 +- routers/web/repo/action_aggregator_test.go | 8 +- routers/web/repo/actions/actions.go | 30 +- routers/web/repo/actions/actions_test.go | 6 +- routers/web/repo/actions/main_test.go | 2 +- routers/web/repo/actions/manual.go | 4 +- routers/web/repo/actions/view.go | 36 +- routers/web/repo/activity.go | 8 +- routers/web/repo/attachment.go | 24 +- routers/web/repo/badges/badges.go | 10 +- routers/web/repo/blame.go | 20 +- routers/web/repo/branch.go | 34 +- routers/web/repo/card.go | 22 +- routers/web/repo/cherry_pick.go | 22 +- routers/web/repo/code_frequency.go | 6 +- routers/web/repo/commit.go | 40 +- routers/web/repo/compare.go | 46 +- routers/web/repo/contributors.go | 6 +- routers/web/repo/download.go | 18 +- routers/web/repo/editor.go | 40 +- routers/web/repo/editor_test.go | 10 +- routers/web/repo/find.go | 6 +- routers/web/repo/flags/manage.go | 8 +- routers/web/repo/githttp.go | 28 +- routers/web/repo/helper.go | 6 +- routers/web/repo/helper_test.go | 2 +- routers/web/repo/issue.go | 76 +-- routers/web/repo/issue_content_history.go | 12 +- routers/web/repo/issue_dependency.go | 8 +- routers/web/repo/issue_label.go | 22 +- routers/web/repo/issue_label_test.go | 14 +- routers/web/repo/issue_lock.go | 8 +- routers/web/repo/issue_pin.go | 8 +- routers/web/repo/issue_stopwatch.go | 8 +- routers/web/repo/issue_timetrack.go | 12 +- routers/web/repo/issue_watch.go | 8 +- routers/web/repo/main_test.go | 2 +- routers/web/repo/middlewares.go | 12 +- routers/web/repo/migrate.go | 34 +- routers/web/repo/milestone.go | 24 +- routers/web/repo/packages.go | 14 +- routers/web/repo/patch.go | 20 +- routers/web/repo/projects.go | 32 +- routers/web/repo/projects_test.go | 4 +- routers/web/repo/pull.go | 66 +-- routers/web/repo/pull_review.go | 22 +- routers/web/repo/pull_review_test.go | 14 +- routers/web/repo/recent_commits.go | 6 +- routers/web/repo/release.go | 46 +- routers/web/repo/release_test.go | 14 +- routers/web/repo/render.go | 14 +- routers/web/repo/repo.go | 52 +- routers/web/repo/search.go | 12 +- routers/web/repo/setting/avatar.go | 14 +- routers/web/repo/setting/collaboration.go | 26 +- routers/web/repo/setting/default_branch.go | 12 +- routers/web/repo/setting/deploy_key.go | 16 +- routers/web/repo/setting/git_hooks.go | 4 +- routers/web/repo/setting/lfs.go | 28 +- routers/web/repo/setting/main_test.go | 2 +- routers/web/repo/setting/protected_branch.go | 22 +- routers/web/repo/setting/protected_tag.go | 18 +- routers/web/repo/setting/runners.go | 14 +- routers/web/repo/setting/secrets.go | 10 +- routers/web/repo/setting/setting.go | 56 +-- routers/web/repo/setting/settings_test.go | 26 +- routers/web/repo/setting/variables.go | 10 +- routers/web/repo/setting/webhook.go | 32 +- routers/web/repo/topic.go | 6 +- routers/web/repo/treelist.go | 6 +- routers/web/repo/view.go | 58 +-- routers/web/repo/wiki.go | 38 +- routers/web/repo/wiki_test.go | 16 +- routers/web/shared/actions/runners.go | 14 +- routers/web/shared/actions/variables.go | 14 +- routers/web/shared/packages/packages.go | 26 +- routers/web/shared/project/column.go | 6 +- routers/web/shared/secrets/secrets.go | 16 +- routers/web/shared/storage_overview.go | 8 +- routers/web/shared/user/header.go | 32 +- routers/web/swagger_json.go | 2 +- routers/web/user/avatar.go | 8 +- routers/web/user/code.go | 14 +- routers/web/user/home.go | 42 +- routers/web/user/home_test.go | 16 +- routers/web/user/main_test.go | 2 +- routers/web/user/notification.go | 30 +- routers/web/user/package.go | 44 +- routers/web/user/profile.go | 34 +- routers/web/user/search.go | 12 +- routers/web/user/setting/account.go | 34 +- routers/web/user/setting/account_test.go | 10 +- routers/web/user/setting/adopt.go | 12 +- routers/web/user/setting/applications.go | 16 +- routers/web/user/setting/blocked_users.go | 10 +- routers/web/user/setting/keys.go | 18 +- routers/web/user/setting/main_test.go | 2 +- routers/web/user/setting/oauth2.go | 6 +- routers/web/user/setting/oauth2_common.go | 14 +- routers/web/user/setting/packages.go | 14 +- routers/web/user/setting/profile.go | 34 +- routers/web/user/setting/runner.go | 4 +- routers/web/user/setting/security/2fa.go | 14 +- routers/web/user/setting/security/openid.go | 14 +- routers/web/user/setting/security/security.go | 16 +- routers/web/user/setting/security/webauthn.go | 16 +- routers/web/user/setting/storage_overview.go | 6 +- routers/web/user/setting/webhooks.go | 12 +- routers/web/user/stop_watch.go | 8 +- routers/web/user/task.go | 6 +- routers/web/web.go | 78 +-- routers/web/webfinger.go | 8 +- services/actions/auth.go | 6 +- services/actions/auth_test.go | 4 +- services/actions/cleanup.go | 12 +- services/actions/cleanup_test.go | 8 +- services/actions/clear_tasks.go | 12 +- services/actions/commit_status.go | 18 +- services/actions/context.go | 14 +- services/actions/context_test.go | 4 +- services/actions/init.go | 10 +- services/actions/interface.go | 2 +- services/actions/job_emitter.go | 8 +- services/actions/job_emitter_test.go | 2 +- services/actions/main_test.go | 8 +- services/actions/notifier.go | 28 +- services/actions/notifier_helper.go | 36 +- services/actions/notifier_helper_test.go | 8 +- services/actions/rerun.go | 4 +- services/actions/rerun_test.go | 2 +- services/actions/schedule_tasks.go | 14 +- services/actions/task.go | 6 +- services/actions/variables.go | 8 +- services/actions/workflows.go | 26 +- services/agit/agit.go | 18 +- services/asymkey/deploy_key.go | 8 +- services/asymkey/main_test.go | 8 +- services/asymkey/sign.go | 24 +- services/asymkey/ssh_key.go | 6 +- services/asymkey/ssh_key_test.go | 10 +- services/attachment/attachment.go | 12 +- services/attachment/attachment_test.go | 12 +- services/auth/auth.go | 18 +- services/auth/auth_test.go | 2 +- services/auth/basic.go | 18 +- services/auth/group.go | 2 +- services/auth/httpsign.go | 10 +- services/auth/interface.go | 6 +- services/auth/main_test.go | 2 +- services/auth/oauth2.go | 18 +- services/auth/oauth2_test.go | 8 +- services/auth/reverseproxy.go | 10 +- services/auth/reverseproxy_test.go | 10 +- services/auth/session.go | 4 +- services/auth/signin.go | 20 +- services/auth/source.go | 6 +- .../auth/source/db/assert_interface_test.go | 6 +- services/auth/source/db/authenticate.go | 6 +- services/auth/source/db/source.go | 4 +- .../auth/source/ldap/assert_interface_test.go | 6 +- services/auth/source/ldap/source.go | 8 +- .../auth/source/ldap/source_authenticate.go | 14 +- services/auth/source/ldap/source_search.go | 4 +- services/auth/source/ldap/source_sync.go | 20 +- .../source/oauth2/assert_interface_test.go | 6 +- services/auth/source/oauth2/init.go | 10 +- services/auth/source/oauth2/jwtsigningkey.go | 6 +- .../auth/source/oauth2/jwtsigningkey_test.go | 4 +- services/auth/source/oauth2/providers.go | 10 +- services/auth/source/oauth2/providers_base.go | 4 +- .../auth/source/oauth2/providers_custom.go | 2 +- .../auth/source/oauth2/providers_openid.go | 6 +- .../auth/source/oauth2/providers_simple.go | 2 +- services/auth/source/oauth2/source.go | 4 +- .../auth/source/oauth2/source_authenticate.go | 4 +- services/auth/source/oauth2/store.go | 4 +- services/auth/source/oauth2/token.go | 2 +- .../auth/source/pam/assert_interface_test.go | 6 +- services/auth/source/pam/source.go | 4 +- .../auth/source/pam/source_authenticate.go | 12 +- services/auth/source/remote/source.go | 4 +- .../auth/source/smtp/assert_interface_test.go | 6 +- services/auth/source/smtp/source.go | 4 +- .../auth/source/smtp/source_authenticate.go | 8 +- services/auth/source/source_group_sync.go | 10 +- services/auth/sync.go | 6 +- services/automerge/automerge.go | 32 +- services/automerge/notify.go | 8 +- services/context/access_log.go | 8 +- services/context/api.go | 24 +- services/context/api_org.go | 2 +- services/context/api_test.go | 2 +- services/context/base.go | 12 +- services/context/base_test.go | 2 +- services/context/captcha.go | 16 +- services/context/context.go | 22 +- services/context/context_cookie.go | 10 +- services/context/context_model.go | 2 +- services/context/context_response.go | 14 +- services/context/context_test.go | 2 +- services/context/csrf.go | 4 +- services/context/org.go | 16 +- services/context/package.go | 16 +- services/context/pagination.go | 2 +- services/context/permission.go | 8 +- services/context/private.go | 8 +- services/context/quota.go | 4 +- services/context/repo.go | 40 +- services/context/repository.go | 2 +- services/context/response.go | 2 +- services/context/upload/upload.go | 6 +- services/context/user.go | 2 +- services/contexttest/context_tests.go | 20 +- services/convert/activity.go | 12 +- services/convert/attachment.go | 4 +- services/convert/convert.go | 36 +- services/convert/git_commit.go | 16 +- services/convert/git_commit_test.go | 10 +- services/convert/issue.go | 14 +- services/convert/issue_comment.go | 12 +- services/convert/issue_test.go | 12 +- services/convert/main_test.go | 6 +- services/convert/mirror.go | 4 +- services/convert/notification.go | 8 +- services/convert/package.go | 8 +- services/convert/pull.go | 18 +- services/convert/pull_review.go | 6 +- services/convert/pull_test.go | 18 +- services/convert/quota.go | 12 +- services/convert/release.go | 4 +- services/convert/release_test.go | 6 +- services/convert/repository.go | 16 +- services/convert/status.go | 6 +- services/convert/user.go | 6 +- services/convert/user_test.go | 8 +- services/convert/utils.go | 4 +- services/convert/wiki.go | 4 +- services/cron/cron.go | 8 +- services/cron/setting.go | 2 +- services/cron/tasks.go | 16 +- services/cron/tasks_actions.go | 6 +- services/cron/tasks_basic.go | 24 +- services/cron/tasks_extended.go | 22 +- services/doctor/actions.go | 12 +- services/doctor/authorizedkeys.go | 8 +- services/doctor/breaking.go | 10 +- services/doctor/checkOldArchives.go | 6 +- services/doctor/dbconsistency.go | 20 +- services/doctor/dbversion.go | 6 +- services/doctor/doctor.go | 10 +- services/doctor/fix16961.go | 12 +- services/doctor/fix16961_test.go | 2 +- services/doctor/fix8312.go | 10 +- services/doctor/heads.go | 6 +- services/doctor/lfs.go | 6 +- services/doctor/mergebase.go | 10 +- services/doctor/misc.go | 22 +- services/doctor/packages_nuget.go | 12 +- services/doctor/paths.go | 4 +- services/doctor/push_mirror_consistency.go | 6 +- services/doctor/repository.go | 10 +- services/doctor/storage.go | 20 +- services/doctor/usertype.go | 4 +- services/externalaccount/link.go | 2 +- services/externalaccount/user.go | 10 +- services/f3/driver/asset.go | 12 +- services/f3/driver/assets.go | 2 +- services/f3/driver/comment.go | 8 +- services/f3/driver/comments.go | 4 +- services/f3/driver/forge.go | 2 +- services/f3/driver/issue.go | 14 +- services/f3/driver/issues.go | 4 +- services/f3/driver/label.go | 4 +- services/f3/driver/labels.go | 4 +- services/f3/driver/main.go | 2 +- services/f3/driver/main_test.go | 14 +- services/f3/driver/milestone.go | 8 +- services/f3/driver/milestones.go | 4 +- services/f3/driver/options.go | 2 +- services/f3/driver/organization.go | 6 +- services/f3/driver/organizations.go | 6 +- services/f3/driver/project.go | 6 +- services/f3/driver/projects.go | 4 +- services/f3/driver/pullrequest.go | 14 +- services/f3/driver/pullrequests.go | 6 +- services/f3/driver/reaction.go | 6 +- services/f3/driver/reactions.go | 4 +- services/f3/driver/release.go | 12 +- services/f3/driver/releases.go | 4 +- services/f3/driver/repository.go | 2 +- services/f3/driver/review.go | 8 +- services/f3/driver/reviewcomment.go | 8 +- services/f3/driver/reviewcomments.go | 4 +- services/f3/driver/reviews.go | 4 +- services/f3/driver/tests/init.go | 2 +- services/f3/driver/tests/new.go | 2 +- services/f3/driver/tests/options.go | 6 +- services/f3/driver/topic.go | 4 +- services/f3/driver/topics.go | 4 +- services/f3/driver/tree.go | 2 +- services/f3/driver/user.go | 6 +- services/f3/driver/users.go | 4 +- services/f3/util/logger.go | 4 +- services/f3/util/logger_test.go | 4 +- services/federation/federation_service.go | 18 +- services/feed/action.go | 22 +- services/feed/action_test.go | 22 +- services/forgejo/main_test.go | 10 +- services/forgejo/sanity.go | 6 +- services/forgejo/sanity_test.go | 6 +- services/forgejo/sanity_v1TOv5_0_1Included.go | 6 +- .../forgejo/sanity_v1TOv5_0_1Included_test.go | 8 +- services/forms/admin.go | 6 +- services/forms/auth_form.go | 4 +- services/forms/org.go | 6 +- services/forms/package_form.go | 4 +- services/forms/repo_branch_form.go | 4 +- services/forms/repo_form.go | 16 +- services/forms/repo_form_test.go | 2 +- services/forms/repo_tag_form.go | 4 +- services/forms/runner.go | 4 +- services/forms/user_form.go | 12 +- services/forms/user_form_auth_openid.go | 4 +- services/forms/user_form_hidden_comments.go | 6 +- services/forms/user_form_test.go | 4 +- services/gitdiff/csv_test.go | 6 +- services/gitdiff/gitdiff.go | 26 +- services/gitdiff/gitdiff_test.go | 14 +- services/gitdiff/highlightdiff.go | 2 +- services/gitdiff/main_test.go | 10 +- services/indexer/indexer.go | 8 +- services/indexer/notify.go | 20 +- services/issue/assignee.go | 18 +- services/issue/assignee_test.go | 8 +- services/issue/comments.go | 12 +- services/issue/comments_test.go | 20 +- services/issue/commit.go | 18 +- services/issue/commit_test.go | 16 +- services/issue/content.go | 6 +- services/issue/issue.go | 26 +- services/issue/issue_test.go | 10 +- services/issue/label.go | 10 +- services/issue/label_test.go | 8 +- services/issue/main_test.go | 8 +- services/issue/milestone.go | 8 +- services/issue/milestone_test.go | 8 +- services/issue/pull.go | 18 +- services/issue/reaction.go | 4 +- services/issue/status.go | 8 +- services/issue/template.go | 10 +- services/lfs/locks.go | 20 +- services/lfs/server.go | 30 +- services/mailer/incoming/incoming.go | 8 +- services/mailer/incoming/incoming_handler.go | 26 +- services/mailer/incoming/payload/payload.go | 4 +- services/mailer/mail.go | 30 +- services/mailer/mail_admin_new_user.go | 12 +- services/mailer/mail_admin_new_user_test.go | 8 +- services/mailer/mail_auth_test.go | 16 +- services/mailer/mail_comment.go | 12 +- services/mailer/mail_issue.go | 18 +- services/mailer/mail_release.go | 16 +- services/mailer/mail_repo.go | 10 +- services/mailer/mail_team_invite.go | 12 +- services/mailer/mail_test.go | 18 +- services/mailer/mailer.go | 16 +- services/mailer/mailer_test.go | 6 +- services/mailer/main_test.go | 12 +- services/mailer/notify.go | 12 +- services/mailer/token/token.go | 4 +- services/markup/main_test.go | 2 +- services/markup/processorhelper.go | 20 +- services/markup/processorhelper_test.go | 10 +- services/migrations/codebase.go | 8 +- services/migrations/codebase_test.go | 2 +- services/migrations/common.go | 8 +- services/migrations/dump.go | 14 +- services/migrations/forgejo_downloader.go | 2 +- .../migrations/forgejo_downloader_test.go | 2 +- services/migrations/git.go | 2 +- services/migrations/gitbucket.go | 6 +- services/migrations/gitea_downloader.go | 6 +- services/migrations/gitea_downloader_test.go | 4 +- services/migrations/gitea_uploader.go | 40 +- services/migrations/gitea_uploader_test.go | 26 +- services/migrations/github.go | 10 +- services/migrations/github_test.go | 4 +- services/migrations/gitlab.go | 12 +- services/migrations/gitlab_test.go | 6 +- services/migrations/gogs.go | 8 +- services/migrations/gogs_test.go | 2 +- services/migrations/http_client.go | 6 +- services/migrations/main_test.go | 4 +- services/migrations/migrate.go | 20 +- services/migrations/migrate_test.go | 6 +- services/migrations/onedev.go | 8 +- services/migrations/onedev_test.go | 2 +- services/migrations/restore.go | 2 +- services/migrations/update.go | 10 +- services/mirror/mirror.go | 12 +- services/mirror/mirror_pull.go | 30 +- services/mirror/mirror_push.go | 22 +- services/mirror/notifier.go | 8 +- services/mirror/queue.go | 8 +- services/notify/notifier.go | 12 +- services/notify/notify.go | 14 +- services/notify/null.go | 12 +- services/org/org.go | 18 +- services/org/org_test.go | 10 +- services/org/repo.go | 8 +- services/org/repo_test.go | 8 +- services/org/team_invite.go | 6 +- services/packages/alpine/repository.go | 16 +- services/packages/alt/repository.go | 18 +- services/packages/arch/repository.go | 16 +- services/packages/auth.go | 8 +- services/packages/cargo/index.go | 22 +- services/packages/cleanup/cleanup.go | 28 +- .../packages/cleanup/cleanup_sha256_test.go | 18 +- services/packages/cleanup/main_test.go | 2 +- services/packages/container/blob_uploader.go | 8 +- services/packages/container/cleanup.go | 10 +- services/packages/container/cleanup_sha256.go | 12 +- services/packages/container/common.go | 6 +- services/packages/debian/repository.go | 16 +- services/packages/package_update.go | 14 +- services/packages/packages.go | 22 +- services/packages/rpm/repository.go | 18 +- services/pull/check.go | 34 +- services/pull/check_test.go | 10 +- services/pull/comment.go | 10 +- services/pull/commit_status.go | 14 +- services/pull/commit_status_test.go | 4 +- services/pull/edits.go | 8 +- services/pull/lfs.go | 12 +- services/pull/main_test.go | 6 +- services/pull/merge.go | 34 +- services/pull/merge_ff_only.go | 6 +- services/pull/merge_merge.go | 6 +- services/pull/merge_prepare.go | 14 +- services/pull/merge_rebase.go | 8 +- services/pull/merge_squash.go | 14 +- services/pull/patch.go | 24 +- services/pull/patch_unmerged.go | 4 +- services/pull/pull.go | 42 +- services/pull/pull_test.go | 14 +- services/pull/review.go | 22 +- services/pull/review_test.go | 10 +- services/pull/temp_repo.go | 12 +- services/pull/update.go | 18 +- services/pull/update_rebase.go | 14 +- services/release/release.go | 32 +- services/release/release_test.go | 18 +- services/release/tag.go | 12 +- services/remote/promote.go | 12 +- services/repository/adopt.go | 26 +- services/repository/adopt_test.go | 10 +- services/repository/archiver/archiver.go | 20 +- services/repository/archiver/archiver_test.go | 12 +- services/repository/avatar.go | 10 +- services/repository/avatar_test.go | 8 +- services/repository/branch.go | 44 +- services/repository/cache.go | 6 +- services/repository/check.go | 16 +- services/repository/collaboration.go | 8 +- services/repository/collaboration_test.go | 6 +- services/repository/commit.go | 4 +- .../repository/commitstatus/commitstatus.go | 22 +- services/repository/contributors_graph.go | 20 +- .../repository/contributors_graph_test.go | 12 +- services/repository/create.go | 24 +- services/repository/create_test.go | 14 +- services/repository/delete.go | 46 +- services/repository/files/cherry_pick.go | 14 +- services/repository/files/commit.go | 8 +- services/repository/files/content.go | 14 +- services/repository/files/content_test.go | 14 +- services/repository/files/diff.go | 4 +- services/repository/files/diff_test.go | 12 +- services/repository/files/file.go | 10 +- services/repository/files/patch.go | 18 +- services/repository/files/temp_repo.go | 18 +- services/repository/files/temp_repo_test.go | 8 +- services/repository/files/tree.go | 10 +- services/repository/files/tree_test.go | 6 +- services/repository/files/update.go | 22 +- services/repository/files/upload.go | 12 +- services/repository/fork.go | 22 +- services/repository/fork_test.go | 10 +- services/repository/generate.go | 16 +- services/repository/gitgraph/graph.go | 4 +- services/repository/gitgraph/graph_models.go | 14 +- services/repository/gitgraph/graph_test.go | 2 +- services/repository/hooks.go | 12 +- services/repository/init.go | 14 +- services/repository/lfs.go | 16 +- services/repository/lfs_test.go | 16 +- services/repository/main_test.go | 2 +- services/repository/migrate.go | 24 +- services/repository/push.go | 34 +- services/repository/repository.go | 30 +- services/repository/repository_test.go | 8 +- services/repository/review.go | 6 +- services/repository/review_test.go | 6 +- services/repository/setting.go | 12 +- services/repository/star.go | 8 +- services/repository/template.go | 12 +- services/repository/transfer.go | 26 +- services/repository/transfer_test.go | 22 +- services/secrets/secrets.go | 4 +- services/secrets/validation.go | 2 +- services/shared/automerge/automerge.go | 12 +- services/task/migrate.go | 28 +- services/task/task.go | 30 +- services/uinotification/notify.go | 20 +- services/user/avatar.go | 10 +- services/user/avatar_test.go | 10 +- services/user/block.go | 8 +- services/user/block_test.go | 12 +- services/user/delete.go | 28 +- services/user/email.go | 12 +- services/user/email_test.go | 10 +- services/user/update.go | 16 +- services/user/update_test.go | 12 +- services/user/user.go | 36 +- services/user/user_test.go | 22 +- services/webhook/default.go | 16 +- services/webhook/default_test.go | 6 +- services/webhook/deliver.go | 20 +- services/webhook/deliver_test.go | 14 +- services/webhook/dingtalk.go | 14 +- services/webhook/dingtalk_test.go | 8 +- services/webhook/discord.go | 22 +- services/webhook/discord_test.go | 10 +- services/webhook/feishu.go | 12 +- services/webhook/feishu_test.go | 8 +- services/webhook/general.go | 10 +- services/webhook/general_test.go | 2 +- services/webhook/gogs.go | 8 +- services/webhook/main_test.go | 12 +- services/webhook/matrix.go | 20 +- services/webhook/matrix_test.go | 8 +- services/webhook/msteams.go | 14 +- services/webhook/msteams_test.go | 8 +- services/webhook/notifier.go | 28 +- services/webhook/notifier_test.go | 22 +- services/webhook/packagist.go | 12 +- services/webhook/packagist_test.go | 8 +- services/webhook/shared/img.go | 2 +- services/webhook/shared/payloader.go | 8 +- services/webhook/slack.go | 18 +- services/webhook/slack_test.go | 8 +- services/webhook/sourcehut/builds.go | 22 +- services/webhook/sourcehut/builds_test.go | 16 +- services/webhook/telegram.go | 18 +- services/webhook/telegram_test.go | 8 +- services/webhook/webhook.go | 30 +- services/webhook/webhook_test.go | 18 +- services/webhook/wechatwork.go | 12 +- services/wiki/wiki.go | 22 +- services/wiki/wiki_path.go | 10 +- services/wiki/wiki_test.go | 12 +- templates/swagger/v1_json.tmpl | 464 +++++++++--------- tests/e2e/changes.go | 2 +- tests/e2e/debugserver_test.go | 2 +- tests/e2e/declare_repos_test.go | 12 +- tests/e2e/e2e_test.go | 18 +- tests/e2e/utils_e2e_test.go | 12 +- tests/fuzz/fuzz_test.go | 6 +- .../user2/commits_search_test.git/config | 2 +- .../integration/actions_commit_status_test.go | 20 +- tests/integration/actions_job_test.go | 18 +- tests/integration/actions_log_test.go | 14 +- tests/integration/actions_route_test.go | 12 +- tests/integration/actions_runner_test.go | 4 +- tests/integration/actions_trigger_test.go | 46 +- tests/integration/actions_variables_test.go | 12 +- tests/integration/admin_config_test.go | 4 +- tests/integration/admin_user_test.go | 16 +- .../integration/api_actions_artifact_test.go | 2 +- .../api_actions_artifact_v4_test.go | 8 +- .../integration/api_activitypub_actor_test.go | 8 +- .../api_activitypub_person_test.go | 16 +- .../api_activitypub_repository_test.go | 20 +- tests/integration/api_admin_actions_test.go | 10 +- tests/integration/api_admin_org_test.go | 10 +- tests/integration/api_admin_test.go | 16 +- tests/integration/api_block_test.go | 12 +- tests/integration/api_branch_test.go | 12 +- .../api_comment_attachment_test.go | 18 +- tests/integration/api_comment_test.go | 20 +- .../api_feed_plain_text_titles_test.go | 6 +- tests/integration/api_forgejo_root_test.go | 2 +- tests/integration/api_forgejo_version_test.go | 12 +- tests/integration/api_fork_test.go | 16 +- .../api_gitignore_templates_test.go | 8 +- tests/integration/api_gpg_keys_test.go | 6 +- tests/integration/api_health_test.go | 6 +- .../api_helper_for_declarative_test.go | 16 +- tests/integration/api_httpsig_test.go | 10 +- .../integration/api_issue_attachment_test.go | 14 +- tests/integration/api_issue_config_test.go | 10 +- tests/integration/api_issue_label_test.go | 14 +- tests/integration/api_issue_milestone_test.go | 14 +- tests/integration/api_issue_pin_test.go | 14 +- tests/integration/api_issue_reaction_test.go | 18 +- tests/integration/api_issue_stopwatch_test.go | 16 +- .../api_issue_subscription_test.go | 16 +- tests/integration/api_issue_templates_test.go | 10 +- tests/integration/api_issue_test.go | 18 +- .../api_issue_tracked_time_test.go | 14 +- tests/integration/api_keys_test.go | 16 +- tests/integration/api_label_templates_test.go | 6 +- .../integration/api_license_templates_test.go | 8 +- tests/integration/api_nodeinfo_test.go | 10 +- tests/integration/api_notification_test.go | 16 +- tests/integration/api_oauth2_apps_test.go | 10 +- tests/integration/api_org_actions_test.go | 10 +- tests/integration/api_org_avatar_test.go | 6 +- tests/integration/api_org_test.go | 22 +- tests/integration/api_packages_alpine_test.go | 14 +- tests/integration/api_packages_alt_test.go | 18 +- tests/integration/api_packages_arch_test.go | 12 +- tests/integration/api_packages_cargo_test.go | 26 +- tests/integration/api_packages_chef_test.go | 16 +- .../integration/api_packages_composer_test.go | 18 +- tests/integration/api_packages_conan_test.go | 20 +- tests/integration/api_packages_conda_test.go | 14 +- ..._packages_container_cleanup_sha256_test.go | 22 +- .../api_packages_container_test.go | 22 +- tests/integration/api_packages_cran_test.go | 12 +- tests/integration/api_packages_debian_test.go | 14 +- .../integration/api_packages_generic_test.go | 12 +- .../integration/api_packages_goproxy_test.go | 10 +- tests/integration/api_packages_helm_test.go | 14 +- tests/integration/api_packages_maven_test.go | 12 +- tests/integration/api_packages_npm_test.go | 16 +- tests/integration/api_packages_nuget_test.go | 20 +- tests/integration/api_packages_pub_test.go | 14 +- tests/integration/api_packages_pypi_test.go | 12 +- tests/integration/api_packages_rpm_test.go | 16 +- .../integration/api_packages_rubygems_test.go | 12 +- tests/integration/api_packages_swift_test.go | 16 +- tests/integration/api_packages_test.go | 26 +- .../integration/api_packages_vagrant_test.go | 16 +- tests/integration/api_private_serv_test.go | 6 +- tests/integration/api_pull_commits_test.go | 12 +- tests/integration/api_pull_review_test.go | 20 +- tests/integration/api_pull_test.go | 24 +- tests/integration/api_push_mirror_test.go | 32 +- .../integration/api_quota_management_test.go | 20 +- tests/integration/api_quota_use_test.go | 32 +- tests/integration/api_releases_test.go | 16 +- tests/integration/api_repo_actions_test.go | 18 +- tests/integration/api_repo_activities_test.go | 10 +- tests/integration/api_repo_archive_test.go | 10 +- tests/integration/api_repo_avatar_test.go | 12 +- tests/integration/api_repo_branch_test.go | 16 +- .../integration/api_repo_collaborator_test.go | 12 +- tests/integration/api_repo_compare_test.go | 10 +- tests/integration/api_repo_edit_test.go | 14 +- .../integration/api_repo_file_create_test.go | 18 +- .../integration/api_repo_file_delete_test.go | 10 +- tests/integration/api_repo_file_get_test.go | 8 +- tests/integration/api_repo_file_helpers.go | 12 +- .../integration/api_repo_file_update_test.go | 16 +- .../integration/api_repo_files_change_test.go | 16 +- .../api_repo_get_contents_list_test.go | 18 +- .../integration/api_repo_get_contents_test.go | 18 +- tests/integration/api_repo_git_blobs_test.go | 12 +- .../integration/api_repo_git_commits_test.go | 10 +- tests/integration/api_repo_git_hook_test.go | 12 +- tests/integration/api_repo_git_notes_test.go | 10 +- tests/integration/api_repo_git_ref_test.go | 8 +- tests/integration/api_repo_git_tags_test.go | 18 +- tests/integration/api_repo_git_trees_test.go | 10 +- tests/integration/api_repo_hook_test.go | 12 +- tests/integration/api_repo_lfs_locks_test.go | 14 +- .../integration/api_repo_lfs_migrate_test.go | 16 +- tests/integration/api_repo_lfs_test.go | 22 +- tests/integration/api_repo_raw_test.go | 8 +- tests/integration/api_repo_secrets_test.go | 12 +- tests/integration/api_repo_tags_test.go | 12 +- tests/integration/api_repo_teams_test.go | 16 +- tests/integration/api_repo_test.go | 24 +- tests/integration/api_repo_topic_test.go | 12 +- tests/integration/api_repo_variables_test.go | 12 +- tests/integration/api_settings_test.go | 6 +- tests/integration/api_team_test.go | 22 +- tests/integration/api_team_user_test.go | 14 +- tests/integration/api_token_test.go | 12 +- tests/integration/api_twofa_test.go | 10 +- tests/integration/api_user_actions_test.go | 10 +- tests/integration/api_user_avatar_test.go | 6 +- tests/integration/api_user_email_test.go | 6 +- tests/integration/api_user_follow_test.go | 6 +- tests/integration/api_user_heatmap_test.go | 8 +- tests/integration/api_user_info_test.go | 10 +- tests/integration/api_user_org_perm_test.go | 6 +- tests/integration/api_user_orgs_test.go | 12 +- tests/integration/api_user_search_test.go | 14 +- tests/integration/api_user_secrets_test.go | 6 +- tests/integration/api_user_star_test.go | 12 +- tests/integration/api_user_variables_test.go | 6 +- tests/integration/api_user_watch_test.go | 6 +- tests/integration/api_wiki_test.go | 18 +- tests/integration/appearance_settings_test.go | 2 +- tests/integration/attachment_test.go | 8 +- tests/integration/auth_ldap_test.go | 20 +- tests/integration/auth_token_test.go | 14 +- tests/integration/benchmarks_test.go | 6 +- tests/integration/block_test.go | 18 +- tests/integration/branches_test.go | 8 +- .../integration/change_default_branch_test.go | 8 +- tests/integration/cmd_admin_test.go | 8 +- tests/integration/cmd_forgejo_actions_test.go | 10 +- tests/integration/cmd_forgejo_f3_test.go | 14 +- tests/integration/cmd_keys_test.go | 4 +- tests/integration/codeowner_test.go | 18 +- .../integration/comment_roles_system_test.go | 8 +- tests/integration/commit_status_test.go | 10 +- tests/integration/compare_test.go | 22 +- tests/integration/cors_test.go | 8 +- tests/integration/create_no_session_test.go | 8 +- tests/integration/csrf_test.go | 6 +- tests/integration/db_collation_test.go | 8 +- tests/integration/delete_user_test.go | 14 +- .../disable_forgotten_password_test.go | 6 +- .../integration/doctor_packages_nuget_test.go | 22 +- tests/integration/download_test.go | 4 +- tests/integration/dummy_lang_test.go | 2 +- tests/integration/dump_restore_test.go | 16 +- tests/integration/easymde_test.go | 2 +- tests/integration/editor_test.go | 16 +- tests/integration/empty_repo_test.go | 18 +- tests/integration/eventsource_test.go | 18 +- tests/integration/explore_code_test.go | 6 +- tests/integration/explore_org_test.go | 6 +- tests/integration/explore_repos_test.go | 2 +- tests/integration/explore_user_test.go | 6 +- tests/integration/feed_repo_test.go | 2 +- tests/integration/feed_user_test.go | 6 +- .../forgejo_confirmation_repo_test.go | 6 +- tests/integration/forgejo_git_test.go | 18 +- .../git_helper_for_declarative_test.go | 8 +- tests/integration/git_push_test.go | 22 +- tests/integration/git_smart_http_test.go | 14 +- tests/integration/git_test.go | 32 +- tests/integration/goget_test.go | 4 +- tests/integration/gpg_git_test.go | 18 +- tests/integration/incoming_email_test.go | 18 +- tests/integration/integration_test.go | 34 +- tests/integration/issue_test.go | 32 +- tests/integration/last_updated_time_test.go | 2 +- tests/integration/lfs_getobject_test.go | 16 +- tests/integration/lfs_local_endpoint_test.go | 4 +- tests/integration/lfs_view_test.go | 12 +- tests/integration/linguist_test.go | 16 +- tests/integration/links_test.go | 10 +- tests/integration/markup_external_test.go | 4 +- tests/integration/markup_test.go | 6 +- tests/integration/migrate_test.go | 28 +- .../migration-test/migration_test.go | 24 +- tests/integration/milestone_test.go | 2 +- tests/integration/mirror_pull_test.go | 22 +- tests/integration/mirror_push_test.go | 34 +- tests/integration/new_org_test.go | 2 +- tests/integration/nonascii_branches_test.go | 2 +- tests/integration/notification_test.go | 6 +- tests/integration/oauth_test.go | 22 +- tests/integration/opengraph_test.go | 4 +- tests/integration/org_count_test.go | 12 +- tests/integration/org_nav_test.go | 4 +- tests/integration/org_project_test.go | 4 +- tests/integration/org_settings_test.go | 6 +- tests/integration/org_team_invite_test.go | 16 +- tests/integration/org_test.go | 20 +- tests/integration/private_project_test.go | 10 +- tests/integration/privateactivity_test.go | 14 +- tests/integration/proctected_branch_test.go | 8 +- tests/integration/project_test.go | 10 +- tests/integration/pull_commit_test.go | 4 +- tests/integration/pull_compare_test.go | 2 +- tests/integration/pull_create_test.go | 22 +- tests/integration/pull_diff_test.go | 2 +- tests/integration/pull_editable_test.go | 6 +- tests/integration/pull_icon_test.go | 22 +- tests/integration/pull_merge_test.go | 52 +- tests/integration/pull_reopen_test.go | 28 +- tests/integration/pull_request_task_test.go | 26 +- tests/integration/pull_review_test.go | 26 +- tests/integration/pull_status_test.go | 10 +- tests/integration/pull_test.go | 12 +- tests/integration/pull_update_test.go | 26 +- tests/integration/quota_use_test.go | 28 +- tests/integration/release_feed_test.go | 2 +- tests/integration/release_test.go | 18 +- tests/integration/remote_test.go | 12 +- tests/integration/rename_branch_test.go | 10 +- tests/integration/repo_activity_test.go | 18 +- tests/integration/repo_archive_test.go | 16 +- tests/integration/repo_archive_text_test.go | 8 +- tests/integration/repo_badges_test.go | 26 +- tests/integration/repo_branch_test.go | 20 +- tests/integration/repo_citation_test.go | 12 +- tests/integration/repo_collaborator_test.go | 2 +- tests/integration/repo_commits_search_test.go | 2 +- tests/integration/repo_commits_test.go | 10 +- tests/integration/repo_delete_test.go | 14 +- tests/integration/repo_flags_test.go | 20 +- tests/integration/repo_fork_test.go | 20 +- tests/integration/repo_generate_test.go | 18 +- tests/integration/repo_git_note_test.go | 2 +- tests/integration/repo_issue_title_test.go | 20 +- .../repo_mergecommit_revert_test.go | 2 +- tests/integration/repo_migrate_test.go | 4 +- tests/integration/repo_migration_ui_test.go | 2 +- tests/integration/repo_pagination_test.go | 10 +- tests/integration/repo_search_test.go | 14 +- tests/integration/repo_settings_hook_test.go | 2 +- tests/integration/repo_settings_test.go | 32 +- tests/integration/repo_signed_tag_test.go | 20 +- tests/integration/repo_starwatch_test.go | 8 +- tests/integration/repo_tag_test.go | 20 +- tests/integration/repo_test.go | 24 +- tests/integration/repo_topic_test.go | 12 +- tests/integration/repo_view_test.go | 16 +- tests/integration/repo_watch_test.go | 6 +- tests/integration/repo_webhook_test.go | 6 +- tests/integration/repo_wiki_test.go | 12 +- tests/integration/repofiles_change_test.go | 18 +- tests/integration/runner_test.go | 12 +- tests/integration/session_test.go | 8 +- tests/integration/setting_test.go | 12 +- tests/integration/signin_test.go | 12 +- tests/integration/signout_test.go | 2 +- tests/integration/signup_test.go | 14 +- tests/integration/size_translations_test.go | 8 +- tests/integration/ssh_key_test.go | 6 +- tests/integration/swagger_test.go | 4 +- tests/integration/timetracking_test.go | 4 +- tests/integration/user_avatar_test.go | 10 +- tests/integration/user_count_test.go | 18 +- tests/integration/user_dashboard_test.go | 16 +- .../integration/user_profile_activity_test.go | 4 +- .../integration/user_profile_follows_test.go | 2 +- tests/integration/user_profile_test.go | 8 +- tests/integration/user_redirect_test.go | 16 +- tests/integration/user_test.go | 28 +- tests/integration/version_test.go | 12 +- tests/integration/view_test.go | 14 +- tests/integration/webfinger_test.go | 8 +- tests/integration/webhook_test.go | 22 +- tests/integration/wiki_test.go | 6 +- tests/integration/xss_test.go | 8 +- tests/test_utils.go | 42 +- 2097 files changed, 10675 insertions(+), 10674 deletions(-) diff --git a/.deadcode-out b/.deadcode-out index 338d22e258..e366abee94 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -1,7 +1,7 @@ -code.gitea.io/gitea/cmd +forgejo.org/cmd NoMainListener -code.gitea.io/gitea/cmd/forgejo +forgejo.org/cmd/forgejo ContextSetNoInit ContextSetNoExit ContextSetStderr @@ -9,48 +9,48 @@ code.gitea.io/gitea/cmd/forgejo ContextSetStdout ContextSetStdin -code.gitea.io/gitea/models +forgejo.org/models IsErrSHANotFound IsErrMergeDivergingFastForwardOnly -code.gitea.io/gitea/models/auth +forgejo.org/models/auth WebAuthnCredentials -code.gitea.io/gitea/models/db +forgejo.org/models/db TruncateBeans InTransaction DumpTables -code.gitea.io/gitea/models/dbfs +forgejo.org/models/dbfs file.renameTo Create Rename -code.gitea.io/gitea/models/forgefed +forgejo.org/models/forgefed GetFederationHost -code.gitea.io/gitea/models/forgejo/semver +forgejo.org/models/forgejo/semver GetVersion SetVersionString SetVersion -code.gitea.io/gitea/models/git +forgejo.org/models/git RemoveDeletedBranchByID -code.gitea.io/gitea/models/issues +forgejo.org/models/issues IsErrUnknownDependencyType IsErrIssueWasClosed -code.gitea.io/gitea/models/organization +forgejo.org/models/organization SearchMembersOptions.ToConds -code.gitea.io/gitea/models/perm/access +forgejo.org/models/perm/access GetRepoWriters -code.gitea.io/gitea/models/repo +forgejo.org/models/repo WatchRepoMode -code.gitea.io/gitea/models/user +forgejo.org/models/user IsErrExternalLoginUserAlreadyExist IsErrExternalLoginUserNotExist NewFederatedUser @@ -58,35 +58,35 @@ code.gitea.io/gitea/models/user GetUserAllSettings DeleteUserSetting -code.gitea.io/gitea/modules/activitypub +forgejo.org/modules/activitypub NewContext Context.APClientFactory -code.gitea.io/gitea/modules/assetfs +forgejo.org/modules/assetfs Bindata -code.gitea.io/gitea/modules/auth/password/hash +forgejo.org/modules/auth/password/hash DummyHasher.HashWithSaltBytes NewDummyHasher -code.gitea.io/gitea/modules/auth/password/pwn +forgejo.org/modules/auth/password/pwn WithHTTP -code.gitea.io/gitea/modules/base +forgejo.org/modules/base SetupGiteaRoot -code.gitea.io/gitea/modules/cache +forgejo.org/modules/cache GetInt WithNoCacheContext RemoveContextData -code.gitea.io/gitea/modules/emoji +forgejo.org/modules/emoji ReplaceCodes -code.gitea.io/gitea/modules/eventsource +forgejo.org/modules/eventsource Event.String -code.gitea.io/gitea/modules/forgefed +forgejo.org/modules/forgefed NewForgeUndoLike ForgeUndoLike.UnmarshalJSON ForgeUndoLike.Validate @@ -96,7 +96,7 @@ code.gitea.io/gitea/modules/forgefed ToRepository OnRepository -code.gitea.io/gitea/modules/git +forgejo.org/modules/git AllowLFSFiltersArgs AddChanges AddChangesWithArgs @@ -106,55 +106,55 @@ code.gitea.io/gitea/modules/git openRepositoryWithDefaultContext ToEntryMode -code.gitea.io/gitea/modules/gitrepo +forgejo.org/modules/gitrepo GetBranchCommitID GetWikiDefaultBranch -code.gitea.io/gitea/modules/graceful +forgejo.org/modules/graceful Manager.TerminateContext Manager.Err Manager.Value Manager.Deadline -code.gitea.io/gitea/modules/hcaptcha +forgejo.org/modules/hcaptcha WithHTTP -code.gitea.io/gitea/modules/hostmatcher +forgejo.org/modules/hostmatcher HostMatchList.AppendPattern -code.gitea.io/gitea/modules/json +forgejo.org/modules/json StdJSON.Marshal StdJSON.Unmarshal StdJSON.NewEncoder StdJSON.NewDecoder StdJSON.Indent -code.gitea.io/gitea/modules/log +forgejo.org/modules/log NewEventWriterBuffer -code.gitea.io/gitea/modules/markup +forgejo.org/modules/markup GetRendererByType RenderString IsMarkupFile -code.gitea.io/gitea/modules/markup/console +forgejo.org/modules/markup/console Render RenderString -code.gitea.io/gitea/modules/markup/markdown +forgejo.org/modules/markup/markdown RenderRawString -code.gitea.io/gitea/modules/markup/mdstripper +forgejo.org/modules/markup/mdstripper stripRenderer.AddOptions StripMarkdown -code.gitea.io/gitea/modules/markup/orgmode +forgejo.org/modules/markup/orgmode RenderString -code.gitea.io/gitea/modules/process +forgejo.org/modules/process Manager.ExecTimeout -code.gitea.io/gitea/modules/queue +forgejo.org/modules/queue newBaseChannelSimple newBaseChannelUnique newBaseRedisSimple @@ -163,26 +163,26 @@ code.gitea.io/gitea/modules/queue testStateRecorder.Reset newWorkerPoolQueueForTest -code.gitea.io/gitea/modules/queue/lqinternal +forgejo.org/modules/queue/lqinternal QueueItemIDBytes QueueItemKeyBytes ListLevelQueueKeys -code.gitea.io/gitea/modules/setting +forgejo.org/modules/setting NewConfigProviderFromData GitConfigType.GetOption InitLoggersForTest -code.gitea.io/gitea/modules/sync +forgejo.org/modules/sync StatusTable.Start StatusTable.IsRunning -code.gitea.io/gitea/modules/timeutil +forgejo.org/modules/timeutil GetExecutableModTime MockSet MockUnset -code.gitea.io/gitea/modules/translation +forgejo.org/modules/translation MockLocale.Language MockLocale.TrString MockLocale.Tr @@ -192,42 +192,42 @@ code.gitea.io/gitea/modules/translation MockLocale.HasKey MockLocale.PrettyNumber -code.gitea.io/gitea/modules/util +forgejo.org/modules/util OptionalArg -code.gitea.io/gitea/modules/util/filebuffer +forgejo.org/modules/util/filebuffer CreateFromReader -code.gitea.io/gitea/modules/validation +forgejo.org/modules/validation IsErrNotValid -code.gitea.io/gitea/modules/web +forgejo.org/modules/web RouteMock RouteMockReset -code.gitea.io/gitea/modules/zstd +forgejo.org/modules/zstd NewWriter Writer.Write Writer.Close -code.gitea.io/gitea/routers/web +forgejo.org/routers/web NotFound -code.gitea.io/gitea/routers/web/org +forgejo.org/routers/web/org MustEnableProjects -code.gitea.io/gitea/services/context +forgejo.org/services/context GetPrivateContext -code.gitea.io/gitea/services/repository +forgejo.org/services/repository IsErrForkAlreadyExist -code.gitea.io/gitea/services/repository/files +forgejo.org/services/repository/files ContentType.String -code.gitea.io/gitea/services/repository/gitgraph +forgejo.org/services/repository/gitgraph Parser.Reset -code.gitea.io/gitea/services/webhook +forgejo.org/services/webhook NewNotifier diff --git a/.forgejo/testdata/build-release/go.mod b/.forgejo/testdata/build-release/go.mod index 729cb6f831..585dcc4f3d 100644 --- a/.forgejo/testdata/build-release/go.mod +++ b/.forgejo/testdata/build-release/go.mod @@ -1,3 +1,3 @@ -module code.gitea.io/gitea +module forgejo.org go 1.23.3 diff --git a/.gitignore b/.gitignore index 79a4108dab..744e24a09a 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ cpu.out /gitea-vet /debug /integrations.test +/forgejo /bin /dist diff --git a/.golangci.yml b/.golangci.yml index cceb7070e7..136c0e624a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -93,7 +93,7 @@ linters-settings: desc: use os or io instead - pkg: golang.org/x/exp desc: it's experimental and unreliable - - pkg: code.gitea.io/gitea/modules/git/internal + - pkg: forgejo.org/modules/git/internal desc: do not use the internal package, use AddXxx function instead - pkg: gopkg.in/ini.v1 desc: do not use the ini package, use gitea's config system instead diff --git a/Dockerfile b/Dockerfile index ebe41ed5c8..9a8877920a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,8 @@ RUN cp /*-alpine-linux-musl*/lib/ld-musl-*.so.1 /lib || true RUN apk --no-cache add build-base git nodejs npm -COPY . ${GOPATH}/src/code.gitea.io/gitea -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +COPY . ${GOPATH}/src/forgejo.org +WORKDIR ${GOPATH}/src/forgejo.org RUN make clean RUN make frontend @@ -47,9 +47,9 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ /tmp/local/etc/s6/gitea/* \ /tmp/local/etc/s6/openssh/* \ /tmp/local/etc/s6/.s6-svscan/* \ - /go/src/code.gitea.io/gitea/gitea \ - /go/src/code.gitea.io/gitea/environment-to-ini -RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete + /go/src/forgejo.org/gitea \ + /go/src/forgejo.org/environment-to-ini +RUN chmod 644 /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete FROM data.forgejo.org/oci/alpine:3.21 ARG RELEASE_VERSION @@ -102,7 +102,7 @@ CMD ["/usr/bin/s6-svscan", "/etc/s6"] COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo -COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env /go/src/forgejo.org/gitea /app/gitea/gitea RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli -COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini -COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh +COPY --from=build-env /go/src/forgejo.org/environment-to-ini /usr/local/bin/environment-to-ini +COPY --from=build-env /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 93004610a7..47aae2798d 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -30,8 +30,8 @@ RUN cp /*-alpine-linux-musl*/lib/ld-musl-*.so.1 /lib || true RUN apk --no-cache add build-base git nodejs npm -COPY . ${GOPATH}/src/code.gitea.io/gitea -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +COPY . ${GOPATH}/src/forgejo.org +WORKDIR ${GOPATH}/src/forgejo.org RUN make clean RUN make frontend @@ -45,9 +45,9 @@ COPY docker/rootless /tmp/local RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \ /tmp/local/usr/local/bin/docker-setup.sh \ /tmp/local/usr/local/bin/gitea \ - /go/src/code.gitea.io/gitea/gitea \ - /go/src/code.gitea.io/gitea/environment-to-ini -RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete + /go/src/forgejo.org/gitea \ + /go/src/forgejo.org/environment-to-ini +RUN chmod 644 /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete FROM data.forgejo.org/oci/alpine:3.21 ARG RELEASE_VERSION @@ -91,10 +91,10 @@ RUN chown git:git /var/lib/gitea /etc/gitea COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env --chown=root:root /go/src/forgejo.org/gitea /app/gitea/gitea RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini -COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh +COPY --from=build-env --chown=root:root /go/src/forgejo.org/environment-to-ini /usr/local/bin/environment-to-ini +COPY --from=build-env /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh #git:git USER 1000:1000 diff --git a/Makefile b/Makefile index ff9de004c9..4fb06db918 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ else DIST := dist DIST_DIRS := $(DIST)/binaries $(DIST)/release -IMPORT := code.gitea.io/gitea +IMPORT := forgejo.org GO ?= $(shell go env GOROOT)/bin/go SHASUM ?= shasum -a 256 @@ -125,10 +125,10 @@ LDFLAGS := $(LDFLAGS) -X "main.ReleaseVersion=$(RELEASE_VERSION)" -X "main.MakeV LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64 ifeq ($(HAS_GO), yes) - GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) $(shell $(GO) list code.gitea.io/gitea/models/forgejo_migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./...)) + GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list forgejo.org/models/migrations/...) $(shell $(GO) list forgejo.org/models/forgejo_migrations/...) forgejo.org/tests/integration/migration-test forgejo.org/tests forgejo.org/tests/integration forgejo.org/tests/e2e,$(shell $(GO) list ./...)) endif REMOTE_CACHER_MODULES ?= cache nosql session queue -GO_TEST_REMOTE_CACHER_PACKAGES ?= $(addprefix code.gitea.io/gitea/modules/,$(REMOTE_CACHER_MODULES)) +GO_TEST_REMOTE_CACHER_PACKAGES ?= $(addprefix forgejo.org/modules/,$(REMOTE_CACHER_MODULES)) FOMANTIC_WORK_DIR := web_src/fomantic @@ -169,7 +169,7 @@ GO_SOURCES += $(GENERATED_GO_DEST) GO_SOURCES_NO_BINDATA := $(GO_SOURCES) ifeq ($(HAS_GO), yes) - MIGRATION_PACKAGES := $(shell $(GO) list code.gitea.io/gitea/models/migrations/... code.gitea.io/gitea/models/forgejo_migrations/...) + MIGRATION_PACKAGES := $(shell $(GO) list forgejo.org/models/migrations/... forgejo.org/models/forgejo_migrations/...) endif ifeq ($(filter $(TAGS_SPLIT),bindata),bindata) @@ -476,7 +476,7 @@ lint-spell: lint-codespell lint-spell-fix: lint-codespell-fix @go run $(MISSPELL_PACKAGE) -w $(SPELLCHECK_FILES) -RUN_DEADCODE = $(GO) run $(DEADCODE_PACKAGE) -generated=false -f='{{println .Path}}{{range .Funcs}}{{printf "\t%s\n" .Name}}{{end}}{{println}}' -test code.gitea.io/gitea +RUN_DEADCODE = $(GO) run $(DEADCODE_PACKAGE) -generated=false -f='{{println .Path}}{{range .Funcs}}{{printf "\t%s\n" .Name}}{{end}}{{println}}' -test forgejo.org .PHONY: lint-go lint-go: @@ -610,7 +610,7 @@ tidy-check: tidy go-licenses: $(GO_LICENSE_FILE) $(GO_LICENSE_FILE): go.mod go.sum - -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --ignore code.gitea.io/gitea --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null + -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --ignore forgejo.org --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null $(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE) @rm -rf $(GO_LICENSE_TMP_DIR) @@ -740,33 +740,33 @@ integration-test-coverage-sqlite: integrations.cover.sqlite.test generate-ini-sq GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.cover.sqlite.test -test.coverprofile=integration.coverage.out integrations.mysql.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -o integrations.mysql.test integrations.pgsql.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -o integrations.pgsql.test integrations.sqlite.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' integrations.cover.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test integrations.cover.sqlite.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' .PHONY: migrations.mysql.test migrations.mysql.test: $(GO_SOURCES) generate-ini-mysql - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration/migration-test -o migrations.mysql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.pgsql.test migrations.pgsql.test: $(GO_SOURCES) generate-ini-pgsql - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration/migration-test -o migrations.pgsql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.sqlite.test migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.individual.mysql.test @@ -777,7 +777,7 @@ migrations.individual.mysql.test: $(GO_SOURCES) .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$* .PHONY: migrations.individual.pgsql.test migrations.individual.pgsql.test: $(GO_SOURCES) @@ -787,7 +787,7 @@ migrations.individual.pgsql.test: $(GO_SOURCES) .PHONY: migrations.individual.pgsql.test\#% migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$* .PHONY: migrations.individual.sqlite.test migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite @@ -797,16 +797,16 @@ migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$* e2e.mysql.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.mysql.test e2e.pgsql.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.pgsql.test e2e.sqlite.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' .PHONY: check check: test @@ -1013,7 +1013,7 @@ generate-gitignore: .PHONY: generate-gomock generate-gomock: - $(GO) run $(GOMOCK_PACKAGE) -package mock -destination ./modules/queue/mock/redisuniversalclient.go code.gitea.io/gitea/modules/nosql RedisClient + $(GO) run $(GOMOCK_PACKAGE) -package mock -destination ./modules/queue/mock/redisuniversalclient.go forgejo.org/modules/nosql RedisClient .PHONY: generate-images generate-images: | node_modules diff --git a/build/backport-locales.go b/build/backport-locales.go index 3df83ea6d9..3125f19014 100644 --- a/build/backport-locales.go +++ b/build/backport-locales.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" ) func main() { diff --git a/build/code-batch-process.go b/build/code-batch-process.go index cc2ab68026..516736b65c 100644 --- a/build/code-batch-process.go +++ b/build/code-batch-process.go @@ -15,7 +15,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/build/codeformat" + "forgejo.org/build/codeformat" ) // Windows has a limitation for command line arguments, the size can not exceed 32KB. diff --git a/build/codeformat/formatimports.go b/build/codeformat/formatimports.go index c9fc2a27b4..acedd13234 100644 --- a/build/codeformat/formatimports.go +++ b/build/codeformat/formatimports.go @@ -13,8 +13,8 @@ import ( ) var importPackageGroupOrders = map[string]int{ - "": 1, // internal - "code.gitea.io/gitea/": 2, + "": 1, // internal + "forgejo.org/": 2, } var errInvalidCommentBetweenImports = errors.New("comments between imported packages are invalid, please move comments to the end of the package line") diff --git a/build/codeformat/formatimports_test.go b/build/codeformat/formatimports_test.go index 1abc9f8ab7..03c780911f 100644 --- a/build/codeformat/formatimports_test.go +++ b/build/codeformat/formatimports_test.go @@ -58,8 +58,8 @@ import ( "code.gitea.io/other/package" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/the/package" @@ -82,8 +82,8 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "code.gitea.io/other/package" "github.com/issue9/identicon" diff --git a/build/generate-emoji.go b/build/generate-emoji.go index 98c2f15d75..0ad49a6541 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -20,7 +20,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) const ( diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index 1e09c83a6a..7acfd6cbe4 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) func main() { diff --git a/build/generate-go-licenses.go b/build/generate-go-licenses.go index 22ef817ebc..3f4d62a2cc 100644 --- a/build/generate-go-licenses.go +++ b/build/generate-go-licenses.go @@ -16,7 +16,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // regexp is based on go-license, excluding README and NOTICE @@ -102,9 +102,9 @@ func main() { pkgName := path.Dir(pkgPath) // There might be a bug somewhere in go-licenses that sometimes interprets the - // root package as "." and sometimes as "code.gitea.io/gitea". Workaround by + // root package as "." and sometimes as "forgejo.org". Workaround by // removing both of them for the sake of stable output. - if pkgName == "." || pkgName == "code.gitea.io/gitea" { + if pkgName == "." || pkgName == "forgejo.org" { continue } diff --git a/build/generate-licenses.go b/build/generate-licenses.go index 9a111bc811..e925d8af02 100644 --- a/build/generate-licenses.go +++ b/build/generate-licenses.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) func main() { diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go index e1d04da301..8aeae26c4c 100644 --- a/build/lint-locale-usage/lint-locale-usage.go +++ b/build/lint-locale-usage/lint-locale-usage.go @@ -17,10 +17,10 @@ import ( "text/template" tmplParser "text/template/parse" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/locale" - fjTemplates "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/locale" + fjTemplates "forgejo.org/modules/templates" + "forgejo.org/modules/util" ) // this works by first gathering all valid source string IDs from `en-US` reference files diff --git a/build/lint-locale/lint-locale.go b/build/lint-locale/lint-locale.go index a738fbd684..94ce941e62 100644 --- a/build/lint-locale/lint-locale.go +++ b/build/lint-locale/lint-locale.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/locale" + "forgejo.org/modules/locale" "github.com/microcosm-cc/bluemonday" "github.com/sergi/go-diff/diffmatchpatch" diff --git a/cmd/actions.go b/cmd/actions.go index 10ae6243c3..54b5154cfa 100644 --- a/cmd/actions.go +++ b/cmd/actions.go @@ -6,8 +6,8 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin.go b/cmd/admin.go index 6c9480e76e..e04a5bc530 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go index 4777a92908..b5e0212df7 100644 --- a/cmd/admin_auth.go +++ b/cmd/admin_auth.go @@ -9,9 +9,9 @@ import ( "os" "text/tabwriter" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - auth_service "code.gitea.io/gitea/services/auth" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + auth_service "forgejo.org/services/auth" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go index aff2a12855..637769b153 100644 --- a/cmd/admin_auth_ldap.go +++ b/cmd/admin_auth_ldap.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + "forgejo.org/models/auth" + "forgejo.org/services/auth/source/ldap" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth_ldap_test.go b/cmd/admin_auth_ldap_test.go index d5385d09e8..269af55d96 100644 --- a/cmd/admin_auth_ldap_test.go +++ b/cmd/admin_auth_ldap_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + "forgejo.org/models/auth" + "forgejo.org/services/auth/source/ldap" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go index 8e6239ac33..58238794b8 100644 --- a/cmd/admin_auth_oauth.go +++ b/cmd/admin_auth_oauth.go @@ -8,8 +8,8 @@ import ( "fmt" "net/url" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth/source/oauth2" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth_stmp.go b/cmd/admin_auth_stmp.go index d724746905..e166cc38cd 100644 --- a/cmd/admin_auth_stmp.go +++ b/cmd/admin_auth_stmp.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/util" + "forgejo.org/services/auth/source/smtp" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_regenerate.go b/cmd/admin_regenerate.go index 0db505ff9c..4e7f685843 100644 --- a/cmd/admin_regenerate.go +++ b/cmd/admin_regenerate.go @@ -4,9 +4,9 @@ package cmd import ( - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/graceful" - repo_service "code.gitea.io/gitea/services/repository" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/graceful" + repo_service "forgejo.org/services/repository" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_change_password.go b/cmd/admin_user_change_password.go index bd9063a8e4..563ad96afd 100644 --- a/cmd/admin_user_change_password.go +++ b/cmd/admin_user_change_password.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + user_service "forgejo.org/services/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go index 781148e734..33e61c0753 100644 --- a/cmd/admin_user_create.go +++ b/cmd/admin_user_create.go @@ -7,12 +7,12 @@ import ( "errors" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - pwd "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + pwd "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go index 520557554a..9a4cc22a77 100644 --- a/cmd/admin_user_delete.go +++ b/cmd/admin_user_delete.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + user_service "forgejo.org/services/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go index 6c2c10494e..abb874bd5f 100644 --- a/cmd/admin_user_generate_access_token.go +++ b/cmd/admin_user_generate_access_token.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_list.go b/cmd/admin_user_list.go index 4c2b26d1df..6044ce7c3f 100644 --- a/cmd/admin_user_list.go +++ b/cmd/admin_user_list.go @@ -8,7 +8,7 @@ import ( "os" "text/tabwriter" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_must_change_password.go b/cmd/admin_user_must_change_password.go index 2794414259..920f5c7b21 100644 --- a/cmd/admin_user_must_change_password.go +++ b/cmd/admin_user_must_change_password.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/cmd.go b/cmd/cmd.go index 423dce2674..c887d0ed52 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -15,10 +15,10 @@ import ( "strings" "syscall" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/urfave/cli/v2" ) diff --git a/cmd/doctor.go b/cmd/doctor.go index 9957053365..b3420982f5 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -11,13 +11,13 @@ import ( "strings" "text/tabwriter" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - migrate_base "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/doctor" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + migrate_base "forgejo.org/models/migrations/base" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/doctor" "github.com/urfave/cli/v2" "xorm.io/xorm" diff --git a/cmd/doctor_convert.go b/cmd/doctor_convert.go index 190b2fc2ef..06883264a3 100644 --- a/cmd/doctor_convert.go +++ b/cmd/doctor_convert.go @@ -6,9 +6,9 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go index e6daae18b9..bfb4b9d803 100644 --- a/cmd/doctor_test.go +++ b/cmd/doctor_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/doctor" + "forgejo.org/modules/log" + "forgejo.org/services/doctor" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" diff --git a/cmd/dump.go b/cmd/dump.go index 14f9a00b58..ac72a2bb18 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" "code.forgejo.org/go-chi/session" "github.com/mholt/archiver/v3" diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go index 3a24cf6c5f..197445f908 100644 --- a/cmd/dump_repo.go +++ b/cmd/dump_repo.go @@ -10,14 +10,14 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/migrations" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/convert" + "forgejo.org/services/migrations" "github.com/urfave/cli/v2" ) diff --git a/cmd/embedded.go b/cmd/embedded.go index 9f03f7be7c..c8b9d13d25 100644 --- a/cmd/embedded.go +++ b/cmd/embedded.go @@ -10,13 +10,13 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/util" "github.com/gobwas/glob" "github.com/urfave/cli/v2" diff --git a/cmd/forgejo/actions.go b/cmd/forgejo/actions.go index 1560b10fac..dbe7398bcf 100644 --- a/cmd/forgejo/actions.go +++ b/cmd/forgejo/actions.go @@ -11,10 +11,10 @@ import ( "os" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - private_routers "code.gitea.io/gitea/routers/private" + actions_model "forgejo.org/models/actions" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + private_routers "forgejo.org/routers/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/forgejo/actions_test.go b/cmd/forgejo/actions_test.go index 897af98315..b58f52184c 100644 --- a/cmd/forgejo/actions_test.go +++ b/cmd/forgejo/actions_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/forgejo/f3.go b/cmd/forgejo/f3.go index 5a0d0ac036..bfd14cd1a4 100644 --- a/cmd/forgejo/f3.go +++ b/cmd/forgejo/f3.go @@ -8,14 +8,14 @@ import ( "context" "errors" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/f3/util" + "forgejo.org/models" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/services/f3/util" - _ "code.gitea.io/gitea/services/f3/driver" // register the driver + _ "forgejo.org/services/f3/driver" // register the driver f3_cmd "code.forgejo.org/f3/gof3/v3/cmd" f3_logger "code.forgejo.org/f3/gof3/v3/logger" diff --git a/cmd/forgejo/forgejo.go b/cmd/forgejo/forgejo.go index 1b7e16ca8f..3b95c80991 100644 --- a/cmd/forgejo/forgejo.go +++ b/cmd/forgejo/forgejo.go @@ -11,10 +11,10 @@ import ( "os/signal" "syscall" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/generate.go b/cmd/generate.go index 806946244b..8d3c221ec5 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/generate" + "forgejo.org/modules/generate" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" diff --git a/cmd/hook.go b/cmd/hook.go index 93dfd9d648..1630c41edd 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/hook_test.go b/cmd/hook_test.go index 4fa249a316..89bd3cf737 100644 --- a/cmd/hook_test.go +++ b/cmd/hook_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/keys.go b/cmd/keys.go index 81425a5722..b12daee1bc 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "forgejo.org/modules/log" + "forgejo.org/modules/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/mailer.go b/cmd/mailer.go index 0c5f2c8c8d..cddebd6d36 100644 --- a/cmd/mailer.go +++ b/cmd/mailer.go @@ -6,8 +6,8 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/main.go b/cmd/main.go index 9a28722b4b..5f48814cd0 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/cmd/forgejo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/cmd/forgejo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/main_test.go b/cmd/main_test.go index 8a9ec14b2e..5e0b36d028 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/manager.go b/cmd/manager.go index b74771e53d..0cb1e60f73 100644 --- a/cmd/manager.go +++ b/cmd/manager.go @@ -7,7 +7,7 @@ import ( "os" "time" - "code.gitea.io/gitea/modules/private" + "forgejo.org/modules/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index 6049b00d5e..ac2c1eb418 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "forgejo.org/modules/log" + "forgejo.org/modules/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/migrate.go b/cmd/migrate.go index 53c496a36c..ab291cfb66 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,10 +6,10 @@ package cmd import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index 3a69b555e0..1b839e7169 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -10,17 +10,17 @@ import ( "io/fs" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/migrations" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/migrations" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" "github.com/urfave/cli/v2" ) diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go index 245f0cacff..28af63f4c8 100644 --- a/cmd/migrate_storage_test.go +++ b/cmd/migrate_storage_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" + packages_service "forgejo.org/services/packages" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go index 37b32aa304..1e53ce26ba 100644 --- a/cmd/restore_repo.go +++ b/cmd/restore_repo.go @@ -6,8 +6,8 @@ package cmd import ( "strings" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/serv.go b/cmd/serv.go index db67e36fa3..0884d6c36b 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -18,18 +18,18 @@ import ( "time" "unicode" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/pprof" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/lfs" + asymkey_model "forgejo.org/models/asymkey" + git_model "forgejo.org/models/git" + "forgejo.org/models/perm" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/pprof" + "forgejo.org/modules/private" + "forgejo.org/modules/process" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/services/lfs" "github.com/golang-jwt/jwt/v5" "github.com/kballard/go-shellquote" diff --git a/cmd/web.go b/cmd/web.go index 787411939c..3e7fdee4bf 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -16,14 +16,14 @@ import ( _ "net/http/pprof" // Used for debugging if enabled and a web server is running - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/install" + "forgejo.org/modules/container" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/routers" + "forgejo.org/routers/install" "github.com/felixge/fgprof" "github.com/urfave/cli/v2" diff --git a/cmd/web_acme.go b/cmd/web_acme.go index 90e4a02764..b2d7435be2 100644 --- a/cmd/web_acme.go +++ b/cmd/web_acme.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" "github.com/caddyserver/certmagic" ) diff --git a/cmd/web_graceful.go b/cmd/web_graceful.go index 996537be3b..b0145d4fc7 100644 --- a/cmd/web_graceful.go +++ b/cmd/web_graceful.go @@ -9,9 +9,9 @@ import ( "net/http/fcgi" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func runHTTP(network, listenAddr, name string, m http.Handler, useProxyProtocol bool) error { diff --git a/cmd/web_https.go b/cmd/web_https.go index 70d35cd40d..bebc5f7c8f 100644 --- a/cmd/web_https.go +++ b/cmd/web_https.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/klauspost/cpuid/v2" ) diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go index f8593e49c3..95f34527ac 100644 --- a/contrib/environment-to-ini/environment-to-ini.go +++ b/contrib/environment-to-ini/environment-to-ini.go @@ -6,8 +6,8 @@ package main import ( "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index b49ef7436f..4284ff362b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.gitea.io/gitea +module forgejo.org go 1.24 diff --git a/main.go b/main.go index b8cc5668e1..3f0283db7f 100644 --- a/main.go +++ b/main.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/cmd" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" // register supported doc types - _ "code.gitea.io/gitea/modules/markup/asciicast" - _ "code.gitea.io/gitea/modules/markup/console" - _ "code.gitea.io/gitea/modules/markup/csv" - _ "code.gitea.io/gitea/modules/markup/markdown" - _ "code.gitea.io/gitea/modules/markup/orgmode" + _ "forgejo.org/modules/markup/asciicast" + _ "forgejo.org/modules/markup/console" + _ "forgejo.org/modules/markup/csv" + _ "forgejo.org/modules/markup/markdown" + _ "forgejo.org/modules/markup/orgmode" "github.com/urfave/cli/v2" ) diff --git a/models/actions/artifact.go b/models/actions/artifact.go index 0bc66ba24e..10cd3868a1 100644 --- a/models/actions/artifact.go +++ b/models/actions/artifact.go @@ -11,9 +11,9 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/actions/forgejo.go b/models/actions/forgejo.go index 5ea77f4473..ce3f8b0c8b 100644 --- a/models/actions/forgejo.go +++ b/models/actions/forgejo.go @@ -7,9 +7,9 @@ import ( "crypto/subtle" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/actions/forgejo_test.go b/models/actions/forgejo_test.go index 9295fc698e..fc4ccfa628 100644 --- a/models/actions/forgejo_test.go +++ b/models/actions/forgejo_test.go @@ -6,9 +6,9 @@ import ( "crypto/subtle" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 3cfb395e62..27916f29ac 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/actions/run.go b/models/actions/run.go index c5512106b9..671177a892 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" "github.com/nektos/act/pkg/jobparser" "xorm.io/builder" diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 9f8edfe4fc..fffbb6670b 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -9,10 +9,10 @@ import ( "slices" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go index 6c5d3b3252..cbcb4beb8e 100644 --- a/models/actions/run_job_list.go +++ b/models/actions/run_job_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index b9b9324e07..92be510569 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -6,12 +6,12 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/translation" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/translation" + webhook_module "forgejo.org/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/runner.go b/models/actions/runner.go index b24950d014..99173000fb 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -11,15 +11,15 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/shared/types" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/shared/types" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" diff --git a/models/actions/runner_list.go b/models/actions/runner_list.go index 3ef8ebb254..6a64c46596 100644 --- a/models/actions/runner_list.go +++ b/models/actions/runner_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" ) type RunnerList []*ActionRunner diff --git a/models/actions/runner_test.go b/models/actions/runner_test.go index 2c8d430f94..0623e66046 100644 --- a/models/actions/runner_test.go +++ b/models/actions/runner_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/runner_token.go b/models/actions/runner_token.go index fd6ba7ecad..a59304d8e8 100644 --- a/models/actions/runner_token.go +++ b/models/actions/runner_token.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ActionRunnerToken represents runner tokens diff --git a/models/actions/runner_token_test.go b/models/actions/runner_token_test.go index 35c9a9d3c3..65d83a8fd0 100644 --- a/models/actions/runner_token_test.go +++ b/models/actions/runner_token_test.go @@ -6,8 +6,8 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/schedule.go b/models/actions/schedule.go index 1ef9978185..633582e017 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec.go b/models/actions/schedule_spec.go index 923e5f7807..83bdceb850 100644 --- a/models/actions/schedule_spec.go +++ b/models/actions/schedule_spec.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/timeutil" "github.com/robfig/cron/v3" ) diff --git a/models/actions/schedule_spec_list.go b/models/actions/schedule_spec_list.go index 78ba622dc3..0a09a60acb 100644 --- a/models/actions/schedule_spec_list.go +++ b/models/actions/schedule_spec_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/container" "xorm.io/builder" ) diff --git a/models/actions/status.go b/models/actions/status.go index eda2234137..f4357af731 100644 --- a/models/actions/status.go +++ b/models/actions/status.go @@ -4,7 +4,7 @@ package actions import ( - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ) diff --git a/models/actions/task.go b/models/actions/task.go index 31655d2f1d..63cbc6e586 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru/v2" diff --git a/models/actions/task_list.go b/models/actions/task_list.go index 502d29e1a3..fe4c028c2c 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/task_output.go b/models/actions/task_output.go index eab5b93118..fa13cadd53 100644 --- a/models/actions/task_output.go +++ b/models/actions/task_output.go @@ -6,7 +6,7 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // ActionTaskOutput represents an output of ActionTask. diff --git a/models/actions/task_step.go b/models/actions/task_step.go index 3af1fe3f5a..1f20157271 100644 --- a/models/actions/task_step.go +++ b/models/actions/task_step.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" ) // ActionTaskStep represents a step of ActionTask diff --git a/models/actions/tasks_version.go b/models/actions/tasks_version.go index d8df353593..a5c357888f 100644 --- a/models/actions/tasks_version.go +++ b/models/actions/tasks_version.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // ActionTasksVersion diff --git a/models/actions/utils.go b/models/actions/utils.go index 12657942fc..7dd3f7ec12 100644 --- a/models/actions/utils.go +++ b/models/actions/utils.go @@ -12,9 +12,9 @@ import ( "io" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) func generateSaltedToken() (string, string, string, string, error) { diff --git a/models/actions/utils_test.go b/models/actions/utils_test.go index 98c048d4ef..af6fd04a6a 100644 --- a/models/actions/utils_test.go +++ b/models/actions/utils_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/variable.go b/models/actions/variable.go index 39cea95c4b..203065487c 100644 --- a/models/actions/variable.go +++ b/models/actions/variable.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/activities/action.go b/models/activities/action.go index dd67b98242..ef99132e6c 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -14,20 +14,20 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/action_list.go b/models/activities/action_list.go index aafb7f8a26..64b92bbda1 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -8,12 +8,12 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action_test.go b/models/activities/action_test.go index 4ce030dd48..ebc40cffa5 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -8,13 +8,13 @@ import ( "path" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/activities/main_test.go b/models/activities/main_test.go index bda5593d02..a5245ab1d3 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -6,11 +6,11 @@ package activities_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/activities/notification.go b/models/activities/notification.go index 09cc640224..4d13900459 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -9,14 +9,14 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/activities/notification_list.go b/models/activities/notification_list.go index 32d2a5c051..9b09dde7ab 100644 --- a/models/activities/notification_list.go +++ b/models/activities/notification_list.go @@ -6,14 +6,14 @@ package activities import ( "context" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 3ff223d870..305a2ae430 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index ffa709ad19..3d15c22e19 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -9,12 +9,12 @@ import ( "sort" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" "xorm.io/xorm" ) diff --git a/models/activities/repo_activity_test.go b/models/activities/repo_activity_test.go index 06cd0e1e8a..c111c50208 100644 --- a/models/activities/repo_activity_test.go +++ b/models/activities/repo_activity_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/activities/statistic.go b/models/activities/statistic.go index ff81ad78a1..4c15cb2898 100644 --- a/models/activities/statistic.go +++ b/models/activities/statistic.go @@ -6,18 +6,18 @@ package activities import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/setting" ) // Statistic contains the database statistics diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index 080075d793..0cc3f759c6 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -6,11 +6,11 @@ package activities import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // UserHeatmapData represents the data needed to create a heatmap diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go index d62565a27c..d922f9a78b 100644 --- a/models/activities/user_heatmap_test.go +++ b/models/activities/user_heatmap_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/timeutil" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/admin/task.go b/models/admin/task.go index 5c2f7af49c..b4e1ac0134 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -7,16 +7,16 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/migration" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // Task represents a task diff --git a/models/asymkey/error.go b/models/asymkey/error.go index e38ba121c6..fc0dd88232 100644 --- a/models/asymkey/error.go +++ b/models/asymkey/error.go @@ -6,7 +6,7 @@ package asymkey import ( "fmt" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrKeyUnableVerify represents a "KeyUnableVerify" kind of error. diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index 6e2914e476..b7e10ce85c 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_add.go b/models/asymkey/gpg_key_add.go index 6c0f6e01a7..06cfd09a3e 100644 --- a/models/asymkey/gpg_key_add.go +++ b/models/asymkey/gpg_key_add.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/modules/log" "github.com/ProtonMail/go-crypto/openpgp" ) diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go index 9aa606405e..73b066b17c 100644 --- a/models/asymkey/gpg_key_commit_verification.go +++ b/models/asymkey/gpg_key_commit_verification.go @@ -6,9 +6,9 @@ package asymkey import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_import.go b/models/asymkey/gpg_key_import.go index c9d46d29e5..8a63ea4a35 100644 --- a/models/asymkey/gpg_key_import.go +++ b/models/asymkey/gpg_key_import.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_list.go b/models/asymkey/gpg_key_list.go index 89548e495e..b2d4fb11f6 100644 --- a/models/asymkey/gpg_key_list.go +++ b/models/asymkey/gpg_key_list.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) type GPGKeyList []*GPGKey diff --git a/models/asymkey/gpg_key_object_verification.go b/models/asymkey/gpg_key_object_verification.go index 24d72a52c1..407a29c221 100644 --- a/models/asymkey/gpg_key_object_verification.go +++ b/models/asymkey/gpg_key_object_verification.go @@ -10,12 +10,12 @@ import ( "hash" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/ProtonMail/go-crypto/openpgp/packet" ) diff --git a/models/asymkey/gpg_key_tag_verification.go b/models/asymkey/gpg_key_tag_verification.go index 5fd3983e54..f054525e8f 100644 --- a/models/asymkey/gpg_key_tag_verification.go +++ b/models/asymkey/gpg_key_tag_verification.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) func ParseTagWithSignature(ctx context.Context, gitRepo *git.Repository, t *git.Tag) *ObjectVerification { diff --git a/models/asymkey/gpg_key_test.go b/models/asymkey/gpg_key_test.go index e9aa9cf5ec..4db07b84c2 100644 --- a/models/asymkey/gpg_key_test.go +++ b/models/asymkey/gpg_key_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index 01812a2d54..2b5ea7a1ac 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -8,10 +8,10 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" ) // __________________ ________ ____ __. diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go index 87b5c22c4a..316e8f1d54 100644 --- a/models/asymkey/main_test.go +++ b/models/asymkey/main_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/asymkey/ssh_key.go b/models/asymkey/ssh_key.go index 7a18732c32..7f76009e7f 100644 --- a/models/asymkey/ssh_key.go +++ b/models/asymkey/ssh_key.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index 57baf89c0c..d3bf6fe886 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -14,10 +14,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // _____ __ .__ .__ .___ diff --git a/models/asymkey/ssh_key_authorized_principals.go b/models/asymkey/ssh_key_authorized_principals.go index f85de12aae..0b4fe13ba7 100644 --- a/models/asymkey/ssh_key_authorized_principals.go +++ b/models/asymkey/ssh_key_authorized_principals.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // _____ __ .__ .__ .___ diff --git a/models/asymkey/ssh_key_deploy.go b/models/asymkey/ssh_key_deploy.go index 429635330d..22e80840af 100644 --- a/models/asymkey/ssh_key_deploy.go +++ b/models/asymkey/ssh_key_deploy.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go index 1ed3b5df2a..11112e4bc3 100644 --- a/models/asymkey/ssh_key_fingerprint.go +++ b/models/asymkey/ssh_key_fingerprint.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_object_verification.go b/models/asymkey/ssh_key_object_verification.go index 5ad6fdb0a9..e0476fe5a8 100644 --- a/models/asymkey/ssh_key_object_verification.go +++ b/models/asymkey/ssh_key_object_verification.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/asymkey/ssh_key_object_verification_test.go b/models/asymkey/ssh_key_object_verification_test.go index 0d5ebabb70..5d1b7edc27 100644 --- a/models/asymkey/ssh_key_object_verification_test.go +++ b/models/asymkey/ssh_key_object_verification_test.go @@ -6,12 +6,12 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go index 3cb51b2b22..305e464b4b 100644 --- a/models/asymkey/ssh_key_parse.go +++ b/models/asymkey/ssh_key_parse.go @@ -16,10 +16,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_principals.go b/models/asymkey/ssh_key_principals.go index 4e7dee2c91..ba2a1a8c7d 100644 --- a/models/asymkey/ssh_key_principals.go +++ b/models/asymkey/ssh_key_principals.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // AddPrincipalKey adds new principal to database and authorized_principals file. diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go index 9a4ef665af..f3c3e41955 100644 --- a/models/asymkey/ssh_key_test.go +++ b/models/asymkey/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/42wim/sshsig" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go index 208288c77b..5dd26ccc9a 100644 --- a/models/asymkey/ssh_key_verify.go +++ b/models/asymkey/ssh_key_verify.go @@ -7,8 +7,8 @@ import ( "bytes" "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/auth/access_token.go b/models/auth/access_token.go index 3ac18940a8..31d88c6b20 100644 --- a/models/auth/access_token.go +++ b/models/auth/access_token.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go index 003ca5c9ab..802ad5aa07 100644 --- a/models/auth/access_token_scope.go +++ b/models/auth/access_token_scope.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/perm" + "forgejo.org/models/perm" ) // AccessTokenScopeCategory represents the scope category for an access token diff --git a/models/auth/access_token_test.go b/models/auth/access_token_test.go index 976ff37493..913118433c 100644 --- a/models/auth/access_token_test.go +++ b/models/auth/access_token_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/auth_token.go b/models/auth/auth_token.go index c64af3e41f..a3ac9c4c1a 100644 --- a/models/auth/auth_token.go +++ b/models/auth/auth_token.go @@ -10,9 +10,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) type AuthorizationPurpose string diff --git a/models/auth/main_test.go b/models/auth/main_test.go index 7b374b38da..b30db24483 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -6,14 +6,14 @@ package auth_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/auth" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/perm/access" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/auth" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index 9a7854408f..fb0a451566 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -14,11 +14,11 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" uuid "github.com/google/uuid" "golang.org/x/crypto/bcrypt" diff --git a/models/auth/oauth2_list.go b/models/auth/oauth2_list.go index c55f10b3c8..6f508833a0 100644 --- a/models/auth/oauth2_list.go +++ b/models/auth/oauth2_list.go @@ -4,7 +4,7 @@ package auth import ( - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index 9b562c8648..877541e0ff 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -8,10 +8,10 @@ import ( "slices" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/session.go b/models/auth/session.go index 75a205f702..b3724dafb6 100644 --- a/models/auth/session.go +++ b/models/auth/session.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/auth/session_test.go b/models/auth/session_test.go index 3b57239704..ab6415f289 100644 --- a/models/auth/session_test.go +++ b/models/auth/session_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/source.go b/models/auth/source.go index d7ed6b97a8..ecd3abc39d 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -9,11 +9,11 @@ import ( "fmt" "reflect" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/auth/source_test.go b/models/auth/source_test.go index 522fecc25f..ed21aef253 100644 --- a/models/auth/source_test.go +++ b/models/auth/source_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go index 67be23320e..f4c1e36b3f 100644 --- a/models/auth/twofactor.go +++ b/models/auth/twofactor.go @@ -11,10 +11,10 @@ import ( "encoding/hex" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/keying" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/pquerna/otp/totp" "golang.org/x/crypto/pbkdf2" diff --git a/models/auth/webauthn.go b/models/auth/webauthn.go index b230e1665a..5b86a6e6f2 100644 --- a/models/auth/webauthn.go +++ b/models/auth/webauthn.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/go-webauthn/webauthn/webauthn" ) diff --git a/models/auth/webauthn_test.go b/models/auth/webauthn_test.go index e1cd652009..abf8e34408 100644 --- a/models/auth/webauthn_test.go +++ b/models/auth/webauthn_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/go-webauthn/webauthn/webauthn" "github.com/stretchr/testify/assert" diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 9eb34dcbcc..ad59bd8769 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -14,10 +14,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/cache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "code.forgejo.org/forgejo-contrib/go-libravatar" ) diff --git a/models/avatars/avatar_test.go b/models/avatars/avatar_test.go index 85c40c3fa1..7850d2c096 100644 --- a/models/avatars/avatar_test.go +++ b/models/avatars/avatar_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - avatars_model "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" + avatars_model "forgejo.org/models/avatars" + "forgejo.org/models/db" + system_model "forgejo.org/models/system" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/avatars/main_test.go b/models/avatars/main_test.go index c721a7dc2a..bdc66954b1 100644 --- a/models/avatars/main_test.go +++ b/models/avatars/main_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" + _ "forgejo.org/models" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/db/collation.go b/models/db/collation.go index 39d28fa2ff..768ada89e6 100644 --- a/models/db/collation.go +++ b/models/db/collation.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/common.go b/models/db/common.go index f3fd3e72ae..c9b012597c 100644 --- a/models/db/common.go +++ b/models/db/common.go @@ -6,8 +6,8 @@ package db import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/db/context_test.go b/models/db/context_test.go index 855f360b75..7ab327b7e9 100644 --- a/models/db/context_test.go +++ b/models/db/context_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/convert.go b/models/db/convert.go index 956e17d411..1f37e49176 100644 --- a/models/db/convert.go +++ b/models/db/convert.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/engine.go b/models/db/engine.go index 822618a7e3..ca6576da8a 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/contexts" diff --git a/models/db/engine_test.go b/models/db/engine_test.go index 230ee3f2b1..5d20e3d602 100644 --- a/models/db/engine_test.go +++ b/models/db/engine_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" - _ "code.gitea.io/gitea/cmd" // for TestPrimaryKeys + _ "forgejo.org/cmd" // for TestPrimaryKeys "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -64,7 +64,7 @@ func TestPrimaryKeys(t *testing.T) { // https://github.com/go-gitea/gitea/issues/21086 // https://github.com/go-gitea/gitea/issues/16802 // To avoid creating tables without primary key again, this test will check them. - // Import "code.gitea.io/gitea/cmd" to make sure each db.RegisterModel in init functions has been called. + // Import "forgejo.org/cmd" to make sure each db.RegisterModel in init functions has been called. beans, err := db.NamesToBean() if err != nil { diff --git a/models/db/error.go b/models/db/error.go index 665e970e17..6b70c40eb3 100644 --- a/models/db/error.go +++ b/models/db/error.go @@ -6,7 +6,7 @@ package db import ( "fmt" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrCancelled represents an error due to context cancellation diff --git a/models/db/index.go b/models/db/index.go index 259ddd6ade..4c15dbe8a1 100644 --- a/models/db/index.go +++ b/models/db/index.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // ResourceIndex represents a resource index which could be used as issue/release and others diff --git a/models/db/index_test.go b/models/db/index_test.go index 11fbc70d8d..929e514329 100644 --- a/models/db/index_test.go +++ b/models/db/index_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/install/db.go b/models/db/install/db.go index d4c1139637..104a7a8e39 100644 --- a/models/db/install/db.go +++ b/models/db/install/db.go @@ -4,8 +4,8 @@ package install import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/db/iterate.go b/models/db/iterate.go index e1caefa72b..450c7d3389 100644 --- a/models/db/iterate.go +++ b/models/db/iterate.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/builder" ) diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 7535d01d56..47b6a956f4 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/list.go b/models/db/list.go index 5c005a0350..057221936c 100644 --- a/models/db/list.go +++ b/models/db/list.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/list_test.go b/models/db/list_test.go index 82240d205b..f13958496a 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -6,9 +6,9 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/log.go b/models/db/log.go index 457ee80ff5..b94af8e39c 100644 --- a/models/db/log.go +++ b/models/db/log.go @@ -7,7 +7,7 @@ import ( "fmt" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" xormlog "xorm.io/xorm/log" ) diff --git a/models/db/main_test.go b/models/db/main_test.go index 7d80b400fe..4b06923950 100644 --- a/models/db/main_test.go +++ b/models/db/main_test.go @@ -6,10 +6,10 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/repo" + _ "forgejo.org/models" + _ "forgejo.org/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/db/name.go b/models/db/name.go index 51be33a8bc..29b60b2373 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) var ( diff --git a/models/db/paginator/main_test.go b/models/db/paginator/main_test.go index 47993aed6b..e2528be121 100644 --- a/models/db/paginator/main_test.go +++ b/models/db/paginator/main_test.go @@ -6,7 +6,7 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/db/paginator/paginator_test.go b/models/db/paginator/paginator_test.go index 20602212d9..c6d0569aaa 100644 --- a/models/db/paginator/paginator_test.go +++ b/models/db/paginator/paginator_test.go @@ -6,8 +6,8 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/db/sequence.go b/models/db/sequence.go index f49ad935de..1740e74c52 100644 --- a/models/db/sequence.go +++ b/models/db/sequence.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // CountBadSequences looks for broken sequences from recreate-table mistakes diff --git a/models/db/sql_postgres_with_schema.go b/models/db/sql_postgres_with_schema.go index ec63447f6f..376f984dc6 100644 --- a/models/db/sql_postgres_with_schema.go +++ b/models/db/sql_postgres_with_schema.go @@ -8,7 +8,7 @@ import ( "database/sql/driver" "sync" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/lib/pq" "xorm.io/xorm/dialects" diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go index dd27b5c36b..12c0398abc 100644 --- a/models/dbfs/dbfile.go +++ b/models/dbfs/dbfile.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) var defaultFileBlockSize int64 = 32 * 1024 diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go index f68b4a2b70..ba57e50151 100644 --- a/models/dbfs/dbfs.go +++ b/models/dbfs/dbfs.go @@ -10,7 +10,7 @@ import ( "path" "time" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) /* diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go index 3ad273a732..8e42c54f31 100644 --- a/models/dbfs/dbfs_test.go +++ b/models/dbfs/dbfs_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go index 537ba0935d..3d4b2bc235 100644 --- a/models/dbfs/main_test.go +++ b/models/dbfs/main_test.go @@ -6,7 +6,7 @@ package dbfs import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/error.go b/models/error.go index 658bdc165c..e8962f386b 100644 --- a/models/error.go +++ b/models/error.go @@ -7,9 +7,9 @@ package models import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/util" ) // ErrUserOwnRepos represents a "UserOwnRepos" kind of error. diff --git a/models/forgefed/federationhost.go b/models/forgefed/federationhost.go index b60c0c39cf..00f13ea399 100644 --- a/models/forgefed/federationhost.go +++ b/models/forgefed/federationhost.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" ) // FederationHost data type diff --git a/models/forgefed/federationhost_repository.go b/models/forgefed/federationhost_repository.go index 03d8741c58..b04a5cd882 100644 --- a/models/forgefed/federationhost_repository.go +++ b/models/forgefed/federationhost_repository.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/validation" ) func init() { diff --git a/models/forgefed/federationhost_test.go b/models/forgefed/federationhost_test.go index ea5494c6e9..7e48a41d3b 100644 --- a/models/forgefed/federationhost_test.go +++ b/models/forgefed/federationhost_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_FederationHostValidation(t *testing.T) { diff --git a/models/forgefed/nodeinfo.go b/models/forgefed/nodeinfo.go index 66d2eca7aa..2461b5e499 100644 --- a/models/forgefed/nodeinfo.go +++ b/models/forgefed/nodeinfo.go @@ -6,7 +6,7 @@ package forgefed import ( "net/url" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" "github.com/valyala/fastjson" ) diff --git a/models/forgefed/nodeinfo_test.go b/models/forgefed/nodeinfo_test.go index 4c73bb44d8..9e37e77100 100644 --- a/models/forgefed/nodeinfo_test.go +++ b/models/forgefed/nodeinfo_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_NodeInfoWellKnownUnmarshalJSON(t *testing.T) { diff --git a/models/forgejo/semver/main_test.go b/models/forgejo/semver/main_test.go index 10875f14fe..dcc9d588cd 100644 --- a/models/forgejo/semver/main_test.go +++ b/models/forgejo/semver/main_test.go @@ -5,12 +5,12 @@ package semver import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/forgejo/semver/semver.go b/models/forgejo/semver/semver.go index 7f122d2301..24a3db9181 100644 --- a/models/forgejo/semver/semver.go +++ b/models/forgejo/semver/semver.go @@ -5,7 +5,7 @@ package semver import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/hashicorp/go-version" ) diff --git a/models/forgejo/semver/semver_test.go b/models/forgejo/semver/semver_test.go index a508c69b18..2d055e86bb 100644 --- a/models/forgejo/semver/semver_test.go +++ b/models/forgejo/semver/semver_test.go @@ -5,8 +5,8 @@ package semver import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/hashicorp/go-version" "github.com/stretchr/testify/assert" diff --git a/models/forgejo_migrations/main_test.go b/models/forgejo_migrations/main_test.go index 2297f74f73..031fe8090d 100644 --- a/models/forgejo_migrations/main_test.go +++ b/models/forgejo_migrations/main_test.go @@ -6,7 +6,7 @@ package forgejo_migrations //nolint:revive import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/forgejo_migrations/migrate.go b/models/forgejo_migrations/migrate.go index 935b072331..a4cbca70c1 100644 --- a/models/forgejo_migrations/migrate.go +++ b/models/forgejo_migrations/migrate.go @@ -8,12 +8,12 @@ import ( "fmt" "os" - "code.gitea.io/gitea/models/forgejo/semver" - forgejo_v1_20 "code.gitea.io/gitea/models/forgejo_migrations/v1_20" - forgejo_v1_22 "code.gitea.io/gitea/models/forgejo_migrations/v1_22" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/forgejo/semver" + forgejo_v1_20 "forgejo.org/models/forgejo_migrations/v1_20" + forgejo_v1_22 "forgejo.org/models/forgejo_migrations/v1_22" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/forgejo_migrations/migrate_test.go b/models/forgejo_migrations/migrate_test.go index 48ee4f77b1..20653929a3 100644 --- a/models/forgejo_migrations/migrate_test.go +++ b/models/forgejo_migrations/migrate_test.go @@ -6,7 +6,7 @@ package forgejo_migrations //nolint:revive import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/require" ) diff --git a/models/forgejo_migrations/v14.go b/models/forgejo_migrations/v14.go index f6dd35ecf0..53f1ef2223 100644 --- a/models/forgejo_migrations/v14.go +++ b/models/forgejo_migrations/v14.go @@ -4,7 +4,7 @@ package forgejo_migrations //nolint:revive import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v15.go b/models/forgejo_migrations/v15.go index d7ed19ca7c..5e5588dd05 100644 --- a/models/forgejo_migrations/v15.go +++ b/models/forgejo_migrations/v15.go @@ -6,7 +6,7 @@ package forgejo_migrations //nolint:revive import ( "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_20/v1.go b/models/forgejo_migrations/v1_20/v1.go index 1097613655..72beaf23de 100644 --- a/models/forgejo_migrations/v1_20/v1.go +++ b/models/forgejo_migrations/v1_20/v1.go @@ -4,7 +4,7 @@ package forgejo_v1_20 //nolint:revive import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_20/v3.go b/models/forgejo_migrations/v1_20/v3.go index caa4f1aa99..cce227e6eb 100644 --- a/models/forgejo_migrations/v1_20/v3.go +++ b/models/forgejo_migrations/v1_20/v3.go @@ -4,7 +4,7 @@ package forgejo_v1_20 //nolint:revive import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_22/main_test.go b/models/forgejo_migrations/v1_22/main_test.go index 097110893f..03c4c5272c 100644 --- a/models/forgejo_migrations/v1_22/main_test.go +++ b/models/forgejo_migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/forgejo_migrations/v1_22/v11.go b/models/forgejo_migrations/v1_22/v11.go index c693993565..17bb592379 100644 --- a/models/forgejo_migrations/v1_22/v11.go +++ b/models/forgejo_migrations/v1_22/v11.go @@ -4,7 +4,7 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_22/v8_test.go b/models/forgejo_migrations/v1_22/v8_test.go index 128fd08ab0..2af9e431b1 100644 --- a/models/forgejo_migrations/v1_22/v8_test.go +++ b/models/forgejo_migrations/v1_22/v8_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/forgejo_migrations/v25.go b/models/forgejo_migrations/v25.go index 5e3dff80b3..8e3032a40c 100644 --- a/models/forgejo_migrations/v25.go +++ b/models/forgejo_migrations/v25.go @@ -9,11 +9,11 @@ import ( "encoding/base64" "fmt" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/forgejo_migrations/v25_test.go b/models/forgejo_migrations/v25_test.go index 73b97f7a35..e7402fd021 100644 --- a/models/forgejo_migrations/v25_test.go +++ b/models/forgejo_migrations/v25_test.go @@ -6,10 +6,10 @@ package forgejo_migrations //nolint:revive import ( "testing" - "code.gitea.io/gitea/models/auth" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/auth" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/keying" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/forgejo_migrations/v27.go b/models/forgejo_migrations/v27.go index b3a93a9aad..2efa3485a8 100644 --- a/models/forgejo_migrations/v27.go +++ b/models/forgejo_migrations/v27.go @@ -4,7 +4,7 @@ package forgejo_migrations //nolint:revive import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/git/branch.go b/models/git/branch.go index 702d767c75..a73a0f2a20 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -8,14 +8,14 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/git/branch_list.go b/models/git/branch_list.go index 81a43eaea3..4b678f15c0 100644 --- a/models/git/branch_list.go +++ b/models/git/branch_list.go @@ -6,10 +6,10 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" "xorm.io/builder" ) diff --git a/models/git/branch_test.go b/models/git/branch_test.go index 81839eb774..5c1762750e 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -7,13 +7,13 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/commit_status.go b/models/git/commit_status.go index f6ac1dcc54..a679703ffd 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -13,16 +13,16 @@ import ( "strings" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/git/commit_status_summary.go b/models/git/commit_status_summary.go index 7603e7aa65..448aa5aed7 100644 --- a/models/git/commit_status_summary.go +++ b/models/git/commit_status_summary.go @@ -6,9 +6,9 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" "xorm.io/builder" ) diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index 9a039bfc39..c062bbbbb9 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -8,15 +8,15 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/structs" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/lfs.go b/models/git/lfs.go index 635d70d9bc..9ec1ca7d8a 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -7,16 +7,16 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go index 07ce7d4abf..9dc0a947c3 100644 --- a/models/git/lfs_lock.go +++ b/models/git/lfs_lock.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // LFSLock represents a git lfs lock of repository. diff --git a/models/git/lfs_lock_list.go b/models/git/lfs_lock_list.go index cab1e61cab..ffa4db21c4 100644 --- a/models/git/lfs_lock_list.go +++ b/models/git/lfs_lock_list.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" ) // LFSLockList is a list of LFSLock diff --git a/models/git/lfs_test.go b/models/git/lfs_test.go index afb73ecf4e..8a2d3c8caf 100644 --- a/models/git/lfs_test.go +++ b/models/git/lfs_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/main_test.go b/models/git/main_test.go index f25ad42584..63a3c363ab 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -6,12 +6,12 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go index 4fc08020e0..c1eb750230 100644 --- a/models/git/protected_branch.go +++ b/models/git/protected_branch.go @@ -10,16 +10,16 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/gobwas/glob" "github.com/gobwas/glob/syntax" diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 613333a5a2..c7a3154884 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -7,8 +7,8 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/modules/optional" "github.com/gobwas/glob" ) diff --git a/models/git/protected_tag.go b/models/git/protected_tag.go index 9a6646c742..eeaae41868 100644 --- a/models/git/protected_tag.go +++ b/models/git/protected_tag.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/modules/timeutil" "github.com/gobwas/glob" ) diff --git a/models/git/protected_tag_test.go b/models/git/protected_tag_test.go index 796e1594b9..eec13fdc1f 100644 --- a/models/git/protected_tag_test.go +++ b/models/git/protected_tag_test.go @@ -6,9 +6,9 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/action_aggregator.go b/models/issues/action_aggregator.go index 722696fbb2..cf5be753f1 100644 --- a/models/issues/action_aggregator.go +++ b/models/issues/action_aggregator.go @@ -6,8 +6,8 @@ package issues import ( "slices" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" ) type ActionAggregator struct { diff --git a/models/issues/assignees.go b/models/issues/assignees.go index a83cb250fa..b1099b6b63 100644 --- a/models/issues/assignees.go +++ b/models/issues/assignees.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go index 47fb81a237..a5e8f0cb09 100644 --- a/models/issues/assignees_test.go +++ b/models/issues/assignees_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/comment.go b/models/issues/comment.go index f77b2bcc8d..ce4cb6ea93 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -12,22 +12,22 @@ import ( "strconv" "unicode/utf8" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/references" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 2f6f57e0da..3c87a1b41a 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" "xorm.io/builder" ) diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go index 7a133d1c16..7285e347b4 100644 --- a/models/issues/comment_list.go +++ b/models/issues/comment_list.go @@ -6,11 +6,11 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" ) // CommentList defines a list of comments diff --git a/models/issues/comment_list_test.go b/models/issues/comment_list_test.go index 5ad1cd19c9..062a710b84 100644 --- a/models/issues/comment_list_test.go +++ b/models/issues/comment_list_test.go @@ -6,10 +6,10 @@ package issues import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go index 88d2200bd1..0e257f533c 100644 --- a/models/issues/comment_test.go +++ b/models/issues/comment_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/content_history.go b/models/issues/content_history.go index cd3e217b21..476c6e0f90 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/avatars" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index dde6f195bc..4e158da1cc 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/dependency.go b/models/issues/dependency.go index 146dd1887d..fab35dad12 100644 --- a/models/issues/dependency.go +++ b/models/issues/dependency.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrDependencyExists represents a "DependencyAlreadyExists" kind of error. diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index 1e73c581ee..46f3ad10e5 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue.go b/models/issues/issue.go index 79701c7be8..142f2de182 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -11,16 +11,16 @@ import ( "regexp" "slices" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_index.go b/models/issues/issue_index.go index 9386027f74..5012067d70 100644 --- a/models/issues/issue_index.go +++ b/models/issues/issue_index.go @@ -6,7 +6,7 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) func GetMaxIssueIndexForRepo(ctx context.Context, repoID int64) (int64, error) { diff --git a/models/issues/issue_index_test.go b/models/issues/issue_index_test.go index eb79a0806c..6de3f0bc95 100644 --- a/models/issues/issue_index_test.go +++ b/models/issues/issue_index_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go index 04e1fa3d7d..c9e792ed0f 100644 --- a/models/issues/issue_label.go +++ b/models/issues/issue_label.go @@ -8,9 +8,9 @@ import ( "fmt" "sort" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/issues/issue_label_test.go b/models/issues/issue_label_test.go index 67f4874c8f..753e389c7b 100644 --- a/models/issues/issue_label_test.go +++ b/models/issues/issue_label_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index fe6c630a31..5a02baa428 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" "xorm.io/builder" ) diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go index 32cc0fe423..7aa5222958 100644 --- a/models/issues/issue_list_test.go +++ b/models/issues/issue_list_test.go @@ -6,11 +6,11 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_lock.go b/models/issues/issue_lock.go index b21629b529..1e4a5906d9 100644 --- a/models/issues/issue_lock.go +++ b/models/issues/issue_lock.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // IssueLockOptions defines options for locking and/or unlocking an issue/PR diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index 697ef7fad6..3c6ce0ca1c 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -6,12 +6,12 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + project_model "forgejo.org/models/project" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/util" ) // LoadProject load the project the issue was assigned to diff --git a/models/issues/issue_project_test.go b/models/issues/issue_project_test.go index d724922946..f518679f34 100644 --- a/models/issues/issue_project_test.go +++ b/models/issues/issue_project_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/project" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index 6592f3708c..bf4b89ee0b 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -9,13 +9,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go index fdc06b05d1..eee8760b9f 100644 --- a/models/issues/issue_stats.go +++ b/models/issues/issue_stats.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_stats_test.go b/models/issues/issue_stats_test.go index 9967557337..549dc04433 100644 --- a/models/issues/issue_stats_test.go +++ b/models/issues/issue_stats_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index d121435f0a..afca27dfcf 100644 --- a/models/issues/issue_test.go +++ b/models/issues/issue_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index ad59b767ab..9d0bc84454 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -8,20 +8,20 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/references" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/references" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 6b59e0725e..70e162411f 100644 --- a/models/issues/issue_user.go +++ b/models/issues/issue_user.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" ) // IssueUser represents an issue-user relation. diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index e059e43e8b..77e6c5bc5a 100644 --- a/models/issues/issue_user_test.go +++ b/models/issues/issue_user_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/require" ) diff --git a/models/issues/issue_watch.go b/models/issues/issue_watch.go index 560be17eb6..ecc09e1e81 100644 --- a/models/issues/issue_watch.go +++ b/models/issues/issue_watch.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" ) // IssueWatch is connection request for receiving issue notification. diff --git a/models/issues/issue_watch_test.go b/models/issues/issue_watch_test.go index 573215d577..a5c01693fa 100644 --- a/models/issues/issue_watch_test.go +++ b/models/issues/issue_watch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go index 9c9d5d66cd..4c753a58eb 100644 --- a/models/issues/issue_xref.go +++ b/models/issues/issue_xref.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/references" ) type crossReference struct { diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index a24d1b04ee..e74717be1e 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/references" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/references" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/label.go b/models/issues/label.go index cb5fdd577d..264ca8cc3d 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/label" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 3e3d097458..f2ba28a6d2 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/main_test.go b/models/issues/main_test.go index baabd6646a..05d854c964 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/repo" + _ "forgejo.org/models/user" "github.com/stretchr/testify/require" ) diff --git a/models/issues/milestone.go b/models/issues/milestone.go index 03fab8b3ee..52433e735d 100644 --- a/models/issues/milestone.go +++ b/models/issues/milestone.go @@ -9,12 +9,12 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index 955ab2356d..e2079fb324 100644 --- a/models/issues/milestone_list.go +++ b/models/issues/milestone_list.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index c83450e9db..bfb4f38ad0 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/pull.go b/models/issues/pull.go index 708dff9b8e..c46961447c 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -12,17 +12,17 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - org_model "code.gitea.io/gitea/models/organization" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + org_model "forgejo.org/models/organization" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index 123ff18d81..a448673454 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 8e0c020ad9..a2dde055a6 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/reaction.go b/models/issues/reaction.go index 11b3c6be20..522040c022 100644 --- a/models/issues/reaction.go +++ b/models/issues/reaction.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/reaction_test.go b/models/issues/reaction_test.go index e02e6d7e0c..0ae201c500 100644 --- a/models/issues/reaction_test.go +++ b/models/issues/reaction_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/review.go b/models/issues/review.go index cd3190f119..db5cd65e2e 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -9,16 +9,16 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review_list.go b/models/issues/review_list.go index a5ceb21791..45480832d8 100644 --- a/models/issues/review_list.go +++ b/models/issues/review_list.go @@ -6,11 +6,11 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - organization_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + organization_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 51cb940579..33d131c225 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -6,11 +6,11 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/stopwatch.go b/models/issues/stopwatch.go index 68e59d59f4..2ff2a17d92 100644 --- a/models/issues/stopwatch.go +++ b/models/issues/stopwatch.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrIssueStopwatchNotExist represents an error that stopwatch is not exist diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go index af86e8b1d8..8920023a3b 100644 --- a/models/issues/stopwatch_test.go +++ b/models/issues/stopwatch_test.go @@ -7,12 +7,12 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index ea404d36cd..05d7b15815 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -9,11 +9,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index 4d4e232012..770b43abd7 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/main_test.go b/models/main_test.go index f9e019f5e2..0edcf8f49d 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -6,15 +6,15 @@ package models import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/system" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/system" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index 333fa3151f..897ad016ab 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/base/db_test.go b/models/migrations/base/db_test.go index 4010a14311..4a610e065d 100644 --- a/models/migrations/base/db_test.go +++ b/models/migrations/base/db_test.go @@ -6,8 +6,8 @@ package base import ( "testing" - migrations_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" + migrations_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" "xorm.io/xorm/names" ) diff --git a/models/migrations/base/main_test.go b/models/migrations/base/main_test.go index c625ef02b8..2b3889441a 100644 --- a/models/migrations/base/main_test.go +++ b/models/migrations/base/main_test.go @@ -6,7 +6,7 @@ package base import ( "testing" - migrations_tests "code.gitea.io/gitea/models/migrations/test" + migrations_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 1674af08cd..11933014d7 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -8,29 +8,29 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/forgejo_migrations" - "code.gitea.io/gitea/models/migrations/v1_10" - "code.gitea.io/gitea/models/migrations/v1_11" - "code.gitea.io/gitea/models/migrations/v1_12" - "code.gitea.io/gitea/models/migrations/v1_13" - "code.gitea.io/gitea/models/migrations/v1_14" - "code.gitea.io/gitea/models/migrations/v1_15" - "code.gitea.io/gitea/models/migrations/v1_16" - "code.gitea.io/gitea/models/migrations/v1_17" - "code.gitea.io/gitea/models/migrations/v1_18" - "code.gitea.io/gitea/models/migrations/v1_19" - "code.gitea.io/gitea/models/migrations/v1_20" - "code.gitea.io/gitea/models/migrations/v1_21" - "code.gitea.io/gitea/models/migrations/v1_22" - "code.gitea.io/gitea/models/migrations/v1_23" - "code.gitea.io/gitea/models/migrations/v1_6" - "code.gitea.io/gitea/models/migrations/v1_7" - "code.gitea.io/gitea/models/migrations/v1_8" - "code.gitea.io/gitea/models/migrations/v1_9" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - forgejo_services "code.gitea.io/gitea/services/forgejo" + "forgejo.org/models/forgejo_migrations" + "forgejo.org/models/migrations/v1_10" + "forgejo.org/models/migrations/v1_11" + "forgejo.org/models/migrations/v1_12" + "forgejo.org/models/migrations/v1_13" + "forgejo.org/models/migrations/v1_14" + "forgejo.org/models/migrations/v1_15" + "forgejo.org/models/migrations/v1_16" + "forgejo.org/models/migrations/v1_17" + "forgejo.org/models/migrations/v1_18" + "forgejo.org/models/migrations/v1_19" + "forgejo.org/models/migrations/v1_20" + "forgejo.org/models/migrations/v1_21" + "forgejo.org/models/migrations/v1_22" + "forgejo.org/models/migrations/v1_23" + "forgejo.org/models/migrations/v1_6" + "forgejo.org/models/migrations/v1_7" + "forgejo.org/models/migrations/v1_8" + "forgejo.org/models/migrations/v1_9" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + forgejo_services "forgejo.org/services/forgejo" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go index 78c2898996..ea941b9a09 100644 --- a/models/migrations/migrations_test.go +++ b/models/migrations/migrations_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/test/tests.go b/models/migrations/test/tests.go index 177e33c56a..07487cf58a 100644 --- a/models/migrations/test/tests.go +++ b/models/migrations/test/tests.go @@ -15,14 +15,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go index 34c8240031..3bfb770f24 100644 --- a/models/migrations/v1_10/v96.go +++ b/models/migrations/v1_10/v96.go @@ -6,8 +6,8 @@ package v1_10 //nolint import ( "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go index ebe6597f7c..7f287b77aa 100644 --- a/models/migrations/v1_10/v99.go +++ b/models/migrations/v1_10/v99.go @@ -4,7 +4,7 @@ package v1_10 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go index 9358e4cef3..a585d9c423 100644 --- a/models/migrations/v1_11/v102.go +++ b/models/migrations/v1_11/v102.go @@ -4,7 +4,7 @@ package v1_11 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go index 3e8ee64bc1..af3578ca4a 100644 --- a/models/migrations/v1_11/v104.go +++ b/models/migrations/v1_11/v104.go @@ -4,7 +4,7 @@ package v1_11 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go index 0857663119..6112ab51a5 100644 --- a/models/migrations/v1_11/v112.go +++ b/models/migrations/v1_11/v112.go @@ -7,8 +7,8 @@ import ( "fmt" "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go index 8c631cfd0b..3d4b41017b 100644 --- a/models/migrations/v1_11/v115.go +++ b/models/migrations/v1_11/v115.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go index 00e391dc87..11a4042973 100644 --- a/models/migrations/v1_12/v127.go +++ b/models/migrations/v1_12/v127.go @@ -6,7 +6,7 @@ package v1_12 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index 6eea1337ef..6d7307f470 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go index 391810c7ca..bfa856796a 100644 --- a/models/migrations/v1_12/v130.go +++ b/models/migrations/v1_12/v130.go @@ -4,8 +4,8 @@ package v1_12 //nolint import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index 23c2916ba8..bba996fd40 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go index d91ff92feb..db6fc6dea1 100644 --- a/models/migrations/v1_12/v136.go +++ b/models/migrations/v1_12/v136.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index 5b6576951d..cd7963524e 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -4,7 +4,7 @@ package v1_12 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index 2d3337012d..d74f808e9f 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -6,8 +6,8 @@ package v1_13 //nolint import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go index 7c7c01ad47..7490e0f3b4 100644 --- a/models/migrations/v1_13/v142.go +++ b/models/migrations/v1_13/v142.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go index 885768dff3..1f9120e2ba 100644 --- a/models/migrations/v1_13/v143.go +++ b/models/migrations/v1_13/v143.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go index f5a0bc5751..7e801eab8a 100644 --- a/models/migrations/v1_13/v144.go +++ b/models/migrations/v1_13/v144.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index 5b38f1cd80..a01f577ed1 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -6,7 +6,7 @@ package v1_13 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go index 7d9a878704..a1b54ee3aa 100644 --- a/models/migrations/v1_13/v146.go +++ b/models/migrations/v1_13/v146.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go index 510ef39b28..cc57504c74 100644 --- a/models/migrations/v1_13/v147.go +++ b/models/migrations/v1_13/v147.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go index 2a1db04cbb..3a0c5909d5 100644 --- a/models/migrations/v1_13/v149.go +++ b/models/migrations/v1_13/v149.go @@ -6,7 +6,7 @@ package v1_13 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go index d5ba489566..be14fd130c 100644 --- a/models/migrations/v1_13/v150.go +++ b/models/migrations/v1_13/v150.go @@ -4,8 +4,8 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index ea4a8eae31..60339962cb 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go index 60cc56713e..cf31190781 100644 --- a/models/migrations/v1_13/v154.go +++ b/models/migrations/v1_13/v154.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go index cf7fcb56a6..c01faedc35 100644 --- a/models/migrations/v1_14/main_test.go +++ b/models/migrations/v1_14/main_test.go @@ -6,7 +6,7 @@ package v1_14 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go index 2cf4954a15..b6dc91a054 100644 --- a/models/migrations/v1_14/v156.go +++ b/models/migrations/v1_14/v156.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 2d688b1706..9849d5a9ea 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -7,8 +7,8 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go index 149ae0f6a8..fdd7e12449 100644 --- a/models/migrations/v1_14/v159.go +++ b/models/migrations/v1_14/v159.go @@ -4,8 +4,8 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go index ac7e821a80..6e904cfab6 100644 --- a/models/migrations/v1_14/v161.go +++ b/models/migrations/v1_14/v161.go @@ -6,7 +6,7 @@ package v1_14 //nolint import ( "context" - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go index 2e4e0b8eb0..5d6d7c2e3f 100644 --- a/models/migrations/v1_14/v162.go +++ b/models/migrations/v1_14/v162.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go index 0cd8ba68c8..60fc98c0a4 100644 --- a/models/migrations/v1_14/v163.go +++ b/models/migrations/v1_14/v163.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go index 5b1a779294..9315e44197 100644 --- a/models/migrations/v1_14/v165.go +++ b/models/migrations/v1_14/v165.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go index 0f9bef902a..d49b70f5ad 100644 --- a/models/migrations/v1_14/v172.go +++ b/models/migrations/v1_14/v172.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index 70d72b2600..3cda5772a0 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -7,8 +7,8 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go index f5e644e501..d88ff207e7 100644 --- a/models/migrations/v1_14/v176_test.go +++ b/models/migrations/v1_14/v176_test.go @@ -6,7 +6,7 @@ package v1_14 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go index cf5e745d39..199a71186a 100644 --- a/models/migrations/v1_14/v177_test.go +++ b/models/migrations/v1_14/v177_test.go @@ -6,8 +6,8 @@ package v1_14 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go index e4960658d3..6c04d3f5ee 100644 --- a/models/migrations/v1_15/main_test.go +++ b/models/migrations/v1_15/main_test.go @@ -6,7 +6,7 @@ package v1_15 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go index f6b142eb42..b990583303 100644 --- a/models/migrations/v1_15/v179.go +++ b/models/migrations/v1_15/v179.go @@ -4,7 +4,7 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go index c71e771861..02fbd57cdb 100644 --- a/models/migrations/v1_15/v180.go +++ b/models/migrations/v1_15/v180.go @@ -4,8 +4,8 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go index ead26f5fcf..4544ca6520 100644 --- a/models/migrations/v1_15/v181_test.go +++ b/models/migrations/v1_15/v181_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go index eb21311339..6865cafac4 100644 --- a/models/migrations/v1_15/v182_test.go +++ b/models/migrations/v1_15/v182_test.go @@ -6,7 +6,7 @@ package v1_15 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go index effad1b467..aaad64c220 100644 --- a/models/migrations/v1_15/v183.go +++ b/models/migrations/v1_15/v183.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 871c9db18a..41b64d4743 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go index 01aab3add5..ad75822de5 100644 --- a/models/migrations/v1_15/v186.go +++ b/models/migrations/v1_15/v186.go @@ -4,7 +4,7 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go index 21cd6772b7..b573fc52ef 100644 --- a/models/migrations/v1_15/v187.go +++ b/models/migrations/v1_15/v187.go @@ -4,7 +4,7 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go index 49611776dd..6f891f3e94 100644 --- a/models/migrations/v1_16/main_test.go +++ b/models/migrations/v1_16/main_test.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go index 5649645051..1ee72d9c39 100644 --- a/models/migrations/v1_16/v189.go +++ b/models/migrations/v1_16/v189.go @@ -7,8 +7,8 @@ import ( "encoding/binary" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go index 88c6ebd2b1..e72c385168 100644 --- a/models/migrations/v1_16/v189_test.go +++ b/models/migrations/v1_16/v189_test.go @@ -6,8 +6,8 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/json" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index c618783c08..567f88d6d1 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -4,7 +4,7 @@ package v1_16 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go index 2d5d158a09..731b9fb43a 100644 --- a/models/migrations/v1_16/v192.go +++ b/models/migrations/v1_16/v192.go @@ -4,7 +4,7 @@ package v1_16 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go index 0da670888b..ab39bcd98c 100644 --- a/models/migrations/v1_16/v193_test.go +++ b/models/migrations/v1_16/v193_test.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go index 9a62fc9649..71234a6fb3 100644 --- a/models/migrations/v1_16/v195_test.go +++ b/models/migrations/v1_16/v195_test.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go index 115bb313a0..8b3c73addc 100644 --- a/models/migrations/v1_16/v198.go +++ b/models/migrations/v1_16/v198.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go index d6c577083c..a064b9830d 100644 --- a/models/migrations/v1_16/v205.go +++ b/models/migrations/v1_16/v205.go @@ -4,7 +4,7 @@ package v1_16 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go index db45b11aed..375a008e18 100644 --- a/models/migrations/v1_16/v210.go +++ b/models/migrations/v1_16/v210.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go index 7321350de2..010cd8a770 100644 --- a/models/migrations/v1_16/v210_test.go +++ b/models/migrations/v1_16/v210_test.go @@ -7,8 +7,8 @@ import ( "encoding/hex" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go index 8a787f68b6..0a8e05ab5f 100644 --- a/models/migrations/v1_17/main_test.go +++ b/models/migrations/v1_17/main_test.go @@ -6,7 +6,7 @@ package v1_17 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go index e3f9437121..2337adcc80 100644 --- a/models/migrations/v1_17/v212.go +++ b/models/migrations/v1_17/v212.go @@ -4,7 +4,7 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go index b338f85417..5aae798562 100644 --- a/models/migrations/v1_17/v215.go +++ b/models/migrations/v1_17/v215.go @@ -4,8 +4,8 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/pull" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index 3f970b68a5..5f096d4824 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -4,7 +4,7 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index 4c05a9b539..5e3dcd0841 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -4,8 +4,8 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go index d266029fd9..e90656090f 100644 --- a/models/migrations/v1_17/v219.go +++ b/models/migrations/v1_17/v219.go @@ -6,8 +6,8 @@ package v1_17 //nolint import ( "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/repo" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go index d4007163ab..61bbf19725 100644 --- a/models/migrations/v1_17/v220.go +++ b/models/migrations/v1_17/v220.go @@ -4,8 +4,8 @@ package v1_17 //nolint import ( - packages_model "code.gitea.io/gitea/models/packages" - container_module "code.gitea.io/gitea/modules/packages/container" + packages_model "forgejo.org/models/packages" + container_module "forgejo.org/modules/packages/container" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go index 9e159388bd..84e9a238af 100644 --- a/models/migrations/v1_17/v221.go +++ b/models/migrations/v1_17/v221.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go index 0f6db2a54f..02607d6b32 100644 --- a/models/migrations/v1_17/v221_test.go +++ b/models/migrations/v1_17/v221_test.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go index 2ffb94eb1c..c9a33f007d 100644 --- a/models/migrations/v1_17/v222.go +++ b/models/migrations/v1_17/v222.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index 3592eb1be6..7d92dcf5ae 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go index 329aa2003a..33f5c51222 100644 --- a/models/migrations/v1_18/main_test.go +++ b/models/migrations/v1_18/main_test.go @@ -6,7 +6,7 @@ package v1_18 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index b0ac3777fc..86bcb1323d 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -4,7 +4,7 @@ package v1_18 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go index 5fe5dcd0c9..b6250fb76c 100644 --- a/models/migrations/v1_18/v227.go +++ b/models/migrations/v1_18/v227.go @@ -4,7 +4,7 @@ package v1_18 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go index 3e7a36de15..1161c8a4c9 100644 --- a/models/migrations/v1_18/v228.go +++ b/models/migrations/v1_18/v228.go @@ -4,7 +4,7 @@ package v1_18 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go index 10d9f35097..f96dde9840 100644 --- a/models/migrations/v1_18/v229.go +++ b/models/migrations/v1_18/v229.go @@ -6,7 +6,7 @@ package v1_18 //nolint import ( "fmt" - "code.gitea.io/gitea/models/issues" + "forgejo.org/models/issues" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go index b20d0ff3a2..ac5e726a79 100644 --- a/models/migrations/v1_18/v229_test.go +++ b/models/migrations/v1_18/v229_test.go @@ -6,8 +6,8 @@ package v1_18 //nolint import ( "testing" - "code.gitea.io/gitea/models/issues" - migration_tests "code.gitea.io/gitea/models/migrations/test" + "forgejo.org/models/issues" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go index 82b3b8f2b0..7dd6675673 100644 --- a/models/migrations/v1_18/v230_test.go +++ b/models/migrations/v1_18/v230_test.go @@ -6,7 +6,7 @@ package v1_18 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go index 18696a7f69..7c56926f4c 100644 --- a/models/migrations/v1_19/main_test.go +++ b/models/migrations/v1_19/main_test.go @@ -6,7 +6,7 @@ package v1_19 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index 9caf587c1e..7fb4a5ac8d 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go index ba4cd8e20b..191afd4868 100644 --- a/models/migrations/v1_19/v233.go +++ b/models/migrations/v1_19/v233.go @@ -6,10 +6,10 @@ package v1_19 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/json" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go index 94e9bc3a11..de025ca2b7 100644 --- a/models/migrations/v1_19/v233_test.go +++ b/models/migrations/v1_19/v233_test.go @@ -6,11 +6,11 @@ package v1_19 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - webhook_module "code.gitea.io/gitea/modules/webhook" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/json" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go index 728a580807..c610a423dd 100644 --- a/models/migrations/v1_19/v234.go +++ b/models/migrations/v1_19/v234.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go index f172a85b1f..fa01a6ab80 100644 --- a/models/migrations/v1_19/v236.go +++ b/models/migrations/v1_19/v236.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 266e6cea58..7c912a8341 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 4505f86299..4ca5becede 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -4,8 +4,8 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index 4470835214..bbf227ef77 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go index e8d95b0e1e..f870dca429 100644 --- a/models/migrations/v1_20/main_test.go +++ b/models/migrations/v1_20/main_test.go @@ -6,7 +6,7 @@ package v1_20 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go index b0d4c21502..7e6585388b 100644 --- a/models/migrations/v1_20/v245.go +++ b/models/migrations/v1_20/v245.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go index 59fc5c46b5..9ed810a623 100644 --- a/models/migrations/v1_20/v247.go +++ b/models/migrations/v1_20/v247.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go index 02951a74d6..d2b096bf58 100644 --- a/models/migrations/v1_20/v249.go +++ b/models/migrations/v1_20/v249.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go index 86388ef0b8..cfcde2fc9b 100644 --- a/models/migrations/v1_20/v250.go +++ b/models/migrations/v1_20/v250.go @@ -6,7 +6,7 @@ package v1_20 //nolint import ( "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go index 7743248a3f..c8665ba7eb 100644 --- a/models/migrations/v1_20/v251.go +++ b/models/migrations/v1_20/v251.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go index ab61cd9b8b..bb85c78309 100644 --- a/models/migrations/v1_20/v252.go +++ b/models/migrations/v1_20/v252.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go index 96c494bd8d..5f4057e9d9 100644 --- a/models/migrations/v1_20/v253.go +++ b/models/migrations/v1_20/v253.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go index 14b70f8f96..49b0ecf220 100644 --- a/models/migrations/v1_20/v255.go +++ b/models/migrations/v1_20/v255.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go index 6c6ca4c748..70f229d73f 100644 --- a/models/migrations/v1_20/v257.go +++ b/models/migrations/v1_20/v257.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go index 5b8ced4ad7..f10b94fa9c 100644 --- a/models/migrations/v1_20/v259.go +++ b/models/migrations/v1_20/v259.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go index ae219ea814..d67cc9dd81 100644 --- a/models/migrations/v1_20/v259_test.go +++ b/models/migrations/v1_20/v259_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go index 0148170458..7104887afb 100644 --- a/models/migrations/v1_21/main_test.go +++ b/models/migrations/v1_21/main_test.go @@ -6,7 +6,7 @@ package v1_21 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index 6ca52c5998..245f3011ab 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -4,7 +4,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go index 4ec1160d0b..743bef152d 100644 --- a/models/migrations/v1_21/v261.go +++ b/models/migrations/v1_21/v261.go @@ -4,7 +4,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go index e81a17ad6d..88eaf0d918 100644 --- a/models/migrations/v1_21/v264.go +++ b/models/migrations/v1_21/v264.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go index bc0e954bdc..f94696a22b 100644 --- a/models/migrations/v1_21/v267.go +++ b/models/migrations/v1_21/v267.go @@ -4,7 +4,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go index 098f6499d5..f45c113c1f 100644 --- a/models/migrations/v1_21/v271.go +++ b/models/migrations/v1_21/v271.go @@ -3,7 +3,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go index 61c79f4a76..1ec6ade566 100644 --- a/models/migrations/v1_21/v273.go +++ b/models/migrations/v1_21/v273.go @@ -3,7 +3,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go index df5994f159..b74e5fed51 100644 --- a/models/migrations/v1_21/v274.go +++ b/models/migrations/v1_21/v274.go @@ -5,7 +5,7 @@ package v1_21 //nolint import ( "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go index 67e950177d..0830c3bd92 100644 --- a/models/migrations/v1_21/v276.go +++ b/models/migrations/v1_21/v276.go @@ -4,8 +4,8 @@ package v1_21 //nolint import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go index 2005789b6d..dc991b78fe 100644 --- a/models/migrations/v1_22/main_test.go +++ b/models/migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go index fc1866aa83..5271c786be 100644 --- a/models/migrations/v1_22/v281.go +++ b/models/migrations/v1_22/v281.go @@ -4,7 +4,7 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go index 5f6c04a881..d8e147a131 100644 --- a/models/migrations/v1_22/v283_test.go +++ b/models/migrations/v1_22/v283_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index 97ff649dca..d0489e7aeb 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -5,8 +5,8 @@ package v1_22 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go index 76b00e5b14..e6f8d4096e 100644 --- a/models/migrations/v1_22/v286_test.go +++ b/models/migrations/v1_22/v286_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go index 7c93bfcc66..44e4991851 100644 --- a/models/migrations/v1_22/v288.go +++ b/models/migrations/v1_22/v288.go @@ -4,7 +4,7 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v290.go b/models/migrations/v1_22/v290.go index e3c58b0515..594e417644 100644 --- a/models/migrations/v1_22/v290.go +++ b/models/migrations/v1_22/v290.go @@ -4,8 +4,8 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v290_test.go b/models/migrations/v1_22/v290_test.go index ced200f83f..569d77bc16 100644 --- a/models/migrations/v1_22/v290_test.go +++ b/models/migrations/v1_22/v290_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go index 53cc719294..9f38c3db56 100644 --- a/models/migrations/v1_22/v293.go +++ b/models/migrations/v1_22/v293.go @@ -4,8 +4,8 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go index 85bb46421b..444146737d 100644 --- a/models/migrations/v1_22/v293_test.go +++ b/models/migrations/v1_22/v293_test.go @@ -6,9 +6,9 @@ package v1_22 //nolint import ( "testing" - "code.gitea.io/gitea/models/db" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/models/project" + "forgejo.org/models/db" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/models/project" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go index c465d53738..ef7b67ca5b 100644 --- a/models/migrations/v1_22/v294_test.go +++ b/models/migrations/v1_22/v294_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go index e3425e4625..0fd90a4a67 100644 --- a/models/migrations/v1_23/main_test.go +++ b/models/migrations/v1_23/main_test.go @@ -6,7 +6,7 @@ package v1_23 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go index d7ea03eb3d..c8ed786d63 100644 --- a/models/migrations/v1_23/v302.go +++ b/models/migrations/v1_23/v302.go @@ -4,7 +4,7 @@ package v1_23 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go index 2fb37ac843..fae0131bdd 100644 --- a/models/migrations/v1_23/v303.go +++ b/models/migrations/v1_23/v303.go @@ -4,7 +4,7 @@ package v1_23 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_23/v303_test.go b/models/migrations/v1_23/v303_test.go index 752eacee0c..f105d11830 100644 --- a/models/migrations/v1_23/v303_test.go +++ b/models/migrations/v1_23/v303_test.go @@ -6,7 +6,7 @@ package v1_23 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/require" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go index 74434a84a1..ec6bd09bb5 100644 --- a/models/migrations/v1_6/v70.go +++ b/models/migrations/v1_6/v70.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go index 586187228b..3706ad4406 100644 --- a/models/migrations/v1_6/v71.go +++ b/models/migrations/v1_6/v71.go @@ -6,9 +6,9 @@ package v1_6 //nolint import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go index 04cef9a170..4df2a0f6e9 100644 --- a/models/migrations/v1_6/v72.go +++ b/models/migrations/v1_6/v72.go @@ -6,7 +6,7 @@ package v1_6 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go index d3fbd94deb..61ad006a47 100644 --- a/models/migrations/v1_8/v76.go +++ b/models/migrations/v1_8/v76.go @@ -6,7 +6,7 @@ package v1_8 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go index 8f041c1484..8102b19335 100644 --- a/models/migrations/v1_8/v78.go +++ b/models/migrations/v1_8/v78.go @@ -4,7 +4,7 @@ package v1_8 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go index eb3a9ed0f4..f7d2d68f96 100644 --- a/models/migrations/v1_8/v79.go +++ b/models/migrations/v1_8/v79.go @@ -4,7 +4,7 @@ package v1_8 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go index 26806dd645..78a90bdde9 100644 --- a/models/migrations/v1_9/v82.go +++ b/models/migrations/v1_9/v82.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go index 10e6c45875..fa24a92d28 100644 --- a/models/migrations/v1_9/v83.go +++ b/models/migrations/v1_9/v83.go @@ -4,7 +4,7 @@ package v1_9 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go index a23d7c5d6e..d8e9d91840 100644 --- a/models/migrations/v1_9/v85.go +++ b/models/migrations/v1_9/v85.go @@ -6,10 +6,10 @@ package v1_9 //nolint import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/org.go b/models/org.go index 5f61f05b16..6e191acff0 100644 --- a/models/org.go +++ b/models/org.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" ) // RemoveOrgUser removes user from given organization. diff --git a/models/org_team.go b/models/org_team.go index 1a452436c3..ecda43f0a9 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -9,16 +9,16 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/org_team_test.go b/models/org_team_test.go index 2819607e12..dc1fdb4b3b 100644 --- a/models/org_team_test.go +++ b/models/org_team_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/org_test.go b/models/org_test.go index bb5e524ec9..45e21da0e0 100644 --- a/models/org_test.go +++ b/models/org_test.go @@ -6,10 +6,10 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/main_test.go b/models/organization/main_test.go index 96eeadafa9..dd10b60d30 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -6,15 +6,15 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/organization" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/organization" + _ "forgejo.org/models/repo" + _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/organization/org.go b/models/organization/org.go index d7269c7166..1339f7415d 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -9,17 +9,17 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + secret_model "forgejo.org/models/secret" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/organization/org_list.go b/models/organization/org_list.go index 7f31b49ccd..4bca3cdb99 100644 --- a/models/organization/org_list.go +++ b/models/organization/org_list.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "xorm.io/builder" ) diff --git a/models/organization/org_list_test.go b/models/organization/org_list_test.go index aa5b1f2636..0e27feee59 100644 --- a/models/organization/org_list_test.go +++ b/models/organization/org_list_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/org_repo.go b/models/organization/org_repo.go index f7e59928f4..f190a38bda 100644 --- a/models/organization/org_repo.go +++ b/models/organization/org_repo.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" ) // GetOrgRepositories get repos belonging to the given organization diff --git a/models/organization/org_test.go b/models/organization/org_test.go index 7a67d9f822..212b893a42 100644 --- a/models/organization/org_test.go +++ b/models/organization/org_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/org_user.go b/models/organization/org_user.go index 5fe3a178d2..81671c5cf5 100644 --- a/models/organization/org_user.go +++ b/models/organization/org_user.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go index 336bf1a5a4..3f6799e8a1 100644 --- a/models/organization/org_user_test.go +++ b/models/organization/org_user_test.go @@ -7,11 +7,11 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/team.go b/models/organization/team.go index 5065a1a1d5..450082077f 100644 --- a/models/organization/team.go +++ b/models/organization/team.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite.go b/models/organization/team_invite.go index 17f6c59610..45be6c4c64 100644 --- a/models/organization/team_invite.go +++ b/models/organization/team_invite.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite_test.go b/models/organization/team_invite_test.go index cbabf79b49..8d55864237 100644 --- a/models/organization/team_invite_test.go +++ b/models/organization/team_invite_test.go @@ -6,10 +6,10 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/team_list.go b/models/organization/team_list.go index 5b45429acf..573fd4ef96 100644 --- a/models/organization/team_list.go +++ b/models/organization/team_list.go @@ -7,10 +7,10 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go index 1184e39263..334b139808 100644 --- a/models/organization/team_repo.go +++ b/models/organization/team_repo.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" "xorm.io/builder" ) diff --git a/models/organization/team_test.go b/models/organization/team_test.go index 64cc68b064..0237f76de8 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index b5237c2c58..b45ac2fc07 100644 --- a/models/organization/team_unit.go +++ b/models/organization/team_unit.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" ) // TeamUnit describes all units of a repository diff --git a/models/organization/team_user.go b/models/organization/team_user.go index f7fa136498..a954e94767 100644 --- a/models/organization/team_user.go +++ b/models/organization/team_user.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/packages/alpine/search.go b/models/packages/alpine/search.go index 77eccb90ed..1cc808d18d 100644 --- a/models/packages/alpine/search.go +++ b/models/packages/alpine/search.go @@ -6,8 +6,8 @@ package alpine import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" + packages_model "forgejo.org/models/packages" + alpine_module "forgejo.org/modules/packages/alpine" ) // GetBranches gets all available branches diff --git a/models/packages/alt/search.go b/models/packages/alt/search.go index a9a0d524d3..0bfba77e0e 100644 --- a/models/packages/alt/search.go +++ b/models/packages/alt/search.go @@ -6,8 +6,8 @@ package alt import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" + packages_model "forgejo.org/models/packages" + rpm_module "forgejo.org/modules/packages/rpm" ) type PackageSearchOptions struct { diff --git a/models/packages/conan/references.go b/models/packages/conan/references.go index 0d888a1ec8..5e09c4b63f 100644 --- a/models/packages/conan/references.go +++ b/models/packages/conan/references.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/packages" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/conan/search.go b/models/packages/conan/search.go index ab0bff5968..3ef8b4cceb 100644 --- a/models/packages/conan/search.go +++ b/models/packages/conan/search.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/container" - conan_module "code.gitea.io/gitea/modules/packages/conan" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/modules/container" + conan_module "forgejo.org/modules/packages/conan" "xorm.io/builder" ) diff --git a/models/packages/conda/search.go b/models/packages/conda/search.go index 887441e3b2..147de1aa02 100644 --- a/models/packages/conda/search.go +++ b/models/packages/conda/search.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" + "forgejo.org/models/db" + "forgejo.org/models/packages" + conda_module "forgejo.org/modules/packages/conda" "xorm.io/builder" ) diff --git a/models/packages/container/search.go b/models/packages/container/search.go index 5df35117ce..1dab7c7b79 100644 --- a/models/packages/container/search.go +++ b/models/packages/container/search.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/cran/search.go b/models/packages/cran/search.go index 8a8b52a35e..35525dfd55 100644 --- a/models/packages/cran/search.go +++ b/models/packages/cran/search.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" + "forgejo.org/models/db" + "forgejo.org/models/packages" + cran_module "forgejo.org/modules/packages/cran" "xorm.io/builder" ) diff --git a/models/packages/debian/search.go b/models/packages/debian/search.go index abf23e42f6..a434a06d2a 100644 --- a/models/packages/debian/search.go +++ b/models/packages/debian/search.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/packages" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/modules/setting" "xorm.io/builder" ) diff --git a/models/packages/debian/search_test.go b/models/packages/debian/search_test.go index 949094d8c1..b8ed98d8fa 100644 --- a/models/packages/debian/search_test.go +++ b/models/packages/debian/search_test.go @@ -7,19 +7,19 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + packages_service "forgejo.org/services/packages" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index 31ab84fd68..19e0e8f5d5 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -9,30 +9,30 @@ import ( "fmt" "net/url" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/packages/alpine" + "forgejo.org/modules/packages/arch" + "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/packages/chef" + "forgejo.org/modules/packages/composer" + "forgejo.org/modules/packages/conan" + "forgejo.org/modules/packages/conda" + "forgejo.org/modules/packages/container" + "forgejo.org/modules/packages/cran" + "forgejo.org/modules/packages/debian" + "forgejo.org/modules/packages/helm" + "forgejo.org/modules/packages/maven" + "forgejo.org/modules/packages/npm" + "forgejo.org/modules/packages/nuget" + "forgejo.org/modules/packages/pub" + "forgejo.org/modules/packages/pypi" + "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/packages/rubygems" + "forgejo.org/modules/packages/swift" + "forgejo.org/modules/packages/vagrant" + "forgejo.org/modules/util" "github.com/hashicorp/go-version" ) diff --git a/models/packages/nuget/search.go b/models/packages/nuget/search.go index 7a505ff08f..af83c27c66 100644 --- a/models/packages/nuget/search.go +++ b/models/packages/nuget/search.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" "xorm.io/builder" ) diff --git a/models/packages/package.go b/models/packages/package.go index 874c7c2847..3b01d0b1ea 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index 439178a14e..e86f652540 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob_upload.go b/models/packages/package_blob_upload.go index 4b0e789221..ddffb6c305 100644 --- a/models/packages/package_blob_upload.go +++ b/models/packages/package_blob_upload.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrPackageBlobUploadNotExist indicates a package blob upload not exist error diff --git a/models/packages/package_cleanup_rule.go b/models/packages/package_cleanup_rule.go index fa12dec406..d0765c8492 100644 --- a/models/packages/package_cleanup_rule.go +++ b/models/packages/package_cleanup_rule.go @@ -8,9 +8,9 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_file.go b/models/packages/package_file.go index 1bb6b57a34..d4bcc2859a 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_property.go b/models/packages/package_property.go index e0170016cf..c4e7be342b 100644 --- a/models/packages/package_property.go +++ b/models/packages/package_property.go @@ -6,7 +6,7 @@ package packages import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 5b9b9b7403..ab2d49c94c 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -7,16 +7,16 @@ package packages_test import ( "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/require" ) diff --git a/models/packages/package_version.go b/models/packages/package_version.go index 278e8e3a86..79086ff1ad 100644 --- a/models/packages/package_version.go +++ b/models/packages/package_version.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/rpm/search.go b/models/packages/rpm/search.go index e697421b49..d4f065a89e 100644 --- a/models/packages/rpm/search.go +++ b/models/packages/rpm/search.go @@ -6,8 +6,8 @@ package rpm import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" + packages_model "forgejo.org/models/packages" + rpm_module "forgejo.org/modules/packages/rpm" ) // GetGroups gets all available groups diff --git a/models/perm/access/access.go b/models/perm/access/access.go index 3e2568b4b4..76b547f772 100644 --- a/models/perm/access/access.go +++ b/models/perm/access/access.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/perm/access/access_test.go b/models/perm/access/access_test.go index 556f51311c..00939bced6 100644 --- a/models/perm/access/access_test.go +++ b/models/perm/access/access_test.go @@ -6,12 +6,12 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/db" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index da6f03715f..0c27d022e0 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -6,14 +6,14 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/repo" + _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index 7e39627a75..ce9963b83a 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/organization" + perm_model "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" ) // Permission contains all the permissions related variables to a repository for a user diff --git a/models/project/column.go b/models/project/column.go index 4757b61677..52917cb9fd 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -9,10 +9,10 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/project/column_test.go b/models/project/column_test.go index fb6dc77126..2ef27de3b5 100644 --- a/models/project/column_test.go +++ b/models/project/column_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/project/issue.go b/models/project/issue.go index 984f47ee7c..9e9db19004 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // ProjectIssue saves relation from issue to a project diff --git a/models/project/main_test.go b/models/project/main_test.go index f4b2d6feda..eaa13bf309 100644 --- a/models/project/main_test.go +++ b/models/project/main_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/repo" + _ "forgejo.org/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/project/project.go b/models/project/project.go index 6c2b02487d..b9813fda91 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -8,14 +8,14 @@ import ( "fmt" "html/template" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/project/project_test.go b/models/project/project_test.go index cef2ea17bd..ee9fdaa2e2 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/pull/automerge.go b/models/pull/automerge.go index d739d5a145..63f572309b 100644 --- a/models/pull/automerge.go +++ b/models/pull/automerge.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" ) // AutoMerge represents a pull request scheduled for merging when checks succeed diff --git a/models/pull/review_state.go b/models/pull/review_state.go index e46a22a49d..2702d5d5a1 100644 --- a/models/pull/review_state.go +++ b/models/pull/review_state.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // ViewedState stores for a file in which state it is currently viewed diff --git a/models/quota/default.go b/models/quota/default.go index e53e47bade..9f655d7847 100644 --- a/models/quota/default.go +++ b/models/quota/default.go @@ -4,7 +4,7 @@ package quota import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func EvaluateDefault(used Used, forSubject LimitSubject) (bool, int64) { diff --git a/models/quota/group.go b/models/quota/group.go index 50080748a1..7ddc20b2d6 100644 --- a/models/quota/group.go +++ b/models/quota/group.go @@ -7,9 +7,9 @@ import ( "context" "math" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "xorm.io/builder" ) diff --git a/models/quota/quota.go b/models/quota/quota.go index ee3fec6c1a..9f1c3ca949 100644 --- a/models/quota/quota.go +++ b/models/quota/quota.go @@ -6,8 +6,8 @@ package quota import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/setting" ) func init() { diff --git a/models/quota/quota_group_test.go b/models/quota/quota_group_test.go index edbf43fcf5..7f693b391b 100644 --- a/models/quota/quota_group_test.go +++ b/models/quota/quota_group_test.go @@ -7,7 +7,7 @@ import ( "math" "testing" - quota_model "code.gitea.io/gitea/models/quota" + quota_model "forgejo.org/models/quota" "github.com/stretchr/testify/assert" ) diff --git a/models/quota/quota_rule_test.go b/models/quota/quota_rule_test.go index 1e1daf4c4a..59c05563f0 100644 --- a/models/quota/quota_rule_test.go +++ b/models/quota/quota_rule_test.go @@ -6,7 +6,7 @@ package quota_test import ( "testing" - quota_model "code.gitea.io/gitea/models/quota" + quota_model "forgejo.org/models/quota" "github.com/stretchr/testify/assert" ) diff --git a/models/quota/rule.go b/models/quota/rule.go index cb23b74b52..89cb57cace 100644 --- a/models/quota/rule.go +++ b/models/quota/rule.go @@ -7,7 +7,7 @@ import ( "context" "slices" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) type Rule struct { diff --git a/models/quota/used.go b/models/quota/used.go index ff84ac20f8..4a1bc84c0a 100644 --- a/models/quota/used.go +++ b/models/quota/used.go @@ -6,10 +6,10 @@ package quota import ( "context" - action_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - package_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" + action_model "forgejo.org/models/actions" + "forgejo.org/models/db" + package_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" "xorm.io/builder" ) diff --git a/models/repo.go b/models/repo.go index 598f8df6a4..6f7ae25615 100644 --- a/models/repo.go +++ b/models/repo.go @@ -11,14 +11,14 @@ import ( _ "image/jpeg" // Needed for jpeg support - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/models/repo/archive_download_count.go b/models/repo/archive_download_count.go index b0735df3ea..8e2df21198 100644 --- a/models/repo/archive_download_count.go +++ b/models/repo/archive_download_count.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" ) // RepoArchiveDownloadCount counts all archive downloads for a tag diff --git a/models/repo/archive_download_count_test.go b/models/repo/archive_download_count_test.go index ffc6cdf6df..0faf515284 100644 --- a/models/repo/archive_download_count_test.go +++ b/models/repo/archive_download_count_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/archiver.go b/models/repo/archiver.go index 3f05fcf752..2d0172a163 100644 --- a/models/repo/archiver.go +++ b/models/repo/archiver.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index b95d785fa5..3bf51e80ca 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -9,12 +9,12 @@ import ( "net/url" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" ) // Attachment represent a attachment of issue/comment/release. diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go index 881a40c3e7..23f4b3799f 100644 --- a/models/repo/attachment_test.go +++ b/models/repo/attachment_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/avatar.go b/models/repo/avatar.go index 72ee938ada..a108fda62d 100644 --- a/models/repo/avatar.go +++ b/models/repo/avatar.go @@ -11,11 +11,11 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // CustomAvatarRelativePath returns repository custom avatar file path. diff --git a/models/repo/collaboration.go b/models/repo/collaboration.go index cb66cb56a6..16d10d38b6 100644 --- a/models/repo/collaboration.go +++ b/models/repo/collaboration.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index 5adedfe442..783091ba9e 100644 --- a/models/repo/collaboration_test.go +++ b/models/repo/collaboration_test.go @@ -6,12 +6,12 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/following_repo.go b/models/repo/following_repo.go index 85b96aa147..f9b9bf5e5e 100644 --- a/models/repo/following_repo.go +++ b/models/repo/following_repo.go @@ -4,7 +4,7 @@ package repo import ( - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) // FollowingRepo represents a federated Repository Actor connected with a local Repo diff --git a/models/repo/following_repo_test.go b/models/repo/following_repo_test.go index d0dd0a31a7..cff125dabe 100644 --- a/models/repo/following_repo_test.go +++ b/models/repo/following_repo_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_FollowingRepoValidation(t *testing.T) { diff --git a/models/repo/fork.go b/models/repo/fork.go index 632e91c2bb..ed8b488738 100644 --- a/models/repo/fork.go +++ b/models/repo/fork.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/repo/fork_test.go b/models/repo/fork_test.go index dd12429cc4..d567081ee6 100644 --- a/models/repo/fork_test.go +++ b/models/repo/fork_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/git.go b/models/repo/git.go index d39915e869..692176c8f6 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // MergeStyle represents the approach to merge commits into base branch. diff --git a/models/repo/issue.go b/models/repo/issue.go index 0dd4fd5ed4..35453f109f 100644 --- a/models/repo/issue.go +++ b/models/repo/issue.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // ___________.__ ___________ __ diff --git a/models/repo/language_stats.go b/models/repo/language_stats.go index d44fea5375..1b619c80cc 100644 --- a/models/repo/language_stats.go +++ b/models/repo/language_stats.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "github.com/go-enry/go-enry/v2" ) diff --git a/models/repo/main_test.go b/models/repo/main_test.go index a9fdcc9000..9fd1cacc97 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -6,15 +6,15 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" // register table model - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/perm/access" // register table model - _ "code.gitea.io/gitea/models/repo" // register table model - _ "code.gitea.io/gitea/models/user" // register table model + _ "forgejo.org/models" // register table model + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/perm/access" // register table model + _ "forgejo.org/models/repo" // register table model + _ "forgejo.org/models/user" // register table model ) func TestMain(m *testing.M) { diff --git a/models/repo/mirror.go b/models/repo/mirror.go index be7b785612..1fe9afd8e9 100644 --- a/models/repo/mirror.go +++ b/models/repo/mirror.go @@ -8,10 +8,10 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrMirrorNotExist mirror does not exist error diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go index 68fb504fdc..d6d0d1135a 100644 --- a/models/repo/pushmirror.go +++ b/models/repo/pushmirror.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/git" + giturl "forgejo.org/modules/git/url" + "forgejo.org/modules/keying" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go index c3368ccafe..de6c9b0a41 100644 --- a/models/repo/pushmirror_test.go +++ b/models/repo/pushmirror_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/redirect.go b/models/repo/redirect.go index 61789ebefa..9c44a255d0 100644 --- a/models/repo/redirect.go +++ b/models/repo/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" ) // ErrRedirectNotExist represents a "RedirectNotExist" kind of error. diff --git a/models/repo/redirect_test.go b/models/repo/redirect_test.go index 2016784aed..d84cbbed54 100644 --- a/models/repo/redirect_test.go +++ b/models/repo/redirect_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/release.go b/models/repo/release.go index 8761cb4410..10e9bb259f 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/release_list.go b/models/repo/release_list.go index 6c33262125..4ec955adf3 100644 --- a/models/repo/release_list.go +++ b/models/repo/release_list.go @@ -6,7 +6,7 @@ package repo import ( "context" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" ) type ReleaseList []*Release diff --git a/models/repo/release_list_test.go b/models/repo/release_list_test.go index cbd77683d0..2b494cb179 100644 --- a/models/repo/release_list_test.go +++ b/models/repo/release_list_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/release_test.go b/models/repo/release_test.go index 7680f2cc9d..94dbd6d9d5 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo.go b/models/repo/repo.go index ca7d50ca6a..8d204d5594 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -14,18 +14,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_flags.go b/models/repo/repo_flags.go index de76ed2b37..247a588cdf 100644 --- a/models/repo/repo_flags.go +++ b/models/repo/repo_flags.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_flags_test.go b/models/repo/repo_flags_test.go index bccefcf72b..bd92b18208 100644 --- a/models/repo/repo_flags_test.go +++ b/models/repo/repo_flags_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_indexer.go b/models/repo/repo_indexer.go index 6e19d8f937..e95517bb07 100644 --- a/models/repo/repo_indexer.go +++ b/models/repo/repo_indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index 25329ae712..ac7d2b69e3 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -8,15 +8,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index 8c13f387ba..b13db64137 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_repository.go b/models/repo/repo_repository.go index 6780165a38..0ba50e6614 100644 --- a/models/repo/repo_repository.go +++ b/models/repo/repo_repository.go @@ -5,8 +5,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/validation" ) func init() { diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index 56b84798d7..a9591a357b 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -7,15 +7,15 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index 5b4066d994..c11ad70627 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -9,13 +9,13 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/xorm" "xorm.io/xorm/convert" diff --git a/models/repo/repo_unit_test.go b/models/repo/repo_unit_test.go index 129d913cfb..210b830d02 100644 --- a/models/repo/repo_unit_test.go +++ b/models/repo/repo_unit_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/perm" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/search.go b/models/repo/search.go index ffb8e26745..c16bfa4922 100644 --- a/models/repo/search.go +++ b/models/repo/search.go @@ -3,7 +3,7 @@ package repo -import "code.gitea.io/gitea/models/db" +import "forgejo.org/models/db" // OrderByMap represents all possible search order var OrderByMap = map[string]map[string]db.SearchOrderBy{ diff --git a/models/repo/star.go b/models/repo/star.go index 60737149da..25c039a50b 100644 --- a/models/repo/star.go +++ b/models/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" ) // Star represents a starred repo by an user. diff --git a/models/repo/star_test.go b/models/repo/star_test.go index 73b362c68c..cbaa21db64 100644 --- a/models/repo/star_test.go +++ b/models/repo/star_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/topic.go b/models/repo/topic.go index 2f14ff7f62..4a3bdc7d8c 100644 --- a/models/repo/topic.go +++ b/models/repo/topic.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index f87ef2bcdf..26ad27896e 100644 --- a/models/repo/topic_test.go +++ b/models/repo/topic_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/update.go b/models/repo/update.go index e7ca224028..0222d09de5 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -8,10 +8,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // UpdateRepositoryOwnerNames updates repository owner_names (this should only be used when the ownerName has changed case) diff --git a/models/repo/upload.go b/models/repo/upload.go index 18834f6b83..49152db7fd 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -12,10 +12,10 @@ import ( "os" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 0f95f5ab6b..309bfee18f 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -6,12 +6,12 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + api "forgejo.org/modules/structs" "xorm.io/builder" ) diff --git a/models/repo/user_repo_test.go b/models/repo/user_repo_test.go index c784a5565d..2912986cd1 100644 --- a/models/repo/user_repo_test.go +++ b/models/repo/user_repo_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/watch.go b/models/repo/watch.go index 6974d893df..3fd915e1e7 100644 --- a/models/repo/watch.go +++ b/models/repo/watch.go @@ -6,10 +6,10 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // WatchMode specifies what kind of watch the user has on a repository diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go index dbf15050cf..059489afbf 100644 --- a/models/repo/watch_test.go +++ b/models/repo/watch_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/wiki.go b/models/repo/wiki.go index b378666a20..f0dd945a72 100644 --- a/models/repo/wiki.go +++ b/models/repo/wiki.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // ErrWikiAlreadyExist represents a "WikiAlreadyExist" kind of error. diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go index 28495a4b7d..bf35a4c610 100644 --- a/models/repo/wiki_test.go +++ b/models/repo/wiki_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo_test.go b/models/repo_test.go index 52f028bbb2..6fbef8edf6 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -6,9 +6,9 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo_transfer.go b/models/repo_transfer.go index 0c23d759f9..f515f1bcf0 100644 --- a/models/repo_transfer.go +++ b/models/repo_transfer.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // RepoTransfer is used to manage repository transfers diff --git a/models/repo_transfer_test.go b/models/repo_transfer_test.go index 6b6d5a8098..6449e40fce 100644 --- a/models/repo_transfer_test.go +++ b/models/repo_transfer_test.go @@ -6,9 +6,9 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/secret/secret.go b/models/secret/secret.go index 2666199547..7be7f454a1 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - secret_module "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/log" + secret_module "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index a1d46c986f..62ca1bb9cc 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -3,7 +3,7 @@ package types -import "code.gitea.io/gitea/modules/translation" +import "forgejo.org/modules/translation" type OwnerType string diff --git a/models/system/appstate.go b/models/system/appstate.go index 01faa1a5be..31274b4c34 100644 --- a/models/system/appstate.go +++ b/models/system/appstate.go @@ -6,7 +6,7 @@ package system import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // AppState represents a state record in database diff --git a/models/system/main_test.go b/models/system/main_test.go index 4181d44ddf..ca2846527a 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -6,13 +6,13 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" // register models - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/system" // register models of system + _ "forgejo.org/models" // register models + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/system" // register models of system ) func TestMain(m *testing.M) { diff --git a/models/system/notice.go b/models/system/notice.go index e7ec6a9693..b1fdd2e4f2 100644 --- a/models/system/notice.go +++ b/models/system/notice.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // NoticeType describes the notice type diff --git a/models/system/notice_test.go b/models/system/notice_test.go index bfb7862fd7..4862160755 100644 --- a/models/system/notice_test.go +++ b/models/system/notice_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/system" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/system/setting.go b/models/system/setting.go index cda60d1758..a57602688a 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting/config" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/system/setting_test.go b/models/system/setting_test.go index 7a7fa02b01..1abaf2f16b 100644 --- a/models/system/setting_test.go +++ b/models/system/setting_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/system" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unit/unit.go b/models/unit/unit.go index 5a8b9114f2..6251d44c9b 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -9,10 +9,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/perm" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // Type is Unit's Type diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index a73967742f..efcad4a405 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -6,7 +6,7 @@ package unit import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go index 4e26de7503..fd2d4b7d75 100644 --- a/models/unittest/consistency.go +++ b/models/unittest/consistency.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 63b26a0af7..6402fd9466 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -10,9 +10,9 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/setting" "github.com/go-testfixtures/testfixtures/v3" "xorm.io/xorm" diff --git a/models/unittest/mock_http.go b/models/unittest/mock_http.go index 8e79699895..e749275282 100644 --- a/models/unittest/mock_http.go +++ b/models/unittest/mock_http.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 70110c4962..d34c9e9a0a 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/system" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index 157c676d09..a7c8e9c2fa 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -7,7 +7,7 @@ import ( "math" "testing" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/avatar.go b/models/user/avatar.go index c39928ce43..27af7f774d 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -11,12 +11,12 @@ import ( "io" "strings" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/avatars" + "forgejo.org/models/db" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // CustomAvatarRelativePath returns user custom avatar relative path. diff --git a/models/user/avatar_test.go b/models/user/avatar_test.go index 974a714477..d3a164142d 100644 --- a/models/user/avatar_test.go +++ b/models/user/avatar_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/badge.go b/models/user/badge.go index ee52b44cf5..e54c993a37 100644 --- a/models/user/badge.go +++ b/models/user/badge.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // Badge represents a user badge diff --git a/models/user/block.go b/models/user/block.go index 189cacc2a2..2e3cfc2fa3 100644 --- a/models/user/block.go +++ b/models/user/block.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" ) // ErrBlockedByUser defines an error stating that the user is not allowed to perform the action because they are blocked. diff --git a/models/user/block_test.go b/models/user/block_test.go index a795ef345e..b1674bf2ff 100644 --- a/models/user/block_test.go +++ b/models/user/block_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/email_address.go b/models/user/email_address.go index fdb3d64904..f9eaec56c9 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -9,11 +9,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 5653111fff..1801f57a23 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/error.go b/models/user/error.go index 5a956a2afe..a0fc1af2bd 100644 --- a/models/user/error.go +++ b/models/user/error.go @@ -6,7 +6,7 @@ package user import ( "fmt" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrUserAlreadyExist represents a "user already exists" error. diff --git a/models/user/external_login_user.go b/models/user/external_login_user.go index 965b7a5ed1..f13454c38a 100644 --- a/models/user/external_login_user.go +++ b/models/user/external_login_user.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/federated_user.go b/models/user/federated_user.go index 1fc42c3c32..fc07836408 100644 --- a/models/user/federated_user.go +++ b/models/user/federated_user.go @@ -4,7 +4,7 @@ package user import ( - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) type FederatedUser struct { diff --git a/models/user/federated_user_test.go b/models/user/federated_user_test.go index 6a2112666f..374236f6d3 100644 --- a/models/user/federated_user_test.go +++ b/models/user/federated_user_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_FederatedUserValidation(t *testing.T) { diff --git a/models/user/follow.go b/models/user/follow.go index 9c3283b888..5be0f73c35 100644 --- a/models/user/follow.go +++ b/models/user/follow.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" ) // Follow represents relations of user and their followers. diff --git a/models/user/follow_test.go b/models/user/follow_test.go index 8c56164ee3..976225a4a8 100644 --- a/models/user/follow_test.go +++ b/models/user/follow_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/list.go b/models/user/list.go index ca589d1e02..71c96c8565 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/auth" + "forgejo.org/models/db" ) // UserList is a list of user. diff --git a/models/user/main_test.go b/models/user/main_test.go index a626d323a7..685b1116f3 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -6,12 +6,12 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/user/must_change_password.go b/models/user/must_change_password.go index 7eab08de89..5503f503b5 100644 --- a/models/user/must_change_password.go +++ b/models/user/must_change_password.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/openid.go b/models/user/openid.go index ee4ecabae0..96b00255a3 100644 --- a/models/user/openid.go +++ b/models/user/openid.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" ) // ErrOpenIDNotExist openid is not known diff --git a/models/user/openid_test.go b/models/user/openid_test.go index c2857aac98..3c55891c1f 100644 --- a/models/user/openid_test.go +++ b/models/user/openid_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/redirect.go b/models/user/redirect.go index 895e76c889..75876f17d2 100644 --- a/models/user/redirect.go +++ b/models/user/redirect.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/redirect_test.go b/models/user/redirect_test.go index 35fd29aa5d..c598fb045f 100644 --- a/models/user/redirect_test.go +++ b/models/user/redirect_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/search.go b/models/user/search.go index ecc95caf3d..d2b9901823 100644 --- a/models/user/search.go +++ b/models/user/search.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/user/setting.go b/models/user/setting.go index b4af0e5ccd..a915119ad2 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - setting_module "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/cache" + setting_module "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/setting_test.go b/models/user/setting_test.go index 0b05c54ee6..7b6658041f 100644 --- a/models/user/setting_test.go +++ b/models/user/setting_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/user.go b/models/user/user.go index 37dd69f42d..fb43f01696 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -21,20 +21,20 @@ import ( _ "image/jpeg" // Needed for jpeg support - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/auth/openid" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "golang.org/x/text/runes" "golang.org/x/text/transform" diff --git a/models/user/user_repository.go b/models/user/user_repository.go index c06441b5c8..172bf7c8b4 100644 --- a/models/user/user_repository.go +++ b/models/user/user_repository.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/optional" + "forgejo.org/modules/validation" ) func init() { diff --git a/models/user/user_system.go b/models/user/user_system.go index b13b355d37..f1585b512a 100644 --- a/models/user/user_system.go +++ b/models/user/user_system.go @@ -8,8 +8,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" ) const ( diff --git a/models/user/user_test.go b/models/user/user_test.go index 4f238967c1..dde0146470 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -12,20 +12,20 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/user_update.go b/models/user/user_update.go index 66702e2a14..bf258811e4 100644 --- a/models/user/user_update.go +++ b/models/user/user_update.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) func IncrUserRepoNum(ctx context.Context, userID int64) error { diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 8734feb2e1..58600cb8bf 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -8,12 +8,12 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" gouuid "github.com/google/uuid" "xorm.io/builder" diff --git a/models/webhook/main_test.go b/models/webhook/main_test.go index f19465d505..fac998e8cd 100644 --- a/models/webhook/main_test.go +++ b/models/webhook/main_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go index f3370f3db5..0691f231b2 100644 --- a/models/webhook/webhook.go +++ b/models/webhook/webhook.go @@ -9,15 +9,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" "xorm.io/builder" ) diff --git a/models/webhook/webhook_system.go b/models/webhook/webhook_system.go index 62e8286205..b63346635c 100644 --- a/models/webhook/webhook_system.go +++ b/models/webhook/webhook_system.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // GetDefaultWebhooks returns all admin-default webhooks. diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index 6af9c26c1c..7f0abbd8bb 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/actions/github.go b/modules/actions/github.go index c27d4edf53..111537c913 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -4,7 +4,7 @@ package actions import ( - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "forgejo.org/modules/webhook" ) const ( diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go index 6652ff6eac..2a5d8a19b8 100644 --- a/modules/actions/github_test.go +++ b/modules/actions/github_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/log.go b/modules/actions/log.go index 5a1425e031..78b1196f87 100644 --- a/modules/actions/log.go +++ b/modules/actions/log.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/dbfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/models/dbfs" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + "forgejo.org/modules/zstd" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go index 1f36e021a5..77bfc747ee 100644 --- a/modules/actions/task_state.go +++ b/modules/actions/task_state.go @@ -4,7 +4,7 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" ) const ( diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go index ff0fd57195..e18de4573f 100644 --- a/modules/actions/task_state_test.go +++ b/modules/actions/task_state_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 94c221ee7b..43948cce5c 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -8,10 +8,10 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/gobwas/glob" "github.com/nektos/act/pkg/jobparser" diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go index 965d01f134..b85ed7fd56 100644 --- a/modules/actions/workflows_test.go +++ b/modules/actions/workflows_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go index 645a4b8c8d..d43e9c2bb0 100644 --- a/modules/activitypub/client.go +++ b/modules/activitypub/client.go @@ -17,10 +17,10 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" "github.com/42wim/httpsig" ) diff --git a/modules/activitypub/client_test.go b/modules/activitypub/client_test.go index 6a771b5a7b..e63d4859be 100644 --- a/modules/activitypub/client_test.go +++ b/modules/activitypub/client_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/activitypub/main_test.go b/modules/activitypub/main_test.go index 30216812cf..4895c85d6b 100644 --- a/modules/activitypub/main_test.go +++ b/modules/activitypub/main_test.go @@ -6,12 +6,12 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/modules/activitypub/user_settings.go b/modules/activitypub/user_settings.go index 7f939af352..77c11d5ae3 100644 --- a/modules/activitypub/user_settings.go +++ b/modules/activitypub/user_settings.go @@ -6,8 +6,8 @@ package activitypub import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" ) const rsaBits = 3072 diff --git a/modules/activitypub/user_settings_test.go b/modules/activitypub/user_settings_test.go index f510e7a6ac..f1a779855c 100644 --- a/modules/activitypub/user_settings_test.go +++ b/modules/activitypub/user_settings_test.go @@ -6,11 +6,11 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 + _ "forgejo.org/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go index 9feabc3f8c..8d54ae5e4a 100644 --- a/modules/assetfs/layered.go +++ b/modules/assetfs/layered.go @@ -14,10 +14,10 @@ import ( "slices" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/util" "github.com/fsnotify/fsnotify" ) diff --git a/modules/auth/common.go b/modules/auth/common.go index 77361f6561..0f36fd942f 100644 --- a/modules/auth/common.go +++ b/modules/auth/common.go @@ -4,8 +4,8 @@ package auth import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) func UnmarshalGroupTeamMapping(raw string) (map[string]map[string][]string, error) { diff --git a/modules/auth/password/hash/argon2.go b/modules/auth/password/hash/argon2.go index 0cd6472fa1..0f65d60c66 100644 --- a/modules/auth/password/hash/argon2.go +++ b/modules/auth/password/hash/argon2.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "golang.org/x/crypto/argon2" ) diff --git a/modules/auth/password/hash/common.go b/modules/auth/password/hash/common.go index 487c0738f4..618ebfd15b 100644 --- a/modules/auth/password/hash/common.go +++ b/modules/auth/password/hash/common.go @@ -6,7 +6,7 @@ package hash import ( "strconv" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) func parseIntParam(value, param, algorithmName, config string, previousErr error) (int, error) { diff --git a/modules/auth/password/hash/hash.go b/modules/auth/password/hash/hash.go index 459320e1b0..eb79db1b9e 100644 --- a/modules/auth/password/hash/hash.go +++ b/modules/auth/password/hash/hash.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // This package takes care of hashing passwords, verifying passwords, defining diff --git a/modules/auth/password/hash/pbkdf2.go b/modules/auth/password/hash/pbkdf2.go index 27382fedb8..0dff5e5134 100644 --- a/modules/auth/password/hash/pbkdf2.go +++ b/modules/auth/password/hash/pbkdf2.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "golang.org/x/crypto/pbkdf2" ) diff --git a/modules/auth/password/hash/scrypt.go b/modules/auth/password/hash/scrypt.go index f3d38f751a..668b69cb9e 100644 --- a/modules/auth/password/hash/scrypt.go +++ b/modules/auth/password/hash/scrypt.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "golang.org/x/crypto/scrypt" ) diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go index 85f9780709..fdbc4ff291 100644 --- a/modules/auth/password/password.go +++ b/modules/auth/password/password.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) var ( diff --git a/modules/auth/password/pwn.go b/modules/auth/password/pwn.go index e00205ea19..239a25f11c 100644 --- a/modules/auth/password/pwn.go +++ b/modules/auth/password/pwn.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/modules/auth/password/pwn" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/auth/password/pwn" + "forgejo.org/modules/setting" ) var ErrIsPwned = errors.New("password has been pwned") diff --git a/modules/auth/password/pwn/pwn.go b/modules/auth/password/pwn/pwn.go index f77ce9f40b..10693ec663 100644 --- a/modules/auth/password/pwn/pwn.go +++ b/modules/auth/password/pwn/pwn.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) const passwordURL = "https://api.pwnedpasswords.com/range/" diff --git a/modules/auth/webauthn/webauthn.go b/modules/auth/webauthn/webauthn.go index 189d197333..a26dc89545 100644 --- a/modules/auth/webauthn/webauthn.go +++ b/modules/auth/webauthn/webauthn.go @@ -7,10 +7,10 @@ import ( "encoding/binary" "encoding/gob" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/modules/auth/webauthn/webauthn_test.go b/modules/auth/webauthn/webauthn_test.go index 15a8d71828..552b698984 100644 --- a/modules/auth/webauthn/webauthn_test.go +++ b/modules/auth/webauthn/webauthn_test.go @@ -6,7 +6,7 @@ package webauthn import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index 106215ec0b..33af60a3b8 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -14,8 +14,8 @@ import ( _ "image/gif" // for processing gif images _ "image/jpeg" // for processing jpeg images - "code.gitea.io/gitea/modules/avatar/identicon" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/avatar/identicon" + "forgejo.org/modules/setting" "golang.org/x/image/draw" diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go index 824a38e15b..2166ca51b0 100644 --- a/modules/avatar/avatar_test.go +++ b/modules/avatar/avatar_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/avatar/hash_test.go b/modules/avatar/hash_test.go index 1b8249c696..0a2db53ad4 100644 --- a/modules/avatar/hash_test.go +++ b/modules/avatar/hash_test.go @@ -9,7 +9,7 @@ import ( "image/png" "testing" - "code.gitea.io/gitea/modules/avatar" + "forgejo.org/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/modules/base/tool.go b/modules/base/tool.go index 02f1db59d3..fd6a7c2b77 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -16,8 +16,8 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" "github.com/dustin/go-humanize" ) diff --git a/modules/cache/cache.go b/modules/cache/cache.go index 2148e028d5..9ad4b5cd90 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" mc "code.forgejo.org/go-chi/cache" diff --git a/modules/cache/cache_redis.go b/modules/cache/cache_redis.go index 4c243b2426..489a585b04 100644 --- a/modules/cache/cache_redis.go +++ b/modules/cache/cache_redis.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/graceful" + "forgejo.org/modules/nosql" "code.forgejo.org/go-chi/cache" ) diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go index 8bc986f1a7..8e931d5b2c 100644 --- a/modules/cache/cache_test.go +++ b/modules/cache/cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/cache/cache_twoqueue.go b/modules/cache/cache_twoqueue.go index c15ed52da1..08efe703c6 100644 --- a/modules/cache/cache_twoqueue.go +++ b/modules/cache/cache_twoqueue.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" mc "code.forgejo.org/go-chi/cache" lru "github.com/hashicorp/golang-lru/v2" diff --git a/modules/cache/context.go b/modules/cache/context.go index f9bdf52044..457c5c1258 100644 --- a/modules/cache/context.go +++ b/modules/cache/context.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // cacheContext is a context that can be used to cache data in a request level context diff --git a/modules/card/card.go b/modules/card/card.go index 370d241073..087cd4ec05 100644 --- a/modules/card/card.go +++ b/modules/card/card.go @@ -19,9 +19,9 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" "github.com/golang/freetype" "github.com/golang/freetype/truetype" diff --git a/modules/card/card_test.go b/modules/card/card_test.go index 27753794c4..ef695b4549 100644 --- a/modules/card/card_test.go +++ b/modules/card/card_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/log" + "forgejo.org/modules/test" "github.com/golang/freetype/truetype" "github.com/stretchr/testify/assert" diff --git a/modules/charset/ambiguous.go b/modules/charset/ambiguous.go index 96e0561e15..a8eacf26a0 100644 --- a/modules/charset/ambiguous.go +++ b/modules/charset/ambiguous.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" ) // AmbiguousTablesForLocale provides the table of ambiguous characters for this locale. diff --git a/modules/charset/ambiguous/generate.go b/modules/charset/ambiguous/generate.go index e3fda5be98..bf7c03a16c 100644 --- a/modules/charset/ambiguous/generate.go +++ b/modules/charset/ambiguous/generate.go @@ -13,7 +13,7 @@ import ( "text/template" "unicode" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "golang.org/x/text/unicode/rangetable" ) diff --git a/modules/charset/charset.go b/modules/charset/charset.go index fc42372b4d..cb03deb966 100644 --- a/modules/charset/charset.go +++ b/modules/charset/charset.go @@ -10,9 +10,9 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gogs/chardet" "golang.org/x/net/html/charset" diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go index f7ea2beccf..ef0d1565d6 100644 --- a/modules/charset/charset_test.go +++ b/modules/charset/charset_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/charset/escape.go b/modules/charset/escape.go index ba0eb73a3a..57b13c1f18 100644 --- a/modules/charset/escape.go +++ b/modules/charset/escape.go @@ -13,9 +13,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) // RuneNBSP is the codepoint for NBSP diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go index 29943eb858..01ebf52a15 100644 --- a/modules/charset/escape_stream.go +++ b/modules/charset/escape_stream.go @@ -10,7 +10,7 @@ import ( "unicode" "unicode/utf8" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" "golang.org/x/net/html" ) diff --git a/modules/charset/escape_test.go b/modules/charset/escape_test.go index 2ca76f88d5..eec6f102cb 100644 --- a/modules/charset/escape_test.go +++ b/modules/charset/escape_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/csv/csv.go b/modules/csv/csv.go index 35c5d6ab67..996a35bdeb 100644 --- a/modules/csv/csv.go +++ b/modules/csv/csv.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" ) const ( diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 6ed6986629..6eb3b3056f 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/eventsource/event.go b/modules/eventsource/event.go index ebcca50903..0e4dbf6e9c 100644 --- a/modules/eventsource/event.go +++ b/modules/eventsource/event.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) func wrapNewlines(w io.Writer, prefix, value []byte) (sum int64, err error) { diff --git a/modules/eventsource/manager_run.go b/modules/eventsource/manager_run.go index d4d95ae72a..0eaee5dc3c 100644 --- a/modules/eventsource/manager_run.go +++ b/modules/eventsource/manager_run.go @@ -7,15 +7,15 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/services/convert" ) // Init starts this eventsource diff --git a/modules/forgefed/activity_like.go b/modules/forgefed/activity_like.go index 0f001486b5..e52d0a9af6 100644 --- a/modules/forgefed/activity_like.go +++ b/modules/forgefed/activity_like.go @@ -6,7 +6,7 @@ package forgefed import ( "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_like_test.go b/modules/forgefed/activity_like_test.go index 6b83381cf9..815b0e02f3 100644 --- a/modules/forgefed/activity_like_test.go +++ b/modules/forgefed/activity_like_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_undo_like.go b/modules/forgefed/activity_undo_like.go index b6b13ba50d..8b7df582ad 100644 --- a/modules/forgefed/activity_undo_like.go +++ b/modules/forgefed/activity_undo_like.go @@ -6,7 +6,7 @@ package forgefed import ( "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_undo_like_test.go b/modules/forgefed/activity_undo_like_test.go index 541e524cb3..1b77369b67 100644 --- a/modules/forgefed/activity_undo_like_test.go +++ b/modules/forgefed/activity_undo_like_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_validateandcheckerror_test.go b/modules/forgefed/activity_validateandcheckerror_test.go index f2f1fbcccb..c1c9164fd2 100644 --- a/modules/forgefed/activity_validateandcheckerror_test.go +++ b/modules/forgefed/activity_validateandcheckerror_test.go @@ -6,7 +6,7 @@ package forgefed import ( "fmt" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func validateAndCheckError(subject validation.Validateable, expectedError string) *string { diff --git a/modules/forgefed/actor.go b/modules/forgefed/actor.go index 0ef46185d1..c01175f0f6 100644 --- a/modules/forgefed/actor.go +++ b/modules/forgefed/actor.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/actor_test.go b/modules/forgefed/actor_test.go index a3c01eceb0..e2157a96e4 100644 --- a/modules/forgefed/actor_test.go +++ b/modules/forgefed/actor_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/repository_test.go b/modules/forgefed/repository_test.go index 13a73c10f4..5aebbbc08f 100644 --- a/modules/forgefed/repository_test.go +++ b/modules/forgefed/repository_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ap "github.com/go-ap/activitypub" ) diff --git a/modules/generate/generate.go b/modules/generate/generate.go index 41a6aa2815..9738195da9 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -11,7 +11,7 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/modules/git/batch_reader.go b/modules/git/batch_reader.go index 3b1a466b2e..1297c7247f 100644 --- a/modules/git/batch_reader.go +++ b/modules/git/batch_reader.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/blame.go b/modules/git/blame.go index d62a8ca0a2..4ff347e31b 100644 --- a/modules/git/blame.go +++ b/modules/git/blame.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // BlamePart represents block of blame - continuous lines with one sha diff --git a/modules/git/blob.go b/modules/git/blob.go index 2f02693428..3fda358938 100644 --- a/modules/git/blob.go +++ b/modules/git/blob.go @@ -10,9 +10,9 @@ import ( "encoding/base64" "io" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" ) // Blob represents a Git object. diff --git a/modules/git/command.go b/modules/git/command.go index 72640a2a94..bf1d624dbf 100644 --- a/modules/git/command.go +++ b/modules/git/command.go @@ -16,10 +16,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/util" ) // TrustedCmdArgs returns the trusted arguments for git command. diff --git a/modules/git/commit.go b/modules/git/commit.go index 78468b907f..baefe3820d 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -15,8 +15,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "github.com/go-git/go-git/v5/config" ) diff --git a/modules/git/commit_info.go b/modules/git/commit_info.go index 39e30b127d..8d9142d362 100644 --- a/modules/git/commit_info.go +++ b/modules/git/commit_info.go @@ -10,7 +10,7 @@ import ( "path" "sort" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // CommitInfo describes the first commit with the provided entry diff --git a/modules/git/diff.go b/modules/git/diff.go index 8374101d2a..0ba9c60912 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // RawDiffType type of a raw diff. diff --git a/modules/git/error.go b/modules/git/error.go index 10fb37be07..427eb4a5b9 100644 --- a/modules/git/error.go +++ b/modules/git/error.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrNotExist commit not exist error diff --git a/modules/git/foreachref/format_test.go b/modules/git/foreachref/format_test.go index 8ff239323c..99b8207168 100644 --- a/modules/git/foreachref/format_test.go +++ b/modules/git/foreachref/format_test.go @@ -6,7 +6,7 @@ package foreachref_test import ( "testing" - "code.gitea.io/gitea/modules/git/foreachref" + "forgejo.org/modules/git/foreachref" "github.com/stretchr/testify/require" ) diff --git a/modules/git/foreachref/parser_test.go b/modules/git/foreachref/parser_test.go index 7a37ced356..1febab80c7 100644 --- a/modules/git/foreachref/parser_test.go +++ b/modules/git/foreachref/parser_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/git/foreachref" + "forgejo.org/modules/json" "github.com/stretchr/testify/require" ) diff --git a/modules/git/git.go b/modules/git/git.go index 576609068a..c7d5a31b31 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/hashicorp/go-version" ) diff --git a/modules/git/git_test.go b/modules/git/git_test.go index cdbd2a1768..bb07367e3b 100644 --- a/modules/git/git_test.go +++ b/modules/git/git_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/grep.go b/modules/git/grep.go index dd176e7aec..117b09fc83 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -17,8 +17,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type GrepResult struct { diff --git a/modules/git/hook.go b/modules/git/hook.go index 46f93ce13e..bef4d024c8 100644 --- a/modules/git/hook.go +++ b/modules/git/hook.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // hookNames is a list of Git server hooks' name that are supported. diff --git a/modules/git/last_commit_cache.go b/modules/git/last_commit_cache.go index 8c7ee5a933..1d7e74a0d7 100644 --- a/modules/git/last_commit_cache.go +++ b/modules/git/last_commit_cache.go @@ -8,8 +8,8 @@ import ( "crypto/sha256" "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // Cache represents a caching interface diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go index 1fd58abfcd..e98e8c19a3 100644 --- a/modules/git/log_name_status.go +++ b/modules/git/log_name_status.go @@ -13,7 +13,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/notes.go b/modules/git/notes.go index 54f4d714e2..c36ab87fbd 100644 --- a/modules/git/notes.go +++ b/modules/git/notes.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // NotesRef is the git ref where Gitea will look for git-notes data. diff --git a/modules/git/notes_test.go b/modules/git/notes_test.go index 69ed3b8a6a..c7fb433ecf 100644 --- a/modules/git/notes_test.go +++ b/modules/git/notes_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/parse.go b/modules/git/parse.go index 8c2c411db6..6bc32057a7 100644 --- a/modules/git/parse.go +++ b/modules/git/parse.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // ParseTreeEntries parses the output of a `git ls-tree -l` command. diff --git a/modules/git/pipeline/catfile.go b/modules/git/pipeline/catfile.go index 4677218150..476f876e2b 100644 --- a/modules/git/pipeline/catfile.go +++ b/modules/git/pipeline/catfile.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // CatFileBatchCheck runs cat-file with --batch-check diff --git a/modules/git/pipeline/lfs.go b/modules/git/pipeline/lfs.go index 3407eb9838..4395e25bd7 100644 --- a/modules/git/pipeline/lfs.go +++ b/modules/git/pipeline/lfs.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // LFSResult represents commits found using a provided pointer file hash diff --git a/modules/git/pipeline/namerev.go b/modules/git/pipeline/namerev.go index ad583a7479..70840edf19 100644 --- a/modules/git/pipeline/namerev.go +++ b/modules/git/pipeline/namerev.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // NameRevStdin runs name-rev --stdin diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go index d88ebe78ef..f39b7113bb 100644 --- a/modules/git/pipeline/revlist.go +++ b/modules/git/pipeline/revlist.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // RevListAllObjects runs rev-list --objects --all and writes to a pipewriter diff --git a/modules/git/ref.go b/modules/git/ref.go index 2db630e2ea..1475d4dc5a 100644 --- a/modules/git/ref.go +++ b/modules/git/ref.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/git/remote.go b/modules/git/remote.go index eea57dd8e0..fb66d76ff0 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -7,7 +7,7 @@ import ( "context" "strings" - giturl "code.gitea.io/gitea/modules/git/url" + giturl "forgejo.org/modules/git/url" ) // GetRemoteAddress returns remote url of git repository in the repoPath with special remote name diff --git a/modules/git/repo.go b/modules/git/repo.go index 84db08d70c..0f4d1f5afa 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -18,9 +18,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // GPGSettings represents the default GPG settings for this repository diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go index cfe4cf7156..2154467332 100644 --- a/modules/git/repo_attribute.go +++ b/modules/git/repo_attribute.go @@ -13,7 +13,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" ) var LinguistAttributes = []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language", "linguist-documentation", "linguist-detectable"} diff --git a/modules/git/repo_attribute_test.go b/modules/git/repo_attribute_test.go index 8b832e7221..ee89373b90 100644 --- a/modules/git/repo_attribute_test.go +++ b/modules/git/repo_attribute_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_base.go b/modules/git/repo_base.go index 5f17bc14f6..a82d59af3c 100644 --- a/modules/git/repo_base.go +++ b/modules/git/repo_base.go @@ -10,7 +10,7 @@ import ( "errors" "path/filepath" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Repository represents a Git repository. diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 7339c7db0d..1992060351 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -13,7 +13,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // BranchPrefix base dir of the branch information file store on git diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index e8c24eaa07..65ab6fd3fd 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/cache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // GetBranchCommitID returns last commit ID string of given branch. diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index f9f7d0edc7..9cbc40eee7 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index b6e9d2b44a..373b5befb5 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -18,7 +18,7 @@ import ( "strings" "time" - logger "code.gitea.io/gitea/modules/log" + logger "forgejo.org/modules/log" ) // CompareInfo represents needed information for comparing references. diff --git a/modules/git/repo_gpg.go b/modules/git/repo_gpg.go index e2b45064fd..2c94234017 100644 --- a/modules/git/repo_gpg.go +++ b/modules/git/repo_gpg.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/process" + "forgejo.org/modules/process" ) // LoadPublicKeyContent will load the key from gpg diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go index f45b6e6191..f58757a9a2 100644 --- a/modules/git/repo_index.go +++ b/modules/git/repo_index.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // ReadTreeToIndex reads a treeish to the index diff --git a/modules/git/repo_language_stats.go b/modules/git/repo_language_stats.go index 37c23faf68..24879a26fe 100644 --- a/modules/git/repo_language_stats.go +++ b/modules/git/repo_language_stats.go @@ -10,9 +10,9 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/analyze" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" "github.com/go-enry/go-enry/v2" ) diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go index 550c653729..3c8b863f75 100644 --- a/modules/git/repo_ref.go +++ b/modules/git/repo_ref.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // GetRefs returns all references of the repository. diff --git a/modules/git/repo_stats.go b/modules/git/repo_stats.go index 83220104bd..ef0865e3d3 100644 --- a/modules/git/repo_stats.go +++ b/modules/git/repo_stats.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // CodeActivityStats represents git statistics data diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index 4466d8e5c0..f7f04e1f10 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -11,9 +11,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git/foreachref" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // TagPrefix tags prefix path on the repository diff --git a/modules/git/signature.go b/modules/git/signature.go index c368ce345c..bd9aebbdd6 100644 --- a/modules/git/signature.go +++ b/modules/git/signature.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // Signature represents the Author, Committer or Tagger information. diff --git a/modules/git/tag.go b/modules/git/tag.go index 34ce8f6fc3..64f1b952ad 100644 --- a/modules/git/tag.go +++ b/modules/git/tag.go @@ -7,8 +7,8 @@ import ( "bytes" "strings" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) const ( diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go index 0d9cfd2258..d51b7992fe 100644 --- a/modules/git/tree_entry.go +++ b/modules/git/tree_entry.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // TreeEntry the leaf in the git tree diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go index e13a4c82e1..a46e2e6bb7 100644 --- a/modules/gitrepo/branch.go +++ b/modules/gitrepo/branch.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // GetBranchesByPath returns a branch by its path diff --git a/modules/gitrepo/gitrepo.go b/modules/gitrepo/gitrepo.go index d89f8f9c0c..a9c920d564 100644 --- a/modules/gitrepo/gitrepo.go +++ b/modules/gitrepo/gitrepo.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" ) type Repository interface { diff --git a/modules/gitrepo/walk.go b/modules/gitrepo/walk.go index 8c672ea78b..8349835ff8 100644 --- a/modules/gitrepo/walk.go +++ b/modules/gitrepo/walk.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // WalkReferences walks all the references from the repository diff --git a/modules/graceful/manager.go b/modules/graceful/manager.go index 077eac64f3..db5738c94c 100644 --- a/modules/graceful/manager.go +++ b/modules/graceful/manager.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) type state uint8 diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index 8147743f79..37edf79075 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -13,10 +13,10 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful/releasereopen" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) func pidMsg() systemdNotifyMsg { diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 320904db17..dc38b02d82 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -15,9 +15,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) const ( diff --git a/modules/graceful/server.go b/modules/graceful/server.go index 2525a83e77..121bbed364 100644 --- a/modules/graceful/server.go +++ b/modules/graceful/server.go @@ -15,9 +15,9 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/proxyprotocol" + "forgejo.org/modules/setting" ) // GetListener returns a net listener diff --git a/modules/graceful/server_hooks.go b/modules/graceful/server_hooks.go index 9b67589571..06be783361 100644 --- a/modules/graceful/server_hooks.go +++ b/modules/graceful/server_hooks.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // awaitShutdown waits for the shutdown signal from the Manager diff --git a/modules/hcaptcha/hcaptcha.go b/modules/hcaptcha/hcaptcha.go index b970d491c5..7f5df9af5a 100644 --- a/modules/hcaptcha/hcaptcha.go +++ b/modules/hcaptcha/hcaptcha.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) const verifyURL = "https://hcaptcha.com/siteverify" diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index c0bc33a3c6..ba3ba479d5 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -15,10 +15,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/analyze" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index 30ce0a4a03..7978fc38a1 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // SetCacheControlInHeader sets suitable cache-control headers in the response diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index 2e3e6a7c42..cd35367bc9 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -16,13 +16,13 @@ import ( "strings" "time" - charsetModule "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + charsetModule "forgejo.org/modules/charset" + "forgejo.org/modules/container" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" "github.com/klauspost/compress/gzhttp" ) diff --git a/modules/httplib/url.go b/modules/httplib/url.go index 14b95898f5..32a02e3277 100644 --- a/modules/httplib/url.go +++ b/modules/httplib/url.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // IsRiskyRedirectURL returns true if the URL is considered risky for redirects diff --git a/modules/httplib/url_test.go b/modules/httplib/url_test.go index 2842edd514..cd2ceac267 100644 --- a/modules/httplib/url_test.go +++ b/modules/httplib/url_test.go @@ -6,8 +6,8 @@ package httplib import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index 25f96933b6..f793b5db3f 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -12,18 +12,18 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - tokenizer_hierarchy "code.gitea.io/gitea/modules/indexer/code/bleve/tokenizer/hierarchy" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/analyze" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + tokenizer_hierarchy "forgejo.org/modules/indexer/code/bleve/tokenizer/hierarchy" + "forgejo.org/modules/indexer/code/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_bleve "forgejo.org/modules/indexer/internal/bleve" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/typesniffer" "github.com/blevesearch/bleve/v2" analyzer_custom "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go index 688e53eb71..3903d77fe0 100644 --- a/modules/indexer/code/elasticsearch/elasticsearch.go +++ b/modules/indexer/code/elasticsearch/elasticsearch.go @@ -11,19 +11,19 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/analyze" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/indexer/code/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_elasticsearch "forgejo.org/modules/indexer/internal/elasticsearch" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/typesniffer" "github.com/go-enry/go-enry/v2" "github.com/olivere/elastic/v7" diff --git a/modules/indexer/code/git.go b/modules/indexer/code/git.go index c7ffcfdd40..14a43cf3be 100644 --- a/modules/indexer/code/git.go +++ b/modules/indexer/code/git.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/indexer/code/internal" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func getDefaultBranchSha(ctx context.Context, repo *repo_model.Repository) (string, error) { diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index 0a8ce27907..c32b637ab4 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -11,16 +11,16 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/indexer/code/bleve" + "forgejo.org/modules/indexer/code/elasticsearch" + "forgejo.org/modules/indexer/code/internal" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) var ( diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index 58768205c6..29b2936fa1 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -7,17 +7,17 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/indexer/code/bleve" + "forgejo.org/modules/indexer/code/elasticsearch" + "forgejo.org/modules/indexer/code/internal" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go index b7440e9de2..cc2c2aaf06 100644 --- a/modules/indexer/code/internal/indexer.go +++ b/modules/indexer/code/internal/indexer.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/indexer/internal" ) // Indexer defines an interface to index and search code contents diff --git a/modules/indexer/code/internal/model.go b/modules/indexer/code/internal/model.go index f75263c83c..ad0a7934d9 100644 --- a/modules/indexer/code/internal/model.go +++ b/modules/indexer/code/internal/model.go @@ -3,7 +3,7 @@ package internal -import "code.gitea.io/gitea/modules/timeutil" +import "forgejo.org/modules/timeutil" type FileUpdate struct { Filename string diff --git a/modules/indexer/code/internal/util.go b/modules/indexer/code/internal/util.go index 1c999fda7d..f5a4ec8e4e 100644 --- a/modules/indexer/code/internal/util.go +++ b/modules/indexer/code/internal/util.go @@ -3,7 +3,7 @@ package internal -import "code.gitea.io/gitea/modules/indexer/internal" +import "forgejo.org/modules/indexer/internal" func FilenameIndexerID(repoID int64, filename string) string { return internal.Base36(repoID) + "_" + filename diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go index 27e35251f0..adf51a76d7 100644 --- a/modules/indexer/code/search.go +++ b/modules/indexer/code/search.go @@ -9,10 +9,10 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/modules/highlight" + "forgejo.org/modules/indexer/code/internal" + "forgejo.org/modules/timeutil" + "forgejo.org/services/gitdiff" ) // Result a search result to display diff --git a/modules/indexer/internal/bleve/indexer.go b/modules/indexer/internal/bleve/indexer.go index 1435d2f519..4a61a80765 100644 --- a/modules/indexer/internal/bleve/indexer.go +++ b/modules/indexer/internal/bleve/indexer.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/indexer/internal" + "forgejo.org/modules/log" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/mapping" diff --git a/modules/indexer/internal/bleve/metadata.go b/modules/indexer/internal/bleve/metadata.go index 3c570ab4ba..08979d3e98 100644 --- a/modules/indexer/internal/bleve/metadata.go +++ b/modules/indexer/internal/bleve/metadata.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) const metaFilename = "rupture_meta.json" diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go index 30e903c49d..9f08290172 100644 --- a/modules/indexer/internal/bleve/query.go +++ b/modules/indexer/internal/bleve/query.go @@ -4,7 +4,7 @@ package bleve import ( - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" diff --git a/modules/indexer/internal/bleve/util.go b/modules/indexer/internal/bleve/util.go index d05b679765..e7311aec6c 100644 --- a/modules/indexer/internal/bleve/util.go +++ b/modules/indexer/internal/bleve/util.go @@ -7,8 +7,8 @@ import ( "errors" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/index/upsidedown" diff --git a/modules/indexer/internal/db/indexer.go b/modules/indexer/internal/db/indexer.go index 3deec836c4..a1121db333 100644 --- a/modules/indexer/internal/db/indexer.go +++ b/modules/indexer/internal/db/indexer.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/modules/indexer/internal" ) var _ internal.Indexer = &Indexer{} diff --git a/modules/indexer/internal/elasticsearch/indexer.go b/modules/indexer/internal/elasticsearch/indexer.go index 395eea3bce..9cd29f3e49 100644 --- a/modules/indexer/internal/elasticsearch/indexer.go +++ b/modules/indexer/internal/elasticsearch/indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/modules/indexer/internal" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/elasticsearch/util.go b/modules/indexer/internal/elasticsearch/util.go index 18cb152d3c..8458bd1326 100644 --- a/modules/indexer/internal/elasticsearch/util.go +++ b/modules/indexer/internal/elasticsearch/util.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/meilisearch/util.go b/modules/indexer/internal/meilisearch/util.go index 845bdb6e7f..ff41b3a857 100644 --- a/modules/indexer/internal/meilisearch/util.go +++ b/modules/indexer/internal/meilisearch/util.go @@ -6,7 +6,7 @@ package meilisearch import ( "fmt" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // VersionedIndexName returns the full index name with version diff --git a/modules/indexer/internal/paginator.go b/modules/indexer/internal/paginator.go index ee204bf047..3ef800c630 100644 --- a/modules/indexer/internal/paginator.go +++ b/modules/indexer/internal/paginator.go @@ -6,7 +6,7 @@ package internal import ( "math" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // ParsePaginator parses a db.Paginator into a skip and limit diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index 3dcc9fe3a4..5d6099bd2a 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -6,9 +6,9 @@ package bleve import ( "context" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/indexer/issues/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_bleve "forgejo.org/modules/indexer/internal/bleve" + "forgejo.org/modules/indexer/issues/internal" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/issues/bleve/bleve_test.go b/modules/indexer/issues/bleve/bleve_test.go index 908514a01a..ead57b572f 100644 --- a/modules/indexer/issues/bleve/bleve_test.go +++ b/modules/indexer/issues/bleve/bleve_test.go @@ -6,7 +6,7 @@ package bleve import ( "testing" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "forgejo.org/modules/indexer/issues/internal/tests" ) func TestBleveIndexer(t *testing.T) { diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go index 05ec548435..9dd026e74f 100644 --- a/modules/indexer/issues/db/db.go +++ b/modules/indexer/issues/db/db.go @@ -6,11 +6,11 @@ package db import ( "context" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_db "code.gitea.io/gitea/modules/indexer/internal/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_db "forgejo.org/modules/indexer/internal/db" + "forgejo.org/modules/indexer/issues/internal" "xorm.io/builder" ) diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index 875a4ca279..4411cc1c37 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + "forgejo.org/modules/container" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/optional" ) func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_model.IssuesOptions, error) { diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index e34ef607c2..d67dc68bfc 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -4,9 +4,9 @@ package issues import ( - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/optional" ) func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions { diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 221ae6dd2f..1bf0145796 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" + "forgejo.org/modules/graceful" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_elasticsearch "forgejo.org/modules/indexer/internal/elasticsearch" + "forgejo.org/modules/indexer/issues/internal" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/issues/elasticsearch/elasticsearch_test.go b/modules/indexer/issues/elasticsearch/elasticsearch_test.go index 4ed0b84442..f8cd4e02f6 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch_test.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "forgejo.org/modules/indexer/issues/internal/tests" ) func TestElasticsearchIndexer(t *testing.T) { diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 3078882258..446e714735 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -12,19 +12,19 @@ import ( "sync/atomic" "time" - db_model "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer/issues/bleve" - "code.gitea.io/gitea/modules/indexer/issues/db" - "code.gitea.io/gitea/modules/indexer/issues/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/meilisearch" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + db_model "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/indexer/issues/bleve" + "forgejo.org/modules/indexer/issues/db" + "forgejo.org/modules/indexer/issues/elasticsearch" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/indexer/issues/meilisearch" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) // IndexerMetadata is used to send data to the queue, so it contains only the ids. diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 9f80d70696..d3b3494672 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -6,17 +6,17 @@ package issues import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/internal/indexer.go b/modules/indexer/issues/internal/indexer.go index 95740bc598..2f3b4029dc 100644 --- a/modules/indexer/issues/internal/indexer.go +++ b/modules/indexer/issues/internal/indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/modules/indexer/internal" ) // Indexer defines an interface to indexer issues contents diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 0751060afc..03f5595a5b 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -4,9 +4,9 @@ package internal import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" ) // IndexerData data stored in the issue indexer diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index 80ff34713e..8308cb7f60 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index 951f3c8bfb..17a8ba2452 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_meilisearch "code.gitea.io/gitea/modules/indexer/internal/meilisearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_meilisearch "forgejo.org/modules/indexer/internal/meilisearch" + "forgejo.org/modules/indexer/issues/internal" "github.com/meilisearch/meilisearch-go" ) diff --git a/modules/indexer/issues/meilisearch/meilisearch_test.go b/modules/indexer/issues/meilisearch/meilisearch_test.go index 349102b762..01160a5240 100644 --- a/modules/indexer/issues/meilisearch/meilisearch_test.go +++ b/modules/indexer/issues/meilisearch/meilisearch_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/indexer/issues/internal/tests" "github.com/meilisearch/meilisearch-go" "github.com/stretchr/testify/assert" diff --git a/modules/indexer/issues/util.go b/modules/indexer/issues/util.go index e752ae6f24..3e6c8babe4 100644 --- a/modules/indexer/issues/util.go +++ b/modules/indexer/issues/util.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + "forgejo.org/modules/container" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" ) // getIssueIndexerData returns the indexer data of an issue and a bool value indicating whether the issue exists. diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index 98a977c700..0d25192e3c 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -6,13 +6,13 @@ package stats import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) // DBIndexer implements Indexer interface to use database's like search diff --git a/modules/indexer/stats/indexer.go b/modules/indexer/stats/indexer.go index 7ec89e2afb..482c4b2ab4 100644 --- a/modules/indexer/stats/indexer.go +++ b/modules/indexer/stats/indexer.go @@ -6,10 +6,10 @@ package stats import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" ) // Indexer defines an interface to index repository stats diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 781bb72eaa..a5899d2506 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -7,16 +7,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go index d002bd57cf..2403eb8dca 100644 --- a/modules/indexer/stats/queue.go +++ b/modules/indexer/stats/queue.go @@ -6,11 +6,11 @@ package stats import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) // statsQueue represents a queue to handle repository stats updates diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go index dbbc9e9186..8e07cbecd8 100644 --- a/modules/issue/template/template.go +++ b/modules/issue/template/template.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/container" + api "forgejo.org/modules/structs" "code.forgejo.org/go-chi/binding" ) diff --git a/modules/issue/template/template_test.go b/modules/issue/template/template_test.go index 349dbeabb0..89e8924e95 100644 --- a/modules/issue/template/template_test.go +++ b/modules/issue/template/template_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index 0fc13d7ddf..8df71a3299 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -9,11 +9,11 @@ import ( "path" "strconv" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" "gopkg.in/yaml.v3" ) diff --git a/modules/keying/keying_test.go b/modules/keying/keying_test.go index d88e907a0b..87dce0a566 100644 --- a/modules/keying/keying_test.go +++ b/modules/keying/keying_test.go @@ -7,7 +7,7 @@ import ( "math" "testing" - "code.gitea.io/gitea/modules/keying" + "forgejo.org/modules/keying" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/label/parser.go b/modules/label/parser.go index 511bac823f..558ae68def 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/options" + "forgejo.org/modules/options" "gopkg.in/yaml.v3" ) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 0d9c0c98ac..ba23cec2be 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) var ( diff --git a/modules/lfs/endpoint.go b/modules/lfs/endpoint.go index 97bd7d4446..b8df4be3ee 100644 --- a/modules/lfs/endpoint.go +++ b/modules/lfs/endpoint.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // DetermineEndpoint determines an endpoint from the clone url or uses the specified LFS url. diff --git a/modules/lfs/filesystem_client.go b/modules/lfs/filesystem_client.go index 71bef5c899..164dfa0011 100644 --- a/modules/lfs/filesystem_client.go +++ b/modules/lfs/filesystem_client.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // FilesystemClient is used to read LFS data from a filesystem path diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go index 0a27fb0c86..e531e2c1fe 100644 --- a/modules/lfs/http_client.go +++ b/modules/lfs/http_client.go @@ -13,10 +13,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" "golang.org/x/sync/errgroup" ) diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go index e80e4847f8..f825d95951 100644 --- a/modules/lfs/http_client_test.go +++ b/modules/lfs/http_client_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/lfs/pointer_scanner.go b/modules/lfs/pointer_scanner.go index 8bbf7a8692..632ecd19ae 100644 --- a/modules/lfs/pointer_scanner.go +++ b/modules/lfs/pointer_scanner.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pipeline" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pipeline" ) // SearchPointerBlobs scans the whole repository for LFS pointer files diff --git a/modules/lfs/shared.go b/modules/lfs/shared.go index ae4bb1f86b..504a726bce 100644 --- a/modules/lfs/shared.go +++ b/modules/lfs/shared.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/lfs/transferadapter.go b/modules/lfs/transferadapter.go index fbc3a3ad8c..98ac8b9a49 100644 --- a/modules/lfs/transferadapter.go +++ b/modules/lfs/transferadapter.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) // TransferAdapter represents an adapter for downloading/uploading LFS objects. diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go index a90ee5c6c0..aa87d2e01a 100644 --- a/modules/lfs/transferadapter_test.go +++ b/modules/lfs/transferadapter_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/log/event_writer_buffer_test.go b/modules/log/event_writer_buffer_test.go index 58c6be1399..ba9455ba69 100644 --- a/modules/log/event_writer_buffer_test.go +++ b/modules/log/event_writer_buffer_test.go @@ -6,7 +6,7 @@ package log_test import ( "testing" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/event_writer_file.go b/modules/log/event_writer_file.go index fd73d7d30a..fd7189e2df 100644 --- a/modules/log/event_writer_file.go +++ b/modules/log/event_writer_file.go @@ -6,7 +6,7 @@ package log import ( "io" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "forgejo.org/modules/util/rotatingfilewriter" ) type WriterFileOption struct { diff --git a/modules/log/flags.go b/modules/log/flags.go index cadf54fdd3..afce30680d 100644 --- a/modules/log/flags.go +++ b/modules/log/flags.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // These flags define which text to prefix to each log entry generated diff --git a/modules/log/flags_test.go b/modules/log/flags_test.go index a101c42a78..1ee322c630 100644 --- a/modules/log/flags_test.go +++ b/modules/log/flags_test.go @@ -6,7 +6,7 @@ package log import ( "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/log/init.go b/modules/log/init.go index 3fb5200ad7..4c6b7b5f82 100644 --- a/modules/log/init.go +++ b/modules/log/init.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "forgejo.org/modules/process" + "forgejo.org/modules/util/rotatingfilewriter" ) var projectPackagePrefix string diff --git a/modules/log/level.go b/modules/log/level.go index 47f7b83f0b..2ad1d67f1a 100644 --- a/modules/log/level.go +++ b/modules/log/level.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // Level is the level of the logger diff --git a/modules/log/level_test.go b/modules/log/level_test.go index 9831ca5650..e6cacc723b 100644 --- a/modules/log/level_test.go +++ b/modules/log/level_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go index 77e7edf6aa..b21e800f52 100644 --- a/modules/log/logger_impl.go +++ b/modules/log/logger_impl.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/util" ) type LoggerImpl struct { diff --git a/modules/markup/asciicast/asciicast.go b/modules/markup/asciicast/asciicast.go index 873029c1bd..739a035977 100644 --- a/modules/markup/asciicast/asciicast.go +++ b/modules/markup/asciicast/asciicast.go @@ -9,8 +9,8 @@ import ( "net/url" "regexp" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" ) func init() { diff --git a/modules/markup/camo.go b/modules/markup/camo.go index 7e2583469d..8380f79280 100644 --- a/modules/markup/camo.go +++ b/modules/markup/camo.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // CamoEncode encodes a lnk to fit with the go-camo and camo proxy links. The purposes of camo-proxy are: diff --git a/modules/markup/camo_test.go b/modules/markup/camo_test.go index 3c5d40afa0..d5600996c9 100644 --- a/modules/markup/camo_test.go +++ b/modules/markup/camo_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/console/console.go b/modules/markup/console/console.go index f544ab218d..c61b6495d3 100644 --- a/modules/markup/console/console.go +++ b/modules/markup/console/console.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" trend "github.com/buildkite/terminal-to-html/v3" "github.com/go-enry/go-enry/v2" diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go index 0d4a2bbeb9..11e0a54e5d 100644 --- a/modules/markup/console/console_test.go +++ b/modules/markup/console/console_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/csv/csv.go b/modules/markup/csv/csv.go index 092eec7098..6a05088ae1 100644 --- a/modules/markup/csv/csv.go +++ b/modules/markup/csv/csv.go @@ -10,11 +10,11 @@ import ( "regexp" "strconv" - "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/csv" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" ) func init() { diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go index 383f134155..008a899c05 100644 --- a/modules/markup/csv/csv_test.go +++ b/modules/markup/csv/csv_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 59f0397515..87c1a284cc 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -11,12 +11,12 @@ import ( "os/exec" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // RegisterRenderers registers all supported third part renderers according settings diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go index 2171f6097b..5499eff18c 100644 --- a/modules/markup/file_preview.go +++ b/modules/markup/file_preview.go @@ -14,11 +14,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/charset" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html.go b/modules/markup/html.go index 936d717903..323adf931d 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -14,17 +14,17 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/regexplru" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/base" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/references" + "forgejo.org/modules/regexplru" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates/vars" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 71be75f6bd..6a5d3bfa35 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index 905a10c58c..d503796eb6 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/unittest" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/markdown/callout/github.go b/modules/markup/markdown/callout/github.go index adc2071823..49ad249696 100644 --- a/modules/markup/markdown/callout/github.go +++ b/modules/markup/markdown/callout/github.go @@ -7,7 +7,7 @@ package callout import ( "strings" - "code.gitea.io/gitea/modules/svg" + "forgejo.org/modules/svg" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/callout/github_legacy.go b/modules/markup/markdown/callout/github_legacy.go index 39ea8619d8..e77da73dd9 100644 --- a/modules/markup/markdown/callout/github_legacy.go +++ b/modules/markup/markdown/callout/github_legacy.go @@ -7,7 +7,7 @@ package callout import ( "strings" - "code.gitea.io/gitea/modules/markup/markdown/util" + "forgejo.org/modules/markup/markdown/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index 1d3e04224f..9a901a2287 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index d249d25014..db92631acc 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -11,13 +11,13 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/markup/markdown/callout" - "code.gitea.io/gitea/modules/markup/markdown/math" - "code.gitea.io/gitea/modules/setting" - giteautil "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/markup/markdown/callout" + "forgejo.org/modules/markup/markdown/math" + "forgejo.org/modules/setting" + giteautil "forgejo.org/modules/util" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/yuin/goldmark" diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index bb59d72957..e229ee4c65 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/markdown/prefixed_id.go b/modules/markup/markdown/prefixed_id.go index 63d7fadc0a..036481dc05 100644 --- a/modules/markup/markdown/prefixed_id.go +++ b/modules/markup/markdown/prefixed_id.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go index f4c48d1b3d..5c3eb1beec 100644 --- a/modules/markup/markdown/renderconfig.go +++ b/modules/markup/markdown/renderconfig.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/markup" "github.com/yuin/goldmark/ast" "gopkg.in/yaml.v3" diff --git a/modules/markup/markdown/toc.go b/modules/markup/markdown/toc.go index 38f744a25f..dbfab3e9dc 100644 --- a/modules/markup/markdown/toc.go +++ b/modules/markup/markdown/toc.go @@ -7,8 +7,8 @@ import ( "fmt" "net/url" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/markup" + "forgejo.org/modules/translation" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_codespan.go b/modules/markup/markdown/transform_codespan.go index 45e3c20c8e..15c3a44f0a 100644 --- a/modules/markup/markdown/transform_codespan.go +++ b/modules/markup/markdown/transform_codespan.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/markup" - mdutil "code.gitea.io/gitea/modules/markup/markdown/util" + "forgejo.org/modules/markup" + mdutil "forgejo.org/modules/markup/markdown/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer/html" diff --git a/modules/markup/markdown/transform_heading.go b/modules/markup/markdown/transform_heading.go index 79fc9a3067..eedaf58556 100644 --- a/modules/markup/markdown/transform_heading.go +++ b/modules/markup/markdown/transform_heading.go @@ -6,9 +6,9 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" - mdutil "code.gitea.io/gitea/modules/markup/markdown/util" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + mdutil "forgejo.org/modules/markup/markdown/util" + "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_image.go b/modules/markup/markdown/transform_image.go index b34a710fed..0f9c69cae6 100644 --- a/modules/markup/markdown/transform_image.go +++ b/modules/markup/markdown/transform_image.go @@ -6,8 +6,8 @@ package markdown import ( "strings" - "code.gitea.io/gitea/modules/markup" - giteautil "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + giteautil "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_link.go b/modules/markup/markdown/transform_link.go index e6f3836412..48e3479563 100644 --- a/modules/markup/markdown/transform_link.go +++ b/modules/markup/markdown/transform_link.go @@ -7,9 +7,9 @@ import ( "bytes" "slices" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - giteautil "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + giteautil "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_list.go b/modules/markup/markdown/transform_list.go index b982fd4a83..03b3c4e89c 100644 --- a/modules/markup/markdown/transform_list.go +++ b/modules/markup/markdown/transform_list.go @@ -6,7 +6,7 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/markup" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go index aefa41d3d2..6a34ac81c4 100644 --- a/modules/markup/mdstripper/mdstripper.go +++ b/modules/markup/mdstripper/mdstripper.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/setting" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go index 391ee6c12b..b9d7b21db0 100644 --- a/modules/markup/orgmode/orgmode.go +++ b/modules/markup/orgmode/orgmode.go @@ -9,11 +9,11 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/lexers" diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go index 58fede7eb8..cdaa9f18ce 100644 --- a/modules/markup/orgmode/orgmode_test.go +++ b/modules/markup/orgmode/orgmode_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/renderer.go b/modules/markup/renderer.go index 2137302f43..a622d75085 100644 --- a/modules/markup/renderer.go +++ b/modules/markup/renderer.go @@ -14,9 +14,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/sanitizer.go b/modules/markup/sanitizer.go index 72d6571e4e..7ff11f0844 100644 --- a/modules/markup/sanitizer.go +++ b/modules/markup/sanitizer.go @@ -10,7 +10,7 @@ import ( "regexp" "sync" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/microcosm-cc/bluemonday" ) diff --git a/modules/mcaptcha/mcaptcha.go b/modules/mcaptcha/mcaptcha.go index 74142aa863..dbcafce29f 100644 --- a/modules/mcaptcha/mcaptcha.go +++ b/modules/mcaptcha/mcaptcha.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "codeberg.org/gusted/mcaptcha" ) diff --git a/modules/metrics/collector.go b/modules/metrics/collector.go index 230260ff94..5b6787d2f7 100755 --- a/modules/metrics/collector.go +++ b/modules/metrics/collector.go @@ -6,9 +6,9 @@ package metrics import ( "runtime" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/setting" "github.com/prometheus/client_golang/prometheus" ) diff --git a/modules/migration/downloader.go b/modules/migration/downloader.go index 08dbbc29a9..48bdf0456d 100644 --- a/modules/migration/downloader.go +++ b/modules/migration/downloader.go @@ -7,7 +7,7 @@ package migration import ( "context" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" ) // Downloader downloads the site repo information diff --git a/modules/migration/file_format.go b/modules/migration/file_format.go index d29d24dd0b..8851ad6de7 100644 --- a/modules/migration/file_format.go +++ b/modules/migration/file_format.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" "github.com/santhosh-tekuri/jsonschema/v6" "gopkg.in/yaml.v3" diff --git a/modules/migration/options.go b/modules/migration/options.go index 234e72c295..63bbe60758 100644 --- a/modules/migration/options.go +++ b/modules/migration/options.go @@ -4,7 +4,7 @@ package migration -import "code.gitea.io/gitea/modules/structs" +import "forgejo.org/modules/structs" // MigrateOptions defines the way a repository gets migrated // this is for internal usage by migrations module and func who interact with it diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go index fbfdff0315..933348d671 100644 --- a/modules/migration/pullrequest.go +++ b/modules/migration/pullrequest.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // PullRequest defines a standard pull request information diff --git a/modules/nosql/manager.go b/modules/nosql/manager.go index 0ba21585fa..7eea069e09 100644 --- a/modules/nosql/manager.go +++ b/modules/nosql/manager.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/process" + "forgejo.org/modules/process" "github.com/redis/go-redis/v9" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/nosql/manager_leveldb.go b/modules/nosql/manager_leveldb.go index 4d2c90debc..087aac3e9a 100644 --- a/modules/nosql/manager_leveldb.go +++ b/modules/nosql/manager_leveldb.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" diff --git a/modules/nosql/manager_redis.go b/modules/nosql/manager_redis.go index 79a533bd6b..bdaade1b47 100644 --- a/modules/nosql/manager_redis.go +++ b/modules/nosql/manager_redis.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/redis/go-redis/v9" ) diff --git a/modules/optional/option_test.go b/modules/optional/option_test.go index 203e9221e3..f6d22d2431 100644 --- a/modules/optional/option_test.go +++ b/modules/optional/option_test.go @@ -6,7 +6,7 @@ package optional_test import ( "testing" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/modules/optional/serialization.go b/modules/optional/serialization.go index b120a0edf6..86c1c97341 100644 --- a/modules/optional/serialization.go +++ b/modules/optional/serialization.go @@ -4,7 +4,7 @@ package optional import ( - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "gopkg.in/yaml.v3" ) diff --git a/modules/optional/serialization_test.go b/modules/optional/serialization_test.go index c852b8a70f..80fe1c9805 100644 --- a/modules/optional/serialization_test.go +++ b/modules/optional/serialization_test.go @@ -7,8 +7,8 @@ import ( std_json "encoding/json" //nolint:depguard "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/json" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/options/base.go b/modules/options/base.go index 6c6e3839f4..3ae8c56b79 100644 --- a/modules/options/base.go +++ b/modules/options/base.go @@ -4,8 +4,8 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/options/dynamic.go b/modules/options/dynamic.go index 085492d11c..8eed8516ab 100644 --- a/modules/options/dynamic.go +++ b/modules/options/dynamic.go @@ -6,8 +6,8 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/options/static.go b/modules/options/static.go index 72b28e990e..02091a2b1c 100644 --- a/modules/options/static.go +++ b/modules/options/static.go @@ -6,7 +6,7 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" + "forgejo.org/modules/assetfs" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/packages/alpine/metadata.go b/modules/packages/alpine/metadata.go index 582c42610d..8562612206 100644 --- a/modules/packages/alpine/metadata.go +++ b/modules/packages/alpine/metadata.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" ) var ( diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index 0a51472d9c..f967bd25a0 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -15,9 +15,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/packages" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/mholt/archiver/v3" ) diff --git a/modules/packages/arch/metadata_test.go b/modules/packages/arch/metadata_test.go index eb8de333ad..16c1c1637d 100644 --- a/modules/packages/arch/metadata_test.go +++ b/modules/packages/arch/metadata_test.go @@ -12,7 +12,7 @@ import ( "testing/fstest" "time" - "code.gitea.io/gitea/modules/packages" + "forgejo.org/modules/packages" "github.com/mholt/archiver/v3" "github.com/stretchr/testify/require" diff --git a/modules/packages/cargo/parser.go b/modules/packages/cargo/parser.go index a09cfc1f73..f2c75538b5 100644 --- a/modules/packages/cargo/parser.go +++ b/modules/packages/cargo/parser.go @@ -9,8 +9,8 @@ import ( "io" "regexp" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/chef/metadata.go b/modules/packages/chef/metadata.go index a1c91870c2..951606bbc5 100644 --- a/modules/packages/chef/metadata.go +++ b/modules/packages/chef/metadata.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" ) const ( diff --git a/modules/packages/composer/metadata.go b/modules/packages/composer/metadata.go index 6035eae8ca..940309b769 100644 --- a/modules/packages/composer/metadata.go +++ b/modules/packages/composer/metadata.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/composer/metadata_test.go b/modules/packages/composer/metadata_test.go index 2bdb23965b..e2bbff4e58 100644 --- a/modules/packages/composer/metadata_test.go +++ b/modules/packages/composer/metadata_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/conan/conaninfo_parser.go b/modules/packages/conan/conaninfo_parser.go index de11dbee45..6027e51401 100644 --- a/modules/packages/conan/conaninfo_parser.go +++ b/modules/packages/conan/conaninfo_parser.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // Conaninfo represents infos of a Conan package diff --git a/modules/packages/conan/reference.go b/modules/packages/conan/reference.go index 58f268bd48..0b863240cb 100644 --- a/modules/packages/conan/reference.go +++ b/modules/packages/conan/reference.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/conda/metadata.go b/modules/packages/conda/metadata.go index 76ba95eace..f61cc61c2a 100644 --- a/modules/packages/conda/metadata.go +++ b/modules/packages/conda/metadata.go @@ -10,10 +10,10 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/zstd" ) var ( diff --git a/modules/packages/conda/metadata_test.go b/modules/packages/conda/metadata_test.go index 25b0295157..959f9c4727 100644 --- a/modules/packages/conda/metadata_test.go +++ b/modules/packages/conda/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/zstd" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go index 2a41fb9105..ec9d834357 100644 --- a/modules/packages/container/metadata.go +++ b/modules/packages/container/metadata.go @@ -8,9 +8,9 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages/container/helm" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/packages/container/helm" + "forgejo.org/modules/validation" oci "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/modules/packages/container/metadata_test.go b/modules/packages/container/metadata_test.go index 930cf48f68..6c8c6ea5b9 100644 --- a/modules/packages/container/metadata_test.go +++ b/modules/packages/container/metadata_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/packages/container/helm" + "forgejo.org/modules/packages/container/helm" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/modules/packages/content_store.go b/modules/packages/content_store.go index 6438fb174f..f4578d91e0 100644 --- a/modules/packages/content_store.go +++ b/modules/packages/content_store.go @@ -9,9 +9,9 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" ) // BlobHash256Key is the key to address a blob content diff --git a/modules/packages/cran/metadata.go b/modules/packages/cran/metadata.go index 0b0bfb07c6..547fe87ccb 100644 --- a/modules/packages/cran/metadata.go +++ b/modules/packages/cran/metadata.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/debian/metadata.go b/modules/packages/debian/metadata.go index e76db63975..e44801654b 100644 --- a/modules/packages/debian/metadata.go +++ b/modules/packages/debian/metadata.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/zstd" "github.com/blakesmith/ar" "github.com/ulikunitz/xz" diff --git a/modules/packages/debian/metadata_test.go b/modules/packages/debian/metadata_test.go index 6f6c469989..cfcbc57ee0 100644 --- a/modules/packages/debian/metadata_test.go +++ b/modules/packages/debian/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/zstd" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/modules/packages/goproxy/metadata.go b/modules/packages/goproxy/metadata.go index 40f7d20508..2dae4100e7 100644 --- a/modules/packages/goproxy/metadata.go +++ b/modules/packages/goproxy/metadata.go @@ -10,7 +10,7 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/hashed_buffer.go b/modules/packages/hashed_buffer.go index 70a086da30..93c693efc9 100644 --- a/modules/packages/hashed_buffer.go +++ b/modules/packages/hashed_buffer.go @@ -6,7 +6,7 @@ package packages import ( "io" - "code.gitea.io/gitea/modules/util/filebuffer" + "forgejo.org/modules/util/filebuffer" ) // HashedSizeReader provide methods to read, sum hashes and a Size method diff --git a/modules/packages/helm/metadata.go b/modules/packages/helm/metadata.go index 421fc5e725..19a30c5ffa 100644 --- a/modules/packages/helm/metadata.go +++ b/modules/packages/helm/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/maven/metadata.go b/modules/packages/maven/metadata.go index fa48b4e0d7..bc0dc0155e 100644 --- a/modules/packages/maven/metadata.go +++ b/modules/packages/maven/metadata.go @@ -7,8 +7,8 @@ import ( "encoding/xml" "io" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "golang.org/x/net/html/charset" ) diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go index 7d3d7cd6b5..ed163d30ac 100644 --- a/modules/packages/npm/creator.go +++ b/modules/packages/npm/creator.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/npm/creator_test.go b/modules/packages/npm/creator_test.go index b2cf1aae0e..5cbaf0d865 100644 --- a/modules/packages/npm/creator_test.go +++ b/modules/packages/npm/creator_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/nuget/metadata.go b/modules/packages/nuget/metadata.go index dfb81baf4e..126a0ad494 100644 --- a/modules/packages/nuget/metadata.go +++ b/modules/packages/nuget/metadata.go @@ -13,8 +13,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/nuget/symbol_extractor.go b/modules/packages/nuget/symbol_extractor.go index 81bf0371a0..992ade7e8f 100644 --- a/modules/packages/nuget/symbol_extractor.go +++ b/modules/packages/nuget/symbol_extractor.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/packages" + "forgejo.org/modules/util" ) var ( diff --git a/modules/packages/pub/metadata.go b/modules/packages/pub/metadata.go index afb464e462..f8afdf7218 100644 --- a/modules/packages/pub/metadata.go +++ b/modules/packages/pub/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index 02003aba3d..30c91115e7 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" "github.com/sassoftware/go-rpmutils" ) diff --git a/modules/packages/rubygems/marshal.go b/modules/packages/rubygems/marshal.go index 4e6a5fc5f8..191efc7c0e 100644 --- a/modules/packages/rubygems/marshal.go +++ b/modules/packages/rubygems/marshal.go @@ -9,7 +9,7 @@ import ( "io" "reflect" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/rubygems/metadata.go b/modules/packages/rubygems/metadata.go index 8a9794860e..6d021a17ab 100644 --- a/modules/packages/rubygems/metadata.go +++ b/modules/packages/rubygems/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "gopkg.in/yaml.v3" ) diff --git a/modules/packages/swift/metadata.go b/modules/packages/swift/metadata.go index 24c4262ab7..34fc4f1784 100644 --- a/modules/packages/swift/metadata.go +++ b/modules/packages/swift/metadata.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/vagrant/metadata.go b/modules/packages/vagrant/metadata.go index 6789533339..24684249b7 100644 --- a/modules/packages/vagrant/metadata.go +++ b/modules/packages/vagrant/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/validation" ) const ( diff --git a/modules/packages/vagrant/metadata_test.go b/modules/packages/vagrant/metadata_test.go index f467781a08..f1950685be 100644 --- a/modules/packages/vagrant/metadata_test.go +++ b/modules/packages/vagrant/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/pprof/pprof.go b/modules/pprof/pprof.go index c611c14270..d46790458e 100644 --- a/modules/pprof/pprof.go +++ b/modules/pprof/pprof.go @@ -9,7 +9,7 @@ import ( "runtime" "runtime/pprof" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // DumpMemProfileForUsername dumps a memory profile at pprofDataPath as memprofile__ diff --git a/modules/private/actions.go b/modules/private/actions.go index 311a283650..8e4b44c226 100644 --- a/modules/private/actions.go +++ b/modules/private/actions.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) type GenerateTokenRequest struct { diff --git a/modules/private/hook.go b/modules/private/hook.go index 93cbcd469d..2d64c1dec9 100644 --- a/modules/private/hook.go +++ b/modules/private/hook.go @@ -9,10 +9,10 @@ import ( "net/url" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" ) // Git environment variables diff --git a/modules/private/internal.go b/modules/private/internal.go index 9c330a24a8..65fddbbe6b 100644 --- a/modules/private/internal.go +++ b/modules/private/internal.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/httplib" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/proxyprotocol" + "forgejo.org/modules/setting" ) // Response is used for internal request response (for user message and error message) diff --git a/modules/private/key.go b/modules/private/key.go index dcd1714856..422ff16d9a 100644 --- a/modules/private/key.go +++ b/modules/private/key.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // UpdatePublicKeyInRepo update public key and if necessary deploy key updates diff --git a/modules/private/mail.go b/modules/private/mail.go index 08de5b7e28..f6054f9c74 100644 --- a/modules/private/mail.go +++ b/modules/private/mail.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // Email structure holds a data for sending general emails diff --git a/modules/private/manager.go b/modules/private/manager.go index 6055e553bd..fa2e0b0d40 100644 --- a/modules/private/manager.go +++ b/modules/private/manager.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // Shutdown calls the internal shutdown function diff --git a/modules/private/request.go b/modules/private/request.go index 58cd261239..b80167adb6 100644 --- a/modules/private/request.go +++ b/modules/private/request.go @@ -8,8 +8,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/httplib" + "forgejo.org/modules/json" ) // ResponseText is used to get the response as text, instead of parsing it as JSON. diff --git a/modules/private/restore_repo.go b/modules/private/restore_repo.go index 496209d3cb..2192d3048d 100644 --- a/modules/private/restore_repo.go +++ b/modules/private/restore_repo.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // RestoreParams structure holds a data for restore repository diff --git a/modules/private/serv.go b/modules/private/serv.go index 480a446954..fb8496930e 100644 --- a/modules/private/serv.go +++ b/modules/private/serv.go @@ -8,10 +8,10 @@ import ( "fmt" "net/url" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" ) // KeyAndOwner is the response from ServNoCommand diff --git a/modules/proxy/proxy.go b/modules/proxy/proxy.go index 1a6bdad7fb..8c460dba30 100644 --- a/modules/proxy/proxy.go +++ b/modules/proxy/proxy.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/gobwas/glob" ) diff --git a/modules/proxyprotocol/conn.go b/modules/proxyprotocol/conn.go index f437f13683..beac5de120 100644 --- a/modules/proxyprotocol/conn.go +++ b/modules/proxyprotocol/conn.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/public/public.go b/modules/public/public.go index abc6b46158..174936fd4a 100644 --- a/modules/public/public.go +++ b/modules/public/public.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/container" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/public/public_test.go b/modules/public/public_test.go index 5e4bf5d671..4bfbb7ef31 100644 --- a/modules/public/public_test.go +++ b/modules/public/public_test.go @@ -6,7 +6,7 @@ package public import ( "testing" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" "github.com/stretchr/testify/assert" ) diff --git a/modules/public/serve_dynamic.go b/modules/public/serve_dynamic.go index a668b17c34..e5bd89b1cd 100644 --- a/modules/public/serve_dynamic.go +++ b/modules/public/serve_dynamic.go @@ -6,8 +6,8 @@ package public import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/public/serve_static.go b/modules/public/serve_static.go index e79085021e..e19bd976eb 100644 --- a/modules/public/serve_static.go +++ b/modules/public/serve_static.go @@ -8,8 +8,8 @@ package public import ( "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/timeutil" ) var _ GzipBytesProvider = (*vfsgen۰CompressedFileInfo)(nil) diff --git a/modules/queue/base_channel.go b/modules/queue/base_channel.go index dd8ccb15f4..1be4edf144 100644 --- a/modules/queue/base_channel.go +++ b/modules/queue/base_channel.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) var errChannelClosed = errors.New("channel is closed") diff --git a/modules/queue/base_levelqueue.go b/modules/queue/base_levelqueue.go index 06cb5f4819..12c805c0be 100644 --- a/modules/queue/base_levelqueue.go +++ b/modules/queue/base_levelqueue.go @@ -7,8 +7,8 @@ import ( "context" "sync/atomic" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/queue/lqinternal" + "forgejo.org/modules/nosql" + "forgejo.org/modules/queue/lqinternal" "code.forgejo.org/forgejo/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_common.go b/modules/queue/base_levelqueue_common.go index ee334c4571..8b4f35c47d 100644 --- a/modules/queue/base_levelqueue_common.go +++ b/modules/queue/base_levelqueue_common.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/nosql" "code.forgejo.org/forgejo/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_test.go b/modules/queue/base_levelqueue_test.go index a4dc7a3062..0f02b9f3ee 100644 --- a/modules/queue/base_levelqueue_test.go +++ b/modules/queue/base_levelqueue_test.go @@ -6,8 +6,8 @@ package queue import ( "testing" - "code.gitea.io/gitea/modules/queue/lqinternal" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/queue/lqinternal" + "forgejo.org/modules/setting" "code.forgejo.org/forgejo/levelqueue" "github.com/stretchr/testify/assert" diff --git a/modules/queue/base_levelqueue_unique.go b/modules/queue/base_levelqueue_unique.go index ac133bdbf4..91d2e68500 100644 --- a/modules/queue/base_levelqueue_unique.go +++ b/modules/queue/base_levelqueue_unique.go @@ -8,8 +8,8 @@ import ( "sync" "sync/atomic" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/queue/lqinternal" + "forgejo.org/modules/nosql" + "forgejo.org/modules/queue/lqinternal" "code.forgejo.org/forgejo/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_redis.go b/modules/queue/base_redis.go index 62df30f68f..ec3c6dc16d 100644 --- a/modules/queue/base_redis.go +++ b/modules/queue/base_redis.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/nosql" "github.com/redis/go-redis/v9" ) diff --git a/modules/queue/base_redis_test.go b/modules/queue/base_redis_test.go index fa1700dc2e..bf3ad5b97b 100644 --- a/modules/queue/base_redis_test.go +++ b/modules/queue/base_redis_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/queue/mock" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/queue/mock" + "forgejo.org/modules/setting" "github.com/redis/go-redis/v9" "github.com/stretchr/testify/suite" diff --git a/modules/queue/base_redis_with_server_test.go b/modules/queue/base_redis_with_server_test.go index b73404f4e5..e1f552bfb2 100644 --- a/modules/queue/base_redis_with_server_test.go +++ b/modules/queue/base_redis_with_server_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/nosql" + "forgejo.org/modules/setting" "github.com/stretchr/testify/suite" ) diff --git a/modules/queue/config.go b/modules/queue/config.go index c5bc16b6f0..f736a5aa12 100644 --- a/modules/queue/config.go +++ b/modules/queue/config.go @@ -4,7 +4,7 @@ package queue import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) type BaseConfig struct { diff --git a/modules/queue/manager.go b/modules/queue/manager.go index 8b964c0c28..8f1a93f273 100644 --- a/modules/queue/manager.go +++ b/modules/queue/manager.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // Manager is a manager for the queues created by "CreateXxxQueue" functions, these queues are called "managed queues". diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index 5806cbd6c9..bd6e314493 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/queue/mock/redisuniversalclient.go b/modules/queue/mock/redisuniversalclient.go index 36e4b7cd5d..65bac755d1 100644 --- a/modules/queue/mock/redisuniversalclient.go +++ b/modules/queue/mock/redisuniversalclient.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: code.gitea.io/gitea/modules/nosql (interfaces: RedisClient) +// Source: forgejo.org/modules/nosql (interfaces: RedisClient) // // Generated by this command: // -// mockgen -package mock -destination ./modules/queue/mock/redisuniversalclient.go code.gitea.io/gitea/modules/nosql RedisClient +// mockgen -package mock -destination ./modules/queue/mock/redisuniversalclient.go forgejo.org/modules/nosql RedisClient // // Package mock is a generated GoMock package. diff --git a/modules/queue/queue.go b/modules/queue/queue.go index 56835014a5..f16b3c1f34 100644 --- a/modules/queue/queue.go +++ b/modules/queue/queue.go @@ -61,7 +61,7 @@ // func handler(items ...*mypkg.QueueItem) []*mypkg.QueueItem { ... } package queue -import "code.gitea.io/gitea/modules/util" +import "forgejo.org/modules/util" type HandlerFuncT[T any] func(...T) (unhandled []T) diff --git a/modules/queue/workergroup.go b/modules/queue/workergroup.go index ea4c0020c5..3fb821ce69 100644 --- a/modules/queue/workergroup.go +++ b/modules/queue/workergroup.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/queue/workerqueue.go b/modules/queue/workerqueue.go index 041ce9a3f2..6a71fc4fb4 100644 --- a/modules/queue/workerqueue.go +++ b/modules/queue/workerqueue.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) // WorkerPoolQueue is a queue that uses a pool of workers to process items diff --git a/modules/queue/workerqueue_test.go b/modules/queue/workerqueue_test.go index 0060d88ec6..5ae1a701b2 100644 --- a/modules/queue/workerqueue_test.go +++ b/modules/queue/workerqueue_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/recaptcha/recaptcha.go b/modules/recaptcha/recaptcha.go index 1777d169c1..95b0a77a43 100644 --- a/modules/recaptcha/recaptcha.go +++ b/modules/recaptcha/recaptcha.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // Response is the structure of JSON returned from API diff --git a/modules/references/references.go b/modules/references/references.go index 3b4bcb3706..e1d4b47de0 100644 --- a/modules/references/references.go +++ b/modules/references/references.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/mdstripper" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/markup/mdstripper" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) var ( diff --git a/modules/references/references_test.go b/modules/references/references_test.go index d5f7c4b4c5..996066c820 100644 --- a/modules/references/references_test.go +++ b/modules/references/references_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/regexplru/regexplru.go b/modules/regexplru/regexplru.go index 8f66dcf3f7..b452094c16 100644 --- a/modules/regexplru/regexplru.go +++ b/modules/regexplru/regexplru.go @@ -6,7 +6,7 @@ package regexplru import ( "regexp" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/modules/repository/branch.go b/modules/repository/branch.go index 2bf9930f19..59b5f9e7d5 100644 --- a/modules/repository/branch.go +++ b/modules/repository/branch.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // SyncRepoBranches synchronizes branch table with repository branches diff --git a/modules/repository/branch_test.go b/modules/repository/branch_test.go index b98618a16b..deb6cd5d19 100644 --- a/modules/repository/branch_test.go +++ b/modules/repository/branch_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/collaborator.go b/modules/repository/collaborator.go index 17915d34b7..5a0c4451b7 100644 --- a/modules/repository/collaborator.go +++ b/modules/repository/collaborator.go @@ -6,11 +6,11 @@ package repository import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/modules/repository/collaborator_test.go b/modules/repository/collaborator_test.go index 63352e33e8..dae173506b 100644 --- a/modules/repository/collaborator_test.go +++ b/modules/repository/collaborator_test.go @@ -6,14 +6,14 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/commits.go b/modules/repository/commits.go index ede60429a1..8f63f03db5 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -9,13 +9,13 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/avatars" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/avatars" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" ) // PushCommit represents a commit in a push operation. diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index a22f3d07b8..f49b0d37c5 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/create.go b/modules/repository/create.go index 32c6235544..d76a5571c7 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -11,22 +11,22 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // CreateRepositoryByExample creates a repository for the user/organization. diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index c743271c26..cb34143cef 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/delete.go b/modules/repository/delete.go index 04af98beef..6fff16b406 100644 --- a/modules/repository/delete.go +++ b/modules/repository/delete.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" ) // CanUserDelete returns true if user could delete the repository diff --git a/modules/repository/env.go b/modules/repository/env.go index e4f32092fc..110f6ca674 100644 --- a/modules/repository/env.go +++ b/modules/repository/env.go @@ -8,9 +8,9 @@ import ( "os" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" ) // env keys for git hooks need diff --git a/modules/repository/fork.go b/modules/repository/fork.go index fbf0008716..42801fa80d 100644 --- a/modules/repository/fork.go +++ b/modules/repository/fork.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" ) // CanUserForkRepo returns true if specified user can fork repository. diff --git a/modules/repository/hooks.go b/modules/repository/hooks.go index 75a21a09dd..0f5e3afc34 100644 --- a/modules/repository/hooks.go +++ b/modules/repository/hooks.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) func getHookTemplates() (hookNames, hookTpls, giteaHookTpls []string) { diff --git a/modules/repository/init.go b/modules/repository/init.go index 5f500c5233..7b1442be93 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -10,14 +10,14 @@ import ( "sort" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) type OptionFile struct { diff --git a/modules/repository/license.go b/modules/repository/license.go index dcbefc8ded..af75d463d2 100644 --- a/modules/repository/license.go +++ b/modules/repository/license.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/options" + "forgejo.org/modules/options" ) type LicenseValues struct { diff --git a/modules/repository/main_test.go b/modules/repository/main_test.go index 7b245cf118..5906b10865 100644 --- a/modules/repository/main_test.go +++ b/modules/repository/main_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/modules/repository/push.go b/modules/repository/push.go index 66d0417caf..d8be0a3e8c 100644 --- a/modules/repository/push.go +++ b/modules/repository/push.go @@ -4,7 +4,7 @@ package repository import ( - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // PushUpdateOptions defines the push update options diff --git a/modules/repository/repo.go b/modules/repository/repo.go index 98e7fcbc0a..c86d48fe52 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -12,17 +12,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) /* diff --git a/modules/repository/repo_test.go b/modules/repository/repo_test.go index f3e7be6d7d..278bdc2420 100644 --- a/modules/repository/repo_test.go +++ b/modules/repository/repo_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/temp.go b/modules/repository/temp.go index 04faa9db3d..6048c43a8e 100644 --- a/modules/repository/temp.go +++ b/modules/repository/temp.go @@ -9,9 +9,9 @@ import ( "path" "path/filepath" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // LocalCopyPath returns the local repository temporary copy path. diff --git a/modules/session/db.go b/modules/session/db.go index 3b12b93521..eea7e2136e 100644 --- a/modules/session/db.go +++ b/modules/session/db.go @@ -7,9 +7,9 @@ import ( "log" "sync" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "code.forgejo.org/go-chi/session" ) diff --git a/modules/session/redis.go b/modules/session/redis.go index 230b501080..cf84ef21d9 100644 --- a/modules/session/redis.go +++ b/modules/session/redis.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/graceful" + "forgejo.org/modules/nosql" "code.forgejo.org/go-chi/session" ) diff --git a/modules/session/virtual.go b/modules/session/virtual.go index 9cf3683a71..1c3e1c778b 100644 --- a/modules/session/virtual.go +++ b/modules/session/virtual.go @@ -7,8 +7,8 @@ import ( "fmt" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" "code.forgejo.org/go-chi/session" memcache "code.forgejo.org/go-chi/session/memcache" diff --git a/modules/setting/admin.go b/modules/setting/admin.go index eed3aa22cf..7a1e071bac 100644 --- a/modules/setting/admin.go +++ b/modules/setting/admin.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // Admin settings diff --git a/modules/setting/admin_test.go b/modules/setting/admin_test.go index 0c6c24b038..5473534521 100644 --- a/modules/setting/admin_test.go +++ b/modules/setting/admin_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/api.go b/modules/setting/api.go index c36f05cfd1..18180c3d07 100644 --- a/modules/setting/api.go +++ b/modules/setting/api.go @@ -7,7 +7,7 @@ import ( "net/url" "path" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // API settings diff --git a/modules/setting/cache.go b/modules/setting/cache.go index bfa6ca0e61..cdc7e1a971 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Cache represents cache settings diff --git a/modules/setting/camo.go b/modules/setting/camo.go index 608ecf8363..5d31446a41 100644 --- a/modules/setting/camo.go +++ b/modules/setting/camo.go @@ -6,7 +6,7 @@ package setting import ( "strconv" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var Camo = struct { diff --git a/modules/setting/config.go b/modules/setting/config.go index 03558574c2..6299640e61 100644 --- a/modules/setting/config.go +++ b/modules/setting/config.go @@ -6,8 +6,8 @@ package setting import ( "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" + "forgejo.org/modules/log" + "forgejo.org/modules/setting/config" ) type PictureStruct struct { diff --git a/modules/setting/config/value.go b/modules/setting/config/value.go index f0ec120544..3409f61b76 100644 --- a/modules/setting/config/value.go +++ b/modules/setting/config/value.go @@ -7,9 +7,9 @@ import ( "context" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) type CfgSecKey struct { diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go index 2bc1a5c341..458dbb51bb 100644 --- a/modules/setting/config_env.go +++ b/modules/setting/config_env.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) const ( diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go index 12cf36aa59..e93b21abda 100644 --- a/modules/setting/config_provider.go +++ b/modules/setting/config_provider.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "gopkg.in/ini.v1" //nolint:depguard ) diff --git a/modules/setting/f3.go b/modules/setting/f3.go index 8669b70562..31d12294b8 100644 --- a/modules/setting/f3.go +++ b/modules/setting/f3.go @@ -3,7 +3,7 @@ package setting import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Friendly Forge Format (F3) settings diff --git a/modules/setting/federation.go b/modules/setting/federation.go index edb18e0054..a0fdec228e 100644 --- a/modules/setting/federation.go +++ b/modules/setting/federation.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/42wim/httpsig" ) diff --git a/modules/setting/git.go b/modules/setting/git.go index 812c4fe6c9..f35592a924 100644 --- a/modules/setting/git.go +++ b/modules/setting/git.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Git settings diff --git a/modules/setting/incoming_email.go b/modules/setting/incoming_email.go index 287e72941c..502be159a1 100644 --- a/modules/setting/incoming_email.go +++ b/modules/setting/incoming_email.go @@ -8,7 +8,7 @@ import ( "net/mail" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var IncomingEmail = struct { diff --git a/modules/setting/indexer.go b/modules/setting/indexer.go index 4c4f63bc61..6a464ee0de 100644 --- a/modules/setting/indexer.go +++ b/modules/setting/indexer.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/gobwas/glob" ) diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go index f55b0cdae9..3cd48c538b 100644 --- a/modules/setting/lfs.go +++ b/modules/setting/lfs.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/generate" + "forgejo.org/modules/generate" ) // LFS represents the server-side configuration for Git LFS. diff --git a/modules/setting/log.go b/modules/setting/log.go index a141188c0c..0747ac4dac 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) type LogGlobalConfig struct { diff --git a/modules/setting/log_test.go b/modules/setting/log_test.go index 3134d3e75c..eda6dc36af 100644 --- a/modules/setting/log_test.go +++ b/modules/setting/log_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" "github.com/stretchr/testify/require" ) diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index 0804fbd717..b7f69c3492 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -11,7 +11,7 @@ import ( "text/template" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" shellquote "github.com/kballard/go-shellquote" ) diff --git a/modules/setting/markup.go b/modules/setting/markup.go index e893c1c2f1..90fc86b131 100644 --- a/modules/setting/markup.go +++ b/modules/setting/markup.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // ExternalMarkupRenderers represents the external markup renderers diff --git a/modules/setting/mirror.go b/modules/setting/mirror.go index 3aa530a1f4..58c57c5c95 100644 --- a/modules/setting/mirror.go +++ b/modules/setting/mirror.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Mirror settings diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 49288e2639..72500cfc89 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -8,8 +8,8 @@ import ( "path/filepath" "sync/atomic" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/generate" + "forgejo.org/modules/log" ) // OAuth2UsernameType is enum describing the way gitea 'name' should be generated from oauth2 data diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go index 18252b2447..2fc5da6996 100644 --- a/modules/setting/oauth2_test.go +++ b/modules/setting/oauth2_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/generate" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/other.go b/modules/setting/other.go index 4ba494765b..db60cd2205 100644 --- a/modules/setting/other.go +++ b/modules/setting/other.go @@ -3,7 +3,7 @@ package setting -import "code.gitea.io/gitea/modules/log" +import "forgejo.org/modules/log" type OtherConfig struct { ShowFooterVersion bool diff --git a/modules/setting/path.go b/modules/setting/path.go index b99f1977bb..33f27db8fd 100644 --- a/modules/setting/path.go +++ b/modules/setting/path.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/setting/proxy.go b/modules/setting/proxy.go index 4ff420d090..7a9de9568b 100644 --- a/modules/setting/proxy.go +++ b/modules/setting/proxy.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Proxy settings diff --git a/modules/setting/queue.go b/modules/setting/queue.go index 251a6c1e30..06d007c140 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) // QueueSettings represent the settings for a queue from the ini diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 93c01cb8fa..9efd674f8b 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // enumerates all the policy repository creating diff --git a/modules/setting/security.go b/modules/setting/security.go index 678a57cb30..f3480d1056 100644 --- a/modules/setting/security.go +++ b/modules/setting/security.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/generate" + "forgejo.org/modules/keying" + "forgejo.org/modules/log" ) var ( diff --git a/modules/setting/server.go b/modules/setting/server.go index c874a58069..bff51f787d 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // Scheme describes protocol types diff --git a/modules/setting/server_test.go b/modules/setting/server_test.go index 4b95961a26..4450f99546 100644 --- a/modules/setting/server_test.go +++ b/modules/setting/server_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/service.go b/modules/setting/service.go index cc84ac7257..729b10839e 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" "github.com/gobwas/glob" ) diff --git a/modules/setting/service_test.go b/modules/setting/service_test.go index e504bc68dc..4fc09021b6 100644 --- a/modules/setting/service_test.go +++ b/modules/setting/service_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/modules/setting/session.go b/modules/setting/session.go index 29ee67914d..e9ff9bf0bc 100644 --- a/modules/setting/session.go +++ b/modules/setting/session.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) // SessionConfig defines Session settings diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 487f2bb0d5..eb7b9e9373 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/user" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/user" + "forgejo.org/modules/util" ) var ForgejoVersion = "1.0.0" diff --git a/modules/setting/setting_test.go b/modules/setting/setting_test.go index 6801844729..1fef9e068a 100644 --- a/modules/setting/setting_test.go +++ b/modules/setting/setting_test.go @@ -7,7 +7,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/ssh.go b/modules/setting/ssh.go index ea387e521f..86193bddb9 100644 --- a/modules/setting/ssh.go +++ b/modules/setting/ssh.go @@ -11,8 +11,8 @@ import ( "text/template" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" gossh "golang.org/x/crypto/ssh" ) diff --git a/modules/setting/time.go b/modules/setting/time.go index 97988211a9..1211fd475a 100644 --- a/modules/setting/time.go +++ b/modules/setting/time.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // DefaultUILocation is the location on the UI, so that we can display the time on UI. diff --git a/modules/setting/ui.go b/modules/setting/ui.go index 40f1812839..2e6a3df4c6 100644 --- a/modules/setting/ui.go +++ b/modules/setting/ui.go @@ -6,8 +6,8 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/container" + "forgejo.org/modules/log" ) // UI settings diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go index dd60acf210..071b729aa1 100644 --- a/modules/setting/webhook.go +++ b/modules/setting/webhook.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Webhook settings diff --git a/modules/ssh/init.go b/modules/ssh/init.go index 21d4f89936..1ccd95b18b 100644 --- a/modules/ssh/init.go +++ b/modules/ssh/init.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func Init() error { diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 6ee10f718b..19cac0b603 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -21,12 +21,12 @@ import ( "sync" "syscall" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gliderlabs/ssh" gossh "golang.org/x/crypto/ssh" diff --git a/modules/ssh/ssh_graceful.go b/modules/ssh/ssh_graceful.go index cad2c685bd..825313ab1c 100644 --- a/modules/ssh/ssh_graceful.go +++ b/modules/ssh/ssh_graceful.go @@ -4,9 +4,9 @@ package ssh import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/gliderlabs/ssh" ) diff --git a/modules/storage/local.go b/modules/storage/local.go index 00c7f668aa..6f851983b1 100644 --- a/modules/storage/local.go +++ b/modules/storage/local.go @@ -11,9 +11,9 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) var _ ObjectStorage = &LocalStorage{} diff --git a/modules/storage/local_test.go b/modules/storage/local_test.go index e230323f67..d0dd3a6462 100644 --- a/modules/storage/local_test.go +++ b/modules/storage/local_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index b02eec7aa0..ee545edc10 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -15,9 +15,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/modules/storage/minio_test.go b/modules/storage/minio_test.go index 9ce1dbc7b4..99f70c4565 100644 --- a/modules/storage/minio_test.go +++ b/modules/storage/minio_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/minio/minio-go/v7" "github.com/stretchr/testify/assert" diff --git a/modules/storage/storage.go b/modules/storage/storage.go index 453d755fbb..db081e0768 100644 --- a/modules/storage/storage.go +++ b/modules/storage/storage.go @@ -11,8 +11,8 @@ import ( "net/url" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // ErrURLNotSupported represents url is not supported diff --git a/modules/storage/storage_test.go b/modules/storage/storage_test.go index 70bcd3155a..af3dd9520e 100644 --- a/modules/storage/storage_test.go +++ b/modules/storage/storage_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go index c97cdcb83c..0a3d4140c2 100644 --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -1,7 +1,7 @@ // Copyright 2017 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package structs // import "code.gitea.io/gitea/modules/structs" +package structs // import "forgejo.org/modules/structs" import ( "time" diff --git a/modules/structs/hook.go b/modules/structs/hook.go index 10b3a9db9b..1665dc4da6 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // ErrInvalidReceiveHook FIXME diff --git a/modules/structs/user.go b/modules/structs/user.go index 6c0468b5fb..49e4c495cf 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -6,7 +6,7 @@ package structs import ( "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // User represents a user diff --git a/modules/svg/svg.go b/modules/svg/svg.go index 016e1dc08b..e00d8de2d1 100644 --- a/modules/svg/svg.go +++ b/modules/svg/svg.go @@ -9,9 +9,9 @@ import ( "path" "strings" - gitea_html "code.gitea.io/gitea/modules/html" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/public" + gitea_html "forgejo.org/modules/html" + "forgejo.org/modules/log" + "forgejo.org/modules/public" ) var svgIcons map[string]string diff --git a/modules/sync/status_pool.go b/modules/sync/status_pool.go index 6f075d54b7..f22e3e155b 100644 --- a/modules/sync/status_pool.go +++ b/modules/sync/status_pool.go @@ -6,7 +6,7 @@ package sync import ( "sync" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // StatusTable is a table maintains true/false values. diff --git a/modules/system/appstate_test.go b/modules/system/appstate_test.go index 2f44c7b845..8a444aff0f 100644 --- a/modules/system/appstate_test.go +++ b/modules/system/appstate_test.go @@ -6,8 +6,8 @@ package system import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/system/db.go b/modules/system/db.go index 17178283d9..384087ab4f 100644 --- a/modules/system/db.go +++ b/modules/system/db.go @@ -6,9 +6,9 @@ package system import ( "context" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/system" + "forgejo.org/modules/json" + "forgejo.org/modules/util" ) // DBStore can be used to store app state items in local filesystem diff --git a/modules/templates/base.go b/modules/templates/base.go index 2c2f35bbed..76d8e3271e 100644 --- a/modules/templates/base.go +++ b/modules/templates/base.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func AssetFS() *assetfs.LayeredFS { diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go index e1babd83c9..c5752c8c72 100644 --- a/modules/templates/dynamic.go +++ b/modules/templates/dynamic.go @@ -6,8 +6,8 @@ package templates import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/templates/eval/eval.go b/modules/templates/eval/eval.go index 5d4ac915b9..487a1de4b0 100644 --- a/modules/templates/eval/eval.go +++ b/modules/templates/eval/eval.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) type Num struct { diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 023ba60fa9..02b175e6f6 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -14,14 +14,14 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/templates/eval" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/svg" + "forgejo.org/modules/templates/eval" + "forgejo.org/modules/util" + "forgejo.org/services/gitdiff" ) // NewFuncMap returns functions for injecting to templates diff --git a/modules/templates/htmlrenderer.go b/modules/templates/htmlrenderer.go index 55a55dd7f4..d60397df08 100644 --- a/modules/templates/htmlrenderer.go +++ b/modules/templates/htmlrenderer.go @@ -19,12 +19,12 @@ import ( "sync/atomic" texttemplate "text/template" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates/scopedtmpl" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates/scopedtmpl" + "forgejo.org/modules/util" ) type TemplateExecutor scopedtmpl.TemplateExecutor diff --git a/modules/templates/htmlrenderer_test.go b/modules/templates/htmlrenderer_test.go index a1d3783a75..7373605744 100644 --- a/modules/templates/htmlrenderer_test.go +++ b/modules/templates/htmlrenderer_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/assetfs" + "forgejo.org/modules/assetfs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index ee79755dbb..a40728d7c7 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -11,9 +11,9 @@ import ( "strings" texttmpl "text/template" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) var mailSubjectSplit = regexp.MustCompile(`(?m)^-{3,}\s*$`) diff --git a/modules/templates/main_test.go b/modules/templates/main_test.go index 977699f9c7..946bc603f6 100644 --- a/modules/templates/main_test.go +++ b/modules/templates/main_test.go @@ -7,12 +7,12 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/models/unittest" + "forgejo.org/modules/markup" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/issues" + _ "forgejo.org/models" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/issues" ) func TestMain(m *testing.M) { diff --git a/modules/templates/static.go b/modules/templates/static.go index b5a7e561ec..776548c853 100644 --- a/modules/templates/static.go +++ b/modules/templates/static.go @@ -8,8 +8,8 @@ package templates import ( "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/timeutil" ) // GlobalModTime provide a global mod time for embedded asset files diff --git a/modules/templates/util_avatar.go b/modules/templates/util_avatar.go index a468361101..93ebec51e4 100644 --- a/modules/templates/util_avatar.go +++ b/modules/templates/util_avatar.go @@ -9,13 +9,13 @@ import ( "html" "html/template" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - gitea_html "code.gitea.io/gitea/modules/html" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/avatars" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + gitea_html "forgejo.org/modules/html" + "forgejo.org/modules/setting" ) type AvatarUtils struct { diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go index f521b39b79..bb83bf692a 100644 --- a/modules/templates/util_date.go +++ b/modules/templates/util_date.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" ) type DateUtils struct{} diff --git a/modules/templates/util_date_test.go b/modules/templates/util_date_test.go index 2f5c79f762..37caf0d422 100644 --- a/modules/templates/util_date_test.go +++ b/modules/templates/util_date_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/templates/util_dict.go b/modules/templates/util_dict.go index 8d6376b522..9d9af77fad 100644 --- a/modules/templates/util_dict.go +++ b/modules/templates/util_dict.go @@ -9,9 +9,9 @@ import ( "html/template" "reflect" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) func dictMerge(base map[string]any, arg any) bool { diff --git a/modules/templates/util_json.go b/modules/templates/util_json.go index 71a4e23d36..3bc80e8f21 100644 --- a/modules/templates/util_json.go +++ b/modules/templates/util_json.go @@ -6,7 +6,7 @@ package templates import ( "bytes" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) type JsonUtils struct{} //nolint:revive diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index 774385483b..12a65c87da 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -12,14 +12,14 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/svg" + activities_model "forgejo.org/models/activities" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + giturl "forgejo.org/modules/git/url" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/svg" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 3c337ae895..a4d7a82eea 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -14,14 +14,14 @@ import ( "strings" "unicode" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/emoji" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" ) // RenderCommitMessage renders commit message with XSS-safe and special links. diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 25a41f02c0..20c39eb417 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -8,10 +8,10 @@ import ( "html/template" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go index 685759dcbc..2d255e54a7 100644 --- a/modules/templates/util_string.go +++ b/modules/templates/util_string.go @@ -8,7 +8,7 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/base" + "forgejo.org/modules/base" ) type StringUtils struct{} diff --git a/modules/test/logchecker.go b/modules/test/logchecker.go index 0f12257f3e..8e8fc32216 100644 --- a/modules/test/logchecker.go +++ b/modules/test/logchecker.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) type LogChecker struct { diff --git a/modules/test/logchecker_test.go b/modules/test/logchecker_test.go index 0f410fed12..d81142bf1c 100644 --- a/modules/test/logchecker_test.go +++ b/modules/test/logchecker_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/modules/test/utils.go b/modules/test/utils.go index 3d884b6cbe..f60bad022e 100644 --- a/modules/test/utils.go +++ b/modules/test/utils.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // RedirectURL returns the redirect URL of a http response. diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index caa8abd07b..b5f196ad4b 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -16,9 +16,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/util" ) var ( diff --git a/modules/timeutil/executable.go b/modules/timeutil/executable.go index 57ae8b2a9d..7b30176df0 100644 --- a/modules/timeutil/executable.go +++ b/modules/timeutil/executable.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 2c89ae38d5..b0bbe25f98 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" ) // Seconds-based time units diff --git a/modules/timeutil/since_test.go b/modules/timeutil/since_test.go index 40fefe8700..b47b2c76dd 100644 --- a/modules/timeutil/since_test.go +++ b/modules/timeutil/since_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go index 27a80b6682..783ccba30b 100644 --- a/modules/timeutil/timestamp.go +++ b/modules/timeutil/timestamp.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // TimeStamp defines a timestamp diff --git a/modules/timeutil/timestampnano.go b/modules/timeutil/timestampnano.go index 4a9f7955b9..e2e86b863f 100644 --- a/modules/timeutil/timestampnano.go +++ b/modules/timeutil/timestampnano.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // TimeStampNano is for nano time in database, do not use it unless there is a real requirement. diff --git a/modules/translation/i18n/dummy_test.go b/modules/translation/i18n/dummy_test.go index 7bc29ef839..1df3d0c348 100644 --- a/modules/translation/i18n/dummy_test.go +++ b/modules/translation/i18n/dummy_test.go @@ -6,7 +6,7 @@ package i18n_test import ( "testing" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/translation/i18n" "github.com/stretchr/testify/assert" ) diff --git a/modules/translation/i18n/errors.go b/modules/translation/i18n/errors.go index ee9436a8f7..63a5f48dfa 100644 --- a/modules/translation/i18n/errors.go +++ b/modules/translation/i18n/errors.go @@ -4,7 +4,7 @@ package i18n import ( - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) var ( diff --git a/modules/translation/i18n/localestore.go b/modules/translation/i18n/localestore.go index 0cfa96810e..823cadf8f9 100644 --- a/modules/translation/i18n/localestore.go +++ b/modules/translation/i18n/localestore.go @@ -8,10 +8,10 @@ import ( "html/template" "slices" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // This file implements the static LocaleStore that will not watch for changes diff --git a/modules/translation/plural_rules.go b/modules/translation/plural_rules.go index b8c00ceef7..7e9ae39111 100644 --- a/modules/translation/plural_rules.go +++ b/modules/translation/plural_rules.go @@ -12,8 +12,8 @@ package translation import ( "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/log" + "forgejo.org/modules/translation/i18n" ) // The constants refer to indices below in `PluralRules` and also in i18n.js, keep them in sync! diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 3ecf8715a3..315e65e53d 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -10,11 +10,11 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation/i18n" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation/i18n" + "forgejo.org/modules/util" "github.com/dustin/go-humanize" "golang.org/x/text/language" diff --git a/modules/translation/translation_test.go b/modules/translation/translation_test.go index 5b3eefb355..356b85f946 100644 --- a/modules/translation/translation_test.go +++ b/modules/translation/translation_test.go @@ -8,7 +8,7 @@ package translation import ( "testing" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/translation/i18n" "github.com/stretchr/testify/assert" ) diff --git a/modules/turnstile/turnstile.go b/modules/turnstile/turnstile.go index 38d0233446..31ba256195 100644 --- a/modules/turnstile/turnstile.go +++ b/modules/turnstile/turnstile.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) // Response is the structure of JSON returned from API diff --git a/modules/typesniffer/typesniffer.go b/modules/typesniffer/typesniffer.go index 212e50c4f1..a8fc70e54c 100644 --- a/modules/typesniffer/typesniffer.go +++ b/modules/typesniffer/typesniffer.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // Use at most this many bytes to determine Content Type. diff --git a/modules/updatechecker/update_checker.go b/modules/updatechecker/update_checker.go index 0c93f08d21..b0932ba663 100644 --- a/modules/updatechecker/update_checker.go +++ b/modules/updatechecker/update_checker.go @@ -11,10 +11,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/system" + "forgejo.org/modules/json" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" + "forgejo.org/modules/system" "github.com/hashicorp/go-version" ) diff --git a/modules/util/rotatingfilewriter/writer.go b/modules/util/rotatingfilewriter/writer.go index c595f49c49..ff234eea93 100644 --- a/modules/util/rotatingfilewriter/writer.go +++ b/modules/util/rotatingfilewriter/writer.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/graceful/releasereopen" + "forgejo.org/modules/util" ) type Options struct { diff --git a/modules/util/util.go b/modules/util/util.go index 88ac07567b..da405c9c4b 100644 --- a/modules/util/util.go +++ b/modules/util/util.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" "golang.org/x/crypto/ssh" "golang.org/x/text/cases" diff --git a/modules/util/util_test.go b/modules/util/util_test.go index 7344c8fbb7..5e0c4a9a0b 100644 --- a/modules/util/util_test.go +++ b/modules/util/util_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/optional" + "forgejo.org/modules/test" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/validation/binding.go b/modules/validation/binding.go index 006fbfafc1..f4f82278bd 100644 --- a/modules/validation/binding.go +++ b/modules/validation/binding.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/auth" + "forgejo.org/modules/git" + "forgejo.org/modules/util" "code.forgejo.org/go-chi/binding" "github.com/gobwas/glob" diff --git a/modules/validation/email.go b/modules/validation/email.go index 326e93378a..fb563c2b81 100644 --- a/modules/validation/email.go +++ b/modules/validation/email.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gobwas/glob" ) diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go index 2f88fcbc60..1f573564e6 100644 --- a/modules/validation/helpers.go +++ b/modules/validation/helpers.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) var externalTrackerRegex = regexp.MustCompile(`({?)(?:user|repo|index)+?(}?)`) diff --git a/modules/validation/helpers_test.go b/modules/validation/helpers_test.go index a1bdf2a29c..01a17f0d6b 100644 --- a/modules/validation/helpers_test.go +++ b/modules/validation/helpers_test.go @@ -6,7 +6,7 @@ package validation import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/validation/validatable.go b/modules/validation/validatable.go index 94b5cc135c..bc565bd194 100644 --- a/modules/validation/validatable.go +++ b/modules/validation/validatable.go @@ -10,7 +10,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" ) // ErrNotValid represents an validation error diff --git a/modules/validation/validatable_test.go b/modules/validation/validatable_test.go index 919f5a3183..0802d5cc92 100644 --- a/modules/validation/validatable_test.go +++ b/modules/validation/validatable_test.go @@ -6,7 +6,7 @@ package validation import ( "testing" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" ) type Sut struct { diff --git a/modules/web/handler.go b/modules/web/handler.go index 728cc5a160..4a7f28b1fa 100644 --- a/modules/web/handler.go +++ b/modules/web/handler.go @@ -9,9 +9,9 @@ import ( "net/http" "reflect" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/modules/web/types" + "forgejo.org/modules/log" + "forgejo.org/modules/web/routing" + "forgejo.org/modules/web/types" ) var responseStatusProviders = map[reflect.Type]func(req *http.Request) types.ResponseStatusProvider{} diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 4e43f6d4b3..9083e9b485 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -8,10 +8,10 @@ import ( "reflect" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "code.forgejo.org/go-chi/binding" ) diff --git a/modules/web/middleware/cookie.go b/modules/web/middleware/cookie.go index f2d25f5b1c..3bfaeabe69 100644 --- a/modules/web/middleware/cookie.go +++ b/modules/web/middleware/cookie.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/session" + "forgejo.org/modules/setting" ) // SetRedirectToCookie convenience function to set the RedirectTo cookie consistently diff --git a/modules/web/middleware/data.go b/modules/web/middleware/data.go index 08d83f94be..4603e64052 100644 --- a/modules/web/middleware/data.go +++ b/modules/web/middleware/data.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // ContextDataStore represents a data store diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go index 9653a6f349..565fb2f502 100644 --- a/modules/web/middleware/locale.go +++ b/modules/web/middleware/locale.go @@ -6,8 +6,8 @@ package middleware import ( "net/http" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/translation" + "forgejo.org/modules/translation/i18n" "golang.org/x/text/language" ) diff --git a/modules/web/route.go b/modules/web/route.go index eda6871d85..046c9f4ba7 100644 --- a/modules/web/route.go +++ b/modules/web/route.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/web/middleware" + "forgejo.org/modules/web/middleware" "code.forgejo.org/go-chi/binding" "github.com/go-chi/chi/v5" diff --git a/modules/web/routemock.go b/modules/web/routemock.go index cb41f63b91..33d2ad06eb 100644 --- a/modules/web/routemock.go +++ b/modules/web/routemock.go @@ -6,7 +6,7 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // MockAfterMiddlewares is a general mock point, it's between middlewares and the handler diff --git a/modules/web/routemock_test.go b/modules/web/routemock_test.go index cd99b99323..43d4b28830 100644 --- a/modules/web/routemock_test.go +++ b/modules/web/routemock_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/web/routing/logger.go b/modules/web/routing/logger.go index 5f3a7592af..760e092914 100644 --- a/modules/web/routing/logger.go +++ b/modules/web/routing/logger.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web/types" + "forgejo.org/modules/log" + "forgejo.org/modules/web/types" ) // NewLoggerHandler is a handler that will log routing to the router log taking account of diff --git a/modules/web/routing/logger_manager.go b/modules/web/routing/logger_manager.go index aa25ec3a27..4b12419b44 100644 --- a/modules/web/routing/logger_manager.go +++ b/modules/web/routing/logger_manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" + "forgejo.org/modules/graceful" + "forgejo.org/modules/process" ) // Event indicates when the printer is triggered diff --git a/routers/api/actions/actions.go b/routers/api/actions/actions.go index a418b3a1c4..70158c4e18 100644 --- a/routers/api/actions/actions.go +++ b/routers/api/actions/actions.go @@ -6,9 +6,9 @@ package actions import ( "net/http" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/actions/ping" - "code.gitea.io/gitea/routers/api/actions/runner" + "forgejo.org/modules/web" + "forgejo.org/routers/api/actions/ping" + "forgejo.org/routers/api/actions/runner" ) func Routes(prefix string) *web.Route { diff --git a/routers/api/actions/artifacts.go b/routers/api/actions/artifacts.go index 405686a058..85a1f5f5be 100644 --- a/routers/api/actions/artifacts.go +++ b/routers/api/actions/artifacts.go @@ -69,18 +69,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/actions" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + web_types "forgejo.org/modules/web/types" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" ) const artifactRouteBase = "/_apis/pipelines/workflows/{run_id}/artifacts" diff --git a/routers/api/actions/artifacts_chunks.go b/routers/api/actions/artifacts_chunks.go index cdb56584b8..a15fa4fd1e 100644 --- a/routers/api/actions/artifacts_chunks.go +++ b/routers/api/actions/artifacts_chunks.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) func saveUploadChunkBase(st storage.ObjectStorage, ctx *ArtifactContext, diff --git a/routers/api/actions/artifacts_utils.go b/routers/api/actions/artifacts_utils.go index db602f1e14..18c8e3fbed 100644 --- a/routers/api/actions/artifacts_utils.go +++ b/routers/api/actions/artifacts_utils.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) const ( diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go index 0417f98242..c6bc39e7d2 100644 --- a/routers/api/actions/artifactsv4.go +++ b/routers/api/actions/artifactsv4.go @@ -98,16 +98,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/actions" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" "google.golang.org/protobuf/encoding/protojson" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/routers/api/actions/ping/ping.go b/routers/api/actions/ping/ping.go index 13985c93a3..6b3378b72e 100644 --- a/routers/api/actions/ping/ping.go +++ b/routers/api/actions/ping/ping.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/routers/api/actions/runner/interceptor.go b/routers/api/actions/runner/interceptor.go index b56e6870ac..be83af6997 100644 --- a/routers/api/actions/runner/interceptor.go +++ b/routers/api/actions/runner/interceptor.go @@ -9,11 +9,11 @@ import ( "errors" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "connectrpc.com/connect" ) diff --git a/routers/api/actions/runner/main_test.go b/routers/api/actions/runner/main_test.go index bed63c166e..112ebe3cb6 100644 --- a/routers/api/actions/runner/main_test.go +++ b/routers/api/actions/runner/main_test.go @@ -6,9 +6,9 @@ package runner import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 6cd37fd224..8aae69f463 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -9,13 +9,13 @@ import ( "fmt" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - actions_service "code.gitea.io/gitea/services/actions" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + actions_service "forgejo.org/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" diff --git a/routers/api/forgejo/v1/api.go b/routers/api/forgejo/v1/api.go index 88c7502e66..dfc5a29d05 100644 --- a/routers/api/forgejo/v1/api.go +++ b/routers/api/forgejo/v1/api.go @@ -4,8 +4,8 @@ package v1 import ( - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/shared" + "forgejo.org/modules/web" + "forgejo.org/routers/api/shared" ) func Routes() *web.Route { diff --git a/routers/api/forgejo/v1/forgejo.go b/routers/api/forgejo/v1/forgejo.go index 0f1f4f1932..b63db6fb9a 100644 --- a/routers/api/forgejo/v1/forgejo.go +++ b/routers/api/forgejo/v1/forgejo.go @@ -5,8 +5,8 @@ package v1 import ( "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) type Forgejo struct{} diff --git a/routers/api/packages/alpine/alpine.go b/routers/api/packages/alpine/alpine.go index 831a910e36..dc992ebb5a 100644 --- a/routers/api/packages/alpine/alpine.go +++ b/routers/api/packages/alpine/alpine.go @@ -13,16 +13,16 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - alpine_model "code.gitea.io/gitea/models/packages/alpine" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - alpine_service "code.gitea.io/gitea/services/packages/alpine" + packages_model "forgejo.org/models/packages" + alpine_model "forgejo.org/models/packages/alpine" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + alpine_module "forgejo.org/modules/packages/alpine" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + alpine_service "forgejo.org/services/packages/alpine" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/alt/alt.go b/routers/api/packages/alt/alt.go index 37a2b64563..a118459ce3 100644 --- a/routers/api/packages/alt/alt.go +++ b/routers/api/packages/alt/alt.go @@ -11,18 +11,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - alt_service "code.gitea.io/gitea/services/packages/alt" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" + alt_service "forgejo.org/services/packages/alt" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index ffc62254d0..ebd081ae77 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -8,37 +8,37 @@ import ( "regexp" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/packages/alpine" - "code.gitea.io/gitea/routers/api/packages/alt" - "code.gitea.io/gitea/routers/api/packages/arch" - "code.gitea.io/gitea/routers/api/packages/cargo" - "code.gitea.io/gitea/routers/api/packages/chef" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/routers/api/packages/conan" - "code.gitea.io/gitea/routers/api/packages/conda" - "code.gitea.io/gitea/routers/api/packages/container" - "code.gitea.io/gitea/routers/api/packages/cran" - "code.gitea.io/gitea/routers/api/packages/debian" - "code.gitea.io/gitea/routers/api/packages/generic" - "code.gitea.io/gitea/routers/api/packages/goproxy" - "code.gitea.io/gitea/routers/api/packages/helm" - "code.gitea.io/gitea/routers/api/packages/maven" - "code.gitea.io/gitea/routers/api/packages/npm" - "code.gitea.io/gitea/routers/api/packages/nuget" - "code.gitea.io/gitea/routers/api/packages/pub" - "code.gitea.io/gitea/routers/api/packages/pypi" - "code.gitea.io/gitea/routers/api/packages/rpm" - "code.gitea.io/gitea/routers/api/packages/rubygems" - "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/routers/api/packages/vagrant" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/routers/api/packages/alpine" + "forgejo.org/routers/api/packages/alt" + "forgejo.org/routers/api/packages/arch" + "forgejo.org/routers/api/packages/cargo" + "forgejo.org/routers/api/packages/chef" + "forgejo.org/routers/api/packages/composer" + "forgejo.org/routers/api/packages/conan" + "forgejo.org/routers/api/packages/conda" + "forgejo.org/routers/api/packages/container" + "forgejo.org/routers/api/packages/cran" + "forgejo.org/routers/api/packages/debian" + "forgejo.org/routers/api/packages/generic" + "forgejo.org/routers/api/packages/goproxy" + "forgejo.org/routers/api/packages/helm" + "forgejo.org/routers/api/packages/maven" + "forgejo.org/routers/api/packages/npm" + "forgejo.org/routers/api/packages/nuget" + "forgejo.org/routers/api/packages/pub" + "forgejo.org/routers/api/packages/pypi" + "forgejo.org/routers/api/packages/rpm" + "forgejo.org/routers/api/packages/rubygems" + "forgejo.org/routers/api/packages/swift" + "forgejo.org/routers/api/packages/vagrant" + "forgejo.org/services/auth" + "forgejo.org/services/context" ) func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) { diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index eedce5cdbc..a45f38dd08 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -13,15 +13,15 @@ import ( "regexp" "strings" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - arch_service "code.gitea.io/gitea/services/packages/arch" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + arch_module "forgejo.org/modules/packages/arch" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + arch_service "forgejo.org/services/packages/arch" ) var ( diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index 140e532efd..50dc8d1c3d 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -10,20 +10,20 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" - cargo_service "code.gitea.io/gitea/services/packages/cargo" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + cargo_module "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + "forgejo.org/services/convert" + packages_service "forgejo.org/services/packages" + cargo_service "forgejo.org/services/packages/cargo" ) // https://doc.rust-lang.org/cargo/reference/registries.html#web-api diff --git a/routers/api/packages/chef/auth.go b/routers/api/packages/chef/auth.go index a790e9a363..fc552c1f1b 100644 --- a/routers/api/packages/chef/auth.go +++ b/routers/api/packages/chef/auth.go @@ -23,10 +23,10 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth" + user_model "forgejo.org/models/user" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/util" + "forgejo.org/services/auth" ) const ( diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index b49f4e9d0a..909817861e 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -13,16 +13,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/composer/api.go b/routers/api/packages/composer/api.go index a3ea2c2f9a..dc491ea8a8 100644 --- a/routers/api/packages/composer/api.go +++ b/routers/api/packages/composer/api.go @@ -8,8 +8,8 @@ import ( "net/url" "time" - packages_model "code.gitea.io/gitea/models/packages" - composer_module "code.gitea.io/gitea/modules/packages/composer" + packages_model "forgejo.org/models/packages" + composer_module "forgejo.org/modules/packages/composer" ) // ServiceIndexResponse contains registry endpoints diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index a045da40de..9e67d419ec 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -12,17 +12,17 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + composer_module "forgejo.org/modules/packages/composer" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + "forgejo.org/services/convert" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/conan/auth.go b/routers/api/packages/conan/auth.go index e2e1901b08..1f5af77304 100644 --- a/routers/api/packages/conan/auth.go +++ b/routers/api/packages/conan/auth.go @@ -6,10 +6,10 @@ package conan import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/packages" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/services/auth" + "forgejo.org/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index e07907a8b1..927d131309 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -11,20 +11,20 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - conan_model "code.gitea.io/gitea/models/packages/conan" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + conan_model "forgejo.org/models/packages/conan" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/modules/setting" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/api/packages/conan/search.go b/routers/api/packages/conan/search.go index 7370c702cd..afc94afef5 100644 --- a/routers/api/packages/conan/search.go +++ b/routers/api/packages/conan/search.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - conan_model "code.gitea.io/gitea/models/packages/conan" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/services/context" + conan_model "forgejo.org/models/packages/conan" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/services/context" ) // SearchResult contains the found recipe names diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index c7e4544d52..52872d2543 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -10,16 +10,16 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - conda_model "code.gitea.io/gitea/models/packages/conda" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + conda_model "forgejo.org/models/packages/conda" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + conda_module "forgejo.org/modules/packages/conda" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/dsnet/compress/bzip2" ) diff --git a/routers/api/packages/container/auth.go b/routers/api/packages/container/auth.go index a8b3ec117a..71c237326e 100644 --- a/routers/api/packages/container/auth.go +++ b/routers/api/packages/container/auth.go @@ -6,10 +6,10 @@ package container import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/packages" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/services/auth" + "forgejo.org/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 24e52d0972..0e07b03c0c 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -12,14 +12,14 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" ) var uploadVersionMutex sync.Mutex diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index 9c9da38424..5276dd5706 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -14,20 +14,20 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" + auth_model "forgejo.org/models/auth" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + container_service "forgejo.org/services/packages/container" digest "github.com/opencontainers/go-digest" ) diff --git a/routers/api/packages/container/manifest.go b/routers/api/packages/container/manifest.go index 4a79a58f51..428e7605a6 100644 --- a/routers/api/packages/container/manifest.go +++ b/routers/api/packages/container/manifest.go @@ -11,17 +11,17 @@ import ( "os" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" digest "github.com/opencontainers/go-digest" oci "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/routers/api/packages/cran/cran.go b/routers/api/packages/cran/cran.go index f1d616724a..f73111278f 100644 --- a/routers/api/packages/cran/cran.go +++ b/routers/api/packages/cran/cran.go @@ -11,14 +11,14 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - cran_model "code.gitea.io/gitea/models/packages/cran" - packages_module "code.gitea.io/gitea/modules/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + cran_model "forgejo.org/models/packages/cran" + packages_module "forgejo.org/modules/packages" + cran_module "forgejo.org/modules/packages/cran" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go index 8c05476cbc..fd64e35657 100644 --- a/routers/api/packages/debian/debian.go +++ b/routers/api/packages/debian/debian.go @@ -11,16 +11,16 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - debian_service "code.gitea.io/gitea/services/packages/debian" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" + debian_service "forgejo.org/services/packages/debian" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index e66f3ee676..6e116e050d 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -10,12 +10,12 @@ import ( "strings" "unicode" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) var ( diff --git a/routers/api/packages/goproxy/goproxy.go b/routers/api/packages/goproxy/goproxy.go index 56a07dbd43..488850ecbf 100644 --- a/routers/api/packages/goproxy/goproxy.go +++ b/routers/api/packages/goproxy/goproxy.go @@ -11,14 +11,14 @@ import ( "sort" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - goproxy_module "code.gitea.io/gitea/modules/packages/goproxy" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + goproxy_module "forgejo.org/modules/packages/goproxy" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index efdb83ec0e..1d8efb8d68 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -12,17 +12,17 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + helm_module "forgejo.org/modules/packages/helm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "gopkg.in/yaml.v3" ) diff --git a/routers/api/packages/helper/helper.go b/routers/api/packages/helper/helper.go index cdb64109ad..99c0867bbb 100644 --- a/routers/api/packages/helper/helper.go +++ b/routers/api/packages/helper/helper.go @@ -9,10 +9,10 @@ import ( "net/http" "net/url" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // LogAndProcessError logs an error and calls a custom callback with the processed error message. diff --git a/routers/api/packages/maven/api.go b/routers/api/packages/maven/api.go index 167fe42b56..21d2aaa100 100644 --- a/routers/api/packages/maven/api.go +++ b/routers/api/packages/maven/api.go @@ -7,8 +7,8 @@ import ( "encoding/xml" "strings" - packages_model "code.gitea.io/gitea/models/packages" - maven_module "code.gitea.io/gitea/modules/packages/maven" + packages_model "forgejo.org/models/packages" + maven_module "forgejo.org/modules/packages/maven" ) // MetadataResponse https://maven.apache.org/ref/3.2.5/maven-repository-metadata/repository-metadata.html diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 92f20255e1..ea04a7b42e 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -19,15 +19,15 @@ import ( "strconv" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - maven_module "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + maven_module "forgejo.org/modules/packages/maven" + "forgejo.org/modules/sync" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/api/packages/npm/api.go b/routers/api/packages/npm/api.go index b4379f3f49..e610c29b4d 100644 --- a/routers/api/packages/npm/api.go +++ b/routers/api/packages/npm/api.go @@ -10,9 +10,9 @@ import ( "net/url" "sort" - packages_model "code.gitea.io/gitea/models/packages" - npm_module "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" + packages_model "forgejo.org/models/packages" + npm_module "forgejo.org/modules/packages/npm" + "forgejo.org/modules/setting" ) func createPackageMetadataResponse(registryURL string, pds []*packages_model.PackageDescriptor) *npm_module.PackageMetadata { diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index 84acfffae2..bf9d247b30 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -12,19 +12,19 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - npm_module "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + npm_module "forgejo.org/modules/packages/npm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/nuget/api_v2.go b/routers/api/packages/nuget/api_v2.go index 073b2700ef..13c93316d5 100644 --- a/routers/api/packages/nuget/api_v2.go +++ b/routers/api/packages/nuget/api_v2.go @@ -8,8 +8,8 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" + packages_model "forgejo.org/models/packages" + nuget_module "forgejo.org/modules/packages/nuget" ) type AtomTitle struct { diff --git a/routers/api/packages/nuget/api_v3.go b/routers/api/packages/nuget/api_v3.go index 2fe25dc0f8..f1f5300523 100644 --- a/routers/api/packages/nuget/api_v3.go +++ b/routers/api/packages/nuget/api_v3.go @@ -7,8 +7,8 @@ import ( "sort" "time" - packages_model "code.gitea.io/gitea/models/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" + packages_model "forgejo.org/models/packages" + nuget_module "forgejo.org/modules/packages/nuget" "golang.org/x/text/collate" "golang.org/x/text/language" diff --git a/routers/api/packages/nuget/auth.go b/routers/api/packages/nuget/auth.go index 1bb68d059b..bab08bb1b8 100644 --- a/routers/api/packages/nuget/auth.go +++ b/routers/api/packages/nuget/auth.go @@ -6,11 +6,11 @@ package nuget import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/auth" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/services/auth" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 0d7212d7f7..254f4311c1 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -14,18 +14,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - nuget_model "code.gitea.io/gitea/models/packages/nuget" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + nuget_model "forgejo.org/models/packages/nuget" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + nuget_module "forgejo.org/modules/packages/nuget" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index f87df52a29..1a1343083f 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -13,16 +13,16 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + pub_module "forgejo.org/modules/packages/pub" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func jsonResponse(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 19d6dc6903..360632570e 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -12,14 +12,14 @@ import ( "strings" "unicode" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - pypi_module "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + pypi_module "forgejo.org/modules/packages/pypi" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) // https://peps.python.org/pep-0426/#name diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index d56678514c..cdbf893183 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -11,18 +11,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - rpm_service "code.gitea.io/gitea/services/packages/rpm" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" + rpm_service "forgejo.org/services/packages/rpm" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index 28f584b391..eed19467ff 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -13,14 +13,14 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - rubygems_module "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + rubygems_module "forgejo.org/modules/packages/rubygems" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index fce2a36dd6..304230a85e 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -12,17 +12,17 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + swift_module "forgejo.org/modules/packages/swift" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go index 98a81da368..26131c2cf2 100644 --- a/routers/api/packages/vagrant/vagrant.go +++ b/routers/api/packages/vagrant/vagrant.go @@ -11,13 +11,13 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + vagrant_module "forgejo.org/modules/packages/vagrant" + "forgejo.org/modules/setting" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/shared/middleware.go b/routers/api/shared/middleware.go index 5e863cb9eb..f56acbe1bf 100644 --- a/routers/api/shared/middleware.go +++ b/routers/api/shared/middleware.go @@ -6,11 +6,11 @@ package shared import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/routers/common" + "forgejo.org/services/auth" + "forgejo.org/services/context" "github.com/go-chi/cors" ) diff --git a/routers/api/v1/activitypub/actor.go b/routers/api/v1/activitypub/actor.go index 4f128e74c4..7568a2a7c8 100644 --- a/routers/api/v1/activitypub/actor.go +++ b/routers/api/v1/activitypub/actor.go @@ -7,11 +7,11 @@ package activitypub import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index 995a148f0b..1da7933418 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/activitypub/repository.go b/routers/api/v1/activitypub/repository.go index 14381664d4..c506840f1c 100644 --- a/routers/api/v1/activitypub/repository.go +++ b/routers/api/v1/activitypub/repository.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/federation" + "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/federation" ap "github.com/go-ap/activitypub" ) diff --git a/routers/api/v1/activitypub/repository_test.go b/routers/api/v1/activitypub/repository_test.go index 1e5af6acac..8d448a4356 100644 --- a/routers/api/v1/activitypub/repository_test.go +++ b/routers/api/v1/activitypub/repository_test.go @@ -6,7 +6,7 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_UserEmailValidate(t *testing.T) { diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index 19d167b50b..a9bb4bd868 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -12,11 +12,11 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - gitea_context "code.gitea.io/gitea/services/context" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + gitea_context "forgejo.org/services/context" "github.com/42wim/httpsig" ap "github.com/go-ap/activitypub" diff --git a/routers/api/v1/activitypub/response.go b/routers/api/v1/activitypub/response.go index 42ef375f12..a97f363cc2 100644 --- a/routers/api/v1/activitypub/response.go +++ b/routers/api/v1/activitypub/response.go @@ -6,10 +6,10 @@ package activitypub import ( "net/http" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index a4708fe032..082411f2bc 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // ListUnadoptedRepositories lists the unadopted repositories that match the provided names diff --git a/routers/api/v1/admin/cron.go b/routers/api/v1/admin/cron.go index e1ca6048c9..5d68ab2dce 100644 --- a/routers/api/v1/admin/cron.go +++ b/routers/api/v1/admin/cron.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/cron" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/cron" ) // ListCronTasks api for getting cron tasks diff --git a/routers/api/v1/admin/email.go b/routers/api/v1/admin/email.go index ba963e9f69..906780a44b 100644 --- a/routers/api/v1/admin/email.go +++ b/routers/api/v1/admin/email.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetAllEmails diff --git a/routers/api/v1/admin/hooks.go b/routers/api/v1/admin/hooks.go index b246cb61b1..b3db2eb5e3 100644 --- a/routers/api/v1/admin/hooks.go +++ b/routers/api/v1/admin/hooks.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list system's webhooks diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index a5c299bbf0..d3a5cea056 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -7,14 +7,14 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // CreateOrg api for create organization diff --git a/routers/api/v1/admin/quota.go b/routers/api/v1/admin/quota.go index 1e7c11e007..c7da0e6398 100644 --- a/routers/api/v1/admin/quota.go +++ b/routers/api/v1/admin/quota.go @@ -6,9 +6,9 @@ package admin import ( "net/http" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + quota_model "forgejo.org/models/quota" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetUserQuota return information about a user's quota diff --git a/routers/api/v1/admin/quota_group.go b/routers/api/v1/admin/quota_group.go index e20b361eb5..afe33b639c 100644 --- a/routers/api/v1/admin/quota_group.go +++ b/routers/api/v1/admin/quota_group.go @@ -7,12 +7,12 @@ import ( go_context "context" "net/http" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListQuotaGroups returns all the quota groups diff --git a/routers/api/v1/admin/quota_rule.go b/routers/api/v1/admin/quota_rule.go index 85c05e1e9b..ea188107fa 100644 --- a/routers/api/v1/admin/quota_rule.go +++ b/routers/api/v1/admin/quota_rule.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - quota_model "code.gitea.io/gitea/models/quota" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + quota_model "forgejo.org/models/quota" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func toLimitSubjects(subjStrings []string) (*quota_model.LimitSubjects, error) { diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index c119d5390a..9f9118e0ab 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -4,10 +4,10 @@ package admin import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/repo" + "forgejo.org/services/context" ) // CreateRepo api for creating a repository diff --git a/routers/api/v1/admin/runners.go b/routers/api/v1/admin/runners.go index d0cfef8e48..e459b947ff 100644 --- a/routers/api/v1/admin/runners.go +++ b/routers/api/v1/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index db8f6627e6..32e1dd414d 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -10,26 +10,26 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" ) func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64) { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 3791a6fbba..2eb1ee4229 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -71,37 +71,37 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/shared" - "code.gitea.io/gitea/routers/api/v1/activitypub" - "code.gitea.io/gitea/routers/api/v1/admin" - "code.gitea.io/gitea/routers/api/v1/misc" - "code.gitea.io/gitea/routers/api/v1/notify" - "code.gitea.io/gitea/routers/api/v1/org" - "code.gitea.io/gitea/routers/api/v1/packages" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/settings" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/shared" + "forgejo.org/routers/api/v1/activitypub" + "forgejo.org/routers/api/v1/admin" + "forgejo.org/routers/api/v1/misc" + "forgejo.org/routers/api/v1/notify" + "forgejo.org/routers/api/v1/org" + "forgejo.org/routers/api/v1/packages" + "forgejo.org/routers/api/v1/repo" + "forgejo.org/routers/api/v1/settings" + "forgejo.org/routers/api/v1/user" + "forgejo.org/services/actions" + "forgejo.org/services/auth" + "forgejo.org/services/context" + "forgejo.org/services/forms" - _ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation + _ "forgejo.org/routers/api/v1/swagger" // for swagger generation "code.forgejo.org/go-chi/binding" ) diff --git a/routers/api/v1/misc/gitignore.go b/routers/api/v1/misc/gitignore.go index dffd771752..ec57038a9b 100644 --- a/routers/api/v1/misc/gitignore.go +++ b/routers/api/v1/misc/gitignore.go @@ -6,11 +6,11 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // Shows a list of all Gitignore templates diff --git a/routers/api/v1/misc/label_templates.go b/routers/api/v1/misc/label_templates.go index cc11f37626..dad5ee34c1 100644 --- a/routers/api/v1/misc/label_templates.go +++ b/routers/api/v1/misc/label_templates.go @@ -6,10 +6,10 @@ package misc import ( "net/http" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/util" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // Shows a list of all Label templates diff --git a/routers/api/v1/misc/licenses.go b/routers/api/v1/misc/licenses.go index 2a980f5084..c9b657a890 100644 --- a/routers/api/v1/misc/licenses.go +++ b/routers/api/v1/misc/licenses.go @@ -8,12 +8,12 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // Returns a list of all License templates diff --git a/routers/api/v1/misc/markup.go b/routers/api/v1/misc/markup.go index 155ad15712..e9f03fdd5c 100644 --- a/routers/api/v1/misc/markup.go +++ b/routers/api/v1/misc/markup.go @@ -6,12 +6,12 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" ) // Markup render markup document to HTML diff --git a/routers/api/v1/misc/markup_test.go b/routers/api/v1/misc/markup_test.go index 32568b805f..3335199e12 100644 --- a/routers/api/v1/misc/markup_test.go +++ b/routers/api/v1/misc/markup_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/misc/nodeinfo.go b/routers/api/v1/misc/nodeinfo.go index 70187e0ebf..9631de7edd 100644 --- a/routers/api/v1/misc/nodeinfo.go +++ b/routers/api/v1/misc/nodeinfo.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) const cacheKeyNodeInfoUsage = "API_NodeInfoUsage" diff --git a/routers/api/v1/misc/signing.go b/routers/api/v1/misc/signing.go index 24a46c1e70..945df6068f 100644 --- a/routers/api/v1/misc/signing.go +++ b/routers/api/v1/misc/signing.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" ) // SigningKey returns the public key of the default signing key if it exists diff --git a/routers/api/v1/misc/version.go b/routers/api/v1/misc/version.go index 3417475d21..5802c12462 100644 --- a/routers/api/v1/misc/version.go +++ b/routers/api/v1/misc/version.go @@ -6,9 +6,9 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) // Version shows the version of the Gitea server diff --git a/routers/api/v1/notify/notifications.go b/routers/api/v1/notify/notifications.go index 46b3c7f5e7..2e19fa0b9c 100644 --- a/routers/api/v1/notify/notifications.go +++ b/routers/api/v1/notify/notifications.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" ) // NewAvailable check if unread notifications exist diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go index 1744426ee8..64a9654d48 100644 --- a/routers/api/v1/notify/repo.go +++ b/routers/api/v1/notify/repo.go @@ -8,11 +8,11 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func statusStringToNotificationStatus(status string) activities_model.NotificationStatus { diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index 8e12d359cb..57c78f5f15 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetThread get notification by ID diff --git a/routers/api/v1/notify/user.go b/routers/api/v1/notify/user.go index 879f484cce..2b8cc8c112 100644 --- a/routers/api/v1/notify/user.go +++ b/routers/api/v1/notify/user.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListNotifications list users's notification threads diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go index 99e70e0740..0d8550a019 100644 --- a/routers/api/v1/org/action.go +++ b/routers/api/v1/org/action.go @@ -7,17 +7,17 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + secret_service "forgejo.org/services/secrets" ) // ListActionsSecrets list an organization's actions secrets diff --git a/routers/api/v1/org/avatar.go b/routers/api/v1/org/avatar.go index f11eb6c1cd..824a9f3495 100644 --- a/routers/api/v1/org/avatar.go +++ b/routers/api/v1/org/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // UpdateAvatarupdates the Avatar of an Organisation diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index c1dc0519ea..2877acd3c7 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -6,11 +6,11 @@ package org import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list an organziation's webhooks diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index b5ec54ccf4..172d531229 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/label" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListLabels list all the labels of an organization diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index 0895c53328..c6e67b2ab9 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -7,14 +7,14 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models" + "forgejo.org/models/organization" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // listMembers list an organization's members diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 7d503c3ad7..fcf2c6b412 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -8,21 +8,21 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/org" - user_service "code.gitea.io/gitea/services/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/org" + user_service "forgejo.org/services/user" ) func listUserOrgs(ctx *context.APIContext, u *user_model.User) { diff --git a/routers/api/v1/org/quota.go b/routers/api/v1/org/quota.go index 57c41f5ce3..f4f89b0aaf 100644 --- a/routers/api/v1/org/quota.go +++ b/routers/api/v1/org/quota.go @@ -4,8 +4,8 @@ package org import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // GetQuota returns the quota information for a given organization diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index bf28d54c42..680cc19ce8 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -8,22 +8,22 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) // ListTeams list all the teams of an organization diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go index a98b5dbc69..03057c4feb 100644 --- a/routers/api/v1/packages/package.go +++ b/routers/api/v1/packages/package.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + packages_service "forgejo.org/services/packages" ) // ListPackages gets all packages of an owner diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 2ce9ad253c..a39d4836e1 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -7,18 +7,18 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + "forgejo.org/services/convert" + secret_service "forgejo.org/services/secrets" ) // ListActionsSecrets list an repo's actions secrets diff --git a/routers/api/v1/repo/avatar.go b/routers/api/v1/repo/avatar.go index 698337ffd2..84aafe764d 100644 --- a/routers/api/v1/repo/avatar.go +++ b/routers/api/v1/repo/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // UpdateVatar updates the Avatar of an Repo diff --git a/routers/api/v1/repo/blob.go b/routers/api/v1/repo/blob.go index 3b116666ea..8ed57d4787 100644 --- a/routers/api/v1/repo/blob.go +++ b/routers/api/v1/repo/blob.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" ) // GetBlob get the blob of a repository file. diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 3ca97f7770..6263360a8e 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -9,22 +9,22 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" ) // GetBranch get a branch of a repository diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index 14915d31ba..3ef7721ef5 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -8,18 +8,18 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + repo_service "forgejo.org/services/repository" ) // ListCollaborators list a repository's collaborators diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go index c5e8cf99eb..4221e59f17 100644 --- a/routers/api/v1/repo/commits.go +++ b/routers/api/v1/repo/commits.go @@ -10,14 +10,14 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetSingleCommit get a commit via sha diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go index 7781e996f5..9c941ea07f 100644 --- a/routers/api/v1/repo/compare.go +++ b/routers/api/v1/repo/compare.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // CompareDiff compare two branches or commits diff --git a/routers/api/v1/repo/download.go b/routers/api/v1/repo/download.go index 3a0401a5b0..86910123e6 100644 --- a/routers/api/v1/repo/download.go +++ b/routers/api/v1/repo/download.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/services/context" - archiver_service "code.gitea.io/gitea/services/repository/archiver" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/services/context" + archiver_service "forgejo.org/services/repository/archiver" ) func DownloadArchive(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 55b245676d..fb71d76388 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -14,23 +14,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" + archiver_service "forgejo.org/services/repository/archiver" + files_service "forgejo.org/services/repository/files" ) const ( diff --git a/routers/api/v1/repo/flags.go b/routers/api/v1/repo/flags.go index ac5cb2e6d6..46af528f0f 100644 --- a/routers/api/v1/repo/flags.go +++ b/routers/api/v1/repo/flags.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" ) func ListFlags(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index c9dc9681c9..edb85cf54f 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -9,19 +9,19 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + repo_service "forgejo.org/services/repository" ) // ListForks list a repository's forks diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go index 26ae84d08d..31957c8b4d 100644 --- a/routers/api/v1/repo/git_hook.go +++ b/routers/api/v1/repo/git_hook.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListGitHooks list all Git hooks of a repository diff --git a/routers/api/v1/repo/git_ref.go b/routers/api/v1/repo/git_ref.go index 54da5eeaa7..b2e52ad95d 100644 --- a/routers/api/v1/repo/git_ref.go +++ b/routers/api/v1/repo/git_ref.go @@ -7,10 +7,10 @@ import ( "net/http" "net/url" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" ) // GetGitAllRefs get ref or an list all the refs of a repository diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index ffd2313591..5d277604b8 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -7,19 +7,19 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list all hooks of a repository diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go index a8065e4a60..77c86388f5 100644 --- a/routers/api/v1/repo/hook_test.go +++ b/routers/api/v1/repo/hook_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + "forgejo.org/models/webhook" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 57fc4b2f17..5495c4a6ba 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -12,23 +12,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // SearchIssues searches for issues across the repositories that the user has access to diff --git a/routers/api/v1/repo/issue_attachment.go b/routers/api/v1/repo/issue_attachment.go index a972ab0374..0cb1875af1 100644 --- a/routers/api/v1/repo/issue_attachment.go +++ b/routers/api/v1/repo/issue_attachment.go @@ -7,17 +7,17 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // GetIssueAttachment gets a single attachment of the issue diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 2fe7aaacb4..1b98c154c8 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -9,18 +9,18 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // ListIssueComments list all the comments of an issue diff --git a/routers/api/v1/repo/issue_comment_attachment.go b/routers/api/v1/repo/issue_comment_attachment.go index c45e2ebe89..9edc9a3cb1 100644 --- a/routers/api/v1/repo/issue_comment_attachment.go +++ b/routers/api/v1/repo/issue_comment_attachment.go @@ -7,17 +7,17 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // GetIssueCommentAttachment gets a single attachment of the comment diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go index c40e92c01b..bed1e7ecf9 100644 --- a/routers/api/v1/repo/issue_dependency.go +++ b/routers/api/v1/repo/issue_dependency.go @@ -7,15 +7,15 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetIssueDependencies list an issue's dependencies diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index 6458fbf514..85af1149ff 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -9,12 +9,12 @@ import ( "net/http" "reflect" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // ListIssueLabels list all the labels of an issue diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go index af3e06332a..84079ed452 100644 --- a/routers/api/v1/repo/issue_pin.go +++ b/routers/api/v1/repo/issue_pin.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // PinIssue pins a issue diff --git a/routers/api/v1/repo/issue_reaction.go b/routers/api/v1/repo/issue_reaction.go index c395255c13..2d6218bf46 100644 --- a/routers/api/v1/repo/issue_reaction.go +++ b/routers/api/v1/repo/issue_reaction.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // GetIssueCommentReactions list reactions of a comment from an issue diff --git a/routers/api/v1/repo/issue_stopwatch.go b/routers/api/v1/repo/issue_stopwatch.go index dd61967ed0..83bcabbe15 100644 --- a/routers/api/v1/repo/issue_stopwatch.go +++ b/routers/api/v1/repo/issue_stopwatch.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // StartIssueStopwatch creates a stopwatch for the given issue. diff --git a/routers/api/v1/repo/issue_subscription.go b/routers/api/v1/repo/issue_subscription.go index 6b29218575..33654dc136 100644 --- a/routers/api/v1/repo/issue_subscription.go +++ b/routers/api/v1/repo/issue_subscription.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // AddIssueSubscription Subscribe user to issue diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index 3d8abfa5f3..7d88b1b2cd 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -8,15 +8,15 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListTrackedTimes list all the tracked times of an issue diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index 88444a2625..2abf95a189 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -10,18 +10,18 @@ import ( "net/http" "net/url" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index b6eb51fd20..bf722ace34 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -8,13 +8,13 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/label" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListLabels list all the labels of a repository diff --git a/routers/api/v1/repo/language.go b/routers/api/v1/repo/language.go index f1d5bbe45f..498aac3447 100644 --- a/routers/api/v1/repo/language.go +++ b/routers/api/v1/repo/language.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) type languageResponse []*repo_model.LanguageStat diff --git a/routers/api/v1/repo/main_test.go b/routers/api/v1/repo/main_test.go index 451f34d72f..a3655fb76b 100644 --- a/routers/api/v1/repo/main_test.go +++ b/routers/api/v1/repo/main_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + webhook_service "forgejo.org/services/webhook" ) func TestMain(m *testing.M) { diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 723a696b92..d0ab5e270e 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -10,28 +10,28 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - notify_service "code.gitea.io/gitea/services/notify" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + notify_service "forgejo.org/services/notify" + repo_service "forgejo.org/services/repository" ) // Migrate migrate remote git repository to gitea diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index b9534016e4..7aa9881bc4 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -9,15 +9,15 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListMilestones list milestones for a repository diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go index 11b026abb7..bc48c6acb7 100644 --- a/routers/api/v1/repo/mirror.go +++ b/routers/api/v1/repo/mirror.go @@ -9,21 +9,21 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" + "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" ) // MirrorSync adds a mirrored repository to the sync queue diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go index 9ed78ce80f..87903d9f36 100644 --- a/routers/api/v1/repo/notes.go +++ b/routers/api/v1/repo/notes.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetNote Get a note corresponding to a single commit from a repository diff --git a/routers/api/v1/repo/patch.go b/routers/api/v1/repo/patch.go index 27c5c17dce..6f35891627 100644 --- a/routers/api/v1/repo/patch.go +++ b/routers/api/v1/repo/patch.go @@ -7,14 +7,14 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/repository/files" ) // ApplyDiffPatch handles API call for applying a patch diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 1a791e8dd5..25c85e7531 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -12,35 +12,35 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/automerge" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + "forgejo.org/services/gitdiff" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" ) // ListPullRequests returns a list of all PRs diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go index 8fba085ff7..aa4c7318a2 100644 --- a/routers/api/v1/repo/pull_review.go +++ b/routers/api/v1/repo/pull_review.go @@ -8,18 +8,18 @@ import ( "net/http" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" ) // ListPullReviews lists all reviews of a pull request diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 2fc5f095cb..68254a530a 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -7,18 +7,18 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - release_service "code.gitea.io/gitea/services/release" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + release_service "forgejo.org/services/release" ) // GetRelease get a single release of a repository diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index d569f6e928..ba273a8d2a 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -11,15 +11,15 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" ) func checkReleaseMatchRepo(ctx *context.APIContext, releaseID int64) bool { diff --git a/routers/api/v1/repo/release_tags.go b/routers/api/v1/repo/release_tags.go index f845fad53b..b27f8584bc 100644 --- a/routers/api/v1/repo/release_tags.go +++ b/routers/api/v1/repo/release_tags.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - releaseservice "code.gitea.io/gitea/services/release" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/context" + "forgejo.org/services/convert" + releaseservice "forgejo.org/services/release" ) // GetReleaseByTag get a single release of a repository by tag name diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 457f179f39..59b32eb667 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -11,32 +11,32 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/issue" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/issue" + repo_service "forgejo.org/services/repository" + wiki_service "forgejo.org/services/wiki" ) // Search repositories via options diff --git a/routers/api/v1/repo/repo_test.go b/routers/api/v1/repo/repo_test.go index 8d6ca9e3b5..69eeb1cfdf 100644 --- a/routers/api/v1/repo/repo_test.go +++ b/routers/api/v1/repo/repo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/star.go b/routers/api/v1/repo/star.go index 99676de119..7a836cd506 100644 --- a/routers/api/v1/repo/star.go +++ b/routers/api/v1/repo/star.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListStargazers list a repository's stargazers diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go index 9e36ea0aed..f02150f881 100644 --- a/routers/api/v1/repo/status.go +++ b/routers/api/v1/repo/status.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + commitstatus_service "forgejo.org/services/repository/commitstatus" ) // NewCommitStatus creates a new CommitStatus diff --git a/routers/api/v1/repo/subscriber.go b/routers/api/v1/repo/subscriber.go index 8584182857..37a2bef85c 100644 --- a/routers/api/v1/repo/subscriber.go +++ b/routers/api/v1/repo/subscriber.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListSubscribers list a repo's subscribers (i.e. watchers) diff --git a/routers/api/v1/repo/tag.go b/routers/api/v1/repo/tag.go index 7dbdd1fcbd..f53a6da811 100644 --- a/routers/api/v1/repo/tag.go +++ b/routers/api/v1/repo/tag.go @@ -9,17 +9,17 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - releaseservice "code.gitea.io/gitea/services/release" + "forgejo.org/models" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + releaseservice "forgejo.org/services/release" ) // ListTags list all the tags of a repository diff --git a/routers/api/v1/repo/teams.go b/routers/api/v1/repo/teams.go index 0ecf3a39d8..4e9d3c40a9 100644 --- a/routers/api/v1/repo/teams.go +++ b/routers/api/v1/repo/teams.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/organization" + "forgejo.org/services/context" + "forgejo.org/services/convert" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) // ListTeams list a repository's teams diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go index 1d8e675bde..daa637936e 100644 --- a/routers/api/v1/repo/topic.go +++ b/routers/api/v1/repo/topic.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListTopics returns list of current topics for repo diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go index 0715aed064..3b6cb4d3f2 100644 --- a/routers/api/v1/repo/transfer.go +++ b/routers/api/v1/repo/transfer.go @@ -8,19 +8,19 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + repo_service "forgejo.org/services/repository" ) // Transfer transfers the ownership of a repository diff --git a/routers/api/v1/repo/tree.go b/routers/api/v1/repo/tree.go index 353a996d5b..af92170abb 100644 --- a/routers/api/v1/repo/tree.go +++ b/routers/api/v1/repo/tree.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" ) // GetTree get the tree of a repository. diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 12aaa8edf8..bb4cf0f211 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -9,17 +9,17 @@ import ( "net/http" "net/url" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + notify_service "forgejo.org/services/notify" + wiki_service "forgejo.org/services/wiki" ) // NewWikiPage response for wiki create request diff --git a/routers/api/v1/settings/settings.go b/routers/api/v1/settings/settings.go index c422315b22..32ef50423c 100644 --- a/routers/api/v1/settings/settings.go +++ b/routers/api/v1/settings/settings.go @@ -6,9 +6,9 @@ package settings import ( "net/http" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" ) // GetGeneralUISettings returns instance's global settings for ui diff --git a/routers/api/v1/shared/quota.go b/routers/api/v1/shared/quota.go index b892df4b2f..ceba9fea57 100644 --- a/routers/api/v1/shared/quota.go +++ b/routers/api/v1/shared/quota.go @@ -6,10 +6,10 @@ package shared import ( "net/http" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + quota_model "forgejo.org/models/quota" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func GetQuota(ctx *context.APIContext, userID int64) { diff --git a/routers/api/v1/shared/runners.go b/routers/api/v1/shared/runners.go index 9c27078326..a7811a95b5 100644 --- a/routers/api/v1/shared/runners.go +++ b/routers/api/v1/shared/runners.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // RegistrationToken is a string used to register a runner with a server diff --git a/routers/api/v1/swagger/action.go b/routers/api/v1/swagger/action.go index 2174b1ff17..6fc58abd76 100644 --- a/routers/api/v1/swagger/action.go +++ b/routers/api/v1/swagger/action.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitea.io/gitea/modules/structs" +import api "forgejo.org/modules/structs" // SecretList // swagger:response SecretList diff --git a/routers/api/v1/swagger/activity.go b/routers/api/v1/swagger/activity.go index 95e1ba9035..64466e5e7b 100644 --- a/routers/api/v1/swagger/activity.go +++ b/routers/api/v1/swagger/activity.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // ActivityFeedsList diff --git a/routers/api/v1/swagger/activitypub.go b/routers/api/v1/swagger/activitypub.go index 91341669da..6235009572 100644 --- a/routers/api/v1/swagger/activitypub.go +++ b/routers/api/v1/swagger/activitypub.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // ActivityPub diff --git a/routers/api/v1/swagger/app.go b/routers/api/v1/swagger/app.go index 6a08b11874..7d62b6d494 100644 --- a/routers/api/v1/swagger/app.go +++ b/routers/api/v1/swagger/app.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // OAuth2Application diff --git a/routers/api/v1/swagger/cron.go b/routers/api/v1/swagger/cron.go index 00cfbe0adb..2c26b22441 100644 --- a/routers/api/v1/swagger/cron.go +++ b/routers/api/v1/swagger/cron.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // CronList diff --git a/routers/api/v1/swagger/issue.go b/routers/api/v1/swagger/issue.go index 62458a3424..b2b5de2228 100644 --- a/routers/api/v1/swagger/issue.go +++ b/routers/api/v1/swagger/issue.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Issue diff --git a/routers/api/v1/swagger/key.go b/routers/api/v1/swagger/key.go index 8390833589..27aa72458d 100644 --- a/routers/api/v1/swagger/key.go +++ b/routers/api/v1/swagger/key.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // PublicKey diff --git a/routers/api/v1/swagger/misc.go b/routers/api/v1/swagger/misc.go index 0553eac2a9..df95a94571 100644 --- a/routers/api/v1/swagger/misc.go +++ b/routers/api/v1/swagger/misc.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // ServerVersion diff --git a/routers/api/v1/swagger/nodeinfo.go b/routers/api/v1/swagger/nodeinfo.go index 8650dfa092..227db61648 100644 --- a/routers/api/v1/swagger/nodeinfo.go +++ b/routers/api/v1/swagger/nodeinfo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // NodeInfo diff --git a/routers/api/v1/swagger/notify.go b/routers/api/v1/swagger/notify.go index 743d807a0a..cd60ef2bcb 100644 --- a/routers/api/v1/swagger/notify.go +++ b/routers/api/v1/swagger/notify.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // NotificationThread diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 48c11c467f..4860f10c98 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -5,9 +5,9 @@ package swagger import ( - ffed "code.gitea.io/gitea/modules/forgefed" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + ffed "forgejo.org/modules/forgefed" + api "forgejo.org/modules/structs" + "forgejo.org/services/forms" ) // not actually a response, just a hack to get go-swagger to include definitions diff --git a/routers/api/v1/swagger/org.go b/routers/api/v1/swagger/org.go index 0105446b00..2d081708a8 100644 --- a/routers/api/v1/swagger/org.go +++ b/routers/api/v1/swagger/org.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Organization diff --git a/routers/api/v1/swagger/package.go b/routers/api/v1/swagger/package.go index eada12d1ea..dd1b45e9aa 100644 --- a/routers/api/v1/swagger/package.go +++ b/routers/api/v1/swagger/package.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Package diff --git a/routers/api/v1/swagger/quota.go b/routers/api/v1/swagger/quota.go index 35e633c39d..b2ea59fb31 100644 --- a/routers/api/v1/swagger/quota.go +++ b/routers/api/v1/swagger/quota.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // QuotaInfo diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go index ca214b4900..445e3417fb 100644 --- a/routers/api/v1/swagger/repo.go +++ b/routers/api/v1/swagger/repo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Repository diff --git a/routers/api/v1/swagger/settings.go b/routers/api/v1/swagger/settings.go index a9466699df..3a07eaf2e0 100644 --- a/routers/api/v1/swagger/settings.go +++ b/routers/api/v1/swagger/settings.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitea.io/gitea/modules/structs" +import api "forgejo.org/modules/structs" // GeneralRepoSettings // swagger:response GeneralRepoSettings diff --git a/routers/api/v1/swagger/user.go b/routers/api/v1/swagger/user.go index 37e28664fb..805cfe3df4 100644 --- a/routers/api/v1/swagger/user.go +++ b/routers/api/v1/swagger/user.go @@ -4,8 +4,8 @@ package swagger import ( - activities_model "code.gitea.io/gitea/models/activities" - api "code.gitea.io/gitea/modules/structs" + activities_model "forgejo.org/models/activities" + api "forgejo.org/modules/structs" ) // User diff --git a/routers/api/v1/user/action.go b/routers/api/v1/user/action.go index c34c5950c0..dd816cb7ae 100644 --- a/routers/api/v1/user/action.go +++ b/routers/api/v1/user/action.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + secret_service "forgejo.org/services/secrets" ) // create or update one secret of the user scope diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index c4fb2ea38d..138ad5a1d2 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListAccessTokens list all the access tokens diff --git a/routers/api/v1/user/avatar.go b/routers/api/v1/user/avatar.go index d3833a32bb..453682a37b 100644 --- a/routers/api/v1/user/avatar.go +++ b/routers/api/v1/user/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // UpdateAvatar updates the Avatar of an User diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 6bd7e10dd8..7b18ea97b0 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + user_service "forgejo.org/services/user" ) // ListEmails list all of the authenticated user's email addresses diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 784e2325a3..643ad49b80 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func responseAPIUsers(ctx *context.APIContext, users []*user_model.User) { diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 652007a78b..1581358b66 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) { diff --git a/routers/api/v1/user/helper.go b/routers/api/v1/user/helper.go index 8b5c64e291..fe0943091f 100644 --- a/routers/api/v1/user/helper.go +++ b/routers/api/v1/user/helper.go @@ -6,8 +6,8 @@ package user import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/services/context" ) // GetUserByParamsName get user by name diff --git a/routers/api/v1/user/hook.go b/routers/api/v1/user/hook.go index 47b6498d85..c8cdf5040d 100644 --- a/routers/api/v1/user/hook.go +++ b/routers/api/v1/user/hook.go @@ -6,11 +6,11 @@ package user import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list the authenticated user's webhooks diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index 1b4ba0a40f..3aecf5fc3a 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -8,18 +8,18 @@ import ( "fmt" "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/repo" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/user/quota.go b/routers/api/v1/user/quota.go index ab2881b355..40c8ee43e9 100644 --- a/routers/api/v1/user/quota.go +++ b/routers/api/v1/user/quota.go @@ -4,8 +4,8 @@ package user import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // GetQuota returns the quota information for the authenticated user diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go index 7df13ee413..7b326812a7 100644 --- a/routers/api/v1/user/repo.go +++ b/routers/api/v1/user/repo.go @@ -6,13 +6,13 @@ package user import ( "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // listUserRepos - List the repositories owned by the given user. diff --git a/routers/api/v1/user/runners.go b/routers/api/v1/user/runners.go index 5e8cdbeb58..579e3eb932 100644 --- a/routers/api/v1/user/runners.go +++ b/routers/api/v1/user/runners.go @@ -4,8 +4,8 @@ package user import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/user/settings.go b/routers/api/v1/user/settings.go index 67ab0dd964..134b448718 100644 --- a/routers/api/v1/user/settings.go +++ b/routers/api/v1/user/settings.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + user_service "forgejo.org/services/user" ) // GetUserSettings returns user settings diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go index be84b13204..19fa49f2ad 100644 --- a/routers/api/v1/user/star.go +++ b/routers/api/v1/user/star.go @@ -9,15 +9,15 @@ import ( std_context "context" "net/http" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/repository" ) // getStarredRepos returns the repos that the user with the specified userID has diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index da1250b283..5bdd56c892 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -8,12 +8,12 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // Search search users diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index dc27a38a03..1358a63f51 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -7,14 +7,14 @@ import ( std_context "context" "net/http" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // getWatchedRepos returns the repos that the user with the specified userID is watching diff --git a/routers/api/v1/utils/block.go b/routers/api/v1/utils/block.go index 34fad96034..a1f044d1ef 100644 --- a/routers/api/v1/utils/block.go +++ b/routers/api/v1/utils/block.go @@ -6,10 +6,10 @@ package utils import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // ListUserBlockedUsers lists the blocked users of the provided doer. diff --git a/routers/api/v1/utils/git.go b/routers/api/v1/utils/git.go index 4e25137817..5359a54899 100644 --- a/routers/api/v1/utils/git.go +++ b/routers/api/v1/utils/git.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // ResolveRefOrSha resolve ref to sha if exist diff --git a/routers/api/v1/utils/hook.go b/routers/api/v1/utils/hook.go index f1abd49a7d..d882845008 100644 --- a/routers/api/v1/utils/hook.go +++ b/routers/api/v1/utils/hook.go @@ -9,16 +9,16 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListOwnerHooks lists the webhooks of the provided owner diff --git a/routers/api/v1/utils/page.go b/routers/api/v1/utils/page.go index 024ba7b8d9..4ab141ca64 100644 --- a/routers/api/v1/utils/page.go +++ b/routers/api/v1/utils/page.go @@ -4,9 +4,9 @@ package utils import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetListOptions returns list options using the page and limit parameters diff --git a/routers/common/auth.go b/routers/common/auth.go index 722c625e7b..d4b3b1fea7 100644 --- a/routers/common/auth.go +++ b/routers/common/auth.go @@ -4,10 +4,10 @@ package common import ( - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/web/middleware" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/context" ) type AuthResult struct { diff --git a/routers/common/compare.go b/routers/common/compare.go index 4d1cc2f0d8..9c158814d1 100644 --- a/routers/common/compare.go +++ b/routers/common/compare.go @@ -4,9 +4,9 @@ package common import ( - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" ) // CompareInfo represents the collected results from ParseCompareInfo diff --git a/routers/common/db.go b/routers/common/db.go index ac24303989..0646071264 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + system_model "forgejo.org/models/system" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" "xorm.io/xorm" ) diff --git a/routers/common/errpage.go b/routers/common/errpage.go index 402ca44c12..907c278ab1 100644 --- a/routers/common/errpage.go +++ b/routers/common/errpage.go @@ -7,15 +7,15 @@ import ( "fmt" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web/middleware" + "forgejo.org/modules/web/routing" + "forgejo.org/services/context" ) const tplStatus500 base.TplName = "status/500" diff --git a/routers/common/errpage_test.go b/routers/common/errpage_test.go index f15d3f1b35..3a492ea304 100644 --- a/routers/common/errpage_test.go +++ b/routers/common/errpage_test.go @@ -10,9 +10,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web/middleware" + "forgejo.org/models/unittest" + "forgejo.org/modules/test" + "forgejo.org/modules/web/middleware" "github.com/stretchr/testify/assert" ) diff --git a/routers/common/markup.go b/routers/common/markup.go index ce3a8acdb0..715d7d883f 100644 --- a/routers/common/markup.go +++ b/routers/common/markup.go @@ -9,11 +9,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/services/context" "mvdan.cc/xurls/v2" ) diff --git a/routers/common/middleware.go b/routers/common/middleware.go index ee2e504ff1..d44f046a1e 100644 --- a/routers/common/middleware.go +++ b/routers/common/middleware.go @@ -9,12 +9,12 @@ import ( "runtime/trace" "strings" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/cache" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" + "forgejo.org/modules/web/routing" + "forgejo.org/services/context" "code.forgejo.org/go-chi/session" "github.com/chi-middleware/proxy" diff --git a/routers/common/middleware_test.go b/routers/common/middleware_test.go index 6126e0afcc..b9c1b226e8 100644 --- a/routers/common/middleware_test.go +++ b/routers/common/middleware_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/web" + "forgejo.org/modules/web" chi "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/routers/common/redirect.go b/routers/common/redirect.go index 9bf2025e19..8c13911a9c 100644 --- a/routers/common/redirect.go +++ b/routers/common/redirect.go @@ -6,7 +6,7 @@ package common import ( "net/http" - "code.gitea.io/gitea/modules/httplib" + "forgejo.org/modules/httplib" ) // FetchRedirectDelegate helps the "fetch" requests to redirect to the correct location diff --git a/routers/common/serve.go b/routers/common/serve.go index 446908db75..9d017ec5a1 100644 --- a/routers/common/serve.go +++ b/routers/common/serve.go @@ -7,11 +7,11 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/git" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // ServeBlob download a git.Blob diff --git a/routers/init.go b/routers/init.go index 821a0ef38c..90a1cb1e89 100644 --- a/routers/init.go +++ b/routers/init.go @@ -8,50 +8,50 @@ import ( "reflect" "runtime" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - authmodel "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/external" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/ssh" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/system" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - actions_router "code.gitea.io/gitea/routers/api/actions" - forgejo "code.gitea.io/gitea/routers/api/forgejo/v1" - packages_router "code.gitea.io/gitea/routers/api/packages" - apiv1 "code.gitea.io/gitea/routers/api/v1" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/private" - web_routers "code.gitea.io/gitea/routers/web" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/cron" - feed_service "code.gitea.io/gitea/services/feed" - indexer_service "code.gitea.io/gitea/services/indexer" - "code.gitea.io/gitea/services/mailer" - mailer_incoming "code.gitea.io/gitea/services/mailer/incoming" - markup_service "code.gitea.io/gitea/services/markup" - repo_migrations "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/repository/archiver" - "code.gitea.io/gitea/services/task" - "code.gitea.io/gitea/services/uinotification" - "code.gitea.io/gitea/services/webhook" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + authmodel "forgejo.org/models/auth" + "forgejo.org/modules/cache" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/git" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/external" + "forgejo.org/modules/setting" + "forgejo.org/modules/ssh" + "forgejo.org/modules/storage" + "forgejo.org/modules/svg" + "forgejo.org/modules/system" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web" + actions_router "forgejo.org/routers/api/actions" + forgejo "forgejo.org/routers/api/forgejo/v1" + packages_router "forgejo.org/routers/api/packages" + apiv1 "forgejo.org/routers/api/v1" + "forgejo.org/routers/common" + "forgejo.org/routers/private" + web_routers "forgejo.org/routers/web" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/automerge" + "forgejo.org/services/cron" + feed_service "forgejo.org/services/feed" + indexer_service "forgejo.org/services/indexer" + "forgejo.org/services/mailer" + mailer_incoming "forgejo.org/services/mailer/incoming" + markup_service "forgejo.org/services/markup" + repo_migrations "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + pull_service "forgejo.org/services/pull" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" + "forgejo.org/services/repository/archiver" + "forgejo.org/services/task" + "forgejo.org/services/uinotification" + "forgejo.org/services/webhook" ) func mustInit(fn func() error) { diff --git a/routers/install/install.go b/routers/install/install.go index 86e342f1f9..b9333a9e16 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -15,25 +15,25 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - db_install "code.gitea.io/gitea/models/db/install" - "code.gitea.io/gitea/models/migrations" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + db_install "forgejo.org/models/db/install" + "forgejo.org/models/migrations" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/base" + "forgejo.org/modules/generate" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/routers/common" + "forgejo.org/services/context" + "forgejo.org/services/forms" "code.forgejo.org/go-chi/session" ) diff --git a/routers/install/routes.go b/routers/install/routes.go index 06c9d389a6..f7fb40f688 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -8,12 +8,12 @@ import ( "html" "net/http" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/services/forms" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/routers/web/healthcheck" + "forgejo.org/services/forms" ) // Routes registers the installation routes diff --git a/routers/install/routes_test.go b/routers/install/routes_test.go index 2aa7f5d7b7..a504cf1baa 100644 --- a/routers/install/routes_test.go +++ b/routers/install/routes_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/actions.go b/routers/private/actions.go index 425c480b3e..441fb881ed 100644 --- a/routers/private/actions.go +++ b/routers/private/actions.go @@ -10,14 +10,14 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // GenerateActionsRunnerToken generates a new runner token for a given scope diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go index af5d75634b..da185e1ab1 100644 --- a/routers/private/default_branch.go +++ b/routers/private/default_branch.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/private" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/private" + gitea_context "forgejo.org/services/context" ) // SetDefaultBranch updates the default branch diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index 11d1161e85..c7748b01c8 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -10,25 +10,25 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - timeutil "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - gitea_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + timeutil "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + gitea_context "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // HookPostReceive updates services and users diff --git a/routers/private/hook_post_receive_test.go b/routers/private/hook_post_receive_test.go index 28f1a7d0be..bbd0c45769 100644 --- a/routers/private/hook_post_receive_test.go +++ b/routers/private/hook_post_receive_test.go @@ -6,15 +6,15 @@ package private import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/private" + repo_module "forgejo.org/modules/repository" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/private/hook_pre_receive.go b/routers/private/hook_pre_receive.go index 4b8439d2da..191273209e 100644 --- a/routers/private/hook_pre_receive.go +++ b/routers/private/hook_pre_receive.go @@ -9,22 +9,22 @@ import ( "net/http" "os" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - gitea_context "code.gitea.io/gitea/services/context" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + gitea_context "forgejo.org/services/context" + pull_service "forgejo.org/services/pull" ) type preReceiveContext struct { diff --git a/routers/private/hook_proc_receive.go b/routers/private/hook_proc_receive.go index e4aabd858c..cd45794261 100644 --- a/routers/private/hook_proc_receive.go +++ b/routers/private/hook_proc_receive.go @@ -6,13 +6,13 @@ package private import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/agit" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/web" + "forgejo.org/services/agit" + gitea_context "forgejo.org/services/context" ) // HookProcReceive proc-receive hook - only handles agit Proc-Receive requests at present diff --git a/routers/private/hook_verification.go b/routers/private/hook_verification.go index 764c976fa9..e9a1967bd2 100644 --- a/routers/private/hook_verification.go +++ b/routers/private/hook_verification.go @@ -10,9 +10,9 @@ import ( "io" "os" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // This file contains commit verification functions for refs passed across in hooks diff --git a/routers/private/hook_verification_test.go b/routers/private/hook_verification_test.go index 47e06245ed..35458f672e 100644 --- a/routers/private/hook_verification_test.go +++ b/routers/private/hook_verification_test.go @@ -6,8 +6,8 @@ package private import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/require" ) diff --git a/routers/private/internal.go b/routers/private/internal.go index dfbdc6967b..5e8d51d970 100644 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -9,11 +9,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/private/internal_repo.go b/routers/private/internal_repo.go index e8ee8ba8ac..f237d2c676 100644 --- a/routers/private/internal_repo.go +++ b/routers/private/internal_repo.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + gitea_context "forgejo.org/services/context" ) // This file contains common functions relating to setting the Repository for the internal routes diff --git a/routers/private/key.go b/routers/private/key.go index 5b8f238a83..2d77c9c5be 100644 --- a/routers/private/key.go +++ b/routers/private/key.go @@ -6,10 +6,10 @@ package private import ( "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/context" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/private" + "forgejo.org/modules/timeutil" + "forgejo.org/services/context" ) // UpdatePublicKeyInRepo update public key and deploy key updates diff --git a/routers/private/mail.go b/routers/private/mail.go index cf3abb31c6..2b96ce910e 100644 --- a/routers/private/mail.go +++ b/routers/private/mail.go @@ -9,14 +9,14 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/mailer" ) // SendEmail pushes messages to mail queue diff --git a/routers/private/main_test.go b/routers/private/main_test.go index a6bec72b41..1b7f00f439 100644 --- a/routers/private/main_test.go +++ b/routers/private/main_test.go @@ -6,7 +6,7 @@ package private import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/private/manager.go b/routers/private/manager.go index a6aa03e4ec..7ab198f71b 100644 --- a/routers/private/manager.go +++ b/routers/private/manager.go @@ -7,16 +7,16 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/modules/graceful" + "forgejo.org/modules/graceful/releasereopen" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web" + "forgejo.org/services/context" ) // ReloadTemplates reloads all the templates diff --git a/routers/private/manager_process.go b/routers/private/manager_process.go index 9a0298a37c..87447da2be 100644 --- a/routers/private/manager_process.go +++ b/routers/private/manager_process.go @@ -11,10 +11,10 @@ import ( "runtime" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - process_module "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + process_module "forgejo.org/modules/process" + "forgejo.org/services/context" ) // Processes prints out the processes diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go index 311bfe6858..c831b44036 100644 --- a/routers/private/manager_unix.go +++ b/routers/private/manager_unix.go @@ -6,8 +6,8 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/graceful" + "forgejo.org/services/context" ) // Restart causes the server to perform a graceful restart diff --git a/routers/private/restore_repo.go b/routers/private/restore_repo.go index 4e95d3071d..6586c9bb2b 100644 --- a/routers/private/restore_repo.go +++ b/routers/private/restore_repo.go @@ -7,10 +7,10 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/private" - myCtx "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/migrations" + "forgejo.org/modules/json" + "forgejo.org/modules/private" + myCtx "forgejo.org/services/context" + "forgejo.org/services/migrations" ) // RestoreRepo restore a repository from data diff --git a/routers/private/serv.go b/routers/private/serv.go index ef3920d359..df61355fb0 100644 --- a/routers/private/serv.go +++ b/routers/private/serv.go @@ -8,19 +8,19 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" + wiki_service "forgejo.org/services/wiki" ) // ServNoCommand returns information about the provided keyid diff --git a/routers/private/ssh_log.go b/routers/private/ssh_log.go index 5bec632ead..f6974967c0 100644 --- a/routers/private/ssh_log.go +++ b/routers/private/ssh_log.go @@ -6,11 +6,11 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" ) // SSHLog hook to response ssh log diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index 067203b28b..96a714376b 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -11,20 +11,20 @@ import ( "runtime" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/updatechecker" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/cron" - "code.gitea.io/gitea/services/forms" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/updatechecker" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/cron" + "forgejo.org/services/forms" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/admin/admin_test.go b/routers/web/admin/admin_test.go index 3518869ede..d0c3c2b56f 100644 --- a/routers/web/admin/admin_test.go +++ b/routers/web/admin/admin_test.go @@ -6,11 +6,11 @@ package admin import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/contexttest" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/admin/applications.go b/routers/web/admin/applications.go index 8583398074..ba15e0a000 100644 --- a/routers/web/admin/applications.go +++ b/routers/web/admin/applications.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" ) var ( diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 8af14f6d52..2c6dc76305 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -10,20 +10,20 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - "code.gitea.io/gitea/services/auth/source/oauth2" - pam_service "code.gitea.io/gitea/services/auth/source/pam" - "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/auth/pam" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/auth/source/ldap" + "forgejo.org/services/auth/source/oauth2" + pam_service "forgejo.org/services/auth/source/pam" + "forgejo.org/services/auth/source/smtp" + "forgejo.org/services/context" + "forgejo.org/services/forms" "xorm.io/xorm/convert" ) diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 06d0ea60fb..f99a193960 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -10,17 +10,17 @@ import ( "strconv" "strings" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" + system_model "forgejo.org/models/system" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" + "forgejo.org/modules/util" + "forgejo.org/services/context" + "forgejo.org/services/mailer" "code.forgejo.org/go-chi/session" ) diff --git a/routers/web/admin/diagnosis.go b/routers/web/admin/diagnosis.go index 959c9bc444..e436dca663 100644 --- a/routers/web/admin/diagnosis.go +++ b/routers/web/admin/diagnosis.go @@ -11,8 +11,8 @@ import ( "runtime/trace" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/httplib" + "forgejo.org/services/context" ) func MonitorDiagnosis(ctx *context.Context) { diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index f0d8555070..a4421cf495 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -8,14 +8,14 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/user" ) const ( diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index cdca0a5c2d..aeceffe848 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) const ( diff --git a/routers/web/admin/main_test.go b/routers/web/admin/main_test.go index e1294ddbb4..bccb0d7058 100644 --- a/routers/web/admin/main_test.go +++ b/routers/web/admin/main_test.go @@ -6,7 +6,7 @@ package admin import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/admin/notice.go b/routers/web/admin/notice.go index 36303cbc06..8bcaadf915 100644 --- a/routers/web/admin/notice.go +++ b/routers/web/admin/notice.go @@ -8,12 +8,12 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + system_model "forgejo.org/models/system" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index cea28f8220..6ece35dcaf 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -5,13 +5,13 @@ package admin import ( - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/routers/web/explore" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 39f064a1be..5c80a1eada 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -8,14 +8,14 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/base" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + packages_cleanup_service "forgejo.org/services/packages/cleanup" ) const ( diff --git a/routers/web/admin/queue.go b/routers/web/admin/queue.go index 246ab379b5..03bbfe5af4 100644 --- a/routers/web/admin/queue.go +++ b/routers/web/admin/queue.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) func Queues(ctx *context.Context) { diff --git a/routers/web/admin/queue_tester.go b/routers/web/admin/queue_tester.go index 8f713b3bb1..831947fe41 100644 --- a/routers/web/admin/queue_tester.go +++ b/routers/web/admin/queue_tester.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) var testQueueOnce sync.Once diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index d0339fdd93..a94b9bb5c3 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -8,16 +8,16 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/web/explore" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index d73290a8db..c6451a9329 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/admin/stacktrace.go b/routers/web/admin/stacktrace.go index d6def94bb4..7c6cd98a56 100644 --- a/routers/web/admin/stacktrace.go +++ b/routers/web/admin/stacktrace.go @@ -7,9 +7,9 @@ import ( "net/http" "runtime" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // Stacktrace show admin monitor goroutines page diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 36ce8d286c..f53a0197cb 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -11,26 +11,26 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/explore" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models" + "forgejo.org/models/auth" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/web/explore" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" ) const ( diff --git a/routers/web/admin/users_test.go b/routers/web/admin/users_test.go index ae3b130101..c8e6f8cb86 100644 --- a/routers/web/admin/users_test.go +++ b/routers/web/admin/users_test.go @@ -6,13 +6,13 @@ package admin import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/auth/2fa.go b/routers/web/auth/2fa.go index f93177bf96..7acf9a87d3 100644 --- a/routers/web/auth/2fa.go +++ b/routers/web/auth/2fa.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" ) var ( diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 1d00c97b6e..755126b8e0 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -11,30 +11,30 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - notify_service "code.gitea.io/gitea/services/notify" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/session" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + notify_service "forgejo.org/services/notify" + user_service "forgejo.org/services/user" "github.com/markbates/goth" ) diff --git a/routers/web/auth/auth_test.go b/routers/web/auth/auth_test.go index c6afbf877c..7a33a3841c 100644 --- a/routers/web/auth/auth_test.go +++ b/routers/web/auth/auth_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/modules/test" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/auth/linkaccount.go b/routers/web/auth/linkaccount.go index e6c9089380..9566652751 100644 --- a/routers/web/auth/linkaccount.go +++ b/routers/web/auth/linkaccount.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" "github.com/markbates/goth" ) diff --git a/routers/web/auth/main_test.go b/routers/web/auth/main_test.go index b438e5d518..a8a32b71f2 100644 --- a/routers/web/auth/main_test.go +++ b/routers/web/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 62b7b0b6d3..f1554638cb 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -17,29 +17,29 @@ import ( "sort" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - source_service "code.gitea.io/gitea/services/auth/source" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" - remote_service "code.gitea.io/gitea/services/remote" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + auth_module "forgejo.org/modules/auth" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + auth_service "forgejo.org/services/auth" + source_service "forgejo.org/services/auth/source" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" + remote_service "forgejo.org/services/remote" + user_service "forgejo.org/services/user" "code.forgejo.org/go-chi/binding" "github.com/golang-jwt/jwt/v5" diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go index a5f2dd7713..6275d63382 100644 --- a/routers/web/auth/oauth_test.go +++ b/routers/web/auth/oauth_test.go @@ -6,12 +6,12 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/auth/source/oauth2" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/services/auth/source/oauth2" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/routers/web/auth/openid.go b/routers/web/auth/openid.go index 83268faacb..b12dea84ea 100644 --- a/routers/web/auth/openid.go +++ b/routers/web/auth/openid.go @@ -8,16 +8,16 @@ import ( "net/http" "net/url" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/openid" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/auth" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index 84f343bfca..82c2d4e9d3 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -8,20 +8,20 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" ) var ( diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go index 5c93c1410e..ac69e03389 100644 --- a/routers/web/auth/webauthn.go +++ b/routers/web/auth/webauthn.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - wa "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + wa "forgejo.org/modules/auth/webauthn" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/base.go b/routers/web/base.go index 285d1ecddc..c1bc7fef5e 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -11,12 +11,12 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/routing" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/web/routing" ) func storageHandler(storageSetting *setting.Storage, prefix string, objStore storage.ObjectStorage) http.HandlerFunc { diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index dd20663f94..37496ca117 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/templates" + "forgejo.org/services/context" ) // List all devtest templates, they will be used for e2e tests for the UI components diff --git a/routers/web/events/events.go b/routers/web/events/events.go index 52f20e07dc..1672f12bda 100644 --- a/routers/web/events/events.go +++ b/routers/web/events/events.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/routers/web/auth" + "forgejo.org/services/context" ) // Events listens for events diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 0a4e828c71..f0b12e9142 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -6,12 +6,12 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index d13271ae53..6c9293e959 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -4,12 +4,12 @@ package explore import ( - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) // Organizations render explore organizations page diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 798fdf5654..0707420a8d 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/sitemap" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/explore/topic.go b/routers/web/explore/topic.go index 95fecfe2b8..3b67bd48b1 100644 --- a/routers/web/explore/topic.go +++ b/routers/web/explore/topic.go @@ -6,11 +6,11 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // TopicSearch search for creating topic diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 241e5f61a1..e349bb1e92 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -7,16 +7,16 @@ import ( "bytes" "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/sitemap" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/feed/branch.go b/routers/web/feed/branch.go index a8a001e0cd..2337b43d4c 100644 --- a/routers/web/feed/branch.go +++ b/routers/web/feed/branch.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/repo" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/convert.go b/routers/web/feed/convert.go index 5f7687d803..24532334ea 100644 --- a/routers/web/feed/convert.go +++ b/routers/web/feed/convert.go @@ -12,16 +12,16 @@ import ( "strconv" "strings" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/util" + "forgejo.org/services/context" "github.com/gorilla/feeds" "github.com/jaytaylor/html2text" diff --git a/routers/web/feed/file.go b/routers/web/feed/file.go index 48f87c7c62..45ceedac12 100644 --- a/routers/web/feed/file.go +++ b/routers/web/feed/file.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/util" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index 08cbcd9e12..dd2fec186f 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -6,10 +6,10 @@ package feed import ( "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/release.go b/routers/web/feed/release.go index fb6e3add65..646241c021 100644 --- a/routers/web/feed/release.go +++ b/routers/web/feed/release.go @@ -6,9 +6,9 @@ package feed import ( "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/render.go b/routers/web/feed/render.go index dc99fb49ed..79681dd0fb 100644 --- a/routers/web/feed/render.go +++ b/routers/web/feed/render.go @@ -4,7 +4,7 @@ package feed import ( - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" ) // RenderBranchFeed render format for branch or file diff --git a/routers/web/feed/repo.go b/routers/web/feed/repo.go index a0033c7d45..0d105dc3a7 100644 --- a/routers/web/feed/repo.go +++ b/routers/web/feed/repo.go @@ -6,9 +6,9 @@ package feed import ( "time" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/githttp.go b/routers/web/githttp.go index 5f1dedce76..e5ed806f2e 100644 --- a/routers/web/githttp.go +++ b/routers/web/githttp.go @@ -6,10 +6,10 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" ) func requireSignIn(ctx *context.Context) { diff --git a/routers/web/goget.go b/routers/web/goget.go index 8d5612ebfe..0fcd755ca1 100644 --- a/routers/web/goget.go +++ b/routers/web/goget.go @@ -11,10 +11,10 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) func goGet(ctx *context.Context) { diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go index 83dfe62537..f0b51aa515 100644 --- a/routers/web/healthcheck/check.go +++ b/routers/web/healthcheck/check.go @@ -9,11 +9,11 @@ import ( "os" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/cache" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type status string diff --git a/routers/web/home.go b/routers/web/home.go index 4ea961c055..e0a466a81c 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -8,19 +8,19 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/routers/web/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/sitemap" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/routers/web/auth" + "forgejo.org/routers/web/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/metrics.go b/routers/web/metrics.go index 46c13f0a24..8c188e206e 100644 --- a/routers/web/metrics.go +++ b/routers/web/metrics.go @@ -7,7 +7,7 @@ import ( "crypto/subtle" "net/http" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/routers/web/misc/markup.go b/routers/web/misc/markup.go index 2bae122b91..d2b67f88c8 100644 --- a/routers/web/misc/markup.go +++ b/routers/web/misc/markup.go @@ -5,10 +5,10 @@ package misc import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" ) // Markup render markup document to HTML diff --git a/routers/web/misc/misc.go b/routers/web/misc/misc.go index 54c93763f6..306b15e3d5 100644 --- a/routers/web/misc/misc.go +++ b/routers/web/misc/misc.go @@ -7,11 +7,11 @@ import ( "net/http" "path" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) func SSHInfo(rw http.ResponseWriter, req *http.Request) { diff --git a/routers/web/misc/swagger-forgejo.go b/routers/web/misc/swagger-forgejo.go index e3aff02c5f..17e3814712 100644 --- a/routers/web/misc/swagger-forgejo.go +++ b/routers/web/misc/swagger-forgejo.go @@ -6,8 +6,8 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/services/context" ) // tplSwagger swagger page template diff --git a/routers/web/misc/swagger.go b/routers/web/misc/swagger.go index 5fddfa8885..226dddaff2 100644 --- a/routers/web/misc/swagger.go +++ b/routers/web/misc/swagger.go @@ -6,8 +6,8 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/services/context" ) // tplSwagger swagger page template diff --git a/routers/web/nodeinfo.go b/routers/web/nodeinfo.go index f1cc7bf530..d8c1727479 100644 --- a/routers/web/nodeinfo.go +++ b/routers/web/nodeinfo.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) type nodeInfoLinks struct { diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 1b58d8fde9..a3823565ed 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -9,18 +9,18 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/main_test.go b/routers/web/org/main_test.go index 92237d6e88..d1d4e89120 100644 --- a/routers/web/org/main_test.go +++ b/routers/web/org/main_test.go @@ -6,7 +6,7 @@ package org_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 3a5509f911..51ac566e1a 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -7,13 +7,13 @@ package org import ( "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models" + "forgejo.org/models/organization" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/org.go b/routers/web/org/org.go index dd3aab458b..e9907c04af 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -8,15 +8,15 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 02eae8052e..dc18c55aa3 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -6,13 +6,13 @@ package org import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/label" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // RetrieveLabels find all the labels of an organization diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 034483aba2..96bd0f1ee2 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -9,20 +9,20 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - attachment_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + project_model "forgejo.org/models/project" + attachment_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/json" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/org/projects_test.go b/routers/web/org/projects_test.go index ab419cc878..dec78502f2 100644 --- a/routers/web/org/projects_test.go +++ b/routers/web/org/projects_test.go @@ -6,9 +6,9 @@ package org_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/routers/web/org" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + "forgejo.org/routers/web/org" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 1683728a8e..284f406413 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -9,25 +9,25 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" + "forgejo.org/services/forms" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" + user_service "forgejo.org/services/user" + webhook_service "forgejo.org/services/webhook" ) const ( diff --git a/routers/web/org/setting/blocked_users.go b/routers/web/org/setting/blocked_users.go index 2cf3f39ef4..77b2791874 100644 --- a/routers/web/org/setting/blocked_users.go +++ b/routers/web/org/setting/blocked_users.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) const tplBlockedUsers = "org/settings/blocked_users" diff --git a/routers/web/org/setting/runners.go b/routers/web/org/setting/runners.go index fe05709237..8053ed7729 100644 --- a/routers/web/org/setting/runners.go +++ b/routers/web/org/setting/runners.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/org/setting/storage_overview.go b/routers/web/org/setting/storage_overview.go index 4b9bd02ca4..5714d7ee23 100644 --- a/routers/web/org/setting/storage_overview.go +++ b/routers/web/org/setting/storage_overview.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/routers/web/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/routers/web/shared" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/setting_oauth2.go b/routers/web/org/setting_oauth2.go index 7f855795d3..9c31063974 100644 --- a/routers/web/org/setting_oauth2.go +++ b/routers/web/org/setting_oauth2.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared_user "forgejo.org/routers/web/shared/user" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/setting_packages.go b/routers/web/org/setting_packages.go index af9836e42c..4457c8fb0f 100644 --- a/routers/web/org/setting_packages.go +++ b/routers/web/org/setting_packages.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/packages" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared "forgejo.org/routers/web/shared/packages" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index df9de4af98..659bee469f 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -12,24 +12,24 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/action_aggregator_test.go b/routers/web/repo/action_aggregator_test.go index 181c1120db..7da14f1912 100644 --- a/routers/web/repo/action_aggregator_test.go +++ b/routers/web/repo/action_aggregator_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + issue_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index e0ef709ea6..0a63f566e0 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -11,21 +11,21 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/unit" + "forgejo.org/modules/actions" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + "forgejo.org/services/convert" "github.com/nektos/act/pkg/model" ) diff --git a/routers/web/repo/actions/actions_test.go b/routers/web/repo/actions/actions_test.go index 939c4aaf57..232aacf96b 100644 --- a/routers/web/repo/actions/actions_test.go +++ b/routers/web/repo/actions/actions_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - unittest "code.gitea.io/gitea/models/unittest" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + unittest "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/actions/main_test.go b/routers/web/repo/actions/main_test.go index a82f9c6672..0f82a0e7ea 100644 --- a/routers/web/repo/actions/main_test.go +++ b/routers/web/repo/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/actions/manual.go b/routers/web/repo/actions/manual.go index 285dc7ab7e..413b087e8b 100644 --- a/routers/web/repo/actions/manual.go +++ b/routers/web/repo/actions/manual.go @@ -6,8 +6,8 @@ package actions import ( "net/url" - actions_service "code.gitea.io/gitea/services/actions" - context_module "code.gitea.io/gitea/services/context" + actions_service "forgejo.org/services/actions" + context_module "forgejo.org/services/context" ) func ManualRunWorkflow(ctx *context_module.Context) { diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index dea31bb1c4..2d009c5720 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -18,24 +18,24 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - actions_service "code.gitea.io/gitea/services/actions" - context_module "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/actions" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/templates" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + actions_service "forgejo.org/services/actions" + context_module "forgejo.org/services/context" "xorm.io/builder" ) diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go index af9cea0f33..c9cd2c13bb 100644 --- a/routers/web/repo/activity.go +++ b/routers/web/repo/activity.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go index b5078e1f63..e46c08fef8 100644 --- a/routers/web/repo/attachment.go +++ b/routers/web/repo/attachment.go @@ -7,18 +7,18 @@ import ( "fmt" "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - repo_service "code.gitea.io/gitea/services/repository" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/routers/common" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + repo_service "forgejo.org/services/repository" ) // UploadIssueAttachment response for Issue/PR attachments diff --git a/routers/web/repo/badges/badges.go b/routers/web/repo/badges/badges.go index a2306d5836..e623a21fc0 100644 --- a/routers/web/repo/badges/badges.go +++ b/routers/web/repo/badges/badges.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/setting" - context_module "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/setting" + context_module "forgejo.org/services/context" ) func getBadgeURL(ctx *context_module.Context, label, text, color string) string { diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index c7fbaaefcb..ccdd59f2dd 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -10,16 +10,16 @@ import ( "net/url" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + user_model "forgejo.org/models/user" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/util" + "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" ) type blameRow struct { diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 4897a5f4fc..af8a838fc9 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -11,23 +11,23 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + "forgejo.org/services/context" + "forgejo.org/services/forms" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/card.go b/routers/web/repo/card.go index e73971cd94..449e5c4890 100644 --- a/routers/web/repo/card.go +++ b/routers/web/repo/card.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/card" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/card" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/services/context" ) // drawUser draws a user avatar in a summary card diff --git a/routers/web/repo/cherry_pick.go b/routers/web/repo/cherry_pick.go index 90dae704f4..0f57eb66f0 100644 --- a/routers/web/repo/cherry_pick.go +++ b/routers/web/repo/cherry_pick.go @@ -8,17 +8,17 @@ import ( "errors" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/repository/files" ) var tplCherryPick base.TplName = "repo/editor/cherry_pick" diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go index c76f492da0..04009b4afa 100644 --- a/routers/web/repo/code_frequency.go +++ b/routers/web/repo/code_frequency.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/base" + "forgejo.org/services/context" + contributors_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 857e34381e..3cd80a6777 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -12,26 +12,26 @@ import ( "path" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - git_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/repository/gitgraph" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/gitdiff" + git_service "forgejo.org/services/repository" + "forgejo.org/services/repository/gitgraph" ) const ( diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 24785d867e..db65e889e0 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -16,29 +16,29 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - csv_module "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + csv_module "forgejo.org/modules/csv" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/routers/common" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/gitdiff" ) const ( diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go index 762fbf9379..094d13b54b 100644 --- a/routers/web/repo/contributors.go +++ b/routers/web/repo/contributors.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/base" + "forgejo.org/services/context" + contributors_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go index d7fe368474..fc82ece4cb 100644 --- a/routers/web/repo/download.go +++ b/routers/web/repo/download.go @@ -7,15 +7,15 @@ package repo import ( "time" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + git_model "forgejo.org/models/git" + "forgejo.org/modules/git" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/routers/common" + "forgejo.org/services/context" ) // ServeBlobOrLFS download a git.Blob redirecting to LFS if necessary diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index f27ad62982..77f71fd2b1 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -10,26 +10,26 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + files_service "forgejo.org/services/repository/files" ) const ( diff --git a/routers/web/repo/editor_test.go b/routers/web/repo/editor_test.go index 4d565b5fd6..5b893cf258 100644 --- a/routers/web/repo/editor_test.go +++ b/routers/web/repo/editor_test.go @@ -6,11 +6,11 @@ package repo import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/services/contexttest" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/find.go b/routers/web/repo/find.go index 9da4237c1e..808323631c 100644 --- a/routers/web/repo/find.go +++ b/routers/web/repo/find.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/flags/manage.go b/routers/web/repo/flags/manage.go index 377a5c20f8..c97ef54818 100644 --- a/routers/web/repo/flags/manage.go +++ b/routers/web/repo/flags/manage.go @@ -6,10 +6,10 @@ package flags import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go index bced8e61b1..650b1d88f4 100644 --- a/routers/web/repo/githttp.go +++ b/routers/web/repo/githttp.go @@ -18,20 +18,20 @@ import ( "sync" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" "github.com/go-chi/cors" ) diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go index 6fa7579231..9d67f142fb 100644 --- a/routers/web/repo/helper.go +++ b/routers/web/repo/helper.go @@ -7,9 +7,9 @@ import ( "net/url" "slices" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/services/context" ) func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User { diff --git a/routers/web/repo/helper_test.go b/routers/web/repo/helper_test.go index 844ad5bf79..2607fd32f8 100644 --- a/routers/web/repo/helper_test.go +++ b/routers/web/repo/helper_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/user" + "forgejo.org/models/user" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index e45abd3952..ff3a903aed 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -20,44 +20,44 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - issue_template "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + issue_indexer "forgejo.org/modules/indexer/issues" + issue_template "forgejo.org/modules/issue/template" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/templates" + "forgejo.org/modules/templates/vars" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" "code.forgejo.org/go-chi/binding" ) diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index 4ce76b2bb9..5c71d75f80 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/avatars" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/avatars" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/services/context" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index 66b38688ec..3764a6bd7e 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // AddDependency adds new dependencies diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 81bee4dbb5..74674e9550 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -6,17 +6,17 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/modules/base" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + issue_service "forgejo.org/services/issue" ) const ( diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go index 2b4915e855..406ab4918c 100644 --- a/routers/web/repo/issue_label_test.go +++ b/routers/web/repo/issue_label_test.go @@ -8,13 +8,13 @@ import ( "strconv" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/repository" + "forgejo.org/modules/test" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/issue_lock.go b/routers/web/repo/issue_lock.go index 1d5fc8a5f3..dea67ab996 100644 --- a/routers/web/repo/issue_lock.go +++ b/routers/web/repo/issue_lock.go @@ -4,10 +4,10 @@ package repo import ( - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // LockIssue locks an issue. This would limit commenting abilities to diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go index 365c812681..5e2075a17f 100644 --- a/routers/web/repo/issue_pin.go +++ b/routers/web/repo/issue_pin.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // IssuePinOrUnpin pin or unpin a Issue diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go index 70d42b27c0..5bc49464dd 100644 --- a/routers/web/repo/issue_stopwatch.go +++ b/routers/web/repo/issue_stopwatch.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/eventsource" + "forgejo.org/services/context" ) // IssueStopwatch creates or stops a stopwatch for the given issue. diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go index 241e434049..e63f7e2dc2 100644 --- a/routers/web/repo/issue_timetrack.go +++ b/routers/web/repo/issue_timetrack.go @@ -7,12 +7,12 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // AddTimeManually tracks time manually diff --git a/routers/web/repo/issue_watch.go b/routers/web/repo/issue_watch.go index 5cff9f4ddd..5af223f865 100644 --- a/routers/web/repo/issue_watch.go +++ b/routers/web/repo/issue_watch.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/main_test.go b/routers/web/repo/main_test.go index 6e469cf2ed..8b30ad41ed 100644 --- a/routers/web/repo/main_test.go +++ b/routers/web/repo/main_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/middlewares.go b/routers/web/repo/middlewares.go index ddda9f3ff2..9aba447433 100644 --- a/routers/web/repo/middlewares.go +++ b/routers/web/repo/middlewares.go @@ -7,12 +7,12 @@ import ( "fmt" "strconv" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/optional" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // SetEditorconfigIfExists set editor config as render variable diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index 0acf966bca..86d2461e94 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -9,23 +9,23 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/services/task" + "forgejo.org/models" + admin_model "forgejo.org/models/admin" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + "forgejo.org/services/task" ) const ( diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index 1c53f73fdb..920a9ee12a 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -9,18 +9,18 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/base" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/issue" "xorm.io/builder" ) diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 11874ab0d0..c947fb99bf 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -6,13 +6,13 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index d234f6c964..688ef19375 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -6,16 +6,16 @@ package repo import ( "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/repository/files" ) const ( diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 0689b0a721..80f699787c 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -9,22 +9,22 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - project_model "code.gitea.io/gitea/models/project" - attachment_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + project_model "forgejo.org/models/project" + attachment_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/json" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/repo/projects_test.go b/routers/web/repo/projects_test.go index d61230a57e..bc8b747980 100644 --- a/routers/web/repo/projects_test.go +++ b/routers/web/repo/projects_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 98dacc1a0d..a54a31ac36 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -16,39 +16,39 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - issue_template "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + issue_template "forgejo.org/modules/issue/template" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/automerge" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + "forgejo.org/services/gitdiff" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" "github.com/gobwas/glob" ) diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index eb8dd83d9c..18a5b872f1 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -8,17 +8,17 @@ import ( "fmt" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + "forgejo.org/modules/base" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + pull_service "forgejo.org/services/pull" ) const ( diff --git a/routers/web/repo/pull_review_test.go b/routers/web/repo/pull_review_test.go index 329e83fe4b..14e6714a63 100644 --- a/routers/web/repo/pull_review_test.go +++ b/routers/web/repo/pull_review_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/templates" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" + "forgejo.org/services/pull" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/recent_commits.go b/routers/web/repo/recent_commits.go index c158fb30b6..6154de7377 100644 --- a/routers/web/repo/recent_commits.go +++ b/routers/web/repo/recent_commits.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/base" + "forgejo.org/services/context" + contributors_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 1791788743..024dd7b62d 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -10,29 +10,29 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - releaseservice "code.gitea.io/gitea/services/release" + "forgejo.org/models" + "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/web/feed" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + releaseservice "forgejo.org/services/release" ) const ( diff --git a/routers/web/repo/release_test.go b/routers/web/repo/release_test.go index 5c7b6e2e8f..785b1fdf69 100644 --- a/routers/web/repo/release_test.go +++ b/routers/web/repo/release_test.go @@ -6,13 +6,13 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go index e64db03e20..b31e2e203a 100644 --- a/routers/web/repo/render.go +++ b/routers/web/repo/render.go @@ -9,13 +9,13 @@ import ( "net/http" "path" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // RenderFile renders a file by repos path diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 2e8ca61bf5..53b3f34347 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -12,32 +12,32 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" + archiver_service "forgejo.org/services/repository/archiver" + commitstatus_service "forgejo.org/services/repository/commitstatus" ) const ( diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index d10eb67528..1671378a3b 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -7,12 +7,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const tplSearch base.TplName = "repo/search" diff --git a/routers/web/repo/setting/avatar.go b/routers/web/repo/setting/avatar.go index 504f57cfc2..abbb12cacb 100644 --- a/routers/web/repo/setting/avatar.go +++ b/routers/web/repo/setting/avatar.go @@ -8,13 +8,13 @@ import ( "fmt" "io" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" ) // UpdateAvatarSetting update repo's avatar diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go index 75b55151e7..a816a16bc8 100644 --- a/routers/web/repo/setting/collaboration.go +++ b/routers/web/repo/setting/collaboration.go @@ -8,19 +8,19 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/mailer" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) // Collaboration render a repository's collaboration page diff --git a/routers/web/repo/setting/default_branch.go b/routers/web/repo/setting/default_branch.go index 881d148afc..1c6033f1e4 100644 --- a/routers/web/repo/setting/default_branch.go +++ b/routers/web/repo/setting/default_branch.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + git_model "forgejo.org/models/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // SetDefaultBranchPost set default branch diff --git a/routers/web/repo/setting/deploy_key.go b/routers/web/repo/setting/deploy_key.go index abc3eb4af1..c59f0e90c2 100644 --- a/routers/web/repo/setting/deploy_key.go +++ b/routers/web/repo/setting/deploy_key.go @@ -6,14 +6,14 @@ package setting import ( "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // DeployKeys render the deploy keys list of a repository page diff --git a/routers/web/repo/setting/git_hooks.go b/routers/web/repo/setting/git_hooks.go index 217a01c90c..a50bce2a27 100644 --- a/routers/web/repo/setting/git_hooks.go +++ b/routers/web/repo/setting/git_hooks.go @@ -6,8 +6,8 @@ package setting import ( "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/git" + "forgejo.org/services/context" ) // GitHooks hooks of a repository diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index 7e3634375a..2e9c34e8a7 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -14,20 +14,20 @@ import ( "strconv" "strings" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + git_model "forgejo.org/models/git" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pipeline" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/main_test.go b/routers/web/repo/setting/main_test.go index c414b853e5..6b5a70ba08 100644 --- a/routers/web/repo/setting/main_test.go +++ b/routers/web/repo/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go index b2f5798a26..18efbc37c4 100644 --- a/routers/web/repo/setting/protected_branch.go +++ b/routers/web/repo/setting/protected_branch.go @@ -11,17 +11,17 @@ import ( "strings" "time" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/services/repository" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/modules/base" + "forgejo.org/modules/web" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + "forgejo.org/services/forms" + pull_service "forgejo.org/services/pull" + "forgejo.org/services/repository" "github.com/gobwas/glob" ) diff --git a/routers/web/repo/setting/protected_tag.go b/routers/web/repo/setting/protected_tag.go index 2c25b650b9..5735149dfd 100644 --- a/routers/web/repo/setting/protected_tag.go +++ b/routers/web/repo/setting/protected_tag.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go index 9dce5d13b7..32c8667825 100644 --- a/routers/web/repo/setting/runners.go +++ b/routers/web/repo/setting/runners.go @@ -8,13 +8,13 @@ import ( "net/http" "net/url" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - actions_shared "code.gitea.io/gitea/routers/web/shared/actions" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + actions_shared "forgejo.org/routers/web/shared/actions" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index d4d56bfc57..11c83e8bd6 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/secrets" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared "forgejo.org/routers/web/shared/secrets" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index df7e388680..2af2eef4a5 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -13,34 +13,34 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - actions_service "code.gitea.io/gitea/services/actions" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/federation" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + "forgejo.org/models" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/organization" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/indexer/code" + "forgejo.org/modules/indexer/stats" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + actions_service "forgejo.org/services/actions" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/federation" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + repo_service "forgejo.org/services/repository" + wiki_service "forgejo.org/services/wiki" ) const ( diff --git a/routers/web/repo/setting/settings_test.go b/routers/web/repo/setting/settings_test.go index 0c8553faea..6f05953bfb 100644 --- a/routers/web/repo/setting/settings_test.go +++ b/routers/web/repo/setting/settings_test.go @@ -7,19 +7,19 @@ import ( "net/http" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/setting/variables.go b/routers/web/repo/setting/variables.go index 4fb8c06e84..a83d2dea6f 100644 --- a/routers/web/repo/setting/variables.go +++ b/routers/web/repo/setting/variables.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/actions" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared "forgejo.org/routers/web/shared/actions" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index af54997794..6d4d9e47e2 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -11,22 +11,22 @@ import ( "net/url" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + webhook_service "forgejo.org/services/webhook" "code.forgejo.org/go-chi/binding" ) diff --git a/routers/web/repo/topic.go b/routers/web/repo/topic.go index d81a695df9..a028afb042 100644 --- a/routers/web/repo/topic.go +++ b/routers/web/repo/topic.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // TopicsPost response for creating repository diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go index d11af4669f..5c37f2ebca 100644 --- a/routers/web/repo/treelist.go +++ b/routers/web/repo/treelist.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/services/context" "github.com/go-enry/go-enry/v2" ) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 9030b03a90..b7a7a3f042 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -24,35 +24,35 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - activities_model "code.gitea.io/gitea/models/activities" - admin_model "code.gitea.io/gitea/models/admin" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/highlight" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - files_service "code.gitea.io/gitea/services/repository/files" + activities_model "forgejo.org/models/activities" + admin_model "forgejo.org/models/admin" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/actions" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/highlight" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/svg" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/routers/web/feed" + "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + files_service "forgejo.org/services/repository/files" "github.com/nektos/act/pkg/model" diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 070d07cdf3..9a21ac21a3 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -14,25 +14,25 @@ import ( "path/filepath" "strings" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - notify_service "code.gitea.io/gitea/services/notify" - wiki_service "code.gitea.io/gitea/services/wiki" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" + "forgejo.org/services/forms" + notify_service "forgejo.org/services/notify" + wiki_service "forgejo.org/services/wiki" ) const ( diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 0c49e7d902..cba416fc92 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" + wiki_service "forgejo.org/services/wiki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 66dce1412b..98a649d1d8 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -6,13 +6,13 @@ package actions import ( "errors" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // RunnersList prepares data for runners list diff --git a/routers/web/shared/actions/variables.go b/routers/web/shared/actions/variables.go index 47f1176f46..13dff2f11a 100644 --- a/routers/web/shared/actions/variables.go +++ b/routers/web/shared/actions/variables.go @@ -4,13 +4,13 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/web" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) func SetVariablesContext(ctx *context.Context, ownerID, repoID int64) { diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index af960f1c0c..1d4fb1588d 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -9,19 +9,19 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - container_service "code.gitea.io/gitea/services/packages/container" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + cargo_service "forgejo.org/services/packages/cargo" + container_service "forgejo.org/services/packages/container" ) func SetPackagesContext(ctx *context.Context, owner *user_model.User) { diff --git a/routers/web/shared/project/column.go b/routers/web/shared/project/column.go index 599842ea9e..40bb439452 100644 --- a/routers/web/shared/project/column.go +++ b/routers/web/shared/project/column.go @@ -4,9 +4,9 @@ package project import ( - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + project_model "forgejo.org/models/project" + "forgejo.org/modules/json" + "forgejo.org/services/context" ) // MoveColumns moves or keeps columns in a project and sorts them inside that project diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index 3bd421f86a..a853598939 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -4,14 +4,14 @@ package secrets import ( - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - secret_service "code.gitea.io/gitea/services/secrets" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + secret_service "forgejo.org/services/secrets" ) func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { diff --git a/routers/web/shared/storage_overview.go b/routers/web/shared/storage_overview.go index 3bebdfb688..fac4aa99e5 100644 --- a/routers/web/shared/storage_overview.go +++ b/routers/web/shared/storage_overview.go @@ -7,10 +7,10 @@ import ( "html/template" "net/http" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // StorageOverview render a size overview of the user, as well as relevant diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index fd7605c33b..c26ff19165 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -7,22 +7,22 @@ package user import ( "net/url" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // prepareContextForCommonProfile store some common data into context data for user's profile related pages (including the nav menu) diff --git a/routers/web/swagger_json.go b/routers/web/swagger_json.go index fc39b504a9..1569600734 100644 --- a/routers/web/swagger_json.go +++ b/routers/web/swagger_json.go @@ -4,7 +4,7 @@ package web import ( - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" ) // SwaggerV1Json render swagger v1 json diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go index 04f510161d..76cc342770 100644 --- a/routers/web/user/avatar.go +++ b/routers/web/user/avatar.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/avatars" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/avatars" + user_model "forgejo.org/models/user" + "forgejo.org/modules/httpcache" + "forgejo.org/services/context" ) func cacheableRedirect(ctx *context.Context, location string) { diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 019249e3e0..ac1852e410 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -6,13 +6,13 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/home.go b/routers/web/user/home.go index a0841c0227..9f22cebaba 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -13,27 +13,27 @@ import ( "strconv" "strings" - activities_model "code.gitea.io/gitea/models/activities" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "forgejo.org/models/activities" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/routers/web/feed" + "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/routers/web/user/home_test.go b/routers/web/user/home_test.go index c09f609161..af9d50538d 100644 --- a/routers/web/user/home_test.go +++ b/routers/web/user/home_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/user/main_test.go b/routers/web/user/main_test.go index 8b6ae69296..080e3fdcfe 100644 --- a/routers/web/user/main_test.go +++ b/routers/web/user/main_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index c3358dbf62..296951b2ff 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -11,21 +11,21 @@ import ( "net/url" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" ) const ( diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 70ea20d388..2862c6684b 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -8,28 +8,28 @@ import ( "net/http" "slices" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - arch_model "code.gitea.io/gitea/modules/packages/arch" - debian_module "code.gitea.io/gitea/modules/packages/debian" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - packages_helper "code.gitea.io/gitea/routers/api/packages/helper" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + alpine_module "forgejo.org/modules/packages/alpine" + arch_model "forgejo.org/modules/packages/arch" + debian_module "forgejo.org/modules/packages/debian" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + packages_helper "forgejo.org/routers/api/packages/helper" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/forms" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index de1c6850aa..5132b1da5c 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -11,23 +11,23 @@ import ( "path" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/org" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/web/feed" + "forgejo.org/routers/web/org" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) const ( diff --git a/routers/web/user/search.go b/routers/web/user/search.go index be5eee90a9..411a356d9b 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // SearchCandidates searches candidate users for dropdown list diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index 6f40e39c8d..a0cdb25f44 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -9,23 +9,23 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/db" - "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - "code.gitea.io/gitea/services/user" + "forgejo.org/models" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/db" + "forgejo.org/services/auth/source/smtp" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + "forgejo.org/services/user" ) const ( diff --git a/routers/web/user/setting/account_test.go b/routers/web/user/setting/account_test.go index 9fdc5e4d53..82e00bbf7c 100644 --- a/routers/web/user/setting/account_test.go +++ b/routers/web/user/setting/account_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go index 171c1933d4..f7fd1c3803 100644 --- a/routers/web/user/setting/adopt.go +++ b/routers/web/user/setting/adopt.go @@ -6,12 +6,12 @@ package setting import ( "path/filepath" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // AdoptOrDeleteRepository adopts or deletes a repository diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index 4dfd859a44..631d5958ea 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -7,14 +7,14 @@ package setting import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/user/setting/blocked_users.go b/routers/web/user/setting/blocked_users.go index 3f35b2eadf..1448dc9a3c 100644 --- a/routers/web/user/setting/blocked_users.go +++ b/routers/web/user/setting/blocked_users.go @@ -6,11 +6,11 @@ package setting import ( "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 9462be71c2..94d32b730f 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -8,15 +8,15 @@ import ( "fmt" "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/user/setting/main_test.go b/routers/web/user/setting/main_test.go index e398208d0d..38ac2842dd 100644 --- a/routers/web/user/setting/main_test.go +++ b/routers/web/user/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/setting/oauth2.go b/routers/web/user/setting/oauth2.go index 1f485e06c8..64b252e97f 100644 --- a/routers/web/user/setting/oauth2.go +++ b/routers/web/user/setting/oauth2.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go index 2132d127b8..7449e45216 100644 --- a/routers/web/user/setting/oauth2_common.go +++ b/routers/web/user/setting/oauth2_common.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + "forgejo.org/modules/base" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) type OAuth2CommonHandlers struct { diff --git a/routers/web/user/setting/packages.go b/routers/web/user/setting/packages.go index 4132659495..ba739a03fc 100644 --- a/routers/web/user/setting/packages.go +++ b/routers/web/user/setting/packages.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - shared "code.gitea.io/gitea/routers/web/shared/packages" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + shared "forgejo.org/routers/web/shared/packages" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 271621872f..173550ad19 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -15,23 +15,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/avatars" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" + "forgejo.org/services/forms" + user_service "forgejo.org/services/user" ) const ( diff --git a/routers/web/user/setting/runner.go b/routers/web/user/setting/runner.go index 2bb10cceb9..5c8bba82a1 100644 --- a/routers/web/user/setting/runner.go +++ b/routers/web/user/setting/runner.go @@ -4,8 +4,8 @@ package setting import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go index 37ccb5e5c4..f1271c8370 100644 --- a/routers/web/user/setting/security/2fa.go +++ b/routers/web/user/setting/security/2fa.go @@ -12,13 +12,13 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/auth" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go index 8f788e1735..14660e1646 100644 --- a/routers/web/user/setting/security/openid.go +++ b/routers/web/user/setting/security/openid.go @@ -6,13 +6,13 @@ package security import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/openid" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // OpenIDPost response for change user's openid diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go index 8d6859ab87..9acc6ab6f0 100644 --- a/routers/web/user/setting/security/security.go +++ b/routers/web/user/setting/security/security.go @@ -8,14 +8,14 @@ import ( "net/http" "sort" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go index bfbc06c701..a909d479c9 100644 --- a/routers/web/user/setting/security/webauthn.go +++ b/routers/web/user/setting/security/webauthn.go @@ -9,14 +9,14 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/auth" - wa "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/auth" + wa "forgejo.org/modules/auth/webauthn" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/user/setting/storage_overview.go b/routers/web/user/setting/storage_overview.go index 8a0c773077..4586600572 100644 --- a/routers/web/user/setting/storage_overview.go +++ b/routers/web/user/setting/storage_overview.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/routers/web/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/routers/web/shared" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go index 3cc67d9def..bc07accad4 100644 --- a/routers/web/user/setting/webhooks.go +++ b/routers/web/user/setting/webhooks.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) const ( diff --git a/routers/web/user/stop_watch.go b/routers/web/user/stop_watch.go index 38f74ea455..210b32d205 100644 --- a/routers/web/user/stop_watch.go +++ b/routers/web/user/stop_watch.go @@ -6,10 +6,10 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetStopwatches get all stopwatches diff --git a/routers/web/user/task.go b/routers/web/user/task.go index 8476767e9e..296c44f809 100644 --- a/routers/web/user/task.go +++ b/routers/web/user/task.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + admin_model "forgejo.org/models/admin" + "forgejo.org/modules/json" + "forgejo.org/services/context" ) // TaskStatus returns task's status diff --git a/routers/web/web.go b/routers/web/web.go index 15264ccc89..303167a6b9 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -8,46 +8,46 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/perm" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/metrics" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/admin" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/routers/web/devtest" - "code.gitea.io/gitea/routers/web/events" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/routers/web/misc" - "code.gitea.io/gitea/routers/web/org" - org_setting "code.gitea.io/gitea/routers/web/org/setting" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/routers/web/repo/actions" - "code.gitea.io/gitea/routers/web/repo/badges" - repo_flags "code.gitea.io/gitea/routers/web/repo/flags" - repo_setting "code.gitea.io/gitea/routers/web/repo/setting" - "code.gitea.io/gitea/routers/web/shared/project" - "code.gitea.io/gitea/routers/web/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/routers/web/user/setting/security" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/lfs" + "forgejo.org/models/perm" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/metrics" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/structs" + "forgejo.org/modules/templates" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/modules/web/routing" + "forgejo.org/routers/common" + "forgejo.org/routers/web/admin" + "forgejo.org/routers/web/auth" + "forgejo.org/routers/web/devtest" + "forgejo.org/routers/web/events" + "forgejo.org/routers/web/explore" + "forgejo.org/routers/web/feed" + "forgejo.org/routers/web/healthcheck" + "forgejo.org/routers/web/misc" + "forgejo.org/routers/web/org" + org_setting "forgejo.org/routers/web/org/setting" + "forgejo.org/routers/web/repo" + "forgejo.org/routers/web/repo/actions" + "forgejo.org/routers/web/repo/badges" + repo_flags "forgejo.org/routers/web/repo/flags" + repo_setting "forgejo.org/routers/web/repo/setting" + "forgejo.org/routers/web/shared/project" + "forgejo.org/routers/web/user" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/routers/web/user/setting/security" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/lfs" - _ "code.gitea.io/gitea/modules/session" // to registers all internal adapters + _ "forgejo.org/modules/session" // to registers all internal adapters "code.forgejo.org/go-chi/captcha" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go index 1f3de70db0..be3c2925fe 100644 --- a/routers/web/webfinger.go +++ b/routers/web/webfinger.go @@ -9,10 +9,10 @@ import ( "net/url" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // https://datatracker.ietf.org/doc/html/draft-ietf-appsawg-webfinger-14#section-4.4 diff --git a/services/actions/auth.go b/services/actions/auth.go index 1ef21f6e0e..4dc86a35f3 100644 --- a/services/actions/auth.go +++ b/services/actions/auth.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/actions/auth_test.go b/services/actions/auth_test.go index 1400e61f47..93a5980bc5 100644 --- a/services/actions/auth_test.go +++ b/services/actions/auth_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go index 34fa2688e7..fde5286e60 100644 --- a/services/actions/cleanup.go +++ b/services/actions/cleanup.go @@ -10,12 +10,12 @@ import ( "os" "time" - actions_model "code.gitea.io/gitea/models/actions" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" + actions_model "forgejo.org/models/actions" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" ) // Cleanup removes expired actions logs, data and artifacts diff --git a/services/actions/cleanup_test.go b/services/actions/cleanup_test.go index 65fae840c1..67f68d4de9 100644 --- a/services/actions/cleanup_test.go +++ b/services/actions/cleanup_test.go @@ -6,10 +6,10 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index f146c22372..31e15ec927 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // StopZombieTasks stops the task which have running status, but haven't been updated for a long time diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 04dffbac88..1fffa6852f 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -8,15 +8,15 @@ import ( "fmt" "path" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + user_model "forgejo.org/models/user" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + commitstatus_service "forgejo.org/services/repository/commitstatus" "github.com/nektos/act/pkg/jobparser" ) diff --git a/services/actions/context.go b/services/actions/context.go index be1c85522b..bf187c56bf 100644 --- a/services/actions/context.go +++ b/services/actions/context.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) // GenerateGiteaContext generate the gitea context without token and gitea_runtime_token diff --git a/services/actions/context_test.go b/services/actions/context_test.go index 4cd8825870..c96094ade8 100644 --- a/services/actions/context_test.go +++ b/services/actions/context_test.go @@ -6,8 +6,8 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/unittest" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/init.go b/services/actions/init.go index 0f49cb6297..8f1db64e27 100644 --- a/services/actions/init.go +++ b/services/actions/init.go @@ -4,11 +4,11 @@ package actions import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + notify_service "forgejo.org/services/notify" ) func Init() { diff --git a/services/actions/interface.go b/services/actions/interface.go index 76bee6f153..54a30061bc 100644 --- a/services/actions/interface.go +++ b/services/actions/interface.go @@ -3,7 +3,7 @@ package actions -import "code.gitea.io/gitea/services/context" +import "forgejo.org/services/context" // API for actions of a repository or organization type API interface { diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index 1f859fcf70..d4ca029d46 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/queue" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/graceful" + "forgejo.org/modules/queue" "github.com/nektos/act/pkg/jobparser" "xorm.io/builder" diff --git a/services/actions/job_emitter_test.go b/services/actions/job_emitter_test.go index 58c2dc3b24..a3e0e95d04 100644 --- a/services/actions/job_emitter_test.go +++ b/services/actions/job_emitter_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/main_test.go b/services/actions/main_test.go index 49629ecb03..71ec1d3426 100644 --- a/services/actions/main_test.go +++ b/services/actions/main_test.go @@ -6,11 +6,11 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 2dd81158a7..2d3a1d2107 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -6,20 +6,20 @@ package actions import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" + notify_service "forgejo.org/services/notify" ) type actionsNotifier struct { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 0a1dbb162d..9de0b75ac7 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -11,24 +11,24 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" diff --git a/services/actions/notifier_helper_test.go b/services/actions/notifier_helper_test.go index 0fa40c0168..9166dc3b95 100644 --- a/services/actions/notifier_helper_test.go +++ b/services/actions/notifier_helper_test.go @@ -6,10 +6,10 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - webhook_module "code.gitea.io/gitea/modules/webhook" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/rerun.go b/services/actions/rerun.go index 60f6650905..f6dd4af5c7 100644 --- a/services/actions/rerun.go +++ b/services/actions/rerun.go @@ -4,8 +4,8 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/container" + actions_model "forgejo.org/models/actions" + "forgejo.org/modules/container" ) // GetAllRerunJobs get all jobs that need to be rerun when job should be rerun diff --git a/services/actions/rerun_test.go b/services/actions/rerun_test.go index a98de7b788..4b822e8da1 100644 --- a/services/actions/rerun_test.go +++ b/services/actions/rerun_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go index 18f3324fd2..f66a6ca092 100644 --- a/services/actions/schedule_tasks.go +++ b/services/actions/schedule_tasks.go @@ -8,13 +8,13 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/nektos/act/pkg/jobparser" ) diff --git a/services/actions/task.go b/services/actions/task.go index bc54ade347..43c8deaa5f 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" diff --git a/services/actions/variables.go b/services/actions/variables.go index a5703898ab..fed1fd0890 100644 --- a/services/actions/variables.go +++ b/services/actions/variables.go @@ -8,10 +8,10 @@ import ( "regexp" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + secret_service "forgejo.org/services/secrets" ) func CreateVariable(ctx context.Context, ownerID, repoID int64, name, data string) (*actions_model.ActionVariable, error) { diff --git a/services/actions/workflows.go b/services/actions/workflows.go index e3e342264d..7ec7c3abed 100644 --- a/services/actions/workflows.go +++ b/services/actions/workflows.go @@ -10,19 +10,19 @@ import ( "fmt" "strconv" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/perm" + "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/actions" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/webhook" + "forgejo.org/services/convert" "github.com/nektos/act/pkg/jobparser" act_model "github.com/nektos/act/pkg/model" diff --git a/services/agit/agit.go b/services/agit/agit.go index a18f9ef728..20e87642c3 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -9,15 +9,15 @@ import ( "os" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" ) // ProcReceive handle proc receive work diff --git a/services/asymkey/deploy_key.go b/services/asymkey/deploy_key.go index e127cbfc6e..4a2cb53eec 100644 --- a/services/asymkey/deploy_key.go +++ b/services/asymkey/deploy_key.go @@ -6,10 +6,10 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // DeleteDeployKey deletes deploy key from its repository authorized_keys file if needed. diff --git a/services/asymkey/main_test.go b/services/asymkey/main_test.go index 060cc78cec..8ba76668b1 100644 --- a/services/asymkey/main_test.go +++ b/services/asymkey/main_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go index 8fb569939c..0030523b22 100644 --- a/services/asymkey/sign.go +++ b/services/asymkey/sign.go @@ -8,18 +8,18 @@ import ( "fmt" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) type signingMode string diff --git a/services/asymkey/ssh_key.go b/services/asymkey/ssh_key.go index 83d7edafa3..f20445891d 100644 --- a/services/asymkey/ssh_key.go +++ b/services/asymkey/ssh_key.go @@ -6,9 +6,9 @@ package asymkey import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // DeletePublicKey deletes SSH key information both in database and authorized_keys file. diff --git a/services/asymkey/ssh_key_test.go b/services/asymkey/ssh_key_test.go index d667a02557..24b28d295e 100644 --- a/services/asymkey/ssh_key_test.go +++ b/services/asymkey/ssh_key_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index c911945e5d..365bd7faf6 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -9,12 +9,12 @@ import ( "fmt" "io" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/services/context/upload" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/services/context/upload" "github.com/google/uuid" ) diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index c24b3f8006..70b1e80d6a 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/auth/auth.go b/services/auth/auth.go index c10872313f..85c9296ced 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -10,15 +10,15 @@ import ( "regexp" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - gitea_context "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/webauthn" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/session" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" + gitea_context "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // Init should be called exactly once when the application starts to allow plugins diff --git a/services/auth/auth_test.go b/services/auth/auth_test.go index 3adaa28664..a6c6c74022 100644 --- a/services/auth/auth_test.go +++ b/services/auth/auth_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func Test_isGitRawOrLFSPath(t *testing.T) { diff --git a/services/auth/basic.go b/services/auth/basic.go index d489164954..f259ad5f69 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -9,15 +9,15 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/middleware" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web/middleware" ) // Ensure the struct implements the interface. diff --git a/services/auth/group.go b/services/auth/group.go index aecf43cb24..b713301b50 100644 --- a/services/auth/group.go +++ b/services/auth/group.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" ) // Ensure the struct implements the interface. diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go index 83a36bef23..d3cbb8aa60 100644 --- a/services/auth/httpsign.go +++ b/services/auth/httpsign.go @@ -11,11 +11,11 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/services/auth/interface.go b/services/auth/interface.go index ece28af12d..12b04a7abf 100644 --- a/services/auth/interface.go +++ b/services/auth/interface.go @@ -7,9 +7,9 @@ import ( "context" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/session" + "forgejo.org/modules/web/middleware" ) // DataStore represents a data store diff --git a/services/auth/main_test.go b/services/auth/main_test.go index b81c39a1f2..0e6315b06e 100644 --- a/services/auth/main_test.go +++ b/services/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index b983e57ecd..e6d556d10b 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -11,15 +11,15 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth/source/oauth2" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/actions" + "forgejo.org/services/auth/source/oauth2" ) // Ensure the struct implements the interface. diff --git a/services/auth/oauth2_test.go b/services/auth/oauth2_test.go index 90e2fe4517..d6455b33ad 100644 --- a/services/auth/oauth2_test.go +++ b/services/auth/oauth2_test.go @@ -6,10 +6,10 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/actions" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/actions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go index 8a5a5dc992..eb9ceb8cf2 100644 --- a/services/auth/reverseproxy.go +++ b/services/auth/reverseproxy.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" gouuid "github.com/google/uuid" ) diff --git a/services/auth/reverseproxy_test.go b/services/auth/reverseproxy_test.go index 7f1b2a7782..70ce1f8b0b 100644 --- a/services/auth/reverseproxy_test.go +++ b/services/auth/reverseproxy_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/require" ) diff --git a/services/auth/session.go b/services/auth/session.go index 35d97e42da..a15c24c940 100644 --- a/services/auth/session.go +++ b/services/auth/session.go @@ -6,8 +6,8 @@ package auth import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" ) // Ensure the struct implements the interface. diff --git a/services/auth/signin.go b/services/auth/signin.go index 7c69da8f94..495b3d387e 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -7,17 +7,17 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/auth/source/smtp" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/auth/source/smtp" - _ "code.gitea.io/gitea/services/auth/source/db" // register the sources (and below) - _ "code.gitea.io/gitea/services/auth/source/ldap" // register the ldap source - _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source + _ "forgejo.org/services/auth/source/db" // register the sources (and below) + _ "forgejo.org/services/auth/source/ldap" // register the ldap source + _ "forgejo.org/services/auth/source/pam" // register the pam source ) // UserSignIn validates user name and password. diff --git a/services/auth/source.go b/services/auth/source.go index 69b71a6dea..b13554efde 100644 --- a/services/auth/source.go +++ b/services/auth/source.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // DeleteSource deletes a AuthSource record in DB. diff --git a/services/auth/source/db/assert_interface_test.go b/services/auth/source/db/assert_interface_test.go index 62387c78f0..1422e9693c 100644 --- a/services/auth/source/db/assert_interface_test.go +++ b/services/auth/source/db/assert_interface_test.go @@ -4,9 +4,9 @@ package db_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/db" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/db" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/db/authenticate.go b/services/auth/source/db/authenticate.go index 8160141863..7c18540a10 100644 --- a/services/auth/source/db/authenticate.go +++ b/services/auth/source/db/authenticate.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // ErrUserPasswordNotSet represents a "ErrUserPasswordNotSet" kind of error. diff --git a/services/auth/source/db/source.go b/services/auth/source/db/source.go index bb2270cbd6..d158718bb2 100644 --- a/services/auth/source/db/source.go +++ b/services/auth/source/db/source.go @@ -6,8 +6,8 @@ package db import ( "context" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" ) // Source is a password authentication service diff --git a/services/auth/source/ldap/assert_interface_test.go b/services/auth/source/ldap/assert_interface_test.go index 33347687dc..859143a3f8 100644 --- a/services/auth/source/ldap/assert_interface_test.go +++ b/services/auth/source/ldap/assert_interface_test.go @@ -4,9 +4,9 @@ package ldap_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/ldap" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/ldap/source.go b/services/auth/source/ldap/source.go index ba407b351a..a094c1410c 100644 --- a/services/auth/source/ldap/source.go +++ b/services/auth/source/ldap/source.go @@ -6,10 +6,10 @@ package ldap import ( "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/modules/json" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" ) // .____ ________ _____ __________ diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index 68ecd16342..a2ff10cd07 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/optional" - source_service "code.gitea.io/gitea/services/auth/source" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + auth_module "forgejo.org/modules/auth" + "forgejo.org/modules/optional" + source_service "forgejo.org/services/auth/source" + user_service "forgejo.org/services/user" ) // Authenticate queries if login/password is valid against the LDAP directory pool, diff --git a/services/auth/source/ldap/source_search.go b/services/auth/source/ldap/source_search.go index 2a61386ae1..da7e225428 100644 --- a/services/auth/source/ldap/source_search.go +++ b/services/auth/source/ldap/source_search.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/container" + "forgejo.org/modules/log" "github.com/go-ldap/ldap/v3" ) diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index 1f70edaa82..cb6172ed1d 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -8,16 +8,16 @@ import ( "fmt" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - source_service "code.gitea.io/gitea/services/auth/source" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + auth_module "forgejo.org/modules/auth" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + source_service "forgejo.org/services/auth/source" + user_service "forgejo.org/services/user" ) // Sync causes this ldap source to synchronize its users with the db diff --git a/services/auth/source/oauth2/assert_interface_test.go b/services/auth/source/oauth2/assert_interface_test.go index 56fe0e4aa8..12fce257cf 100644 --- a/services/auth/source/oauth2/assert_interface_test.go +++ b/services/auth/source/oauth2/assert_interface_test.go @@ -4,9 +4,9 @@ package oauth2_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/oauth2/init.go b/services/auth/source/oauth2/init.go index 5c25681548..6c78a14da4 100644 --- a/services/auth/source/oauth2/init.go +++ b/services/auth/source/oauth2/init.go @@ -9,11 +9,11 @@ import ( "net/http" "sync" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" "github.com/google/uuid" "github.com/gorilla/sessions" diff --git a/services/auth/source/oauth2/jwtsigningkey.go b/services/auth/source/oauth2/jwtsigningkey.go index 92adfc4d84..550945a812 100644 --- a/services/auth/source/oauth2/jwtsigningkey.go +++ b/services/auth/source/oauth2/jwtsigningkey.go @@ -18,9 +18,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/auth/source/oauth2/jwtsigningkey_test.go b/services/auth/source/oauth2/jwtsigningkey_test.go index 4db538b0e8..7cf2833696 100644 --- a/services/auth/source/oauth2/jwtsigningkey_test.go +++ b/services/auth/source/oauth2/jwtsigningkey_test.go @@ -13,8 +13,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/auth/source/oauth2/providers.go b/services/auth/source/oauth2/providers.go index f2c1bb4894..773ce19c12 100644 --- a/services/auth/source/oauth2/providers.go +++ b/services/auth/source/oauth2/providers.go @@ -12,11 +12,11 @@ import ( "net/url" "sort" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" "github.com/markbates/goth" ) diff --git a/services/auth/source/oauth2/providers_base.go b/services/auth/source/oauth2/providers_base.go index 63318b84ef..1ef8d0af72 100644 --- a/services/auth/source/oauth2/providers_base.go +++ b/services/auth/source/oauth2/providers_base.go @@ -6,8 +6,8 @@ package oauth2 import ( "html/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/svg" + "forgejo.org/modules/log" + "forgejo.org/modules/svg" ) // BaseProvider represents a common base for Provider diff --git a/services/auth/source/oauth2/providers_custom.go b/services/auth/source/oauth2/providers_custom.go index 65cf538ad7..51a412e0be 100644 --- a/services/auth/source/oauth2/providers_custom.go +++ b/services/auth/source/oauth2/providers_custom.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azureadv2" diff --git a/services/auth/source/oauth2/providers_openid.go b/services/auth/source/oauth2/providers_openid.go index f606581271..7950506ab7 100644 --- a/services/auth/source/oauth2/providers_openid.go +++ b/services/auth/source/oauth2/providers_openid.go @@ -6,9 +6,9 @@ package oauth2 import ( "html/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/svg" "github.com/markbates/goth" "github.com/markbates/goth/providers/openidConnect" diff --git a/services/auth/source/oauth2/providers_simple.go b/services/auth/source/oauth2/providers_simple.go index e95323a62a..8e2c0a7700 100644 --- a/services/auth/source/oauth2/providers_simple.go +++ b/services/auth/source/oauth2/providers_simple.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azuread" diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go index 3f8616c6ff..5245f88270 100644 --- a/services/auth/source/oauth2/source.go +++ b/services/auth/source/oauth2/source.go @@ -6,8 +6,8 @@ package oauth2 import ( "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) // Source holds configuration for the OAuth2 login source. diff --git a/services/auth/source/oauth2/source_authenticate.go b/services/auth/source/oauth2/source_authenticate.go index bbda35dee0..1efd7be02a 100644 --- a/services/auth/source/oauth2/source_authenticate.go +++ b/services/auth/source/oauth2/source_authenticate.go @@ -6,8 +6,8 @@ package oauth2 import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/auth/source/db" + user_model "forgejo.org/models/user" + "forgejo.org/services/auth/source/db" ) // Authenticate falls back to the db authenticator diff --git a/services/auth/source/oauth2/store.go b/services/auth/source/oauth2/store.go index e031653119..d52581ea2d 100644 --- a/services/auth/source/oauth2/store.go +++ b/services/auth/source/oauth2/store.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/log" - session_module "code.gitea.io/gitea/modules/session" + "forgejo.org/modules/log" + session_module "forgejo.org/modules/session" chiSession "code.forgejo.org/go-chi/session" "github.com/gorilla/sessions" diff --git a/services/auth/source/oauth2/token.go b/services/auth/source/oauth2/token.go index 3405619d3f..fba1fd8a01 100644 --- a/services/auth/source/oauth2/token.go +++ b/services/auth/source/oauth2/token.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/auth/source/pam/assert_interface_test.go b/services/auth/source/pam/assert_interface_test.go index 8e7648b8d3..8c54b7e9e2 100644 --- a/services/auth/source/pam/assert_interface_test.go +++ b/services/auth/source/pam/assert_interface_test.go @@ -4,9 +4,9 @@ package pam_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/pam" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/pam" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/pam/source.go b/services/auth/source/pam/source.go index 96b182e185..e1dc83ba43 100644 --- a/services/auth/source/pam/source.go +++ b/services/auth/source/pam/source.go @@ -4,8 +4,8 @@ package pam import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) // __________ _____ _____ diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go index 0df0b2bca1..6f3ffc2d9d 100644 --- a/services/auth/source/pam/source_authenticate.go +++ b/services/auth/source/pam/source_authenticate.go @@ -8,12 +8,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/pam" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" "github.com/google/uuid" ) diff --git a/services/auth/source/remote/source.go b/services/auth/source/remote/source.go index 4165858a56..effbabc7d0 100644 --- a/services/auth/source/remote/source.go +++ b/services/auth/source/remote/source.go @@ -4,8 +4,8 @@ package remote import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) type Source struct { diff --git a/services/auth/source/smtp/assert_interface_test.go b/services/auth/source/smtp/assert_interface_test.go index 6c9cde66e1..6826dae873 100644 --- a/services/auth/source/smtp/assert_interface_test.go +++ b/services/auth/source/smtp/assert_interface_test.go @@ -4,9 +4,9 @@ package smtp_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/smtp" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go index 2a648e421e..d44971bab0 100644 --- a/services/auth/source/smtp/source.go +++ b/services/auth/source/smtp/source.go @@ -4,8 +4,8 @@ package smtp import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) // _________ __________________________ diff --git a/services/auth/source/smtp/source_authenticate.go b/services/auth/source/smtp/source_authenticate.go index 1f0a61c789..3d7ccd0669 100644 --- a/services/auth/source/smtp/source_authenticate.go +++ b/services/auth/source/smtp/source_authenticate.go @@ -10,10 +10,10 @@ import ( "net/textproto" "strings" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/util" ) // Authenticate queries if the provided login/password is authenticates against the SMTP server diff --git a/services/auth/source/source_group_sync.go b/services/auth/source/source_group_sync.go index 3a2411ec55..46be6937fb 100644 --- a/services/auth/source/source_group_sync.go +++ b/services/auth/source/source_group_sync.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" ) type syncType int diff --git a/services/auth/sync.go b/services/auth/sync.go index 7562ac812b..c594be7a24 100644 --- a/services/auth/sync.go +++ b/services/auth/sync.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" ) // SyncExternalUsers is used to synchronize users with external authorization source diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index d3cc4c6fb1..51a14edd9a 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -8,22 +8,22 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - shared_automerge "code.gitea.io/gitea/services/shared/automerge" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + shared_automerge "forgejo.org/services/shared/automerge" ) // Init runs the task queue to that handles auto merges diff --git a/services/automerge/notify.go b/services/automerge/notify.go index cb078214f6..3b5eae9d48 100644 --- a/services/automerge/notify.go +++ b/services/automerge/notify.go @@ -6,10 +6,10 @@ package automerge import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) type automergeNotifier struct { diff --git a/services/context/access_log.go b/services/context/access_log.go index 0926748ac5..7a54b746f6 100644 --- a/services/context/access_log.go +++ b/services/context/access_log.go @@ -12,10 +12,10 @@ import ( "text/template" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" ) type routerLoggerOptions struct { diff --git a/services/context/api.go b/services/context/api.go index 871a2f012d..37f0e0f559 100644 --- a/services/context/api.go +++ b/services/context/api.go @@ -11,18 +11,18 @@ import ( "net/url" "strings" - issues_model "code.gitea.io/gitea/models/issues" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - mc "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" + issues_model "forgejo.org/models/issues" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + mc "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + web_types "forgejo.org/modules/web/types" "code.forgejo.org/go-chi/cache" ) diff --git a/services/context/api_org.go b/services/context/api_org.go index dad02b1719..acc9594e48 100644 --- a/services/context/api_org.go +++ b/services/context/api_org.go @@ -3,7 +3,7 @@ package context -import "code.gitea.io/gitea/models/organization" +import "forgejo.org/models/organization" // APIOrganization contains organization and team type APIOrganization struct { diff --git a/services/context/api_test.go b/services/context/api_test.go index 6064fee1c3..90e4d5ec65 100644 --- a/services/context/api_test.go +++ b/services/context/api_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/context/base.go b/services/context/base.go index 0259e0d806..0275ea8a99 100644 --- a/services/context/base.go +++ b/services/context/base.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web/middleware" + "forgejo.org/modules/httplib" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/translation" + "forgejo.org/modules/web/middleware" "github.com/go-chi/chi/v5" ) diff --git a/services/context/base_test.go b/services/context/base_test.go index 823f20e00b..868ac00f8b 100644 --- a/services/context/base_test.go +++ b/services/context/base_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/captcha.go b/services/context/captcha.go index da837acb00..8ae8bdcae3 100644 --- a/services/context/captcha.go +++ b/services/context/captcha.go @@ -7,14 +7,14 @@ import ( "fmt" "sync" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/hcaptcha" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mcaptcha" - "code.gitea.io/gitea/modules/recaptcha" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/turnstile" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/hcaptcha" + "forgejo.org/modules/log" + "forgejo.org/modules/mcaptcha" + "forgejo.org/modules/recaptcha" + "forgejo.org/modules/setting" + "forgejo.org/modules/turnstile" mc "code.forgejo.org/go-chi/cache" "code.forgejo.org/go-chi/captcha" diff --git a/services/context/context.go b/services/context/context.go index 91e7b1849d..91484c5ba3 100644 --- a/services/context/context.go +++ b/services/context/context.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - mc "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - web_types "code.gitea.io/gitea/modules/web/types" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + mc "forgejo.org/modules/cache" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + web_types "forgejo.org/modules/web/types" "code.forgejo.org/go-chi/cache" "code.forgejo.org/go-chi/session" diff --git a/services/context/context_cookie.go b/services/context/context_cookie.go index 3699f81071..08ef84b5eb 100644 --- a/services/context/context_cookie.go +++ b/services/context/context_cookie.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web/middleware" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web/middleware" ) const CookieNameFlash = "gitea_flash" diff --git a/services/context/context_model.go b/services/context/context_model.go index 4f70aac516..1a8751ee63 100644 --- a/services/context/context_model.go +++ b/services/context/context_model.go @@ -4,7 +4,7 @@ package context import ( - "code.gitea.io/gitea/models/unit" + "forgejo.org/models/unit" ) // IsUserSiteAdmin returns true if current user is a site admin diff --git a/services/context/context_response.go b/services/context/context_response.go index f36b834a44..e20e7dd852 100644 --- a/services/context/context_response.go +++ b/services/context/context_response.go @@ -16,13 +16,13 @@ import ( "syscall" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web/middleware" ) // RedirectToUser redirect to a differently-named user diff --git a/services/context/context_test.go b/services/context/context_test.go index 033ce2ef0a..c2a271d2b7 100644 --- a/services/context/context_test.go +++ b/services/context/context_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/csrf.go b/services/context/csrf.go index 51127c6eb0..82dd9283ff 100644 --- a/services/context/csrf.go +++ b/services/context/csrf.go @@ -25,8 +25,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) const ( diff --git a/services/context/org.go b/services/context/org.go index 9673f2f5a9..31ad60704f 100644 --- a/services/context/org.go +++ b/services/context/org.go @@ -7,14 +7,14 @@ package context import ( "strings" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" ) // Organization contains organization context diff --git a/services/context/package.go b/services/context/package.go index c452c657e7..e597249e2a 100644 --- a/services/context/package.go +++ b/services/context/package.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/templates" ) // Package contains owner, access mode and optional the package descriptor diff --git a/services/context/pagination.go b/services/context/pagination.go index 655a278f9f..b826e59dea 100644 --- a/services/context/pagination.go +++ b/services/context/pagination.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/paginator" + "forgejo.org/modules/paginator" ) // Pagination provides a pagination via paginator.Paginator and additional configurations for the link params used in rendering diff --git a/services/context/permission.go b/services/context/permission.go index 14a9801dcc..b6af87f912 100644 --- a/services/context/permission.go +++ b/services/context/permission.go @@ -6,10 +6,10 @@ package context import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/log" ) // RequireRepoAdmin returns a middleware for requiring repository admin permission diff --git a/services/context/private.go b/services/context/private.go index 8b41949f60..3d7ed694f1 100644 --- a/services/context/private.go +++ b/services/context/private.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" + "forgejo.org/modules/graceful" + "forgejo.org/modules/process" + "forgejo.org/modules/web" + web_types "forgejo.org/modules/web/types" ) // PrivateContext represents a context for private routes diff --git a/services/context/quota.go b/services/context/quota.go index 94e8847696..f6e79e1ebe 100644 --- a/services/context/quota.go +++ b/services/context/quota.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/base" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/base" ) type QuotaTargetType int diff --git a/services/context/repo.go b/services/context/repo.go index ff03844c03..a1e1cadf6c 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -15,26 +15,26 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/card" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/card" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + asymkey_service "forgejo.org/services/asymkey" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/services/context/repository.go b/services/context/repository.go index 422ac3f58d..7eef2c5068 100644 --- a/services/context/repository.go +++ b/services/context/repository.go @@ -6,7 +6,7 @@ package context import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" ) // RepositoryIDAssignmentAPI returns a middleware to handle context-repo assignment for api routes diff --git a/services/context/response.go b/services/context/response.go index 2f271f211b..8fc631e671 100644 --- a/services/context/response.go +++ b/services/context/response.go @@ -6,7 +6,7 @@ package context import ( "net/http" - web_types "code.gitea.io/gitea/modules/web/types" + web_types "forgejo.org/modules/web/types" ) // ResponseWriter represents a response writer for HTTP diff --git a/services/context/upload/upload.go b/services/context/upload/upload.go index 77a7eb9377..2fa177e604 100644 --- a/services/context/upload/upload.go +++ b/services/context/upload/upload.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // ErrFileTypeForbidden not allowed file type error diff --git a/services/context/user.go b/services/context/user.go index 4c9cd2928b..a82c90d7a6 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" ) // UserAssignmentWeb returns a middleware to handle context-user assignment for web routes diff --git a/services/contexttest/context_tests.go b/services/contexttest/context_tests.go index 7c829f3598..ebab04f620 100644 --- a/services/contexttest/context_tests.go +++ b/services/contexttest/context_tests.go @@ -15,16 +15,16 @@ import ( "testing" "time" - org_model "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + org_model "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/services/convert/activity.go b/services/convert/activity.go index 01fef73e58..213db13772 100644 --- a/services/convert/activity.go +++ b/services/convert/activity.go @@ -6,12 +6,12 @@ package convert import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + activities_model "forgejo.org/models/activities" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" ) func ToActivity(ctx context.Context, ac *activities_model.Action, doer *user_model.User) *api.Activity { diff --git a/services/convert/attachment.go b/services/convert/attachment.go index d632c94c18..6617aac906 100644 --- a/services/convert/attachment.go +++ b/services/convert/attachment.go @@ -4,8 +4,8 @@ package convert import ( - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) func WebAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachment) string { diff --git a/services/convert/convert.go b/services/convert/convert.go index 7a094494e4..2ea24a1b51 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -11,24 +11,24 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" + actions_model "forgejo.org/models/actions" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/gitdiff" ) // ToEmail convert models.EmailAddress to api.Email diff --git a/services/convert/git_commit.go b/services/convert/git_commit.go index e0efcddbcb..e041361737 100644 --- a/services/convert/git_commit.go +++ b/services/convert/git_commit.go @@ -8,14 +8,14 @@ import ( "net/url" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - ctx "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/gitdiff" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + ctx "forgejo.org/services/context" + "forgejo.org/services/gitdiff" ) // ToCommitUser convert a git.Signature to an api.CommitUser diff --git a/services/convert/git_commit_test.go b/services/convert/git_commit_test.go index 68d1b05168..463b93aac3 100644 --- a/services/convert/git_commit_test.go +++ b/services/convert/git_commit_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/issue.go b/services/convert/issue.go index f514dc4313..c7803794d0 100644 --- a/services/convert/issue.go +++ b/services/convert/issue.go @@ -9,13 +9,13 @@ import ( "net/url" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" ) func ToIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) *api.Issue { diff --git a/services/convert/issue_comment.go b/services/convert/issue_comment.go index 9ec9ac7684..9ea315aee6 100644 --- a/services/convert/issue_comment.go +++ b/services/convert/issue_comment.go @@ -6,12 +6,12 @@ package convert import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // ToAPIComment converts a issues_model.Comment to the api.Comment format for API usage diff --git a/services/convert/issue_test.go b/services/convert/issue_test.go index 0aeb3e5612..97bacfb229 100644 --- a/services/convert/issue_test.go +++ b/services/convert/issue_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/main_test.go b/services/convert/main_test.go index b28b8f9446..5915d16be4 100644 --- a/services/convert/main_test.go +++ b/services/convert/main_test.go @@ -6,10 +6,10 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/convert/mirror.go b/services/convert/mirror.go index 85e0d1c856..9e7d2659ab 100644 --- a/services/convert/mirror.go +++ b/services/convert/mirror.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) // ToPushMirror convert from repo_model.PushMirror and remoteAddress to api.TopicResponse diff --git a/services/convert/notification.go b/services/convert/notification.go index 41063cf399..3a4239e0fe 100644 --- a/services/convert/notification.go +++ b/services/convert/notification.go @@ -7,10 +7,10 @@ import ( "context" "net/url" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - api "code.gitea.io/gitea/modules/structs" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + api "forgejo.org/modules/structs" ) // ToNotificationThread convert a Notification to api.NotificationThread diff --git a/services/convert/package.go b/services/convert/package.go index b5fca21a3c..a28e60e1b1 100644 --- a/services/convert/package.go +++ b/services/convert/package.go @@ -6,10 +6,10 @@ package convert import ( "context" - "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToPackage convert a packages.PackageDescriptor to api.Package diff --git a/services/convert/pull.go b/services/convert/pull.go index 70dc22445a..7bee2b4c44 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" ) // ToAPIPullRequest assumes following fields have been assigned with valid values: diff --git a/services/convert/pull_review.go b/services/convert/pull_review.go index f7990e7a5c..08ccc0e1fc 100644 --- a/services/convert/pull_review.go +++ b/services/convert/pull_review.go @@ -7,9 +7,9 @@ import ( "context" "strings" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToPullReview convert a review to api format diff --git a/services/convert/pull_test.go b/services/convert/pull_test.go index 1339ed5cc0..3e4875fc60 100644 --- a/services/convert/pull_test.go +++ b/services/convert/pull_test.go @@ -6,15 +6,15 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/quota.go b/services/convert/quota.go index 791cd8e038..ba729feaac 100644 --- a/services/convert/quota.go +++ b/services/convert/quota.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - action_model "code.gitea.io/gitea/models/actions" - issue_model "code.gitea.io/gitea/models/issues" - package_model "code.gitea.io/gitea/models/packages" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + action_model "forgejo.org/models/actions" + issue_model "forgejo.org/models/issues" + package_model "forgejo.org/models/packages" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) func ToQuotaRuleInfo(rule quota_model.Rule, withName bool) api.QuotaRuleInfo { diff --git a/services/convert/release.go b/services/convert/release.go index 8c0f61b56c..7773cf3b19 100644 --- a/services/convert/release.go +++ b/services/convert/release.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) // ToAPIRelease convert a repo_model.Release to api.Release diff --git a/services/convert/release_test.go b/services/convert/release_test.go index 2e40bb9cdd..3abd2ff3ef 100644 --- a/services/convert/release_test.go +++ b/services/convert/release_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/repository.go b/services/convert/repository.go index e4b2c7b8bc..1b0f46b3da 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -7,14 +7,14 @@ import ( "context" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" ) // ToRepo converts a Repository to api.Repository diff --git a/services/convert/status.go b/services/convert/status.go index 6cef63c1cd..1a71e70a52 100644 --- a/services/convert/status.go +++ b/services/convert/status.go @@ -6,9 +6,9 @@ package convert import ( "context" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + git_model "forgejo.org/models/git" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToCommitStatus converts git_model.CommitStatus to api.CommitStatus diff --git a/services/convert/user.go b/services/convert/user.go index 7b6775dfb4..444089fd83 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -6,9 +6,9 @@ package convert import ( "context" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToUser convert user_model.User to api.User diff --git a/services/convert/user_test.go b/services/convert/user_test.go index 0f0b520c9b..01ce8101da 100644 --- a/services/convert/user_test.go +++ b/services/convert/user_test.go @@ -6,10 +6,10 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/utils.go b/services/convert/utils.go index fe35fd2dac..3bbd4e39bd 100644 --- a/services/convert/utils.go +++ b/services/convert/utils.go @@ -7,8 +7,8 @@ package convert import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" ) // ToCorrectPageSize makes sure page size is in allowed range. diff --git a/services/convert/wiki.go b/services/convert/wiki.go index 767bfdb88d..adcbd52949 100644 --- a/services/convert/wiki.go +++ b/services/convert/wiki.go @@ -6,8 +6,8 @@ package convert import ( "time" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" ) // ToWikiCommit convert a git commit into a WikiCommit diff --git a/services/cron/cron.go b/services/cron/cron.go index 3c5737e371..d020f3fd6c 100644 --- a/services/cron/cron.go +++ b/services/cron/cron.go @@ -9,10 +9,10 @@ import ( "runtime/pprof" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/graceful" + "forgejo.org/modules/process" + "forgejo.org/modules/sync" + "forgejo.org/modules/translation" "github.com/go-co-op/gocron" ) diff --git a/services/cron/setting.go b/services/cron/setting.go index 6dad88830a..7fd4c4e1d8 100644 --- a/services/cron/setting.go +++ b/services/cron/setting.go @@ -6,7 +6,7 @@ package cron import ( "time" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" ) // Config represents a basic configuration interface that cron task diff --git a/services/cron/tasks.go b/services/cron/tasks.go index f8a7444c49..b547acdf05 100644 --- a/services/cron/tasks.go +++ b/services/cron/tasks.go @@ -11,14 +11,14 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/db" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) var ( diff --git a/services/cron/tasks_actions.go b/services/cron/tasks_actions.go index 59cfe36d14..a7fd3cd0bc 100644 --- a/services/cron/tasks_actions.go +++ b/services/cron/tasks_actions.go @@ -6,9 +6,9 @@ package cron import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - actions_service "code.gitea.io/gitea/services/actions" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + actions_service "forgejo.org/services/actions" ) func initActionsTasks() { diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 23eb0dd291..5ada7a8f5c 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -7,18 +7,18 @@ import ( "context" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" + "forgejo.org/models" + git_model "forgejo.org/models/git" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/services/auth" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + packages_cleanup_service "forgejo.org/services/packages/cleanup" + repo_service "forgejo.org/services/repository" + archiver_service "forgejo.org/services/repository/archiver" ) func registerUpdateMirrorTask() { diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go index e1ba5274e6..322fe27ca0 100644 --- a/services/cron/tasks_extended.go +++ b/services/cron/tasks_extended.go @@ -7,17 +7,17 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/updatechecker" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - user_service "code.gitea.io/gitea/services/user" + activities_model "forgejo.org/models/activities" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/setting" + "forgejo.org/modules/updatechecker" + repo_service "forgejo.org/services/repository" + archiver_service "forgejo.org/services/repository/archiver" + user_service "forgejo.org/services/user" ) func registerDeleteInactiveUsers() { diff --git a/services/doctor/actions.go b/services/doctor/actions.go index 7c44fb8392..c382132265 100644 --- a/services/doctor/actions.go +++ b/services/doctor/actions.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_service "forgejo.org/services/repository" ) func disableMirrorActionsUnit(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/authorizedkeys.go b/services/doctor/authorizedkeys.go index 2920cf51d7..04a3680ff5 100644 --- a/services/doctor/authorizedkeys.go +++ b/services/doctor/authorizedkeys.go @@ -12,10 +12,10 @@ import ( "path/filepath" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) const tplCommentPrefix = `# gitea public key` diff --git a/services/doctor/breaking.go b/services/doctor/breaking.go index ec8433b8de..339f8e847c 100644 --- a/services/doctor/breaking.go +++ b/services/doctor/breaking.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" "xorm.io/builder" ) diff --git a/services/doctor/checkOldArchives.go b/services/doctor/checkOldArchives.go index 390dfb43aa..301e99391b 100644 --- a/services/doctor/checkOldArchives.go +++ b/services/doctor/checkOldArchives.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) func checkOldArchives(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go index 9e2fcb645f..6fcbd90940 100644 --- a/services/doctor/dbconsistency.go +++ b/services/doctor/dbconsistency.go @@ -6,16 +6,16 @@ package doctor import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/migrations" - org_model "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/migrations" + org_model "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type consistencyCheck struct { diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go index 2a102b2194..9c02c732e5 100644 --- a/services/doctor/dbversion.go +++ b/services/doctor/dbversion.go @@ -6,9 +6,9 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + "forgejo.org/modules/log" ) func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/doctor.go b/services/doctor/doctor.go index a4eb5e16b9..6d8e168bf2 100644 --- a/services/doctor/doctor.go +++ b/services/doctor/doctor.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // Check represents a Doctor check diff --git a/services/doctor/fix16961.go b/services/doctor/fix16961.go index 50d9ac6621..2212d9e903 100644 --- a/services/doctor/fix16961.go +++ b/services/doctor/fix16961.go @@ -9,12 +9,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/services/doctor/fix16961_test.go b/services/doctor/fix16961_test.go index 498ed9c8d5..7a83c808c3 100644 --- a/services/doctor/fix16961_test.go +++ b/services/doctor/fix16961_test.go @@ -6,7 +6,7 @@ package doctor import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/fix8312.go b/services/doctor/fix8312.go index 4fc049873a..31cd6686d7 100644 --- a/services/doctor/fix8312.go +++ b/services/doctor/fix8312.go @@ -6,11 +6,11 @@ package doctor import ( "context" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/heads.go b/services/doctor/heads.go index 41fca01d57..7f9d1c73e8 100644 --- a/services/doctor/heads.go +++ b/services/doctor/heads.go @@ -6,9 +6,9 @@ package doctor import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/lfs.go b/services/doctor/lfs.go index 8531b7bbe8..fed127de5d 100644 --- a/services/doctor/lfs.go +++ b/services/doctor/lfs.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/repository" ) func init() { diff --git a/services/doctor/mergebase.go b/services/doctor/mergebase.go index de460c4190..bebde30bee 100644 --- a/services/doctor/mergebase.go +++ b/services/doctor/mergebase.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/misc.go b/services/doctor/misc.go index 9300c3a25c..9b9c96b52b 100644 --- a/services/doctor/misc.go +++ b/services/doctor/misc.go @@ -11,17 +11,17 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/services/doctor/packages_nuget.go b/services/doctor/packages_nuget.go index 47fdb3ac12..f6a33db779 100644 --- a/services/doctor/packages_nuget.go +++ b/services/doctor/packages_nuget.go @@ -9,12 +9,12 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + nuget_module "forgejo.org/modules/packages/nuget" + packages_service "forgejo.org/services/packages" "xorm.io/builder" ) diff --git a/services/doctor/paths.go b/services/doctor/paths.go index 8e37f01ef5..4fbe19ea04 100644 --- a/services/doctor/paths.go +++ b/services/doctor/paths.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type configurationFile struct { diff --git a/services/doctor/push_mirror_consistency.go b/services/doctor/push_mirror_consistency.go index 68b96d6415..07986770b2 100644 --- a/services/doctor/push_mirror_consistency.go +++ b/services/doctor/push_mirror_consistency.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/repository.go b/services/doctor/repository.go index 6c33426636..cd51483d88 100644 --- a/services/doctor/repository.go +++ b/services/doctor/repository.go @@ -6,11 +6,11 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + repo_service "forgejo.org/services/repository" "xorm.io/builder" ) diff --git a/services/doctor/storage.go b/services/doctor/storage.go index 3f3b562c37..7dbe475d6c 100644 --- a/services/doctor/storage.go +++ b/services/doctor/storage.go @@ -9,16 +9,16 @@ import ( "io/fs" "strings" - "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/git" + "forgejo.org/models/packages" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" ) type commonStorageCheckOptions struct { diff --git a/services/doctor/usertype.go b/services/doctor/usertype.go index ab32b78e62..0a034d8f9d 100644 --- a/services/doctor/usertype.go +++ b/services/doctor/usertype.go @@ -6,8 +6,8 @@ package doctor import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" ) func checkUserType(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/externalaccount/link.go b/services/externalaccount/link.go index d6e2ea7e94..f5d29b5ce5 100644 --- a/services/externalaccount/link.go +++ b/services/externalaccount/link.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "github.com/markbates/goth" ) diff --git a/services/externalaccount/user.go b/services/externalaccount/user.go index 3cfd8c81f9..68d085f6d0 100644 --- a/services/externalaccount/user.go +++ b/services/externalaccount/user.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/markbates/goth" ) diff --git a/services/f3/driver/asset.go b/services/f3/driver/asset.go index 61e571d1b6..c9d2ecdf2f 100644 --- a/services/f3/driver/asset.go +++ b/services/f3/driver/asset.go @@ -12,12 +12,12 @@ import ( "io" "os" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/attachment" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/services/attachment" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/assets.go b/services/f3/driver/assets.go index 88a3979713..106d5029f3 100644 --- a/services/f3/driver/assets.go +++ b/services/f3/driver/assets.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/comment.go b/services/f3/driver/comment.go index 166bfcd328..bd924930b5 100644 --- a/services/f3/driver/comment.go +++ b/services/f3/driver/comment.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/comments.go b/services/f3/driver/comments.go index eb79b74066..d8c84e290c 100644 --- a/services/f3/driver/comments.go +++ b/services/f3/driver/comments.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/forge.go b/services/f3/driver/forge.go index c232882753..03acb41450 100644 --- a/services/f3/driver/forge.go +++ b/services/f3/driver/forge.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/issue.go b/services/f3/driver/issue.go index 7e10f3a9db..6308c4cc2d 100644 --- a/services/f3/driver/issue.go +++ b/services/f3/driver/issue.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + issue_service "forgejo.org/services/issue" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/issues.go b/services/f3/driver/issues.go index 3a5a64e2b1..dd6828dc86 100644 --- a/services/f3/driver/issues.go +++ b/services/f3/driver/issues.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/label.go b/services/f3/driver/label.go index 509a69cf71..707ac2bab3 100644 --- a/services/f3/driver/label.go +++ b/services/f3/driver/label.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/labels.go b/services/f3/driver/labels.go index 03f986b57a..4f705ed206 100644 --- a/services/f3/driver/labels.go +++ b/services/f3/driver/labels.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/main.go b/services/f3/driver/main.go index 825d456692..eb6e4a6fb6 100644 --- a/services/f3/driver/main.go +++ b/services/f3/driver/main.go @@ -5,7 +5,7 @@ package driver import ( - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" "code.forgejo.org/f3/gof3/v3/options" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/main_test.go b/services/f3/driver/main_test.go index 8505b69b7e..b136fd5b23 100644 --- a/services/f3/driver/main_test.go +++ b/services/f3/driver/main_test.go @@ -7,14 +7,14 @@ package driver import ( "testing" - "code.gitea.io/gitea/models/unittest" - driver_options "code.gitea.io/gitea/services/f3/driver/options" + "forgejo.org/models/unittest" + driver_options "forgejo.org/services/f3/driver/options" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" - _ "code.gitea.io/gitea/services/f3/driver/tests" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/perm/access" + _ "forgejo.org/services/f3/driver/tests" tests_f3 "code.forgejo.org/f3/gof3/v3/tree/tests/f3" "github.com/stretchr/testify/require" diff --git a/services/f3/driver/milestone.go b/services/f3/driver/milestone.go index e57fee95a7..d10e6918ac 100644 --- a/services/f3/driver/milestone.go +++ b/services/f3/driver/milestone.go @@ -9,10 +9,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/milestones.go b/services/f3/driver/milestones.go index c816903bb1..cf0b70c158 100644 --- a/services/f3/driver/milestones.go +++ b/services/f3/driver/milestones.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/options.go b/services/f3/driver/options.go index abc5015dd0..516f9baf7a 100644 --- a/services/f3/driver/options.go +++ b/services/f3/driver/options.go @@ -7,7 +7,7 @@ package driver import ( "net/http" - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" "code.forgejo.org/f3/gof3/v3/options" ) diff --git a/services/f3/driver/organization.go b/services/f3/driver/organization.go index 8e818a231a..af1eea4dda 100644 --- a/services/f3/driver/organization.go +++ b/services/f3/driver/organization.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/organizations.go b/services/f3/driver/organizations.go index adebdbbe95..eca6bfb9d4 100644 --- a/services/f3/driver/organizations.go +++ b/services/f3/driver/organizations.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" f3_id "code.forgejo.org/f3/gof3/v3/id" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/project.go b/services/f3/driver/project.go index 2400663426..5a3ec81e40 100644 --- a/services/f3/driver/project.go +++ b/services/f3/driver/project.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + repo_service "forgejo.org/services/repository" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/projects.go b/services/f3/driver/projects.go index fb447f3f01..0c76854f43 100644 --- a/services/f3/driver/projects.go +++ b/services/f3/driver/projects.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" f3_id "code.forgejo.org/f3/gof3/v3/id" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/pullrequest.go b/services/f3/driver/pullrequest.go index b8cb06c4d5..664ee6b13b 100644 --- a/services/f3/driver/pullrequest.go +++ b/services/f3/driver/pullrequest.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + issue_service "forgejo.org/services/issue" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/pullrequests.go b/services/f3/driver/pullrequests.go index e7f2910314..227171994c 100644 --- a/services/f3/driver/pullrequests.go +++ b/services/f3/driver/pullrequests.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/optional" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/reaction.go b/services/f3/driver/reaction.go index 4f12fa41db..74c50b9d13 100644 --- a/services/f3/driver/reaction.go +++ b/services/f3/driver/reaction.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/reactions.go b/services/f3/driver/reactions.go index b7fd5e8f0a..a546927b92 100644 --- a/services/f3/driver/reactions.go +++ b/services/f3/driver/reactions.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/release.go b/services/f3/driver/release.go index 86490e8b02..df38bd8bc0 100644 --- a/services/f3/driver/release.go +++ b/services/f3/driver/release.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - release_service "code.gitea.io/gitea/services/release" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + release_service "forgejo.org/services/release" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/releases.go b/services/f3/driver/releases.go index 3b46bc7c54..a631c0b60e 100644 --- a/services/f3/driver/releases.go +++ b/services/f3/driver/releases.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/repository.go b/services/f3/driver/repository.go index 118d5f2f2a..e7f4e43723 100644 --- a/services/f3/driver/repository.go +++ b/services/f3/driver/repository.go @@ -7,7 +7,7 @@ package driver import ( "context" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" "code.forgejo.org/f3/gof3/v3/f3" helpers_repository "code.forgejo.org/f3/gof3/v3/forges/helpers/repository" diff --git a/services/f3/driver/review.go b/services/f3/driver/review.go index d180ea96be..f4f5ff44b8 100644 --- a/services/f3/driver/review.go +++ b/services/f3/driver/review.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/reviewcomment.go b/services/f3/driver/reviewcomment.go index 7ba0e15802..22759b6df3 100644 --- a/services/f3/driver/reviewcomment.go +++ b/services/f3/driver/reviewcomment.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/reviewcomments.go b/services/f3/driver/reviewcomments.go index e11aaa489b..2aa4dea22c 100644 --- a/services/f3/driver/reviewcomments.go +++ b/services/f3/driver/reviewcomments.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/reviews.go b/services/f3/driver/reviews.go index a20d5741d1..7c3dcb37de 100644 --- a/services/f3/driver/reviews.go +++ b/services/f3/driver/reviews.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/tests/init.go b/services/f3/driver/tests/init.go index d7bf23ac88..9035296dc0 100644 --- a/services/f3/driver/tests/init.go +++ b/services/f3/driver/tests/init.go @@ -5,7 +5,7 @@ package tests import ( - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" tests_forge "code.forgejo.org/f3/gof3/v3/tree/tests/f3/forge" ) diff --git a/services/f3/driver/tests/new.go b/services/f3/driver/tests/new.go index dc6ac437e6..2f5c6c64db 100644 --- a/services/f3/driver/tests/new.go +++ b/services/f3/driver/tests/new.go @@ -7,7 +7,7 @@ package tests import ( "testing" - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" f3_kind "code.forgejo.org/f3/gof3/v3/kind" "code.forgejo.org/f3/gof3/v3/options" diff --git a/services/f3/driver/tests/options.go b/services/f3/driver/tests/options.go index adaa1da588..f61b10c9ef 100644 --- a/services/f3/driver/tests/options.go +++ b/services/f3/driver/tests/options.go @@ -7,9 +7,9 @@ package tests import ( "testing" - forgejo_log "code.gitea.io/gitea/modules/log" - driver_options "code.gitea.io/gitea/services/f3/driver/options" - "code.gitea.io/gitea/services/f3/util" + forgejo_log "forgejo.org/modules/log" + driver_options "forgejo.org/services/f3/driver/options" + "forgejo.org/services/f3/util" "code.forgejo.org/f3/gof3/v3/options" ) diff --git a/services/f3/driver/topic.go b/services/f3/driver/topic.go index eeb387cf93..cc94aa35fa 100644 --- a/services/f3/driver/topic.go +++ b/services/f3/driver/topic.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/topics.go b/services/f3/driver/topics.go index 2685a47928..38f03dbd2d 100644 --- a/services/f3/driver/topics.go +++ b/services/f3/driver/topics.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/tree.go b/services/f3/driver/tree.go index 2377d3794d..ff927df9d4 100644 --- a/services/f3/driver/tree.go +++ b/services/f3/driver/tree.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - forgejo_options "code.gitea.io/gitea/services/f3/driver/options" + forgejo_options "forgejo.org/services/f3/driver/options" f3_kind "code.forgejo.org/f3/gof3/v3/kind" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/user.go b/services/f3/driver/user.go index 0ba6cbb7c6..bf8bfaf9c9 100644 --- a/services/f3/driver/user.go +++ b/services/f3/driver/user.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + user_service "forgejo.org/services/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/users.go b/services/f3/driver/users.go index 59b10fc51d..cb413ae05d 100644 --- a/services/f3/driver/users.go +++ b/services/f3/driver/users.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" f3_id "code.forgejo.org/f3/gof3/v3/id" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/util/logger.go b/services/f3/util/logger.go index 21d8d6bbfa..9a1409ae84 100644 --- a/services/f3/util/logger.go +++ b/services/f3/util/logger.go @@ -6,8 +6,8 @@ package util import ( "fmt" - forgejo_log "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" + forgejo_log "forgejo.org/modules/log" + "forgejo.org/modules/migration" "code.forgejo.org/f3/gof3/v3/logger" ) diff --git a/services/f3/util/logger_test.go b/services/f3/util/logger_test.go index db880aa439..4afd5dd57f 100644 --- a/services/f3/util/logger_test.go +++ b/services/f3/util/logger_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - forgejo_log "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/test" + forgejo_log "forgejo.org/modules/log" + "forgejo.org/modules/test" "code.forgejo.org/f3/gof3/v3/logger" "github.com/stretchr/testify/assert" diff --git a/services/federation/federation_service.go b/services/federation/federation_service.go index 4c6f5ca0ca..21c7be855b 100644 --- a/services/federation/federation_service.go +++ b/services/federation/federation_service.go @@ -11,15 +11,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/forgefed" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/auth/password" - fm "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/forgefed" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/auth/password" + fm "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" "github.com/google/uuid" ) diff --git a/services/feed/action.go b/services/feed/action.go index 2d6a6cb09a..a2cd0551a3 100644 --- a/services/feed/action.go +++ b/services/feed/action.go @@ -9,17 +9,17 @@ import ( "path" "strings" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) type actionNotifier struct { diff --git a/services/feed/action_test.go b/services/feed/action_test.go index 037cf08dfe..b0bbcdc3b6 100644 --- a/services/feed/action_test.go +++ b/services/feed/action_test.go @@ -7,18 +7,18 @@ import ( "strings" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/forgejo/main_test.go b/services/forgejo/main_test.go index 40ce1715b1..5523ed1aab 100644 --- a/services/forgejo/main_test.go +++ b/services/forgejo/main_test.go @@ -5,12 +5,12 @@ package forgejo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/forgejo/sanity.go b/services/forgejo/sanity.go index 5e817d67f5..70f15889d4 100644 --- a/services/forgejo/sanity.go +++ b/services/forgejo/sanity.go @@ -3,9 +3,9 @@ package forgejo import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) var ( diff --git a/services/forgejo/sanity_test.go b/services/forgejo/sanity_test.go index 657f7e2720..065a9fda4d 100644 --- a/services/forgejo/sanity_test.go +++ b/services/forgejo/sanity_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/require" ) diff --git a/services/forgejo/sanity_v1TOv5_0_1Included.go b/services/forgejo/sanity_v1TOv5_0_1Included.go index 49de636f33..1d3f07d8e1 100644 --- a/services/forgejo/sanity_v1TOv5_0_1Included.go +++ b/services/forgejo/sanity_v1TOv5_0_1Included.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgejo/semver" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/forgejo/semver" + "forgejo.org/modules/setting" "github.com/hashicorp/go-version" ) diff --git a/services/forgejo/sanity_v1TOv5_0_1Included_test.go b/services/forgejo/sanity_v1TOv5_0_1Included_test.go index 56618ebd5f..2521afb496 100644 --- a/services/forgejo/sanity_v1TOv5_0_1Included_test.go +++ b/services/forgejo/sanity_v1TOv5_0_1Included_test.go @@ -6,10 +6,10 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgejo/semver" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/forgejo/semver" + "forgejo.org/models/unittest" + "forgejo.org/modules/log" "github.com/stretchr/testify/require" ) diff --git a/services/forms/admin.go b/services/forms/admin.go index 1f055cff55..5a5d46634b 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -6,9 +6,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go index 21443ff6a5..e665ca0d19 100644 --- a/services/forms/auth_form.go +++ b/services/forms/auth_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/org.go b/services/forms/org.go index dea2e159e9..a6e4e72c4a 100644 --- a/services/forms/org.go +++ b/services/forms/org.go @@ -7,9 +7,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/package_form.go b/services/forms/package_form.go index 7a7d8752cf..82e5a09f86 100644 --- a/services/forms/package_form.go +++ b/services/forms/package_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/repo_branch_form.go b/services/forms/repo_branch_form.go index 186a4ad367..c34e7c6d17 100644 --- a/services/forms/repo_branch_form.go +++ b/services/forms/repo_branch_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 8253a8957b..bd2eb769c6 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -12,14 +12,14 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/models" + issues_model "forgejo.org/models/issues" + project_model "forgejo.org/models/project" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/repo_form_test.go b/services/forms/repo_form_test.go index 2c5a8e2c0f..4047762096 100644 --- a/services/forms/repo_form_test.go +++ b/services/forms/repo_form_test.go @@ -6,7 +6,7 @@ package forms import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/forms/repo_tag_form.go b/services/forms/repo_tag_form.go index 38f5996db3..1254c84d07 100644 --- a/services/forms/repo_tag_form.go +++ b/services/forms/repo_tag_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/runner.go b/services/forms/runner.go index f933750858..fcf6c5a694 100644 --- a/services/forms/runner.go +++ b/services/forms/runner.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/user_form.go b/services/forms/user_form.go index d76e97ceb1..dfd5b3da9b 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/user_form_auth_openid.go b/services/forms/user_form_auth_openid.go index c5ab703fa1..02d4f873bc 100644 --- a/services/forms/user_form_auth_openid.go +++ b/services/forms/user_form_auth_openid.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/user_form_hidden_comments.go b/services/forms/user_form_hidden_comments.go index b9677c1800..74a1aaccb0 100644 --- a/services/forms/user_form_hidden_comments.go +++ b/services/forms/user_form_hidden_comments.go @@ -6,9 +6,9 @@ package forms import ( "math/big" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) type hiddenCommentTypeGroupsType map[string][]issues_model.CommentType diff --git a/services/forms/user_form_test.go b/services/forms/user_form_test.go index 66050187c9..67fb64cabf 100644 --- a/services/forms/user_form_test.go +++ b/services/forms/user_form_test.go @@ -7,8 +7,8 @@ import ( "strconv" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/services/gitdiff/csv_test.go b/services/gitdiff/csv_test.go index 1dbe616374..9bffba33fd 100644 --- a/services/gitdiff/csv_test.go +++ b/services/gitdiff/csv_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - csv_module "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + csv_module "forgejo.org/modules/csv" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index f2070983e6..2e1fecda2a 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -17,19 +17,19 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + user_model "forgejo.org/models/user" + "forgejo.org/modules/analyze" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/highlight" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" "github.com/sergi/go-diff/diffmatchpatch" stdcharset "golang.org/x/net/html/charset" diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index f2c099d554..532255fe84 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" dmp "github.com/sergi/go-diff/diffmatchpatch" "github.com/stretchr/testify/assert" diff --git a/services/gitdiff/highlightdiff.go b/services/gitdiff/highlightdiff.go index c72959ea16..08681b8617 100644 --- a/services/gitdiff/highlightdiff.go +++ b/services/gitdiff/highlightdiff.go @@ -6,7 +6,7 @@ package gitdiff import ( "strings" - "code.gitea.io/gitea/modules/highlight" + "forgejo.org/modules/highlight" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/services/gitdiff/main_test.go b/services/gitdiff/main_test.go index 3d4d480530..cd7a6a4a6b 100644 --- a/services/gitdiff/main_test.go +++ b/services/gitdiff/main_test.go @@ -6,12 +6,12 @@ package gitdiff import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/indexer/indexer.go b/services/indexer/indexer.go index 38dd012a51..92036f95c3 100644 --- a/services/indexer/indexer.go +++ b/services/indexer/indexer.go @@ -4,10 +4,10 @@ package indexer import ( - code_indexer "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - stats_indexer "code.gitea.io/gitea/modules/indexer/stats" - notify_service "code.gitea.io/gitea/services/notify" + code_indexer "forgejo.org/modules/indexer/code" + issue_indexer "forgejo.org/modules/indexer/issues" + stats_indexer "forgejo.org/modules/indexer/stats" + notify_service "forgejo.org/services/notify" ) // Init initialize the repo indexer diff --git a/services/indexer/notify.go b/services/indexer/notify.go index e2cfe477d3..ddd89f733c 100644 --- a/services/indexer/notify.go +++ b/services/indexer/notify.go @@ -6,16 +6,16 @@ package indexer import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - stats_indexer "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + code_indexer "forgejo.org/modules/indexer/code" + issue_indexer "forgejo.org/modules/indexer/issues" + stats_indexer "forgejo.org/modules/indexer/stats" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + notify_service "forgejo.org/services/notify" ) type indexerNotifier struct { diff --git a/services/issue/assignee.go b/services/issue/assignee.go index 3d6d0b881a..a5f9c2731f 100644 --- a/services/issue/assignee.go +++ b/services/issue/assignee.go @@ -6,15 +6,15 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) // DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array diff --git a/services/issue/assignee_test.go b/services/issue/assignee_test.go index 2b70b8c8ce..66a66459cb 100644 --- a/services/issue/assignee_test.go +++ b/services/issue/assignee_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/comments.go b/services/issue/comments.go index 3ab577b83f..dedef6cc87 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + notify_service "forgejo.org/services/notify" ) // CreateRefComment creates a commit reference comment to issue. diff --git a/services/issue/comments_test.go b/services/issue/comments_test.go index 62547a584a..728af15529 100644 --- a/services/issue/comments_test.go +++ b/services/issue/comments_test.go @@ -6,17 +6,17 @@ package issue_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + issue_service "forgejo.org/services/issue" + "forgejo.org/tests" - _ "code.gitea.io/gitea/services/webhook" + _ "forgejo.org/services/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/commit.go b/services/issue/commit.go index 8b927d52b6..1e51fb32b7 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -13,15 +13,15 @@ import ( "strings" "time" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/references" + "forgejo.org/modules/repository" ) const ( diff --git a/services/issue/commit_test.go b/services/issue/commit_test.go index c3c3e4c042..e3a41d2305 100644 --- a/services/issue/commit_test.go +++ b/services/issue/commit_test.go @@ -6,14 +6,14 @@ package issue import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" "github.com/stretchr/testify/require" ) diff --git a/services/issue/content.go b/services/issue/content.go index 612a9a6b4c..d5c79e5fde 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -6,9 +6,9 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) // ChangeContent changes issue content, as the given user. diff --git a/services/issue/issue.go b/services/issue/issue.go index 5e726176d0..f6a3e90b10 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -8,19 +8,19 @@ import ( "fmt" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + notify_service "forgejo.org/services/notify" ) // NewIssue creates new issue with labels for repository. diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go index a0bb88e387..e15a0118ad 100644 --- a/services/issue/issue_test.go +++ b/services/issue/issue_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/label.go b/services/issue/label.go index 6b8070d8aa..bcac54272a 100644 --- a/services/issue/label.go +++ b/services/issue/label.go @@ -6,11 +6,11 @@ package issue import ( "context" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) // ClearLabels clears all of an issue's labels diff --git a/services/issue/label_test.go b/services/issue/label_test.go index b9d26345c1..73a028684b 100644 --- a/services/issue/label_test.go +++ b/services/issue/label_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/require" ) diff --git a/services/issue/main_test.go b/services/issue/main_test.go index c3da441537..673ec5e4cc 100644 --- a/services/issue/main_test.go +++ b/services/issue/main_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/services/webhook" - _ "code.gitea.io/gitea/models/actions" + _ "forgejo.org/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/issue/milestone.go b/services/issue/milestone.go index 407ad0a59b..3fa7083812 100644 --- a/services/issue/milestone.go +++ b/services/issue/milestone.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) func updateMilestoneCounters(ctx context.Context, issue *issues_model.Issue, id int64) error { diff --git a/services/issue/milestone_test.go b/services/issue/milestone_test.go index e75f64550c..4123433c2a 100644 --- a/services/issue/milestone_test.go +++ b/services/issue/milestone_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/pull.go b/services/issue/pull.go index 3b61c00afa..b0a0c47d88 100644 --- a/services/issue/pull.go +++ b/services/issue/pull.go @@ -8,15 +8,15 @@ import ( "fmt" "time" - issues_model "code.gitea.io/gitea/models/issues" - org_model "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + issues_model "forgejo.org/models/issues" + org_model "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func getMergeBase(repo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) { diff --git a/services/issue/reaction.go b/services/issue/reaction.go index dbb4735de2..c6a11aa0f0 100644 --- a/services/issue/reaction.go +++ b/services/issue/reaction.go @@ -5,8 +5,8 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" ) // CreateIssueReaction creates a reaction on issue. diff --git a/services/issue/status.go b/services/issue/status.go index 9b6c683f4f..6664da7daa 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -6,10 +6,10 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) // ChangeStatus changes issue status to open or closed. diff --git a/services/issue/template.go b/services/issue/template.go index 9a2b048401..67a01825d2 100644 --- a/services/issue/template.go +++ b/services/issue/template.go @@ -10,11 +10,11 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/issue/template" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" "gopkg.in/yaml.v3" ) diff --git a/services/lfs/locks.go b/services/lfs/locks.go index 2a362b1c0d..a45b2cc93b 100644 --- a/services/lfs/locks.go +++ b/services/lfs/locks.go @@ -8,16 +8,16 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - lfs_module "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/json" + lfs_module "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func handleLockListOut(ctx *context.Context, repo *repo_model.Repository, lock *git_model.LFSLock, err error) { diff --git a/services/lfs/server.go b/services/lfs/server.go index 51d6f42776..8eef62eabe 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -18,21 +18,21 @@ import ( "strconv" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - lfs_module "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + lfs_module "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/services/context" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/mailer/incoming/incoming.go b/services/mailer/incoming/incoming.go index 1b1be4c656..b1b9191df3 100644 --- a/services/mailer/incoming/incoming.go +++ b/services/mailer/incoming/incoming.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/token" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/services/mailer/token" "code.forgejo.org/forgejo/reply" "github.com/emersion/go-imap" diff --git a/services/mailer/incoming/incoming_handler.go b/services/mailer/incoming/incoming_handler.go index dc3c4ec69b..7505148978 100644 --- a/services/mailer/incoming/incoming_handler.go +++ b/services/mailer/incoming/incoming_handler.go @@ -8,19 +8,19 @@ import ( "context" "fmt" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context/upload" - issue_service "code.gitea.io/gitea/services/issue" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - "code.gitea.io/gitea/services/mailer/token" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + attachment_service "forgejo.org/services/attachment" + "forgejo.org/services/context/upload" + issue_service "forgejo.org/services/issue" + incoming_payload "forgejo.org/services/mailer/incoming/payload" + "forgejo.org/services/mailer/token" + pull_service "forgejo.org/services/pull" ) type MailHandler interface { diff --git a/services/mailer/incoming/payload/payload.go b/services/mailer/incoming/payload/payload.go index 00ada7826b..bb7a65e3d5 100644 --- a/services/mailer/incoming/payload/payload.go +++ b/services/mailer/incoming/payload/payload.go @@ -6,8 +6,8 @@ package payload import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/util" ) const replyPayloadVersion1 byte = 1 diff --git a/services/mailer/mail.go b/services/mailer/mail.go index bfede28bbe..c0a37d9fb2 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -16,21 +16,21 @@ import ( texttmpl "text/template" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - "code.gitea.io/gitea/services/mailer/token" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/emoji" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + incoming_payload "forgejo.org/services/mailer/incoming/payload" + "forgejo.org/services/mailer/token" "gopkg.in/gomail.v2" ) diff --git a/services/mailer/mail_admin_new_user.go b/services/mailer/mail_admin_new_user.go index 0713de8a95..ffb03197b7 100644 --- a/services/mailer/mail_admin_new_user.go +++ b/services/mailer/mail_admin_new_user.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" ) const ( diff --git a/services/mailer/mail_admin_new_user_test.go b/services/mailer/mail_admin_new_user_test.go index 765c8cb6c9..9273691792 100644 --- a/services/mailer/mail_admin_new_user_test.go +++ b/services/mailer/mail_admin_new_user_test.go @@ -8,10 +8,10 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mail_auth_test.go b/services/mailer/mail_auth_test.go index 38e3721a22..e40a0d6fa0 100644 --- a/services/mailer/mail_auth_test.go +++ b/services/mailer/mail_auth_test.go @@ -6,14 +6,14 @@ package mailer_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mail_comment.go b/services/mailer/mail_comment.go index 1812441d5a..b4ed3145ed 100644 --- a/services/mailer/mail_comment.go +++ b/services/mailer/mail_comment.go @@ -6,12 +6,12 @@ package mailer import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // MailParticipantsComment sends new comment emails to repository watchers and mentioned people. diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index 1bb6fdc7a3..b0329caa0b 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func fallbackMailSubject(issue *issues_model.Issue) string { diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index 0b8b97e9cd..0f2ef33fe1 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -7,14 +7,14 @@ import ( "bytes" "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) const ( diff --git a/services/mailer/mail_repo.go b/services/mailer/mail_repo.go index 7003584786..eed650f3ac 100644 --- a/services/mailer/mail_repo.go +++ b/services/mailer/mail_repo.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) // SendRepoTransferNotifyMail triggers a notification e-mail when a pending repository transfer was created diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index ceecefa50f..a2a871d3c3 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -9,12 +9,12 @@ import ( "fmt" "net/url" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) const ( diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 43e5d83890..616eea2d85 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -15,15 +15,15 @@ import ( "testing" texttmpl "text/template" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go index 0a723f974a..4561240df5 100644 --- a/services/mailer/mailer.go +++ b/services/mailer/mailer.go @@ -18,14 +18,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/modules/base" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + notify_service "forgejo.org/services/notify" ntlmssp "github.com/Azure/go-ntlmssp" "github.com/jaytaylor/html2text" diff --git a/services/mailer/mailer_test.go b/services/mailer/mailer_test.go index 045701f3a5..aef242d908 100644 --- a/services/mailer/mailer_test.go +++ b/services/mailer/mailer_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go index 908976e7ef..9ef71dbdb3 100644 --- a/services/mailer/main_test.go +++ b/services/mailer/main_test.go @@ -7,13 +7,13 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" - _ "code.gitea.io/gitea/models/actions" + _ "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/mailer/notify.go b/services/mailer/notify.go index 54ab80aab9..e61ecd0511 100644 --- a/services/mailer/notify.go +++ b/services/mailer/notify.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) type mailNotifier struct { diff --git a/services/mailer/token/token.go b/services/mailer/token/token.go index 1a52bce803..f3d7286cb0 100644 --- a/services/mailer/token/token.go +++ b/services/mailer/token/token.go @@ -11,8 +11,8 @@ import ( "fmt" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" ) // A token is a verifiable container describing an action. diff --git a/services/markup/main_test.go b/services/markup/main_test.go index 89fe3e7e34..1b085b4929 100644 --- a/services/markup/main_test.go +++ b/services/markup/main_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/markup/processorhelper.go b/services/markup/processorhelper.go index 40bf1d65da..b5fcd78cb7 100644 --- a/services/markup/processorhelper.go +++ b/services/markup/processorhelper.go @@ -7,16 +7,16 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - gitea_context "code.gitea.io/gitea/services/context" - file_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models/perm/access" + "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + gitea_context "forgejo.org/services/context" + file_service "forgejo.org/services/repository/files" ) func ProcessorHelper() *markup.ProcessorHelper { diff --git a/services/markup/processorhelper_test.go b/services/markup/processorhelper_test.go index 4d103048b5..8195451746 100644 --- a/services/markup/processorhelper_test.go +++ b/services/markup/processorhelper_test.go @@ -8,11 +8,11 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/models/user" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/codebase.go b/services/migrations/codebase.go index 492fc908e9..843df0f973 100644 --- a/services/migrations/codebase.go +++ b/services/migrations/codebase.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/proxy" + "forgejo.org/modules/structs" ) var ( diff --git a/services/migrations/codebase_test.go b/services/migrations/codebase_test.go index fbd4e70143..315c7be709 100644 --- a/services/migrations/codebase_test.go +++ b/services/migrations/codebase_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/common.go b/services/migrations/common.go index d88518899d..ee74461447 100644 --- a/services/migrations/common.go +++ b/services/migrations/common.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" + system_model "forgejo.org/models/system" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" ) // WarnAndNotice will log the provided message and send a repository notice diff --git a/services/migrations/dump.go b/services/migrations/dump.go index cb13cd3e5c..cbf6b87668 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -16,13 +16,13 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" "github.com/google/uuid" "gopkg.in/yaml.v3" diff --git a/services/migrations/forgejo_downloader.go b/services/migrations/forgejo_downloader.go index 25dbb6ec51..5f809b82be 100644 --- a/services/migrations/forgejo_downloader.go +++ b/services/migrations/forgejo_downloader.go @@ -4,7 +4,7 @@ package migrations import ( - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" ) func init() { diff --git a/services/migrations/forgejo_downloader_test.go b/services/migrations/forgejo_downloader_test.go index 5bd37551cc..db1930ebba 100644 --- a/services/migrations/forgejo_downloader_test.go +++ b/services/migrations/forgejo_downloader_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" "github.com/stretchr/testify/require" ) diff --git a/services/migrations/git.go b/services/migrations/git.go index 22ffd5e765..46710b0abe 100644 --- a/services/migrations/git.go +++ b/services/migrations/git.go @@ -6,7 +6,7 @@ package migrations import ( "context" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" ) var _ base.Downloader = &PlainGitDownloader{} diff --git a/services/migrations/gitbucket.go b/services/migrations/gitbucket.go index 4fe9e30a39..b68fc01083 100644 --- a/services/migrations/gitbucket.go +++ b/services/migrations/gitbucket.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" ) var ( diff --git a/services/migrations/gitea_downloader.go b/services/migrations/gitea_downloader.go index b42c7aa4da..272a7d379a 100644 --- a/services/migrations/gitea_downloader.go +++ b/services/migrations/gitea_downloader.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" gitea_sdk "code.gitea.io/sdk/gitea" ) diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index b9ddb9b431..b3d49752f3 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 7bd6538ff2..7edaef5557 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -14,26 +14,26 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - base_module "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/uri" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + base_module "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/uri" + "forgejo.org/modules/util" + "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" "github.com/google/uuid" ) diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index e01f4664ba..e07c621acc 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/github.go b/services/migrations/github.go index 7025354f77..5052a68114 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/proxy" + "forgejo.org/modules/structs" "github.com/google/go-github/v64/github" "golang.org/x/oauth2" diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go index 080fd497ca..b1f20c4716 100644 --- a/services/migrations/github_test.go +++ b/services/migrations/github_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index 2eb3e6629d..ac0d3bcf7a 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -15,12 +15,12 @@ import ( "strings" "time" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" gitlab "gitlab.com/gitlab-org/api/client-go" ) diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go index f1404d946d..924dab5144 100644 --- a/services/migrations/gitlab_test.go +++ b/services/migrations/gitlab_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gogs.go b/services/migrations/gogs.go index 1fef4808b0..b6fb8cef0a 100644 --- a/services/migrations/gogs.go +++ b/services/migrations/gogs.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/proxy" + "forgejo.org/modules/structs" "github.com/gogs/go-gogs-client" ) diff --git a/services/migrations/gogs_test.go b/services/migrations/gogs_test.go index 450aeab5ef..7d7f10c2b9 100644 --- a/services/migrations/gogs_test.go +++ b/services/migrations/gogs_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/http_client.go b/services/migrations/http_client.go index 0b997e08f4..26962f2976 100644 --- a/services/migrations/http_client.go +++ b/services/migrations/http_client.go @@ -7,9 +7,9 @@ import ( "crypto/tls" "net/http" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" ) // NewMigrationHTTPClient returns a HTTP client for migration diff --git a/services/migrations/main_test.go b/services/migrations/main_test.go index f78d75e4db..17e6505df2 100644 --- a/services/migrations/main_test.go +++ b/services/migrations/main_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go index ccb9cb7e98..81d1c203fe 100644 --- a/services/migrations/migrate.go +++ b/services/migrations/migrate.go @@ -12,16 +12,16 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // MigrateOptions is equal to base.MigrateOptions diff --git a/services/migrations/migrate_test.go b/services/migrations/migrate_test.go index 6e45cbd906..804d01df7a 100644 --- a/services/migrations/migrate_test.go +++ b/services/migrations/migrate_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/require" ) diff --git a/services/migrations/onedev.go b/services/migrations/onedev.go index e2f7b771f3..a553a4d8f5 100644 --- a/services/migrations/onedev.go +++ b/services/migrations/onedev.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" ) var ( diff --git a/services/migrations/onedev_test.go b/services/migrations/onedev_test.go index 46e3eb8d18..5bb2e2bb5c 100644 --- a/services/migrations/onedev_test.go +++ b/services/migrations/onedev_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/restore.go b/services/migrations/restore.go index e8725bc647..fe2628da52 100644 --- a/services/migrations/restore.go +++ b/services/migrations/restore.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strconv" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "gopkg.in/yaml.v3" ) diff --git a/services/migrations/update.go b/services/migrations/update.go index 4a49206f82..4d497c1e2e 100644 --- a/services/migrations/update.go +++ b/services/migrations/update.go @@ -6,11 +6,11 @@ package migrations import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/externalaccount" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + "forgejo.org/services/externalaccount" ) // UpdateMigrationPosterID updates all migrated repositories' issues and comments posterID diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go index bc2d6711cf..6d871ad5ff 100644 --- a/services/mirror/mirror.go +++ b/services/mirror/mirror.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) // doMirrorSync causes this request to mirror itself diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 085995df4f..a63cbcf40c 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -9,21 +9,21 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + giturl "forgejo.org/modules/git/url" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/proxy" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) // gitShortEmptySha Git short empty SHA diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index 4b1d7718b6..11b8ad459a 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -13,17 +13,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) var stripExitStatus = regexp.MustCompile(`exit status \d+ - `) diff --git a/services/mirror/notifier.go b/services/mirror/notifier.go index 93d904470d..8f8552f419 100644 --- a/services/mirror/notifier.go +++ b/services/mirror/notifier.go @@ -6,10 +6,10 @@ package mirror import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/repository" - notify_service "code.gitea.io/gitea/services/notify" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/repository" + notify_service "forgejo.org/services/notify" ) func init() { diff --git a/services/mirror/queue.go b/services/mirror/queue.go index 0d9a624730..b4869cf8c0 100644 --- a/services/mirror/queue.go +++ b/services/mirror/queue.go @@ -4,10 +4,10 @@ package mirror import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) var mirrorQueue *queue.WorkerPoolQueue[*SyncRequest] diff --git a/services/notify/notifier.go b/services/notify/notifier.go index 3230a5e5f5..00f98942d9 100644 --- a/services/notify/notifier.go +++ b/services/notify/notifier.go @@ -6,12 +6,12 @@ package notify import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/repository" ) // Notifier defines an interface to notify receiver diff --git a/services/notify/notify.go b/services/notify/notify.go index 5ed63646aa..fb30dfb609 100644 --- a/services/notify/notify.go +++ b/services/notify/notify.go @@ -6,13 +6,13 @@ package notify import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" ) var notifiers []Notifier diff --git a/services/notify/null.go b/services/notify/null.go index 894d118eac..7182e69abb 100644 --- a/services/notify/null.go +++ b/services/notify/null.go @@ -6,12 +6,12 @@ package notify import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/repository" ) // NullNotifier implements a blank notifier diff --git a/services/org/org.go b/services/org/org.go index dca7794b47..b1bbe43046 100644 --- a/services/org/org.go +++ b/services/org/org.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + repo_service "forgejo.org/services/repository" ) // DeleteOrganization completely and permanently deletes everything of organization. diff --git a/services/org/org_test.go b/services/org/org_test.go index 07358438f6..b0f591c745 100644 --- a/services/org/org_test.go +++ b/services/org/org_test.go @@ -6,11 +6,11 @@ package org import ( "testing" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/org/repo.go b/services/org/repo.go index 78a829ef25..33f55b1191 100644 --- a/services/org/repo.go +++ b/services/org/repo.go @@ -7,10 +7,10 @@ import ( "context" "errors" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" ) // TeamAddRepository adds new repository to team of organization. diff --git a/services/org/repo_test.go b/services/org/repo_test.go index 2ddb8f9045..c51cbf4c28 100644 --- a/services/org/repo_test.go +++ b/services/org/repo_test.go @@ -6,10 +6,10 @@ package org import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/require" ) diff --git a/services/org/team_invite.go b/services/org/team_invite.go index 3f28044dbf..9c5da25522 100644 --- a/services/org/team_invite.go +++ b/services/org/team_invite.go @@ -6,9 +6,9 @@ package org import ( "context" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/mailer" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/services/mailer" ) // CreateTeamInvite make a persistent invite in db and mail it diff --git a/services/packages/alpine/repository.go b/services/packages/alpine/repository.go index 92f475bb7b..9435887a46 100644 --- a/services/packages/alpine/repository.go +++ b/services/packages/alpine/repository.go @@ -20,14 +20,14 @@ import ( "io" "strings" - packages_model "code.gitea.io/gitea/models/packages" - alpine_model "code.gitea.io/gitea/models/packages/alpine" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + alpine_model "forgejo.org/models/packages/alpine" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + alpine_module "forgejo.org/modules/packages/alpine" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/services/packages/alt/repository.go b/services/packages/alt/repository.go index f49c435e64..317862da9d 100644 --- a/services/packages/alt/repository.go +++ b/services/packages/alt/repository.go @@ -14,15 +14,15 @@ import ( "path" "time" - packages_model "code.gitea.io/gitea/models/packages" - alt_model "code.gitea.io/gitea/models/packages/alt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + alt_model "forgejo.org/models/packages/alt" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + packages_service "forgejo.org/services/packages" "github.com/ulikunitz/xz" ) diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index e681f24561..2a865e6dbd 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -16,14 +16,14 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + arch_module "forgejo.org/modules/packages/arch" + "forgejo.org/modules/setting" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/auth.go b/services/packages/auth.go index c5bf5af532..ab2c347bc9 100644 --- a/services/packages/auth.go +++ b/services/packages/auth.go @@ -9,10 +9,10 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/packages/cargo/index.go b/services/packages/cargo/index.go index 59823cd3de..9afcd79571 100644 --- a/services/packages/cargo/index.go +++ b/services/packages/cargo/index.go @@ -13,17 +13,17 @@ import ( "strconv" "time" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + cargo_module "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" ) const ( diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go index d84bdf1b03..7e821e2630 100644 --- a/services/packages/cleanup/cleanup.go +++ b/services/packages/cleanup/cleanup.go @@ -8,20 +8,20 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - packages_service "code.gitea.io/gitea/services/packages" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - alt_service "code.gitea.io/gitea/services/packages/alt" - arch_service "code.gitea.io/gitea/services/packages/arch" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - container_service "code.gitea.io/gitea/services/packages/container" - debian_service "code.gitea.io/gitea/services/packages/debian" - rpm_service "code.gitea.io/gitea/services/packages/rpm" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + packages_service "forgejo.org/services/packages" + alpine_service "forgejo.org/services/packages/alpine" + alt_service "forgejo.org/services/packages/alt" + arch_service "forgejo.org/services/packages/arch" + cargo_service "forgejo.org/services/packages/cargo" + container_service "forgejo.org/services/packages/container" + debian_service "forgejo.org/services/packages/debian" + rpm_service "forgejo.org/services/packages/rpm" ) // Task method to execute cleanup rules and cleanup expired package data diff --git a/services/packages/cleanup/cleanup_sha256_test.go b/services/packages/cleanup/cleanup_sha256_test.go index 41dde28248..f26b98b4b0 100644 --- a/services/packages/cleanup/cleanup_sha256_test.go +++ b/services/packages/cleanup/cleanup_sha256_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - container_service "code.gitea.io/gitea/services/packages/container" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + container_service "forgejo.org/services/packages/container" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/packages/cleanup/main_test.go b/services/packages/cleanup/main_test.go index ded3d76c83..e9135c147a 100644 --- a/services/packages/cleanup/main_test.go +++ b/services/packages/cleanup/main_test.go @@ -6,7 +6,7 @@ package container import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/packages/container/blob_uploader.go b/services/packages/container/blob_uploader.go index bae2e2d6af..cc009d1f5c 100644 --- a/services/packages/container/blob_uploader.go +++ b/services/packages/container/blob_uploader.go @@ -9,10 +9,10 @@ import ( "io" "os" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) var ( diff --git a/services/packages/container/cleanup.go b/services/packages/container/cleanup.go index b5563c688f..a4ae7118f5 100644 --- a/services/packages/container/cleanup.go +++ b/services/packages/container/cleanup.go @@ -7,11 +7,11 @@ import ( "context" "time" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/modules/optional" - container_module "code.gitea.io/gitea/modules/packages/container" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/modules/optional" + container_module "forgejo.org/modules/packages/container" + packages_service "forgejo.org/services/packages" digest "github.com/opencontainers/go-digest" ) diff --git a/services/packages/container/cleanup_sha256.go b/services/packages/container/cleanup_sha256.go index 16afc74b18..5d0d02c22d 100644 --- a/services/packages/container/cleanup_sha256.go +++ b/services/packages/container/cleanup_sha256.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/timeutil" ) var ( diff --git a/services/packages/container/common.go b/services/packages/container/common.go index 5a14ed5b7a..758ef51721 100644 --- a/services/packages/container/common.go +++ b/services/packages/container/common.go @@ -7,9 +7,9 @@ import ( "context" "strings" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" + packages_model "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + container_module "forgejo.org/modules/packages/container" ) // UpdateRepositoryNames updates the repository name property for all packages of the specific owner diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go index e400f1e924..a8a401662e 100644 --- a/services/packages/debian/repository.go +++ b/services/packages/debian/repository.go @@ -14,14 +14,14 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - debian_model "code.gitea.io/gitea/models/packages/debian" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + debian_model "forgejo.org/models/packages/debian" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/package_update.go b/services/packages/package_update.go index 4a22ee7a62..7fa938e260 100644 --- a/services/packages/package_update.go +++ b/services/packages/package_update.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + org_model "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" ) func LinkToRepository(ctx context.Context, pkg *packages_model.Package, repo *repo_model.Repository, doer *user_model.User) error { diff --git a/services/packages/packages.go b/services/packages/packages.go index bf89b6ad35..1232e5914f 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -12,17 +12,17 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + notify_service "forgejo.org/services/notify" ) var ( diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index 705876e5c0..961de7828f 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -16,15 +16,15 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - rpm_model "code.gitea.io/gitea/models/packages/rpm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + rpm_model "forgejo.org/models/packages/rpm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/pull/check.go b/services/pull/check.go index 2d91ed07f5..d038b3d829 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -11,23 +11,23 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/timeutil" - asymkey_service "code.gitea.io/gitea/services/asymkey" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/timeutil" + asymkey_service "forgejo.org/services/asymkey" + notify_service "forgejo.org/services/notify" ) // prPatchCheckerQueue represents a queue to handle update pull request tests diff --git a/services/pull/check_test.go b/services/pull/check_test.go index dfb8ff708b..b965d90236 100644 --- a/services/pull/check_test.go +++ b/services/pull/check_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/comment.go b/services/pull/comment.go index 53587d4f54..25542daa9f 100644 --- a/services/pull/comment.go +++ b/services/pull/comment.go @@ -6,11 +6,11 @@ package pull import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" ) // getCommitIDsFromRepo get commit IDs from repo in between oldCommitID and newCommitID diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go index 2c77d9cf4e..3c864c8ef2 100644 --- a/services/pull/commit_status.go +++ b/services/pull/commit_status.go @@ -9,13 +9,13 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" "github.com/gobwas/glob" ) diff --git a/services/pull/commit_status_test.go b/services/pull/commit_status_test.go index 592acdd55c..593c88fb19 100644 --- a/services/pull/commit_status_test.go +++ b/services/pull/commit_status_test.go @@ -7,8 +7,8 @@ package pull import ( "testing" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/structs" + git_model "forgejo.org/models/git" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/edits.go b/services/pull/edits.go index c7550dcb07..dbf08e6851 100644 --- a/services/pull/edits.go +++ b/services/pull/edits.go @@ -8,10 +8,10 @@ import ( "context" "errors" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" ) var ErrUserHasNoPermissionForAction = errors.New("user not allowed to do this action") diff --git a/services/pull/lfs.go b/services/pull/lfs.go index ed03583d4f..8d9f401641 100644 --- a/services/pull/lfs.go +++ b/services/pull/lfs.go @@ -11,12 +11,12 @@ import ( "strconv" "sync" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/git/pipeline" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" ) // LFSPush pushes lfs objects referred to in new commits in the head repository from the base repository diff --git a/services/pull/main_test.go b/services/pull/main_test.go index 4bcb50fb96..5262b5be50 100644 --- a/services/pull/main_test.go +++ b/services/pull/main_test.go @@ -7,10 +7,10 @@ package pull import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/pull/merge.go b/services/pull/merge.go index a1585e64ab..9b0d632377 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -14,23 +14,23 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/references" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" ) // getMergeMessage composes the message used when merging a pull request. diff --git a/services/pull/merge_ff_only.go b/services/pull/merge_ff_only.go index f57c732104..1e1c337889 100644 --- a/services/pull/merge_ff_only.go +++ b/services/pull/merge_ff_only.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // doMergeStyleFastForwardOnly merges the tracking into the current HEAD - which is assumed to be staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_merge.go b/services/pull/merge_merge.go index bf56c071db..713e1f175d 100644 --- a/services/pull/merge_merge.go +++ b/services/pull/merge_merge.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // doMergeStyleMerge merges the tracking branch into the current HEAD - which is assumed to be the staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go index 88f6c037eb..fb09515dbd 100644 --- a/services/pull/merge_prepare.go +++ b/services/pull/merge_prepare.go @@ -14,13 +14,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + asymkey_service "forgejo.org/services/asymkey" ) type mergeContext struct { diff --git a/services/pull/merge_rebase.go b/services/pull/merge_rebase.go index ecf376220e..088934cdfb 100644 --- a/services/pull/merge_rebase.go +++ b/services/pull/merge_rebase.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" ) // getRebaseAmendMessage composes the message to amend commits in rebase merge of a pull request. diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index 6dda46eaec..1c6f734a25 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // doMergeStyleSquash gets a commit author signature for squash commits diff --git a/services/pull/patch.go b/services/pull/patch.go index e90b4bdbbe..35d1b101e2 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -13,18 +13,18 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unit" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gobwas/glob" ) diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go index c60c48d923..caa0318c48 100644 --- a/services/pull/patch_unmerged.go +++ b/services/pull/patch_unmerged.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // lsFileLine is a Quadruplet struct (+error) representing a partially parsed line from ls-files diff --git a/services/pull/pull.go b/services/pull/pull.go index 6af7d8ba0c..18f63cf95d 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -13,27 +13,27 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - gitea_context "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + gitea_context "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" ) // TODO: use clustered lock (unique queue? or *abuse* cache) diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index c51619e7f6..010b7a6404 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -7,13 +7,13 @@ package pull import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/review.go b/services/pull/review.go index 927c43150b..d61d9623b6 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -11,17 +11,17 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`) diff --git a/services/pull/review_test.go b/services/pull/review_test.go index 4cb3ad007c..0d9fe7f902 100644 --- a/services/pull/review_test.go +++ b/services/pull/review_test.go @@ -6,11 +6,11 @@ package pull_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + pull_service "forgejo.org/services/pull" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index 36bdbde55c..1805ffc527 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -11,12 +11,12 @@ import ( "path/filepath" "strings" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" ) // Temporary repos created here use standard branch names to help simplify diff --git a/services/pull/update.go b/services/pull/update.go index dbc1b711e2..1b4b6b039d 100644 --- a/services/pull/update.go +++ b/services/pull/update.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" ) // Update updates pull request with base branch. diff --git a/services/pull/update_rebase.go b/services/pull/update_rebase.go index 3e2a7be132..b12613985a 100644 --- a/services/pull/update_rebase.go +++ b/services/pull/update_rebase.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" ) // updateHeadByRebaseOnToBase handles updating a PR's head branch by rebasing it on the PR current base branch diff --git a/services/release/release.go b/services/release/release.go index b52e4b124e..f0682c4dca 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -9,22 +9,22 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/attachment" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/services/attachment" + notify_service "forgejo.org/services/notify" ) type AttachmentChange struct { diff --git a/services/release/release_test.go b/services/release/release_test.go index 5a22c473cf..66106eb606 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -8,16 +8,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/services/attachment" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/services/attachment" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/release/tag.go b/services/release/tag.go index dae2b70f76..e1608d1897 100644 --- a/services/release/tag.go +++ b/services/release/tag.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + repo_module "forgejo.org/modules/repository" "xorm.io/builder" ) diff --git a/services/remote/promote.go b/services/remote/promote.go index eb41ace462..26a54fb635 100644 --- a/services/remote/promote.go +++ b/services/remote/promote.go @@ -6,12 +6,12 @@ package remote import ( "context" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth/source/oauth2" - remote_source "code.gitea.io/gitea/services/auth/source/remote" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/services/auth/source/oauth2" + remote_source "forgejo.org/services/auth/source/remote" ) type Reason int diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 3d6fe71a09..3651b018e6 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -11,19 +11,19 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" "github.com/gobwas/glob" ) diff --git a/services/repository/adopt_test.go b/services/repository/adopt_test.go index 71fb1fc885..a66b4c5ac0 100644 --- a/services/repository/adopt_test.go +++ b/services/repository/adopt_test.go @@ -8,11 +8,11 @@ import ( "path" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index 279067c002..cffb07210f 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // ArchiveRequest defines the parameters of an archive request, which notably diff --git a/services/repository/archiver/archiver_test.go b/services/repository/archiver/archiver_test.go index e7a2422e55..ec4da2404f 100644 --- a/services/repository/archiver/archiver_test.go +++ b/services/repository/archiver/archiver_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/services/contexttest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/avatar.go b/services/repository/avatar.go index 32940a7aa3..a1cd3228df 100644 --- a/services/repository/avatar.go +++ b/services/repository/avatar.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) // UploadAvatar saves custom avatar for repository. diff --git a/services/repository/avatar_test.go b/services/repository/avatar_test.go index b3c498dfc8..e5fcf7f239 100644 --- a/services/repository/avatar_test.go +++ b/services/repository/avatar_test.go @@ -9,10 +9,10 @@ import ( "image/png" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/avatar" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/avatar" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/branch.go b/services/repository/branch.go index 8e1a6cd27f..689f35803d 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -9,28 +9,28 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/queue" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + files_service "forgejo.org/services/repository/files" "xorm.io/builder" ) diff --git a/services/repository/cache.go b/services/repository/cache.go index b0811a99fc..cd5b95afa3 100644 --- a/services/repository/cache.go +++ b/services/repository/cache.go @@ -6,9 +6,9 @@ package repository import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" ) // CacheRef cachhe last commit information of the branch or the tag diff --git a/services/repository/check.go b/services/repository/check.go index 5cdcc14679..7e680f3c58 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/services/repository/collaboration.go b/services/repository/collaboration.go index dccc124748..7a0d7edb7f 100644 --- a/services/repository/collaboration.go +++ b/services/repository/collaboration.go @@ -7,10 +7,10 @@ package repository import ( "context" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" ) // DeleteCollaboration removes collaboration relation between the user and repository. diff --git a/services/repository/collaboration_test.go b/services/repository/collaboration_test.go index c087018be4..b27b91be23 100644 --- a/services/repository/collaboration_test.go +++ b/services/repository/collaboration_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/require" ) diff --git a/services/repository/commit.go b/services/repository/commit.go index e8c0262ef4..0ff4ea701e 100644 --- a/services/repository/commit.go +++ b/services/repository/commit.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/util" - gitea_ctx "code.gitea.io/gitea/services/context" + "forgejo.org/modules/util" + gitea_ctx "forgejo.org/services/context" ) type ContainedLinks struct { // TODO: better name? diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index 635b0b108e..03a62d0410 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -9,17 +9,17 @@ import ( "fmt" "slices" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - shared_automerge "code.gitea.io/gitea/services/shared/automerge" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + shared_automerge "forgejo.org/services/shared/automerge" ) func getCacheKey(repoID int64, brancheName string) string { diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go index 48871813bd..ad4cc400cb 100644 --- a/services/repository/contributors_graph.go +++ b/services/repository/contributors_graph.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/avatars" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/avatars" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" "code.forgejo.org/go-chi/cache" ) diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go index c62bef25a1..927c950bec 100644 --- a/services/repository/contributors_graph_test.go +++ b/services/repository/contributors_graph_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/test" "code.forgejo.org/go-chi/cache" "github.com/stretchr/testify/assert" diff --git a/services/repository/create.go b/services/repository/create.go index 8a1118cc2b..4491b12497 100644 --- a/services/repository/create.go +++ b/services/repository/create.go @@ -12,18 +12,18 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/templates/vars" + "forgejo.org/modules/util" ) // CreateRepoOptions contains the create repository options diff --git a/services/repository/create_test.go b/services/repository/create_test.go index 9cde285181..7eb3c0f805 100644 --- a/services/repository/create_test.go +++ b/services/repository/create_test.go @@ -7,13 +7,13 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/delete.go b/services/repository/delete.go index 09213e5c65..7c83ba12cd 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -7,29 +7,29 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - admin_model "code.gitea.io/gitea/models/admin" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - federation_service "code.gitea.io/gitea/services/federation" + "forgejo.org/models" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + admin_model "forgejo.org/models/admin" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + secret_model "forgejo.org/models/secret" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + federation_service "forgejo.org/services/federation" "xorm.io/builder" ) diff --git a/services/repository/files/cherry_pick.go b/services/repository/files/cherry_pick.go index 451a182155..b6d54c4086 100644 --- a/services/repository/files/cherry_pick.go +++ b/services/repository/files/cherry_pick.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/pull" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + "forgejo.org/services/pull" ) // CherryPick cherrypicks or reverts a commit to the given repository diff --git a/services/repository/files/commit.go b/services/repository/files/commit.go index e0dad29273..0c0671429b 100644 --- a/services/repository/files/commit.go +++ b/services/repository/files/commit.go @@ -6,10 +6,10 @@ package files import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/structs" + asymkey_model "forgejo.org/models/asymkey" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/structs" ) // CountDivergingCommits determines how many commits a branch is ahead or behind the repository's base branch diff --git a/services/repository/files/content.go b/services/repository/files/content.go index 32517e8d91..3eb3049f12 100644 --- a/services/repository/files/content.go +++ b/services/repository/files/content.go @@ -10,13 +10,13 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // ContentType repo content type diff --git a/services/repository/files/content_test.go b/services/repository/files/content_test.go index f5e2b84690..ca2f861c0b 100644 --- a/services/repository/files/content_test.go +++ b/services/repository/files/content_test.go @@ -6,14 +6,14 @@ package files import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/files/diff.go b/services/repository/files/diff.go index bf8b938e21..354a343d12 100644 --- a/services/repository/files/diff.go +++ b/services/repository/files/diff.go @@ -7,8 +7,8 @@ import ( "context" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/gitdiff" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/gitdiff" ) // GetDiffPreview produces and returns diff result of a file which is not yet committed. diff --git a/services/repository/files/diff_test.go b/services/repository/files/diff_test.go index 95de10e07e..d6265273c7 100644 --- a/services/repository/files/diff_test.go +++ b/services/repository/files/diff_test.go @@ -6,12 +6,12 @@ package files import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/services/contexttest" + "forgejo.org/services/gitdiff" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/files/file.go b/services/repository/files/file.go index 7884d880e0..810c60163d 100644 --- a/services/repository/files/file.go +++ b/services/repository/files/file.go @@ -10,11 +10,11 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) func GetFilesResponseFromCommit(ctx context.Context, repo *repo_model.Repository, commit *git.Commit, branch string, treeNames []string) (*api.FilesResponse, error) { diff --git a/services/repository/files/patch.go b/services/repository/files/patch.go index e5f7e2af96..5b1dd65b5a 100644 --- a/services/repository/files/patch.go +++ b/services/repository/files/patch.go @@ -8,15 +8,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + asymkey_service "forgejo.org/services/asymkey" ) // ApplyDiffPatchOptions holds the repository diff patch update options diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index 30d95ba9ab..b3aadbc6cb 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -13,15 +13,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/gitdiff" ) // TemporaryUploadRepository is a type to wrap our upload repositories as a shallow clone diff --git a/services/repository/files/temp_repo_test.go b/services/repository/files/temp_repo_test.go index e7d85ea3cc..852e762267 100644 --- a/services/repository/files/temp_repo_test.go +++ b/services/repository/files/temp_repo_test.go @@ -6,10 +6,10 @@ package files import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/require" ) diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go index e3a7f3b8b0..1e575f95e8 100644 --- a/services/repository/files/tree.go +++ b/services/repository/files/tree.go @@ -8,11 +8,11 @@ import ( "fmt" "net/url" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" ) // GetTreeBySHA get the GitTreeResponse of a repository using a sha hash. diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go index 9e5c5c1701..7865fcf2e2 100644 --- a/services/repository/files/tree_test.go +++ b/services/repository/files/tree_test.go @@ -6,9 +6,9 @@ package files import ( "testing" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/files/update.go b/services/repository/files/update.go index d6025b6ced..5e8834c6de 100644 --- a/services/repository/files/update.go +++ b/services/repository/files/update.go @@ -11,17 +11,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + asymkey_service "forgejo.org/services/asymkey" ) // IdentityOptions for a person's identity like an author or committer diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go index 1330116889..6359087e88 100644 --- a/services/repository/files/upload.go +++ b/services/repository/files/upload.go @@ -10,12 +10,12 @@ import ( "path" "strings" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" ) // UploadRepoFileOptions contains the uploaded repository file options diff --git a/services/repository/fork.go b/services/repository/fork.go index 0378f7bae6..9d15b6207d 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -9,17 +9,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) // ErrForkAlreadyExist represents a "ForkAlreadyExist" kind of error. diff --git a/services/repository/fork_test.go b/services/repository/fork_test.go index 2e1e72aaad..227dd1850e 100644 --- a/services/repository/fork_test.go +++ b/services/repository/fork_test.go @@ -6,11 +6,11 @@ package repository import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/generate.go b/services/repository/generate.go index 4a312a33c3..9aeb057c3d 100644 --- a/services/repository/generate.go +++ b/services/repository/generate.go @@ -16,14 +16,14 @@ import ( "strings" "time" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/util" "github.com/gobwas/glob" "github.com/huandu/xstrings" diff --git a/services/repository/gitgraph/graph.go b/services/repository/gitgraph/graph.go index 4db5598015..bf15baed2a 100644 --- a/services/repository/gitgraph/graph.go +++ b/services/repository/gitgraph/graph.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" ) // GetCommitGraph return a list of commit (GraphItems) from all branches diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index 4e94468205..20107cc646 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -10,13 +10,13 @@ import ( "strings" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // NewGraph creates a basic graph diff --git a/services/repository/gitgraph/graph_test.go b/services/repository/gitgraph/graph_test.go index e7e437e42d..374341b276 100644 --- a/services/repository/gitgraph/graph_test.go +++ b/services/repository/gitgraph/graph_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) func BenchmarkGetCommitGraph(b *testing.B) { diff --git a/services/repository/hooks.go b/services/repository/hooks.go index 97e9e290a3..d3021414cf 100644 --- a/services/repository/hooks.go +++ b/services/repository/hooks.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/webhook" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" "xorm.io/builder" ) diff --git a/services/repository/init.go b/services/repository/init.go index 817fa4abd7..525b322752 100644 --- a/services/repository/init.go +++ b/services/repository/init.go @@ -9,13 +9,13 @@ import ( "os" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - asymkey_service "code.gitea.io/gitea/services/asymkey" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + asymkey_service "forgejo.org/services/asymkey" ) // initRepoCommit temporarily changes with work directory. diff --git a/services/repository/lfs.go b/services/repository/lfs.go index 4cd1110e55..43acb8ee6c 100644 --- a/services/repository/lfs.go +++ b/services/repository/lfs.go @@ -8,14 +8,14 @@ import ( "fmt" "time" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // GarbageCollectLFSMetaObjectsOptions provides options for GarbageCollectLFSMetaObjects function diff --git a/services/repository/lfs_test.go b/services/repository/lfs_test.go index 838386d845..e38c38e29c 100644 --- a/services/repository/lfs_test.go +++ b/services/repository/lfs_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/main_test.go b/services/repository/main_test.go index 7ad1540aee..942a805638 100644 --- a/services/repository/main_test.go +++ b/services/repository/main_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/repository/migrate.go b/services/repository/migrate.go index c8f65dd63d..80f5d68231 100644 --- a/services/repository/migrate.go +++ b/services/repository/migrate.go @@ -10,18 +10,18 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/migration" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // MigrateRepositoryGitData starts migrating git related data after created migrating repository diff --git a/services/repository/push.go b/services/repository/push.go index 924f365c05..53574a7d93 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -10,23 +10,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" ) // pushQueue represents a queue to handle update pull request tests diff --git a/services/repository/repository.go b/services/repository/repository.go index 35bcdfd528..a2620740b1 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -8,21 +8,21 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" ) // WebSearchRepository represents a repository returned by web search diff --git a/services/repository/repository_test.go b/services/repository/repository_test.go index a5c0b3efcd..c08f7151ca 100644 --- a/services/repository/repository_test.go +++ b/services/repository/repository_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/review.go b/services/repository/review.go index 40513e6bc6..c4000a2846 100644 --- a/services/repository/review.go +++ b/services/repository/review.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" ) // GetReviewerTeams get all teams can be requested to review diff --git a/services/repository/review_test.go b/services/repository/review_test.go index eb1712c2ce..5ece99a2e3 100644 --- a/services/repository/review_test.go +++ b/services/repository/review_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/setting.go b/services/repository/setting.go index 33b00cca8c..c127f3129e 100644 --- a/services/repository/setting.go +++ b/services/repository/setting.go @@ -7,12 +7,12 @@ import ( "context" "slices" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - actions_service "code.gitea.io/gitea/services/actions" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + actions_service "forgejo.org/services/actions" ) // UpdateRepositoryUnits updates a repository's units diff --git a/services/repository/star.go b/services/repository/star.go index 505da0f099..8cc2e0a243 100644 --- a/services/repository/star.go +++ b/services/repository/star.go @@ -6,10 +6,10 @@ package repository import ( "context" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/federation" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/services/federation" ) func StarRepoAndSendLikeActivities(ctx context.Context, doer user.User, repoID int64, star bool) error { diff --git a/services/repository/template.go b/services/repository/template.go index 36a680c8e2..3566aa2b7e 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -6,12 +6,12 @@ package repository import ( "context" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) // GenerateIssueLabels generates issue labels from a template repository diff --git a/services/repository/transfer.go b/services/repository/transfer.go index 467c85ef6f..6026d85ae1 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -9,19 +9,19 @@ import ( "os" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) // repoWorkingPool represents a working pool to order the parallel changes to the same repository diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index cc51a05781..4bb0fc140c 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -7,17 +7,17 @@ import ( "sync" "testing" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/feed" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" + "forgejo.org/services/feed" + notify_service "forgejo.org/services/notify" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go index 031c474dd7..2d5aebdbc1 100644 --- a/services/secrets/secrets.go +++ b/services/secrets/secrets.go @@ -6,8 +6,8 @@ package secrets import ( "context" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" ) func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data string) (*secret_model.Secret, bool, error) { diff --git a/services/secrets/validation.go b/services/secrets/validation.go index 3db5b96452..44250ba87b 100644 --- a/services/secrets/validation.go +++ b/services/secrets/validation.go @@ -6,7 +6,7 @@ package secrets import ( "regexp" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // https://docs.github.com/en/actions/security-guides/encrypted-secrets#naming-your-secrets diff --git a/services/shared/automerge/automerge.go b/services/shared/automerge/automerge.go index 8f38cf260a..1dc309f4b3 100644 --- a/services/shared/automerge/automerge.go +++ b/services/shared/automerge/automerge.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" ) // PRAutoMergeQueue represents a queue to handle update pull request tests diff --git a/services/task/migrate.go b/services/task/migrate.go index 9cef77a6c8..a9f76299fd 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -10,20 +10,20 @@ import ( "strings" "time" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/migrations" - notify_service "code.gitea.io/gitea/services/notify" + admin_model "forgejo.org/models/admin" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/migration" + "forgejo.org/modules/process" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/services/migrations" + notify_service "forgejo.org/services/notify" ) func handleCreateError(owner *user_model.User, err error) error { diff --git a/services/task/task.go b/services/task/task.go index ac659ac3e5..3181fc79d7 100644 --- a/services/task/task.go +++ b/services/task/task.go @@ -7,21 +7,21 @@ import ( "context" "fmt" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + admin_model "forgejo.org/models/admin" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/queue" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + repo_service "forgejo.org/services/repository" ) // taskQueue is a global queue of tasks diff --git a/services/uinotification/notify.go b/services/uinotification/notify.go index be5f7019a2..25048e7b53 100644 --- a/services/uinotification/notify.go +++ b/services/uinotification/notify.go @@ -6,16 +6,16 @@ package uinotification import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + notify_service "forgejo.org/services/notify" ) type ( diff --git a/services/user/avatar.go b/services/user/avatar.go index 3f87466eaa..79dfc76503 100644 --- a/services/user/avatar.go +++ b/services/user/avatar.go @@ -10,11 +10,11 @@ import ( "io" "os" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) // UploadAvatar saves custom avatar for user. diff --git a/services/user/avatar_test.go b/services/user/avatar_test.go index 21fca8dd09..b208efeb6f 100644 --- a/services/user/avatar_test.go +++ b/services/user/avatar_test.go @@ -10,11 +10,11 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/user/block.go b/services/user/block.go index 0b31119dfb..6be8dc5f70 100644 --- a/services/user/block.go +++ b/services/user/block.go @@ -5,10 +5,10 @@ package user import ( "context" - model "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + model "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/services/user/block_test.go b/services/user/block_test.go index 13959e56b4..a2ba5d71a7 100644 --- a/services/user/block_test.go +++ b/services/user/block_test.go @@ -6,12 +6,12 @@ package user import ( "testing" - model "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + model "forgejo.org/models" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/user/delete.go b/services/user/delete.go index 587e3c2a8f..9ce917cd27 100644 --- a/services/user/delete.go +++ b/services/user/delete.go @@ -10,20 +10,20 @@ import ( _ "image/jpeg" // Needed for jpeg support - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - issue_service "code.gitea.io/gitea/services/issue" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + issue_service "forgejo.org/services/issue" "xorm.io/builder" ) diff --git a/services/user/email.go b/services/user/email.go index 31404aadaa..f49efde1be 100644 --- a/services/user/email.go +++ b/services/user/email.go @@ -8,12 +8,12 @@ import ( "errors" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/services/mailer" ) // AdminAddOrSetPrimaryEmailAddress is used by admins to add or set a user's primary email address diff --git a/services/user/email_test.go b/services/user/email_test.go index 86f31a8984..b48936a27e 100644 --- a/services/user/email_test.go +++ b/services/user/email_test.go @@ -6,11 +6,11 @@ package user import ( "testing" - "code.gitea.io/gitea/models/db" - organization_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + organization_model "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/services/user/update.go b/services/user/update.go index 62c30ac05f..65d3992751 100644 --- a/services/user/update.go +++ b/services/user/update.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - password_module "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + password_module "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/mailer" ) type UpdateOptions struct { diff --git a/services/user/update_test.go b/services/user/update_test.go index 11379d4508..f1754b2db9 100644 --- a/services/user/update_test.go +++ b/services/user/update_test.go @@ -6,12 +6,12 @@ package user import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - password_module "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + password_module "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/user/user.go b/services/user/user.go index 62fe44ca27..d90fbac978 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -11,24 +11,24 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/agit" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/services/agit" + org_service "forgejo.org/services/org" + "forgejo.org/services/packages" + container_service "forgejo.org/services/packages/container" + repo_service "forgejo.org/services/repository" ) // RenameUser renames a user diff --git a/services/user/user_test.go b/services/user/user_test.go index 058ff7b6ed..ebcdb17710 100644 --- a/services/user/user_test.go +++ b/services/user/user_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/default.go b/services/webhook/default.go index 089ff8bae3..30717a7352 100644 --- a/services/webhook/default.go +++ b/services/webhook/default.go @@ -11,14 +11,14 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/svg" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/svg" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) var _ Handler = defaultHandler{} diff --git a/services/webhook/default_test.go b/services/webhook/default_test.go index 7056e77b47..f946870d57 100644 --- a/services/webhook/default_test.go +++ b/services/webhook/default_test.go @@ -6,9 +6,9 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + webhook_module "forgejo.org/modules/webhook" jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/assert" diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go index 25668143e6..0c7c039f10 100644 --- a/services/webhook/deliver.go +++ b/services/webhook/deliver.go @@ -14,16 +14,16 @@ import ( "sync" "time" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/graceful" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/proxy" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/gobwas/glob" ) diff --git a/services/webhook/deliver_test.go b/services/webhook/deliver_test.go index c6d1cb60dc..4dd898e60a 100644 --- a/services/webhook/deliver_test.go +++ b/services/webhook/deliver_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/dingtalk.go b/services/webhook/dingtalk.go index 899c5b2d9f..9d5c7e573f 100644 --- a/services/webhook/dingtalk.go +++ b/services/webhook/dingtalk.go @@ -11,13 +11,13 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type dingtalkHandler struct{} diff --git a/services/webhook/dingtalk_test.go b/services/webhook/dingtalk_test.go index 762d29dddc..5d2a240660 100644 --- a/services/webhook/dingtalk_test.go +++ b/services/webhook/dingtalk_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/discord.go b/services/webhook/discord.go index cd25175ea1..3970a2552d 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -15,17 +15,17 @@ import ( "strings" "unicode/utf8" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" "code.forgejo.org/go-chi/binding" ) diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go index e0bb2225f7..ce3aaa10cf 100644 --- a/services/webhook/discord_test.go +++ b/services/webhook/discord_test.go @@ -6,11 +6,11 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/feishu.go b/services/webhook/feishu.go index f77c3bbd65..01b3d07983 100644 --- a/services/webhook/feishu.go +++ b/services/webhook/feishu.go @@ -10,12 +10,12 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type feishuHandler struct{} diff --git a/services/webhook/feishu_test.go b/services/webhook/feishu_test.go index 614e0f1ef4..7cf24b84ed 100644 --- a/services/webhook/feishu_test.go +++ b/services/webhook/feishu_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/general.go b/services/webhook/general.go index ef68f2885b..40a2467177 100644 --- a/services/webhook/general.go +++ b/services/webhook/general.go @@ -9,11 +9,11 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" ) type linkFormatter = func(string, string) string diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go index 8412293708..b321fb3f8c 100644 --- a/services/webhook/general_test.go +++ b/services/webhook/general_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/webhook/gogs.go b/services/webhook/gogs.go index 7dbf64343f..bbab1ad41d 100644 --- a/services/webhook/gogs.go +++ b/services/webhook/gogs.go @@ -7,10 +7,10 @@ import ( "html/template" "net/http" - webhook_model "code.gitea.io/gitea/models/webhook" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type gogsHandler struct{ defaultHandler } diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 6147aac499..97957291ca 100644 --- a/services/webhook/main_test.go +++ b/services/webhook/main_test.go @@ -6,13 +6,13 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/unittest" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go index 4b33bfb1d3..f1cc9384d3 100644 --- a/services/webhook/matrix.go +++ b/services/webhook/matrix.go @@ -16,16 +16,16 @@ import ( "regexp" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/svg" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type matrixHandler struct{} diff --git a/services/webhook/matrix_test.go b/services/webhook/matrix_test.go index 46e0041a34..1644def0e1 100644 --- a/services/webhook/matrix_test.go +++ b/services/webhook/matrix_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index 736d084a8c..1ed03afd26 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -11,13 +11,13 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type msteamsHandler struct{} diff --git a/services/webhook/msteams_test.go b/services/webhook/msteams_test.go index d9a9724e5b..b210f299bc 100644 --- a/services/webhook/msteams_test.go +++ b/services/webhook/msteams_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index ddd7002890..e9fd52c940 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -6,20 +6,20 @@ package webhook import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" + notify_service "forgejo.org/services/notify" ) func init() { diff --git a/services/webhook/notifier_test.go b/services/webhook/notifier_test.go index 36ec3b8bf1..6b1f170287 100644 --- a/services/webhook/notifier_test.go +++ b/services/webhook/notifier_test.go @@ -7,17 +7,17 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/packagist.go b/services/webhook/packagist.go index 9831a4e008..7ae3e0c48f 100644 --- a/services/webhook/packagist.go +++ b/services/webhook/packagist.go @@ -10,12 +10,12 @@ import ( "net/http" "net/url" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type packagistHandler struct{} diff --git a/services/webhook/packagist_test.go b/services/webhook/packagist_test.go index 0f696f1b99..e5bf4ec8d1 100644 --- a/services/webhook/packagist_test.go +++ b/services/webhook/packagist_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/shared/img.go b/services/webhook/shared/img.go index 2d65ba4e0f..95286c563e 100644 --- a/services/webhook/shared/img.go +++ b/services/webhook/shared/img.go @@ -5,7 +5,7 @@ import ( "html/template" "strconv" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func ImgIcon(name string, size int) template.HTML { diff --git a/services/webhook/shared/payloader.go b/services/webhook/shared/payloader.go index cf0bfa82cb..0a6535eddb 100644 --- a/services/webhook/shared/payloader.go +++ b/services/webhook/shared/payloader.go @@ -14,10 +14,10 @@ import ( "io" "net/http" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" ) var ErrPayloadTypeNotSupported = errors.New("unsupported webhook event") diff --git a/services/webhook/slack.go b/services/webhook/slack.go index 5ef3e4e06f..e854f89c6c 100644 --- a/services/webhook/slack.go +++ b/services/webhook/slack.go @@ -11,15 +11,15 @@ import ( "regexp" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" "code.forgejo.org/go-chi/binding" ) diff --git a/services/webhook/slack_test.go b/services/webhook/slack_test.go index ecc11d541f..62090fd310 100644 --- a/services/webhook/slack_test.go +++ b/services/webhook/slack_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/sourcehut/builds.go b/services/webhook/sourcehut/builds.go index 346ccd3c0b..bd3eeebc6c 100644 --- a/services/webhook/sourcehut/builds.go +++ b/services/webhook/sourcehut/builds.go @@ -13,17 +13,17 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" "code.forgejo.org/go-chi/binding" "gopkg.in/yaml.v3" diff --git a/services/webhook/sourcehut/builds_test.go b/services/webhook/sourcehut/builds_test.go index 689c369a7f..ac4172f5ff 100644 --- a/services/webhook/sourcehut/builds_test.go +++ b/services/webhook/sourcehut/builds_test.go @@ -7,14 +7,14 @@ import ( "strings" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/webhook/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/telegram.go b/services/webhook/telegram.go index a02a7691e9..d0abd667f4 100644 --- a/services/webhook/telegram.go +++ b/services/webhook/telegram.go @@ -11,15 +11,15 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type telegramHandler struct{} diff --git a/services/webhook/telegram_test.go b/services/webhook/telegram_test.go index 85a62f7615..5066e55b8c 100644 --- a/services/webhook/telegram_test.go +++ b/services/webhook/telegram_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/webhook.go b/services/webhook/webhook.go index 1366ea8e8f..989b535564 100644 --- a/services/webhook/webhook.go +++ b/services/webhook/webhook.go @@ -11,21 +11,21 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/sourcehut" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/sourcehut" "github.com/gobwas/glob" ) diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index 2ebbbe4a51..c9af09d3e9 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -7,15 +7,15 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go index 87f8bb8b18..323d23aba7 100644 --- a/services/webhook/wechatwork.go +++ b/services/webhook/wechatwork.go @@ -10,12 +10,12 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type wechatworkHandler struct{} diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 63196aa862..cf1477e72c 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -11,17 +11,17 @@ import ( "os" "strings" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/sync" - asymkey_service "code.gitea.io/gitea/services/asymkey" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/sync" + asymkey_service "forgejo.org/services/asymkey" + repo_service "forgejo.org/services/repository" ) // TODO: use clustered lock (unique queue? or *abuse* cache) diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 74c7064043..ca312388af 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -8,11 +8,11 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/convert" ) // To define the wiki related concepts: diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index efcc13db99..d76104dfc7 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" - _ "code.gitea.io/gitea/models/actions" + _ "forgejo.org/models/actions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index cc95fc488d..231386e3aa 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -20595,7 +20595,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "APIForbiddenError": { "type": "object", @@ -20609,7 +20609,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIInternalServerError": { "type": "object", @@ -20623,7 +20623,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIInvalidTopicsError": { "type": "object", @@ -20640,7 +20640,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APINotFound": { "type": "object", @@ -20661,7 +20661,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIRepoArchivedError": { "type": "object", @@ -20675,7 +20675,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIUnauthorizedError": { "type": "object", @@ -20689,7 +20689,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIValidationError": { "type": "object", @@ -20703,7 +20703,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "AccessToken": { "type": "object", @@ -20734,7 +20734,7 @@ "x-go-name": "TokenLastEight" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionRunJob": { "description": "ActionRunJob represents a job of a run", @@ -20791,7 +20791,7 @@ "x-go-name": "TaskID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionTask": { "description": "ActionTask represents a ActionTask", @@ -20855,7 +20855,7 @@ "x-go-name": "WorkflowID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionTaskResponse": { "description": "ActionTaskResponse returns a ActionTask", @@ -20874,7 +20874,7 @@ "x-go-name": "Entries" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionVariable": { "description": "ActionVariable return value of the query API", @@ -20903,7 +20903,7 @@ "x-go-name": "RepoID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Activity": { "type": "object", @@ -20994,7 +20994,7 @@ "x-go-name": "UserID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActivityPub": { "description": "ActivityPub type", @@ -21005,7 +21005,7 @@ "x-go-name": "Context" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AddCollaboratorOption": { "description": "AddCollaboratorOption options when adding a user as a collaborator of a repository", @@ -21021,7 +21021,7 @@ "x-go-name": "Permission" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AddTimeOption": { "description": "AddTimeOption options for adding time to an issue", @@ -21047,7 +21047,7 @@ "x-go-name": "User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AnnotatedTag": { "description": "AnnotatedTag represents an annotated tag", @@ -21082,7 +21082,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AnnotatedTagObject": { "description": "AnnotatedTagObject contains meta information of the tag object", @@ -21101,7 +21101,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Attachment": { "description": "Attachment a generic attachment", @@ -21148,7 +21148,7 @@ "x-go-name": "UUID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "BlockedUser": { "type": "object", @@ -21165,7 +21165,7 @@ "x-go-name": "Created" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Branch": { "description": "Branch represents a repository branch", @@ -21211,7 +21211,7 @@ "x-go-name": "UserCanPush" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "BranchProtection": { "description": "BranchProtection represents a branch protection for a repository", @@ -21351,7 +21351,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ChangeFileOperation": { "description": "ChangeFileOperation for creating, updating or deleting a file", @@ -21392,7 +21392,7 @@ "x-go-name": "SHA" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ChangeFilesOptions": { "description": "ChangeFilesOptions options for creating, updating or deleting multiple files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -21439,7 +21439,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ChangedFile": { "description": "ChangedFile store information about files affected by the pull request", @@ -21485,7 +21485,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CombinedStatus": { "description": "CombinedStatus holds the combined state of several statuses for a single commit", @@ -21522,7 +21522,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Comment": { "description": "Comment represents a comment on a commit or issue", @@ -21579,7 +21579,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Commit": { "type": "object", @@ -21629,7 +21629,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitAffectedFiles": { "description": "CommitAffectedFiles store information about files affected by the commit", @@ -21644,7 +21644,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitDateOptions": { "description": "CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE", @@ -21661,7 +21661,7 @@ "x-go-name": "Committer" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitMeta": { "type": "object", @@ -21681,7 +21681,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitStats": { "description": "CommitStats is statistics for a RepoCommit", @@ -21703,7 +21703,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitStatus": { "description": "CommitStatus holds a single status of a single Commit", @@ -21747,12 +21747,12 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitStatusState": { "description": "CommitStatusState holds the state of a CommitStatus\nIt can be \"pending\", \"success\", \"error\" and \"failure\"", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitUser": { "type": "object", @@ -21772,7 +21772,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Compare": { "type": "object", @@ -21798,7 +21798,7 @@ "x-go-name": "TotalCommits" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ContentsResponse": { "description": "ContentsResponse contains information about a repo's entry's (dir, file, symlink, submodule) metadata and content", @@ -21870,7 +21870,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateAccessTokenOption": { "description": "CreateAccessTokenOption options when create access token", @@ -21891,7 +21891,7 @@ "x-go-name": "Scopes" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateBranchProtectionOption": { "description": "CreateBranchProtectionOption options for creating a branch protection", @@ -22021,7 +22021,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateBranchRepoOption": { "description": "CreateBranchRepoOption options when creating a branch in a repository", @@ -22049,7 +22049,7 @@ "x-go-name": "OldRefName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateEmailOption": { "description": "CreateEmailOption options when creating email addresses", @@ -22064,7 +22064,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateFileOptions": { "description": "CreateFileOptions options for creating files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -22108,7 +22108,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateForkOption": { "description": "CreateForkOption options for creating a fork", @@ -22125,7 +22125,7 @@ "x-go-name": "Organization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateGPGKeyOption": { "description": "CreateGPGKeyOption options create user GPG key", @@ -22145,7 +22145,7 @@ "x-go-name": "Signature" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateHookOption": { "description": "CreateHookOption options when create a hook", @@ -22196,7 +22196,7 @@ "x-go-name": "Type" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateHookOptionConfig": { "description": "CreateHookOptionConfig has all config options in it\nrequired are \"content_type\" and \"url\" Required", @@ -22204,7 +22204,7 @@ "additionalProperties": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateIssueCommentOption": { "description": "CreateIssueCommentOption options for creating a comment on an issue", @@ -22223,7 +22223,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateIssueOption": { "description": "CreateIssueOption options to create one issue", @@ -22281,7 +22281,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateKeyOption": { "description": "CreateKeyOption options when creating a key", @@ -22309,7 +22309,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateLabelOption": { "description": "CreateLabelOption options for creating a label", @@ -22343,7 +22343,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateMilestoneOption": { "description": "CreateMilestoneOption options for creating a milestone", @@ -22371,7 +22371,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateOAuth2ApplicationOptions": { "description": "CreateOAuth2ApplicationOptions holds options to create an oauth2 application", @@ -22393,7 +22393,7 @@ "x-go-name": "RedirectURIs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateOrUpdateSecretOption": { "description": "CreateOrUpdateSecretOption options when creating or updating secret", @@ -22408,7 +22408,7 @@ "x-go-name": "Data" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateOrgOption": { "description": "CreateOrgOption options for creating an organization", @@ -22456,7 +22456,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePullRequestOption": { "description": "CreatePullRequestOption options when creating a pull request", @@ -22508,7 +22508,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePullReviewComment": { "description": "CreatePullReviewComment represent a review comment for creation api", @@ -22536,7 +22536,7 @@ "x-go-name": "Path" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePullReviewCommentOptions": { "$ref": "#/definitions/CreatePullReviewComment" @@ -22564,7 +22564,7 @@ "$ref": "#/definitions/ReviewStateType" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePushMirrorOption": { "type": "object", @@ -22595,7 +22595,7 @@ "x-go-name": "UseSSH" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateQuotaGroupOptions": { "description": "CreateQutaGroupOptions represents the options for creating a quota group", @@ -22615,7 +22615,7 @@ "x-go-name": "Rules" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateQuotaRuleOptions": { "description": "CreateQuotaRuleOptions represents the options for creating a quota rule", @@ -22641,7 +22641,7 @@ "x-go-name": "Subjects" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateReleaseOption": { "description": "CreateReleaseOption options when creating a release", @@ -22679,7 +22679,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateRepoOption": { "description": "CreateRepoOption options when creating repository", @@ -22760,7 +22760,7 @@ "x-go-name": "TrustModel" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateStatusOption": { "description": "CreateStatusOption holds the information needed to create a new CommitStatus for a Commit", @@ -22782,7 +22782,7 @@ "x-go-name": "TargetURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateTagOption": { "description": "CreateTagOption options when creating a tag", @@ -22804,7 +22804,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateTagProtectionOption": { "description": "CreateTagProtectionOption options for creating a tag protection", @@ -22829,7 +22829,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateTeamOption": { "description": "CreateTeamOption options for creating a team", @@ -22891,7 +22891,7 @@ "example": "{\"repo.actions\",\"repo.packages\",\"repo.code\":\"read\",\"repo.issues\":\"write\",\"repo.ext_issues\":\"none\",\"repo.wiki\":\"admin\",\"repo.pulls\":\"owner\",\"repo.releases\":\"none\",\"repo.projects\":\"none\",\"repo.ext_wiki\":\"none\"}" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateUserOption": { "description": "CreateUserOption create user options", @@ -22950,7 +22950,7 @@ "x-go-name": "Visibility" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateVariableOption": { "description": "CreateVariableOption the option when creating variable", @@ -22965,7 +22965,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateWikiPageOptions": { "description": "CreateWikiPageOptions form for creating wiki", @@ -22987,7 +22987,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Cron": { "description": "Cron represents a Cron task", @@ -23017,7 +23017,7 @@ "x-go-name": "Schedule" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeleteEmailOption": { "description": "DeleteEmailOption options when deleting email addresses", @@ -23032,7 +23032,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeleteFileOptions": { "description": "DeleteFileOptions options for deleting files (used for other File structs below)\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -23076,7 +23076,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeleteLabelsOption": { "description": "DeleteLabelOption options for deleting a label", @@ -23088,7 +23088,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeployKey": { "description": "DeployKey a deploy key", @@ -23133,7 +23133,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DismissPullReviewOptions": { "description": "DismissPullReviewOptions are options to dismiss a pull review", @@ -23148,7 +23148,7 @@ "x-go-name": "Priors" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DispatchWorkflowOption": { "description": "DispatchWorkflowOption options when dispatching a workflow", @@ -23177,7 +23177,7 @@ "x-go-name": "ReturnRunInfo" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DispatchWorkflowRun": { "description": "DispatchWorkflowRun represents a workflow run", @@ -23204,7 +23204,7 @@ "x-go-name": "RunNumber" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditAttachmentOptions": { "description": "EditAttachmentOptions options for editing attachments", @@ -23220,7 +23220,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditBranchProtectionOption": { "description": "EditBranchProtectionOption options for editing a branch protection", @@ -23341,7 +23341,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditDeadlineOption": { "description": "EditDeadlineOption options for creating a deadline", @@ -23356,7 +23356,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditGitHookOption": { "description": "EditGitHookOption options when modifying one Git hook", @@ -23367,7 +23367,7 @@ "x-go-name": "Content" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditHookOption": { "description": "EditHookOption options when modify one hook", @@ -23400,7 +23400,7 @@ "x-go-name": "Events" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditIssueCommentOption": { "description": "EditIssueCommentOption options for editing a comment", @@ -23419,7 +23419,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditIssueOption": { "description": "EditIssueOption options for editing an issue", @@ -23473,7 +23473,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditLabelOption": { "description": "EditLabelOption options for editing a label", @@ -23503,7 +23503,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditMilestoneOption": { "description": "EditMilestoneOption options for editing a milestone", @@ -23527,7 +23527,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditOrgOption": { "description": "EditOrgOption options for editing an organization", @@ -23568,7 +23568,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditPullRequestOption": { "description": "EditPullRequestOption options when modify pull request", @@ -23628,7 +23628,7 @@ "x-go-name": "RemoveDeadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditQuotaRuleOptions": { "description": "EditQuotaRuleOptions represents the options for editing a quota rule", @@ -23649,7 +23649,7 @@ "x-go-name": "Subjects" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditReactionOption": { "description": "EditReactionOption contain the reaction type", @@ -23660,7 +23660,7 @@ "x-go-name": "Reaction" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditReleaseOption": { "description": "EditReleaseOption options when editing a release", @@ -23695,7 +23695,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditRepoOption": { "description": "EditRepoOption options when editing a repository's properties", @@ -23867,7 +23867,7 @@ "x-go-name": "WikiBranch" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditTagProtectionOption": { "description": "EditTagProtectionOption options for editing a tag protection", @@ -23892,7 +23892,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditTeamOption": { "description": "EditTeamOption options for editing a team", @@ -23961,7 +23961,7 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditUserOption": { "description": "EditUserOption edit user options", @@ -24047,7 +24047,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Email": { "description": "Email an email address belonging to a user", @@ -24076,7 +24076,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ExternalTracker": { "description": "ExternalTracker represents settings for external tracker", @@ -24103,7 +24103,7 @@ "x-go-name": "ExternalTrackerURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ExternalWiki": { "description": "ExternalWiki represents setting for external wiki", @@ -24115,7 +24115,7 @@ "x-go-name": "ExternalWikiURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileCommitResponse": { "type": "object", @@ -24159,7 +24159,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileDeleteResponse": { "description": "FileDeleteResponse contains information about a repo's file that was deleted", @@ -24175,7 +24175,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileLinksResponse": { "description": "FileLinksResponse contains the links for a repo's file", @@ -24194,7 +24194,7 @@ "x-go-name": "Self" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileResponse": { "description": "FileResponse contains information about a repo's file", @@ -24210,7 +24210,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FilesResponse": { "description": "FilesResponse contains information about multiple files from a repo", @@ -24230,12 +24230,12 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ForgeLike": { "description": "ForgeLike activity data type", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/forgefed" + "x-go-package": "forgejo.org/modules/forgefed" }, "GPGKey": { "description": "GPGKey a user GPG key to sign commit and tag in repository", @@ -24303,7 +24303,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GPGKeyEmail": { "description": "GPGKeyEmail an email attached to a GPGKey", @@ -24318,7 +24318,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralAPISettings": { "description": "GeneralAPISettings contains global api settings exposed by it", @@ -24345,7 +24345,7 @@ "x-go-name": "MaxResponseItems" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralAttachmentSettings": { "description": "GeneralAttachmentSettings contains global Attachment settings exposed by API", @@ -24370,7 +24370,7 @@ "x-go-name": "MaxSize" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralRepoSettings": { "description": "GeneralRepoSettings contains global repository settings exposed by API", @@ -24405,7 +24405,7 @@ "x-go-name": "TimeTrackingDisabled" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralUISettings": { "description": "GeneralUISettings contains global ui settings exposed by API", @@ -24430,7 +24430,7 @@ "x-go-name": "DefaultTheme" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GenerateRepoOption": { "description": "GenerateRepoOption options when creating repository using a template", @@ -24502,7 +24502,7 @@ "x-go-name": "Webhooks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitBlobResponse": { "description": "GitBlobResponse represents a git blob", @@ -24530,7 +24530,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitEntry": { "description": "GitEntry represents a git tree", @@ -24562,7 +24562,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitHook": { "description": "GitHook represents a Git repository hook", @@ -24581,7 +24581,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitObject": { "type": "object", @@ -24600,7 +24600,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitTreeResponse": { "description": "GitTreeResponse returns a git tree", @@ -24636,7 +24636,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitignoreTemplateInfo": { "description": "GitignoreTemplateInfo name and text of a gitignore template", @@ -24651,7 +24651,7 @@ "x-go-name": "Source" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Hook": { "description": "Hook a hook is a web hook when one repository changed", @@ -24715,7 +24715,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Identity": { "description": "Identity for a person's identity like an author or committer", @@ -24731,7 +24731,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "InternalTracker": { "description": "InternalTracker represents settings for internal tracker", @@ -24753,7 +24753,7 @@ "x-go-name": "EnableTimeTracker" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Issue": { "description": "Issue represents an issue in a repository", @@ -24872,7 +24872,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueConfig": { "type": "object", @@ -24889,7 +24889,7 @@ "x-go-name": "ContactLinks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueConfigContactLink": { "type": "object", @@ -24907,7 +24907,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueConfigValidation": { "type": "object", @@ -24921,7 +24921,7 @@ "x-go-name": "Valid" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueDeadline": { "description": "IssueDeadline represents an issue deadline", @@ -24933,7 +24933,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueFormField": { "description": "IssueFormField represents a form field", @@ -24964,17 +24964,17 @@ "x-go-name": "Visible" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueFormFieldType": { "type": "string", "title": "IssueFormFieldType defines issue form field type, can be \"markdown\", \"textarea\", \"input\", \"dropdown\" or \"checkboxes\"", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueFormFieldVisible": { "description": "IssueFormFieldVisible defines issue form field visible", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueLabelsOption": { "description": "IssueLabelsOption a collection of labels", @@ -24992,7 +24992,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueMeta": { "description": "IssueMeta basic issue information", @@ -25012,7 +25012,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueTemplate": { "description": "IssueTemplate represents an issue template for a repository", @@ -25053,14 +25053,14 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueTemplateLabels": { "type": "array", "items": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Label": { "description": "Label a label to an issue or a pr", @@ -25099,7 +25099,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "LabelTemplate": { "description": "LabelTemplate info of a Label template", @@ -25124,7 +25124,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "LicenseTemplateInfo": { "description": "LicensesInfo contains information about a License", @@ -25151,7 +25151,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "LicensesTemplateListEntry": { "description": "LicensesListEntry is used for the API", @@ -25170,7 +25170,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "MarkdownOption": { "description": "MarkdownOption markdown options", @@ -25193,7 +25193,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "MarkupOption": { "description": "MarkupOption markup options", @@ -25224,7 +25224,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "MergePullRequestOption": { "description": "MergePullRequestForm form for merging Pull Request", @@ -25271,7 +25271,7 @@ } }, "x-go-name": "MergePullRequestForm", - "x-go-package": "code.gitea.io/gitea/services/forms" + "x-go-package": "forgejo.org/services/forms" }, "MigrateRepoOptions": { "description": "MigrateRepoOptions options for migrating repository's\nthis is used to interact with api v1", @@ -25375,7 +25375,7 @@ "x-go-name": "Wiki" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Milestone": { "description": "Milestone milestone is a collection of issues on one repository", @@ -25428,7 +25428,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NewIssuePinsAllowed": { "description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed", @@ -25443,7 +25443,7 @@ "x-go-name": "PullRequests" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfo": { "description": "NodeInfo contains standardized way of exposing metadata about a server running one of the distributed social networks", @@ -25478,7 +25478,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoServices": { "description": "NodeInfoServices contains the third party sites this server can connect to via their application API", @@ -25499,7 +25499,7 @@ "x-go-name": "Outbound" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoSoftware": { "description": "NodeInfoSoftware contains Metadata about server software in use", @@ -25522,7 +25522,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoUsage": { "description": "NodeInfoUsage contains usage statistics for this server", @@ -25542,7 +25542,7 @@ "$ref": "#/definitions/NodeInfoUsageUsers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoUsageUsers": { "description": "NodeInfoUsageUsers contains statistics about the users of this server", @@ -25564,7 +25564,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Note": { "description": "Note contains information related to a git note", @@ -25578,7 +25578,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NoteOptions": { "type": "object", @@ -25588,7 +25588,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotificationCount": { "description": "NotificationCount number of unread notifications", @@ -25600,7 +25600,7 @@ "x-go-name": "New" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotificationSubject": { "description": "NotificationSubject contains the notification subject (Issue/Pull/Commit)", @@ -25633,7 +25633,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotificationThread": { "description": "NotificationThread expose Notification on API", @@ -25668,12 +25668,12 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotifySubjectType": { "description": "NotifySubjectType represent type of notification subject", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "OAuth2Application": { "type": "object", @@ -25713,7 +25713,7 @@ "x-go-name": "RedirectURIs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Organization": { "description": "Organization represents an organization", @@ -25766,7 +25766,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "OrganizationPermissions": { "description": "OrganizationPermissions list different users permissions on an organization", @@ -25793,7 +25793,7 @@ "x-go-name": "IsOwner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PRBranchInfo": { "description": "PRBranchInfo information about a branch", @@ -25820,7 +25820,7 @@ "x-go-name": "Sha" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Package": { "description": "Package represents a package", @@ -25862,7 +25862,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PackageFile": { "description": "PackageFile represents a package file", @@ -25898,7 +25898,7 @@ "x-go-name": "HashSHA512" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PayloadCommit": { "description": "PayloadCommit represents a commit", @@ -25953,7 +25953,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PayloadCommitVerification": { "description": "PayloadCommitVerification represents the GPG verification of a commit", @@ -25979,7 +25979,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PayloadUser": { "description": "PayloadUser represents the author or committer of a commit", @@ -26000,7 +26000,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Permission": { "description": "Permission represents a set of permissions", @@ -26019,7 +26019,7 @@ "x-go-name": "Push" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PublicKey": { "description": "PublicKey publickey is a user key to push code to repository", @@ -26063,7 +26063,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullRequest": { "description": "PullRequest represents a pull request", @@ -26237,7 +26237,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullRequestMeta": { "description": "PullRequestMeta PR info if an issue is a PR", @@ -26261,7 +26261,7 @@ "x-go-name": "Merged" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullReview": { "description": "PullReview represents a pull request review", @@ -26325,7 +26325,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullReviewComment": { "description": "PullReviewComment represents a comment on a pull request review", @@ -26396,7 +26396,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullReviewRequestOptions": { "description": "PullReviewRequestOptions are options to add or remove pull review requests", @@ -26417,7 +26417,7 @@ "x-go-name": "TeamReviewers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PushMirror": { "description": "PushMirror represents information of a push mirror", @@ -26462,7 +26462,7 @@ "x-go-name": "SyncOnCommit" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaGroup": { "description": "QuotaGroup represents a quota group", @@ -26482,7 +26482,7 @@ "x-go-name": "Rules" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaGroupList": { "description": "QuotaGroupList represents a list of quota groups", @@ -26490,7 +26490,7 @@ "items": { "$ref": "#/definitions/QuotaGroup" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaInfo": { "description": "QuotaInfo represents information about a user's quota", @@ -26503,7 +26503,7 @@ "$ref": "#/definitions/QuotaUsed" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaRuleInfo": { "description": "QuotaRuleInfo contains information about a quota rule", @@ -26529,7 +26529,7 @@ "x-go-name": "Subjects" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsed": { "description": "QuotaUsed represents the quota usage of a user", @@ -26539,7 +26539,7 @@ "$ref": "#/definitions/QuotaUsedSize" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedArtifact": { "description": "QuotaUsedArtifact represents an artifact counting towards a user's quota", @@ -26562,7 +26562,7 @@ "x-go-name": "Size" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedArtifactList": { "description": "QuotaUsedArtifactList represents a list of artifacts counting towards a user's quota", @@ -26570,7 +26570,7 @@ "items": { "$ref": "#/definitions/QuotaUsedArtifact" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedAttachment": { "description": "QuotaUsedAttachment represents an attachment counting towards a user's quota", @@ -26610,7 +26610,7 @@ "x-go-name": "Size" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedAttachmentList": { "description": "QuotaUsedAttachmentList represents a list of attachment counting towards a user's quota", @@ -26618,7 +26618,7 @@ "items": { "$ref": "#/definitions/QuotaUsedAttachment" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedPackage": { "description": "QuotaUsedPackage represents a package counting towards a user's quota", @@ -26651,7 +26651,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedPackageList": { "description": "QuotaUsedPackageList represents a list of packages counting towards a user's quota", @@ -26659,7 +26659,7 @@ "items": { "$ref": "#/definitions/QuotaUsedPackage" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSize": { "description": "QuotaUsedSize represents the size-based quota usage of a user", @@ -26675,7 +26675,7 @@ "$ref": "#/definitions/QuotaUsedSizeRepos" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeAssets": { "description": "QuotaUsedSizeAssets represents the size-based asset usage of a user", @@ -26694,7 +26694,7 @@ "$ref": "#/definitions/QuotaUsedSizeAssetsPackages" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeAssetsAttachments": { "description": "QuotaUsedSizeAssetsAttachments represents the size-based attachment quota usage of a user", @@ -26713,7 +26713,7 @@ "x-go-name": "Releases" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeAssetsPackages": { "description": "QuotaUsedSizeAssetsPackages represents the size-based package quota usage of a user", @@ -26726,7 +26726,7 @@ "x-go-name": "All" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeGit": { "description": "QuotaUsedSizeGit represents the size-based git (lfs) quota usage of a user", @@ -26738,7 +26738,7 @@ "format": "int64" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeRepos": { "description": "QuotaUsedSizeRepos represents the size-based repository quota usage of a user", @@ -26757,7 +26757,7 @@ "x-go-name": "Public" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Reaction": { "description": "Reaction contain one reaction", @@ -26776,7 +26776,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Reference": { "type": "object", @@ -26794,7 +26794,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Release": { "description": "Release represents a repository release", @@ -26877,7 +26877,7 @@ "x-go-name": "ZipURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RenameOrgOption": { "description": "RenameOrgOption options when renaming an organization", @@ -26893,7 +26893,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", @@ -26909,7 +26909,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ReplaceFlagsOption": { "description": "ReplaceFlagsOption options when replacing the flags of a repository", @@ -26923,7 +26923,7 @@ "x-go-name": "Flags" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoCollaboratorPermission": { "description": "RepoCollaboratorPermission to get repository permission for a collaborator", @@ -26941,7 +26941,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoCommit": { "type": "object", @@ -26968,7 +26968,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoTopicOptions": { "description": "RepoTopicOptions a collection of repo topic names", @@ -26983,7 +26983,7 @@ "x-go-name": "Topics" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoTransfer": { "description": "RepoTransfer represents a pending repo transfer", @@ -27003,7 +27003,7 @@ "x-go-name": "Teams" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Repository": { "description": "Repository represents a repository", @@ -27275,7 +27275,7 @@ "x-go-name": "WikiBranch" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepositoryMeta": { "description": "RepositoryMeta basic repository information", @@ -27299,12 +27299,12 @@ "x-go-name": "Owner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ReviewStateType": { "description": "ReviewStateType review state type", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "SearchResults": { "description": "SearchResults results of a successful search", @@ -27322,7 +27322,7 @@ "x-go-name": "OK" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Secret": { "description": "Secret represents a secret", @@ -27339,7 +27339,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ServerVersion": { "description": "ServerVersion wraps the version of the server", @@ -27350,7 +27350,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "SetUserQuotaGroupsOptions": { "description": "SetUserQuotaGroupsOptions represents the quota groups of a user", @@ -27368,12 +27368,12 @@ "x-go-name": "Groups" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "StateType": { "description": "StateType issue state type", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "StopWatch": { "description": "StopWatch represent a running stopwatch", @@ -27411,7 +27411,7 @@ "x-go-name": "Seconds" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "SubmitPullReviewOptions": { "description": "SubmitPullReviewOptions are options to submit a pending pull review", @@ -27425,7 +27425,7 @@ "$ref": "#/definitions/ReviewStateType" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Tag": { "description": "Tag represents a repository tag", @@ -27458,7 +27458,7 @@ "x-go-name": "ZipballURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TagArchiveDownloadCount": { "description": "TagArchiveDownloadCount counts how many times a archive was downloaded", @@ -27475,7 +27475,7 @@ "x-go-name": "Zip" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TagProtection": { "description": "TagProtection represents a tag protection", @@ -27515,7 +27515,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Team": { "description": "Team represents a team in an organization", @@ -27591,13 +27591,13 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TimeStamp": { "description": "TimeStamp defines a timestamp", "type": "integer", "format": "int64", - "x-go-package": "code.gitea.io/gitea/modules/timeutil" + "x-go-package": "forgejo.org/modules/timeutil" }, "TimelineComment": { "description": "TimelineComment represents a timeline comment (comment of any type) on a commit or issue", @@ -27717,7 +27717,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TopicName": { "description": "TopicName a list of repo topic names", @@ -27731,7 +27731,7 @@ "x-go-name": "TopicNames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TopicResponse": { "description": "TopicResponse for returning topics", @@ -27762,7 +27762,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TrackedTime": { "description": "TrackedTime worked time for an issue / pr", @@ -27804,7 +27804,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TransferRepoOption": { "description": "TransferRepoOption options when transfer a repository's ownership", @@ -27827,7 +27827,7 @@ "x-go-name": "TeamIDs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateBranchRepoOption": { "description": "UpdateBranchRepoOption options when updating a branch in a repository", @@ -27843,7 +27843,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateFileOptions": { "description": "UpdateFileOptions options for updating files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -27898,7 +27898,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateRepoAvatarOption": { "description": "UpdateRepoAvatarUserOption options when updating the repo avatar", @@ -27910,7 +27910,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateUserAvatarOption": { "description": "UpdateUserAvatarUserOption options when updating the user avatar", @@ -27922,7 +27922,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateVariableOption": { "description": "UpdateVariableOption the option when updating variable", @@ -27942,7 +27942,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "User": { "description": "User represents a user", @@ -28068,7 +28068,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UserHeatmapData": { "description": "UserHeatmapData represents the data needed to create a heatmap", @@ -28083,7 +28083,7 @@ "$ref": "#/definitions/TimeStamp" } }, - "x-go-package": "code.gitea.io/gitea/models/activities" + "x-go-package": "forgejo.org/models/activities" }, "UserSettings": { "description": "UserSettings represents user settings", @@ -28139,7 +28139,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UserSettingsOptions": { "description": "UserSettingsOptions represents options to change user settings", @@ -28195,7 +28195,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WatchInfo": { "description": "WatchInfo represents an API watch status of one repository", @@ -28226,7 +28226,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiCommit": { "description": "WikiCommit page commit/revision", @@ -28247,7 +28247,7 @@ "x-go-name": "ID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiCommitList": { "description": "WikiCommitList commit/revision list", @@ -28266,7 +28266,7 @@ "x-go-name": "Count" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiPage": { "description": "WikiPage a wiki page", @@ -28306,7 +28306,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiPageMetaData": { "description": "WikiPageMetaData wiki page meta information", @@ -28328,7 +28328,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" } }, "responses": { diff --git a/tests/e2e/changes.go b/tests/e2e/changes.go index 1e5533bc6b..d1d318fd06 100644 --- a/tests/e2e/changes.go +++ b/tests/e2e/changes.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/gobwas/glob" ) diff --git a/tests/e2e/debugserver_test.go b/tests/e2e/debugserver_test.go index 49461fabe5..8742790b14 100644 --- a/tests/e2e/debugserver_test.go +++ b/tests/e2e/debugserver_test.go @@ -17,7 +17,7 @@ import ( "syscall" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func TestDebugserver(t *testing.T) { diff --git a/tests/e2e/declare_repos_test.go b/tests/e2e/declare_repos_test.go index c55a42ac66..f701b11f97 100644 --- a/tests/e2e/declare_repos_test.go +++ b/tests/e2e/declare_repos_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index aecb2c70c7..1961a4b68a 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -16,15 +16,15 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers" + "forgejo.org/tests" ) var testE2eWebRoutes *web.Route diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go index b96d61fd2c..d57c7bc2d3 100644 --- a/tests/e2e/utils_e2e_test.go +++ b/tests/e2e/utils_e2e_test.go @@ -18,12 +18,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - modules_session "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + modules_session "forgejo.org/modules/session" + "forgejo.org/modules/setting" + "forgejo.org/tests" "code.forgejo.org/go-chi/session" "github.com/stretchr/testify/require" diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index d16f26c085..754c7ef064 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -9,9 +9,9 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" ) var renderContext = markup.RenderContext{ diff --git a/tests/gitea-repositories-meta/user2/commits_search_test.git/config b/tests/gitea-repositories-meta/user2/commits_search_test.git/config index bfbada5989..534a026f8f 100644 --- a/tests/gitea-repositories-meta/user2/commits_search_test.git/config +++ b/tests/gitea-repositories-meta/user2/commits_search_test.git/config @@ -3,6 +3,6 @@ filemode = true bare = true [remote "origin"] - url = /home/mura/go/src/code.gitea.io/gitea/tests/gitea-repositories-meta/user2/commits_search_test/ + url = /home/mura/go/src/forgejo.org/tests/gitea-repositories-meta/user2/commits_search_test/ fetch = +refs/*:refs/* mirror = true diff --git a/tests/integration/actions_commit_status_test.go b/tests/integration/actions_commit_status_test.go index 0dae5db344..a14b427c98 100644 --- a/tests/integration/actions_commit_status_test.go +++ b/tests/integration/actions_commit_status_test.go @@ -7,16 +7,16 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/automerge" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/services/actions" + "forgejo.org/services/automerge" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index a2ccbf0e3d..412215086e 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go index d66eada950..2c2e2e88b3 100644 --- a/tests/integration/actions_log_test.go +++ b/tests/integration/actions_log_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_route_test.go b/tests/integration/actions_route_test.go index daeae30b38..2641fb6a04 100644 --- a/tests/integration/actions_route_test.go +++ b/tests/integration/actions_route_test.go @@ -11,12 +11,12 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go index 0cc4204567..93f38db9ee 100644 --- a/tests/integration/actions_runner_test.go +++ b/tests/integration/actions_runner_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index ecdf8b7076..2d5dd3b957 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -11,29 +11,29 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - actions_service "code.gitea.io/gitea/services/actions" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + webhook_module "forgejo.org/modules/webhook" + actions_service "forgejo.org/services/actions" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_variables_test.go b/tests/integration/actions_variables_test.go index 0179a543dc..0b59284f27 100644 --- a/tests/integration/actions_variables_test.go +++ b/tests/integration/actions_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/admin_config_test.go b/tests/integration/admin_config_test.go index 860a92d6a3..92faf7ef01 100644 --- a/tests/integration/admin_config_test.go +++ b/tests/integration/admin_config_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index b61c50f4a8..f98650c567 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go index 6393fc53cc..dc2b86d28b 100644 --- a/tests/integration/api_actions_artifact_test.go +++ b/tests/integration/api_actions_artifact_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go index 43df1aeee0..9fa7590620 100644 --- a/tests/integration/api_actions_artifact_v4_test.go +++ b/tests/integration/api_actions_artifact_v4_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/routers/api/actions" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/storage" + "forgejo.org/routers/api/actions" + actions_service "forgejo.org/services/actions" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_activitypub_actor_test.go b/tests/integration/api_activitypub_actor_test.go index de4d669c9d..778a34d785 100644 --- a/tests/integration/api_activitypub_actor_test.go +++ b/tests/integration/api_activitypub_actor_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go index 846ae79891..d8492942e5 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_activitypub_repository_test.go b/tests/integration/api_activitypub_repository_test.go index a86e32b278..29fbe6d781 100644 --- a/tests/integration/api_activitypub_repository_test.go +++ b/tests/integration/api_activitypub_repository_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgefed" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - forgefed_modules "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/forgefed" + "forgejo.org/models/unittest" + "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + forgefed_modules "forgejo.org/modules/forgefed" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_admin_actions_test.go b/tests/integration/api_admin_actions_test.go index fd55f0fd2e..763c35544a 100644 --- a/tests/integration/api_admin_actions_test.go +++ b/tests/integration/api_admin_actions_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go index 823ef2f136..df5e961ec6 100644 --- a/tests/integration/api_admin_org_test.go +++ b/tests/integration/api_admin_org_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go index 5f8d360dec..c5f8906bfc 100644 --- a/tests/integration/api_admin_test.go +++ b/tests/integration/api_admin_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_block_test.go b/tests/integration/api_block_test.go index a69ee9b74f..8b25ce9283 100644 --- a/tests/integration/api_block_test.go +++ b/tests/integration/api_block_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index aa22b15ea1..df6b7022cd 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_attachment_test.go b/tests/integration/api_comment_attachment_test.go index db1b98a20f..16eb3c9b12 100644 --- a/tests/integration/api_comment_attachment_test.go +++ b/tests/integration/api_comment_attachment_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go index c6905293d0..fd0cadbb1a 100644 --- a/tests/integration/api_comment_test.go +++ b/tests/integration/api_comment_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/references" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/references" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_feed_plain_text_titles_test.go b/tests/integration/api_feed_plain_text_titles_test.go index b1247780d8..889d0a103a 100644 --- a/tests/integration/api_feed_plain_text_titles_test.go +++ b/tests/integration/api_feed_plain_text_titles_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_forgejo_root_test.go b/tests/integration/api_forgejo_root_test.go index d21c9449b3..a5c1b8abe0 100644 --- a/tests/integration/api_forgejo_root_test.go +++ b/tests/integration/api_forgejo_root_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_forgejo_version_test.go b/tests/integration/api_forgejo_version_test.go index 5c95fd373c..b42e4a2bd7 100644 --- a/tests/integration/api_forgejo_version_test.go +++ b/tests/integration/api_forgejo_version_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - v1 "code.gitea.io/gitea/routers/api/forgejo/v1" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + v1 "forgejo.org/routers/api/forgejo/v1" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go index 1d04a4b013..2809af2748 100644 --- a/tests/integration/api_fork_test.go +++ b/tests/integration/api_fork_test.go @@ -9,14 +9,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gitignore_templates_test.go b/tests/integration/api_gitignore_templates_test.go index c58f5eebfe..2412b55d3a 100644 --- a/tests/integration/api_gitignore_templates_test.go +++ b/tests/integration/api_gitignore_templates_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gpg_keys_test.go b/tests/integration/api_gpg_keys_test.go index ec0dafc2d6..1acbf91de0 100644 --- a/tests/integration/api_gpg_keys_test.go +++ b/tests/integration/api_gpg_keys_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_health_test.go b/tests/integration/api_health_test.go index 5657f4fd06..22f060e79b 100644 --- a/tests/integration/api_health_test.go +++ b/tests/integration/api_health_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/routers/web/healthcheck" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_helper_for_declarative_test.go b/tests/integration/api_helper_for_declarative_test.go index 4985f45b9c..b5941b3389 100644 --- a/tests/integration/api_helper_for_declarative_test.go +++ b/tests/integration/api_helper_for_declarative_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/queue" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/queue" + api "forgejo.org/modules/structs" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_httpsig_test.go b/tests/integration/api_httpsig_test.go index cca477f5e1..48a0b267eb 100644 --- a/tests/integration/api_httpsig_test.go +++ b/tests/integration/api_httpsig_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/tests/integration/api_issue_attachment_test.go b/tests/integration/api_issue_attachment_test.go index 77e752d122..ef7e6183f9 100644 --- a/tests/integration/api_issue_attachment_test.go +++ b/tests/integration/api_issue_attachment_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go index 16f81e785d..809be572da 100644 --- a/tests/integration/api_issue_config_test.go +++ b/tests/integration/api_issue_config_test.go @@ -9,11 +9,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_label_test.go b/tests/integration/api_issue_label_test.go index ebcf29a13d..7b2fbd18be 100644 --- a/tests/integration/api_issue_label_test.go +++ b/tests/integration/api_issue_label_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go index 32ac56298f..2ab7f9a346 100644 --- a/tests/integration/api_issue_milestone_test.go +++ b/tests/integration/api_issue_milestone_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_pin_test.go b/tests/integration/api_issue_pin_test.go index 2f257a89e0..2073241903 100644 --- a/tests/integration/api_issue_pin_test.go +++ b/tests/integration/api_issue_pin_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_reaction_test.go b/tests/integration/api_issue_reaction_test.go index 4ca909f281..817c07898c 100644 --- a/tests/integration/api_issue_reaction_test.go +++ b/tests/integration/api_issue_reaction_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go index 4765787e6f..f395ad1a61 100644 --- a/tests/integration/api_issue_stopwatch_test.go +++ b/tests/integration/api_issue_stopwatch_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_subscription_test.go b/tests/integration/api_issue_subscription_test.go index 7a716301c4..4d1b9b2fb1 100644 --- a/tests/integration/api_issue_subscription_test.go +++ b/tests/integration/api_issue_subscription_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_templates_test.go b/tests/integration/api_issue_templates_test.go index d634329514..49b1a6f277 100644 --- a/tests/integration/api_issue_templates_test.go +++ b/tests/integration/api_issue_templates_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index 2d3fd80c06..99fc158fdd 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go index 90a59fb481..41def89a55 100644 --- a/tests/integration/api_issue_tracked_time_test.go +++ b/tests/integration/api_issue_tracked_time_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_keys_test.go b/tests/integration/api_keys_test.go index 86daa8c506..a6f0fbe69b 100644 --- a/tests/integration/api_keys_test.go +++ b/tests/integration/api_keys_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_label_templates_test.go b/tests/integration/api_label_templates_test.go index 3039f8c60c..545a1736d0 100644 --- a/tests/integration/api_label_templates_test.go +++ b/tests/integration/api_label_templates_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_license_templates_test.go b/tests/integration/api_license_templates_test.go index e12aab7c2c..7bdd1bc7dc 100644 --- a/tests/integration/api_license_templates_test.go +++ b/tests/integration/api_license_templates_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index d000083717..c4f2309aac 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go index ad233d9e73..b9efaa43a3 100644 --- a/tests/integration/api_notification_test.go +++ b/tests/integration/api_notification_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_oauth2_apps_test.go b/tests/integration/api_oauth2_apps_test.go index 85c7184b64..2490a11888 100644 --- a/tests/integration/api_oauth2_apps_test.go +++ b/tests/integration/api_oauth2_apps_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_actions_test.go b/tests/integration/api_org_actions_test.go index 8c1948fc4a..ed8f91e5c2 100644 --- a/tests/integration/api_org_actions_test.go +++ b/tests/integration/api_org_actions_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_avatar_test.go b/tests/integration/api_org_avatar_test.go index bbe116cd60..aa5ca0fa08 100644 --- a/tests/integration/api_org_avatar_test.go +++ b/tests/integration/api_org_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go index 5f92271d64..37e6035045 100644 --- a/tests/integration/api_org_test.go +++ b/tests/integration/api_org_test.go @@ -9,17 +9,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + "forgejo.org/models/perm" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_alpine_test.go b/tests/integration/api_packages_alpine_test.go index 2264625556..d3cf56394c 100644 --- a/tests/integration/api_packages_alpine_test.go +++ b/tests/integration/api_packages_alpine_test.go @@ -14,13 +14,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + alpine_module "forgejo.org/modules/packages/alpine" + alpine_service "forgejo.org/services/packages/alpine" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_alt_test.go b/tests/integration/api_packages_alt_test.go index 5fc289c134..e84af7dd15 100644 --- a/tests/integration/api_packages_alt_test.go +++ b/tests/integration/api_packages_alt_test.go @@ -16,15 +16,15 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 57db324a2f..2463fd1c8e 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -18,12 +18,12 @@ import ( "testing" "testing/fstest" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - arch_model "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + arch_model "forgejo.org/modules/packages/arch" + "forgejo.org/tests" "github.com/ProtonMail/go-crypto/openpgp/armor" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 7a9105eb3a..048859e312 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -12,19 +12,19 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - cargo_router "code.gitea.io/gitea/routers/api/packages/cargo" - gitea_context "code.gitea.io/gitea/services/context" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + cargo_module "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/setting" + cargo_router "forgejo.org/routers/api/packages/cargo" + gitea_context "forgejo.org/services/context" + cargo_service "forgejo.org/services/packages/cargo" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index febb1a8b6c..390ac50688 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - chef_router "code.gitea.io/gitea/routers/api/packages/chef" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/setting" + chef_router "forgejo.org/routers/api/packages/chef" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 774676f8e2..9c906a8959 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -11,15 +11,15 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + composer_module "forgejo.org/modules/packages/composer" + "forgejo.org/modules/setting" + "forgejo.org/routers/api/packages/composer" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 9d8f435068..c0185c852d 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conan_model "code.gitea.io/gitea/models/packages/conan" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/setting" - conan_router "code.gitea.io/gitea/routers/api/packages/conan" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + conan_model "forgejo.org/models/packages/conan" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/modules/setting" + conan_router "forgejo.org/routers/api/packages/conan" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index 4625c5854c..6924968d35 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -12,13 +12,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/zstd" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + conda_module "forgejo.org/modules/packages/conda" + "forgejo.org/modules/zstd" + "forgejo.org/tests" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_cleanup_sha256_test.go b/tests/integration/api_packages_container_cleanup_sha256_test.go index eb63eff720..b1ed435b80 100644 --- a/tests/integration/api_packages_container_cleanup_sha256_test.go +++ b/tests/integration/api_packages_container_cleanup_sha256_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - packages_cleanup "code.gitea.io/gitea/services/packages/cleanup" - packages_container "code.gitea.io/gitea/services/packages/container" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + packages_cleanup "forgejo.org/services/packages/cleanup" + packages_container "forgejo.org/services/packages/container" + "forgejo.org/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index 3c28f45660..223c865dec 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -13,17 +13,17 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cran_test.go b/tests/integration/api_packages_cran_test.go index d64b592327..2326d36171 100644 --- a/tests/integration/api_packages_cran_test.go +++ b/tests/integration/api_packages_cran_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + cran_module "forgejo.org/modules/packages/cran" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_debian_test.go b/tests/integration/api_packages_debian_test.go index d85f56fdbb..67498ec043 100644 --- a/tests/integration/api_packages_debian_test.go +++ b/tests/integration/api_packages_debian_test.go @@ -13,13 +13,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/tests" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 1a53f33387..5a3727cae5 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -10,12 +10,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_goproxy_test.go b/tests/integration/api_packages_goproxy_test.go index 716d90b242..1534fa73cc 100644 --- a/tests/integration/api_packages_goproxy_test.go +++ b/tests/integration/api_packages_goproxy_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 4b48b74ce0..df19e7cd03 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + helm_module "forgejo.org/modules/packages/helm" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index b453f10b69..438c2f0fb5 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -11,12 +11,12 @@ import ( "sync" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/maven" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index d0c54c306b..38c7ee54c0 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/npm" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index 47b9cfe86c..b4da9695f0 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -17,16 +17,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/packages/nuget" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + nuget_module "forgejo.org/modules/packages/nuget" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/routers/api/packages/nuget" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index d6bce3055e..72ba2f14cd 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -15,13 +15,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + pub_module "forgejo.org/modules/packages/pub" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index a75bae85ac..f025f8e577 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -13,12 +13,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/pypi" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go index 853c8f0f69..3abaec3462 100644 --- a/tests/integration/api_packages_rpm_test.go +++ b/tests/integration/api_packages_rpm_test.go @@ -15,14 +15,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 0ec9b9321b..97c2c8bb5f 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -14,12 +14,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/rubygems" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go index 3c2a8b0694..ec0d4a2b81 100644 --- a/tests/integration/api_packages_swift_test.go +++ b/tests/integration/api_packages_swift_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - swift_router "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + swift_module "forgejo.org/modules/packages/swift" + "forgejo.org/modules/setting" + swift_router "forgejo.org/routers/api/packages/swift" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index c74f40a689..a157d18cd5 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" + packages_cleanup_service "forgejo.org/services/packages/cleanup" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_vagrant_test.go b/tests/integration/api_packages_vagrant_test.go index b446466296..b9977d61c5 100644 --- a/tests/integration/api_packages_vagrant_test.go +++ b/tests/integration/api_packages_vagrant_test.go @@ -12,14 +12,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + vagrant_module "forgejo.org/modules/packages/vagrant" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_private_serv_test.go b/tests/integration/api_private_serv_test.go index 11eb730915..a7dc59a611 100644 --- a/tests/integration/api_private_serv_test.go +++ b/tests/integration/api_private_serv_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/private" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/perm" + "forgejo.org/modules/private" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_commits_test.go b/tests/integration/api_pull_commits_test.go index d62b9d9140..bfdcd79e66 100644 --- a/tests/integration/api_pull_commits_test.go +++ b/tests/integration/api_pull_commits_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index b66e65ee41..930f9b816b 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -8,16 +8,16 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + issue_service "forgejo.org/services/issue" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index 7b95d441dd..e35eca38cf 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -11,18 +11,18 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/services/forms" + issue_service "forgejo.org/services/issue" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_push_mirror_test.go b/tests/integration/api_push_mirror_test.go index f2135cec62..282c3aaba0 100644 --- a/tests/integration/api_push_mirror_test.go +++ b/tests/integration/api_push_mirror_test.go @@ -17,22 +17,22 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_quota_management_test.go b/tests/integration/api_quota_management_test.go index 6337e66516..c46c857197 100644 --- a/tests/integration/api_quota_management_test.go +++ b/tests/integration/api_quota_management_test.go @@ -8,16 +8,16 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_quota_use_test.go b/tests/integration/api_quota_use_test.go index 11cbdcf145..2b50cca4ab 100644 --- a/tests/integration/api_quota_use_test.go +++ b/tests/integration/api_quota_use_test.go @@ -14,22 +14,22 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/migration" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/services/context" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 1327daf57e..98fc293fbc 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_actions_test.go b/tests/integration/api_repo_actions_test.go index 302f0c93cb..42c1038a0e 100644 --- a/tests/integration/api_repo_actions_test.go +++ b/tests/integration/api_repo_actions_test.go @@ -10,15 +10,15 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_activities_test.go b/tests/integration/api_repo_activities_test.go index dbdedec372..ea966c1cfe 100644 --- a/tests/integration/api_repo_activities_test.go +++ b/tests/integration/api_repo_activities_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index fab3dedfab..30e62943f0 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -11,11 +11,11 @@ import ( "regexp" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_avatar_test.go b/tests/integration/api_repo_avatar_test.go index 8ee256ec9f..0bd0a54f27 100644 --- a/tests/integration/api_repo_avatar_test.go +++ b/tests/integration/api_repo_avatar_test.go @@ -10,12 +10,12 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go index 83159022ea..caadea7e39 100644 --- a/tests/integration/api_repo_branch_test.go +++ b/tests/integration/api_repo_branch_test.go @@ -11,14 +11,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_collaborator_test.go b/tests/integration/api_repo_collaborator_test.go index 81d7a591f8..61f4f578d7 100644 --- a/tests/integration/api_repo_collaborator_test.go +++ b/tests/integration/api_repo_collaborator_test.go @@ -8,12 +8,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go index d4b170e60e..35f0a21d82 100644 --- a/tests/integration/api_repo_compare_test.go +++ b/tests/integration/api_repo_compare_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 7de8910ee0..288c645e37 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -9,13 +9,13 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 18aad34c98..cff891f6d8 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go index 7c93307e19..b76edf45ca 100644 --- a/tests/integration/api_repo_file_delete_test.go +++ b/tests/integration/api_repo_file_delete_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_get_test.go b/tests/integration/api_repo_file_get_test.go index 1a4e670bc1..7bd7393b01 100644 --- a/tests/integration/api_repo_file_get_test.go +++ b/tests/integration/api_repo_file_get_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go index 4350092b8b..09cf93d8a5 100644 --- a/tests/integration/api_repo_file_helpers.go +++ b/tests/integration/api_repo_file_helpers.go @@ -6,12 +6,12 @@ package integration import ( "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + files_service "forgejo.org/services/repository/files" ) func createFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, branchName, content string) (*api.FilesResponse, error) { diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go index c8ce94a3f5..4ed0df2b08 100644 --- a/tests/integration/api_repo_file_update_test.go +++ b/tests/integration/api_repo_file_update_test.go @@ -11,14 +11,14 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go index aca58025d2..d188751dab 100644 --- a/tests/integration/api_repo_files_change_test.go +++ b/tests/integration/api_repo_files_change_test.go @@ -10,14 +10,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_get_contents_list_test.go b/tests/integration/api_repo_get_contents_list_test.go index e76ccd9932..543f10f6d2 100644 --- a/tests/integration/api_repo_get_contents_list_test.go +++ b/tests/integration/api_repo_get_contents_list_test.go @@ -9,15 +9,15 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go index cb321b8b1f..9cf266b3dd 100644 --- a/tests/integration/api_repo_get_contents_test.go +++ b/tests/integration/api_repo_get_contents_test.go @@ -9,15 +9,15 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_git_blobs_test.go b/tests/integration/api_repo_git_blobs_test.go index 184362e7e3..980fff1e52 100644 --- a/tests/integration/api_repo_git_blobs_test.go +++ b/tests/integration/api_repo_git_blobs_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_commits_test.go b/tests/integration/api_repo_git_commits_test.go index c4c626eb49..e80c0024b8 100644 --- a/tests/integration/api_repo_git_commits_test.go +++ b/tests/integration/api_repo_git_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_hook_test.go b/tests/integration/api_repo_git_hook_test.go index 9917b41790..aadc231d82 100644 --- a/tests/integration/api_repo_git_hook_test.go +++ b/tests/integration/api_repo_git_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_notes_test.go b/tests/integration/api_repo_git_notes_test.go index 1b5e5d652c..dfafec7135 100644 --- a/tests/integration/api_repo_git_notes_test.go +++ b/tests/integration/api_repo_git_notes_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_ref_test.go b/tests/integration/api_repo_git_ref_test.go index 875752ae3f..a4c05e208c 100644 --- a/tests/integration/api_repo_git_ref_test.go +++ b/tests/integration/api_repo_git_ref_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestAPIReposGitRefs(t *testing.T) { diff --git a/tests/integration/api_repo_git_tags_test.go b/tests/integration/api_repo_git_tags_test.go index c5883a8058..73d7250c46 100644 --- a/tests/integration/api_repo_git_tags_test.go +++ b/tests/integration/api_repo_git_tags_test.go @@ -8,15 +8,15 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_trees_test.go b/tests/integration/api_repo_git_trees_test.go index 8eec6d8d22..f321760218 100644 --- a/tests/integration/api_repo_git_trees_test.go +++ b/tests/integration/api_repo_git_trees_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestAPIReposGitTrees(t *testing.T) { diff --git a/tests/integration/api_repo_hook_test.go b/tests/integration/api_repo_hook_test.go index 9ae8119b28..b2b8b47d40 100644 --- a/tests/integration/api_repo_hook_test.go +++ b/tests/integration/api_repo_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go index 4ba01e6d9b..b3a295c2de 100644 --- a/tests/integration/api_repo_lfs_locks_test.go +++ b/tests/integration/api_repo_lfs_locks_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_migrate_test.go b/tests/integration/api_repo_lfs_migrate_test.go index de85b9160d..fcfa43cac4 100644 --- a/tests/integration/api_repo_lfs_migrate_test.go +++ b/tests/integration/api_repo_lfs_migrate_test.go @@ -8,14 +8,14 @@ import ( "path" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/migrations" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go index 7a2a92d415..078cedf78e 100644 --- a/tests/integration/api_repo_lfs_test.go +++ b/tests/integration/api_repo_lfs_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_raw_test.go b/tests/integration/api_repo_raw_test.go index e5f83d1c80..5ae11a8e71 100644 --- a/tests/integration/api_repo_raw_test.go +++ b/tests/integration/api_repo_raw_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_secrets_test.go b/tests/integration/api_repo_secrets_test.go index c3074d9ece..a2c9439f03 100644 --- a/tests/integration/api_repo_secrets_test.go +++ b/tests/integration/api_repo_secrets_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIRepoSecrets(t *testing.T) { diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go index 09f17ef475..81475249a1 100644 --- a/tests/integration/api_repo_tags_test.go +++ b/tests/integration/api_repo_tags_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_teams_test.go b/tests/integration/api_repo_teams_test.go index 91bfd66b3a..c75714d003 100644 --- a/tests/integration/api_repo_teams_test.go +++ b/tests/integration/api_repo_teams_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go index 6cc7aea2c8..cd79c6eee6 100644 --- a/tests/integration/api_repo_test.go +++ b/tests/integration/api_repo_test.go @@ -9,18 +9,18 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_topic_test.go b/tests/integration/api_repo_topic_test.go index dcb8ae09da..c826fbd818 100644 --- a/tests/integration/api_repo_topic_test.go +++ b/tests/integration/api_repo_topic_test.go @@ -10,12 +10,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_variables_test.go b/tests/integration/api_repo_variables_test.go index 7847962b07..6e3e8c1db6 100644 --- a/tests/integration/api_repo_variables_test.go +++ b/tests/integration/api_repo_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIRepoVariables(t *testing.T) { diff --git a/tests/integration/api_settings_test.go b/tests/integration/api_settings_test.go index 9881578fba..e13f4062da 100644 --- a/tests/integration/api_settings_test.go +++ b/tests/integration/api_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go index 4fee39d687..41d34dcd50 100644 --- a/tests/integration/api_team_test.go +++ b/tests/integration/api_team_test.go @@ -9,17 +9,17 @@ import ( "sort" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_team_user_test.go b/tests/integration/api_team_user_test.go index 6c80bc9f80..0c76dd459d 100644 --- a/tests/integration/api_team_user_test.go +++ b/tests/integration/api_team_user_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index f94a0986f2..aba6a25256 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go index 9de096ed2f..6441b23199 100644 --- a/tests/integration/api_twofa_test.go +++ b/tests/integration/api_twofa_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_user_actions_test.go b/tests/integration/api_user_actions_test.go index a03d4e95ae..1eb5089ee4 100644 --- a/tests/integration/api_user_actions_test.go +++ b/tests/integration/api_user_actions_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_avatar_test.go b/tests/integration/api_user_avatar_test.go index 22dc09a6b7..858e6cf71f 100644 --- a/tests/integration/api_user_avatar_test.go +++ b/tests/integration/api_user_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_user_email_test.go b/tests/integration/api_user_email_test.go index 6441e2ed8e..b0907ad1cf 100644 --- a/tests/integration/api_user_email_test.go +++ b/tests/integration/api_user_email_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_follow_test.go b/tests/integration/api_user_follow_test.go index 68443eff48..703d8ff494 100644 --- a/tests/integration/api_user_follow_test.go +++ b/tests/integration/api_user_follow_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_heatmap_test.go b/tests/integration/api_user_heatmap_test.go index a23536735b..69d2524aaa 100644 --- a/tests/integration/api_user_heatmap_test.go +++ b/tests/integration/api_user_heatmap_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/timeutil" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_info_test.go b/tests/integration/api_user_info_test.go index 89f7266859..eefabe52ac 100644 --- a/tests/integration/api_user_info_test.go +++ b/tests/integration/api_user_info_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_org_perm_test.go b/tests/integration/api_user_org_perm_test.go index 85bb1db170..9a09a34087 100644 --- a/tests/integration/api_user_org_perm_test.go +++ b/tests/integration/api_user_org_perm_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_orgs_test.go b/tests/integration/api_user_orgs_test.go index e31199406d..ca3fc7df34 100644 --- a/tests/integration/api_user_orgs_test.go +++ b/tests/integration/api_user_orgs_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go index ab52b26531..3df3e45778 100644 --- a/tests/integration/api_user_search_test.go +++ b/tests/integration/api_user_search_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_secrets_test.go b/tests/integration/api_user_secrets_test.go index 56bf30e804..50ecdedfd6 100644 --- a/tests/integration/api_user_secrets_test.go +++ b/tests/integration/api_user_secrets_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIUserSecrets(t *testing.T) { diff --git a/tests/integration/api_user_star_test.go b/tests/integration/api_user_star_test.go index aafe9cfb8b..27e5b9e0ca 100644 --- a/tests/integration/api_user_star_test.go +++ b/tests/integration/api_user_star_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_variables_test.go b/tests/integration/api_user_variables_test.go index 9fd84ddf81..2e219be7ec 100644 --- a/tests/integration/api_user_variables_test.go +++ b/tests/integration/api_user_variables_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIUserVariables(t *testing.T) { diff --git a/tests/integration/api_user_watch_test.go b/tests/integration/api_user_watch_test.go index 953e00551d..fd8964a8ed 100644 --- a/tests/integration/api_user_watch_test.go +++ b/tests/integration/api_user_watch_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index a1018e45be..1720587dd4 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -11,15 +11,15 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/appearance_settings_test.go b/tests/integration/appearance_settings_test.go index ad87887331..33ca9f97aa 100644 --- a/tests/integration/appearance_settings_test.go +++ b/tests/integration/appearance_settings_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 7bd3e680f7..5920620f48 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 42d19341ba..6b9a71a5aa 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - "code.gitea.io/gitea/tests" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/ldap" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_token_test.go b/tests/integration/auth_token_test.go index d1fd5dda83..b4242c2681 100644 --- a/tests/integration/auth_token_test.go +++ b/tests/integration/auth_token_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/benchmarks_test.go b/tests/integration/benchmarks_test.go index 62da761d2d..40875e0c7d 100644 --- a/tests/integration/benchmarks_test.go +++ b/tests/integration/benchmarks_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" ) // StringWithCharset random string (from https://www.calhoun.io/creating-random-strings-in-go/) diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go index 8eda4ffa54..d249737555 100644 --- a/tests/integration/block_test.go +++ b/tests/integration/block_test.go @@ -11,15 +11,15 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/models/activities" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/branches_test.go b/tests/integration/branches_test.go index e0482b6f2e..c599106866 100644 --- a/tests/integration/branches_test.go +++ b/tests/integration/branches_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - gitea_context "code.gitea.io/gitea/services/context" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + gitea_context "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/change_default_branch_test.go b/tests/integration/change_default_branch_test.go index 703834b712..84f02e41f9 100644 --- a/tests/integration/change_default_branch_test.go +++ b/tests/integration/change_default_branch_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestChangeDefaultBranch(t *testing.T) { diff --git a/tests/integration/cmd_admin_test.go b/tests/integration/cmd_admin_test.go index b493dff919..043ecef346 100644 --- a/tests/integration/cmd_admin_test.go +++ b/tests/integration/cmd_admin_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/cmd_forgejo_actions_test.go b/tests/integration/cmd_forgejo_actions_test.go index a458a6437d..bee50a6d98 100644 --- a/tests/integration/cmd_forgejo_actions_test.go +++ b/tests/integration/cmd_forgejo_actions_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/cmd_forgejo_f3_test.go b/tests/integration/cmd_forgejo_f3_test.go index 6c34a71c71..1eda413e4c 100644 --- a/tests/integration/cmd_forgejo_f3_test.go +++ b/tests/integration/cmd_forgejo_f3_test.go @@ -9,14 +9,14 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/cmd/forgejo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/f3/driver/options" - "code.gitea.io/gitea/tests" + "forgejo.org/cmd/forgejo" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/services/f3/driver/options" + "forgejo.org/tests" - _ "code.gitea.io/gitea/services/f3/driver" - _ "code.gitea.io/gitea/services/f3/driver/tests" + _ "forgejo.org/services/f3/driver" + _ "forgejo.org/services/f3/driver/tests" f3_filesystem_options "code.forgejo.org/f3/gof3/v3/forges/filesystem/options" f3_logger "code.forgejo.org/f3/gof3/v3/logger" diff --git a/tests/integration/cmd_keys_test.go b/tests/integration/cmd_keys_test.go index e93a8b5b57..c76055c4a8 100644 --- a/tests/integration/cmd_keys_test.go +++ b/tests/integration/cmd_keys_test.go @@ -9,8 +9,8 @@ import ( "os/exec" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/codeowner_test.go b/tests/integration/codeowner_test.go index e1df15426d..e2eeb843d8 100644 --- a/tests/integration/codeowner_test.go +++ b/tests/integration/codeowner_test.go @@ -13,15 +13,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/comment_roles_system_test.go b/tests/integration/comment_roles_system_test.go index 4c5d5ed8da..3b315f28f8 100644 --- a/tests/integration/comment_roles_system_test.go +++ b/tests/integration/comment_roles_system_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/commit_status_test.go b/tests/integration/commit_status_test.go index 924fc5b074..9dd1bcd283 100644 --- a/tests/integration/commit_status_test.go +++ b/tests/integration/commit_status_test.go @@ -6,11 +6,11 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index d134ebf40a..3c3e8adf94 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/optional" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/cors_test.go b/tests/integration/cors_test.go index 25dfbabf41..a050693035 100644 --- a/tests/integration/cors_test.go +++ b/tests/integration/cors_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go index ca2a775459..ed547c5b5a 100644 --- a/tests/integration/create_no_session_test.go +++ b/tests/integration/create_no_session_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/routers" + "forgejo.org/tests" "code.forgejo.org/go-chi/session" "github.com/stretchr/testify/assert" diff --git a/tests/integration/csrf_test.go b/tests/integration/csrf_test.go index fcb9661b8a..100614cbb4 100644 --- a/tests/integration/csrf_test.go +++ b/tests/integration/csrf_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go index 0e5bf00ed7..6bfe656b9b 100644 --- a/tests/integration/db_collation_test.go +++ b/tests/integration/db_collation_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/delete_user_test.go b/tests/integration/delete_user_test.go index fa407a75ad..767d6c9724 100644 --- a/tests/integration/delete_user_test.go +++ b/tests/integration/delete_user_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func assertUserDeleted(t *testing.T, userID int64, purged bool) { diff --git a/tests/integration/disable_forgotten_password_test.go b/tests/integration/disable_forgotten_password_test.go index 8a50c8d409..7a1e502d93 100644 --- a/tests/integration/disable_forgotten_password_test.go +++ b/tests/integration/disable_forgotten_password_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" ) func TestDisableForgottenPasswordFalse(t *testing.T) { diff --git a/tests/integration/doctor_packages_nuget_test.go b/tests/integration/doctor_packages_nuget_test.go index a012567efc..e505799730 100644 --- a/tests/integration/doctor_packages_nuget_test.go +++ b/tests/integration/doctor_packages_nuget_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - doctor "code.gitea.io/gitea/services/doctor" - packages_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + doctor "forgejo.org/services/doctor" + packages_service "forgejo.org/services/packages" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/download_test.go b/tests/integration/download_test.go index efe5ac791c..d5e68402c5 100644 --- a/tests/integration/download_test.go +++ b/tests/integration/download_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dummy_lang_test.go b/tests/integration/dummy_lang_test.go index d26ea6edc4..08c5176731 100644 --- a/tests/integration/dummy_lang_test.go +++ b/tests/integration/dummy_lang_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go index e794c3fb15..239170a256 100644 --- a/tests/integration/dump_restore_test.go +++ b/tests/integration/dump_restore_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/migrations" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/easymde_test.go b/tests/integration/easymde_test.go index 2b4630d8b4..7ecbe4f5b7 100644 --- a/tests/integration/easymde_test.go +++ b/tests/integration/easymde_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" ) func TestEasyMDESwitch(t *testing.T) { diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index 96d388ddb9..7321aa26c9 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -15,14 +15,14 @@ import ( "path" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index 637de7d5c7..baea2566ff 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -11,15 +11,15 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/eventsource_test.go b/tests/integration/eventsource_test.go index e081df0e57..8eb5110e54 100644 --- a/tests/integration/eventsource_test.go +++ b/tests/integration/eventsource_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/eventsource" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/eventsource" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/explore_code_test.go b/tests/integration/explore_code_test.go index 02b3a6a0f7..97cc97b996 100644 --- a/tests/integration/explore_code_test.go +++ b/tests/integration/explore_code_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/explore_org_test.go b/tests/integration/explore_org_test.go index e0c48ccf0d..111fd2dda7 100644 --- a/tests/integration/explore_org_test.go +++ b/tests/integration/explore_org_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_repos_test.go b/tests/integration/explore_repos_test.go index c0179c50da..604d473ac5 100644 --- a/tests/integration/explore_repos_test.go +++ b/tests/integration/explore_repos_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_user_test.go b/tests/integration/explore_user_test.go index d1e3fd85af..689e623e69 100644 --- a/tests/integration/explore_user_test.go +++ b/tests/integration/explore_user_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_repo_test.go b/tests/integration/feed_repo_test.go index f1f56c4f63..a4d5ef2610 100644 --- a/tests/integration/feed_repo_test.go +++ b/tests/integration/feed_repo_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/feed_user_test.go b/tests/integration/feed_user_test.go index d618f30566..51da24252a 100644 --- a/tests/integration/feed_user_test.go +++ b/tests/integration/feed_user_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/forgejo_confirmation_repo_test.go b/tests/integration/forgejo_confirmation_repo_test.go index 598baa48b4..0229046efc 100644 --- a/tests/integration/forgejo_confirmation_repo_test.go +++ b/tests/integration/forgejo_confirmation_repo_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/forgejo_git_test.go b/tests/integration/forgejo_git_test.go index ebad074e14..693d6d9209 100644 --- a/tests/integration/forgejo_git_test.go +++ b/tests/integration/forgejo_git_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index d2bd54eecd..89453296ca 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -17,10 +17,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 50b4de9219..110bb6c886 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_smart_http_test.go b/tests/integration/git_smart_http_test.go index 5d65cd9bd8..671ba07d23 100644 --- a/tests/integration/git_smart_http_test.go +++ b/tests/integration/git_smart_http_test.go @@ -11,13 +11,13 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/perm" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go index 551912b273..d8fed1df2e 100644 --- a/tests/integration/git_test.go +++ b/tests/integration/git_test.go @@ -18,22 +18,22 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - gitea_context "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + gitea_context "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/goget_test.go b/tests/integration/goget_test.go index 854f8d7a2d..d1187e4cb5 100644 --- a/tests/integration/goget_test.go +++ b/tests/integration/goget_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/gpg_git_test.go b/tests/integration/gpg_git_test.go index 5302997f6d..0fd998e815 100644 --- a/tests/integration/gpg_git_test.go +++ b/tests/integration/gpg_git_test.go @@ -10,15 +10,15 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index 66f833b28d..a47aaed87a 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/incoming" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - token_service "code.gitea.io/gitea/services/mailer/token" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/services/mailer/incoming" + incoming_payload "forgejo.org/services/mailer/incoming/payload" + token_service "forgejo.org/services/mailer/token" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 0110b44c29..4257a999d9 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -25,23 +25,23 @@ import ( "testing" "time" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/services/auth/source/remote" - gitea_context "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/tests" + "forgejo.org/cmd" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers" + "forgejo.org/services/auth/source/remote" + gitea_context "forgejo.org/services/context" + user_service "forgejo.org/services/user" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/markbates/goth" diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 70525c0c44..5b06b15dd7 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -15,22 +15,22 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/optional" + "forgejo.org/modules/references" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/last_updated_time_test.go b/tests/integration/last_updated_time_test.go index 34ba9a471f..0b3f08677c 100644 --- a/tests/integration/last_updated_time_test.go +++ b/tests/integration/last_updated_time_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_getobject_test.go b/tests/integration/lfs_getobject_test.go index 351c1a38a4..ddaef827ef 100644 --- a/tests/integration/lfs_getobject_test.go +++ b/tests/integration/lfs_getobject_test.go @@ -11,14 +11,14 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/json" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/klauspost/compress/gzhttp" gzipp "github.com/klauspost/compress/gzip" diff --git a/tests/integration/lfs_local_endpoint_test.go b/tests/integration/lfs_local_endpoint_test.go index d42888bbe1..8962e0a710 100644 --- a/tests/integration/lfs_local_endpoint_test.go +++ b/tests/integration/lfs_local_endpoint_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/lfs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go index 9b663fa8e7..6df5855ed6 100644 --- a/tests/integration/lfs_view_test.go +++ b/tests/integration/lfs_view_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/linguist_test.go b/tests/integration/linguist_test.go index 8690401d8a..85080c1d2e 100644 --- a/tests/integration/linguist_test.go +++ b/tests/integration/linguist_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/queue" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/indexer/stats" + "forgejo.org/modules/queue" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index e9ad933b24..3d240f900a 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -9,11 +9,11 @@ import ( "path" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go index 0eaa9669f4..e77d9682a4 100644 --- a/tests/integration/markup_external_test.go +++ b/tests/integration/markup_external_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/markup_test.go b/tests/integration/markup_test.go index d63190a885..ab6b437390 100644 --- a/tests/integration/markup_test.go +++ b/tests/integration/markup_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index 0b03a4136b..32b3ef867d 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -12,20 +12,20 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/services/migrations" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index 729d8e0dff..8076dfa452 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -16,18 +16,18 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - migrate_base "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + migrate_base "forgejo.org/models/migrations/base" + "forgejo.org/models/unittest" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go index 3a1b7d6f1b..bdfdd2c6d9 100644 --- a/tests/integration/milestone_test.go +++ b/tests/integration/milestone_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go index 7072f1eb27..c9c8037e27 100644 --- a/tests/integration/mirror_pull_test.go +++ b/tests/integration/mirror_pull_test.go @@ -6,17 +6,17 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/migration" - mirror_service "code.gitea.io/gitea/services/mirror" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/migration" + mirror_service "forgejo.org/services/mirror" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index ae8d289184..ca8d536e46 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -16,23 +16,23 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - gitea_context "code.gitea.io/gitea/services/context" - doctor "code.gitea.io/gitea/services/doctor" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + gitea_context "forgejo.org/services/context" + doctor "forgejo.org/services/doctor" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/new_org_test.go b/tests/integration/new_org_test.go index ec9f2f244c..ab9ee4bc18 100644 --- a/tests/integration/new_org_test.go +++ b/tests/integration/new_org_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/nonascii_branches_test.go b/tests/integration/nonascii_branches_test.go index 8917a9b574..2b27c8be45 100644 --- a/tests/integration/nonascii_branches_test.go +++ b/tests/integration/nonascii_branches_test.go @@ -9,7 +9,7 @@ import ( "path" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/notification_test.go b/tests/integration/notification_test.go index 6195ec2282..be1eecd1d1 100644 --- a/tests/integration/notification_test.go +++ b/tests/integration/notification_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestNotification(t *testing.T) { diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 336d14c418..a4dea51a07 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -15,17 +15,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers/web/auth" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers/web/auth" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/opengraph_test.go b/tests/integration/opengraph_test.go index d54f59c9b8..38998d0c76 100644 --- a/tests/integration/opengraph_test.go +++ b/tests/integration/opengraph_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/org_count_test.go b/tests/integration/org_count_test.go index e3de9257f0..93035c8e5b 100644 --- a/tests/integration/org_count_test.go +++ b/tests/integration/org_count_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/org_nav_test.go b/tests/integration/org_nav_test.go index 37b62921ae..09736d12a0 100644 --- a/tests/integration/org_nav_test.go +++ b/tests/integration/org_nav_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_project_test.go b/tests/integration/org_project_test.go index 31d10f16ff..3ab2379b5e 100644 --- a/tests/integration/org_project_test.go +++ b/tests/integration/org_project_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/tests" ) func TestOrgProjectAccess(t *testing.T) { diff --git a/tests/integration/org_settings_test.go b/tests/integration/org_settings_test.go index 56b7b02271..fde57e2e26 100644 --- a/tests/integration/org_settings_test.go +++ b/tests/integration/org_settings_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index 2fe296e8c3..3ca236a5dd 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index eabfe11dcd..bc1a5bbe72 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/private_project_test.go b/tests/integration/private_project_test.go index 663c1c1e75..b2ad8d1cd7 100644 --- a/tests/integration/private_project_test.go +++ b/tests/integration/private_project_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - org_model "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + org_model "forgejo.org/models/organization" + project_model "forgejo.org/models/project" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 5362462f7d..84f09c64e1 100644 --- a/tests/integration/privateactivity_test.go +++ b/tests/integration/privateactivity_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/proctected_branch_test.go b/tests/integration/proctected_branch_test.go index 9c6e5e3cae..5024b63c42 100644 --- a/tests/integration/proctected_branch_test.go +++ b/tests/integration/proctected_branch_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index fc2986e1eb..7dc8bf112d 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go index 5ef6d6ceca..90d16d725d 100644 --- a/tests/integration/pull_commit_test.go +++ b/tests/integration/pull_commit_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/tests" + pull_service "forgejo.org/services/pull" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go index f5baf05965..adb24c60f6 100644 --- a/tests/integration/pull_compare_test.go +++ b/tests/integration/pull_compare_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index 7ccbce2eae..42155076a8 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -14,17 +14,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_diff_test.go b/tests/integration/pull_diff_test.go index 5411250935..70e0d5d33a 100644 --- a/tests/integration/pull_diff_test.go +++ b/tests/integration/pull_diff_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_editable_test.go b/tests/integration/pull_editable_test.go index dfd634f0b5..f2e6f2f52c 100644 --- a/tests/integration/pull_editable_test.go +++ b/tests/integration/pull_editable_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestPullEditable_ShowEditableLabel(t *testing.T) { diff --git a/tests/integration/pull_icon_test.go b/tests/integration/pull_icon_test.go index b678550c30..9ab8f244cf 100644 --- a/tests/integration/pull_icon_test.go +++ b/tests/integration/pull_icon_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index d583abe226..f60fc27bb3 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -17,32 +17,32 @@ import ( "testing" "time" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/automerge" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/pull" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" - files_service "code.gitea.io/gitea/services/repository/files" - webhook_service "code.gitea.io/gitea/services/webhook" - "code.gitea.io/gitea/tests" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/services/automerge" + forgejo_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/pull" + commitstatus_service "forgejo.org/services/repository/commitstatus" + files_service "forgejo.org/services/repository/files" + webhook_service "forgejo.org/services/webhook" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_reopen_test.go b/tests/integration/pull_reopen_test.go index e510d59626..cf95f6b730 100644 --- a/tests/integration/pull_reopen_test.go +++ b/tests/integration/pull_reopen_test.go @@ -12,20 +12,20 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_request_task_test.go b/tests/integration/pull_request_task_test.go index e268cb8cc5..777aac08a5 100644 --- a/tests/integration/pull_request_task_test.go +++ b/tests/integration/pull_request_task_test.go @@ -7,19 +7,19 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 1777d20d92..6dacdc4315 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -14,19 +14,19 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/services/mailer" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/test" + issue_service "forgejo.org/services/issue" + "forgejo.org/services/mailer" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go index 80eea34513..1fdc871bb3 100644 --- a/tests/integration/pull_status_test.go +++ b/tests/integration/pull_status_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_test.go b/tests/integration/pull_test.go index edca5f0384..3695ebe5f2 100644 --- a/tests/integration/pull_test.go +++ b/tests/integration/pull_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index f36ea88c2b..18766e8fa4 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -11,19 +11,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/quota_use_test.go b/tests/integration/quota_use_test.go index 39c5c1ae5c..314dcff6e9 100644 --- a/tests/integration/quota_use_test.go +++ b/tests/integration/quota_use_test.go @@ -14,20 +14,20 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - forgejo_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + forgejo_context "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" gouuid "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/tests/integration/release_feed_test.go b/tests/integration/release_feed_test.go index fd1f42c3cd..0ab299f617 100644 --- a/tests/integration/release_feed_test.go +++ b/tests/integration/release_feed_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index c535c6c93d..b1162780ab 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/remote_test.go b/tests/integration/remote_test.go index 3c322deea1..506ee8ecaa 100644 --- a/tests/integration/remote_test.go +++ b/tests/integration/remote_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" - remote_service "code.gitea.io/gitea/services/remote" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/test" + remote_service "forgejo.org/services/remote" + "forgejo.org/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go index 20d4c9b48f..d7440e5125 100644 --- a/tests/integration/rename_branch_test.go +++ b/tests/integration/rename_branch_test.go @@ -8,11 +8,11 @@ import ( "net/url" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + gitea_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go index c1177fac11..6199373119 100644 --- a/tests/integration/repo_activity_test.go +++ b/tests/integration/repo_activity_test.go @@ -11,15 +11,15 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_archive_test.go b/tests/integration/repo_archive_test.go index aea500b9b1..f0ffedfd9b 100644 --- a/tests/integration/repo_archive_test.go +++ b/tests/integration/repo_archive_test.go @@ -13,14 +13,14 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/routers/web" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_archive_text_test.go b/tests/integration/repo_archive_text_test.go index e759246aa4..db133ce7d7 100644 --- a/tests/integration/repo_archive_text_test.go +++ b/tests/integration/repo_archive_text_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_badges_test.go b/tests/integration/repo_badges_test.go index a74d3979c2..baaa8c136a 100644 --- a/tests/integration/repo_badges_test.go +++ b/tests/integration/repo_badges_test.go @@ -12,19 +12,19 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/services/release" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/services/release" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index df9ea9a97c..46cd29d025 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -12,16 +12,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_citation_test.go b/tests/integration/repo_citation_test.go index 4f7e24ee51..5651ac3db3 100644 --- a/tests/integration/repo_citation_test.go +++ b/tests/integration/repo_citation_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_collaborator_test.go b/tests/integration/repo_collaborator_test.go index b3e7197c7e..e18308e7cb 100644 --- a/tests/integration/repo_collaborator_test.go +++ b/tests/integration/repo_collaborator_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_search_test.go b/tests/integration/repo_commits_search_test.go index 74ac25c0f5..92ff74ba68 100644 --- a/tests/integration/repo_commits_search_test.go +++ b/tests/integration/repo_commits_search_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index e399898958..f3d3a145ae 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -11,11 +11,11 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_delete_test.go b/tests/integration/repo_delete_test.go index 44ef26f19a..faabd13432 100644 --- a/tests/integration/repo_delete_test.go +++ b/tests/integration/repo_delete_test.go @@ -6,13 +6,13 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_flags_test.go b/tests/integration/repo_flags_test.go index 8b64776a5a..c52610cd10 100644 --- a/tests/integration/repo_flags_test.go +++ b/tests/integration/repo_flags_test.go @@ -10,16 +10,16 @@ import ( "slices" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index b64991ae18..03bbba1b2c 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -12,16 +12,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index d541a4b651..fd29156e4e 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_git_note_test.go b/tests/integration/repo_git_note_test.go index 6ad57c81b0..e6b23754db 100644 --- a/tests/integration/repo_git_note_test.go +++ b/tests/integration/repo_git_note_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_issue_title_test.go b/tests/integration/repo_issue_title_test.go index cf517a7a40..587db43223 100644 --- a/tests/integration/repo_issue_title_test.go +++ b/tests/integration/repo_issue_title_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_mergecommit_revert_test.go b/tests/integration/repo_mergecommit_revert_test.go index eb75d45c15..600ee991f8 100644 --- a/tests/integration/repo_mergecommit_revert_test.go +++ b/tests/integration/repo_mergecommit_revert_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_migrate_test.go b/tests/integration/repo_migrate_test.go index 9fb7a73379..233a55ef8f 100644 --- a/tests/integration/repo_migrate_test.go +++ b/tests/integration/repo_migrate_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go index 594b09b490..5e2f0c0a76 100644 --- a/tests/integration/repo_migration_ui_test.go +++ b/tests/integration/repo_migration_ui_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_pagination_test.go b/tests/integration/repo_pagination_test.go index 1c1f2ac82e..692936353b 100644 --- a/tests/integration/repo_pagination_test.go +++ b/tests/integration/repo_pagination_test.go @@ -8,11 +8,11 @@ import ( "path" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 60eca66735..909668d3ca 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_settings_hook_test.go b/tests/integration/repo_settings_hook_test.go index 0a3dd57160..f7349d4e66 100644 --- a/tests/integration/repo_settings_hook_test.go +++ b/tests/integration/repo_settings_hook_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_settings_test.go b/tests/integration/repo_settings_test.go index 2c4ffba24d..f78df96a93 100644 --- a/tests/integration/repo_settings_test.go +++ b/tests/integration/repo_settings_test.go @@ -9,22 +9,22 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgefed" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - fm "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/validation" - gitea_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/forgefed" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + fm "forgejo.org/modules/forgefed" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/validation" + gitea_context "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" + user_service "forgejo.org/services/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_signed_tag_test.go b/tests/integration/repo_signed_tag_test.go index 41e663ce52..16d8841304 100644 --- a/tests/integration/repo_signed_tag_test.go +++ b/tests/integration/repo_signed_tag_test.go @@ -10,16 +10,16 @@ import ( "os/exec" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/repo_starwatch_test.go b/tests/integration/repo_starwatch_test.go index a8bad30109..3bcfa29fe3 100644 --- a/tests/integration/repo_starwatch_test.go +++ b/tests/integration/repo_starwatch_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 0ce0e142b9..9be33ec8a8 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/release" - "code.gitea.io/gitea/tests" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/services/release" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 5445ce6d4c..f8961443c5 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -12,18 +12,18 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_topic_test.go b/tests/integration/repo_topic_test.go index f5778a2861..6dc60e2c3a 100644 --- a/tests/integration/repo_topic_test.go +++ b/tests/integration/repo_topic_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_view_test.go b/tests/integration/repo_view_test.go index 46e75063bc..7ea4aeb4c6 100644 --- a/tests/integration/repo_view_test.go +++ b/tests/integration/repo_view_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_watch_test.go b/tests/integration/repo_watch_test.go index ef3028f293..0bcb039b01 100644 --- a/tests/integration/repo_watch_test.go +++ b/tests/integration/repo_watch_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" ) func TestRepoWatch(t *testing.T) { diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 37bad56b9e..be1b9cbcec 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/webhook" - "code.gitea.io/gitea/tests" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/webhook" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_wiki_test.go b/tests/integration/repo_wiki_test.go index eeb49cc7cf..5cd893702d 100644 --- a/tests/integration/repo_wiki_test.go +++ b/tests/integration/repo_wiki_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index 1896971046..dce310b0fc 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/runner_test.go b/tests/integration/runner_test.go index bab2a67230..2ca0a6b996 100644 --- a/tests/integration/runner_test.go +++ b/tests/integration/runner_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/session_test.go b/tests/integration/session_test.go index a5bcab269a..7af5645dec 100644 --- a/tests/integration/session_test.go +++ b/tests/integration/session_test.go @@ -6,10 +6,10 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 5635faad38..66790e5835 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go index f8e2e079ca..dd8322214a 100644 --- a/tests/integration/signin_test.go +++ b/tests/integration/signin_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index 7fd0b5c64a..efcf54f14d 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" ) func TestSignOut(t *testing.T) { diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go index 39533bbf89..91752d415e 100644 --- a/tests/integration/signup_test.go +++ b/tests/integration/signup_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/size_translations_test.go b/tests/integration/size_translations_test.go index a0b88291f4..d34cd0b490 100644 --- a/tests/integration/size_translations_test.go +++ b/tests/integration/size_translations_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go index ebf0d26c2d..aece9c3fd9 100644 --- a/tests/integration/ssh_key_test.go +++ b/tests/integration/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/swagger_test.go b/tests/integration/swagger_test.go index 584601f7f9..ac10a91691 100644 --- a/tests/integration/swagger_test.go +++ b/tests/integration/swagger_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/json" + "forgejo.org/tests" swagger_spec "github.com/go-openapi/spec" "github.com/stretchr/testify/require" diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go index 10e539cbe6..49ae92033e 100644 --- a/tests/integration/timetracking_test.go +++ b/tests/integration/timetracking_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go index a7c0264aaa..b0d930d71f 100644 --- a/tests/integration/user_avatar_test.go +++ b/tests/integration/user_avatar_test.go @@ -12,11 +12,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/avatar" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/user_count_test.go b/tests/integration/user_count_test.go index 8fb78a61ee..5f762ca317 100644 --- a/tests/integration/user_count_test.go +++ b/tests/integration/user_count_test.go @@ -9,15 +9,15 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/user_dashboard_test.go b/tests/integration/user_dashboard_test.go index 20f3f858f9..b95bdab078 100644 --- a/tests/integration/user_dashboard_test.go +++ b/tests/integration/user_dashboard_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - issue_service "code.gitea.io/gitea/services/issue" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + issue_service "forgejo.org/services/issue" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_activity_test.go index f1269e5e93..eb9bfa1741 100644 --- a/tests/integration/user_profile_activity_test.go +++ b/tests/integration/user_profile_activity_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_profile_follows_test.go b/tests/integration/user_profile_follows_test.go index 24b74268e6..08bd58db16 100644 --- a/tests/integration/user_profile_follows_test.go +++ b/tests/integration/user_profile_follows_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_profile_test.go b/tests/integration/user_profile_test.go index 5532403510..04d87c49ab 100644 --- a/tests/integration/user_profile_test.go +++ b/tests/integration/user_profile_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_redirect_test.go b/tests/integration/user_redirect_test.go index 2235876859..52dc5d9d3a 100644 --- a/tests/integration/user_redirect_test.go +++ b/tests/integration/user_redirect_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index 58ab4b52d7..5e02f90f9e 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -15,20 +15,20 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/mailer" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/pquerna/otp/totp" diff --git a/tests/integration/version_test.go b/tests/integration/version_test.go index 144471adb2..9db586ee97 100644 --- a/tests/integration/version_test.go +++ b/tests/integration/version_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/view_test.go b/tests/integration/view_test.go index 41e60b4d9b..80371b84ce 100644 --- a/tests/integration/view_test.go +++ b/tests/integration/view_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go index 18f509aca9..053528d919 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/webhook_test.go b/tests/integration/webhook_test.go index 60d4d48d7c..6d92a16dd8 100644 --- a/tests/integration/webhook_test.go +++ b/tests/integration/webhook_test.go @@ -8,17 +8,17 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/release" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/release" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go index 587b138175..3e4761b9bd 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/wiki_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/git" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go index 6ac5b062f2..2c4934c541 100644 --- a/tests/integration/xss_test.go +++ b/tests/integration/xss_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/test_utils.go b/tests/test_utils.go index c4d87ca619..e6aa9c7963 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -16,27 +16,27 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - wiki_service "code.gitea.io/gitea/services/wiki" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/process" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/routers" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + wiki_service "forgejo.org/services/wiki" "github.com/google/uuid" "github.com/stretchr/testify/assert" From e286457990b54c43248d6e321672e2a6d882503e Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Thu, 27 Mar 2025 20:13:05 +0000 Subject: [PATCH 008/568] [v11.0/forgejo] chore: branding import path (#7354) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7337 - Massive replacement of changing `code.gitea.io/gitea` to `forgejo.org`. - Resolves forgejo/discussions#258 Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7354 Reviewed-by: Gusted Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- .deadcode-out | 108 ++-- .forgejo/testdata/build-release/go.mod | 2 +- .gitignore | 1 + .golangci.yml | 2 +- Dockerfile | 16 +- Dockerfile.rootless | 16 +- Makefile | 42 +- build/backport-locales.go | 4 +- build/code-batch-process.go | 2 +- build/codeformat/formatimports.go | 4 +- build/codeformat/formatimports_test.go | 8 +- build/generate-emoji.go | 2 +- build/generate-gitignores.go | 2 +- build/generate-go-licenses.go | 6 +- build/generate-licenses.go | 2 +- build/lint-locale-usage/lint-locale-usage.go | 8 +- build/lint-locale/lint-locale.go | 2 +- cmd/actions.go | 4 +- cmd/admin.go | 12 +- cmd/admin_auth.go | 6 +- cmd/admin_auth_ldap.go | 4 +- cmd/admin_auth_ldap_test.go | 4 +- cmd/admin_auth_oauth.go | 4 +- cmd/admin_auth_stmp.go | 6 +- cmd/admin_regenerate.go | 6 +- cmd/admin_user_change_password.go | 10 +- cmd/admin_user_create.go | 12 +- cmd/admin_user_delete.go | 6 +- cmd/admin_user_generate_access_token.go | 4 +- cmd/admin_user_list.go | 2 +- cmd/admin_user_must_change_password.go | 2 +- cmd/cmd.go | 8 +- cmd/doctor.go | 14 +- cmd/doctor_convert.go | 6 +- cmd/doctor_test.go | 4 +- cmd/dump.go | 12 +- cmd/dump_repo.go | 16 +- cmd/embedded.go | 14 +- cmd/forgejo/actions.go | 8 +- cmd/forgejo/actions_test.go | 2 +- cmd/forgejo/f3.go | 14 +- cmd/forgejo/forgejo.go | 8 +- cmd/generate.go | 2 +- cmd/hook.go | 12 +- cmd/hook_test.go | 4 +- cmd/keys.go | 4 +- cmd/mailer.go | 4 +- cmd/main.go | 6 +- cmd/main_test.go | 6 +- cmd/manager.go | 2 +- cmd/manager_logging.go | 4 +- cmd/migrate.go | 8 +- cmd/migrate_storage.go | 22 +- cmd/migrate_storage_test.go | 20 +- cmd/restore_repo.go | 4 +- cmd/serv.go | 24 +- cmd/web.go | 16 +- cmd/web_acme.go | 8 +- cmd/web_graceful.go | 6 +- cmd/web_https.go | 6 +- .../environment-to-ini/environment-to-ini.go | 4 +- go.mod | 2 +- main.go | 16 +- models/actions/artifact.go | 6 +- models/actions/forgejo.go | 6 +- models/actions/forgejo_test.go | 6 +- models/actions/main_test.go | 2 +- models/actions/run.go | 18 +- models/actions/run_job.go | 8 +- models/actions/run_job_list.go | 6 +- models/actions/run_list.go | 12 +- models/actions/runner.go | 18 +- models/actions/runner_list.go | 8 +- models/actions/runner_test.go | 6 +- models/actions/runner_token.go | 10 +- models/actions/runner_token_test.go | 4 +- models/actions/schedule.go | 12 +- models/actions/schedule_spec.go | 6 +- models/actions/schedule_spec_list.go | 6 +- models/actions/status.go | 2 +- models/actions/task.go | 14 +- models/actions/task_list.go | 6 +- models/actions/task_output.go | 2 +- models/actions/task_step.go | 4 +- models/actions/tasks_version.go | 6 +- models/actions/utils.go | 6 +- models/actions/utils_test.go | 2 +- models/actions/variable.go | 6 +- models/activities/action.go | 28 +- models/activities/action_list.go | 12 +- models/activities/action_test.go | 14 +- models/activities/main_test.go | 8 +- models/activities/notification.go | 16 +- models/activities/notification_list.go | 16 +- models/activities/notification_test.go | 10 +- models/activities/repo_activity.go | 12 +- models/activities/repo_activity_test.go | 6 +- models/activities/statistic.go | 24 +- models/activities/user_heatmap.go | 10 +- models/activities/user_heatmap_test.go | 12 +- models/admin/task.go | 20 +- models/asymkey/error.go | 2 +- models/asymkey/gpg_key.go | 6 +- models/asymkey/gpg_key_add.go | 4 +- models/asymkey/gpg_key_commit_verification.go | 6 +- models/asymkey/gpg_key_import.go | 2 +- models/asymkey/gpg_key_list.go | 2 +- models/asymkey/gpg_key_object_verification.go | 12 +- models/asymkey/gpg_key_tag_verification.go | 2 +- models/asymkey/gpg_key_test.go | 10 +- models/asymkey/gpg_key_verify.go | 8 +- models/asymkey/main_test.go | 2 +- models/asymkey/ssh_key.go | 14 +- models/asymkey/ssh_key_authorized_keys.go | 8 +- .../asymkey/ssh_key_authorized_principals.go | 8 +- models/asymkey/ssh_key_deploy.go | 6 +- models/asymkey/ssh_key_fingerprint.go | 10 +- models/asymkey/ssh_key_object_verification.go | 6 +- .../ssh_key_object_verification_test.go | 12 +- models/asymkey/ssh_key_parse.go | 8 +- models/asymkey/ssh_key_principals.go | 10 +- models/asymkey/ssh_key_test.go | 6 +- models/asymkey/ssh_key_verify.go | 4 +- models/auth/access_token.go | 8 +- models/auth/access_token_scope.go | 2 +- models/auth/access_token_test.go | 6 +- models/auth/auth_token.go | 6 +- models/auth/main_test.go | 14 +- models/auth/oauth2.go | 10 +- models/auth/oauth2_list.go | 2 +- models/auth/oauth2_test.go | 8 +- models/auth/session.go | 4 +- models/auth/session_test.go | 8 +- models/auth/source.go | 10 +- models/auth/source_test.go | 8 +- models/auth/twofactor.go | 8 +- models/auth/webauthn.go | 6 +- models/auth/webauthn_test.go | 6 +- models/avatars/avatar.go | 8 +- models/avatars/avatar_test.go | 10 +- models/avatars/main_test.go | 8 +- models/db/collation.go | 6 +- models/db/common.go | 4 +- models/db/context_test.go | 4 +- models/db/convert.go | 4 +- models/db/engine.go | 4 +- models/db/engine_test.go | 16 +- models/db/error.go | 2 +- models/db/index.go | 2 +- models/db/index_test.go | 4 +- models/db/install/db.go | 4 +- models/db/iterate.go | 2 +- models/db/iterate_test.go | 6 +- models/db/list.go | 2 +- models/db/list_test.go | 6 +- models/db/log.go | 2 +- models/db/main_test.go | 6 +- models/db/name.go | 2 +- models/db/paginator/main_test.go | 2 +- models/db/paginator/paginator_test.go | 4 +- models/db/sequence.go | 2 +- models/db/sql_postgres_with_schema.go | 2 +- models/dbfs/dbfile.go | 2 +- models/dbfs/dbfs.go | 2 +- models/dbfs/dbfs_test.go | 2 +- models/dbfs/main_test.go | 2 +- models/error.go | 6 +- models/forgefed/federationhost.go | 4 +- models/forgefed/federationhost_repository.go | 4 +- models/forgefed/federationhost_test.go | 2 +- models/forgefed/nodeinfo.go | 2 +- models/forgefed/nodeinfo_test.go | 2 +- models/forgejo/semver/main_test.go | 10 +- models/forgejo/semver/semver.go | 2 +- models/forgejo/semver/semver_test.go | 4 +- models/forgejo_migrations/main_test.go | 2 +- models/forgejo_migrations/migrate.go | 12 +- models/forgejo_migrations/migrate_test.go | 2 +- models/forgejo_migrations/v14.go | 2 +- models/forgejo_migrations/v15.go | 2 +- models/forgejo_migrations/v1_20/v1.go | 2 +- models/forgejo_migrations/v1_20/v3.go | 2 +- models/forgejo_migrations/v1_22/main_test.go | 2 +- models/forgejo_migrations/v1_22/v11.go | 2 +- models/forgejo_migrations/v1_22/v8_test.go | 2 +- models/forgejo_migrations/v25.go | 10 +- models/forgejo_migrations/v25_test.go | 8 +- models/forgejo_migrations/v27.go | 2 +- models/git/branch.go | 16 +- models/git/branch_list.go | 8 +- models/git/branch_test.go | 14 +- models/git/commit_status.go | 20 +- models/git/commit_status_summary.go | 6 +- models/git/commit_status_test.go | 18 +- models/git/lfs.go | 20 +- models/git/lfs_lock.go | 16 +- models/git/lfs_lock_list.go | 6 +- models/git/lfs_test.go | 8 +- models/git/main_test.go | 10 +- models/git/protected_branch.go | 20 +- models/git/protected_branch_list.go | 4 +- models/git/protected_tag.go | 6 +- models/git/protected_tag_test.go | 6 +- models/issues/action_aggregator.go | 4 +- models/issues/assignees.go | 6 +- models/issues/assignees_test.go | 8 +- models/issues/comment.go | 32 +- models/issues/comment_code.go | 8 +- models/issues/comment_list.go | 10 +- models/issues/comment_list_test.go | 8 +- models/issues/comment_test.go | 12 +- models/issues/content_history.go | 10 +- models/issues/content_history_test.go | 8 +- models/issues/dependency.go | 8 +- models/issues/dependency_test.go | 8 +- models/issues/issue.go | 20 +- models/issues/issue_index.go | 2 +- models/issues/issue_index_test.go | 8 +- models/issues/issue_label.go | 6 +- models/issues/issue_label_test.go | 8 +- models/issues/issue_list.go | 10 +- models/issues/issue_list_test.go | 10 +- models/issues/issue_lock.go | 4 +- models/issues/issue_project.go | 12 +- models/issues/issue_project_test.go | 16 +- models/issues/issue_search.go | 14 +- models/issues/issue_stats.go | 2 +- models/issues/issue_stats_test.go | 6 +- models/issues/issue_test.go | 12 +- models/issues/issue_update.go | 28 +- models/issues/issue_user.go | 4 +- models/issues/issue_user_test.go | 8 +- models/issues/issue_watch.go | 8 +- models/issues/issue_watch_test.go | 6 +- models/issues/issue_xref.go | 12 +- models/issues/issue_xref_test.go | 12 +- models/issues/label.go | 10 +- models/issues/label_test.go | 12 +- models/issues/main_test.go | 14 +- models/issues/milestone.go | 12 +- models/issues/milestone_list.go | 4 +- models/issues/milestone_test.go | 16 +- models/issues/pull.go | 22 +- models/issues/pull_list.go | 16 +- models/issues/pull_test.go | 14 +- models/issues/reaction.go | 14 +- models/issues/reaction_test.go | 12 +- models/issues/review.go | 20 +- models/issues/review_list.go | 10 +- models/issues/review_test.go | 10 +- models/issues/stopwatch.go | 10 +- models/issues/stopwatch_test.go | 12 +- models/issues/tracked_time.go | 10 +- models/issues/tracked_time_test.go | 10 +- models/main_test.go | 16 +- models/migrations/base/db.go | 4 +- models/migrations/base/db_test.go | 4 +- models/migrations/base/main_test.go | 2 +- models/migrations/migrations.go | 46 +- models/migrations/migrations_test.go | 2 +- models/migrations/test/tests.go | 16 +- models/migrations/v1_10/v96.go | 4 +- models/migrations/v1_10/v99.go | 2 +- models/migrations/v1_11/v102.go | 2 +- models/migrations/v1_11/v104.go | 2 +- models/migrations/v1_11/v112.go | 4 +- models/migrations/v1_11/v115.go | 8 +- models/migrations/v1_12/v127.go | 2 +- models/migrations/v1_12/v128.go | 6 +- models/migrations/v1_12/v130.go | 4 +- models/migrations/v1_12/v134.go | 6 +- models/migrations/v1_12/v136.go | 8 +- models/migrations/v1_12/v139.go | 2 +- models/migrations/v1_13/v140.go | 4 +- models/migrations/v1_13/v142.go | 2 +- models/migrations/v1_13/v143.go | 2 +- models/migrations/v1_13/v144.go | 2 +- models/migrations/v1_13/v145.go | 2 +- models/migrations/v1_13/v146.go | 2 +- models/migrations/v1_13/v147.go | 2 +- models/migrations/v1_13/v149.go | 2 +- models/migrations/v1_13/v150.go | 4 +- models/migrations/v1_13/v151.go | 4 +- models/migrations/v1_13/v154.go | 2 +- models/migrations/v1_14/main_test.go | 2 +- models/migrations/v1_14/v156.go | 6 +- models/migrations/v1_14/v158.go | 4 +- models/migrations/v1_14/v159.go | 4 +- models/migrations/v1_14/v161.go | 2 +- models/migrations/v1_14/v162.go | 2 +- models/migrations/v1_14/v163.go | 2 +- models/migrations/v1_14/v165.go | 2 +- models/migrations/v1_14/v172.go | 2 +- models/migrations/v1_14/v175.go | 4 +- models/migrations/v1_14/v176_test.go | 2 +- models/migrations/v1_14/v177_test.go | 4 +- models/migrations/v1_15/main_test.go | 2 +- models/migrations/v1_15/v179.go | 2 +- models/migrations/v1_15/v180.go | 4 +- models/migrations/v1_15/v181_test.go | 2 +- models/migrations/v1_15/v182_test.go | 2 +- models/migrations/v1_15/v183.go | 2 +- models/migrations/v1_15/v184.go | 4 +- models/migrations/v1_15/v186.go | 2 +- models/migrations/v1_15/v187.go | 2 +- models/migrations/v1_16/main_test.go | 2 +- models/migrations/v1_16/v189.go | 4 +- models/migrations/v1_16/v189_test.go | 4 +- models/migrations/v1_16/v191.go | 2 +- models/migrations/v1_16/v192.go | 2 +- models/migrations/v1_16/v193_test.go | 2 +- models/migrations/v1_16/v195_test.go | 2 +- models/migrations/v1_16/v198.go | 2 +- models/migrations/v1_16/v205.go | 2 +- models/migrations/v1_16/v210.go | 2 +- models/migrations/v1_16/v210_test.go | 4 +- models/migrations/v1_17/main_test.go | 2 +- models/migrations/v1_17/v212.go | 2 +- models/migrations/v1_17/v215.go | 4 +- models/migrations/v1_17/v217.go | 2 +- models/migrations/v1_17/v218.go | 4 +- models/migrations/v1_17/v219.go | 4 +- models/migrations/v1_17/v220.go | 4 +- models/migrations/v1_17/v221.go | 2 +- models/migrations/v1_17/v221_test.go | 2 +- models/migrations/v1_17/v222.go | 4 +- models/migrations/v1_17/v223.go | 6 +- models/migrations/v1_18/main_test.go | 2 +- models/migrations/v1_18/v225.go | 2 +- models/migrations/v1_18/v227.go | 2 +- models/migrations/v1_18/v228.go | 2 +- models/migrations/v1_18/v229.go | 2 +- models/migrations/v1_18/v229_test.go | 4 +- models/migrations/v1_18/v230_test.go | 2 +- models/migrations/v1_19/main_test.go | 2 +- models/migrations/v1_19/v232.go | 2 +- models/migrations/v1_19/v233.go | 8 +- models/migrations/v1_19/v233_test.go | 10 +- models/migrations/v1_19/v234.go | 2 +- models/migrations/v1_19/v236.go | 2 +- models/migrations/v1_19/v238.go | 2 +- models/migrations/v1_19/v240.go | 4 +- models/migrations/v1_19/v242.go | 2 +- models/migrations/v1_20/main_test.go | 2 +- models/migrations/v1_20/v245.go | 4 +- models/migrations/v1_20/v247.go | 2 +- models/migrations/v1_20/v249.go | 2 +- models/migrations/v1_20/v250.go | 2 +- models/migrations/v1_20/v251.go | 2 +- models/migrations/v1_20/v252.go | 2 +- models/migrations/v1_20/v253.go | 2 +- models/migrations/v1_20/v255.go | 2 +- models/migrations/v1_20/v257.go | 2 +- models/migrations/v1_20/v259.go | 2 +- models/migrations/v1_20/v259_test.go | 2 +- models/migrations/v1_21/main_test.go | 2 +- models/migrations/v1_21/v260.go | 2 +- models/migrations/v1_21/v261.go | 2 +- models/migrations/v1_21/v264.go | 4 +- models/migrations/v1_21/v267.go | 2 +- models/migrations/v1_21/v271.go | 2 +- models/migrations/v1_21/v273.go | 2 +- models/migrations/v1_21/v274.go | 2 +- models/migrations/v1_21/v276.go | 4 +- models/migrations/v1_22/main_test.go | 2 +- models/migrations/v1_22/v281.go | 2 +- models/migrations/v1_22/v283_test.go | 2 +- models/migrations/v1_22/v286.go | 4 +- models/migrations/v1_22/v286_test.go | 2 +- models/migrations/v1_22/v288.go | 2 +- models/migrations/v1_22/v290.go | 4 +- models/migrations/v1_22/v290_test.go | 6 +- models/migrations/v1_22/v293.go | 4 +- models/migrations/v1_22/v293_test.go | 6 +- models/migrations/v1_22/v294_test.go | 2 +- models/migrations/v1_23/main_test.go | 2 +- models/migrations/v1_23/v302.go | 2 +- models/migrations/v1_23/v303.go | 2 +- models/migrations/v1_23/v303_test.go | 2 +- models/migrations/v1_6/v70.go | 2 +- models/migrations/v1_6/v71.go | 6 +- models/migrations/v1_6/v72.go | 2 +- models/migrations/v1_8/v76.go | 2 +- models/migrations/v1_8/v78.go | 2 +- models/migrations/v1_8/v79.go | 2 +- models/migrations/v1_9/v82.go | 4 +- models/migrations/v1_9/v83.go | 2 +- models/migrations/v1_9/v85.go | 8 +- models/org.go | 8 +- models/org_team.go | 20 +- models/org_team_test.go | 14 +- models/org_test.go | 8 +- models/organization/main_test.go | 16 +- models/organization/org.go | 22 +- models/organization/org_list.go | 8 +- models/organization/org_list_test.go | 8 +- models/organization/org_repo.go | 4 +- models/organization/org_test.go | 16 +- models/organization/org_user.go | 8 +- models/organization/org_user_test.go | 10 +- models/organization/team.go | 14 +- models/organization/team_invite.go | 8 +- models/organization/team_invite_test.go | 8 +- models/organization/team_list.go | 8 +- models/organization/team_repo.go | 6 +- models/organization/team_test.go | 10 +- models/organization/team_unit.go | 6 +- models/organization/team_user.go | 4 +- models/packages/alpine/search.go | 4 +- models/packages/alt/search.go | 4 +- models/packages/conan/references.go | 10 +- models/packages/conan/search.go | 8 +- models/packages/conda/search.go | 6 +- models/packages/container/search.go | 10 +- models/packages/cran/search.go | 6 +- models/packages/debian/search.go | 8 +- models/packages/debian/search_test.go | 24 +- models/packages/descriptor.go | 48 +- models/packages/nuget/search.go | 4 +- models/packages/package.go | 4 +- models/packages/package_blob.go | 14 +- models/packages/package_blob_upload.go | 6 +- models/packages/package_cleanup_rule.go | 6 +- models/packages/package_file.go | 6 +- models/packages/package_property.go | 2 +- models/packages/package_test.go | 18 +- models/packages/package_version.go | 8 +- models/packages/rpm/search.go | 4 +- models/perm/access/access.go | 10 +- models/perm/access/access_test.go | 12 +- models/perm/access/main_test.go | 14 +- models/perm/access/repo_permission.go | 14 +- models/project/column.go | 8 +- models/project/column_test.go | 4 +- models/project/issue.go | 6 +- models/project/main_test.go | 4 +- models/project/project.go | 16 +- models/project/project_test.go | 6 +- models/pull/automerge.go | 8 +- models/pull/review_state.go | 6 +- models/quota/default.go | 2 +- models/quota/group.go | 6 +- models/quota/quota.go | 4 +- models/quota/quota_group_test.go | 2 +- models/quota/quota_rule_test.go | 2 +- models/quota/rule.go | 2 +- models/quota/used.go | 8 +- models/repo.go | 16 +- models/repo/archive_download_count.go | 6 +- models/repo/archive_download_count_test.go | 8 +- models/repo/archiver.go | 8 +- models/repo/attachment.go | 12 +- models/repo/attachment_test.go | 6 +- models/repo/avatar.go | 10 +- models/repo/collaboration.go | 10 +- models/repo/collaboration_test.go | 12 +- models/repo/following_repo.go | 2 +- models/repo/following_repo_test.go | 2 +- models/repo/fork.go | 6 +- models/repo/fork_test.go | 6 +- models/repo/git.go | 2 +- models/repo/issue.go | 6 +- models/repo/language_stats.go | 4 +- models/repo/main_test.go | 16 +- models/repo/mirror.go | 8 +- models/repo/pushmirror.go | 16 +- models/repo/pushmirror_test.go | 8 +- models/repo/redirect.go | 4 +- models/repo/redirect_test.go | 6 +- models/repo/release.go | 14 +- models/repo/release_list.go | 2 +- models/repo/release_list_test.go | 2 +- models/repo/release_test.go | 4 +- models/repo/repo.go | 24 +- models/repo/repo_flags.go | 2 +- models/repo/repo_flags_test.go | 6 +- models/repo/repo_indexer.go | 2 +- models/repo/repo_list.go | 18 +- models/repo/repo_list_test.go | 14 +- models/repo/repo_repository.go | 4 +- models/repo/repo_test.go | 18 +- models/repo/repo_unit.go | 14 +- models/repo/repo_unit_test.go | 6 +- models/repo/search.go | 2 +- models/repo/star.go | 6 +- models/repo/star_test.go | 6 +- models/repo/topic.go | 6 +- models/repo/topic_test.go | 6 +- models/repo/update.go | 8 +- models/repo/upload.go | 8 +- models/repo/user_repo.go | 12 +- models/repo/user_repo_test.go | 8 +- models/repo/watch.go | 8 +- models/repo/watch_test.go | 8 +- models/repo/wiki.go | 6 +- models/repo/wiki_test.go | 6 +- models/repo_test.go | 6 +- models/repo_transfer.go | 12 +- models/repo_transfer_test.go | 6 +- models/secret/secret.go | 16 +- models/shared/types/ownertype.go | 2 +- models/system/appstate.go | 2 +- models/system/main_test.go | 12 +- models/system/notice.go | 10 +- models/system/notice_test.go | 6 +- models/system/setting.go | 8 +- models/system/setting_test.go | 6 +- models/unit/unit.go | 8 +- models/unit/unit_test.go | 2 +- models/unittest/consistency.go | 2 +- models/unittest/fixtures.go | 6 +- models/unittest/mock_http.go | 2 +- models/unittest/testdb.go | 18 +- models/unittest/unit_tests.go | 2 +- models/user/avatar.go | 12 +- models/user/avatar_test.go | 10 +- models/user/badge.go | 2 +- models/user/block.go | 4 +- models/user/block_test.go | 6 +- models/user/email_address.go | 10 +- models/user/email_address_test.go | 8 +- models/user/error.go | 2 +- models/user/external_login_user.go | 4 +- models/user/federated_user.go | 2 +- models/user/federated_user_test.go | 2 +- models/user/follow.go | 4 +- models/user/follow_test.go | 6 +- models/user/list.go | 4 +- models/user/main_test.go | 10 +- models/user/must_change_password.go | 4 +- models/user/openid.go | 4 +- models/user/openid_test.go | 6 +- models/user/redirect.go | 8 +- models/user/redirect_test.go | 6 +- models/user/search.go | 8 +- models/user/setting.go | 8 +- models/user/setting_test.go | 6 +- models/user/user.go | 28 +- models/user/user_repository.go | 6 +- models/user/user_system.go | 4 +- models/user/user_test.go | 28 +- models/user/user_update.go | 2 +- models/webhook/hooktask.go | 12 +- models/webhook/main_test.go | 2 +- models/webhook/webhook.go | 18 +- models/webhook/webhook_system.go | 2 +- models/webhook/webhook_test.go | 12 +- modules/actions/github.go | 2 +- modules/actions/github_test.go | 2 +- modules/actions/log.go | 8 +- modules/actions/task_state.go | 2 +- modules/actions/task_state_test.go | 2 +- modules/actions/workflows.go | 8 +- modules/actions/workflows_test.go | 6 +- modules/activitypub/client.go | 8 +- modules/activitypub/client_test.go | 10 +- modules/activitypub/main_test.go | 10 +- modules/activitypub/user_settings.go | 4 +- modules/activitypub/user_settings_test.go | 8 +- modules/assetfs/layered.go | 8 +- modules/auth/common.go | 4 +- modules/auth/password/hash/argon2.go | 2 +- modules/auth/password/hash/common.go | 2 +- modules/auth/password/hash/hash.go | 2 +- modules/auth/password/hash/pbkdf2.go | 2 +- modules/auth/password/hash/scrypt.go | 2 +- modules/auth/password/password.go | 4 +- modules/auth/password/pwn.go | 4 +- modules/auth/password/pwn/pwn.go | 2 +- modules/auth/webauthn/webauthn.go | 8 +- modules/auth/webauthn/webauthn_test.go | 2 +- modules/avatar/avatar.go | 4 +- modules/avatar/avatar_test.go | 2 +- modules/avatar/hash_test.go | 2 +- modules/base/tool.go | 4 +- modules/cache/cache.go | 2 +- modules/cache/cache_redis.go | 4 +- modules/cache/cache_test.go | 2 +- modules/cache/cache_twoqueue.go | 2 +- modules/cache/context.go | 2 +- modules/card/card.go | 6 +- modules/card/card_test.go | 4 +- modules/charset/ambiguous.go | 2 +- modules/charset/ambiguous/generate.go | 2 +- modules/charset/charset.go | 6 +- modules/charset/charset_test.go | 2 +- modules/charset/escape.go | 6 +- modules/charset/escape_stream.go | 2 +- modules/charset/escape_test.go | 6 +- modules/csv/csv.go | 6 +- modules/csv/csv_test.go | 6 +- modules/eventsource/event.go | 2 +- modules/eventsource/manager_run.go | 18 +- modules/forgefed/activity_like.go | 2 +- modules/forgefed/activity_like_test.go | 2 +- modules/forgefed/activity_undo_like.go | 2 +- modules/forgefed/activity_undo_like_test.go | 2 +- .../activity_validateandcheckerror_test.go | 2 +- modules/forgefed/actor.go | 2 +- modules/forgefed/actor_test.go | 4 +- modules/forgefed/repository_test.go | 2 +- modules/generate/generate.go | 2 +- modules/git/batch_reader.go | 2 +- modules/git/blame.go | 4 +- modules/git/blob.go | 6 +- modules/git/command.go | 8 +- modules/git/commit.go | 4 +- modules/git/commit_info.go | 2 +- modules/git/diff.go | 2 +- modules/git/error.go | 2 +- modules/git/foreachref/format_test.go | 2 +- modules/git/foreachref/parser_test.go | 4 +- modules/git/git.go | 4 +- modules/git/git_test.go | 4 +- modules/git/grep.go | 4 +- modules/git/hook.go | 4 +- modules/git/last_commit_cache.go | 4 +- modules/git/log_name_status.go | 2 +- modules/git/notes.go | 2 +- modules/git/notes_test.go | 4 +- modules/git/parse.go | 2 +- modules/git/pipeline/catfile.go | 4 +- modules/git/pipeline/lfs.go | 2 +- modules/git/pipeline/namerev.go | 2 +- modules/git/pipeline/revlist.go | 4 +- modules/git/ref.go | 2 +- modules/git/remote.go | 2 +- modules/git/repo.go | 6 +- modules/git/repo_attribute.go | 2 +- modules/git/repo_attribute_test.go | 2 +- modules/git/repo_base.go | 2 +- modules/git/repo_branch.go | 2 +- modules/git/repo_commit.go | 6 +- modules/git/repo_commit_test.go | 4 +- modules/git/repo_compare.go | 2 +- modules/git/repo_gpg.go | 2 +- modules/git/repo_index.go | 4 +- modules/git/repo_language_stats.go | 6 +- modules/git/repo_ref.go | 2 +- modules/git/repo_stats.go | 2 +- modules/git/repo_tag.go | 6 +- modules/git/signature.go | 4 +- modules/git/tag.go | 4 +- modules/git/tree_entry.go | 2 +- modules/gitrepo/branch.go | 2 +- modules/gitrepo/gitrepo.go | 4 +- modules/gitrepo/walk.go | 2 +- modules/graceful/manager.go | 6 +- modules/graceful/manager_unix.go | 8 +- modules/graceful/net_unix.go | 6 +- modules/graceful/server.go | 6 +- modules/graceful/server_hooks.go | 2 +- modules/hcaptcha/hcaptcha.go | 4 +- modules/highlight/highlight.go | 8 +- modules/httpcache/httpcache.go | 2 +- modules/httplib/serve.go | 14 +- modules/httplib/url.go | 2 +- modules/httplib/url_test.go | 4 +- modules/indexer/code/bleve/bleve.go | 24 +- .../code/elasticsearch/elasticsearch.go | 26 +- modules/indexer/code/git.go | 10 +- modules/indexer/code/indexer.go | 20 +- modules/indexer/code/indexer_test.go | 20 +- modules/indexer/code/internal/indexer.go | 6 +- modules/indexer/code/internal/model.go | 2 +- modules/indexer/code/internal/util.go | 2 +- modules/indexer/code/search.go | 8 +- modules/indexer/internal/bleve/indexer.go | 4 +- modules/indexer/internal/bleve/metadata.go | 2 +- modules/indexer/internal/bleve/query.go | 2 +- modules/indexer/internal/bleve/util.go | 4 +- modules/indexer/internal/db/indexer.go | 2 +- .../indexer/internal/elasticsearch/indexer.go | 2 +- .../indexer/internal/elasticsearch/util.go | 2 +- modules/indexer/internal/meilisearch/util.go | 2 +- modules/indexer/internal/paginator.go | 2 +- modules/indexer/issues/bleve/bleve.go | 6 +- modules/indexer/issues/bleve/bleve_test.go | 2 +- modules/indexer/issues/db/db.go | 10 +- modules/indexer/issues/db/options.go | 10 +- modules/indexer/issues/dboptions.go | 6 +- .../issues/elasticsearch/elasticsearch.go | 8 +- .../elasticsearch/elasticsearch_test.go | 2 +- modules/indexer/issues/indexer.go | 26 +- modules/indexer/issues/indexer_test.go | 20 +- modules/indexer/issues/internal/indexer.go | 2 +- modules/indexer/issues/internal/model.go | 6 +- .../indexer/issues/internal/tests/tests.go | 8 +- .../indexer/issues/meilisearch/meilisearch.go | 6 +- .../issues/meilisearch/meilisearch_test.go | 4 +- modules/indexer/issues/util.go | 12 +- modules/indexer/stats/db.go | 14 +- modules/indexer/stats/indexer.go | 8 +- modules/indexer/stats/indexer_test.go | 18 +- modules/indexer/stats/queue.go | 10 +- modules/issue/template/template.go | 4 +- modules/issue/template/template_test.go | 4 +- modules/issue/template/unmarshal.go | 10 +- modules/keying/keying_test.go | 2 +- modules/label/parser.go | 2 +- modules/lfs/content_store.go | 4 +- modules/lfs/endpoint.go | 4 +- modules/lfs/filesystem_client.go | 2 +- modules/lfs/http_client.go | 8 +- modules/lfs/http_client_test.go | 6 +- modules/lfs/pointer_scanner.go | 4 +- modules/lfs/shared.go | 2 +- modules/lfs/transferadapter.go | 4 +- modules/lfs/transferadapter_test.go | 2 +- modules/log/event_writer_buffer_test.go | 2 +- modules/log/event_writer_file.go | 2 +- modules/log/flags.go | 2 +- modules/log/flags_test.go | 2 +- modules/log/init.go | 4 +- modules/log/level.go | 2 +- modules/log/level_test.go | 2 +- modules/log/logger_impl.go | 4 +- modules/markup/asciicast/asciicast.go | 4 +- modules/markup/camo.go | 4 +- modules/markup/camo_test.go | 2 +- modules/markup/console/console.go | 4 +- modules/markup/console/console_test.go | 4 +- modules/markup/csv/csv.go | 10 +- modules/markup/csv/csv_test.go | 4 +- modules/markup/external/external.go | 12 +- modules/markup/file_preview.go | 10 +- modules/markup/html.go | 22 +- modules/markup/html_internal_test.go | 6 +- modules/markup/html_test.go | 20 +- modules/markup/markdown/callout/github.go | 2 +- .../markup/markdown/callout/github_legacy.go | 2 +- modules/markup/markdown/goldmark.go | 4 +- modules/markup/markdown/markdown.go | 14 +- modules/markup/markdown/markdown_test.go | 16 +- modules/markup/markdown/prefixed_id.go | 6 +- modules/markup/markdown/renderconfig.go | 2 +- modules/markup/markdown/toc.go | 4 +- modules/markup/markdown/transform_codespan.go | 4 +- modules/markup/markdown/transform_heading.go | 6 +- modules/markup/markdown/transform_image.go | 4 +- modules/markup/markdown/transform_link.go | 6 +- modules/markup/markdown/transform_list.go | 2 +- modules/markup/mdstripper/mdstripper.go | 6 +- modules/markup/orgmode/orgmode.go | 10 +- modules/markup/orgmode/orgmode_test.go | 8 +- modules/markup/renderer.go | 6 +- modules/markup/sanitizer.go | 2 +- modules/mcaptcha/mcaptcha.go | 2 +- modules/metrics/collector.go | 6 +- modules/migration/downloader.go | 2 +- modules/migration/file_format.go | 4 +- modules/migration/options.go | 2 +- modules/migration/pullrequest.go | 2 +- modules/nosql/manager.go | 2 +- modules/nosql/manager_leveldb.go | 2 +- modules/nosql/manager_redis.go | 2 +- modules/optional/option_test.go | 2 +- modules/optional/serialization.go | 2 +- modules/optional/serialization_test.go | 4 +- modules/options/base.go | 4 +- modules/options/dynamic.go | 4 +- modules/options/static.go | 2 +- modules/packages/alpine/metadata.go | 4 +- modules/packages/arch/metadata.go | 6 +- modules/packages/arch/metadata_test.go | 2 +- modules/packages/cargo/parser.go | 4 +- modules/packages/chef/metadata.go | 6 +- modules/packages/composer/metadata.go | 6 +- modules/packages/composer/metadata_test.go | 2 +- modules/packages/conan/conaninfo_parser.go | 2 +- modules/packages/conan/reference.go | 4 +- modules/packages/conda/metadata.go | 8 +- modules/packages/conda/metadata_test.go | 2 +- modules/packages/container/metadata.go | 6 +- modules/packages/container/metadata_test.go | 2 +- modules/packages/content_store.go | 6 +- modules/packages/cran/metadata.go | 2 +- modules/packages/debian/metadata.go | 6 +- modules/packages/debian/metadata_test.go | 2 +- modules/packages/goproxy/metadata.go | 2 +- modules/packages/hashed_buffer.go | 2 +- modules/packages/helm/metadata.go | 4 +- modules/packages/maven/metadata.go | 4 +- modules/packages/npm/creator.go | 6 +- modules/packages/npm/creator_test.go | 2 +- modules/packages/nuget/metadata.go | 4 +- modules/packages/nuget/symbol_extractor.go | 4 +- modules/packages/pub/metadata.go | 4 +- modules/packages/rpm/metadata.go | 4 +- modules/packages/rubygems/marshal.go | 2 +- modules/packages/rubygems/metadata.go | 4 +- modules/packages/swift/metadata.go | 6 +- modules/packages/vagrant/metadata.go | 4 +- modules/packages/vagrant/metadata_test.go | 2 +- modules/pprof/pprof.go | 2 +- modules/private/actions.go | 2 +- modules/private/hook.go | 8 +- modules/private/internal.go | 10 +- modules/private/key.go | 2 +- modules/private/mail.go | 2 +- modules/private/manager.go | 2 +- modules/private/request.go | 4 +- modules/private/restore_repo.go | 2 +- modules/private/serv.go | 8 +- modules/proxy/proxy.go | 4 +- modules/proxyprotocol/conn.go | 2 +- modules/public/public.go | 12 +- modules/public/public_test.go | 2 +- modules/public/serve_dynamic.go | 4 +- modules/public/serve_static.go | 4 +- modules/queue/base_channel.go | 2 +- modules/queue/base_levelqueue.go | 4 +- modules/queue/base_levelqueue_common.go | 2 +- modules/queue/base_levelqueue_test.go | 4 +- modules/queue/base_levelqueue_unique.go | 4 +- modules/queue/base_redis.go | 6 +- modules/queue/base_redis_test.go | 4 +- modules/queue/base_redis_with_server_test.go | 4 +- modules/queue/config.go | 2 +- modules/queue/manager.go | 4 +- modules/queue/manager_test.go | 2 +- modules/queue/mock/redisuniversalclient.go | 4 +- modules/queue/queue.go | 2 +- modules/queue/workergroup.go | 2 +- modules/queue/workerqueue.go | 8 +- modules/queue/workerqueue_test.go | 4 +- modules/recaptcha/recaptcha.go | 6 +- modules/references/references.go | 8 +- modules/references/references_test.go | 2 +- modules/regexplru/regexplru.go | 2 +- modules/repository/branch.go | 16 +- modules/repository/branch_test.go | 8 +- modules/repository/collaborator.go | 10 +- modules/repository/collaborator_test.go | 16 +- modules/repository/commits.go | 14 +- modules/repository/commits_test.go | 10 +- modules/repository/create.go | 32 +- modules/repository/create_test.go | 8 +- modules/repository/delete.go | 6 +- modules/repository/env.go | 6 +- modules/repository/fork.go | 6 +- modules/repository/hooks.go | 4 +- modules/repository/init.go | 16 +- modules/repository/license.go | 2 +- modules/repository/main_test.go | 6 +- modules/repository/push.go | 2 +- modules/repository/repo.go | 22 +- modules/repository/repo_test.go | 2 +- modules/repository/temp.go | 6 +- modules/session/db.go | 6 +- modules/session/redis.go | 4 +- modules/session/virtual.go | 4 +- modules/setting/admin.go | 2 +- modules/setting/admin_test.go | 2 +- modules/setting/api.go | 2 +- modules/setting/cache.go | 2 +- modules/setting/camo.go | 2 +- modules/setting/config.go | 4 +- modules/setting/config/value.go | 6 +- modules/setting/config_env.go | 2 +- modules/setting/config_provider.go | 4 +- modules/setting/f3.go | 2 +- modules/setting/federation.go | 2 +- modules/setting/git.go | 2 +- modules/setting/incoming_email.go | 2 +- modules/setting/indexer.go | 2 +- modules/setting/lfs.go | 2 +- modules/setting/log.go | 4 +- modules/setting/log_test.go | 4 +- modules/setting/mailer.go | 2 +- modules/setting/markup.go | 2 +- modules/setting/mirror.go | 2 +- modules/setting/oauth2.go | 4 +- modules/setting/oauth2_test.go | 4 +- modules/setting/other.go | 2 +- modules/setting/path.go | 2 +- modules/setting/proxy.go | 2 +- modules/setting/queue.go | 4 +- modules/setting/repository.go | 2 +- modules/setting/security.go | 8 +- modules/setting/server.go | 6 +- modules/setting/server_test.go | 2 +- modules/setting/service.go | 4 +- modules/setting/service_test.go | 2 +- modules/setting/session.go | 4 +- modules/setting/setting.go | 6 +- modules/setting/setting_test.go | 2 +- modules/setting/ssh.go | 4 +- modules/setting/time.go | 2 +- modules/setting/ui.go | 4 +- modules/setting/webhook.go | 2 +- modules/ssh/init.go | 4 +- modules/ssh/ssh.go | 12 +- modules/ssh/ssh_graceful.go | 6 +- modules/storage/local.go | 6 +- modules/storage/local_test.go | 2 +- modules/storage/minio.go | 6 +- modules/storage/minio_test.go | 2 +- modules/storage/storage.go | 4 +- modules/storage/storage_test.go | 2 +- modules/structs/attachment.go | 2 +- modules/structs/hook.go | 2 +- modules/structs/user.go | 2 +- modules/svg/svg.go | 6 +- modules/sync/status_pool.go | 2 +- modules/system/appstate_test.go | 4 +- modules/system/db.go | 6 +- modules/templates/base.go | 4 +- modules/templates/dynamic.go | 4 +- modules/templates/eval/eval.go | 2 +- modules/templates/helper.go | 16 +- modules/templates/htmlrenderer.go | 12 +- modules/templates/htmlrenderer_test.go | 2 +- modules/templates/mailer.go | 6 +- modules/templates/main_test.go | 10 +- modules/templates/static.go | 4 +- modules/templates/util_avatar.go | 14 +- modules/templates/util_date.go | 6 +- modules/templates/util_date_test.go | 6 +- modules/templates/util_dict.go | 6 +- modules/templates/util_json.go | 2 +- modules/templates/util_misc.go | 16 +- modules/templates/util_render.go | 16 +- modules/templates/util_render_test.go | 8 +- modules/templates/util_string.go | 2 +- modules/test/logchecker.go | 2 +- modules/test/logchecker_test.go | 2 +- modules/test/utils.go | 2 +- modules/testlogger/testlogger.go | 6 +- modules/timeutil/executable.go | 2 +- modules/timeutil/since.go | 2 +- modules/timeutil/since_test.go | 4 +- modules/timeutil/timestamp.go | 2 +- modules/timeutil/timestampnano.go | 2 +- modules/translation/i18n/dummy_test.go | 2 +- modules/translation/i18n/errors.go | 2 +- modules/translation/i18n/localestore.go | 8 +- modules/translation/plural_rules.go | 4 +- modules/translation/translation.go | 10 +- modules/translation/translation_test.go | 2 +- modules/turnstile/turnstile.go | 4 +- modules/typesniffer/typesniffer.go | 2 +- modules/updatechecker/update_checker.go | 8 +- modules/util/rotatingfilewriter/writer.go | 4 +- modules/util/util.go | 2 +- modules/util/util_test.go | 6 +- modules/validation/binding.go | 6 +- modules/validation/email.go | 4 +- modules/validation/helpers.go | 2 +- modules/validation/helpers_test.go | 2 +- modules/validation/validatable.go | 2 +- modules/validation/validatable_test.go | 2 +- modules/web/handler.go | 6 +- modules/web/middleware/binding.go | 8 +- modules/web/middleware/cookie.go | 4 +- modules/web/middleware/data.go | 2 +- modules/web/middleware/locale.go | 4 +- modules/web/route.go | 2 +- modules/web/routemock.go | 2 +- modules/web/routemock_test.go | 2 +- modules/web/routing/logger.go | 4 +- modules/web/routing/logger_manager.go | 4 +- routers/api/actions/actions.go | 6 +- routers/api/actions/artifacts.go | 24 +- routers/api/actions/artifacts_chunks.go | 8 +- routers/api/actions/artifacts_utils.go | 6 +- routers/api/actions/artifactsv4.go | 20 +- routers/api/actions/ping/ping.go | 2 +- routers/api/actions/runner/interceptor.go | 10 +- routers/api/actions/runner/main_test.go | 4 +- routers/api/actions/runner/runner.go | 14 +- routers/api/forgejo/v1/api.go | 4 +- routers/api/forgejo/v1/forgejo.go | 4 +- routers/api/packages/alpine/alpine.go | 20 +- routers/api/packages/alt/alt.go | 24 +- routers/api/packages/api.go | 62 +-- routers/api/packages/arch/arch.go | 18 +- routers/api/packages/cargo/cargo.go | 28 +- routers/api/packages/chef/auth.go | 8 +- routers/api/packages/chef/chef.go | 20 +- routers/api/packages/composer/api.go | 4 +- routers/api/packages/composer/composer.go | 22 +- routers/api/packages/conan/auth.go | 8 +- routers/api/packages/conan/conan.go | 28 +- routers/api/packages/conan/search.go | 10 +- routers/api/packages/conda/conda.go | 20 +- routers/api/packages/container/auth.go | 8 +- routers/api/packages/container/blob.go | 16 +- routers/api/packages/container/container.go | 28 +- routers/api/packages/container/manifest.go | 22 +- routers/api/packages/cran/cran.go | 16 +- routers/api/packages/debian/debian.go | 20 +- routers/api/packages/generic/generic.go | 12 +- routers/api/packages/goproxy/goproxy.go | 16 +- routers/api/packages/helm/helm.go | 22 +- routers/api/packages/helper/helper.go | 8 +- routers/api/packages/maven/api.go | 4 +- routers/api/packages/maven/maven.go | 18 +- routers/api/packages/npm/api.go | 6 +- routers/api/packages/npm/npm.go | 26 +- routers/api/packages/nuget/api_v2.go | 4 +- routers/api/packages/nuget/api_v3.go | 4 +- routers/api/packages/nuget/auth.go | 10 +- routers/api/packages/nuget/nuget.go | 24 +- routers/api/packages/pub/pub.go | 20 +- routers/api/packages/pypi/pypi.go | 16 +- routers/api/packages/rpm/rpm.go | 24 +- routers/api/packages/rubygems/rubygems.go | 16 +- routers/api/packages/swift/swift.go | 22 +- routers/api/packages/vagrant/vagrant.go | 14 +- routers/api/shared/middleware.go | 10 +- routers/api/v1/activitypub/actor.go | 10 +- routers/api/v1/activitypub/person.go | 8 +- routers/api/v1/activitypub/repository.go | 12 +- routers/api/v1/activitypub/repository_test.go | 2 +- routers/api/v1/activitypub/reqsignature.go | 10 +- routers/api/v1/activitypub/response.go | 8 +- routers/api/v1/admin/adopt.go | 12 +- routers/api/v1/admin/cron.go | 12 +- routers/api/v1/admin/email.go | 10 +- routers/api/v1/admin/hooks.go | 16 +- routers/api/v1/admin/org.go | 16 +- routers/api/v1/admin/quota.go | 6 +- routers/api/v1/admin/quota_group.go | 12 +- routers/api/v1/admin/quota_rule.go | 10 +- routers/api/v1/admin/repo.go | 8 +- routers/api/v1/admin/runners.go | 4 +- routers/api/v1/admin/user.go | 40 +- routers/api/v1/api.go | 60 +-- routers/api/v1/misc/gitignore.go | 10 +- routers/api/v1/misc/label_templates.go | 8 +- routers/api/v1/misc/licenses.go | 12 +- routers/api/v1/misc/markup.go | 12 +- routers/api/v1/misc/markup_test.go | 10 +- routers/api/v1/misc/nodeinfo.go | 10 +- routers/api/v1/misc/signing.go | 4 +- routers/api/v1/misc/version.go | 6 +- routers/api/v1/notify/notifications.go | 10 +- routers/api/v1/notify/repo.go | 10 +- routers/api/v1/notify/threads.go | 10 +- routers/api/v1/notify/user.go | 10 +- routers/api/v1/org/action.go | 22 +- routers/api/v1/org/avatar.go | 8 +- routers/api/v1/org/hook.go | 10 +- routers/api/v1/org/label.go | 14 +- routers/api/v1/org/member.go | 16 +- routers/api/v1/org/org.go | 30 +- routers/api/v1/org/quota.go | 4 +- routers/api/v1/org/team.go | 32 +- routers/api/v1/packages/package.go | 18 +- routers/api/v1/repo/action.go | 24 +- routers/api/v1/repo/avatar.go | 8 +- routers/api/v1/repo/blob.go | 4 +- routers/api/v1/repo/branch.go | 32 +- routers/api/v1/repo/collaborators.go | 24 +- routers/api/v1/repo/commits.go | 16 +- routers/api/v1/repo/compare.go | 10 +- routers/api/v1/repo/download.go | 8 +- routers/api/v1/repo/file.go | 34 +- routers/api/v1/repo/flags.go | 6 +- routers/api/v1/repo/fork.go | 26 +- routers/api/v1/repo/git_hook.go | 10 +- routers/api/v1/repo/git_ref.go | 8 +- routers/api/v1/repo/hook.go | 26 +- routers/api/v1/repo/hook_test.go | 6 +- routers/api/v1/repo/issue.go | 34 +- routers/api/v1/repo/issue_attachment.go | 22 +- routers/api/v1/repo/issue_comment.go | 24 +- .../api/v1/repo/issue_comment_attachment.go | 22 +- routers/api/v1/repo/issue_dependency.go | 18 +- routers/api/v1/repo/issue_label.go | 12 +- routers/api/v1/repo/issue_pin.go | 8 +- routers/api/v1/repo/issue_reaction.go | 16 +- routers/api/v1/repo/issue_stopwatch.go | 8 +- routers/api/v1/repo/issue_subscription.go | 12 +- routers/api/v1/repo/issue_tracked_time.go | 18 +- routers/api/v1/repo/key.go | 24 +- routers/api/v1/repo/label.go | 14 +- routers/api/v1/repo/language.go | 6 +- routers/api/v1/repo/main_test.go | 6 +- routers/api/v1/repo/migrate.go | 44 +- routers/api/v1/repo/milestone.go | 18 +- routers/api/v1/repo/mirror.go | 30 +- routers/api/v1/repo/notes.go | 10 +- routers/api/v1/repo/patch.go | 16 +- routers/api/v1/repo/pull.go | 58 +-- routers/api/v1/repo/pull_review.go | 24 +- routers/api/v1/repo/release.go | 24 +- routers/api/v1/repo/release_attachment.go | 18 +- routers/api/v1/repo/release_tags.go | 10 +- routers/api/v1/repo/repo.go | 52 +- routers/api/v1/repo/repo_test.go | 10 +- routers/api/v1/repo/star.go | 10 +- routers/api/v1/repo/status.go | 16 +- routers/api/v1/repo/subscriber.go | 10 +- routers/api/v1/repo/tag.go | 22 +- routers/api/v1/repo/teams.go | 10 +- routers/api/v1/repo/topic.go | 14 +- routers/api/v1/repo/transfer.go | 26 +- routers/api/v1/repo/tree.go | 4 +- routers/api/v1/repo/wiki.go | 22 +- routers/api/v1/settings/settings.go | 6 +- routers/api/v1/shared/quota.go | 8 +- routers/api/v1/shared/runners.go | 10 +- routers/api/v1/swagger/action.go | 2 +- routers/api/v1/swagger/activity.go | 2 +- routers/api/v1/swagger/activitypub.go | 2 +- routers/api/v1/swagger/app.go | 2 +- routers/api/v1/swagger/cron.go | 2 +- routers/api/v1/swagger/issue.go | 2 +- routers/api/v1/swagger/key.go | 2 +- routers/api/v1/swagger/misc.go | 2 +- routers/api/v1/swagger/nodeinfo.go | 2 +- routers/api/v1/swagger/notify.go | 2 +- routers/api/v1/swagger/options.go | 6 +- routers/api/v1/swagger/org.go | 2 +- routers/api/v1/swagger/package.go | 2 +- routers/api/v1/swagger/quota.go | 2 +- routers/api/v1/swagger/repo.go | 2 +- routers/api/v1/swagger/settings.go | 2 +- routers/api/v1/swagger/user.go | 4 +- routers/api/v1/user/action.go | 18 +- routers/api/v1/user/app.go | 14 +- routers/api/v1/user/avatar.go | 8 +- routers/api/v1/user/email.go | 14 +- routers/api/v1/user/follower.go | 10 +- routers/api/v1/user/gpg_key.go | 18 +- routers/api/v1/user/helper.go | 4 +- routers/api/v1/user/hook.go | 10 +- routers/api/v1/user/key.go | 24 +- routers/api/v1/user/quota.go | 4 +- routers/api/v1/user/repo.go | 14 +- routers/api/v1/user/runners.go | 4 +- routers/api/v1/user/settings.go | 12 +- routers/api/v1/user/star.go | 18 +- routers/api/v1/user/user.go | 12 +- routers/api/v1/user/watch.go | 16 +- routers/api/v1/utils/block.go | 8 +- routers/api/v1/utils/git.go | 8 +- routers/api/v1/utils/hook.go | 20 +- routers/api/v1/utils/page.go | 6 +- routers/common/auth.go | 8 +- routers/common/compare.go | 6 +- routers/common/db.go | 12 +- routers/common/errpage.go | 18 +- routers/common/errpage_test.go | 6 +- routers/common/markup.go | 10 +- routers/common/middleware.go | 12 +- routers/common/middleware_test.go | 2 +- routers/common/redirect.go | 2 +- routers/common/serve.go | 10 +- routers/init.go | 88 ++-- routers/install/install.go | 38 +- routers/install/routes.go | 12 +- routers/install/routes_test.go | 2 +- routers/private/actions.go | 16 +- routers/private/default_branch.go | 8 +- routers/private/hook_post_receive.go | 38 +- routers/private/hook_post_receive_test.go | 18 +- routers/private/hook_pre_receive.go | 32 +- routers/private/hook_proc_receive.go | 14 +- routers/private/hook_verification.go | 6 +- routers/private/hook_verification_test.go | 4 +- routers/private/internal.go | 10 +- routers/private/internal_repo.go | 10 +- routers/private/key.go | 8 +- routers/private/mail.go | 16 +- routers/private/main_test.go | 2 +- routers/private/manager.go | 20 +- routers/private/manager_process.go | 8 +- routers/private/manager_unix.go | 4 +- routers/private/restore_repo.go | 8 +- routers/private/serv.go | 26 +- routers/private/ssh_log.go | 10 +- routers/web/admin/admin.go | 28 +- routers/web/admin/admin_test.go | 10 +- routers/web/admin/applications.go | 12 +- routers/web/admin/auths.go | 28 +- routers/web/admin/config.go | 22 +- routers/web/admin/diagnosis.go | 4 +- routers/web/admin/emails.go | 16 +- routers/web/admin/hooks.go | 10 +- routers/web/admin/main_test.go | 2 +- routers/web/admin/notice.go | 12 +- routers/web/admin/orgs.go | 14 +- routers/web/admin/packages.go | 16 +- routers/web/admin/queue.go | 6 +- routers/web/admin/queue_tester.go | 10 +- routers/web/admin/repos.go | 20 +- routers/web/admin/runners.go | 4 +- routers/web/admin/stacktrace.go | 6 +- routers/web/admin/users.go | 40 +- routers/web/admin/users_test.go | 14 +- routers/web/auth/2fa.go | 16 +- routers/web/auth/auth.go | 48 +- routers/web/auth/auth_test.go | 4 +- routers/web/auth/linkaccount.go | 24 +- routers/web/auth/main_test.go | 2 +- routers/web/auth/oauth.go | 46 +- routers/web/auth/oauth_test.go | 12 +- routers/web/auth/openid.go | 20 +- routers/web/auth/password.go | 28 +- routers/web/auth/webauthn.go | 16 +- routers/web/base.go | 12 +- routers/web/devtest/devtest.go | 6 +- routers/web/events/events.go | 10 +- routers/web/explore/code.go | 12 +- routers/web/explore/org.go | 12 +- routers/web/explore/repo.go | 14 +- routers/web/explore/topic.go | 10 +- routers/web/explore/user.go | 20 +- routers/web/feed/branch.go | 4 +- routers/web/feed/convert.go | 20 +- routers/web/feed/file.go | 8 +- routers/web/feed/profile.go | 8 +- routers/web/feed/release.go | 6 +- routers/web/feed/render.go | 2 +- routers/web/feed/repo.go | 6 +- routers/web/githttp.go | 8 +- routers/web/goget.go | 8 +- routers/web/healthcheck/check.go | 10 +- routers/web/home.go | 26 +- routers/web/metrics.go | 2 +- routers/web/misc/markup.go | 8 +- routers/web/misc/misc.go | 10 +- routers/web/misc/swagger-forgejo.go | 4 +- routers/web/misc/swagger.go | 4 +- routers/web/nodeinfo.go | 4 +- routers/web/org/home.go | 24 +- routers/web/org/main_test.go | 2 +- routers/web/org/members.go | 14 +- routers/web/org/org.go | 18 +- routers/web/org/org_labels.go | 14 +- routers/web/org/projects.go | 28 +- routers/web/org/projects_test.go | 6 +- routers/web/org/setting.go | 38 +- routers/web/org/setting/blocked_users.go | 10 +- routers/web/org/setting/runners.go | 2 +- routers/web/org/setting/storage_overview.go | 6 +- routers/web/org/setting_oauth2.go | 14 +- routers/web/org/setting_packages.go | 10 +- routers/web/org/teams.go | 36 +- routers/web/repo/action_aggregator_test.go | 8 +- routers/web/repo/actions/actions.go | 30 +- routers/web/repo/actions/actions_test.go | 6 +- routers/web/repo/actions/main_test.go | 2 +- routers/web/repo/actions/manual.go | 4 +- routers/web/repo/actions/view.go | 36 +- routers/web/repo/activity.go | 8 +- routers/web/repo/attachment.go | 24 +- routers/web/repo/badges/badges.go | 10 +- routers/web/repo/blame.go | 20 +- routers/web/repo/branch.go | 34 +- routers/web/repo/card.go | 22 +- routers/web/repo/cherry_pick.go | 22 +- routers/web/repo/code_frequency.go | 6 +- routers/web/repo/commit.go | 40 +- routers/web/repo/compare.go | 46 +- routers/web/repo/contributors.go | 6 +- routers/web/repo/download.go | 18 +- routers/web/repo/editor.go | 40 +- routers/web/repo/editor_test.go | 10 +- routers/web/repo/find.go | 6 +- routers/web/repo/flags/manage.go | 8 +- routers/web/repo/githttp.go | 28 +- routers/web/repo/helper.go | 6 +- routers/web/repo/helper_test.go | 2 +- routers/web/repo/issue.go | 76 +-- routers/web/repo/issue_content_history.go | 12 +- routers/web/repo/issue_dependency.go | 8 +- routers/web/repo/issue_label.go | 22 +- routers/web/repo/issue_label_test.go | 14 +- routers/web/repo/issue_lock.go | 8 +- routers/web/repo/issue_pin.go | 8 +- routers/web/repo/issue_stopwatch.go | 8 +- routers/web/repo/issue_timetrack.go | 12 +- routers/web/repo/issue_watch.go | 8 +- routers/web/repo/main_test.go | 2 +- routers/web/repo/middlewares.go | 12 +- routers/web/repo/migrate.go | 34 +- routers/web/repo/milestone.go | 24 +- routers/web/repo/packages.go | 14 +- routers/web/repo/patch.go | 20 +- routers/web/repo/projects.go | 32 +- routers/web/repo/projects_test.go | 4 +- routers/web/repo/pull.go | 66 +-- routers/web/repo/pull_review.go | 22 +- routers/web/repo/pull_review_test.go | 14 +- routers/web/repo/recent_commits.go | 6 +- routers/web/repo/release.go | 46 +- routers/web/repo/release_test.go | 14 +- routers/web/repo/render.go | 14 +- routers/web/repo/repo.go | 52 +- routers/web/repo/search.go | 12 +- routers/web/repo/setting/avatar.go | 14 +- routers/web/repo/setting/collaboration.go | 26 +- routers/web/repo/setting/default_branch.go | 12 +- routers/web/repo/setting/deploy_key.go | 16 +- routers/web/repo/setting/git_hooks.go | 4 +- routers/web/repo/setting/lfs.go | 28 +- routers/web/repo/setting/main_test.go | 2 +- routers/web/repo/setting/protected_branch.go | 22 +- routers/web/repo/setting/protected_tag.go | 18 +- routers/web/repo/setting/runners.go | 14 +- routers/web/repo/setting/secrets.go | 10 +- routers/web/repo/setting/setting.go | 56 +-- routers/web/repo/setting/settings_test.go | 26 +- routers/web/repo/setting/variables.go | 10 +- routers/web/repo/setting/webhook.go | 32 +- routers/web/repo/topic.go | 6 +- routers/web/repo/treelist.go | 6 +- routers/web/repo/view.go | 58 +-- routers/web/repo/wiki.go | 38 +- routers/web/repo/wiki_test.go | 16 +- routers/web/shared/actions/runners.go | 14 +- routers/web/shared/actions/variables.go | 14 +- routers/web/shared/packages/packages.go | 26 +- routers/web/shared/project/column.go | 6 +- routers/web/shared/secrets/secrets.go | 16 +- routers/web/shared/storage_overview.go | 8 +- routers/web/shared/user/header.go | 32 +- routers/web/swagger_json.go | 2 +- routers/web/user/avatar.go | 8 +- routers/web/user/code.go | 14 +- routers/web/user/home.go | 42 +- routers/web/user/home_test.go | 16 +- routers/web/user/main_test.go | 2 +- routers/web/user/notification.go | 30 +- routers/web/user/package.go | 44 +- routers/web/user/profile.go | 34 +- routers/web/user/search.go | 12 +- routers/web/user/setting/account.go | 34 +- routers/web/user/setting/account_test.go | 10 +- routers/web/user/setting/adopt.go | 12 +- routers/web/user/setting/applications.go | 16 +- routers/web/user/setting/blocked_users.go | 10 +- routers/web/user/setting/keys.go | 18 +- routers/web/user/setting/main_test.go | 2 +- routers/web/user/setting/oauth2.go | 6 +- routers/web/user/setting/oauth2_common.go | 14 +- routers/web/user/setting/packages.go | 14 +- routers/web/user/setting/profile.go | 34 +- routers/web/user/setting/runner.go | 4 +- routers/web/user/setting/security/2fa.go | 14 +- routers/web/user/setting/security/openid.go | 14 +- routers/web/user/setting/security/security.go | 16 +- routers/web/user/setting/security/webauthn.go | 16 +- routers/web/user/setting/storage_overview.go | 6 +- routers/web/user/setting/webhooks.go | 12 +- routers/web/user/stop_watch.go | 8 +- routers/web/user/task.go | 6 +- routers/web/web.go | 78 +-- routers/web/webfinger.go | 8 +- services/actions/auth.go | 6 +- services/actions/auth_test.go | 4 +- services/actions/cleanup.go | 12 +- services/actions/cleanup_test.go | 8 +- services/actions/clear_tasks.go | 12 +- services/actions/commit_status.go | 18 +- services/actions/context.go | 14 +- services/actions/context_test.go | 4 +- services/actions/init.go | 10 +- services/actions/interface.go | 2 +- services/actions/job_emitter.go | 8 +- services/actions/job_emitter_test.go | 2 +- services/actions/main_test.go | 8 +- services/actions/notifier.go | 28 +- services/actions/notifier_helper.go | 36 +- services/actions/notifier_helper_test.go | 8 +- services/actions/rerun.go | 4 +- services/actions/rerun_test.go | 2 +- services/actions/schedule_tasks.go | 14 +- services/actions/task.go | 6 +- services/actions/variables.go | 8 +- services/actions/workflows.go | 26 +- services/agit/agit.go | 18 +- services/asymkey/deploy_key.go | 8 +- services/asymkey/main_test.go | 8 +- services/asymkey/sign.go | 24 +- services/asymkey/ssh_key.go | 6 +- services/asymkey/ssh_key_test.go | 10 +- services/attachment/attachment.go | 12 +- services/attachment/attachment_test.go | 12 +- services/auth/auth.go | 18 +- services/auth/auth_test.go | 2 +- services/auth/basic.go | 18 +- services/auth/group.go | 2 +- services/auth/httpsign.go | 10 +- services/auth/interface.go | 6 +- services/auth/main_test.go | 2 +- services/auth/oauth2.go | 18 +- services/auth/oauth2_test.go | 8 +- services/auth/reverseproxy.go | 10 +- services/auth/reverseproxy_test.go | 10 +- services/auth/session.go | 4 +- services/auth/signin.go | 20 +- services/auth/source.go | 6 +- .../auth/source/db/assert_interface_test.go | 6 +- services/auth/source/db/authenticate.go | 6 +- services/auth/source/db/source.go | 4 +- .../auth/source/ldap/assert_interface_test.go | 6 +- services/auth/source/ldap/source.go | 8 +- .../auth/source/ldap/source_authenticate.go | 14 +- services/auth/source/ldap/source_search.go | 4 +- services/auth/source/ldap/source_sync.go | 20 +- .../source/oauth2/assert_interface_test.go | 6 +- services/auth/source/oauth2/init.go | 10 +- services/auth/source/oauth2/jwtsigningkey.go | 6 +- .../auth/source/oauth2/jwtsigningkey_test.go | 4 +- services/auth/source/oauth2/providers.go | 10 +- services/auth/source/oauth2/providers_base.go | 4 +- .../auth/source/oauth2/providers_custom.go | 2 +- .../auth/source/oauth2/providers_openid.go | 6 +- .../auth/source/oauth2/providers_simple.go | 2 +- services/auth/source/oauth2/source.go | 4 +- .../auth/source/oauth2/source_authenticate.go | 4 +- services/auth/source/oauth2/store.go | 4 +- services/auth/source/oauth2/token.go | 2 +- .../auth/source/pam/assert_interface_test.go | 6 +- services/auth/source/pam/source.go | 4 +- .../auth/source/pam/source_authenticate.go | 12 +- services/auth/source/remote/source.go | 4 +- .../auth/source/smtp/assert_interface_test.go | 6 +- services/auth/source/smtp/source.go | 4 +- .../auth/source/smtp/source_authenticate.go | 8 +- services/auth/source/source_group_sync.go | 10 +- services/auth/sync.go | 6 +- services/automerge/automerge.go | 32 +- services/automerge/notify.go | 8 +- services/context/access_log.go | 8 +- services/context/api.go | 24 +- services/context/api_org.go | 2 +- services/context/api_test.go | 2 +- services/context/base.go | 12 +- services/context/base_test.go | 2 +- services/context/captcha.go | 16 +- services/context/context.go | 22 +- services/context/context_cookie.go | 10 +- services/context/context_model.go | 2 +- services/context/context_response.go | 14 +- services/context/context_test.go | 2 +- services/context/csrf.go | 4 +- services/context/org.go | 16 +- services/context/package.go | 16 +- services/context/pagination.go | 2 +- services/context/permission.go | 8 +- services/context/private.go | 8 +- services/context/quota.go | 4 +- services/context/repo.go | 40 +- services/context/repository.go | 2 +- services/context/response.go | 2 +- services/context/upload/upload.go | 6 +- services/context/user.go | 2 +- services/contexttest/context_tests.go | 20 +- services/convert/activity.go | 12 +- services/convert/attachment.go | 4 +- services/convert/convert.go | 36 +- services/convert/git_commit.go | 16 +- services/convert/git_commit_test.go | 10 +- services/convert/issue.go | 14 +- services/convert/issue_comment.go | 12 +- services/convert/issue_test.go | 12 +- services/convert/main_test.go | 6 +- services/convert/mirror.go | 4 +- services/convert/notification.go | 8 +- services/convert/package.go | 8 +- services/convert/pull.go | 18 +- services/convert/pull_review.go | 6 +- services/convert/pull_test.go | 18 +- services/convert/quota.go | 12 +- services/convert/release.go | 4 +- services/convert/release_test.go | 6 +- services/convert/repository.go | 16 +- services/convert/status.go | 6 +- services/convert/user.go | 6 +- services/convert/user_test.go | 8 +- services/convert/utils.go | 4 +- services/convert/wiki.go | 4 +- services/cron/cron.go | 8 +- services/cron/setting.go | 2 +- services/cron/tasks.go | 16 +- services/cron/tasks_actions.go | 6 +- services/cron/tasks_basic.go | 24 +- services/cron/tasks_extended.go | 22 +- services/doctor/actions.go | 12 +- services/doctor/authorizedkeys.go | 8 +- services/doctor/breaking.go | 10 +- services/doctor/checkOldArchives.go | 6 +- services/doctor/dbconsistency.go | 20 +- services/doctor/dbversion.go | 6 +- services/doctor/doctor.go | 10 +- services/doctor/fix16961.go | 12 +- services/doctor/fix16961_test.go | 2 +- services/doctor/fix8312.go | 10 +- services/doctor/heads.go | 6 +- services/doctor/lfs.go | 6 +- services/doctor/mergebase.go | 10 +- services/doctor/misc.go | 22 +- services/doctor/packages_nuget.go | 12 +- services/doctor/paths.go | 4 +- services/doctor/push_mirror_consistency.go | 6 +- services/doctor/repository.go | 10 +- services/doctor/storage.go | 20 +- services/doctor/usertype.go | 4 +- services/externalaccount/link.go | 2 +- services/externalaccount/user.go | 10 +- services/f3/driver/asset.go | 12 +- services/f3/driver/assets.go | 2 +- services/f3/driver/comment.go | 8 +- services/f3/driver/comments.go | 4 +- services/f3/driver/forge.go | 2 +- services/f3/driver/issue.go | 14 +- services/f3/driver/issues.go | 4 +- services/f3/driver/label.go | 4 +- services/f3/driver/labels.go | 4 +- services/f3/driver/main.go | 2 +- services/f3/driver/main_test.go | 14 +- services/f3/driver/milestone.go | 8 +- services/f3/driver/milestones.go | 4 +- services/f3/driver/options.go | 2 +- services/f3/driver/organization.go | 6 +- services/f3/driver/organizations.go | 6 +- services/f3/driver/project.go | 6 +- services/f3/driver/projects.go | 4 +- services/f3/driver/pullrequest.go | 14 +- services/f3/driver/pullrequests.go | 6 +- services/f3/driver/reaction.go | 6 +- services/f3/driver/reactions.go | 4 +- services/f3/driver/release.go | 12 +- services/f3/driver/releases.go | 4 +- services/f3/driver/repository.go | 2 +- services/f3/driver/review.go | 8 +- services/f3/driver/reviewcomment.go | 8 +- services/f3/driver/reviewcomments.go | 4 +- services/f3/driver/reviews.go | 4 +- services/f3/driver/tests/init.go | 2 +- services/f3/driver/tests/new.go | 2 +- services/f3/driver/tests/options.go | 6 +- services/f3/driver/topic.go | 4 +- services/f3/driver/topics.go | 4 +- services/f3/driver/tree.go | 2 +- services/f3/driver/user.go | 6 +- services/f3/driver/users.go | 4 +- services/f3/util/logger.go | 4 +- services/f3/util/logger_test.go | 4 +- services/federation/federation_service.go | 18 +- services/feed/action.go | 22 +- services/feed/action_test.go | 22 +- services/forgejo/main_test.go | 10 +- services/forgejo/sanity.go | 6 +- services/forgejo/sanity_test.go | 6 +- services/forgejo/sanity_v1TOv5_0_1Included.go | 6 +- .../forgejo/sanity_v1TOv5_0_1Included_test.go | 8 +- services/forms/admin.go | 6 +- services/forms/auth_form.go | 4 +- services/forms/org.go | 6 +- services/forms/package_form.go | 4 +- services/forms/repo_branch_form.go | 4 +- services/forms/repo_form.go | 16 +- services/forms/repo_form_test.go | 2 +- services/forms/repo_tag_form.go | 4 +- services/forms/runner.go | 4 +- services/forms/user_form.go | 12 +- services/forms/user_form_auth_openid.go | 4 +- services/forms/user_form_hidden_comments.go | 6 +- services/forms/user_form_test.go | 4 +- services/gitdiff/csv_test.go | 6 +- services/gitdiff/gitdiff.go | 26 +- services/gitdiff/gitdiff_test.go | 14 +- services/gitdiff/highlightdiff.go | 2 +- services/gitdiff/main_test.go | 10 +- services/indexer/indexer.go | 8 +- services/indexer/notify.go | 20 +- services/issue/assignee.go | 18 +- services/issue/assignee_test.go | 8 +- services/issue/comments.go | 12 +- services/issue/comments_test.go | 20 +- services/issue/commit.go | 18 +- services/issue/commit_test.go | 16 +- services/issue/content.go | 6 +- services/issue/issue.go | 26 +- services/issue/issue_test.go | 10 +- services/issue/label.go | 10 +- services/issue/label_test.go | 8 +- services/issue/main_test.go | 8 +- services/issue/milestone.go | 8 +- services/issue/milestone_test.go | 8 +- services/issue/pull.go | 18 +- services/issue/reaction.go | 4 +- services/issue/status.go | 8 +- services/issue/template.go | 10 +- services/lfs/locks.go | 20 +- services/lfs/server.go | 30 +- services/mailer/incoming/incoming.go | 8 +- services/mailer/incoming/incoming_handler.go | 26 +- services/mailer/incoming/payload/payload.go | 4 +- services/mailer/mail.go | 30 +- services/mailer/mail_admin_new_user.go | 12 +- services/mailer/mail_admin_new_user_test.go | 8 +- services/mailer/mail_auth_test.go | 16 +- services/mailer/mail_comment.go | 12 +- services/mailer/mail_issue.go | 18 +- services/mailer/mail_release.go | 16 +- services/mailer/mail_repo.go | 10 +- services/mailer/mail_team_invite.go | 12 +- services/mailer/mail_test.go | 18 +- services/mailer/mailer.go | 16 +- services/mailer/mailer_test.go | 6 +- services/mailer/main_test.go | 12 +- services/mailer/notify.go | 12 +- services/mailer/token/token.go | 4 +- services/markup/main_test.go | 2 +- services/markup/processorhelper.go | 20 +- services/markup/processorhelper_test.go | 10 +- services/migrations/codebase.go | 8 +- services/migrations/codebase_test.go | 2 +- services/migrations/common.go | 8 +- services/migrations/dump.go | 14 +- services/migrations/forgejo_downloader.go | 2 +- .../migrations/forgejo_downloader_test.go | 2 +- services/migrations/git.go | 2 +- services/migrations/gitbucket.go | 6 +- services/migrations/gitea_downloader.go | 6 +- services/migrations/gitea_downloader_test.go | 4 +- services/migrations/gitea_uploader.go | 40 +- services/migrations/gitea_uploader_test.go | 26 +- services/migrations/github.go | 10 +- services/migrations/github_test.go | 4 +- services/migrations/gitlab.go | 12 +- services/migrations/gitlab_test.go | 6 +- services/migrations/gogs.go | 8 +- services/migrations/gogs_test.go | 2 +- services/migrations/http_client.go | 6 +- services/migrations/main_test.go | 4 +- services/migrations/migrate.go | 20 +- services/migrations/migrate_test.go | 6 +- services/migrations/onedev.go | 8 +- services/migrations/onedev_test.go | 2 +- services/migrations/restore.go | 2 +- services/migrations/update.go | 10 +- services/mirror/mirror.go | 12 +- services/mirror/mirror_pull.go | 30 +- services/mirror/mirror_push.go | 22 +- services/mirror/notifier.go | 8 +- services/mirror/queue.go | 8 +- services/notify/notifier.go | 12 +- services/notify/notify.go | 14 +- services/notify/null.go | 12 +- services/org/org.go | 18 +- services/org/org_test.go | 10 +- services/org/repo.go | 8 +- services/org/repo_test.go | 8 +- services/org/team_invite.go | 6 +- services/packages/alpine/repository.go | 16 +- services/packages/alt/repository.go | 18 +- services/packages/arch/repository.go | 16 +- services/packages/auth.go | 8 +- services/packages/cargo/index.go | 22 +- services/packages/cleanup/cleanup.go | 28 +- .../packages/cleanup/cleanup_sha256_test.go | 18 +- services/packages/cleanup/main_test.go | 2 +- services/packages/container/blob_uploader.go | 8 +- services/packages/container/cleanup.go | 10 +- services/packages/container/cleanup_sha256.go | 12 +- services/packages/container/common.go | 6 +- services/packages/debian/repository.go | 16 +- services/packages/package_update.go | 14 +- services/packages/packages.go | 22 +- services/packages/rpm/repository.go | 18 +- services/pull/check.go | 34 +- services/pull/check_test.go | 10 +- services/pull/comment.go | 10 +- services/pull/commit_status.go | 14 +- services/pull/commit_status_test.go | 4 +- services/pull/edits.go | 8 +- services/pull/lfs.go | 12 +- services/pull/main_test.go | 6 +- services/pull/merge.go | 34 +- services/pull/merge_ff_only.go | 6 +- services/pull/merge_merge.go | 6 +- services/pull/merge_prepare.go | 14 +- services/pull/merge_rebase.go | 8 +- services/pull/merge_squash.go | 14 +- services/pull/patch.go | 24 +- services/pull/patch_unmerged.go | 4 +- services/pull/pull.go | 42 +- services/pull/pull_test.go | 14 +- services/pull/review.go | 22 +- services/pull/review_test.go | 10 +- services/pull/temp_repo.go | 12 +- services/pull/update.go | 18 +- services/pull/update_rebase.go | 14 +- services/release/release.go | 32 +- services/release/release_test.go | 18 +- services/release/tag.go | 12 +- services/remote/promote.go | 12 +- services/repository/adopt.go | 26 +- services/repository/adopt_test.go | 10 +- services/repository/archiver/archiver.go | 20 +- services/repository/archiver/archiver_test.go | 12 +- services/repository/avatar.go | 10 +- services/repository/avatar_test.go | 8 +- services/repository/branch.go | 44 +- services/repository/cache.go | 6 +- services/repository/check.go | 16 +- services/repository/collaboration.go | 8 +- services/repository/collaboration_test.go | 6 +- services/repository/commit.go | 4 +- .../repository/commitstatus/commitstatus.go | 22 +- services/repository/contributors_graph.go | 20 +- .../repository/contributors_graph_test.go | 12 +- services/repository/create.go | 24 +- services/repository/create_test.go | 14 +- services/repository/delete.go | 46 +- services/repository/files/cherry_pick.go | 14 +- services/repository/files/commit.go | 8 +- services/repository/files/content.go | 14 +- services/repository/files/content_test.go | 14 +- services/repository/files/diff.go | 4 +- services/repository/files/diff_test.go | 12 +- services/repository/files/file.go | 10 +- services/repository/files/patch.go | 18 +- services/repository/files/temp_repo.go | 18 +- services/repository/files/temp_repo_test.go | 8 +- services/repository/files/tree.go | 10 +- services/repository/files/tree_test.go | 6 +- services/repository/files/update.go | 22 +- services/repository/files/upload.go | 12 +- services/repository/fork.go | 22 +- services/repository/fork_test.go | 10 +- services/repository/generate.go | 16 +- services/repository/gitgraph/graph.go | 4 +- services/repository/gitgraph/graph_models.go | 14 +- services/repository/gitgraph/graph_test.go | 2 +- services/repository/hooks.go | 12 +- services/repository/init.go | 14 +- services/repository/lfs.go | 16 +- services/repository/lfs_test.go | 16 +- services/repository/main_test.go | 2 +- services/repository/migrate.go | 24 +- services/repository/push.go | 34 +- services/repository/repository.go | 30 +- services/repository/repository_test.go | 8 +- services/repository/review.go | 6 +- services/repository/review_test.go | 6 +- services/repository/setting.go | 12 +- services/repository/star.go | 8 +- services/repository/template.go | 12 +- services/repository/transfer.go | 26 +- services/repository/transfer_test.go | 22 +- services/secrets/secrets.go | 4 +- services/secrets/validation.go | 2 +- services/shared/automerge/automerge.go | 12 +- services/task/migrate.go | 28 +- services/task/task.go | 30 +- services/uinotification/notify.go | 20 +- services/user/avatar.go | 10 +- services/user/avatar_test.go | 10 +- services/user/block.go | 8 +- services/user/block_test.go | 12 +- services/user/delete.go | 28 +- services/user/email.go | 12 +- services/user/email_test.go | 10 +- services/user/update.go | 16 +- services/user/update_test.go | 12 +- services/user/user.go | 36 +- services/user/user_test.go | 22 +- services/webhook/default.go | 16 +- services/webhook/default_test.go | 6 +- services/webhook/deliver.go | 20 +- services/webhook/deliver_test.go | 14 +- services/webhook/dingtalk.go | 14 +- services/webhook/dingtalk_test.go | 8 +- services/webhook/discord.go | 22 +- services/webhook/discord_test.go | 10 +- services/webhook/feishu.go | 12 +- services/webhook/feishu_test.go | 8 +- services/webhook/general.go | 10 +- services/webhook/general_test.go | 2 +- services/webhook/gogs.go | 8 +- services/webhook/main_test.go | 12 +- services/webhook/matrix.go | 20 +- services/webhook/matrix_test.go | 8 +- services/webhook/msteams.go | 14 +- services/webhook/msteams_test.go | 8 +- services/webhook/notifier.go | 28 +- services/webhook/notifier_test.go | 22 +- services/webhook/packagist.go | 12 +- services/webhook/packagist_test.go | 8 +- services/webhook/shared/img.go | 2 +- services/webhook/shared/payloader.go | 8 +- services/webhook/slack.go | 18 +- services/webhook/slack_test.go | 8 +- services/webhook/sourcehut/builds.go | 22 +- services/webhook/sourcehut/builds_test.go | 16 +- services/webhook/telegram.go | 18 +- services/webhook/telegram_test.go | 8 +- services/webhook/webhook.go | 30 +- services/webhook/webhook_test.go | 18 +- services/webhook/wechatwork.go | 12 +- services/wiki/wiki.go | 22 +- services/wiki/wiki_path.go | 10 +- services/wiki/wiki_test.go | 12 +- templates/swagger/v1_json.tmpl | 464 +++++++++--------- tests/e2e/changes.go | 2 +- tests/e2e/debugserver_test.go | 2 +- tests/e2e/declare_repos_test.go | 12 +- tests/e2e/e2e_test.go | 18 +- tests/e2e/utils_e2e_test.go | 12 +- tests/fuzz/fuzz_test.go | 6 +- .../user2/commits_search_test.git/config | 2 +- .../integration/actions_commit_status_test.go | 20 +- tests/integration/actions_job_test.go | 18 +- tests/integration/actions_log_test.go | 14 +- tests/integration/actions_route_test.go | 12 +- tests/integration/actions_runner_test.go | 4 +- tests/integration/actions_trigger_test.go | 46 +- tests/integration/actions_variables_test.go | 12 +- tests/integration/admin_config_test.go | 4 +- tests/integration/admin_user_test.go | 16 +- .../integration/api_actions_artifact_test.go | 2 +- .../api_actions_artifact_v4_test.go | 8 +- .../integration/api_activitypub_actor_test.go | 8 +- .../api_activitypub_person_test.go | 16 +- .../api_activitypub_repository_test.go | 20 +- tests/integration/api_admin_actions_test.go | 10 +- tests/integration/api_admin_org_test.go | 10 +- tests/integration/api_admin_test.go | 16 +- tests/integration/api_block_test.go | 12 +- tests/integration/api_branch_test.go | 12 +- .../api_comment_attachment_test.go | 18 +- tests/integration/api_comment_test.go | 20 +- .../api_feed_plain_text_titles_test.go | 6 +- tests/integration/api_forgejo_root_test.go | 2 +- tests/integration/api_forgejo_version_test.go | 12 +- tests/integration/api_fork_test.go | 16 +- .../api_gitignore_templates_test.go | 8 +- tests/integration/api_gpg_keys_test.go | 6 +- tests/integration/api_health_test.go | 6 +- .../api_helper_for_declarative_test.go | 16 +- tests/integration/api_httpsig_test.go | 10 +- .../integration/api_issue_attachment_test.go | 14 +- tests/integration/api_issue_config_test.go | 10 +- tests/integration/api_issue_label_test.go | 14 +- tests/integration/api_issue_milestone_test.go | 14 +- tests/integration/api_issue_pin_test.go | 14 +- tests/integration/api_issue_reaction_test.go | 18 +- tests/integration/api_issue_stopwatch_test.go | 16 +- .../api_issue_subscription_test.go | 16 +- tests/integration/api_issue_templates_test.go | 10 +- tests/integration/api_issue_test.go | 18 +- .../api_issue_tracked_time_test.go | 14 +- tests/integration/api_keys_test.go | 16 +- tests/integration/api_label_templates_test.go | 6 +- .../integration/api_license_templates_test.go | 8 +- tests/integration/api_nodeinfo_test.go | 10 +- tests/integration/api_notification_test.go | 16 +- tests/integration/api_oauth2_apps_test.go | 10 +- tests/integration/api_org_actions_test.go | 10 +- tests/integration/api_org_avatar_test.go | 6 +- tests/integration/api_org_test.go | 22 +- tests/integration/api_packages_alpine_test.go | 14 +- tests/integration/api_packages_alt_test.go | 18 +- tests/integration/api_packages_arch_test.go | 12 +- tests/integration/api_packages_cargo_test.go | 26 +- tests/integration/api_packages_chef_test.go | 16 +- .../integration/api_packages_composer_test.go | 18 +- tests/integration/api_packages_conan_test.go | 20 +- tests/integration/api_packages_conda_test.go | 14 +- ..._packages_container_cleanup_sha256_test.go | 22 +- .../api_packages_container_test.go | 22 +- tests/integration/api_packages_cran_test.go | 12 +- tests/integration/api_packages_debian_test.go | 14 +- .../integration/api_packages_generic_test.go | 12 +- .../integration/api_packages_goproxy_test.go | 10 +- tests/integration/api_packages_helm_test.go | 14 +- tests/integration/api_packages_maven_test.go | 12 +- tests/integration/api_packages_npm_test.go | 16 +- tests/integration/api_packages_nuget_test.go | 20 +- tests/integration/api_packages_pub_test.go | 14 +- tests/integration/api_packages_pypi_test.go | 12 +- tests/integration/api_packages_rpm_test.go | 16 +- .../integration/api_packages_rubygems_test.go | 12 +- tests/integration/api_packages_swift_test.go | 16 +- tests/integration/api_packages_test.go | 26 +- .../integration/api_packages_vagrant_test.go | 16 +- tests/integration/api_private_serv_test.go | 6 +- tests/integration/api_pull_commits_test.go | 12 +- tests/integration/api_pull_review_test.go | 20 +- tests/integration/api_pull_test.go | 24 +- tests/integration/api_push_mirror_test.go | 32 +- .../integration/api_quota_management_test.go | 20 +- tests/integration/api_quota_use_test.go | 32 +- tests/integration/api_releases_test.go | 16 +- tests/integration/api_repo_actions_test.go | 18 +- tests/integration/api_repo_activities_test.go | 10 +- tests/integration/api_repo_archive_test.go | 10 +- tests/integration/api_repo_avatar_test.go | 12 +- tests/integration/api_repo_branch_test.go | 16 +- .../integration/api_repo_collaborator_test.go | 12 +- tests/integration/api_repo_compare_test.go | 10 +- tests/integration/api_repo_edit_test.go | 14 +- .../integration/api_repo_file_create_test.go | 18 +- .../integration/api_repo_file_delete_test.go | 10 +- tests/integration/api_repo_file_get_test.go | 8 +- tests/integration/api_repo_file_helpers.go | 12 +- .../integration/api_repo_file_update_test.go | 16 +- .../integration/api_repo_files_change_test.go | 16 +- .../api_repo_get_contents_list_test.go | 18 +- .../integration/api_repo_get_contents_test.go | 18 +- tests/integration/api_repo_git_blobs_test.go | 12 +- .../integration/api_repo_git_commits_test.go | 10 +- tests/integration/api_repo_git_hook_test.go | 12 +- tests/integration/api_repo_git_notes_test.go | 10 +- tests/integration/api_repo_git_ref_test.go | 8 +- tests/integration/api_repo_git_tags_test.go | 18 +- tests/integration/api_repo_git_trees_test.go | 10 +- tests/integration/api_repo_hook_test.go | 12 +- tests/integration/api_repo_lfs_locks_test.go | 14 +- .../integration/api_repo_lfs_migrate_test.go | 16 +- tests/integration/api_repo_lfs_test.go | 22 +- tests/integration/api_repo_raw_test.go | 8 +- tests/integration/api_repo_secrets_test.go | 12 +- tests/integration/api_repo_tags_test.go | 12 +- tests/integration/api_repo_teams_test.go | 16 +- tests/integration/api_repo_test.go | 24 +- tests/integration/api_repo_topic_test.go | 12 +- tests/integration/api_repo_variables_test.go | 12 +- tests/integration/api_settings_test.go | 6 +- tests/integration/api_team_test.go | 22 +- tests/integration/api_team_user_test.go | 14 +- tests/integration/api_token_test.go | 12 +- tests/integration/api_twofa_test.go | 10 +- tests/integration/api_user_actions_test.go | 10 +- tests/integration/api_user_avatar_test.go | 6 +- tests/integration/api_user_email_test.go | 6 +- tests/integration/api_user_follow_test.go | 6 +- tests/integration/api_user_heatmap_test.go | 8 +- tests/integration/api_user_info_test.go | 10 +- tests/integration/api_user_org_perm_test.go | 6 +- tests/integration/api_user_orgs_test.go | 12 +- tests/integration/api_user_search_test.go | 14 +- tests/integration/api_user_secrets_test.go | 6 +- tests/integration/api_user_star_test.go | 12 +- tests/integration/api_user_variables_test.go | 6 +- tests/integration/api_user_watch_test.go | 6 +- tests/integration/api_wiki_test.go | 18 +- tests/integration/appearance_settings_test.go | 2 +- tests/integration/attachment_test.go | 8 +- tests/integration/auth_ldap_test.go | 20 +- tests/integration/auth_token_test.go | 14 +- tests/integration/benchmarks_test.go | 6 +- tests/integration/block_test.go | 18 +- tests/integration/branches_test.go | 8 +- .../integration/change_default_branch_test.go | 8 +- tests/integration/cmd_admin_test.go | 8 +- tests/integration/cmd_forgejo_actions_test.go | 10 +- tests/integration/cmd_forgejo_f3_test.go | 14 +- tests/integration/cmd_keys_test.go | 4 +- tests/integration/codeowner_test.go | 18 +- .../integration/comment_roles_system_test.go | 8 +- tests/integration/commit_status_test.go | 10 +- tests/integration/compare_test.go | 22 +- tests/integration/cors_test.go | 8 +- tests/integration/create_no_session_test.go | 8 +- tests/integration/csrf_test.go | 6 +- tests/integration/db_collation_test.go | 8 +- tests/integration/delete_user_test.go | 14 +- .../disable_forgotten_password_test.go | 6 +- .../integration/doctor_packages_nuget_test.go | 22 +- tests/integration/download_test.go | 4 +- tests/integration/dummy_lang_test.go | 2 +- tests/integration/dump_restore_test.go | 16 +- tests/integration/easymde_test.go | 2 +- tests/integration/editor_test.go | 16 +- tests/integration/empty_repo_test.go | 18 +- tests/integration/eventsource_test.go | 18 +- tests/integration/explore_code_test.go | 6 +- tests/integration/explore_org_test.go | 6 +- tests/integration/explore_repos_test.go | 2 +- tests/integration/explore_user_test.go | 6 +- tests/integration/feed_repo_test.go | 2 +- tests/integration/feed_user_test.go | 6 +- .../forgejo_confirmation_repo_test.go | 6 +- tests/integration/forgejo_git_test.go | 18 +- .../git_helper_for_declarative_test.go | 8 +- tests/integration/git_push_test.go | 22 +- tests/integration/git_smart_http_test.go | 14 +- tests/integration/git_test.go | 32 +- tests/integration/goget_test.go | 4 +- tests/integration/gpg_git_test.go | 18 +- tests/integration/incoming_email_test.go | 18 +- tests/integration/integration_test.go | 34 +- tests/integration/issue_test.go | 32 +- tests/integration/last_updated_time_test.go | 2 +- tests/integration/lfs_getobject_test.go | 16 +- tests/integration/lfs_local_endpoint_test.go | 4 +- tests/integration/lfs_view_test.go | 12 +- tests/integration/linguist_test.go | 16 +- tests/integration/links_test.go | 10 +- tests/integration/markup_external_test.go | 4 +- tests/integration/markup_test.go | 6 +- tests/integration/migrate_test.go | 28 +- .../migration-test/migration_test.go | 24 +- tests/integration/milestone_test.go | 2 +- tests/integration/mirror_pull_test.go | 22 +- tests/integration/mirror_push_test.go | 34 +- tests/integration/new_org_test.go | 2 +- tests/integration/nonascii_branches_test.go | 2 +- tests/integration/notification_test.go | 6 +- tests/integration/oauth_test.go | 22 +- tests/integration/opengraph_test.go | 4 +- tests/integration/org_count_test.go | 12 +- tests/integration/org_nav_test.go | 4 +- tests/integration/org_project_test.go | 4 +- tests/integration/org_settings_test.go | 6 +- tests/integration/org_team_invite_test.go | 16 +- tests/integration/org_test.go | 20 +- tests/integration/private_project_test.go | 10 +- tests/integration/privateactivity_test.go | 14 +- tests/integration/proctected_branch_test.go | 8 +- tests/integration/project_test.go | 10 +- tests/integration/pull_commit_test.go | 4 +- tests/integration/pull_compare_test.go | 2 +- tests/integration/pull_create_test.go | 22 +- tests/integration/pull_diff_test.go | 2 +- tests/integration/pull_editable_test.go | 6 +- tests/integration/pull_icon_test.go | 22 +- tests/integration/pull_merge_test.go | 52 +- tests/integration/pull_reopen_test.go | 28 +- tests/integration/pull_request_task_test.go | 26 +- tests/integration/pull_review_test.go | 26 +- tests/integration/pull_status_test.go | 10 +- tests/integration/pull_test.go | 12 +- tests/integration/pull_update_test.go | 26 +- tests/integration/quota_use_test.go | 28 +- tests/integration/release_feed_test.go | 2 +- tests/integration/release_test.go | 18 +- tests/integration/remote_test.go | 12 +- tests/integration/rename_branch_test.go | 10 +- tests/integration/repo_activity_test.go | 18 +- tests/integration/repo_archive_test.go | 16 +- tests/integration/repo_archive_text_test.go | 8 +- tests/integration/repo_badges_test.go | 26 +- tests/integration/repo_branch_test.go | 20 +- tests/integration/repo_citation_test.go | 12 +- tests/integration/repo_collaborator_test.go | 2 +- tests/integration/repo_commits_search_test.go | 2 +- tests/integration/repo_commits_test.go | 10 +- tests/integration/repo_delete_test.go | 14 +- tests/integration/repo_flags_test.go | 20 +- tests/integration/repo_fork_test.go | 20 +- tests/integration/repo_generate_test.go | 18 +- tests/integration/repo_git_note_test.go | 2 +- tests/integration/repo_issue_title_test.go | 20 +- .../repo_mergecommit_revert_test.go | 2 +- tests/integration/repo_migrate_test.go | 4 +- tests/integration/repo_migration_ui_test.go | 2 +- tests/integration/repo_pagination_test.go | 10 +- tests/integration/repo_search_test.go | 14 +- tests/integration/repo_settings_hook_test.go | 2 +- tests/integration/repo_settings_test.go | 32 +- tests/integration/repo_signed_tag_test.go | 20 +- tests/integration/repo_starwatch_test.go | 8 +- tests/integration/repo_tag_test.go | 20 +- tests/integration/repo_test.go | 24 +- tests/integration/repo_topic_test.go | 12 +- tests/integration/repo_view_test.go | 16 +- tests/integration/repo_watch_test.go | 6 +- tests/integration/repo_webhook_test.go | 6 +- tests/integration/repo_wiki_test.go | 12 +- tests/integration/repofiles_change_test.go | 18 +- tests/integration/runner_test.go | 12 +- tests/integration/session_test.go | 8 +- tests/integration/setting_test.go | 12 +- tests/integration/signin_test.go | 12 +- tests/integration/signout_test.go | 2 +- tests/integration/signup_test.go | 14 +- tests/integration/size_translations_test.go | 8 +- tests/integration/ssh_key_test.go | 6 +- tests/integration/swagger_test.go | 4 +- tests/integration/timetracking_test.go | 4 +- tests/integration/user_avatar_test.go | 10 +- tests/integration/user_count_test.go | 18 +- tests/integration/user_dashboard_test.go | 16 +- .../integration/user_profile_activity_test.go | 4 +- .../integration/user_profile_follows_test.go | 2 +- tests/integration/user_profile_test.go | 8 +- tests/integration/user_redirect_test.go | 16 +- tests/integration/user_test.go | 28 +- tests/integration/version_test.go | 12 +- tests/integration/view_test.go | 14 +- tests/integration/webfinger_test.go | 8 +- tests/integration/webhook_test.go | 22 +- tests/integration/wiki_test.go | 6 +- tests/integration/xss_test.go | 8 +- tests/test_utils.go | 42 +- 2097 files changed, 10675 insertions(+), 10674 deletions(-) diff --git a/.deadcode-out b/.deadcode-out index 338d22e258..e366abee94 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -1,7 +1,7 @@ -code.gitea.io/gitea/cmd +forgejo.org/cmd NoMainListener -code.gitea.io/gitea/cmd/forgejo +forgejo.org/cmd/forgejo ContextSetNoInit ContextSetNoExit ContextSetStderr @@ -9,48 +9,48 @@ code.gitea.io/gitea/cmd/forgejo ContextSetStdout ContextSetStdin -code.gitea.io/gitea/models +forgejo.org/models IsErrSHANotFound IsErrMergeDivergingFastForwardOnly -code.gitea.io/gitea/models/auth +forgejo.org/models/auth WebAuthnCredentials -code.gitea.io/gitea/models/db +forgejo.org/models/db TruncateBeans InTransaction DumpTables -code.gitea.io/gitea/models/dbfs +forgejo.org/models/dbfs file.renameTo Create Rename -code.gitea.io/gitea/models/forgefed +forgejo.org/models/forgefed GetFederationHost -code.gitea.io/gitea/models/forgejo/semver +forgejo.org/models/forgejo/semver GetVersion SetVersionString SetVersion -code.gitea.io/gitea/models/git +forgejo.org/models/git RemoveDeletedBranchByID -code.gitea.io/gitea/models/issues +forgejo.org/models/issues IsErrUnknownDependencyType IsErrIssueWasClosed -code.gitea.io/gitea/models/organization +forgejo.org/models/organization SearchMembersOptions.ToConds -code.gitea.io/gitea/models/perm/access +forgejo.org/models/perm/access GetRepoWriters -code.gitea.io/gitea/models/repo +forgejo.org/models/repo WatchRepoMode -code.gitea.io/gitea/models/user +forgejo.org/models/user IsErrExternalLoginUserAlreadyExist IsErrExternalLoginUserNotExist NewFederatedUser @@ -58,35 +58,35 @@ code.gitea.io/gitea/models/user GetUserAllSettings DeleteUserSetting -code.gitea.io/gitea/modules/activitypub +forgejo.org/modules/activitypub NewContext Context.APClientFactory -code.gitea.io/gitea/modules/assetfs +forgejo.org/modules/assetfs Bindata -code.gitea.io/gitea/modules/auth/password/hash +forgejo.org/modules/auth/password/hash DummyHasher.HashWithSaltBytes NewDummyHasher -code.gitea.io/gitea/modules/auth/password/pwn +forgejo.org/modules/auth/password/pwn WithHTTP -code.gitea.io/gitea/modules/base +forgejo.org/modules/base SetupGiteaRoot -code.gitea.io/gitea/modules/cache +forgejo.org/modules/cache GetInt WithNoCacheContext RemoveContextData -code.gitea.io/gitea/modules/emoji +forgejo.org/modules/emoji ReplaceCodes -code.gitea.io/gitea/modules/eventsource +forgejo.org/modules/eventsource Event.String -code.gitea.io/gitea/modules/forgefed +forgejo.org/modules/forgefed NewForgeUndoLike ForgeUndoLike.UnmarshalJSON ForgeUndoLike.Validate @@ -96,7 +96,7 @@ code.gitea.io/gitea/modules/forgefed ToRepository OnRepository -code.gitea.io/gitea/modules/git +forgejo.org/modules/git AllowLFSFiltersArgs AddChanges AddChangesWithArgs @@ -106,55 +106,55 @@ code.gitea.io/gitea/modules/git openRepositoryWithDefaultContext ToEntryMode -code.gitea.io/gitea/modules/gitrepo +forgejo.org/modules/gitrepo GetBranchCommitID GetWikiDefaultBranch -code.gitea.io/gitea/modules/graceful +forgejo.org/modules/graceful Manager.TerminateContext Manager.Err Manager.Value Manager.Deadline -code.gitea.io/gitea/modules/hcaptcha +forgejo.org/modules/hcaptcha WithHTTP -code.gitea.io/gitea/modules/hostmatcher +forgejo.org/modules/hostmatcher HostMatchList.AppendPattern -code.gitea.io/gitea/modules/json +forgejo.org/modules/json StdJSON.Marshal StdJSON.Unmarshal StdJSON.NewEncoder StdJSON.NewDecoder StdJSON.Indent -code.gitea.io/gitea/modules/log +forgejo.org/modules/log NewEventWriterBuffer -code.gitea.io/gitea/modules/markup +forgejo.org/modules/markup GetRendererByType RenderString IsMarkupFile -code.gitea.io/gitea/modules/markup/console +forgejo.org/modules/markup/console Render RenderString -code.gitea.io/gitea/modules/markup/markdown +forgejo.org/modules/markup/markdown RenderRawString -code.gitea.io/gitea/modules/markup/mdstripper +forgejo.org/modules/markup/mdstripper stripRenderer.AddOptions StripMarkdown -code.gitea.io/gitea/modules/markup/orgmode +forgejo.org/modules/markup/orgmode RenderString -code.gitea.io/gitea/modules/process +forgejo.org/modules/process Manager.ExecTimeout -code.gitea.io/gitea/modules/queue +forgejo.org/modules/queue newBaseChannelSimple newBaseChannelUnique newBaseRedisSimple @@ -163,26 +163,26 @@ code.gitea.io/gitea/modules/queue testStateRecorder.Reset newWorkerPoolQueueForTest -code.gitea.io/gitea/modules/queue/lqinternal +forgejo.org/modules/queue/lqinternal QueueItemIDBytes QueueItemKeyBytes ListLevelQueueKeys -code.gitea.io/gitea/modules/setting +forgejo.org/modules/setting NewConfigProviderFromData GitConfigType.GetOption InitLoggersForTest -code.gitea.io/gitea/modules/sync +forgejo.org/modules/sync StatusTable.Start StatusTable.IsRunning -code.gitea.io/gitea/modules/timeutil +forgejo.org/modules/timeutil GetExecutableModTime MockSet MockUnset -code.gitea.io/gitea/modules/translation +forgejo.org/modules/translation MockLocale.Language MockLocale.TrString MockLocale.Tr @@ -192,42 +192,42 @@ code.gitea.io/gitea/modules/translation MockLocale.HasKey MockLocale.PrettyNumber -code.gitea.io/gitea/modules/util +forgejo.org/modules/util OptionalArg -code.gitea.io/gitea/modules/util/filebuffer +forgejo.org/modules/util/filebuffer CreateFromReader -code.gitea.io/gitea/modules/validation +forgejo.org/modules/validation IsErrNotValid -code.gitea.io/gitea/modules/web +forgejo.org/modules/web RouteMock RouteMockReset -code.gitea.io/gitea/modules/zstd +forgejo.org/modules/zstd NewWriter Writer.Write Writer.Close -code.gitea.io/gitea/routers/web +forgejo.org/routers/web NotFound -code.gitea.io/gitea/routers/web/org +forgejo.org/routers/web/org MustEnableProjects -code.gitea.io/gitea/services/context +forgejo.org/services/context GetPrivateContext -code.gitea.io/gitea/services/repository +forgejo.org/services/repository IsErrForkAlreadyExist -code.gitea.io/gitea/services/repository/files +forgejo.org/services/repository/files ContentType.String -code.gitea.io/gitea/services/repository/gitgraph +forgejo.org/services/repository/gitgraph Parser.Reset -code.gitea.io/gitea/services/webhook +forgejo.org/services/webhook NewNotifier diff --git a/.forgejo/testdata/build-release/go.mod b/.forgejo/testdata/build-release/go.mod index 729cb6f831..585dcc4f3d 100644 --- a/.forgejo/testdata/build-release/go.mod +++ b/.forgejo/testdata/build-release/go.mod @@ -1,3 +1,3 @@ -module code.gitea.io/gitea +module forgejo.org go 1.23.3 diff --git a/.gitignore b/.gitignore index 79a4108dab..744e24a09a 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ cpu.out /gitea-vet /debug /integrations.test +/forgejo /bin /dist diff --git a/.golangci.yml b/.golangci.yml index cceb7070e7..136c0e624a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -93,7 +93,7 @@ linters-settings: desc: use os or io instead - pkg: golang.org/x/exp desc: it's experimental and unreliable - - pkg: code.gitea.io/gitea/modules/git/internal + - pkg: forgejo.org/modules/git/internal desc: do not use the internal package, use AddXxx function instead - pkg: gopkg.in/ini.v1 desc: do not use the ini package, use gitea's config system instead diff --git a/Dockerfile b/Dockerfile index ebe41ed5c8..9a8877920a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,8 @@ RUN cp /*-alpine-linux-musl*/lib/ld-musl-*.so.1 /lib || true RUN apk --no-cache add build-base git nodejs npm -COPY . ${GOPATH}/src/code.gitea.io/gitea -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +COPY . ${GOPATH}/src/forgejo.org +WORKDIR ${GOPATH}/src/forgejo.org RUN make clean RUN make frontend @@ -47,9 +47,9 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ /tmp/local/etc/s6/gitea/* \ /tmp/local/etc/s6/openssh/* \ /tmp/local/etc/s6/.s6-svscan/* \ - /go/src/code.gitea.io/gitea/gitea \ - /go/src/code.gitea.io/gitea/environment-to-ini -RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete + /go/src/forgejo.org/gitea \ + /go/src/forgejo.org/environment-to-ini +RUN chmod 644 /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete FROM data.forgejo.org/oci/alpine:3.21 ARG RELEASE_VERSION @@ -102,7 +102,7 @@ CMD ["/usr/bin/s6-svscan", "/etc/s6"] COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo -COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env /go/src/forgejo.org/gitea /app/gitea/gitea RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli -COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini -COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh +COPY --from=build-env /go/src/forgejo.org/environment-to-ini /usr/local/bin/environment-to-ini +COPY --from=build-env /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 93004610a7..47aae2798d 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -30,8 +30,8 @@ RUN cp /*-alpine-linux-musl*/lib/ld-musl-*.so.1 /lib || true RUN apk --no-cache add build-base git nodejs npm -COPY . ${GOPATH}/src/code.gitea.io/gitea -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +COPY . ${GOPATH}/src/forgejo.org +WORKDIR ${GOPATH}/src/forgejo.org RUN make clean RUN make frontend @@ -45,9 +45,9 @@ COPY docker/rootless /tmp/local RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \ /tmp/local/usr/local/bin/docker-setup.sh \ /tmp/local/usr/local/bin/gitea \ - /go/src/code.gitea.io/gitea/gitea \ - /go/src/code.gitea.io/gitea/environment-to-ini -RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete + /go/src/forgejo.org/gitea \ + /go/src/forgejo.org/environment-to-ini +RUN chmod 644 /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete FROM data.forgejo.org/oci/alpine:3.21 ARG RELEASE_VERSION @@ -91,10 +91,10 @@ RUN chown git:git /var/lib/gitea /etc/gitea COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env --chown=root:root /go/src/forgejo.org/gitea /app/gitea/gitea RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini -COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh +COPY --from=build-env --chown=root:root /go/src/forgejo.org/environment-to-ini /usr/local/bin/environment-to-ini +COPY --from=build-env /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh #git:git USER 1000:1000 diff --git a/Makefile b/Makefile index ff9de004c9..4fb06db918 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ else DIST := dist DIST_DIRS := $(DIST)/binaries $(DIST)/release -IMPORT := code.gitea.io/gitea +IMPORT := forgejo.org GO ?= $(shell go env GOROOT)/bin/go SHASUM ?= shasum -a 256 @@ -125,10 +125,10 @@ LDFLAGS := $(LDFLAGS) -X "main.ReleaseVersion=$(RELEASE_VERSION)" -X "main.MakeV LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64 ifeq ($(HAS_GO), yes) - GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) $(shell $(GO) list code.gitea.io/gitea/models/forgejo_migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./...)) + GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list forgejo.org/models/migrations/...) $(shell $(GO) list forgejo.org/models/forgejo_migrations/...) forgejo.org/tests/integration/migration-test forgejo.org/tests forgejo.org/tests/integration forgejo.org/tests/e2e,$(shell $(GO) list ./...)) endif REMOTE_CACHER_MODULES ?= cache nosql session queue -GO_TEST_REMOTE_CACHER_PACKAGES ?= $(addprefix code.gitea.io/gitea/modules/,$(REMOTE_CACHER_MODULES)) +GO_TEST_REMOTE_CACHER_PACKAGES ?= $(addprefix forgejo.org/modules/,$(REMOTE_CACHER_MODULES)) FOMANTIC_WORK_DIR := web_src/fomantic @@ -169,7 +169,7 @@ GO_SOURCES += $(GENERATED_GO_DEST) GO_SOURCES_NO_BINDATA := $(GO_SOURCES) ifeq ($(HAS_GO), yes) - MIGRATION_PACKAGES := $(shell $(GO) list code.gitea.io/gitea/models/migrations/... code.gitea.io/gitea/models/forgejo_migrations/...) + MIGRATION_PACKAGES := $(shell $(GO) list forgejo.org/models/migrations/... forgejo.org/models/forgejo_migrations/...) endif ifeq ($(filter $(TAGS_SPLIT),bindata),bindata) @@ -476,7 +476,7 @@ lint-spell: lint-codespell lint-spell-fix: lint-codespell-fix @go run $(MISSPELL_PACKAGE) -w $(SPELLCHECK_FILES) -RUN_DEADCODE = $(GO) run $(DEADCODE_PACKAGE) -generated=false -f='{{println .Path}}{{range .Funcs}}{{printf "\t%s\n" .Name}}{{end}}{{println}}' -test code.gitea.io/gitea +RUN_DEADCODE = $(GO) run $(DEADCODE_PACKAGE) -generated=false -f='{{println .Path}}{{range .Funcs}}{{printf "\t%s\n" .Name}}{{end}}{{println}}' -test forgejo.org .PHONY: lint-go lint-go: @@ -610,7 +610,7 @@ tidy-check: tidy go-licenses: $(GO_LICENSE_FILE) $(GO_LICENSE_FILE): go.mod go.sum - -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --ignore code.gitea.io/gitea --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null + -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --ignore forgejo.org --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null $(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE) @rm -rf $(GO_LICENSE_TMP_DIR) @@ -740,33 +740,33 @@ integration-test-coverage-sqlite: integrations.cover.sqlite.test generate-ini-sq GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.cover.sqlite.test -test.coverprofile=integration.coverage.out integrations.mysql.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -o integrations.mysql.test integrations.pgsql.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -o integrations.pgsql.test integrations.sqlite.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' integrations.cover.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test integrations.cover.sqlite.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' .PHONY: migrations.mysql.test migrations.mysql.test: $(GO_SOURCES) generate-ini-mysql - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration/migration-test -o migrations.mysql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.pgsql.test migrations.pgsql.test: $(GO_SOURCES) generate-ini-pgsql - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration/migration-test -o migrations.pgsql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.sqlite.test migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) .PHONY: migrations.individual.mysql.test @@ -777,7 +777,7 @@ migrations.individual.mysql.test: $(GO_SOURCES) .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$* .PHONY: migrations.individual.pgsql.test migrations.individual.pgsql.test: $(GO_SOURCES) @@ -787,7 +787,7 @@ migrations.individual.pgsql.test: $(GO_SOURCES) .PHONY: migrations.individual.pgsql.test\#% migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$* .PHONY: migrations.individual.sqlite.test migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite @@ -797,16 +797,16 @@ migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' forgejo.org/models/migrations/$* e2e.mysql.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.mysql.test e2e.pgsql.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.pgsql.test e2e.sqlite.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' + $(GOTEST) $(GOTESTFLAGS) -c forgejo.org/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' .PHONY: check check: test @@ -1013,7 +1013,7 @@ generate-gitignore: .PHONY: generate-gomock generate-gomock: - $(GO) run $(GOMOCK_PACKAGE) -package mock -destination ./modules/queue/mock/redisuniversalclient.go code.gitea.io/gitea/modules/nosql RedisClient + $(GO) run $(GOMOCK_PACKAGE) -package mock -destination ./modules/queue/mock/redisuniversalclient.go forgejo.org/modules/nosql RedisClient .PHONY: generate-images generate-images: | node_modules diff --git a/build/backport-locales.go b/build/backport-locales.go index 3df83ea6d9..3125f19014 100644 --- a/build/backport-locales.go +++ b/build/backport-locales.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" ) func main() { diff --git a/build/code-batch-process.go b/build/code-batch-process.go index cc2ab68026..516736b65c 100644 --- a/build/code-batch-process.go +++ b/build/code-batch-process.go @@ -15,7 +15,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/build/codeformat" + "forgejo.org/build/codeformat" ) // Windows has a limitation for command line arguments, the size can not exceed 32KB. diff --git a/build/codeformat/formatimports.go b/build/codeformat/formatimports.go index c9fc2a27b4..acedd13234 100644 --- a/build/codeformat/formatimports.go +++ b/build/codeformat/formatimports.go @@ -13,8 +13,8 @@ import ( ) var importPackageGroupOrders = map[string]int{ - "": 1, // internal - "code.gitea.io/gitea/": 2, + "": 1, // internal + "forgejo.org/": 2, } var errInvalidCommentBetweenImports = errors.New("comments between imported packages are invalid, please move comments to the end of the package line") diff --git a/build/codeformat/formatimports_test.go b/build/codeformat/formatimports_test.go index 1abc9f8ab7..03c780911f 100644 --- a/build/codeformat/formatimports_test.go +++ b/build/codeformat/formatimports_test.go @@ -58,8 +58,8 @@ import ( "code.gitea.io/other/package" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/the/package" @@ -82,8 +82,8 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "code.gitea.io/other/package" "github.com/issue9/identicon" diff --git a/build/generate-emoji.go b/build/generate-emoji.go index 98c2f15d75..0ad49a6541 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -20,7 +20,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) const ( diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index 1e09c83a6a..7acfd6cbe4 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) func main() { diff --git a/build/generate-go-licenses.go b/build/generate-go-licenses.go index 22ef817ebc..3f4d62a2cc 100644 --- a/build/generate-go-licenses.go +++ b/build/generate-go-licenses.go @@ -16,7 +16,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // regexp is based on go-license, excluding README and NOTICE @@ -102,9 +102,9 @@ func main() { pkgName := path.Dir(pkgPath) // There might be a bug somewhere in go-licenses that sometimes interprets the - // root package as "." and sometimes as "code.gitea.io/gitea". Workaround by + // root package as "." and sometimes as "forgejo.org". Workaround by // removing both of them for the sake of stable output. - if pkgName == "." || pkgName == "code.gitea.io/gitea" { + if pkgName == "." || pkgName == "forgejo.org" { continue } diff --git a/build/generate-licenses.go b/build/generate-licenses.go index 9a111bc811..e925d8af02 100644 --- a/build/generate-licenses.go +++ b/build/generate-licenses.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) func main() { diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go index f42bc59cbb..31154ba7cb 100644 --- a/build/lint-locale-usage/lint-locale-usage.go +++ b/build/lint-locale-usage/lint-locale-usage.go @@ -17,10 +17,10 @@ import ( "text/template" tmplParser "text/template/parse" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/locale" - fjTemplates "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/locale" + fjTemplates "forgejo.org/modules/templates" + "forgejo.org/modules/util" ) // this works by first gathering all valid source string IDs from `en-US` reference files diff --git a/build/lint-locale/lint-locale.go b/build/lint-locale/lint-locale.go index a738fbd684..94ce941e62 100644 --- a/build/lint-locale/lint-locale.go +++ b/build/lint-locale/lint-locale.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/locale" + "forgejo.org/modules/locale" "github.com/microcosm-cc/bluemonday" "github.com/sergi/go-diff/diffmatchpatch" diff --git a/cmd/actions.go b/cmd/actions.go index 10ae6243c3..54b5154cfa 100644 --- a/cmd/actions.go +++ b/cmd/actions.go @@ -6,8 +6,8 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin.go b/cmd/admin.go index 6c9480e76e..e04a5bc530 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go index 4777a92908..b5e0212df7 100644 --- a/cmd/admin_auth.go +++ b/cmd/admin_auth.go @@ -9,9 +9,9 @@ import ( "os" "text/tabwriter" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - auth_service "code.gitea.io/gitea/services/auth" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + auth_service "forgejo.org/services/auth" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go index aff2a12855..637769b153 100644 --- a/cmd/admin_auth_ldap.go +++ b/cmd/admin_auth_ldap.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + "forgejo.org/models/auth" + "forgejo.org/services/auth/source/ldap" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth_ldap_test.go b/cmd/admin_auth_ldap_test.go index d5385d09e8..269af55d96 100644 --- a/cmd/admin_auth_ldap_test.go +++ b/cmd/admin_auth_ldap_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + "forgejo.org/models/auth" + "forgejo.org/services/auth/source/ldap" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go index 8e6239ac33..58238794b8 100644 --- a/cmd/admin_auth_oauth.go +++ b/cmd/admin_auth_oauth.go @@ -8,8 +8,8 @@ import ( "fmt" "net/url" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth/source/oauth2" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_auth_stmp.go b/cmd/admin_auth_stmp.go index d724746905..e166cc38cd 100644 --- a/cmd/admin_auth_stmp.go +++ b/cmd/admin_auth_stmp.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/util" + "forgejo.org/services/auth/source/smtp" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_regenerate.go b/cmd/admin_regenerate.go index 0db505ff9c..4e7f685843 100644 --- a/cmd/admin_regenerate.go +++ b/cmd/admin_regenerate.go @@ -4,9 +4,9 @@ package cmd import ( - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/graceful" - repo_service "code.gitea.io/gitea/services/repository" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/graceful" + repo_service "forgejo.org/services/repository" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_change_password.go b/cmd/admin_user_change_password.go index bd9063a8e4..563ad96afd 100644 --- a/cmd/admin_user_change_password.go +++ b/cmd/admin_user_change_password.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + user_service "forgejo.org/services/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go index 781148e734..33e61c0753 100644 --- a/cmd/admin_user_create.go +++ b/cmd/admin_user_create.go @@ -7,12 +7,12 @@ import ( "errors" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - pwd "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + pwd "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go index 520557554a..9a4cc22a77 100644 --- a/cmd/admin_user_delete.go +++ b/cmd/admin_user_delete.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + user_service "forgejo.org/services/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go index 6c2c10494e..abb874bd5f 100644 --- a/cmd/admin_user_generate_access_token.go +++ b/cmd/admin_user_generate_access_token.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_list.go b/cmd/admin_user_list.go index 4c2b26d1df..6044ce7c3f 100644 --- a/cmd/admin_user_list.go +++ b/cmd/admin_user_list.go @@ -8,7 +8,7 @@ import ( "os" "text/tabwriter" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/admin_user_must_change_password.go b/cmd/admin_user_must_change_password.go index 2794414259..920f5c7b21 100644 --- a/cmd/admin_user_must_change_password.go +++ b/cmd/admin_user_must_change_password.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "github.com/urfave/cli/v2" ) diff --git a/cmd/cmd.go b/cmd/cmd.go index 423dce2674..c887d0ed52 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -15,10 +15,10 @@ import ( "strings" "syscall" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/urfave/cli/v2" ) diff --git a/cmd/doctor.go b/cmd/doctor.go index 9957053365..b3420982f5 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -11,13 +11,13 @@ import ( "strings" "text/tabwriter" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - migrate_base "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/doctor" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + migrate_base "forgejo.org/models/migrations/base" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/doctor" "github.com/urfave/cli/v2" "xorm.io/xorm" diff --git a/cmd/doctor_convert.go b/cmd/doctor_convert.go index 190b2fc2ef..06883264a3 100644 --- a/cmd/doctor_convert.go +++ b/cmd/doctor_convert.go @@ -6,9 +6,9 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go index e6daae18b9..bfb4b9d803 100644 --- a/cmd/doctor_test.go +++ b/cmd/doctor_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/doctor" + "forgejo.org/modules/log" + "forgejo.org/services/doctor" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" diff --git a/cmd/dump.go b/cmd/dump.go index 14f9a00b58..ac72a2bb18 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" "code.forgejo.org/go-chi/session" "github.com/mholt/archiver/v3" diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go index 3a24cf6c5f..197445f908 100644 --- a/cmd/dump_repo.go +++ b/cmd/dump_repo.go @@ -10,14 +10,14 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/migrations" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/convert" + "forgejo.org/services/migrations" "github.com/urfave/cli/v2" ) diff --git a/cmd/embedded.go b/cmd/embedded.go index 9f03f7be7c..c8b9d13d25 100644 --- a/cmd/embedded.go +++ b/cmd/embedded.go @@ -10,13 +10,13 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/util" "github.com/gobwas/glob" "github.com/urfave/cli/v2" diff --git a/cmd/forgejo/actions.go b/cmd/forgejo/actions.go index 1560b10fac..dbe7398bcf 100644 --- a/cmd/forgejo/actions.go +++ b/cmd/forgejo/actions.go @@ -11,10 +11,10 @@ import ( "os" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - private_routers "code.gitea.io/gitea/routers/private" + actions_model "forgejo.org/models/actions" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + private_routers "forgejo.org/routers/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/forgejo/actions_test.go b/cmd/forgejo/actions_test.go index 897af98315..b58f52184c 100644 --- a/cmd/forgejo/actions_test.go +++ b/cmd/forgejo/actions_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/forgejo/f3.go b/cmd/forgejo/f3.go index 5a0d0ac036..bfd14cd1a4 100644 --- a/cmd/forgejo/f3.go +++ b/cmd/forgejo/f3.go @@ -8,14 +8,14 @@ import ( "context" "errors" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/f3/util" + "forgejo.org/models" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/services/f3/util" - _ "code.gitea.io/gitea/services/f3/driver" // register the driver + _ "forgejo.org/services/f3/driver" // register the driver f3_cmd "code.forgejo.org/f3/gof3/v3/cmd" f3_logger "code.forgejo.org/f3/gof3/v3/logger" diff --git a/cmd/forgejo/forgejo.go b/cmd/forgejo/forgejo.go index 1b7e16ca8f..3b95c80991 100644 --- a/cmd/forgejo/forgejo.go +++ b/cmd/forgejo/forgejo.go @@ -11,10 +11,10 @@ import ( "os/signal" "syscall" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/generate.go b/cmd/generate.go index 806946244b..8d3c221ec5 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/generate" + "forgejo.org/modules/generate" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" diff --git a/cmd/hook.go b/cmd/hook.go index 93dfd9d648..1630c41edd 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/hook_test.go b/cmd/hook_test.go index 4fa249a316..89bd3cf737 100644 --- a/cmd/hook_test.go +++ b/cmd/hook_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/keys.go b/cmd/keys.go index 81425a5722..b12daee1bc 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "forgejo.org/modules/log" + "forgejo.org/modules/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/mailer.go b/cmd/mailer.go index 0c5f2c8c8d..cddebd6d36 100644 --- a/cmd/mailer.go +++ b/cmd/mailer.go @@ -6,8 +6,8 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/main.go b/cmd/main.go index 9a28722b4b..5f48814cd0 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/cmd/forgejo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/cmd/forgejo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/main_test.go b/cmd/main_test.go index 8a9ec14b2e..5e0b36d028 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/manager.go b/cmd/manager.go index b74771e53d..0cb1e60f73 100644 --- a/cmd/manager.go +++ b/cmd/manager.go @@ -7,7 +7,7 @@ import ( "os" "time" - "code.gitea.io/gitea/modules/private" + "forgejo.org/modules/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index 6049b00d5e..ac2c1eb418 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "forgejo.org/modules/log" + "forgejo.org/modules/private" "github.com/urfave/cli/v2" ) diff --git a/cmd/migrate.go b/cmd/migrate.go index 53c496a36c..ab291cfb66 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,10 +6,10 @@ package cmd import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index 3a69b555e0..1b839e7169 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -10,17 +10,17 @@ import ( "io/fs" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/migrations" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/migrations" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" "github.com/urfave/cli/v2" ) diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go index 245f0cacff..28af63f4c8 100644 --- a/cmd/migrate_storage_test.go +++ b/cmd/migrate_storage_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" + packages_service "forgejo.org/services/packages" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go index 37b32aa304..1e53ce26ba 100644 --- a/cmd/restore_repo.go +++ b/cmd/restore_repo.go @@ -6,8 +6,8 @@ package cmd import ( "strings" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/cmd/serv.go b/cmd/serv.go index db67e36fa3..0884d6c36b 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -18,18 +18,18 @@ import ( "time" "unicode" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/pprof" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/lfs" + asymkey_model "forgejo.org/models/asymkey" + git_model "forgejo.org/models/git" + "forgejo.org/models/perm" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/pprof" + "forgejo.org/modules/private" + "forgejo.org/modules/process" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/services/lfs" "github.com/golang-jwt/jwt/v5" "github.com/kballard/go-shellquote" diff --git a/cmd/web.go b/cmd/web.go index 787411939c..3e7fdee4bf 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -16,14 +16,14 @@ import ( _ "net/http/pprof" // Used for debugging if enabled and a web server is running - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/install" + "forgejo.org/modules/container" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/routers" + "forgejo.org/routers/install" "github.com/felixge/fgprof" "github.com/urfave/cli/v2" diff --git a/cmd/web_acme.go b/cmd/web_acme.go index 90e4a02764..b2d7435be2 100644 --- a/cmd/web_acme.go +++ b/cmd/web_acme.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" "github.com/caddyserver/certmagic" ) diff --git a/cmd/web_graceful.go b/cmd/web_graceful.go index 996537be3b..b0145d4fc7 100644 --- a/cmd/web_graceful.go +++ b/cmd/web_graceful.go @@ -9,9 +9,9 @@ import ( "net/http/fcgi" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func runHTTP(network, listenAddr, name string, m http.Handler, useProxyProtocol bool) error { diff --git a/cmd/web_https.go b/cmd/web_https.go index 70d35cd40d..bebc5f7c8f 100644 --- a/cmd/web_https.go +++ b/cmd/web_https.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/klauspost/cpuid/v2" ) diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go index f8593e49c3..95f34527ac 100644 --- a/contrib/environment-to-ini/environment-to-ini.go +++ b/contrib/environment-to-ini/environment-to-ini.go @@ -6,8 +6,8 @@ package main import ( "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index b49ef7436f..4284ff362b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.gitea.io/gitea +module forgejo.org go 1.24 diff --git a/main.go b/main.go index b8cc5668e1..3f0283db7f 100644 --- a/main.go +++ b/main.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/cmd" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" // register supported doc types - _ "code.gitea.io/gitea/modules/markup/asciicast" - _ "code.gitea.io/gitea/modules/markup/console" - _ "code.gitea.io/gitea/modules/markup/csv" - _ "code.gitea.io/gitea/modules/markup/markdown" - _ "code.gitea.io/gitea/modules/markup/orgmode" + _ "forgejo.org/modules/markup/asciicast" + _ "forgejo.org/modules/markup/console" + _ "forgejo.org/modules/markup/csv" + _ "forgejo.org/modules/markup/markdown" + _ "forgejo.org/modules/markup/orgmode" "github.com/urfave/cli/v2" ) diff --git a/models/actions/artifact.go b/models/actions/artifact.go index 0bc66ba24e..10cd3868a1 100644 --- a/models/actions/artifact.go +++ b/models/actions/artifact.go @@ -11,9 +11,9 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/actions/forgejo.go b/models/actions/forgejo.go index 5ea77f4473..ce3f8b0c8b 100644 --- a/models/actions/forgejo.go +++ b/models/actions/forgejo.go @@ -7,9 +7,9 @@ import ( "crypto/subtle" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/actions/forgejo_test.go b/models/actions/forgejo_test.go index 9295fc698e..fc4ccfa628 100644 --- a/models/actions/forgejo_test.go +++ b/models/actions/forgejo_test.go @@ -6,9 +6,9 @@ import ( "crypto/subtle" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 3cfb395e62..27916f29ac 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/actions/run.go b/models/actions/run.go index c5512106b9..671177a892 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" "github.com/nektos/act/pkg/jobparser" "xorm.io/builder" diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 9f8edfe4fc..fffbb6670b 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -9,10 +9,10 @@ import ( "slices" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go index 6c5d3b3252..cbcb4beb8e 100644 --- a/models/actions/run_job_list.go +++ b/models/actions/run_job_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index b9b9324e07..92be510569 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -6,12 +6,12 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/translation" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/translation" + webhook_module "forgejo.org/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/runner.go b/models/actions/runner.go index b24950d014..99173000fb 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -11,15 +11,15 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/shared/types" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/shared/types" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" diff --git a/models/actions/runner_list.go b/models/actions/runner_list.go index 3ef8ebb254..6a64c46596 100644 --- a/models/actions/runner_list.go +++ b/models/actions/runner_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" ) type RunnerList []*ActionRunner diff --git a/models/actions/runner_test.go b/models/actions/runner_test.go index 2c8d430f94..0623e66046 100644 --- a/models/actions/runner_test.go +++ b/models/actions/runner_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/runner_token.go b/models/actions/runner_token.go index fd6ba7ecad..a59304d8e8 100644 --- a/models/actions/runner_token.go +++ b/models/actions/runner_token.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ActionRunnerToken represents runner tokens diff --git a/models/actions/runner_token_test.go b/models/actions/runner_token_test.go index 35c9a9d3c3..65d83a8fd0 100644 --- a/models/actions/runner_token_test.go +++ b/models/actions/runner_token_test.go @@ -6,8 +6,8 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/schedule.go b/models/actions/schedule.go index 1ef9978185..633582e017 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec.go b/models/actions/schedule_spec.go index 923e5f7807..83bdceb850 100644 --- a/models/actions/schedule_spec.go +++ b/models/actions/schedule_spec.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/timeutil" "github.com/robfig/cron/v3" ) diff --git a/models/actions/schedule_spec_list.go b/models/actions/schedule_spec_list.go index 78ba622dc3..0a09a60acb 100644 --- a/models/actions/schedule_spec_list.go +++ b/models/actions/schedule_spec_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/container" "xorm.io/builder" ) diff --git a/models/actions/status.go b/models/actions/status.go index eda2234137..f4357af731 100644 --- a/models/actions/status.go +++ b/models/actions/status.go @@ -4,7 +4,7 @@ package actions import ( - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ) diff --git a/models/actions/task.go b/models/actions/task.go index 31655d2f1d..63cbc6e586 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru/v2" diff --git a/models/actions/task_list.go b/models/actions/task_list.go index 502d29e1a3..fe4c028c2c 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/task_output.go b/models/actions/task_output.go index eab5b93118..fa13cadd53 100644 --- a/models/actions/task_output.go +++ b/models/actions/task_output.go @@ -6,7 +6,7 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // ActionTaskOutput represents an output of ActionTask. diff --git a/models/actions/task_step.go b/models/actions/task_step.go index 3af1fe3f5a..1f20157271 100644 --- a/models/actions/task_step.go +++ b/models/actions/task_step.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" ) // ActionTaskStep represents a step of ActionTask diff --git a/models/actions/tasks_version.go b/models/actions/tasks_version.go index d8df353593..a5c357888f 100644 --- a/models/actions/tasks_version.go +++ b/models/actions/tasks_version.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // ActionTasksVersion diff --git a/models/actions/utils.go b/models/actions/utils.go index 12657942fc..7dd3f7ec12 100644 --- a/models/actions/utils.go +++ b/models/actions/utils.go @@ -12,9 +12,9 @@ import ( "io" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) func generateSaltedToken() (string, string, string, string, error) { diff --git a/models/actions/utils_test.go b/models/actions/utils_test.go index 98c048d4ef..af6fd04a6a 100644 --- a/models/actions/utils_test.go +++ b/models/actions/utils_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/variable.go b/models/actions/variable.go index 39cea95c4b..203065487c 100644 --- a/models/actions/variable.go +++ b/models/actions/variable.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/activities/action.go b/models/activities/action.go index dd67b98242..ef99132e6c 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -14,20 +14,20 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/action_list.go b/models/activities/action_list.go index aafb7f8a26..64b92bbda1 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -8,12 +8,12 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action_test.go b/models/activities/action_test.go index 4ce030dd48..ebc40cffa5 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -8,13 +8,13 @@ import ( "path" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/activities/main_test.go b/models/activities/main_test.go index bda5593d02..a5245ab1d3 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -6,11 +6,11 @@ package activities_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/activities/notification.go b/models/activities/notification.go index 09cc640224..4d13900459 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -9,14 +9,14 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/activities/notification_list.go b/models/activities/notification_list.go index 32d2a5c051..9b09dde7ab 100644 --- a/models/activities/notification_list.go +++ b/models/activities/notification_list.go @@ -6,14 +6,14 @@ package activities import ( "context" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 3ff223d870..305a2ae430 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index ffa709ad19..3d15c22e19 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -9,12 +9,12 @@ import ( "sort" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" "xorm.io/xorm" ) diff --git a/models/activities/repo_activity_test.go b/models/activities/repo_activity_test.go index 06cd0e1e8a..c111c50208 100644 --- a/models/activities/repo_activity_test.go +++ b/models/activities/repo_activity_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/activities/statistic.go b/models/activities/statistic.go index ff81ad78a1..4c15cb2898 100644 --- a/models/activities/statistic.go +++ b/models/activities/statistic.go @@ -6,18 +6,18 @@ package activities import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/setting" ) // Statistic contains the database statistics diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index 080075d793..0cc3f759c6 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -6,11 +6,11 @@ package activities import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // UserHeatmapData represents the data needed to create a heatmap diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go index d62565a27c..d922f9a78b 100644 --- a/models/activities/user_heatmap_test.go +++ b/models/activities/user_heatmap_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/timeutil" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/admin/task.go b/models/admin/task.go index 5c2f7af49c..b4e1ac0134 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -7,16 +7,16 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/migration" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // Task represents a task diff --git a/models/asymkey/error.go b/models/asymkey/error.go index e38ba121c6..fc0dd88232 100644 --- a/models/asymkey/error.go +++ b/models/asymkey/error.go @@ -6,7 +6,7 @@ package asymkey import ( "fmt" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrKeyUnableVerify represents a "KeyUnableVerify" kind of error. diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index 6e2914e476..b7e10ce85c 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_add.go b/models/asymkey/gpg_key_add.go index 6c0f6e01a7..06cfd09a3e 100644 --- a/models/asymkey/gpg_key_add.go +++ b/models/asymkey/gpg_key_add.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/modules/log" "github.com/ProtonMail/go-crypto/openpgp" ) diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go index 9aa606405e..73b066b17c 100644 --- a/models/asymkey/gpg_key_commit_verification.go +++ b/models/asymkey/gpg_key_commit_verification.go @@ -6,9 +6,9 @@ package asymkey import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_import.go b/models/asymkey/gpg_key_import.go index c9d46d29e5..8a63ea4a35 100644 --- a/models/asymkey/gpg_key_import.go +++ b/models/asymkey/gpg_key_import.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_list.go b/models/asymkey/gpg_key_list.go index 89548e495e..b2d4fb11f6 100644 --- a/models/asymkey/gpg_key_list.go +++ b/models/asymkey/gpg_key_list.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) type GPGKeyList []*GPGKey diff --git a/models/asymkey/gpg_key_object_verification.go b/models/asymkey/gpg_key_object_verification.go index 24d72a52c1..407a29c221 100644 --- a/models/asymkey/gpg_key_object_verification.go +++ b/models/asymkey/gpg_key_object_verification.go @@ -10,12 +10,12 @@ import ( "hash" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/ProtonMail/go-crypto/openpgp/packet" ) diff --git a/models/asymkey/gpg_key_tag_verification.go b/models/asymkey/gpg_key_tag_verification.go index 5fd3983e54..f054525e8f 100644 --- a/models/asymkey/gpg_key_tag_verification.go +++ b/models/asymkey/gpg_key_tag_verification.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) func ParseTagWithSignature(ctx context.Context, gitRepo *git.Repository, t *git.Tag) *ObjectVerification { diff --git a/models/asymkey/gpg_key_test.go b/models/asymkey/gpg_key_test.go index e9aa9cf5ec..4db07b84c2 100644 --- a/models/asymkey/gpg_key_test.go +++ b/models/asymkey/gpg_key_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index 01812a2d54..2b5ea7a1ac 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -8,10 +8,10 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" ) // __________________ ________ ____ __. diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go index 87b5c22c4a..316e8f1d54 100644 --- a/models/asymkey/main_test.go +++ b/models/asymkey/main_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/asymkey/ssh_key.go b/models/asymkey/ssh_key.go index 7a18732c32..7f76009e7f 100644 --- a/models/asymkey/ssh_key.go +++ b/models/asymkey/ssh_key.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index 57baf89c0c..d3bf6fe886 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -14,10 +14,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // _____ __ .__ .__ .___ diff --git a/models/asymkey/ssh_key_authorized_principals.go b/models/asymkey/ssh_key_authorized_principals.go index f85de12aae..0b4fe13ba7 100644 --- a/models/asymkey/ssh_key_authorized_principals.go +++ b/models/asymkey/ssh_key_authorized_principals.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // _____ __ .__ .__ .___ diff --git a/models/asymkey/ssh_key_deploy.go b/models/asymkey/ssh_key_deploy.go index 429635330d..22e80840af 100644 --- a/models/asymkey/ssh_key_deploy.go +++ b/models/asymkey/ssh_key_deploy.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go index 1ed3b5df2a..11112e4bc3 100644 --- a/models/asymkey/ssh_key_fingerprint.go +++ b/models/asymkey/ssh_key_fingerprint.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_object_verification.go b/models/asymkey/ssh_key_object_verification.go index 5ad6fdb0a9..e0476fe5a8 100644 --- a/models/asymkey/ssh_key_object_verification.go +++ b/models/asymkey/ssh_key_object_verification.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/asymkey/ssh_key_object_verification_test.go b/models/asymkey/ssh_key_object_verification_test.go index 0d5ebabb70..5d1b7edc27 100644 --- a/models/asymkey/ssh_key_object_verification_test.go +++ b/models/asymkey/ssh_key_object_verification_test.go @@ -6,12 +6,12 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go index 3cb51b2b22..305e464b4b 100644 --- a/models/asymkey/ssh_key_parse.go +++ b/models/asymkey/ssh_key_parse.go @@ -16,10 +16,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_principals.go b/models/asymkey/ssh_key_principals.go index 4e7dee2c91..ba2a1a8c7d 100644 --- a/models/asymkey/ssh_key_principals.go +++ b/models/asymkey/ssh_key_principals.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // AddPrincipalKey adds new principal to database and authorized_principals file. diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go index 9a4ef665af..f3c3e41955 100644 --- a/models/asymkey/ssh_key_test.go +++ b/models/asymkey/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/42wim/sshsig" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go index 208288c77b..5dd26ccc9a 100644 --- a/models/asymkey/ssh_key_verify.go +++ b/models/asymkey/ssh_key_verify.go @@ -7,8 +7,8 @@ import ( "bytes" "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/auth/access_token.go b/models/auth/access_token.go index 3ac18940a8..31d88c6b20 100644 --- a/models/auth/access_token.go +++ b/models/auth/access_token.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go index 003ca5c9ab..802ad5aa07 100644 --- a/models/auth/access_token_scope.go +++ b/models/auth/access_token_scope.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/perm" + "forgejo.org/models/perm" ) // AccessTokenScopeCategory represents the scope category for an access token diff --git a/models/auth/access_token_test.go b/models/auth/access_token_test.go index 976ff37493..913118433c 100644 --- a/models/auth/access_token_test.go +++ b/models/auth/access_token_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/auth_token.go b/models/auth/auth_token.go index c64af3e41f..a3ac9c4c1a 100644 --- a/models/auth/auth_token.go +++ b/models/auth/auth_token.go @@ -10,9 +10,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) type AuthorizationPurpose string diff --git a/models/auth/main_test.go b/models/auth/main_test.go index 7b374b38da..b30db24483 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -6,14 +6,14 @@ package auth_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/auth" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/perm/access" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/auth" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index 9a7854408f..fb0a451566 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -14,11 +14,11 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" uuid "github.com/google/uuid" "golang.org/x/crypto/bcrypt" diff --git a/models/auth/oauth2_list.go b/models/auth/oauth2_list.go index c55f10b3c8..6f508833a0 100644 --- a/models/auth/oauth2_list.go +++ b/models/auth/oauth2_list.go @@ -4,7 +4,7 @@ package auth import ( - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index 9b562c8648..877541e0ff 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -8,10 +8,10 @@ import ( "slices" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/session.go b/models/auth/session.go index 75a205f702..b3724dafb6 100644 --- a/models/auth/session.go +++ b/models/auth/session.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/auth/session_test.go b/models/auth/session_test.go index 3b57239704..ab6415f289 100644 --- a/models/auth/session_test.go +++ b/models/auth/session_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/source.go b/models/auth/source.go index d7ed6b97a8..ecd3abc39d 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -9,11 +9,11 @@ import ( "fmt" "reflect" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/auth/source_test.go b/models/auth/source_test.go index 522fecc25f..ed21aef253 100644 --- a/models/auth/source_test.go +++ b/models/auth/source_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go index 67be23320e..f4c1e36b3f 100644 --- a/models/auth/twofactor.go +++ b/models/auth/twofactor.go @@ -11,10 +11,10 @@ import ( "encoding/hex" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/keying" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/pquerna/otp/totp" "golang.org/x/crypto/pbkdf2" diff --git a/models/auth/webauthn.go b/models/auth/webauthn.go index b230e1665a..5b86a6e6f2 100644 --- a/models/auth/webauthn.go +++ b/models/auth/webauthn.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/go-webauthn/webauthn/webauthn" ) diff --git a/models/auth/webauthn_test.go b/models/auth/webauthn_test.go index e1cd652009..abf8e34408 100644 --- a/models/auth/webauthn_test.go +++ b/models/auth/webauthn_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/go-webauthn/webauthn/webauthn" "github.com/stretchr/testify/assert" diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 9eb34dcbcc..ad59bd8769 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -14,10 +14,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/cache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "code.forgejo.org/forgejo-contrib/go-libravatar" ) diff --git a/models/avatars/avatar_test.go b/models/avatars/avatar_test.go index 85c40c3fa1..7850d2c096 100644 --- a/models/avatars/avatar_test.go +++ b/models/avatars/avatar_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - avatars_model "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" + avatars_model "forgejo.org/models/avatars" + "forgejo.org/models/db" + system_model "forgejo.org/models/system" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/avatars/main_test.go b/models/avatars/main_test.go index c721a7dc2a..bdc66954b1 100644 --- a/models/avatars/main_test.go +++ b/models/avatars/main_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" + _ "forgejo.org/models" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/db/collation.go b/models/db/collation.go index 39d28fa2ff..768ada89e6 100644 --- a/models/db/collation.go +++ b/models/db/collation.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/common.go b/models/db/common.go index f3fd3e72ae..c9b012597c 100644 --- a/models/db/common.go +++ b/models/db/common.go @@ -6,8 +6,8 @@ package db import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/db/context_test.go b/models/db/context_test.go index 855f360b75..7ab327b7e9 100644 --- a/models/db/context_test.go +++ b/models/db/context_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/convert.go b/models/db/convert.go index 956e17d411..1f37e49176 100644 --- a/models/db/convert.go +++ b/models/db/convert.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/engine.go b/models/db/engine.go index 822618a7e3..ca6576da8a 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/contexts" diff --git a/models/db/engine_test.go b/models/db/engine_test.go index 230ee3f2b1..5d20e3d602 100644 --- a/models/db/engine_test.go +++ b/models/db/engine_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" - _ "code.gitea.io/gitea/cmd" // for TestPrimaryKeys + _ "forgejo.org/cmd" // for TestPrimaryKeys "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -64,7 +64,7 @@ func TestPrimaryKeys(t *testing.T) { // https://github.com/go-gitea/gitea/issues/21086 // https://github.com/go-gitea/gitea/issues/16802 // To avoid creating tables without primary key again, this test will check them. - // Import "code.gitea.io/gitea/cmd" to make sure each db.RegisterModel in init functions has been called. + // Import "forgejo.org/cmd" to make sure each db.RegisterModel in init functions has been called. beans, err := db.NamesToBean() if err != nil { diff --git a/models/db/error.go b/models/db/error.go index 665e970e17..6b70c40eb3 100644 --- a/models/db/error.go +++ b/models/db/error.go @@ -6,7 +6,7 @@ package db import ( "fmt" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrCancelled represents an error due to context cancellation diff --git a/models/db/index.go b/models/db/index.go index 259ddd6ade..4c15dbe8a1 100644 --- a/models/db/index.go +++ b/models/db/index.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // ResourceIndex represents a resource index which could be used as issue/release and others diff --git a/models/db/index_test.go b/models/db/index_test.go index 11fbc70d8d..929e514329 100644 --- a/models/db/index_test.go +++ b/models/db/index_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/install/db.go b/models/db/install/db.go index d4c1139637..104a7a8e39 100644 --- a/models/db/install/db.go +++ b/models/db/install/db.go @@ -4,8 +4,8 @@ package install import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/db/iterate.go b/models/db/iterate.go index e1caefa72b..450c7d3389 100644 --- a/models/db/iterate.go +++ b/models/db/iterate.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/builder" ) diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 7535d01d56..47b6a956f4 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/list.go b/models/db/list.go index 5c005a0350..057221936c 100644 --- a/models/db/list.go +++ b/models/db/list.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/list_test.go b/models/db/list_test.go index 82240d205b..f13958496a 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -6,9 +6,9 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/db/log.go b/models/db/log.go index 457ee80ff5..b94af8e39c 100644 --- a/models/db/log.go +++ b/models/db/log.go @@ -7,7 +7,7 @@ import ( "fmt" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" xormlog "xorm.io/xorm/log" ) diff --git a/models/db/main_test.go b/models/db/main_test.go index 7d80b400fe..4b06923950 100644 --- a/models/db/main_test.go +++ b/models/db/main_test.go @@ -6,10 +6,10 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/repo" + _ "forgejo.org/models" + _ "forgejo.org/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/db/name.go b/models/db/name.go index 51be33a8bc..29b60b2373 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) var ( diff --git a/models/db/paginator/main_test.go b/models/db/paginator/main_test.go index 47993aed6b..e2528be121 100644 --- a/models/db/paginator/main_test.go +++ b/models/db/paginator/main_test.go @@ -6,7 +6,7 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/db/paginator/paginator_test.go b/models/db/paginator/paginator_test.go index 20602212d9..c6d0569aaa 100644 --- a/models/db/paginator/paginator_test.go +++ b/models/db/paginator/paginator_test.go @@ -6,8 +6,8 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/db/sequence.go b/models/db/sequence.go index f49ad935de..1740e74c52 100644 --- a/models/db/sequence.go +++ b/models/db/sequence.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // CountBadSequences looks for broken sequences from recreate-table mistakes diff --git a/models/db/sql_postgres_with_schema.go b/models/db/sql_postgres_with_schema.go index ec63447f6f..376f984dc6 100644 --- a/models/db/sql_postgres_with_schema.go +++ b/models/db/sql_postgres_with_schema.go @@ -8,7 +8,7 @@ import ( "database/sql/driver" "sync" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/lib/pq" "xorm.io/xorm/dialects" diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go index dd27b5c36b..12c0398abc 100644 --- a/models/dbfs/dbfile.go +++ b/models/dbfs/dbfile.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) var defaultFileBlockSize int64 = 32 * 1024 diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go index f68b4a2b70..ba57e50151 100644 --- a/models/dbfs/dbfs.go +++ b/models/dbfs/dbfs.go @@ -10,7 +10,7 @@ import ( "path" "time" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) /* diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go index 3ad273a732..8e42c54f31 100644 --- a/models/dbfs/dbfs_test.go +++ b/models/dbfs/dbfs_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go index 537ba0935d..3d4b2bc235 100644 --- a/models/dbfs/main_test.go +++ b/models/dbfs/main_test.go @@ -6,7 +6,7 @@ package dbfs import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/error.go b/models/error.go index 658bdc165c..e8962f386b 100644 --- a/models/error.go +++ b/models/error.go @@ -7,9 +7,9 @@ package models import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/util" ) // ErrUserOwnRepos represents a "UserOwnRepos" kind of error. diff --git a/models/forgefed/federationhost.go b/models/forgefed/federationhost.go index b60c0c39cf..00f13ea399 100644 --- a/models/forgefed/federationhost.go +++ b/models/forgefed/federationhost.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" ) // FederationHost data type diff --git a/models/forgefed/federationhost_repository.go b/models/forgefed/federationhost_repository.go index 03d8741c58..b04a5cd882 100644 --- a/models/forgefed/federationhost_repository.go +++ b/models/forgefed/federationhost_repository.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/validation" ) func init() { diff --git a/models/forgefed/federationhost_test.go b/models/forgefed/federationhost_test.go index ea5494c6e9..7e48a41d3b 100644 --- a/models/forgefed/federationhost_test.go +++ b/models/forgefed/federationhost_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_FederationHostValidation(t *testing.T) { diff --git a/models/forgefed/nodeinfo.go b/models/forgefed/nodeinfo.go index 66d2eca7aa..2461b5e499 100644 --- a/models/forgefed/nodeinfo.go +++ b/models/forgefed/nodeinfo.go @@ -6,7 +6,7 @@ package forgefed import ( "net/url" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" "github.com/valyala/fastjson" ) diff --git a/models/forgefed/nodeinfo_test.go b/models/forgefed/nodeinfo_test.go index 4c73bb44d8..9e37e77100 100644 --- a/models/forgefed/nodeinfo_test.go +++ b/models/forgefed/nodeinfo_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_NodeInfoWellKnownUnmarshalJSON(t *testing.T) { diff --git a/models/forgejo/semver/main_test.go b/models/forgejo/semver/main_test.go index 10875f14fe..dcc9d588cd 100644 --- a/models/forgejo/semver/main_test.go +++ b/models/forgejo/semver/main_test.go @@ -5,12 +5,12 @@ package semver import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/forgejo/semver/semver.go b/models/forgejo/semver/semver.go index 7f122d2301..24a3db9181 100644 --- a/models/forgejo/semver/semver.go +++ b/models/forgejo/semver/semver.go @@ -5,7 +5,7 @@ package semver import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/hashicorp/go-version" ) diff --git a/models/forgejo/semver/semver_test.go b/models/forgejo/semver/semver_test.go index a508c69b18..2d055e86bb 100644 --- a/models/forgejo/semver/semver_test.go +++ b/models/forgejo/semver/semver_test.go @@ -5,8 +5,8 @@ package semver import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/hashicorp/go-version" "github.com/stretchr/testify/assert" diff --git a/models/forgejo_migrations/main_test.go b/models/forgejo_migrations/main_test.go index 2297f74f73..031fe8090d 100644 --- a/models/forgejo_migrations/main_test.go +++ b/models/forgejo_migrations/main_test.go @@ -6,7 +6,7 @@ package forgejo_migrations //nolint:revive import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/forgejo_migrations/migrate.go b/models/forgejo_migrations/migrate.go index 935b072331..a4cbca70c1 100644 --- a/models/forgejo_migrations/migrate.go +++ b/models/forgejo_migrations/migrate.go @@ -8,12 +8,12 @@ import ( "fmt" "os" - "code.gitea.io/gitea/models/forgejo/semver" - forgejo_v1_20 "code.gitea.io/gitea/models/forgejo_migrations/v1_20" - forgejo_v1_22 "code.gitea.io/gitea/models/forgejo_migrations/v1_22" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/forgejo/semver" + forgejo_v1_20 "forgejo.org/models/forgejo_migrations/v1_20" + forgejo_v1_22 "forgejo.org/models/forgejo_migrations/v1_22" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/forgejo_migrations/migrate_test.go b/models/forgejo_migrations/migrate_test.go index 48ee4f77b1..20653929a3 100644 --- a/models/forgejo_migrations/migrate_test.go +++ b/models/forgejo_migrations/migrate_test.go @@ -6,7 +6,7 @@ package forgejo_migrations //nolint:revive import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/require" ) diff --git a/models/forgejo_migrations/v14.go b/models/forgejo_migrations/v14.go index f6dd35ecf0..53f1ef2223 100644 --- a/models/forgejo_migrations/v14.go +++ b/models/forgejo_migrations/v14.go @@ -4,7 +4,7 @@ package forgejo_migrations //nolint:revive import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v15.go b/models/forgejo_migrations/v15.go index d7ed19ca7c..5e5588dd05 100644 --- a/models/forgejo_migrations/v15.go +++ b/models/forgejo_migrations/v15.go @@ -6,7 +6,7 @@ package forgejo_migrations //nolint:revive import ( "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_20/v1.go b/models/forgejo_migrations/v1_20/v1.go index 1097613655..72beaf23de 100644 --- a/models/forgejo_migrations/v1_20/v1.go +++ b/models/forgejo_migrations/v1_20/v1.go @@ -4,7 +4,7 @@ package forgejo_v1_20 //nolint:revive import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_20/v3.go b/models/forgejo_migrations/v1_20/v3.go index caa4f1aa99..cce227e6eb 100644 --- a/models/forgejo_migrations/v1_20/v3.go +++ b/models/forgejo_migrations/v1_20/v3.go @@ -4,7 +4,7 @@ package forgejo_v1_20 //nolint:revive import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_22/main_test.go b/models/forgejo_migrations/v1_22/main_test.go index 097110893f..03c4c5272c 100644 --- a/models/forgejo_migrations/v1_22/main_test.go +++ b/models/forgejo_migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/forgejo_migrations/v1_22/v11.go b/models/forgejo_migrations/v1_22/v11.go index c693993565..17bb592379 100644 --- a/models/forgejo_migrations/v1_22/v11.go +++ b/models/forgejo_migrations/v1_22/v11.go @@ -4,7 +4,7 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/forgejo_migrations/v1_22/v8_test.go b/models/forgejo_migrations/v1_22/v8_test.go index 128fd08ab0..2af9e431b1 100644 --- a/models/forgejo_migrations/v1_22/v8_test.go +++ b/models/forgejo_migrations/v1_22/v8_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/forgejo_migrations/v25.go b/models/forgejo_migrations/v25.go index 5e3dff80b3..8e3032a40c 100644 --- a/models/forgejo_migrations/v25.go +++ b/models/forgejo_migrations/v25.go @@ -9,11 +9,11 @@ import ( "encoding/base64" "fmt" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/forgejo_migrations/v25_test.go b/models/forgejo_migrations/v25_test.go index 73b97f7a35..e7402fd021 100644 --- a/models/forgejo_migrations/v25_test.go +++ b/models/forgejo_migrations/v25_test.go @@ -6,10 +6,10 @@ package forgejo_migrations //nolint:revive import ( "testing" - "code.gitea.io/gitea/models/auth" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/auth" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/keying" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/forgejo_migrations/v27.go b/models/forgejo_migrations/v27.go index b3a93a9aad..2efa3485a8 100644 --- a/models/forgejo_migrations/v27.go +++ b/models/forgejo_migrations/v27.go @@ -4,7 +4,7 @@ package forgejo_migrations //nolint:revive import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/git/branch.go b/models/git/branch.go index 702d767c75..a73a0f2a20 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -8,14 +8,14 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/git/branch_list.go b/models/git/branch_list.go index 81a43eaea3..4b678f15c0 100644 --- a/models/git/branch_list.go +++ b/models/git/branch_list.go @@ -6,10 +6,10 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" "xorm.io/builder" ) diff --git a/models/git/branch_test.go b/models/git/branch_test.go index 81839eb774..5c1762750e 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -7,13 +7,13 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/commit_status.go b/models/git/commit_status.go index f6ac1dcc54..a679703ffd 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -13,16 +13,16 @@ import ( "strings" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/git/commit_status_summary.go b/models/git/commit_status_summary.go index 7603e7aa65..448aa5aed7 100644 --- a/models/git/commit_status_summary.go +++ b/models/git/commit_status_summary.go @@ -6,9 +6,9 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" "xorm.io/builder" ) diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index 9a039bfc39..c062bbbbb9 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -8,15 +8,15 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/structs" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/lfs.go b/models/git/lfs.go index 635d70d9bc..9ec1ca7d8a 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -7,16 +7,16 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go index 07ce7d4abf..9dc0a947c3 100644 --- a/models/git/lfs_lock.go +++ b/models/git/lfs_lock.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // LFSLock represents a git lfs lock of repository. diff --git a/models/git/lfs_lock_list.go b/models/git/lfs_lock_list.go index cab1e61cab..ffa4db21c4 100644 --- a/models/git/lfs_lock_list.go +++ b/models/git/lfs_lock_list.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" ) // LFSLockList is a list of LFSLock diff --git a/models/git/lfs_test.go b/models/git/lfs_test.go index afb73ecf4e..8a2d3c8caf 100644 --- a/models/git/lfs_test.go +++ b/models/git/lfs_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/git/main_test.go b/models/git/main_test.go index f25ad42584..63a3c363ab 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -6,12 +6,12 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go index 4fc08020e0..c1eb750230 100644 --- a/models/git/protected_branch.go +++ b/models/git/protected_branch.go @@ -10,16 +10,16 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "github.com/gobwas/glob" "github.com/gobwas/glob/syntax" diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 613333a5a2..c7a3154884 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -7,8 +7,8 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/modules/optional" "github.com/gobwas/glob" ) diff --git a/models/git/protected_tag.go b/models/git/protected_tag.go index 9a6646c742..eeaae41868 100644 --- a/models/git/protected_tag.go +++ b/models/git/protected_tag.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/modules/timeutil" "github.com/gobwas/glob" ) diff --git a/models/git/protected_tag_test.go b/models/git/protected_tag_test.go index 796e1594b9..eec13fdc1f 100644 --- a/models/git/protected_tag_test.go +++ b/models/git/protected_tag_test.go @@ -6,9 +6,9 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/action_aggregator.go b/models/issues/action_aggregator.go index 722696fbb2..cf5be753f1 100644 --- a/models/issues/action_aggregator.go +++ b/models/issues/action_aggregator.go @@ -6,8 +6,8 @@ package issues import ( "slices" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" ) type ActionAggregator struct { diff --git a/models/issues/assignees.go b/models/issues/assignees.go index a83cb250fa..b1099b6b63 100644 --- a/models/issues/assignees.go +++ b/models/issues/assignees.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go index 47fb81a237..a5e8f0cb09 100644 --- a/models/issues/assignees_test.go +++ b/models/issues/assignees_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/comment.go b/models/issues/comment.go index f77b2bcc8d..ce4cb6ea93 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -12,22 +12,22 @@ import ( "strconv" "unicode/utf8" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/references" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 2f6f57e0da..3c87a1b41a 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" "xorm.io/builder" ) diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go index 7a133d1c16..7285e347b4 100644 --- a/models/issues/comment_list.go +++ b/models/issues/comment_list.go @@ -6,11 +6,11 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" ) // CommentList defines a list of comments diff --git a/models/issues/comment_list_test.go b/models/issues/comment_list_test.go index 5ad1cd19c9..062a710b84 100644 --- a/models/issues/comment_list_test.go +++ b/models/issues/comment_list_test.go @@ -6,10 +6,10 @@ package issues import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go index 88d2200bd1..0e257f533c 100644 --- a/models/issues/comment_test.go +++ b/models/issues/comment_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/content_history.go b/models/issues/content_history.go index cd3e217b21..476c6e0f90 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/avatars" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index dde6f195bc..4e158da1cc 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/dependency.go b/models/issues/dependency.go index 146dd1887d..fab35dad12 100644 --- a/models/issues/dependency.go +++ b/models/issues/dependency.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrDependencyExists represents a "DependencyAlreadyExists" kind of error. diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index 1e73c581ee..46f3ad10e5 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue.go b/models/issues/issue.go index 79701c7be8..142f2de182 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -11,16 +11,16 @@ import ( "regexp" "slices" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_index.go b/models/issues/issue_index.go index 9386027f74..5012067d70 100644 --- a/models/issues/issue_index.go +++ b/models/issues/issue_index.go @@ -6,7 +6,7 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) func GetMaxIssueIndexForRepo(ctx context.Context, repoID int64) (int64, error) { diff --git a/models/issues/issue_index_test.go b/models/issues/issue_index_test.go index eb79a0806c..6de3f0bc95 100644 --- a/models/issues/issue_index_test.go +++ b/models/issues/issue_index_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go index 04e1fa3d7d..c9e792ed0f 100644 --- a/models/issues/issue_label.go +++ b/models/issues/issue_label.go @@ -8,9 +8,9 @@ import ( "fmt" "sort" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/issues/issue_label_test.go b/models/issues/issue_label_test.go index 67f4874c8f..753e389c7b 100644 --- a/models/issues/issue_label_test.go +++ b/models/issues/issue_label_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index fe6c630a31..5a02baa428 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "forgejo.org/models/db" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" "xorm.io/builder" ) diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go index 32cc0fe423..7aa5222958 100644 --- a/models/issues/issue_list_test.go +++ b/models/issues/issue_list_test.go @@ -6,11 +6,11 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_lock.go b/models/issues/issue_lock.go index b21629b529..1e4a5906d9 100644 --- a/models/issues/issue_lock.go +++ b/models/issues/issue_lock.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // IssueLockOptions defines options for locking and/or unlocking an issue/PR diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index 697ef7fad6..3c6ce0ca1c 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -6,12 +6,12 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + project_model "forgejo.org/models/project" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/util" ) // LoadProject load the project the issue was assigned to diff --git a/models/issues/issue_project_test.go b/models/issues/issue_project_test.go index d724922946..f518679f34 100644 --- a/models/issues/issue_project_test.go +++ b/models/issues/issue_project_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/project" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index 6592f3708c..bf4b89ee0b 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -9,13 +9,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go index fdc06b05d1..eee8760b9f 100644 --- a/models/issues/issue_stats.go +++ b/models/issues/issue_stats.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_stats_test.go b/models/issues/issue_stats_test.go index 9967557337..549dc04433 100644 --- a/models/issues/issue_stats_test.go +++ b/models/issues/issue_stats_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index d121435f0a..afca27dfcf 100644 --- a/models/issues/issue_test.go +++ b/models/issues/issue_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index ad59b767ab..9d0bc84454 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -8,20 +8,20 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/references" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/references" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 6b59e0725e..70e162411f 100644 --- a/models/issues/issue_user.go +++ b/models/issues/issue_user.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" ) // IssueUser represents an issue-user relation. diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index e059e43e8b..77e6c5bc5a 100644 --- a/models/issues/issue_user_test.go +++ b/models/issues/issue_user_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/require" ) diff --git a/models/issues/issue_watch.go b/models/issues/issue_watch.go index 560be17eb6..ecc09e1e81 100644 --- a/models/issues/issue_watch.go +++ b/models/issues/issue_watch.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" ) // IssueWatch is connection request for receiving issue notification. diff --git a/models/issues/issue_watch_test.go b/models/issues/issue_watch_test.go index 573215d577..a5c01693fa 100644 --- a/models/issues/issue_watch_test.go +++ b/models/issues/issue_watch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go index 9c9d5d66cd..4c753a58eb 100644 --- a/models/issues/issue_xref.go +++ b/models/issues/issue_xref.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/references" ) type crossReference struct { diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index a24d1b04ee..e74717be1e 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/references" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/references" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/label.go b/models/issues/label.go index cb5fdd577d..264ca8cc3d 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/label" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 3e3d097458..f2ba28a6d2 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/main_test.go b/models/issues/main_test.go index baabd6646a..05d854c964 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/repo" + _ "forgejo.org/models/user" "github.com/stretchr/testify/require" ) diff --git a/models/issues/milestone.go b/models/issues/milestone.go index 03fab8b3ee..52433e735d 100644 --- a/models/issues/milestone.go +++ b/models/issues/milestone.go @@ -9,12 +9,12 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index 955ab2356d..e2079fb324 100644 --- a/models/issues/milestone_list.go +++ b/models/issues/milestone_list.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index c83450e9db..bfb4f38ad0 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/pull.go b/models/issues/pull.go index 708dff9b8e..c46961447c 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -12,17 +12,17 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - org_model "code.gitea.io/gitea/models/organization" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + org_model "forgejo.org/models/organization" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index 123ff18d81..a448673454 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 8e0c020ad9..a2dde055a6 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/reaction.go b/models/issues/reaction.go index 11b3c6be20..522040c022 100644 --- a/models/issues/reaction.go +++ b/models/issues/reaction.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/reaction_test.go b/models/issues/reaction_test.go index e02e6d7e0c..0ae201c500 100644 --- a/models/issues/reaction_test.go +++ b/models/issues/reaction_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/review.go b/models/issues/review.go index cd3190f119..db5cd65e2e 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -9,16 +9,16 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review_list.go b/models/issues/review_list.go index a5ceb21791..45480832d8 100644 --- a/models/issues/review_list.go +++ b/models/issues/review_list.go @@ -6,11 +6,11 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - organization_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + organization_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 51cb940579..33d131c225 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -6,11 +6,11 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/stopwatch.go b/models/issues/stopwatch.go index 68e59d59f4..2ff2a17d92 100644 --- a/models/issues/stopwatch.go +++ b/models/issues/stopwatch.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrIssueStopwatchNotExist represents an error that stopwatch is not exist diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go index af86e8b1d8..8920023a3b 100644 --- a/models/issues/stopwatch_test.go +++ b/models/issues/stopwatch_test.go @@ -7,12 +7,12 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index ea404d36cd..05d7b15815 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -9,11 +9,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index 4d4e232012..770b43abd7 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/main_test.go b/models/main_test.go index f9e019f5e2..0edcf8f49d 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -6,15 +6,15 @@ package models import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/system" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/system" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index 333fa3151f..897ad016ab 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/base/db_test.go b/models/migrations/base/db_test.go index 4010a14311..4a610e065d 100644 --- a/models/migrations/base/db_test.go +++ b/models/migrations/base/db_test.go @@ -6,8 +6,8 @@ package base import ( "testing" - migrations_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" + migrations_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" "xorm.io/xorm/names" ) diff --git a/models/migrations/base/main_test.go b/models/migrations/base/main_test.go index c625ef02b8..2b3889441a 100644 --- a/models/migrations/base/main_test.go +++ b/models/migrations/base/main_test.go @@ -6,7 +6,7 @@ package base import ( "testing" - migrations_tests "code.gitea.io/gitea/models/migrations/test" + migrations_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 1674af08cd..11933014d7 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -8,29 +8,29 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/forgejo_migrations" - "code.gitea.io/gitea/models/migrations/v1_10" - "code.gitea.io/gitea/models/migrations/v1_11" - "code.gitea.io/gitea/models/migrations/v1_12" - "code.gitea.io/gitea/models/migrations/v1_13" - "code.gitea.io/gitea/models/migrations/v1_14" - "code.gitea.io/gitea/models/migrations/v1_15" - "code.gitea.io/gitea/models/migrations/v1_16" - "code.gitea.io/gitea/models/migrations/v1_17" - "code.gitea.io/gitea/models/migrations/v1_18" - "code.gitea.io/gitea/models/migrations/v1_19" - "code.gitea.io/gitea/models/migrations/v1_20" - "code.gitea.io/gitea/models/migrations/v1_21" - "code.gitea.io/gitea/models/migrations/v1_22" - "code.gitea.io/gitea/models/migrations/v1_23" - "code.gitea.io/gitea/models/migrations/v1_6" - "code.gitea.io/gitea/models/migrations/v1_7" - "code.gitea.io/gitea/models/migrations/v1_8" - "code.gitea.io/gitea/models/migrations/v1_9" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - forgejo_services "code.gitea.io/gitea/services/forgejo" + "forgejo.org/models/forgejo_migrations" + "forgejo.org/models/migrations/v1_10" + "forgejo.org/models/migrations/v1_11" + "forgejo.org/models/migrations/v1_12" + "forgejo.org/models/migrations/v1_13" + "forgejo.org/models/migrations/v1_14" + "forgejo.org/models/migrations/v1_15" + "forgejo.org/models/migrations/v1_16" + "forgejo.org/models/migrations/v1_17" + "forgejo.org/models/migrations/v1_18" + "forgejo.org/models/migrations/v1_19" + "forgejo.org/models/migrations/v1_20" + "forgejo.org/models/migrations/v1_21" + "forgejo.org/models/migrations/v1_22" + "forgejo.org/models/migrations/v1_23" + "forgejo.org/models/migrations/v1_6" + "forgejo.org/models/migrations/v1_7" + "forgejo.org/models/migrations/v1_8" + "forgejo.org/models/migrations/v1_9" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + forgejo_services "forgejo.org/services/forgejo" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go index 78c2898996..ea941b9a09 100644 --- a/models/migrations/migrations_test.go +++ b/models/migrations/migrations_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/test/tests.go b/models/migrations/test/tests.go index 177e33c56a..07487cf58a 100644 --- a/models/migrations/test/tests.go +++ b/models/migrations/test/tests.go @@ -15,14 +15,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go index 34c8240031..3bfb770f24 100644 --- a/models/migrations/v1_10/v96.go +++ b/models/migrations/v1_10/v96.go @@ -6,8 +6,8 @@ package v1_10 //nolint import ( "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go index ebe6597f7c..7f287b77aa 100644 --- a/models/migrations/v1_10/v99.go +++ b/models/migrations/v1_10/v99.go @@ -4,7 +4,7 @@ package v1_10 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go index 9358e4cef3..a585d9c423 100644 --- a/models/migrations/v1_11/v102.go +++ b/models/migrations/v1_11/v102.go @@ -4,7 +4,7 @@ package v1_11 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go index 3e8ee64bc1..af3578ca4a 100644 --- a/models/migrations/v1_11/v104.go +++ b/models/migrations/v1_11/v104.go @@ -4,7 +4,7 @@ package v1_11 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go index 0857663119..6112ab51a5 100644 --- a/models/migrations/v1_11/v112.go +++ b/models/migrations/v1_11/v112.go @@ -7,8 +7,8 @@ import ( "fmt" "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go index 8c631cfd0b..3d4b41017b 100644 --- a/models/migrations/v1_11/v115.go +++ b/models/migrations/v1_11/v115.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go index 00e391dc87..11a4042973 100644 --- a/models/migrations/v1_12/v127.go +++ b/models/migrations/v1_12/v127.go @@ -6,7 +6,7 @@ package v1_12 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index 6eea1337ef..6d7307f470 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go index 391810c7ca..bfa856796a 100644 --- a/models/migrations/v1_12/v130.go +++ b/models/migrations/v1_12/v130.go @@ -4,8 +4,8 @@ package v1_12 //nolint import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index 23c2916ba8..bba996fd40 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go index d91ff92feb..db6fc6dea1 100644 --- a/models/migrations/v1_12/v136.go +++ b/models/migrations/v1_12/v136.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index 5b6576951d..cd7963524e 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -4,7 +4,7 @@ package v1_12 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index 2d3337012d..d74f808e9f 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -6,8 +6,8 @@ package v1_13 //nolint import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go index 7c7c01ad47..7490e0f3b4 100644 --- a/models/migrations/v1_13/v142.go +++ b/models/migrations/v1_13/v142.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go index 885768dff3..1f9120e2ba 100644 --- a/models/migrations/v1_13/v143.go +++ b/models/migrations/v1_13/v143.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go index f5a0bc5751..7e801eab8a 100644 --- a/models/migrations/v1_13/v144.go +++ b/models/migrations/v1_13/v144.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index 5b38f1cd80..a01f577ed1 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -6,7 +6,7 @@ package v1_13 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go index 7d9a878704..a1b54ee3aa 100644 --- a/models/migrations/v1_13/v146.go +++ b/models/migrations/v1_13/v146.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go index 510ef39b28..cc57504c74 100644 --- a/models/migrations/v1_13/v147.go +++ b/models/migrations/v1_13/v147.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go index 2a1db04cbb..3a0c5909d5 100644 --- a/models/migrations/v1_13/v149.go +++ b/models/migrations/v1_13/v149.go @@ -6,7 +6,7 @@ package v1_13 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go index d5ba489566..be14fd130c 100644 --- a/models/migrations/v1_13/v150.go +++ b/models/migrations/v1_13/v150.go @@ -4,8 +4,8 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index ea4a8eae31..60339962cb 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go index 60cc56713e..cf31190781 100644 --- a/models/migrations/v1_13/v154.go +++ b/models/migrations/v1_13/v154.go @@ -4,7 +4,7 @@ package v1_13 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go index cf7fcb56a6..c01faedc35 100644 --- a/models/migrations/v1_14/main_test.go +++ b/models/migrations/v1_14/main_test.go @@ -6,7 +6,7 @@ package v1_14 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go index 2cf4954a15..b6dc91a054 100644 --- a/models/migrations/v1_14/v156.go +++ b/models/migrations/v1_14/v156.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 2d688b1706..9849d5a9ea 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -7,8 +7,8 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go index 149ae0f6a8..fdd7e12449 100644 --- a/models/migrations/v1_14/v159.go +++ b/models/migrations/v1_14/v159.go @@ -4,8 +4,8 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go index ac7e821a80..6e904cfab6 100644 --- a/models/migrations/v1_14/v161.go +++ b/models/migrations/v1_14/v161.go @@ -6,7 +6,7 @@ package v1_14 //nolint import ( "context" - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go index 2e4e0b8eb0..5d6d7c2e3f 100644 --- a/models/migrations/v1_14/v162.go +++ b/models/migrations/v1_14/v162.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go index 0cd8ba68c8..60fc98c0a4 100644 --- a/models/migrations/v1_14/v163.go +++ b/models/migrations/v1_14/v163.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go index 5b1a779294..9315e44197 100644 --- a/models/migrations/v1_14/v165.go +++ b/models/migrations/v1_14/v165.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go index 0f9bef902a..d49b70f5ad 100644 --- a/models/migrations/v1_14/v172.go +++ b/models/migrations/v1_14/v172.go @@ -4,7 +4,7 @@ package v1_14 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index 70d72b2600..3cda5772a0 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -7,8 +7,8 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go index f5e644e501..d88ff207e7 100644 --- a/models/migrations/v1_14/v176_test.go +++ b/models/migrations/v1_14/v176_test.go @@ -6,7 +6,7 @@ package v1_14 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go index cf5e745d39..199a71186a 100644 --- a/models/migrations/v1_14/v177_test.go +++ b/models/migrations/v1_14/v177_test.go @@ -6,8 +6,8 @@ package v1_14 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go index e4960658d3..6c04d3f5ee 100644 --- a/models/migrations/v1_15/main_test.go +++ b/models/migrations/v1_15/main_test.go @@ -6,7 +6,7 @@ package v1_15 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go index f6b142eb42..b990583303 100644 --- a/models/migrations/v1_15/v179.go +++ b/models/migrations/v1_15/v179.go @@ -4,7 +4,7 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go index c71e771861..02fbd57cdb 100644 --- a/models/migrations/v1_15/v180.go +++ b/models/migrations/v1_15/v180.go @@ -4,8 +4,8 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go index ead26f5fcf..4544ca6520 100644 --- a/models/migrations/v1_15/v181_test.go +++ b/models/migrations/v1_15/v181_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go index eb21311339..6865cafac4 100644 --- a/models/migrations/v1_15/v182_test.go +++ b/models/migrations/v1_15/v182_test.go @@ -6,7 +6,7 @@ package v1_15 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go index effad1b467..aaad64c220 100644 --- a/models/migrations/v1_15/v183.go +++ b/models/migrations/v1_15/v183.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 871c9db18a..41b64d4743 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go index 01aab3add5..ad75822de5 100644 --- a/models/migrations/v1_15/v186.go +++ b/models/migrations/v1_15/v186.go @@ -4,7 +4,7 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go index 21cd6772b7..b573fc52ef 100644 --- a/models/migrations/v1_15/v187.go +++ b/models/migrations/v1_15/v187.go @@ -4,7 +4,7 @@ package v1_15 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go index 49611776dd..6f891f3e94 100644 --- a/models/migrations/v1_16/main_test.go +++ b/models/migrations/v1_16/main_test.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go index 5649645051..1ee72d9c39 100644 --- a/models/migrations/v1_16/v189.go +++ b/models/migrations/v1_16/v189.go @@ -7,8 +7,8 @@ import ( "encoding/binary" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go index 88c6ebd2b1..e72c385168 100644 --- a/models/migrations/v1_16/v189_test.go +++ b/models/migrations/v1_16/v189_test.go @@ -6,8 +6,8 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/json" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index c618783c08..567f88d6d1 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -4,7 +4,7 @@ package v1_16 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go index 2d5d158a09..731b9fb43a 100644 --- a/models/migrations/v1_16/v192.go +++ b/models/migrations/v1_16/v192.go @@ -4,7 +4,7 @@ package v1_16 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go index 0da670888b..ab39bcd98c 100644 --- a/models/migrations/v1_16/v193_test.go +++ b/models/migrations/v1_16/v193_test.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go index 9a62fc9649..71234a6fb3 100644 --- a/models/migrations/v1_16/v195_test.go +++ b/models/migrations/v1_16/v195_test.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go index 115bb313a0..8b3c73addc 100644 --- a/models/migrations/v1_16/v198.go +++ b/models/migrations/v1_16/v198.go @@ -6,7 +6,7 @@ package v1_16 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go index d6c577083c..a064b9830d 100644 --- a/models/migrations/v1_16/v205.go +++ b/models/migrations/v1_16/v205.go @@ -4,7 +4,7 @@ package v1_16 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go index db45b11aed..375a008e18 100644 --- a/models/migrations/v1_16/v210.go +++ b/models/migrations/v1_16/v210.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go index 7321350de2..010cd8a770 100644 --- a/models/migrations/v1_16/v210_test.go +++ b/models/migrations/v1_16/v210_test.go @@ -7,8 +7,8 @@ import ( "encoding/hex" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go index 8a787f68b6..0a8e05ab5f 100644 --- a/models/migrations/v1_17/main_test.go +++ b/models/migrations/v1_17/main_test.go @@ -6,7 +6,7 @@ package v1_17 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go index e3f9437121..2337adcc80 100644 --- a/models/migrations/v1_17/v212.go +++ b/models/migrations/v1_17/v212.go @@ -4,7 +4,7 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go index b338f85417..5aae798562 100644 --- a/models/migrations/v1_17/v215.go +++ b/models/migrations/v1_17/v215.go @@ -4,8 +4,8 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/pull" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index 3f970b68a5..5f096d4824 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -4,7 +4,7 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index 4c05a9b539..5e3dcd0841 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -4,8 +4,8 @@ package v1_17 //nolint import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go index d266029fd9..e90656090f 100644 --- a/models/migrations/v1_17/v219.go +++ b/models/migrations/v1_17/v219.go @@ -6,8 +6,8 @@ package v1_17 //nolint import ( "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/repo" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go index d4007163ab..61bbf19725 100644 --- a/models/migrations/v1_17/v220.go +++ b/models/migrations/v1_17/v220.go @@ -4,8 +4,8 @@ package v1_17 //nolint import ( - packages_model "code.gitea.io/gitea/models/packages" - container_module "code.gitea.io/gitea/modules/packages/container" + packages_model "forgejo.org/models/packages" + container_module "forgejo.org/modules/packages/container" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go index 9e159388bd..84e9a238af 100644 --- a/models/migrations/v1_17/v221.go +++ b/models/migrations/v1_17/v221.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go index 0f6db2a54f..02607d6b32 100644 --- a/models/migrations/v1_17/v221_test.go +++ b/models/migrations/v1_17/v221_test.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go index 2ffb94eb1c..c9a33f007d 100644 --- a/models/migrations/v1_17/v222.go +++ b/models/migrations/v1_17/v222.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index 3592eb1be6..7d92dcf5ae 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go index 329aa2003a..33f5c51222 100644 --- a/models/migrations/v1_18/main_test.go +++ b/models/migrations/v1_18/main_test.go @@ -6,7 +6,7 @@ package v1_18 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index b0ac3777fc..86bcb1323d 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -4,7 +4,7 @@ package v1_18 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go index 5fe5dcd0c9..b6250fb76c 100644 --- a/models/migrations/v1_18/v227.go +++ b/models/migrations/v1_18/v227.go @@ -4,7 +4,7 @@ package v1_18 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go index 3e7a36de15..1161c8a4c9 100644 --- a/models/migrations/v1_18/v228.go +++ b/models/migrations/v1_18/v228.go @@ -4,7 +4,7 @@ package v1_18 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go index 10d9f35097..f96dde9840 100644 --- a/models/migrations/v1_18/v229.go +++ b/models/migrations/v1_18/v229.go @@ -6,7 +6,7 @@ package v1_18 //nolint import ( "fmt" - "code.gitea.io/gitea/models/issues" + "forgejo.org/models/issues" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go index b20d0ff3a2..ac5e726a79 100644 --- a/models/migrations/v1_18/v229_test.go +++ b/models/migrations/v1_18/v229_test.go @@ -6,8 +6,8 @@ package v1_18 //nolint import ( "testing" - "code.gitea.io/gitea/models/issues" - migration_tests "code.gitea.io/gitea/models/migrations/test" + "forgejo.org/models/issues" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go index 82b3b8f2b0..7dd6675673 100644 --- a/models/migrations/v1_18/v230_test.go +++ b/models/migrations/v1_18/v230_test.go @@ -6,7 +6,7 @@ package v1_18 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go index 18696a7f69..7c56926f4c 100644 --- a/models/migrations/v1_19/main_test.go +++ b/models/migrations/v1_19/main_test.go @@ -6,7 +6,7 @@ package v1_19 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index 9caf587c1e..7fb4a5ac8d 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go index ba4cd8e20b..191afd4868 100644 --- a/models/migrations/v1_19/v233.go +++ b/models/migrations/v1_19/v233.go @@ -6,10 +6,10 @@ package v1_19 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/json" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go index 94e9bc3a11..de025ca2b7 100644 --- a/models/migrations/v1_19/v233_test.go +++ b/models/migrations/v1_19/v233_test.go @@ -6,11 +6,11 @@ package v1_19 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - webhook_module "code.gitea.io/gitea/modules/webhook" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/json" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go index 728a580807..c610a423dd 100644 --- a/models/migrations/v1_19/v234.go +++ b/models/migrations/v1_19/v234.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go index f172a85b1f..fa01a6ab80 100644 --- a/models/migrations/v1_19/v236.go +++ b/models/migrations/v1_19/v236.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 266e6cea58..7c912a8341 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 4505f86299..4ca5becede 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -4,8 +4,8 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index 4470835214..bbf227ef77 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go index e8d95b0e1e..f870dca429 100644 --- a/models/migrations/v1_20/main_test.go +++ b/models/migrations/v1_20/main_test.go @@ -6,7 +6,7 @@ package v1_20 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go index b0d4c21502..7e6585388b 100644 --- a/models/migrations/v1_20/v245.go +++ b/models/migrations/v1_20/v245.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go index 59fc5c46b5..9ed810a623 100644 --- a/models/migrations/v1_20/v247.go +++ b/models/migrations/v1_20/v247.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go index 02951a74d6..d2b096bf58 100644 --- a/models/migrations/v1_20/v249.go +++ b/models/migrations/v1_20/v249.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go index 86388ef0b8..cfcde2fc9b 100644 --- a/models/migrations/v1_20/v250.go +++ b/models/migrations/v1_20/v250.go @@ -6,7 +6,7 @@ package v1_20 //nolint import ( "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go index 7743248a3f..c8665ba7eb 100644 --- a/models/migrations/v1_20/v251.go +++ b/models/migrations/v1_20/v251.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go index ab61cd9b8b..bb85c78309 100644 --- a/models/migrations/v1_20/v252.go +++ b/models/migrations/v1_20/v252.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go index 96c494bd8d..5f4057e9d9 100644 --- a/models/migrations/v1_20/v253.go +++ b/models/migrations/v1_20/v253.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go index 14b70f8f96..49b0ecf220 100644 --- a/models/migrations/v1_20/v255.go +++ b/models/migrations/v1_20/v255.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go index 6c6ca4c748..70f229d73f 100644 --- a/models/migrations/v1_20/v257.go +++ b/models/migrations/v1_20/v257.go @@ -4,7 +4,7 @@ package v1_20 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go index 5b8ced4ad7..f10b94fa9c 100644 --- a/models/migrations/v1_20/v259.go +++ b/models/migrations/v1_20/v259.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go index ae219ea814..d67cc9dd81 100644 --- a/models/migrations/v1_20/v259_test.go +++ b/models/migrations/v1_20/v259_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go index 0148170458..7104887afb 100644 --- a/models/migrations/v1_21/main_test.go +++ b/models/migrations/v1_21/main_test.go @@ -6,7 +6,7 @@ package v1_21 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index 6ca52c5998..245f3011ab 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -4,7 +4,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go index 4ec1160d0b..743bef152d 100644 --- a/models/migrations/v1_21/v261.go +++ b/models/migrations/v1_21/v261.go @@ -4,7 +4,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go index e81a17ad6d..88eaf0d918 100644 --- a/models/migrations/v1_21/v264.go +++ b/models/migrations/v1_21/v264.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go index bc0e954bdc..f94696a22b 100644 --- a/models/migrations/v1_21/v267.go +++ b/models/migrations/v1_21/v267.go @@ -4,7 +4,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go index 098f6499d5..f45c113c1f 100644 --- a/models/migrations/v1_21/v271.go +++ b/models/migrations/v1_21/v271.go @@ -3,7 +3,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go index 61c79f4a76..1ec6ade566 100644 --- a/models/migrations/v1_21/v273.go +++ b/models/migrations/v1_21/v273.go @@ -3,7 +3,7 @@ package v1_21 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go index df5994f159..b74e5fed51 100644 --- a/models/migrations/v1_21/v274.go +++ b/models/migrations/v1_21/v274.go @@ -5,7 +5,7 @@ package v1_21 //nolint import ( "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go index 67e950177d..0830c3bd92 100644 --- a/models/migrations/v1_21/v276.go +++ b/models/migrations/v1_21/v276.go @@ -4,8 +4,8 @@ package v1_21 //nolint import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go index 2005789b6d..dc991b78fe 100644 --- a/models/migrations/v1_22/main_test.go +++ b/models/migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go index fc1866aa83..5271c786be 100644 --- a/models/migrations/v1_22/v281.go +++ b/models/migrations/v1_22/v281.go @@ -4,7 +4,7 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go index 5f6c04a881..d8e147a131 100644 --- a/models/migrations/v1_22/v283_test.go +++ b/models/migrations/v1_22/v283_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/require" ) diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index 97ff649dca..d0489e7aeb 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -5,8 +5,8 @@ package v1_22 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go index 76b00e5b14..e6f8d4096e 100644 --- a/models/migrations/v1_22/v286_test.go +++ b/models/migrations/v1_22/v286_test.go @@ -6,7 +6,7 @@ package v1_22 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go index 7c93bfcc66..44e4991851 100644 --- a/models/migrations/v1_22/v288.go +++ b/models/migrations/v1_22/v288.go @@ -4,7 +4,7 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v290.go b/models/migrations/v1_22/v290.go index e3c58b0515..594e417644 100644 --- a/models/migrations/v1_22/v290.go +++ b/models/migrations/v1_22/v290.go @@ -4,8 +4,8 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v290_test.go b/models/migrations/v1_22/v290_test.go index ced200f83f..569d77bc16 100644 --- a/models/migrations/v1_22/v290_test.go +++ b/models/migrations/v1_22/v290_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go index 53cc719294..9f38c3db56 100644 --- a/models/migrations/v1_22/v293.go +++ b/models/migrations/v1_22/v293.go @@ -4,8 +4,8 @@ package v1_22 //nolint import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go index 85bb46421b..444146737d 100644 --- a/models/migrations/v1_22/v293_test.go +++ b/models/migrations/v1_22/v293_test.go @@ -6,9 +6,9 @@ package v1_22 //nolint import ( "testing" - "code.gitea.io/gitea/models/db" - migration_tests "code.gitea.io/gitea/models/migrations/test" - "code.gitea.io/gitea/models/project" + "forgejo.org/models/db" + migration_tests "forgejo.org/models/migrations/test" + "forgejo.org/models/project" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go index c465d53738..ef7b67ca5b 100644 --- a/models/migrations/v1_22/v294_test.go +++ b/models/migrations/v1_22/v294_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go index e3425e4625..0fd90a4a67 100644 --- a/models/migrations/v1_23/main_test.go +++ b/models/migrations/v1_23/main_test.go @@ -6,7 +6,7 @@ package v1_23 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go index d7ea03eb3d..c8ed786d63 100644 --- a/models/migrations/v1_23/v302.go +++ b/models/migrations/v1_23/v302.go @@ -4,7 +4,7 @@ package v1_23 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go index 2fb37ac843..fae0131bdd 100644 --- a/models/migrations/v1_23/v303.go +++ b/models/migrations/v1_23/v303.go @@ -4,7 +4,7 @@ package v1_23 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_23/v303_test.go b/models/migrations/v1_23/v303_test.go index 752eacee0c..f105d11830 100644 --- a/models/migrations/v1_23/v303_test.go +++ b/models/migrations/v1_23/v303_test.go @@ -6,7 +6,7 @@ package v1_23 //nolint import ( "testing" - migration_tests "code.gitea.io/gitea/models/migrations/test" + migration_tests "forgejo.org/models/migrations/test" "github.com/stretchr/testify/require" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go index 74434a84a1..ec6bd09bb5 100644 --- a/models/migrations/v1_6/v70.go +++ b/models/migrations/v1_6/v70.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go index 586187228b..3706ad4406 100644 --- a/models/migrations/v1_6/v71.go +++ b/models/migrations/v1_6/v71.go @@ -6,9 +6,9 @@ package v1_6 //nolint import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go index 04cef9a170..4df2a0f6e9 100644 --- a/models/migrations/v1_6/v72.go +++ b/models/migrations/v1_6/v72.go @@ -6,7 +6,7 @@ package v1_6 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go index d3fbd94deb..61ad006a47 100644 --- a/models/migrations/v1_8/v76.go +++ b/models/migrations/v1_8/v76.go @@ -6,7 +6,7 @@ package v1_8 //nolint import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go index 8f041c1484..8102b19335 100644 --- a/models/migrations/v1_8/v78.go +++ b/models/migrations/v1_8/v78.go @@ -4,7 +4,7 @@ package v1_8 //nolint import ( - "code.gitea.io/gitea/models/migrations/base" + "forgejo.org/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go index eb3a9ed0f4..f7d2d68f96 100644 --- a/models/migrations/v1_8/v79.go +++ b/models/migrations/v1_8/v79.go @@ -4,7 +4,7 @@ package v1_8 //nolint import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go index 26806dd645..78a90bdde9 100644 --- a/models/migrations/v1_9/v82.go +++ b/models/migrations/v1_9/v82.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go index 10e6c45875..fa24a92d28 100644 --- a/models/migrations/v1_9/v83.go +++ b/models/migrations/v1_9/v83.go @@ -4,7 +4,7 @@ package v1_9 //nolint import ( - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go index a23d7c5d6e..d8e9d91840 100644 --- a/models/migrations/v1_9/v85.go +++ b/models/migrations/v1_9/v85.go @@ -6,10 +6,10 @@ package v1_9 //nolint import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/migrations/base" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/xorm" ) diff --git a/models/org.go b/models/org.go index 5f61f05b16..6e191acff0 100644 --- a/models/org.go +++ b/models/org.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" ) // RemoveOrgUser removes user from given organization. diff --git a/models/org_team.go b/models/org_team.go index 1a452436c3..ecda43f0a9 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -9,16 +9,16 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/org_team_test.go b/models/org_team_test.go index 2819607e12..dc1fdb4b3b 100644 --- a/models/org_team_test.go +++ b/models/org_team_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/org_test.go b/models/org_test.go index bb5e524ec9..45e21da0e0 100644 --- a/models/org_test.go +++ b/models/org_test.go @@ -6,10 +6,10 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/main_test.go b/models/organization/main_test.go index 96eeadafa9..dd10b60d30 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -6,15 +6,15 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/organization" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/organization" + _ "forgejo.org/models/repo" + _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/organization/org.go b/models/organization/org.go index d7269c7166..1339f7415d 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -9,17 +9,17 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + secret_model "forgejo.org/models/secret" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/organization/org_list.go b/models/organization/org_list.go index 7f31b49ccd..4bca3cdb99 100644 --- a/models/organization/org_list.go +++ b/models/organization/org_list.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "xorm.io/builder" ) diff --git a/models/organization/org_list_test.go b/models/organization/org_list_test.go index aa5b1f2636..0e27feee59 100644 --- a/models/organization/org_list_test.go +++ b/models/organization/org_list_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/org_repo.go b/models/organization/org_repo.go index f7e59928f4..f190a38bda 100644 --- a/models/organization/org_repo.go +++ b/models/organization/org_repo.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" ) // GetOrgRepositories get repos belonging to the given organization diff --git a/models/organization/org_test.go b/models/organization/org_test.go index 7a67d9f822..212b893a42 100644 --- a/models/organization/org_test.go +++ b/models/organization/org_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/org_user.go b/models/organization/org_user.go index 5fe3a178d2..81671c5cf5 100644 --- a/models/organization/org_user.go +++ b/models/organization/org_user.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go index 336bf1a5a4..3f6799e8a1 100644 --- a/models/organization/org_user_test.go +++ b/models/organization/org_user_test.go @@ -7,11 +7,11 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/team.go b/models/organization/team.go index 5065a1a1d5..450082077f 100644 --- a/models/organization/team.go +++ b/models/organization/team.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite.go b/models/organization/team_invite.go index 17f6c59610..45be6c4c64 100644 --- a/models/organization/team_invite.go +++ b/models/organization/team_invite.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite_test.go b/models/organization/team_invite_test.go index cbabf79b49..8d55864237 100644 --- a/models/organization/team_invite_test.go +++ b/models/organization/team_invite_test.go @@ -6,10 +6,10 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/team_list.go b/models/organization/team_list.go index 5b45429acf..573fd4ef96 100644 --- a/models/organization/team_list.go +++ b/models/organization/team_list.go @@ -7,10 +7,10 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go index 1184e39263..334b139808 100644 --- a/models/organization/team_repo.go +++ b/models/organization/team_repo.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" "xorm.io/builder" ) diff --git a/models/organization/team_test.go b/models/organization/team_test.go index 64cc68b064..0237f76de8 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index b5237c2c58..b45ac2fc07 100644 --- a/models/organization/team_unit.go +++ b/models/organization/team_unit.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" ) // TeamUnit describes all units of a repository diff --git a/models/organization/team_user.go b/models/organization/team_user.go index f7fa136498..a954e94767 100644 --- a/models/organization/team_user.go +++ b/models/organization/team_user.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/packages/alpine/search.go b/models/packages/alpine/search.go index 77eccb90ed..1cc808d18d 100644 --- a/models/packages/alpine/search.go +++ b/models/packages/alpine/search.go @@ -6,8 +6,8 @@ package alpine import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" + packages_model "forgejo.org/models/packages" + alpine_module "forgejo.org/modules/packages/alpine" ) // GetBranches gets all available branches diff --git a/models/packages/alt/search.go b/models/packages/alt/search.go index a9a0d524d3..0bfba77e0e 100644 --- a/models/packages/alt/search.go +++ b/models/packages/alt/search.go @@ -6,8 +6,8 @@ package alt import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" + packages_model "forgejo.org/models/packages" + rpm_module "forgejo.org/modules/packages/rpm" ) type PackageSearchOptions struct { diff --git a/models/packages/conan/references.go b/models/packages/conan/references.go index 0d888a1ec8..5e09c4b63f 100644 --- a/models/packages/conan/references.go +++ b/models/packages/conan/references.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/packages" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/conan/search.go b/models/packages/conan/search.go index ab0bff5968..3ef8b4cceb 100644 --- a/models/packages/conan/search.go +++ b/models/packages/conan/search.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/container" - conan_module "code.gitea.io/gitea/modules/packages/conan" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/modules/container" + conan_module "forgejo.org/modules/packages/conan" "xorm.io/builder" ) diff --git a/models/packages/conda/search.go b/models/packages/conda/search.go index 887441e3b2..147de1aa02 100644 --- a/models/packages/conda/search.go +++ b/models/packages/conda/search.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" + "forgejo.org/models/db" + "forgejo.org/models/packages" + conda_module "forgejo.org/modules/packages/conda" "xorm.io/builder" ) diff --git a/models/packages/container/search.go b/models/packages/container/search.go index 5df35117ce..1dab7c7b79 100644 --- a/models/packages/container/search.go +++ b/models/packages/container/search.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/cran/search.go b/models/packages/cran/search.go index 8a8b52a35e..35525dfd55 100644 --- a/models/packages/cran/search.go +++ b/models/packages/cran/search.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" + "forgejo.org/models/db" + "forgejo.org/models/packages" + cran_module "forgejo.org/modules/packages/cran" "xorm.io/builder" ) diff --git a/models/packages/debian/search.go b/models/packages/debian/search.go index abf23e42f6..a434a06d2a 100644 --- a/models/packages/debian/search.go +++ b/models/packages/debian/search.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/packages" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/modules/setting" "xorm.io/builder" ) diff --git a/models/packages/debian/search_test.go b/models/packages/debian/search_test.go index 949094d8c1..b8ed98d8fa 100644 --- a/models/packages/debian/search_test.go +++ b/models/packages/debian/search_test.go @@ -7,19 +7,19 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + packages_service "forgejo.org/services/packages" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index 31ab84fd68..19e0e8f5d5 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -9,30 +9,30 @@ import ( "fmt" "net/url" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/packages/alpine" + "forgejo.org/modules/packages/arch" + "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/packages/chef" + "forgejo.org/modules/packages/composer" + "forgejo.org/modules/packages/conan" + "forgejo.org/modules/packages/conda" + "forgejo.org/modules/packages/container" + "forgejo.org/modules/packages/cran" + "forgejo.org/modules/packages/debian" + "forgejo.org/modules/packages/helm" + "forgejo.org/modules/packages/maven" + "forgejo.org/modules/packages/npm" + "forgejo.org/modules/packages/nuget" + "forgejo.org/modules/packages/pub" + "forgejo.org/modules/packages/pypi" + "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/packages/rubygems" + "forgejo.org/modules/packages/swift" + "forgejo.org/modules/packages/vagrant" + "forgejo.org/modules/util" "github.com/hashicorp/go-version" ) diff --git a/models/packages/nuget/search.go b/models/packages/nuget/search.go index 7a505ff08f..af83c27c66 100644 --- a/models/packages/nuget/search.go +++ b/models/packages/nuget/search.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" "xorm.io/builder" ) diff --git a/models/packages/package.go b/models/packages/package.go index 874c7c2847..3b01d0b1ea 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index 439178a14e..e86f652540 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob_upload.go b/models/packages/package_blob_upload.go index 4b0e789221..ddffb6c305 100644 --- a/models/packages/package_blob_upload.go +++ b/models/packages/package_blob_upload.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrPackageBlobUploadNotExist indicates a package blob upload not exist error diff --git a/models/packages/package_cleanup_rule.go b/models/packages/package_cleanup_rule.go index fa12dec406..d0765c8492 100644 --- a/models/packages/package_cleanup_rule.go +++ b/models/packages/package_cleanup_rule.go @@ -8,9 +8,9 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_file.go b/models/packages/package_file.go index 1bb6b57a34..d4bcc2859a 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_property.go b/models/packages/package_property.go index e0170016cf..c4e7be342b 100644 --- a/models/packages/package_property.go +++ b/models/packages/package_property.go @@ -6,7 +6,7 @@ package packages import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 5b9b9b7403..ab2d49c94c 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -7,16 +7,16 @@ package packages_test import ( "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/require" ) diff --git a/models/packages/package_version.go b/models/packages/package_version.go index 278e8e3a86..79086ff1ad 100644 --- a/models/packages/package_version.go +++ b/models/packages/package_version.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/packages/rpm/search.go b/models/packages/rpm/search.go index e697421b49..d4f065a89e 100644 --- a/models/packages/rpm/search.go +++ b/models/packages/rpm/search.go @@ -6,8 +6,8 @@ package rpm import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" + packages_model "forgejo.org/models/packages" + rpm_module "forgejo.org/modules/packages/rpm" ) // GetGroups gets all available groups diff --git a/models/perm/access/access.go b/models/perm/access/access.go index 3e2568b4b4..76b547f772 100644 --- a/models/perm/access/access.go +++ b/models/perm/access/access.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/perm/access/access_test.go b/models/perm/access/access_test.go index 556f51311c..00939bced6 100644 --- a/models/perm/access/access_test.go +++ b/models/perm/access/access_test.go @@ -6,12 +6,12 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/db" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index da6f03715f..0c27d022e0 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -6,14 +6,14 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/repo" + _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index 7e39627a75..ce9963b83a 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/organization" + perm_model "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" ) // Permission contains all the permissions related variables to a repository for a user diff --git a/models/project/column.go b/models/project/column.go index 4757b61677..52917cb9fd 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -9,10 +9,10 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/project/column_test.go b/models/project/column_test.go index fb6dc77126..2ef27de3b5 100644 --- a/models/project/column_test.go +++ b/models/project/column_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/project/issue.go b/models/project/issue.go index 984f47ee7c..9e9db19004 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // ProjectIssue saves relation from issue to a project diff --git a/models/project/main_test.go b/models/project/main_test.go index f4b2d6feda..eaa13bf309 100644 --- a/models/project/main_test.go +++ b/models/project/main_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/repo" + _ "forgejo.org/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/project/project.go b/models/project/project.go index 6c2b02487d..b9813fda91 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -8,14 +8,14 @@ import ( "fmt" "html/template" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/project/project_test.go b/models/project/project_test.go index cef2ea17bd..ee9fdaa2e2 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/pull/automerge.go b/models/pull/automerge.go index d739d5a145..63f572309b 100644 --- a/models/pull/automerge.go +++ b/models/pull/automerge.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" ) // AutoMerge represents a pull request scheduled for merging when checks succeed diff --git a/models/pull/review_state.go b/models/pull/review_state.go index e46a22a49d..2702d5d5a1 100644 --- a/models/pull/review_state.go +++ b/models/pull/review_state.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // ViewedState stores for a file in which state it is currently viewed diff --git a/models/quota/default.go b/models/quota/default.go index e53e47bade..9f655d7847 100644 --- a/models/quota/default.go +++ b/models/quota/default.go @@ -4,7 +4,7 @@ package quota import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func EvaluateDefault(used Used, forSubject LimitSubject) (bool, int64) { diff --git a/models/quota/group.go b/models/quota/group.go index 50080748a1..7ddc20b2d6 100644 --- a/models/quota/group.go +++ b/models/quota/group.go @@ -7,9 +7,9 @@ import ( "context" "math" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "xorm.io/builder" ) diff --git a/models/quota/quota.go b/models/quota/quota.go index ee3fec6c1a..9f1c3ca949 100644 --- a/models/quota/quota.go +++ b/models/quota/quota.go @@ -6,8 +6,8 @@ package quota import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/setting" ) func init() { diff --git a/models/quota/quota_group_test.go b/models/quota/quota_group_test.go index edbf43fcf5..7f693b391b 100644 --- a/models/quota/quota_group_test.go +++ b/models/quota/quota_group_test.go @@ -7,7 +7,7 @@ import ( "math" "testing" - quota_model "code.gitea.io/gitea/models/quota" + quota_model "forgejo.org/models/quota" "github.com/stretchr/testify/assert" ) diff --git a/models/quota/quota_rule_test.go b/models/quota/quota_rule_test.go index 1e1daf4c4a..59c05563f0 100644 --- a/models/quota/quota_rule_test.go +++ b/models/quota/quota_rule_test.go @@ -6,7 +6,7 @@ package quota_test import ( "testing" - quota_model "code.gitea.io/gitea/models/quota" + quota_model "forgejo.org/models/quota" "github.com/stretchr/testify/assert" ) diff --git a/models/quota/rule.go b/models/quota/rule.go index cb23b74b52..89cb57cace 100644 --- a/models/quota/rule.go +++ b/models/quota/rule.go @@ -7,7 +7,7 @@ import ( "context" "slices" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) type Rule struct { diff --git a/models/quota/used.go b/models/quota/used.go index ff84ac20f8..4a1bc84c0a 100644 --- a/models/quota/used.go +++ b/models/quota/used.go @@ -6,10 +6,10 @@ package quota import ( "context" - action_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - package_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" + action_model "forgejo.org/models/actions" + "forgejo.org/models/db" + package_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" "xorm.io/builder" ) diff --git a/models/repo.go b/models/repo.go index 598f8df6a4..6f7ae25615 100644 --- a/models/repo.go +++ b/models/repo.go @@ -11,14 +11,14 @@ import ( _ "image/jpeg" // Needed for jpeg support - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/models/repo/archive_download_count.go b/models/repo/archive_download_count.go index b0735df3ea..8e2df21198 100644 --- a/models/repo/archive_download_count.go +++ b/models/repo/archive_download_count.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" ) // RepoArchiveDownloadCount counts all archive downloads for a tag diff --git a/models/repo/archive_download_count_test.go b/models/repo/archive_download_count_test.go index ffc6cdf6df..0faf515284 100644 --- a/models/repo/archive_download_count_test.go +++ b/models/repo/archive_download_count_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/archiver.go b/models/repo/archiver.go index 3f05fcf752..2d0172a163 100644 --- a/models/repo/archiver.go +++ b/models/repo/archiver.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index b95d785fa5..3bf51e80ca 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -9,12 +9,12 @@ import ( "net/url" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" ) // Attachment represent a attachment of issue/comment/release. diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go index 881a40c3e7..23f4b3799f 100644 --- a/models/repo/attachment_test.go +++ b/models/repo/attachment_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/avatar.go b/models/repo/avatar.go index 72ee938ada..a108fda62d 100644 --- a/models/repo/avatar.go +++ b/models/repo/avatar.go @@ -11,11 +11,11 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // CustomAvatarRelativePath returns repository custom avatar file path. diff --git a/models/repo/collaboration.go b/models/repo/collaboration.go index cb66cb56a6..16d10d38b6 100644 --- a/models/repo/collaboration.go +++ b/models/repo/collaboration.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index 5adedfe442..783091ba9e 100644 --- a/models/repo/collaboration_test.go +++ b/models/repo/collaboration_test.go @@ -6,12 +6,12 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/following_repo.go b/models/repo/following_repo.go index 85b96aa147..f9b9bf5e5e 100644 --- a/models/repo/following_repo.go +++ b/models/repo/following_repo.go @@ -4,7 +4,7 @@ package repo import ( - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) // FollowingRepo represents a federated Repository Actor connected with a local Repo diff --git a/models/repo/following_repo_test.go b/models/repo/following_repo_test.go index d0dd0a31a7..cff125dabe 100644 --- a/models/repo/following_repo_test.go +++ b/models/repo/following_repo_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_FollowingRepoValidation(t *testing.T) { diff --git a/models/repo/fork.go b/models/repo/fork.go index 632e91c2bb..ed8b488738 100644 --- a/models/repo/fork.go +++ b/models/repo/fork.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/models/repo/fork_test.go b/models/repo/fork_test.go index dd12429cc4..d567081ee6 100644 --- a/models/repo/fork_test.go +++ b/models/repo/fork_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/git.go b/models/repo/git.go index d39915e869..692176c8f6 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // MergeStyle represents the approach to merge commits into base branch. diff --git a/models/repo/issue.go b/models/repo/issue.go index 0dd4fd5ed4..35453f109f 100644 --- a/models/repo/issue.go +++ b/models/repo/issue.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // ___________.__ ___________ __ diff --git a/models/repo/language_stats.go b/models/repo/language_stats.go index d44fea5375..1b619c80cc 100644 --- a/models/repo/language_stats.go +++ b/models/repo/language_stats.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "github.com/go-enry/go-enry/v2" ) diff --git a/models/repo/main_test.go b/models/repo/main_test.go index a9fdcc9000..9fd1cacc97 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -6,15 +6,15 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" // register table model - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/perm/access" // register table model - _ "code.gitea.io/gitea/models/repo" // register table model - _ "code.gitea.io/gitea/models/user" // register table model + _ "forgejo.org/models" // register table model + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/perm/access" // register table model + _ "forgejo.org/models/repo" // register table model + _ "forgejo.org/models/user" // register table model ) func TestMain(m *testing.M) { diff --git a/models/repo/mirror.go b/models/repo/mirror.go index be7b785612..1fe9afd8e9 100644 --- a/models/repo/mirror.go +++ b/models/repo/mirror.go @@ -8,10 +8,10 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // ErrMirrorNotExist mirror does not exist error diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go index 68fb504fdc..d6d0d1135a 100644 --- a/models/repo/pushmirror.go +++ b/models/repo/pushmirror.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/git" + giturl "forgejo.org/modules/git/url" + "forgejo.org/modules/keying" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go index c3368ccafe..de6c9b0a41 100644 --- a/models/repo/pushmirror_test.go +++ b/models/repo/pushmirror_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/redirect.go b/models/repo/redirect.go index 61789ebefa..9c44a255d0 100644 --- a/models/repo/redirect.go +++ b/models/repo/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" ) // ErrRedirectNotExist represents a "RedirectNotExist" kind of error. diff --git a/models/repo/redirect_test.go b/models/repo/redirect_test.go index 2016784aed..d84cbbed54 100644 --- a/models/repo/redirect_test.go +++ b/models/repo/redirect_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/release.go b/models/repo/release.go index 8761cb4410..10e9bb259f 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/release_list.go b/models/repo/release_list.go index 6c33262125..4ec955adf3 100644 --- a/models/repo/release_list.go +++ b/models/repo/release_list.go @@ -6,7 +6,7 @@ package repo import ( "context" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" ) type ReleaseList []*Release diff --git a/models/repo/release_list_test.go b/models/repo/release_list_test.go index cbd77683d0..2b494cb179 100644 --- a/models/repo/release_list_test.go +++ b/models/repo/release_list_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/release_test.go b/models/repo/release_test.go index 7680f2cc9d..94dbd6d9d5 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo.go b/models/repo/repo.go index ca7d50ca6a..8d204d5594 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -14,18 +14,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_flags.go b/models/repo/repo_flags.go index de76ed2b37..247a588cdf 100644 --- a/models/repo/repo_flags.go +++ b/models/repo/repo_flags.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_flags_test.go b/models/repo/repo_flags_test.go index bccefcf72b..bd92b18208 100644 --- a/models/repo/repo_flags_test.go +++ b/models/repo/repo_flags_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_indexer.go b/models/repo/repo_indexer.go index 6e19d8f937..e95517bb07 100644 --- a/models/repo/repo_indexer.go +++ b/models/repo/repo_indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index 25329ae712..ac7d2b69e3 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -8,15 +8,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index 8c13f387ba..b13db64137 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_repository.go b/models/repo/repo_repository.go index 6780165a38..0ba50e6614 100644 --- a/models/repo/repo_repository.go +++ b/models/repo/repo_repository.go @@ -5,8 +5,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/validation" ) func init() { diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index 56b84798d7..a9591a357b 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -7,15 +7,15 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index 5b4066d994..c11ad70627 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -9,13 +9,13 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/xorm" "xorm.io/xorm/convert" diff --git a/models/repo/repo_unit_test.go b/models/repo/repo_unit_test.go index 129d913cfb..210b830d02 100644 --- a/models/repo/repo_unit_test.go +++ b/models/repo/repo_unit_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/perm" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/search.go b/models/repo/search.go index ffb8e26745..c16bfa4922 100644 --- a/models/repo/search.go +++ b/models/repo/search.go @@ -3,7 +3,7 @@ package repo -import "code.gitea.io/gitea/models/db" +import "forgejo.org/models/db" // OrderByMap represents all possible search order var OrderByMap = map[string]map[string]db.SearchOrderBy{ diff --git a/models/repo/star.go b/models/repo/star.go index 60737149da..25c039a50b 100644 --- a/models/repo/star.go +++ b/models/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" ) // Star represents a starred repo by an user. diff --git a/models/repo/star_test.go b/models/repo/star_test.go index 73b362c68c..cbaa21db64 100644 --- a/models/repo/star_test.go +++ b/models/repo/star_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/topic.go b/models/repo/topic.go index 2f14ff7f62..4a3bdc7d8c 100644 --- a/models/repo/topic.go +++ b/models/repo/topic.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index f87ef2bcdf..26ad27896e 100644 --- a/models/repo/topic_test.go +++ b/models/repo/topic_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/update.go b/models/repo/update.go index e7ca224028..0222d09de5 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -8,10 +8,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // UpdateRepositoryOwnerNames updates repository owner_names (this should only be used when the ownerName has changed case) diff --git a/models/repo/upload.go b/models/repo/upload.go index 18834f6b83..49152db7fd 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -12,10 +12,10 @@ import ( "os" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 0f95f5ab6b..309bfee18f 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -6,12 +6,12 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + api "forgejo.org/modules/structs" "xorm.io/builder" ) diff --git a/models/repo/user_repo_test.go b/models/repo/user_repo_test.go index c784a5565d..2912986cd1 100644 --- a/models/repo/user_repo_test.go +++ b/models/repo/user_repo_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/watch.go b/models/repo/watch.go index 6974d893df..3fd915e1e7 100644 --- a/models/repo/watch.go +++ b/models/repo/watch.go @@ -6,10 +6,10 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // WatchMode specifies what kind of watch the user has on a repository diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go index dbf15050cf..059489afbf 100644 --- a/models/repo/watch_test.go +++ b/models/repo/watch_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/wiki.go b/models/repo/wiki.go index b378666a20..f0dd945a72 100644 --- a/models/repo/wiki.go +++ b/models/repo/wiki.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // ErrWikiAlreadyExist represents a "WikiAlreadyExist" kind of error. diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go index 28495a4b7d..bf35a4c610 100644 --- a/models/repo/wiki_test.go +++ b/models/repo/wiki_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo_test.go b/models/repo_test.go index 52f028bbb2..6fbef8edf6 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -6,9 +6,9 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo_transfer.go b/models/repo_transfer.go index 0c23d759f9..f515f1bcf0 100644 --- a/models/repo_transfer.go +++ b/models/repo_transfer.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // RepoTransfer is used to manage repository transfers diff --git a/models/repo_transfer_test.go b/models/repo_transfer_test.go index 6b6d5a8098..6449e40fce 100644 --- a/models/repo_transfer_test.go +++ b/models/repo_transfer_test.go @@ -6,9 +6,9 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/secret/secret.go b/models/secret/secret.go index 2666199547..7be7f454a1 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - secret_module "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/log" + secret_module "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index a1d46c986f..62ca1bb9cc 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -3,7 +3,7 @@ package types -import "code.gitea.io/gitea/modules/translation" +import "forgejo.org/modules/translation" type OwnerType string diff --git a/models/system/appstate.go b/models/system/appstate.go index 01faa1a5be..31274b4c34 100644 --- a/models/system/appstate.go +++ b/models/system/appstate.go @@ -6,7 +6,7 @@ package system import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // AppState represents a state record in database diff --git a/models/system/main_test.go b/models/system/main_test.go index 4181d44ddf..ca2846527a 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -6,13 +6,13 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" // register models - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/system" // register models of system + _ "forgejo.org/models" // register models + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/system" // register models of system ) func TestMain(m *testing.M) { diff --git a/models/system/notice.go b/models/system/notice.go index e7ec6a9693..b1fdd2e4f2 100644 --- a/models/system/notice.go +++ b/models/system/notice.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // NoticeType describes the notice type diff --git a/models/system/notice_test.go b/models/system/notice_test.go index bfb7862fd7..4862160755 100644 --- a/models/system/notice_test.go +++ b/models/system/notice_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/system" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/system/setting.go b/models/system/setting.go index cda60d1758..a57602688a 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting/config" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/models/system/setting_test.go b/models/system/setting_test.go index 7a7fa02b01..1abaf2f16b 100644 --- a/models/system/setting_test.go +++ b/models/system/setting_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/system" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unit/unit.go b/models/unit/unit.go index 5a8b9114f2..6251d44c9b 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -9,10 +9,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/perm" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // Type is Unit's Type diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index a73967742f..efcad4a405 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -6,7 +6,7 @@ package unit import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go index 4e26de7503..fd2d4b7d75 100644 --- a/models/unittest/consistency.go +++ b/models/unittest/consistency.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 63b26a0af7..6402fd9466 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -10,9 +10,9 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/setting" "github.com/go-testfixtures/testfixtures/v3" "xorm.io/xorm" diff --git a/models/unittest/mock_http.go b/models/unittest/mock_http.go index 8e79699895..e749275282 100644 --- a/models/unittest/mock_http.go +++ b/models/unittest/mock_http.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 70110c4962..d34c9e9a0a 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/system" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index 157c676d09..a7c8e9c2fa 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -7,7 +7,7 @@ import ( "math" "testing" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/avatar.go b/models/user/avatar.go index c39928ce43..27af7f774d 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -11,12 +11,12 @@ import ( "io" "strings" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/avatars" + "forgejo.org/models/db" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // CustomAvatarRelativePath returns user custom avatar relative path. diff --git a/models/user/avatar_test.go b/models/user/avatar_test.go index 974a714477..d3a164142d 100644 --- a/models/user/avatar_test.go +++ b/models/user/avatar_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/badge.go b/models/user/badge.go index ee52b44cf5..e54c993a37 100644 --- a/models/user/badge.go +++ b/models/user/badge.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // Badge represents a user badge diff --git a/models/user/block.go b/models/user/block.go index 189cacc2a2..2e3cfc2fa3 100644 --- a/models/user/block.go +++ b/models/user/block.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" ) // ErrBlockedByUser defines an error stating that the user is not allowed to perform the action because they are blocked. diff --git a/models/user/block_test.go b/models/user/block_test.go index a795ef345e..b1674bf2ff 100644 --- a/models/user/block_test.go +++ b/models/user/block_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/email_address.go b/models/user/email_address.go index fdb3d64904..f9eaec56c9 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -9,11 +9,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 5653111fff..1801f57a23 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/error.go b/models/user/error.go index 5a956a2afe..a0fc1af2bd 100644 --- a/models/user/error.go +++ b/models/user/error.go @@ -6,7 +6,7 @@ package user import ( "fmt" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrUserAlreadyExist represents a "user already exists" error. diff --git a/models/user/external_login_user.go b/models/user/external_login_user.go index 965b7a5ed1..f13454c38a 100644 --- a/models/user/external_login_user.go +++ b/models/user/external_login_user.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/federated_user.go b/models/user/federated_user.go index 1fc42c3c32..fc07836408 100644 --- a/models/user/federated_user.go +++ b/models/user/federated_user.go @@ -4,7 +4,7 @@ package user import ( - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) type FederatedUser struct { diff --git a/models/user/federated_user_test.go b/models/user/federated_user_test.go index 6a2112666f..374236f6d3 100644 --- a/models/user/federated_user_test.go +++ b/models/user/federated_user_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_FederatedUserValidation(t *testing.T) { diff --git a/models/user/follow.go b/models/user/follow.go index 9c3283b888..5be0f73c35 100644 --- a/models/user/follow.go +++ b/models/user/follow.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" ) // Follow represents relations of user and their followers. diff --git a/models/user/follow_test.go b/models/user/follow_test.go index 8c56164ee3..976225a4a8 100644 --- a/models/user/follow_test.go +++ b/models/user/follow_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/list.go b/models/user/list.go index ca589d1e02..71c96c8565 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/auth" + "forgejo.org/models/db" ) // UserList is a list of user. diff --git a/models/user/main_test.go b/models/user/main_test.go index a626d323a7..685b1116f3 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -6,12 +6,12 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/user" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/user/must_change_password.go b/models/user/must_change_password.go index 7eab08de89..5503f503b5 100644 --- a/models/user/must_change_password.go +++ b/models/user/must_change_password.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/openid.go b/models/user/openid.go index ee4ecabae0..96b00255a3 100644 --- a/models/user/openid.go +++ b/models/user/openid.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/util" ) // ErrOpenIDNotExist openid is not known diff --git a/models/user/openid_test.go b/models/user/openid_test.go index c2857aac98..3c55891c1f 100644 --- a/models/user/openid_test.go +++ b/models/user/openid_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/redirect.go b/models/user/redirect.go index 895e76c889..75876f17d2 100644 --- a/models/user/redirect.go +++ b/models/user/redirect.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/redirect_test.go b/models/user/redirect_test.go index 35fd29aa5d..c598fb045f 100644 --- a/models/user/redirect_test.go +++ b/models/user/redirect_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/search.go b/models/user/search.go index ecc95caf3d..d2b9901823 100644 --- a/models/user/search.go +++ b/models/user/search.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/user/setting.go b/models/user/setting.go index b4af0e5ccd..a915119ad2 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - setting_module "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/modules/cache" + setting_module "forgejo.org/modules/setting" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/models/user/setting_test.go b/models/user/setting_test.go index 0b05c54ee6..7b6658041f 100644 --- a/models/user/setting_test.go +++ b/models/user/setting_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/user.go b/models/user/user.go index 37dd69f42d..fb43f01696 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -21,20 +21,20 @@ import ( _ "image/jpeg" // Needed for jpeg support - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/auth/openid" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "golang.org/x/text/runes" "golang.org/x/text/transform" diff --git a/models/user/user_repository.go b/models/user/user_repository.go index c06441b5c8..172bf7c8b4 100644 --- a/models/user/user_repository.go +++ b/models/user/user_repository.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/modules/optional" + "forgejo.org/modules/validation" ) func init() { diff --git a/models/user/user_system.go b/models/user/user_system.go index b13b355d37..f1585b512a 100644 --- a/models/user/user_system.go +++ b/models/user/user_system.go @@ -8,8 +8,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" ) const ( diff --git a/models/user/user_test.go b/models/user/user_test.go index 4f238967c1..dde0146470 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -12,20 +12,20 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/container" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/user_update.go b/models/user/user_update.go index 66702e2a14..bf258811e4 100644 --- a/models/user/user_update.go +++ b/models/user/user_update.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) func IncrUserRepoNum(ctx context.Context, userID int64) error { diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 8734feb2e1..58600cb8bf 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -8,12 +8,12 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" gouuid "github.com/google/uuid" "xorm.io/builder" diff --git a/models/webhook/main_test.go b/models/webhook/main_test.go index f19465d505..fac998e8cd 100644 --- a/models/webhook/main_test.go +++ b/models/webhook/main_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go index f3370f3db5..0691f231b2 100644 --- a/models/webhook/webhook.go +++ b/models/webhook/webhook.go @@ -9,15 +9,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" "xorm.io/builder" ) diff --git a/models/webhook/webhook_system.go b/models/webhook/webhook_system.go index 62e8286205..b63346635c 100644 --- a/models/webhook/webhook_system.go +++ b/models/webhook/webhook_system.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // GetDefaultWebhooks returns all admin-default webhooks. diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index 6af9c26c1c..7f0abbd8bb 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/actions/github.go b/modules/actions/github.go index c27d4edf53..111537c913 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -4,7 +4,7 @@ package actions import ( - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "forgejo.org/modules/webhook" ) const ( diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go index 6652ff6eac..2a5d8a19b8 100644 --- a/modules/actions/github_test.go +++ b/modules/actions/github_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/log.go b/modules/actions/log.go index 5a1425e031..78b1196f87 100644 --- a/modules/actions/log.go +++ b/modules/actions/log.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/dbfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/models/dbfs" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + "forgejo.org/modules/zstd" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go index 1f36e021a5..77bfc747ee 100644 --- a/modules/actions/task_state.go +++ b/modules/actions/task_state.go @@ -4,7 +4,7 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" ) const ( diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go index ff0fd57195..e18de4573f 100644 --- a/modules/actions/task_state_test.go +++ b/modules/actions/task_state_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 94c221ee7b..43948cce5c 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -8,10 +8,10 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/gobwas/glob" "github.com/nektos/act/pkg/jobparser" diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go index 965d01f134..b85ed7fd56 100644 --- a/modules/actions/workflows_test.go +++ b/modules/actions/workflows_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go index 645a4b8c8d..d43e9c2bb0 100644 --- a/modules/activitypub/client.go +++ b/modules/activitypub/client.go @@ -17,10 +17,10 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" "github.com/42wim/httpsig" ) diff --git a/modules/activitypub/client_test.go b/modules/activitypub/client_test.go index 6a771b5a7b..e63d4859be 100644 --- a/modules/activitypub/client_test.go +++ b/modules/activitypub/client_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/activitypub/main_test.go b/modules/activitypub/main_test.go index 30216812cf..4895c85d6b 100644 --- a/modules/activitypub/main_test.go +++ b/modules/activitypub/main_test.go @@ -6,12 +6,12 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/modules/activitypub/user_settings.go b/modules/activitypub/user_settings.go index 7f939af352..77c11d5ae3 100644 --- a/modules/activitypub/user_settings.go +++ b/modules/activitypub/user_settings.go @@ -6,8 +6,8 @@ package activitypub import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" ) const rsaBits = 3072 diff --git a/modules/activitypub/user_settings_test.go b/modules/activitypub/user_settings_test.go index f510e7a6ac..f1a779855c 100644 --- a/modules/activitypub/user_settings_test.go +++ b/modules/activitypub/user_settings_test.go @@ -6,11 +6,11 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 + _ "forgejo.org/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go index 9feabc3f8c..8d54ae5e4a 100644 --- a/modules/assetfs/layered.go +++ b/modules/assetfs/layered.go @@ -14,10 +14,10 @@ import ( "slices" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/util" "github.com/fsnotify/fsnotify" ) diff --git a/modules/auth/common.go b/modules/auth/common.go index 77361f6561..0f36fd942f 100644 --- a/modules/auth/common.go +++ b/modules/auth/common.go @@ -4,8 +4,8 @@ package auth import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) func UnmarshalGroupTeamMapping(raw string) (map[string]map[string][]string, error) { diff --git a/modules/auth/password/hash/argon2.go b/modules/auth/password/hash/argon2.go index 0cd6472fa1..0f65d60c66 100644 --- a/modules/auth/password/hash/argon2.go +++ b/modules/auth/password/hash/argon2.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "golang.org/x/crypto/argon2" ) diff --git a/modules/auth/password/hash/common.go b/modules/auth/password/hash/common.go index 487c0738f4..618ebfd15b 100644 --- a/modules/auth/password/hash/common.go +++ b/modules/auth/password/hash/common.go @@ -6,7 +6,7 @@ package hash import ( "strconv" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) func parseIntParam(value, param, algorithmName, config string, previousErr error) (int, error) { diff --git a/modules/auth/password/hash/hash.go b/modules/auth/password/hash/hash.go index 459320e1b0..eb79db1b9e 100644 --- a/modules/auth/password/hash/hash.go +++ b/modules/auth/password/hash/hash.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // This package takes care of hashing passwords, verifying passwords, defining diff --git a/modules/auth/password/hash/pbkdf2.go b/modules/auth/password/hash/pbkdf2.go index 27382fedb8..0dff5e5134 100644 --- a/modules/auth/password/hash/pbkdf2.go +++ b/modules/auth/password/hash/pbkdf2.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "golang.org/x/crypto/pbkdf2" ) diff --git a/modules/auth/password/hash/scrypt.go b/modules/auth/password/hash/scrypt.go index f3d38f751a..668b69cb9e 100644 --- a/modules/auth/password/hash/scrypt.go +++ b/modules/auth/password/hash/scrypt.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "golang.org/x/crypto/scrypt" ) diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go index 85f9780709..fdbc4ff291 100644 --- a/modules/auth/password/password.go +++ b/modules/auth/password/password.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) var ( diff --git a/modules/auth/password/pwn.go b/modules/auth/password/pwn.go index e00205ea19..239a25f11c 100644 --- a/modules/auth/password/pwn.go +++ b/modules/auth/password/pwn.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/modules/auth/password/pwn" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/auth/password/pwn" + "forgejo.org/modules/setting" ) var ErrIsPwned = errors.New("password has been pwned") diff --git a/modules/auth/password/pwn/pwn.go b/modules/auth/password/pwn/pwn.go index f77ce9f40b..10693ec663 100644 --- a/modules/auth/password/pwn/pwn.go +++ b/modules/auth/password/pwn/pwn.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) const passwordURL = "https://api.pwnedpasswords.com/range/" diff --git a/modules/auth/webauthn/webauthn.go b/modules/auth/webauthn/webauthn.go index 189d197333..a26dc89545 100644 --- a/modules/auth/webauthn/webauthn.go +++ b/modules/auth/webauthn/webauthn.go @@ -7,10 +7,10 @@ import ( "encoding/binary" "encoding/gob" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/modules/auth/webauthn/webauthn_test.go b/modules/auth/webauthn/webauthn_test.go index 15a8d71828..552b698984 100644 --- a/modules/auth/webauthn/webauthn_test.go +++ b/modules/auth/webauthn/webauthn_test.go @@ -6,7 +6,7 @@ package webauthn import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index 106215ec0b..33af60a3b8 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -14,8 +14,8 @@ import ( _ "image/gif" // for processing gif images _ "image/jpeg" // for processing jpeg images - "code.gitea.io/gitea/modules/avatar/identicon" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/avatar/identicon" + "forgejo.org/modules/setting" "golang.org/x/image/draw" diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go index 824a38e15b..2166ca51b0 100644 --- a/modules/avatar/avatar_test.go +++ b/modules/avatar/avatar_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/avatar/hash_test.go b/modules/avatar/hash_test.go index 1b8249c696..0a2db53ad4 100644 --- a/modules/avatar/hash_test.go +++ b/modules/avatar/hash_test.go @@ -9,7 +9,7 @@ import ( "image/png" "testing" - "code.gitea.io/gitea/modules/avatar" + "forgejo.org/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/modules/base/tool.go b/modules/base/tool.go index 02f1db59d3..fd6a7c2b77 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -16,8 +16,8 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" "github.com/dustin/go-humanize" ) diff --git a/modules/cache/cache.go b/modules/cache/cache.go index 2148e028d5..9ad4b5cd90 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" mc "code.forgejo.org/go-chi/cache" diff --git a/modules/cache/cache_redis.go b/modules/cache/cache_redis.go index 4c243b2426..489a585b04 100644 --- a/modules/cache/cache_redis.go +++ b/modules/cache/cache_redis.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/graceful" + "forgejo.org/modules/nosql" "code.forgejo.org/go-chi/cache" ) diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go index 8bc986f1a7..8e931d5b2c 100644 --- a/modules/cache/cache_test.go +++ b/modules/cache/cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/cache/cache_twoqueue.go b/modules/cache/cache_twoqueue.go index c15ed52da1..08efe703c6 100644 --- a/modules/cache/cache_twoqueue.go +++ b/modules/cache/cache_twoqueue.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" mc "code.forgejo.org/go-chi/cache" lru "github.com/hashicorp/golang-lru/v2" diff --git a/modules/cache/context.go b/modules/cache/context.go index f9bdf52044..457c5c1258 100644 --- a/modules/cache/context.go +++ b/modules/cache/context.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // cacheContext is a context that can be used to cache data in a request level context diff --git a/modules/card/card.go b/modules/card/card.go index 370d241073..087cd4ec05 100644 --- a/modules/card/card.go +++ b/modules/card/card.go @@ -19,9 +19,9 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" "github.com/golang/freetype" "github.com/golang/freetype/truetype" diff --git a/modules/card/card_test.go b/modules/card/card_test.go index 27753794c4..ef695b4549 100644 --- a/modules/card/card_test.go +++ b/modules/card/card_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/log" + "forgejo.org/modules/test" "github.com/golang/freetype/truetype" "github.com/stretchr/testify/assert" diff --git a/modules/charset/ambiguous.go b/modules/charset/ambiguous.go index 96e0561e15..a8eacf26a0 100644 --- a/modules/charset/ambiguous.go +++ b/modules/charset/ambiguous.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" ) // AmbiguousTablesForLocale provides the table of ambiguous characters for this locale. diff --git a/modules/charset/ambiguous/generate.go b/modules/charset/ambiguous/generate.go index e3fda5be98..bf7c03a16c 100644 --- a/modules/charset/ambiguous/generate.go +++ b/modules/charset/ambiguous/generate.go @@ -13,7 +13,7 @@ import ( "text/template" "unicode" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "golang.org/x/text/unicode/rangetable" ) diff --git a/modules/charset/charset.go b/modules/charset/charset.go index fc42372b4d..cb03deb966 100644 --- a/modules/charset/charset.go +++ b/modules/charset/charset.go @@ -10,9 +10,9 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gogs/chardet" "golang.org/x/net/html/charset" diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go index f7ea2beccf..ef0d1565d6 100644 --- a/modules/charset/charset_test.go +++ b/modules/charset/charset_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/charset/escape.go b/modules/charset/escape.go index ba0eb73a3a..57b13c1f18 100644 --- a/modules/charset/escape.go +++ b/modules/charset/escape.go @@ -13,9 +13,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) // RuneNBSP is the codepoint for NBSP diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go index 29943eb858..01ebf52a15 100644 --- a/modules/charset/escape_stream.go +++ b/modules/charset/escape_stream.go @@ -10,7 +10,7 @@ import ( "unicode" "unicode/utf8" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" "golang.org/x/net/html" ) diff --git a/modules/charset/escape_test.go b/modules/charset/escape_test.go index 2ca76f88d5..eec6f102cb 100644 --- a/modules/charset/escape_test.go +++ b/modules/charset/escape_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/csv/csv.go b/modules/csv/csv.go index 35c5d6ab67..996a35bdeb 100644 --- a/modules/csv/csv.go +++ b/modules/csv/csv.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" ) const ( diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 6ed6986629..6eb3b3056f 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/eventsource/event.go b/modules/eventsource/event.go index ebcca50903..0e4dbf6e9c 100644 --- a/modules/eventsource/event.go +++ b/modules/eventsource/event.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) func wrapNewlines(w io.Writer, prefix, value []byte) (sum int64, err error) { diff --git a/modules/eventsource/manager_run.go b/modules/eventsource/manager_run.go index d4d95ae72a..0eaee5dc3c 100644 --- a/modules/eventsource/manager_run.go +++ b/modules/eventsource/manager_run.go @@ -7,15 +7,15 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/services/convert" ) // Init starts this eventsource diff --git a/modules/forgefed/activity_like.go b/modules/forgefed/activity_like.go index 0f001486b5..e52d0a9af6 100644 --- a/modules/forgefed/activity_like.go +++ b/modules/forgefed/activity_like.go @@ -6,7 +6,7 @@ package forgefed import ( "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_like_test.go b/modules/forgefed/activity_like_test.go index 6b83381cf9..815b0e02f3 100644 --- a/modules/forgefed/activity_like_test.go +++ b/modules/forgefed/activity_like_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_undo_like.go b/modules/forgefed/activity_undo_like.go index b6b13ba50d..8b7df582ad 100644 --- a/modules/forgefed/activity_undo_like.go +++ b/modules/forgefed/activity_undo_like.go @@ -6,7 +6,7 @@ package forgefed import ( "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_undo_like_test.go b/modules/forgefed/activity_undo_like_test.go index 541e524cb3..1b77369b67 100644 --- a/modules/forgefed/activity_undo_like_test.go +++ b/modules/forgefed/activity_undo_like_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/activity_validateandcheckerror_test.go b/modules/forgefed/activity_validateandcheckerror_test.go index f2f1fbcccb..c1c9164fd2 100644 --- a/modules/forgefed/activity_validateandcheckerror_test.go +++ b/modules/forgefed/activity_validateandcheckerror_test.go @@ -6,7 +6,7 @@ package forgefed import ( "fmt" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func validateAndCheckError(subject validation.Validateable, expectedError string) *string { diff --git a/modules/forgefed/actor.go b/modules/forgefed/actor.go index 0ef46185d1..c01175f0f6 100644 --- a/modules/forgefed/actor.go +++ b/modules/forgefed/actor.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/actor_test.go b/modules/forgefed/actor_test.go index a3c01eceb0..e2157a96e4 100644 --- a/modules/forgefed/actor_test.go +++ b/modules/forgefed/actor_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" ap "github.com/go-ap/activitypub" ) diff --git a/modules/forgefed/repository_test.go b/modules/forgefed/repository_test.go index 13a73c10f4..5aebbbc08f 100644 --- a/modules/forgefed/repository_test.go +++ b/modules/forgefed/repository_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ap "github.com/go-ap/activitypub" ) diff --git a/modules/generate/generate.go b/modules/generate/generate.go index 41a6aa2815..9738195da9 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -11,7 +11,7 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/modules/git/batch_reader.go b/modules/git/batch_reader.go index 3b1a466b2e..1297c7247f 100644 --- a/modules/git/batch_reader.go +++ b/modules/git/batch_reader.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/blame.go b/modules/git/blame.go index d62a8ca0a2..4ff347e31b 100644 --- a/modules/git/blame.go +++ b/modules/git/blame.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // BlamePart represents block of blame - continuous lines with one sha diff --git a/modules/git/blob.go b/modules/git/blob.go index 2f02693428..3fda358938 100644 --- a/modules/git/blob.go +++ b/modules/git/blob.go @@ -10,9 +10,9 @@ import ( "encoding/base64" "io" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" ) // Blob represents a Git object. diff --git a/modules/git/command.go b/modules/git/command.go index 72640a2a94..bf1d624dbf 100644 --- a/modules/git/command.go +++ b/modules/git/command.go @@ -16,10 +16,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/util" ) // TrustedCmdArgs returns the trusted arguments for git command. diff --git a/modules/git/commit.go b/modules/git/commit.go index 78468b907f..baefe3820d 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -15,8 +15,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "github.com/go-git/go-git/v5/config" ) diff --git a/modules/git/commit_info.go b/modules/git/commit_info.go index 39e30b127d..8d9142d362 100644 --- a/modules/git/commit_info.go +++ b/modules/git/commit_info.go @@ -10,7 +10,7 @@ import ( "path" "sort" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // CommitInfo describes the first commit with the provided entry diff --git a/modules/git/diff.go b/modules/git/diff.go index 8374101d2a..0ba9c60912 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // RawDiffType type of a raw diff. diff --git a/modules/git/error.go b/modules/git/error.go index 10fb37be07..427eb4a5b9 100644 --- a/modules/git/error.go +++ b/modules/git/error.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // ErrNotExist commit not exist error diff --git a/modules/git/foreachref/format_test.go b/modules/git/foreachref/format_test.go index 8ff239323c..99b8207168 100644 --- a/modules/git/foreachref/format_test.go +++ b/modules/git/foreachref/format_test.go @@ -6,7 +6,7 @@ package foreachref_test import ( "testing" - "code.gitea.io/gitea/modules/git/foreachref" + "forgejo.org/modules/git/foreachref" "github.com/stretchr/testify/require" ) diff --git a/modules/git/foreachref/parser_test.go b/modules/git/foreachref/parser_test.go index 7a37ced356..1febab80c7 100644 --- a/modules/git/foreachref/parser_test.go +++ b/modules/git/foreachref/parser_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/git/foreachref" + "forgejo.org/modules/json" "github.com/stretchr/testify/require" ) diff --git a/modules/git/git.go b/modules/git/git.go index 576609068a..c7d5a31b31 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/hashicorp/go-version" ) diff --git a/modules/git/git_test.go b/modules/git/git_test.go index cdbd2a1768..bb07367e3b 100644 --- a/modules/git/git_test.go +++ b/modules/git/git_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/grep.go b/modules/git/grep.go index dd176e7aec..117b09fc83 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -17,8 +17,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type GrepResult struct { diff --git a/modules/git/hook.go b/modules/git/hook.go index 46f93ce13e..bef4d024c8 100644 --- a/modules/git/hook.go +++ b/modules/git/hook.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // hookNames is a list of Git server hooks' name that are supported. diff --git a/modules/git/last_commit_cache.go b/modules/git/last_commit_cache.go index 8c7ee5a933..1d7e74a0d7 100644 --- a/modules/git/last_commit_cache.go +++ b/modules/git/last_commit_cache.go @@ -8,8 +8,8 @@ import ( "crypto/sha256" "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // Cache represents a caching interface diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go index 1fd58abfcd..e98e8c19a3 100644 --- a/modules/git/log_name_status.go +++ b/modules/git/log_name_status.go @@ -13,7 +13,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/notes.go b/modules/git/notes.go index 54f4d714e2..c36ab87fbd 100644 --- a/modules/git/notes.go +++ b/modules/git/notes.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // NotesRef is the git ref where Gitea will look for git-notes data. diff --git a/modules/git/notes_test.go b/modules/git/notes_test.go index 69ed3b8a6a..c7fb433ecf 100644 --- a/modules/git/notes_test.go +++ b/modules/git/notes_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/parse.go b/modules/git/parse.go index 8c2c411db6..6bc32057a7 100644 --- a/modules/git/parse.go +++ b/modules/git/parse.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // ParseTreeEntries parses the output of a `git ls-tree -l` command. diff --git a/modules/git/pipeline/catfile.go b/modules/git/pipeline/catfile.go index 4677218150..476f876e2b 100644 --- a/modules/git/pipeline/catfile.go +++ b/modules/git/pipeline/catfile.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // CatFileBatchCheck runs cat-file with --batch-check diff --git a/modules/git/pipeline/lfs.go b/modules/git/pipeline/lfs.go index 3407eb9838..4395e25bd7 100644 --- a/modules/git/pipeline/lfs.go +++ b/modules/git/pipeline/lfs.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // LFSResult represents commits found using a provided pointer file hash diff --git a/modules/git/pipeline/namerev.go b/modules/git/pipeline/namerev.go index ad583a7479..70840edf19 100644 --- a/modules/git/pipeline/namerev.go +++ b/modules/git/pipeline/namerev.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // NameRevStdin runs name-rev --stdin diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go index d88ebe78ef..f39b7113bb 100644 --- a/modules/git/pipeline/revlist.go +++ b/modules/git/pipeline/revlist.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // RevListAllObjects runs rev-list --objects --all and writes to a pipewriter diff --git a/modules/git/ref.go b/modules/git/ref.go index 2db630e2ea..1475d4dc5a 100644 --- a/modules/git/ref.go +++ b/modules/git/ref.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/git/remote.go b/modules/git/remote.go index eea57dd8e0..fb66d76ff0 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -7,7 +7,7 @@ import ( "context" "strings" - giturl "code.gitea.io/gitea/modules/git/url" + giturl "forgejo.org/modules/git/url" ) // GetRemoteAddress returns remote url of git repository in the repoPath with special remote name diff --git a/modules/git/repo.go b/modules/git/repo.go index 84db08d70c..0f4d1f5afa 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -18,9 +18,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // GPGSettings represents the default GPG settings for this repository diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go index cfe4cf7156..2154467332 100644 --- a/modules/git/repo_attribute.go +++ b/modules/git/repo_attribute.go @@ -13,7 +13,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" ) var LinguistAttributes = []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language", "linguist-documentation", "linguist-detectable"} diff --git a/modules/git/repo_attribute_test.go b/modules/git/repo_attribute_test.go index 8b832e7221..ee89373b90 100644 --- a/modules/git/repo_attribute_test.go +++ b/modules/git/repo_attribute_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_base.go b/modules/git/repo_base.go index 5f17bc14f6..a82d59af3c 100644 --- a/modules/git/repo_base.go +++ b/modules/git/repo_base.go @@ -10,7 +10,7 @@ import ( "errors" "path/filepath" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Repository represents a Git repository. diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 7339c7db0d..1992060351 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -13,7 +13,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // BranchPrefix base dir of the branch information file store on git diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index e8c24eaa07..65ab6fd3fd 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/cache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // GetBranchCommitID returns last commit ID string of given branch. diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index f9f7d0edc7..9cbc40eee7 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index b6e9d2b44a..373b5befb5 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -18,7 +18,7 @@ import ( "strings" "time" - logger "code.gitea.io/gitea/modules/log" + logger "forgejo.org/modules/log" ) // CompareInfo represents needed information for comparing references. diff --git a/modules/git/repo_gpg.go b/modules/git/repo_gpg.go index e2b45064fd..2c94234017 100644 --- a/modules/git/repo_gpg.go +++ b/modules/git/repo_gpg.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/process" + "forgejo.org/modules/process" ) // LoadPublicKeyContent will load the key from gpg diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go index f45b6e6191..f58757a9a2 100644 --- a/modules/git/repo_index.go +++ b/modules/git/repo_index.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // ReadTreeToIndex reads a treeish to the index diff --git a/modules/git/repo_language_stats.go b/modules/git/repo_language_stats.go index 37c23faf68..24879a26fe 100644 --- a/modules/git/repo_language_stats.go +++ b/modules/git/repo_language_stats.go @@ -10,9 +10,9 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/analyze" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" "github.com/go-enry/go-enry/v2" ) diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go index 550c653729..3c8b863f75 100644 --- a/modules/git/repo_ref.go +++ b/modules/git/repo_ref.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // GetRefs returns all references of the repository. diff --git a/modules/git/repo_stats.go b/modules/git/repo_stats.go index 83220104bd..ef0865e3d3 100644 --- a/modules/git/repo_stats.go +++ b/modules/git/repo_stats.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // CodeActivityStats represents git statistics data diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index 4466d8e5c0..f7f04e1f10 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -11,9 +11,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git/foreachref" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // TagPrefix tags prefix path on the repository diff --git a/modules/git/signature.go b/modules/git/signature.go index c368ce345c..bd9aebbdd6 100644 --- a/modules/git/signature.go +++ b/modules/git/signature.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // Signature represents the Author, Committer or Tagger information. diff --git a/modules/git/tag.go b/modules/git/tag.go index 34ce8f6fc3..64f1b952ad 100644 --- a/modules/git/tag.go +++ b/modules/git/tag.go @@ -7,8 +7,8 @@ import ( "bytes" "strings" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) const ( diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go index 0d9cfd2258..d51b7992fe 100644 --- a/modules/git/tree_entry.go +++ b/modules/git/tree_entry.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // TreeEntry the leaf in the git tree diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go index e13a4c82e1..a46e2e6bb7 100644 --- a/modules/gitrepo/branch.go +++ b/modules/gitrepo/branch.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // GetBranchesByPath returns a branch by its path diff --git a/modules/gitrepo/gitrepo.go b/modules/gitrepo/gitrepo.go index d89f8f9c0c..a9c920d564 100644 --- a/modules/gitrepo/gitrepo.go +++ b/modules/gitrepo/gitrepo.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" ) type Repository interface { diff --git a/modules/gitrepo/walk.go b/modules/gitrepo/walk.go index 8c672ea78b..8349835ff8 100644 --- a/modules/gitrepo/walk.go +++ b/modules/gitrepo/walk.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // WalkReferences walks all the references from the repository diff --git a/modules/graceful/manager.go b/modules/graceful/manager.go index 077eac64f3..db5738c94c 100644 --- a/modules/graceful/manager.go +++ b/modules/graceful/manager.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) type state uint8 diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index 8147743f79..37edf79075 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -13,10 +13,10 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful/releasereopen" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) func pidMsg() systemdNotifyMsg { diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 320904db17..dc38b02d82 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -15,9 +15,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) const ( diff --git a/modules/graceful/server.go b/modules/graceful/server.go index 2525a83e77..121bbed364 100644 --- a/modules/graceful/server.go +++ b/modules/graceful/server.go @@ -15,9 +15,9 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/proxyprotocol" + "forgejo.org/modules/setting" ) // GetListener returns a net listener diff --git a/modules/graceful/server_hooks.go b/modules/graceful/server_hooks.go index 9b67589571..06be783361 100644 --- a/modules/graceful/server_hooks.go +++ b/modules/graceful/server_hooks.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // awaitShutdown waits for the shutdown signal from the Manager diff --git a/modules/hcaptcha/hcaptcha.go b/modules/hcaptcha/hcaptcha.go index b970d491c5..7f5df9af5a 100644 --- a/modules/hcaptcha/hcaptcha.go +++ b/modules/hcaptcha/hcaptcha.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) const verifyURL = "https://hcaptcha.com/siteverify" diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index c0bc33a3c6..ba3ba479d5 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -15,10 +15,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/analyze" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index 30ce0a4a03..7978fc38a1 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // SetCacheControlInHeader sets suitable cache-control headers in the response diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index 2e3e6a7c42..cd35367bc9 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -16,13 +16,13 @@ import ( "strings" "time" - charsetModule "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + charsetModule "forgejo.org/modules/charset" + "forgejo.org/modules/container" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" "github.com/klauspost/compress/gzhttp" ) diff --git a/modules/httplib/url.go b/modules/httplib/url.go index 14b95898f5..32a02e3277 100644 --- a/modules/httplib/url.go +++ b/modules/httplib/url.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // IsRiskyRedirectURL returns true if the URL is considered risky for redirects diff --git a/modules/httplib/url_test.go b/modules/httplib/url_test.go index 2842edd514..cd2ceac267 100644 --- a/modules/httplib/url_test.go +++ b/modules/httplib/url_test.go @@ -6,8 +6,8 @@ package httplib import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index 25f96933b6..f793b5db3f 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -12,18 +12,18 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - tokenizer_hierarchy "code.gitea.io/gitea/modules/indexer/code/bleve/tokenizer/hierarchy" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/analyze" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + tokenizer_hierarchy "forgejo.org/modules/indexer/code/bleve/tokenizer/hierarchy" + "forgejo.org/modules/indexer/code/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_bleve "forgejo.org/modules/indexer/internal/bleve" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/typesniffer" "github.com/blevesearch/bleve/v2" analyzer_custom "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go index 688e53eb71..3903d77fe0 100644 --- a/modules/indexer/code/elasticsearch/elasticsearch.go +++ b/modules/indexer/code/elasticsearch/elasticsearch.go @@ -11,19 +11,19 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/analyze" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/indexer/code/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_elasticsearch "forgejo.org/modules/indexer/internal/elasticsearch" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/typesniffer" "github.com/go-enry/go-enry/v2" "github.com/olivere/elastic/v7" diff --git a/modules/indexer/code/git.go b/modules/indexer/code/git.go index c7ffcfdd40..14a43cf3be 100644 --- a/modules/indexer/code/git.go +++ b/modules/indexer/code/git.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/indexer/code/internal" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func getDefaultBranchSha(ctx context.Context, repo *repo_model.Repository) (string, error) { diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index 0a8ce27907..c32b637ab4 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -11,16 +11,16 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/indexer/code/bleve" + "forgejo.org/modules/indexer/code/elasticsearch" + "forgejo.org/modules/indexer/code/internal" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) var ( diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index 58768205c6..29b2936fa1 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -7,17 +7,17 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/indexer/code/bleve" + "forgejo.org/modules/indexer/code/elasticsearch" + "forgejo.org/modules/indexer/code/internal" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go index b7440e9de2..cc2c2aaf06 100644 --- a/modules/indexer/code/internal/indexer.go +++ b/modules/indexer/code/internal/indexer.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/indexer/internal" ) // Indexer defines an interface to index and search code contents diff --git a/modules/indexer/code/internal/model.go b/modules/indexer/code/internal/model.go index f75263c83c..ad0a7934d9 100644 --- a/modules/indexer/code/internal/model.go +++ b/modules/indexer/code/internal/model.go @@ -3,7 +3,7 @@ package internal -import "code.gitea.io/gitea/modules/timeutil" +import "forgejo.org/modules/timeutil" type FileUpdate struct { Filename string diff --git a/modules/indexer/code/internal/util.go b/modules/indexer/code/internal/util.go index 1c999fda7d..f5a4ec8e4e 100644 --- a/modules/indexer/code/internal/util.go +++ b/modules/indexer/code/internal/util.go @@ -3,7 +3,7 @@ package internal -import "code.gitea.io/gitea/modules/indexer/internal" +import "forgejo.org/modules/indexer/internal" func FilenameIndexerID(repoID int64, filename string) string { return internal.Base36(repoID) + "_" + filename diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go index 27e35251f0..adf51a76d7 100644 --- a/modules/indexer/code/search.go +++ b/modules/indexer/code/search.go @@ -9,10 +9,10 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/modules/highlight" + "forgejo.org/modules/indexer/code/internal" + "forgejo.org/modules/timeutil" + "forgejo.org/services/gitdiff" ) // Result a search result to display diff --git a/modules/indexer/internal/bleve/indexer.go b/modules/indexer/internal/bleve/indexer.go index 1435d2f519..4a61a80765 100644 --- a/modules/indexer/internal/bleve/indexer.go +++ b/modules/indexer/internal/bleve/indexer.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/indexer/internal" + "forgejo.org/modules/log" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/mapping" diff --git a/modules/indexer/internal/bleve/metadata.go b/modules/indexer/internal/bleve/metadata.go index 3c570ab4ba..08979d3e98 100644 --- a/modules/indexer/internal/bleve/metadata.go +++ b/modules/indexer/internal/bleve/metadata.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) const metaFilename = "rupture_meta.json" diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go index 30e903c49d..9f08290172 100644 --- a/modules/indexer/internal/bleve/query.go +++ b/modules/indexer/internal/bleve/query.go @@ -4,7 +4,7 @@ package bleve import ( - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" diff --git a/modules/indexer/internal/bleve/util.go b/modules/indexer/internal/bleve/util.go index d05b679765..e7311aec6c 100644 --- a/modules/indexer/internal/bleve/util.go +++ b/modules/indexer/internal/bleve/util.go @@ -7,8 +7,8 @@ import ( "errors" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/index/upsidedown" diff --git a/modules/indexer/internal/db/indexer.go b/modules/indexer/internal/db/indexer.go index 3deec836c4..a1121db333 100644 --- a/modules/indexer/internal/db/indexer.go +++ b/modules/indexer/internal/db/indexer.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/modules/indexer/internal" ) var _ internal.Indexer = &Indexer{} diff --git a/modules/indexer/internal/elasticsearch/indexer.go b/modules/indexer/internal/elasticsearch/indexer.go index 395eea3bce..9cd29f3e49 100644 --- a/modules/indexer/internal/elasticsearch/indexer.go +++ b/modules/indexer/internal/elasticsearch/indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/modules/indexer/internal" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/elasticsearch/util.go b/modules/indexer/internal/elasticsearch/util.go index 18cb152d3c..8458bd1326 100644 --- a/modules/indexer/internal/elasticsearch/util.go +++ b/modules/indexer/internal/elasticsearch/util.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/meilisearch/util.go b/modules/indexer/internal/meilisearch/util.go index 845bdb6e7f..ff41b3a857 100644 --- a/modules/indexer/internal/meilisearch/util.go +++ b/modules/indexer/internal/meilisearch/util.go @@ -6,7 +6,7 @@ package meilisearch import ( "fmt" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // VersionedIndexName returns the full index name with version diff --git a/modules/indexer/internal/paginator.go b/modules/indexer/internal/paginator.go index ee204bf047..3ef800c630 100644 --- a/modules/indexer/internal/paginator.go +++ b/modules/indexer/internal/paginator.go @@ -6,7 +6,7 @@ package internal import ( "math" - "code.gitea.io/gitea/models/db" + "forgejo.org/models/db" ) // ParsePaginator parses a db.Paginator into a skip and limit diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index 3dcc9fe3a4..5d6099bd2a 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -6,9 +6,9 @@ package bleve import ( "context" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/indexer/issues/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_bleve "forgejo.org/modules/indexer/internal/bleve" + "forgejo.org/modules/indexer/issues/internal" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/issues/bleve/bleve_test.go b/modules/indexer/issues/bleve/bleve_test.go index 908514a01a..ead57b572f 100644 --- a/modules/indexer/issues/bleve/bleve_test.go +++ b/modules/indexer/issues/bleve/bleve_test.go @@ -6,7 +6,7 @@ package bleve import ( "testing" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "forgejo.org/modules/indexer/issues/internal/tests" ) func TestBleveIndexer(t *testing.T) { diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go index 05ec548435..9dd026e74f 100644 --- a/modules/indexer/issues/db/db.go +++ b/modules/indexer/issues/db/db.go @@ -6,11 +6,11 @@ package db import ( "context" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_db "code.gitea.io/gitea/modules/indexer/internal/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_db "forgejo.org/modules/indexer/internal/db" + "forgejo.org/modules/indexer/issues/internal" "xorm.io/builder" ) diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index 875a4ca279..4411cc1c37 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + "forgejo.org/modules/container" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/optional" ) func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_model.IssuesOptions, error) { diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index e34ef607c2..d67dc68bfc 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -4,9 +4,9 @@ package issues import ( - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/optional" ) func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions { diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 221ae6dd2f..1bf0145796 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" + "forgejo.org/modules/graceful" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_elasticsearch "forgejo.org/modules/indexer/internal/elasticsearch" + "forgejo.org/modules/indexer/issues/internal" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/issues/elasticsearch/elasticsearch_test.go b/modules/indexer/issues/elasticsearch/elasticsearch_test.go index 4ed0b84442..f8cd4e02f6 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch_test.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "forgejo.org/modules/indexer/issues/internal/tests" ) func TestElasticsearchIndexer(t *testing.T) { diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 3078882258..446e714735 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -12,19 +12,19 @@ import ( "sync/atomic" "time" - db_model "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer/issues/bleve" - "code.gitea.io/gitea/modules/indexer/issues/db" - "code.gitea.io/gitea/modules/indexer/issues/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/meilisearch" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + db_model "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/indexer/issues/bleve" + "forgejo.org/modules/indexer/issues/db" + "forgejo.org/modules/indexer/issues/elasticsearch" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/indexer/issues/meilisearch" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) // IndexerMetadata is used to send data to the queue, so it contains only the ids. diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 9f80d70696..d3b3494672 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -6,17 +6,17 @@ package issues import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/internal/indexer.go b/modules/indexer/issues/internal/indexer.go index 95740bc598..2f3b4029dc 100644 --- a/modules/indexer/issues/internal/indexer.go +++ b/modules/indexer/issues/internal/indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" + "forgejo.org/modules/indexer/internal" ) // Indexer defines an interface to indexer issues contents diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 0751060afc..03f5595a5b 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -4,9 +4,9 @@ package internal import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" ) // IndexerData data stored in the issue indexer diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index 80ff34713e..8308cb7f60 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/optional" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index 951f3c8bfb..17a8ba2452 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_meilisearch "code.gitea.io/gitea/modules/indexer/internal/meilisearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" + indexer_internal "forgejo.org/modules/indexer/internal" + inner_meilisearch "forgejo.org/modules/indexer/internal/meilisearch" + "forgejo.org/modules/indexer/issues/internal" "github.com/meilisearch/meilisearch-go" ) diff --git a/modules/indexer/issues/meilisearch/meilisearch_test.go b/modules/indexer/issues/meilisearch/meilisearch_test.go index 349102b762..01160a5240 100644 --- a/modules/indexer/issues/meilisearch/meilisearch_test.go +++ b/modules/indexer/issues/meilisearch/meilisearch_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/indexer/issues/internal/tests" "github.com/meilisearch/meilisearch-go" "github.com/stretchr/testify/assert" diff --git a/modules/indexer/issues/util.go b/modules/indexer/issues/util.go index e752ae6f24..3e6c8babe4 100644 --- a/modules/indexer/issues/util.go +++ b/modules/indexer/issues/util.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + "forgejo.org/modules/container" + "forgejo.org/modules/indexer/issues/internal" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" ) // getIssueIndexerData returns the indexer data of an issue and a bool value indicating whether the issue exists. diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index 98a977c700..0d25192e3c 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -6,13 +6,13 @@ package stats import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) // DBIndexer implements Indexer interface to use database's like search diff --git a/modules/indexer/stats/indexer.go b/modules/indexer/stats/indexer.go index 7ec89e2afb..482c4b2ab4 100644 --- a/modules/indexer/stats/indexer.go +++ b/modules/indexer/stats/indexer.go @@ -6,10 +6,10 @@ package stats import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" ) // Indexer defines an interface to index repository stats diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 781bb72eaa..a5899d2506 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -7,16 +7,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go index d002bd57cf..2403eb8dca 100644 --- a/modules/indexer/stats/queue.go +++ b/modules/indexer/stats/queue.go @@ -6,11 +6,11 @@ package stats import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) // statsQueue represents a queue to handle repository stats updates diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go index dbbc9e9186..8e07cbecd8 100644 --- a/modules/issue/template/template.go +++ b/modules/issue/template/template.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/container" + api "forgejo.org/modules/structs" "code.forgejo.org/go-chi/binding" ) diff --git a/modules/issue/template/template_test.go b/modules/issue/template/template_test.go index 349dbeabb0..89e8924e95 100644 --- a/modules/issue/template/template_test.go +++ b/modules/issue/template/template_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index 0fc13d7ddf..8df71a3299 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -9,11 +9,11 @@ import ( "path" "strconv" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" "gopkg.in/yaml.v3" ) diff --git a/modules/keying/keying_test.go b/modules/keying/keying_test.go index d88e907a0b..87dce0a566 100644 --- a/modules/keying/keying_test.go +++ b/modules/keying/keying_test.go @@ -7,7 +7,7 @@ import ( "math" "testing" - "code.gitea.io/gitea/modules/keying" + "forgejo.org/modules/keying" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/label/parser.go b/modules/label/parser.go index 511bac823f..558ae68def 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/options" + "forgejo.org/modules/options" "gopkg.in/yaml.v3" ) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 0d9c0c98ac..ba23cec2be 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) var ( diff --git a/modules/lfs/endpoint.go b/modules/lfs/endpoint.go index 97bd7d4446..b8df4be3ee 100644 --- a/modules/lfs/endpoint.go +++ b/modules/lfs/endpoint.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // DetermineEndpoint determines an endpoint from the clone url or uses the specified LFS url. diff --git a/modules/lfs/filesystem_client.go b/modules/lfs/filesystem_client.go index 71bef5c899..164dfa0011 100644 --- a/modules/lfs/filesystem_client.go +++ b/modules/lfs/filesystem_client.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // FilesystemClient is used to read LFS data from a filesystem path diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go index 0a27fb0c86..e531e2c1fe 100644 --- a/modules/lfs/http_client.go +++ b/modules/lfs/http_client.go @@ -13,10 +13,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" "golang.org/x/sync/errgroup" ) diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go index e80e4847f8..f825d95951 100644 --- a/modules/lfs/http_client_test.go +++ b/modules/lfs/http_client_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/lfs/pointer_scanner.go b/modules/lfs/pointer_scanner.go index 8bbf7a8692..632ecd19ae 100644 --- a/modules/lfs/pointer_scanner.go +++ b/modules/lfs/pointer_scanner.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pipeline" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pipeline" ) // SearchPointerBlobs scans the whole repository for LFS pointer files diff --git a/modules/lfs/shared.go b/modules/lfs/shared.go index ae4bb1f86b..504a726bce 100644 --- a/modules/lfs/shared.go +++ b/modules/lfs/shared.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/lfs/transferadapter.go b/modules/lfs/transferadapter.go index fbc3a3ad8c..98ac8b9a49 100644 --- a/modules/lfs/transferadapter.go +++ b/modules/lfs/transferadapter.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) // TransferAdapter represents an adapter for downloading/uploading LFS objects. diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go index a90ee5c6c0..aa87d2e01a 100644 --- a/modules/lfs/transferadapter_test.go +++ b/modules/lfs/transferadapter_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/log/event_writer_buffer_test.go b/modules/log/event_writer_buffer_test.go index 58c6be1399..ba9455ba69 100644 --- a/modules/log/event_writer_buffer_test.go +++ b/modules/log/event_writer_buffer_test.go @@ -6,7 +6,7 @@ package log_test import ( "testing" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/event_writer_file.go b/modules/log/event_writer_file.go index fd73d7d30a..fd7189e2df 100644 --- a/modules/log/event_writer_file.go +++ b/modules/log/event_writer_file.go @@ -6,7 +6,7 @@ package log import ( "io" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "forgejo.org/modules/util/rotatingfilewriter" ) type WriterFileOption struct { diff --git a/modules/log/flags.go b/modules/log/flags.go index cadf54fdd3..afce30680d 100644 --- a/modules/log/flags.go +++ b/modules/log/flags.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // These flags define which text to prefix to each log entry generated diff --git a/modules/log/flags_test.go b/modules/log/flags_test.go index a101c42a78..1ee322c630 100644 --- a/modules/log/flags_test.go +++ b/modules/log/flags_test.go @@ -6,7 +6,7 @@ package log import ( "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/log/init.go b/modules/log/init.go index 3fb5200ad7..4c6b7b5f82 100644 --- a/modules/log/init.go +++ b/modules/log/init.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "forgejo.org/modules/process" + "forgejo.org/modules/util/rotatingfilewriter" ) var projectPackagePrefix string diff --git a/modules/log/level.go b/modules/log/level.go index 47f7b83f0b..2ad1d67f1a 100644 --- a/modules/log/level.go +++ b/modules/log/level.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // Level is the level of the logger diff --git a/modules/log/level_test.go b/modules/log/level_test.go index 9831ca5650..e6cacc723b 100644 --- a/modules/log/level_test.go +++ b/modules/log/level_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go index 77e7edf6aa..b21e800f52 100644 --- a/modules/log/logger_impl.go +++ b/modules/log/logger_impl.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/util" ) type LoggerImpl struct { diff --git a/modules/markup/asciicast/asciicast.go b/modules/markup/asciicast/asciicast.go index 873029c1bd..739a035977 100644 --- a/modules/markup/asciicast/asciicast.go +++ b/modules/markup/asciicast/asciicast.go @@ -9,8 +9,8 @@ import ( "net/url" "regexp" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" ) func init() { diff --git a/modules/markup/camo.go b/modules/markup/camo.go index 7e2583469d..8380f79280 100644 --- a/modules/markup/camo.go +++ b/modules/markup/camo.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // CamoEncode encodes a lnk to fit with the go-camo and camo proxy links. The purposes of camo-proxy are: diff --git a/modules/markup/camo_test.go b/modules/markup/camo_test.go index 3c5d40afa0..d5600996c9 100644 --- a/modules/markup/camo_test.go +++ b/modules/markup/camo_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/console/console.go b/modules/markup/console/console.go index f544ab218d..c61b6495d3 100644 --- a/modules/markup/console/console.go +++ b/modules/markup/console/console.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" trend "github.com/buildkite/terminal-to-html/v3" "github.com/go-enry/go-enry/v2" diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go index 0d4a2bbeb9..11e0a54e5d 100644 --- a/modules/markup/console/console_test.go +++ b/modules/markup/console/console_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/csv/csv.go b/modules/markup/csv/csv.go index 092eec7098..6a05088ae1 100644 --- a/modules/markup/csv/csv.go +++ b/modules/markup/csv/csv.go @@ -10,11 +10,11 @@ import ( "regexp" "strconv" - "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/csv" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" ) func init() { diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go index 383f134155..008a899c05 100644 --- a/modules/markup/csv/csv_test.go +++ b/modules/markup/csv/csv_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 59f0397515..87c1a284cc 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -11,12 +11,12 @@ import ( "os/exec" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // RegisterRenderers registers all supported third part renderers according settings diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go index 2171f6097b..5499eff18c 100644 --- a/modules/markup/file_preview.go +++ b/modules/markup/file_preview.go @@ -14,11 +14,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/charset" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html.go b/modules/markup/html.go index 936d717903..323adf931d 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -14,17 +14,17 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/regexplru" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/base" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/references" + "forgejo.org/modules/regexplru" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates/vars" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 71be75f6bd..6a5d3bfa35 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index 905a10c58c..d503796eb6 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/unittest" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/markdown/callout/github.go b/modules/markup/markdown/callout/github.go index adc2071823..49ad249696 100644 --- a/modules/markup/markdown/callout/github.go +++ b/modules/markup/markdown/callout/github.go @@ -7,7 +7,7 @@ package callout import ( "strings" - "code.gitea.io/gitea/modules/svg" + "forgejo.org/modules/svg" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/callout/github_legacy.go b/modules/markup/markdown/callout/github_legacy.go index 39ea8619d8..e77da73dd9 100644 --- a/modules/markup/markdown/callout/github_legacy.go +++ b/modules/markup/markdown/callout/github_legacy.go @@ -7,7 +7,7 @@ package callout import ( "strings" - "code.gitea.io/gitea/modules/markup/markdown/util" + "forgejo.org/modules/markup/markdown/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index 1d3e04224f..9a901a2287 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index d249d25014..db92631acc 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -11,13 +11,13 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/markup/markdown/callout" - "code.gitea.io/gitea/modules/markup/markdown/math" - "code.gitea.io/gitea/modules/setting" - giteautil "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/markup/markdown/callout" + "forgejo.org/modules/markup/markdown/math" + "forgejo.org/modules/setting" + giteautil "forgejo.org/modules/util" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/yuin/goldmark" diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index bb59d72957..e229ee4c65 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/markdown/prefixed_id.go b/modules/markup/markdown/prefixed_id.go index 63d7fadc0a..036481dc05 100644 --- a/modules/markup/markdown/prefixed_id.go +++ b/modules/markup/markdown/prefixed_id.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/container" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go index f4c48d1b3d..5c3eb1beec 100644 --- a/modules/markup/markdown/renderconfig.go +++ b/modules/markup/markdown/renderconfig.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/markup" "github.com/yuin/goldmark/ast" "gopkg.in/yaml.v3" diff --git a/modules/markup/markdown/toc.go b/modules/markup/markdown/toc.go index 38f744a25f..dbfab3e9dc 100644 --- a/modules/markup/markdown/toc.go +++ b/modules/markup/markdown/toc.go @@ -7,8 +7,8 @@ import ( "fmt" "net/url" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/markup" + "forgejo.org/modules/translation" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_codespan.go b/modules/markup/markdown/transform_codespan.go index 45e3c20c8e..15c3a44f0a 100644 --- a/modules/markup/markdown/transform_codespan.go +++ b/modules/markup/markdown/transform_codespan.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/markup" - mdutil "code.gitea.io/gitea/modules/markup/markdown/util" + "forgejo.org/modules/markup" + mdutil "forgejo.org/modules/markup/markdown/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer/html" diff --git a/modules/markup/markdown/transform_heading.go b/modules/markup/markdown/transform_heading.go index 79fc9a3067..eedaf58556 100644 --- a/modules/markup/markdown/transform_heading.go +++ b/modules/markup/markdown/transform_heading.go @@ -6,9 +6,9 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" - mdutil "code.gitea.io/gitea/modules/markup/markdown/util" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + mdutil "forgejo.org/modules/markup/markdown/util" + "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_image.go b/modules/markup/markdown/transform_image.go index b34a710fed..0f9c69cae6 100644 --- a/modules/markup/markdown/transform_image.go +++ b/modules/markup/markdown/transform_image.go @@ -6,8 +6,8 @@ package markdown import ( "strings" - "code.gitea.io/gitea/modules/markup" - giteautil "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + giteautil "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_link.go b/modules/markup/markdown/transform_link.go index e6f3836412..48e3479563 100644 --- a/modules/markup/markdown/transform_link.go +++ b/modules/markup/markdown/transform_link.go @@ -7,9 +7,9 @@ import ( "bytes" "slices" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - giteautil "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + giteautil "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_list.go b/modules/markup/markdown/transform_list.go index b982fd4a83..03b3c4e89c 100644 --- a/modules/markup/markdown/transform_list.go +++ b/modules/markup/markdown/transform_list.go @@ -6,7 +6,7 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/modules/markup" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go index aefa41d3d2..6a34ac81c4 100644 --- a/modules/markup/mdstripper/mdstripper.go +++ b/modules/markup/mdstripper/mdstripper.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/markup/common" + "forgejo.org/modules/setting" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go index 391ee6c12b..b9d7b21db0 100644 --- a/modules/markup/orgmode/orgmode.go +++ b/modules/markup/orgmode/orgmode.go @@ -9,11 +9,11 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/lexers" diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go index 58fede7eb8..cdaa9f18ce 100644 --- a/modules/markup/orgmode/orgmode_test.go +++ b/modules/markup/orgmode/orgmode_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/renderer.go b/modules/markup/renderer.go index 2137302f43..a622d75085 100644 --- a/modules/markup/renderer.go +++ b/modules/markup/renderer.go @@ -14,9 +14,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/sanitizer.go b/modules/markup/sanitizer.go index 72d6571e4e..7ff11f0844 100644 --- a/modules/markup/sanitizer.go +++ b/modules/markup/sanitizer.go @@ -10,7 +10,7 @@ import ( "regexp" "sync" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/microcosm-cc/bluemonday" ) diff --git a/modules/mcaptcha/mcaptcha.go b/modules/mcaptcha/mcaptcha.go index 74142aa863..dbcafce29f 100644 --- a/modules/mcaptcha/mcaptcha.go +++ b/modules/mcaptcha/mcaptcha.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "codeberg.org/gusted/mcaptcha" ) diff --git a/modules/metrics/collector.go b/modules/metrics/collector.go index 230260ff94..5b6787d2f7 100755 --- a/modules/metrics/collector.go +++ b/modules/metrics/collector.go @@ -6,9 +6,9 @@ package metrics import ( "runtime" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/setting" "github.com/prometheus/client_golang/prometheus" ) diff --git a/modules/migration/downloader.go b/modules/migration/downloader.go index 08dbbc29a9..48bdf0456d 100644 --- a/modules/migration/downloader.go +++ b/modules/migration/downloader.go @@ -7,7 +7,7 @@ package migration import ( "context" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" ) // Downloader downloads the site repo information diff --git a/modules/migration/file_format.go b/modules/migration/file_format.go index d29d24dd0b..8851ad6de7 100644 --- a/modules/migration/file_format.go +++ b/modules/migration/file_format.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" "github.com/santhosh-tekuri/jsonschema/v6" "gopkg.in/yaml.v3" diff --git a/modules/migration/options.go b/modules/migration/options.go index 234e72c295..63bbe60758 100644 --- a/modules/migration/options.go +++ b/modules/migration/options.go @@ -4,7 +4,7 @@ package migration -import "code.gitea.io/gitea/modules/structs" +import "forgejo.org/modules/structs" // MigrateOptions defines the way a repository gets migrated // this is for internal usage by migrations module and func who interact with it diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go index fbfdff0315..933348d671 100644 --- a/modules/migration/pullrequest.go +++ b/modules/migration/pullrequest.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // PullRequest defines a standard pull request information diff --git a/modules/nosql/manager.go b/modules/nosql/manager.go index 0ba21585fa..7eea069e09 100644 --- a/modules/nosql/manager.go +++ b/modules/nosql/manager.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/process" + "forgejo.org/modules/process" "github.com/redis/go-redis/v9" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/nosql/manager_leveldb.go b/modules/nosql/manager_leveldb.go index 4d2c90debc..087aac3e9a 100644 --- a/modules/nosql/manager_leveldb.go +++ b/modules/nosql/manager_leveldb.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" diff --git a/modules/nosql/manager_redis.go b/modules/nosql/manager_redis.go index 79a533bd6b..bdaade1b47 100644 --- a/modules/nosql/manager_redis.go +++ b/modules/nosql/manager_redis.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/redis/go-redis/v9" ) diff --git a/modules/optional/option_test.go b/modules/optional/option_test.go index 203e9221e3..f6d22d2431 100644 --- a/modules/optional/option_test.go +++ b/modules/optional/option_test.go @@ -6,7 +6,7 @@ package optional_test import ( "testing" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/modules/optional/serialization.go b/modules/optional/serialization.go index b120a0edf6..86c1c97341 100644 --- a/modules/optional/serialization.go +++ b/modules/optional/serialization.go @@ -4,7 +4,7 @@ package optional import ( - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "gopkg.in/yaml.v3" ) diff --git a/modules/optional/serialization_test.go b/modules/optional/serialization_test.go index c852b8a70f..80fe1c9805 100644 --- a/modules/optional/serialization_test.go +++ b/modules/optional/serialization_test.go @@ -7,8 +7,8 @@ import ( std_json "encoding/json" //nolint:depguard "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/json" + "forgejo.org/modules/optional" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/options/base.go b/modules/options/base.go index 6c6e3839f4..3ae8c56b79 100644 --- a/modules/options/base.go +++ b/modules/options/base.go @@ -4,8 +4,8 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/options/dynamic.go b/modules/options/dynamic.go index 085492d11c..8eed8516ab 100644 --- a/modules/options/dynamic.go +++ b/modules/options/dynamic.go @@ -6,8 +6,8 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/options/static.go b/modules/options/static.go index 72b28e990e..02091a2b1c 100644 --- a/modules/options/static.go +++ b/modules/options/static.go @@ -6,7 +6,7 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" + "forgejo.org/modules/assetfs" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/packages/alpine/metadata.go b/modules/packages/alpine/metadata.go index 582c42610d..8562612206 100644 --- a/modules/packages/alpine/metadata.go +++ b/modules/packages/alpine/metadata.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" ) var ( diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index 0a51472d9c..f967bd25a0 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -15,9 +15,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/packages" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/mholt/archiver/v3" ) diff --git a/modules/packages/arch/metadata_test.go b/modules/packages/arch/metadata_test.go index eb8de333ad..16c1c1637d 100644 --- a/modules/packages/arch/metadata_test.go +++ b/modules/packages/arch/metadata_test.go @@ -12,7 +12,7 @@ import ( "testing/fstest" "time" - "code.gitea.io/gitea/modules/packages" + "forgejo.org/modules/packages" "github.com/mholt/archiver/v3" "github.com/stretchr/testify/require" diff --git a/modules/packages/cargo/parser.go b/modules/packages/cargo/parser.go index a09cfc1f73..f2c75538b5 100644 --- a/modules/packages/cargo/parser.go +++ b/modules/packages/cargo/parser.go @@ -9,8 +9,8 @@ import ( "io" "regexp" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/chef/metadata.go b/modules/packages/chef/metadata.go index a1c91870c2..951606bbc5 100644 --- a/modules/packages/chef/metadata.go +++ b/modules/packages/chef/metadata.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" ) const ( diff --git a/modules/packages/composer/metadata.go b/modules/packages/composer/metadata.go index 6035eae8ca..940309b769 100644 --- a/modules/packages/composer/metadata.go +++ b/modules/packages/composer/metadata.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/composer/metadata_test.go b/modules/packages/composer/metadata_test.go index 2bdb23965b..e2bbff4e58 100644 --- a/modules/packages/composer/metadata_test.go +++ b/modules/packages/composer/metadata_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/conan/conaninfo_parser.go b/modules/packages/conan/conaninfo_parser.go index de11dbee45..6027e51401 100644 --- a/modules/packages/conan/conaninfo_parser.go +++ b/modules/packages/conan/conaninfo_parser.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // Conaninfo represents infos of a Conan package diff --git a/modules/packages/conan/reference.go b/modules/packages/conan/reference.go index 58f268bd48..0b863240cb 100644 --- a/modules/packages/conan/reference.go +++ b/modules/packages/conan/reference.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/conda/metadata.go b/modules/packages/conda/metadata.go index 76ba95eace..f61cc61c2a 100644 --- a/modules/packages/conda/metadata.go +++ b/modules/packages/conda/metadata.go @@ -10,10 +10,10 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/zstd" ) var ( diff --git a/modules/packages/conda/metadata_test.go b/modules/packages/conda/metadata_test.go index 25b0295157..959f9c4727 100644 --- a/modules/packages/conda/metadata_test.go +++ b/modules/packages/conda/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/zstd" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go index 2a41fb9105..ec9d834357 100644 --- a/modules/packages/container/metadata.go +++ b/modules/packages/container/metadata.go @@ -8,9 +8,9 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages/container/helm" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/packages/container/helm" + "forgejo.org/modules/validation" oci "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/modules/packages/container/metadata_test.go b/modules/packages/container/metadata_test.go index 930cf48f68..6c8c6ea5b9 100644 --- a/modules/packages/container/metadata_test.go +++ b/modules/packages/container/metadata_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/packages/container/helm" + "forgejo.org/modules/packages/container/helm" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/modules/packages/content_store.go b/modules/packages/content_store.go index 6438fb174f..f4578d91e0 100644 --- a/modules/packages/content_store.go +++ b/modules/packages/content_store.go @@ -9,9 +9,9 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" ) // BlobHash256Key is the key to address a blob content diff --git a/modules/packages/cran/metadata.go b/modules/packages/cran/metadata.go index 0b0bfb07c6..547fe87ccb 100644 --- a/modules/packages/cran/metadata.go +++ b/modules/packages/cran/metadata.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/debian/metadata.go b/modules/packages/debian/metadata.go index e76db63975..e44801654b 100644 --- a/modules/packages/debian/metadata.go +++ b/modules/packages/debian/metadata.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/zstd" "github.com/blakesmith/ar" "github.com/ulikunitz/xz" diff --git a/modules/packages/debian/metadata_test.go b/modules/packages/debian/metadata_test.go index 6f6c469989..cfcbc57ee0 100644 --- a/modules/packages/debian/metadata_test.go +++ b/modules/packages/debian/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/zstd" + "forgejo.org/modules/zstd" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/modules/packages/goproxy/metadata.go b/modules/packages/goproxy/metadata.go index 40f7d20508..2dae4100e7 100644 --- a/modules/packages/goproxy/metadata.go +++ b/modules/packages/goproxy/metadata.go @@ -10,7 +10,7 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/hashed_buffer.go b/modules/packages/hashed_buffer.go index 70a086da30..93c693efc9 100644 --- a/modules/packages/hashed_buffer.go +++ b/modules/packages/hashed_buffer.go @@ -6,7 +6,7 @@ package packages import ( "io" - "code.gitea.io/gitea/modules/util/filebuffer" + "forgejo.org/modules/util/filebuffer" ) // HashedSizeReader provide methods to read, sum hashes and a Size method diff --git a/modules/packages/helm/metadata.go b/modules/packages/helm/metadata.go index 421fc5e725..19a30c5ffa 100644 --- a/modules/packages/helm/metadata.go +++ b/modules/packages/helm/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/maven/metadata.go b/modules/packages/maven/metadata.go index fa48b4e0d7..bc0dc0155e 100644 --- a/modules/packages/maven/metadata.go +++ b/modules/packages/maven/metadata.go @@ -7,8 +7,8 @@ import ( "encoding/xml" "io" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "golang.org/x/net/html/charset" ) diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go index 7d3d7cd6b5..ed163d30ac 100644 --- a/modules/packages/npm/creator.go +++ b/modules/packages/npm/creator.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/npm/creator_test.go b/modules/packages/npm/creator_test.go index b2cf1aae0e..5cbaf0d865 100644 --- a/modules/packages/npm/creator_test.go +++ b/modules/packages/npm/creator_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/nuget/metadata.go b/modules/packages/nuget/metadata.go index dfb81baf4e..126a0ad494 100644 --- a/modules/packages/nuget/metadata.go +++ b/modules/packages/nuget/metadata.go @@ -13,8 +13,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/nuget/symbol_extractor.go b/modules/packages/nuget/symbol_extractor.go index 81bf0371a0..992ade7e8f 100644 --- a/modules/packages/nuget/symbol_extractor.go +++ b/modules/packages/nuget/symbol_extractor.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/packages" + "forgejo.org/modules/util" ) var ( diff --git a/modules/packages/pub/metadata.go b/modules/packages/pub/metadata.go index afb464e462..f8afdf7218 100644 --- a/modules/packages/pub/metadata.go +++ b/modules/packages/pub/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index 02003aba3d..30c91115e7 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" "github.com/sassoftware/go-rpmutils" ) diff --git a/modules/packages/rubygems/marshal.go b/modules/packages/rubygems/marshal.go index 4e6a5fc5f8..191efc7c0e 100644 --- a/modules/packages/rubygems/marshal.go +++ b/modules/packages/rubygems/marshal.go @@ -9,7 +9,7 @@ import ( "io" "reflect" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) const ( diff --git a/modules/packages/rubygems/metadata.go b/modules/packages/rubygems/metadata.go index 8a9794860e..6d021a17ab 100644 --- a/modules/packages/rubygems/metadata.go +++ b/modules/packages/rubygems/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "gopkg.in/yaml.v3" ) diff --git a/modules/packages/swift/metadata.go b/modules/packages/swift/metadata.go index 24c4262ab7..34fc4f1784 100644 --- a/modules/packages/swift/metadata.go +++ b/modules/packages/swift/metadata.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/vagrant/metadata.go b/modules/packages/vagrant/metadata.go index 6789533339..24684249b7 100644 --- a/modules/packages/vagrant/metadata.go +++ b/modules/packages/vagrant/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/json" + "forgejo.org/modules/validation" ) const ( diff --git a/modules/packages/vagrant/metadata_test.go b/modules/packages/vagrant/metadata_test.go index f467781a08..f1950685be 100644 --- a/modules/packages/vagrant/metadata_test.go +++ b/modules/packages/vagrant/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/pprof/pprof.go b/modules/pprof/pprof.go index c611c14270..d46790458e 100644 --- a/modules/pprof/pprof.go +++ b/modules/pprof/pprof.go @@ -9,7 +9,7 @@ import ( "runtime" "runtime/pprof" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // DumpMemProfileForUsername dumps a memory profile at pprofDataPath as memprofile__ diff --git a/modules/private/actions.go b/modules/private/actions.go index 311a283650..8e4b44c226 100644 --- a/modules/private/actions.go +++ b/modules/private/actions.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) type GenerateTokenRequest struct { diff --git a/modules/private/hook.go b/modules/private/hook.go index 93cbcd469d..2d64c1dec9 100644 --- a/modules/private/hook.go +++ b/modules/private/hook.go @@ -9,10 +9,10 @@ import ( "net/url" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" ) // Git environment variables diff --git a/modules/private/internal.go b/modules/private/internal.go index 9c330a24a8..65fddbbe6b 100644 --- a/modules/private/internal.go +++ b/modules/private/internal.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/httplib" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/proxyprotocol" + "forgejo.org/modules/setting" ) // Response is used for internal request response (for user message and error message) diff --git a/modules/private/key.go b/modules/private/key.go index dcd1714856..422ff16d9a 100644 --- a/modules/private/key.go +++ b/modules/private/key.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // UpdatePublicKeyInRepo update public key and if necessary deploy key updates diff --git a/modules/private/mail.go b/modules/private/mail.go index 08de5b7e28..f6054f9c74 100644 --- a/modules/private/mail.go +++ b/modules/private/mail.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // Email structure holds a data for sending general emails diff --git a/modules/private/manager.go b/modules/private/manager.go index 6055e553bd..fa2e0b0d40 100644 --- a/modules/private/manager.go +++ b/modules/private/manager.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // Shutdown calls the internal shutdown function diff --git a/modules/private/request.go b/modules/private/request.go index 58cd261239..b80167adb6 100644 --- a/modules/private/request.go +++ b/modules/private/request.go @@ -8,8 +8,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/httplib" + "forgejo.org/modules/json" ) // ResponseText is used to get the response as text, instead of parsing it as JSON. diff --git a/modules/private/restore_repo.go b/modules/private/restore_repo.go index 496209d3cb..2192d3048d 100644 --- a/modules/private/restore_repo.go +++ b/modules/private/restore_repo.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // RestoreParams structure holds a data for restore repository diff --git a/modules/private/serv.go b/modules/private/serv.go index 480a446954..fb8496930e 100644 --- a/modules/private/serv.go +++ b/modules/private/serv.go @@ -8,10 +8,10 @@ import ( "fmt" "net/url" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" ) // KeyAndOwner is the response from ServNoCommand diff --git a/modules/proxy/proxy.go b/modules/proxy/proxy.go index 1a6bdad7fb..8c460dba30 100644 --- a/modules/proxy/proxy.go +++ b/modules/proxy/proxy.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/gobwas/glob" ) diff --git a/modules/proxyprotocol/conn.go b/modules/proxyprotocol/conn.go index f437f13683..beac5de120 100644 --- a/modules/proxyprotocol/conn.go +++ b/modules/proxyprotocol/conn.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/public/public.go b/modules/public/public.go index abc6b46158..174936fd4a 100644 --- a/modules/public/public.go +++ b/modules/public/public.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/container" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/public/public_test.go b/modules/public/public_test.go index 5e4bf5d671..4bfbb7ef31 100644 --- a/modules/public/public_test.go +++ b/modules/public/public_test.go @@ -6,7 +6,7 @@ package public import ( "testing" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" "github.com/stretchr/testify/assert" ) diff --git a/modules/public/serve_dynamic.go b/modules/public/serve_dynamic.go index a668b17c34..e5bd89b1cd 100644 --- a/modules/public/serve_dynamic.go +++ b/modules/public/serve_dynamic.go @@ -6,8 +6,8 @@ package public import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/public/serve_static.go b/modules/public/serve_static.go index e79085021e..e19bd976eb 100644 --- a/modules/public/serve_static.go +++ b/modules/public/serve_static.go @@ -8,8 +8,8 @@ package public import ( "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/timeutil" ) var _ GzipBytesProvider = (*vfsgen۰CompressedFileInfo)(nil) diff --git a/modules/queue/base_channel.go b/modules/queue/base_channel.go index dd8ccb15f4..1be4edf144 100644 --- a/modules/queue/base_channel.go +++ b/modules/queue/base_channel.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) var errChannelClosed = errors.New("channel is closed") diff --git a/modules/queue/base_levelqueue.go b/modules/queue/base_levelqueue.go index 06cb5f4819..12c805c0be 100644 --- a/modules/queue/base_levelqueue.go +++ b/modules/queue/base_levelqueue.go @@ -7,8 +7,8 @@ import ( "context" "sync/atomic" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/queue/lqinternal" + "forgejo.org/modules/nosql" + "forgejo.org/modules/queue/lqinternal" "code.forgejo.org/forgejo/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_common.go b/modules/queue/base_levelqueue_common.go index ee334c4571..8b4f35c47d 100644 --- a/modules/queue/base_levelqueue_common.go +++ b/modules/queue/base_levelqueue_common.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/nosql" "code.forgejo.org/forgejo/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_test.go b/modules/queue/base_levelqueue_test.go index a4dc7a3062..0f02b9f3ee 100644 --- a/modules/queue/base_levelqueue_test.go +++ b/modules/queue/base_levelqueue_test.go @@ -6,8 +6,8 @@ package queue import ( "testing" - "code.gitea.io/gitea/modules/queue/lqinternal" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/queue/lqinternal" + "forgejo.org/modules/setting" "code.forgejo.org/forgejo/levelqueue" "github.com/stretchr/testify/assert" diff --git a/modules/queue/base_levelqueue_unique.go b/modules/queue/base_levelqueue_unique.go index ac133bdbf4..91d2e68500 100644 --- a/modules/queue/base_levelqueue_unique.go +++ b/modules/queue/base_levelqueue_unique.go @@ -8,8 +8,8 @@ import ( "sync" "sync/atomic" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/queue/lqinternal" + "forgejo.org/modules/nosql" + "forgejo.org/modules/queue/lqinternal" "code.forgejo.org/forgejo/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_redis.go b/modules/queue/base_redis.go index 62df30f68f..ec3c6dc16d 100644 --- a/modules/queue/base_redis.go +++ b/modules/queue/base_redis.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/nosql" "github.com/redis/go-redis/v9" ) diff --git a/modules/queue/base_redis_test.go b/modules/queue/base_redis_test.go index fa1700dc2e..bf3ad5b97b 100644 --- a/modules/queue/base_redis_test.go +++ b/modules/queue/base_redis_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/queue/mock" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/queue/mock" + "forgejo.org/modules/setting" "github.com/redis/go-redis/v9" "github.com/stretchr/testify/suite" diff --git a/modules/queue/base_redis_with_server_test.go b/modules/queue/base_redis_with_server_test.go index b73404f4e5..e1f552bfb2 100644 --- a/modules/queue/base_redis_with_server_test.go +++ b/modules/queue/base_redis_with_server_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/nosql" + "forgejo.org/modules/setting" "github.com/stretchr/testify/suite" ) diff --git a/modules/queue/config.go b/modules/queue/config.go index c5bc16b6f0..f736a5aa12 100644 --- a/modules/queue/config.go +++ b/modules/queue/config.go @@ -4,7 +4,7 @@ package queue import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) type BaseConfig struct { diff --git a/modules/queue/manager.go b/modules/queue/manager.go index 8b964c0c28..8f1a93f273 100644 --- a/modules/queue/manager.go +++ b/modules/queue/manager.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // Manager is a manager for the queues created by "CreateXxxQueue" functions, these queues are called "managed queues". diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index 5806cbd6c9..bd6e314493 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/queue/mock/redisuniversalclient.go b/modules/queue/mock/redisuniversalclient.go index 36e4b7cd5d..65bac755d1 100644 --- a/modules/queue/mock/redisuniversalclient.go +++ b/modules/queue/mock/redisuniversalclient.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: code.gitea.io/gitea/modules/nosql (interfaces: RedisClient) +// Source: forgejo.org/modules/nosql (interfaces: RedisClient) // // Generated by this command: // -// mockgen -package mock -destination ./modules/queue/mock/redisuniversalclient.go code.gitea.io/gitea/modules/nosql RedisClient +// mockgen -package mock -destination ./modules/queue/mock/redisuniversalclient.go forgejo.org/modules/nosql RedisClient // // Package mock is a generated GoMock package. diff --git a/modules/queue/queue.go b/modules/queue/queue.go index 56835014a5..f16b3c1f34 100644 --- a/modules/queue/queue.go +++ b/modules/queue/queue.go @@ -61,7 +61,7 @@ // func handler(items ...*mypkg.QueueItem) []*mypkg.QueueItem { ... } package queue -import "code.gitea.io/gitea/modules/util" +import "forgejo.org/modules/util" type HandlerFuncT[T any] func(...T) (unhandled []T) diff --git a/modules/queue/workergroup.go b/modules/queue/workergroup.go index ea4c0020c5..3fb821ce69 100644 --- a/modules/queue/workergroup.go +++ b/modules/queue/workergroup.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/queue/workerqueue.go b/modules/queue/workerqueue.go index 041ce9a3f2..6a71fc4fb4 100644 --- a/modules/queue/workerqueue.go +++ b/modules/queue/workerqueue.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) // WorkerPoolQueue is a queue that uses a pool of workers to process items diff --git a/modules/queue/workerqueue_test.go b/modules/queue/workerqueue_test.go index 0060d88ec6..5ae1a701b2 100644 --- a/modules/queue/workerqueue_test.go +++ b/modules/queue/workerqueue_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/recaptcha/recaptcha.go b/modules/recaptcha/recaptcha.go index 1777d169c1..95b0a77a43 100644 --- a/modules/recaptcha/recaptcha.go +++ b/modules/recaptcha/recaptcha.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // Response is the structure of JSON returned from API diff --git a/modules/references/references.go b/modules/references/references.go index 3b4bcb3706..e1d4b47de0 100644 --- a/modules/references/references.go +++ b/modules/references/references.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/mdstripper" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/markup/mdstripper" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) var ( diff --git a/modules/references/references_test.go b/modules/references/references_test.go index d5f7c4b4c5..996066c820 100644 --- a/modules/references/references_test.go +++ b/modules/references/references_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/regexplru/regexplru.go b/modules/regexplru/regexplru.go index 8f66dcf3f7..b452094c16 100644 --- a/modules/regexplru/regexplru.go +++ b/modules/regexplru/regexplru.go @@ -6,7 +6,7 @@ package regexplru import ( "regexp" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/modules/repository/branch.go b/modules/repository/branch.go index 2bf9930f19..59b5f9e7d5 100644 --- a/modules/repository/branch.go +++ b/modules/repository/branch.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" ) // SyncRepoBranches synchronizes branch table with repository branches diff --git a/modules/repository/branch_test.go b/modules/repository/branch_test.go index b98618a16b..deb6cd5d19 100644 --- a/modules/repository/branch_test.go +++ b/modules/repository/branch_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/collaborator.go b/modules/repository/collaborator.go index 17915d34b7..5a0c4451b7 100644 --- a/modules/repository/collaborator.go +++ b/modules/repository/collaborator.go @@ -6,11 +6,11 @@ package repository import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/modules/repository/collaborator_test.go b/modules/repository/collaborator_test.go index 63352e33e8..dae173506b 100644 --- a/modules/repository/collaborator_test.go +++ b/modules/repository/collaborator_test.go @@ -6,14 +6,14 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + "forgejo.org/models/organization" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/commits.go b/modules/repository/commits.go index ede60429a1..8f63f03db5 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -9,13 +9,13 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/avatars" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/avatars" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" ) // PushCommit represents a commit in a push operation. diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index a22f3d07b8..f49b0d37c5 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/create.go b/modules/repository/create.go index 32c6235544..d76a5571c7 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -11,22 +11,22 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // CreateRepositoryByExample creates a repository for the user/organization. diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index c743271c26..cb34143cef 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/repository/delete.go b/modules/repository/delete.go index 04af98beef..6fff16b406 100644 --- a/modules/repository/delete.go +++ b/modules/repository/delete.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" ) // CanUserDelete returns true if user could delete the repository diff --git a/modules/repository/env.go b/modules/repository/env.go index e4f32092fc..110f6ca674 100644 --- a/modules/repository/env.go +++ b/modules/repository/env.go @@ -8,9 +8,9 @@ import ( "os" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" ) // env keys for git hooks need diff --git a/modules/repository/fork.go b/modules/repository/fork.go index fbf0008716..42801fa80d 100644 --- a/modules/repository/fork.go +++ b/modules/repository/fork.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" ) // CanUserForkRepo returns true if specified user can fork repository. diff --git a/modules/repository/hooks.go b/modules/repository/hooks.go index 75a21a09dd..0f5e3afc34 100644 --- a/modules/repository/hooks.go +++ b/modules/repository/hooks.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) func getHookTemplates() (hookNames, hookTpls, giteaHookTpls []string) { diff --git a/modules/repository/init.go b/modules/repository/init.go index 5f500c5233..7b1442be93 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -10,14 +10,14 @@ import ( "sort" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) type OptionFile struct { diff --git a/modules/repository/license.go b/modules/repository/license.go index dcbefc8ded..af75d463d2 100644 --- a/modules/repository/license.go +++ b/modules/repository/license.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/options" + "forgejo.org/modules/options" ) type LicenseValues struct { diff --git a/modules/repository/main_test.go b/modules/repository/main_test.go index 7b245cf118..5906b10865 100644 --- a/modules/repository/main_test.go +++ b/modules/repository/main_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/modules/repository/push.go b/modules/repository/push.go index 66d0417caf..d8be0a3e8c 100644 --- a/modules/repository/push.go +++ b/modules/repository/push.go @@ -4,7 +4,7 @@ package repository import ( - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) // PushUpdateOptions defines the push update options diff --git a/modules/repository/repo.go b/modules/repository/repo.go index 98e7fcbc0a..c86d48fe52 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -12,17 +12,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) /* diff --git a/modules/repository/repo_test.go b/modules/repository/repo_test.go index f3e7be6d7d..278bdc2420 100644 --- a/modules/repository/repo_test.go +++ b/modules/repository/repo_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/temp.go b/modules/repository/temp.go index 04faa9db3d..6048c43a8e 100644 --- a/modules/repository/temp.go +++ b/modules/repository/temp.go @@ -9,9 +9,9 @@ import ( "path" "path/filepath" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // LocalCopyPath returns the local repository temporary copy path. diff --git a/modules/session/db.go b/modules/session/db.go index 3b12b93521..eea7e2136e 100644 --- a/modules/session/db.go +++ b/modules/session/db.go @@ -7,9 +7,9 @@ import ( "log" "sync" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/timeutil" "code.forgejo.org/go-chi/session" ) diff --git a/modules/session/redis.go b/modules/session/redis.go index 230b501080..cf84ef21d9 100644 --- a/modules/session/redis.go +++ b/modules/session/redis.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "forgejo.org/modules/graceful" + "forgejo.org/modules/nosql" "code.forgejo.org/go-chi/session" ) diff --git a/modules/session/virtual.go b/modules/session/virtual.go index 9cf3683a71..1c3e1c778b 100644 --- a/modules/session/virtual.go +++ b/modules/session/virtual.go @@ -7,8 +7,8 @@ import ( "fmt" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" "code.forgejo.org/go-chi/session" memcache "code.forgejo.org/go-chi/session/memcache" diff --git a/modules/setting/admin.go b/modules/setting/admin.go index eed3aa22cf..7a1e071bac 100644 --- a/modules/setting/admin.go +++ b/modules/setting/admin.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // Admin settings diff --git a/modules/setting/admin_test.go b/modules/setting/admin_test.go index 0c6c24b038..5473534521 100644 --- a/modules/setting/admin_test.go +++ b/modules/setting/admin_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/api.go b/modules/setting/api.go index c36f05cfd1..18180c3d07 100644 --- a/modules/setting/api.go +++ b/modules/setting/api.go @@ -7,7 +7,7 @@ import ( "net/url" "path" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // API settings diff --git a/modules/setting/cache.go b/modules/setting/cache.go index bfa6ca0e61..cdc7e1a971 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Cache represents cache settings diff --git a/modules/setting/camo.go b/modules/setting/camo.go index 608ecf8363..5d31446a41 100644 --- a/modules/setting/camo.go +++ b/modules/setting/camo.go @@ -6,7 +6,7 @@ package setting import ( "strconv" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var Camo = struct { diff --git a/modules/setting/config.go b/modules/setting/config.go index 03558574c2..6299640e61 100644 --- a/modules/setting/config.go +++ b/modules/setting/config.go @@ -6,8 +6,8 @@ package setting import ( "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" + "forgejo.org/modules/log" + "forgejo.org/modules/setting/config" ) type PictureStruct struct { diff --git a/modules/setting/config/value.go b/modules/setting/config/value.go index f0ec120544..3409f61b76 100644 --- a/modules/setting/config/value.go +++ b/modules/setting/config/value.go @@ -7,9 +7,9 @@ import ( "context" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) type CfgSecKey struct { diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go index 2bc1a5c341..458dbb51bb 100644 --- a/modules/setting/config_env.go +++ b/modules/setting/config_env.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) const ( diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go index 12cf36aa59..e93b21abda 100644 --- a/modules/setting/config_provider.go +++ b/modules/setting/config_provider.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" "gopkg.in/ini.v1" //nolint:depguard ) diff --git a/modules/setting/f3.go b/modules/setting/f3.go index 8669b70562..31d12294b8 100644 --- a/modules/setting/f3.go +++ b/modules/setting/f3.go @@ -3,7 +3,7 @@ package setting import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Friendly Forge Format (F3) settings diff --git a/modules/setting/federation.go b/modules/setting/federation.go index edb18e0054..a0fdec228e 100644 --- a/modules/setting/federation.go +++ b/modules/setting/federation.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/42wim/httpsig" ) diff --git a/modules/setting/git.go b/modules/setting/git.go index 812c4fe6c9..f35592a924 100644 --- a/modules/setting/git.go +++ b/modules/setting/git.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Git settings diff --git a/modules/setting/incoming_email.go b/modules/setting/incoming_email.go index 287e72941c..502be159a1 100644 --- a/modules/setting/incoming_email.go +++ b/modules/setting/incoming_email.go @@ -8,7 +8,7 @@ import ( "net/mail" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var IncomingEmail = struct { diff --git a/modules/setting/indexer.go b/modules/setting/indexer.go index 4c4f63bc61..6a464ee0de 100644 --- a/modules/setting/indexer.go +++ b/modules/setting/indexer.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/gobwas/glob" ) diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go index f55b0cdae9..3cd48c538b 100644 --- a/modules/setting/lfs.go +++ b/modules/setting/lfs.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/generate" + "forgejo.org/modules/generate" ) // LFS represents the server-side configuration for Git LFS. diff --git a/modules/setting/log.go b/modules/setting/log.go index a141188c0c..0747ac4dac 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) type LogGlobalConfig struct { diff --git a/modules/setting/log_test.go b/modules/setting/log_test.go index 3134d3e75c..eda6dc36af 100644 --- a/modules/setting/log_test.go +++ b/modules/setting/log_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" "github.com/stretchr/testify/require" ) diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index 0804fbd717..b7f69c3492 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -11,7 +11,7 @@ import ( "text/template" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" shellquote "github.com/kballard/go-shellquote" ) diff --git a/modules/setting/markup.go b/modules/setting/markup.go index e893c1c2f1..90fc86b131 100644 --- a/modules/setting/markup.go +++ b/modules/setting/markup.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // ExternalMarkupRenderers represents the external markup renderers diff --git a/modules/setting/mirror.go b/modules/setting/mirror.go index 3aa530a1f4..58c57c5c95 100644 --- a/modules/setting/mirror.go +++ b/modules/setting/mirror.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Mirror settings diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 49288e2639..72500cfc89 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -8,8 +8,8 @@ import ( "path/filepath" "sync/atomic" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/generate" + "forgejo.org/modules/log" ) // OAuth2UsernameType is enum describing the way gitea 'name' should be generated from oauth2 data diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go index 18252b2447..2fc5da6996 100644 --- a/modules/setting/oauth2_test.go +++ b/modules/setting/oauth2_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/generate" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/other.go b/modules/setting/other.go index 4ba494765b..db60cd2205 100644 --- a/modules/setting/other.go +++ b/modules/setting/other.go @@ -3,7 +3,7 @@ package setting -import "code.gitea.io/gitea/modules/log" +import "forgejo.org/modules/log" type OtherConfig struct { ShowFooterVersion bool diff --git a/modules/setting/path.go b/modules/setting/path.go index b99f1977bb..33f27db8fd 100644 --- a/modules/setting/path.go +++ b/modules/setting/path.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/setting/proxy.go b/modules/setting/proxy.go index 4ff420d090..7a9de9568b 100644 --- a/modules/setting/proxy.go +++ b/modules/setting/proxy.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Proxy settings diff --git a/modules/setting/queue.go b/modules/setting/queue.go index 251a6c1e30..06d007c140 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) // QueueSettings represent the settings for a queue from the ini diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 93c01cb8fa..9efd674f8b 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // enumerates all the policy repository creating diff --git a/modules/setting/security.go b/modules/setting/security.go index 678a57cb30..f3480d1056 100644 --- a/modules/setting/security.go +++ b/modules/setting/security.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/keying" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/generate" + "forgejo.org/modules/keying" + "forgejo.org/modules/log" ) var ( diff --git a/modules/setting/server.go b/modules/setting/server.go index c874a58069..bff51f787d 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) // Scheme describes protocol types diff --git a/modules/setting/server_test.go b/modules/setting/server_test.go index 4b95961a26..4450f99546 100644 --- a/modules/setting/server_test.go +++ b/modules/setting/server_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/service.go b/modules/setting/service.go index cc84ac7257..729b10839e 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" "github.com/gobwas/glob" ) diff --git a/modules/setting/service_test.go b/modules/setting/service_test.go index e504bc68dc..4fc09021b6 100644 --- a/modules/setting/service_test.go +++ b/modules/setting/service_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/modules/setting/session.go b/modules/setting/session.go index 29ee67914d..e9ff9bf0bc 100644 --- a/modules/setting/session.go +++ b/modules/setting/session.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/json" + "forgejo.org/modules/log" ) // SessionConfig defines Session settings diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 487f2bb0d5..eb7b9e9373 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/user" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/user" + "forgejo.org/modules/util" ) var ForgejoVersion = "1.0.0" diff --git a/modules/setting/setting_test.go b/modules/setting/setting_test.go index 6801844729..1fef9e068a 100644 --- a/modules/setting/setting_test.go +++ b/modules/setting/setting_test.go @@ -7,7 +7,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/ssh.go b/modules/setting/ssh.go index ea387e521f..86193bddb9 100644 --- a/modules/setting/ssh.go +++ b/modules/setting/ssh.go @@ -11,8 +11,8 @@ import ( "text/template" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" gossh "golang.org/x/crypto/ssh" ) diff --git a/modules/setting/time.go b/modules/setting/time.go index 97988211a9..1211fd475a 100644 --- a/modules/setting/time.go +++ b/modules/setting/time.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // DefaultUILocation is the location on the UI, so that we can display the time on UI. diff --git a/modules/setting/ui.go b/modules/setting/ui.go index 40f1812839..2e6a3df4c6 100644 --- a/modules/setting/ui.go +++ b/modules/setting/ui.go @@ -6,8 +6,8 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/container" + "forgejo.org/modules/log" ) // UI settings diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go index dd60acf210..071b729aa1 100644 --- a/modules/setting/webhook.go +++ b/modules/setting/webhook.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) // Webhook settings diff --git a/modules/ssh/init.go b/modules/ssh/init.go index 21d4f89936..1ccd95b18b 100644 --- a/modules/ssh/init.go +++ b/modules/ssh/init.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func Init() error { diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 6ee10f718b..19cac0b603 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -21,12 +21,12 @@ import ( "sync" "syscall" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gliderlabs/ssh" gossh "golang.org/x/crypto/ssh" diff --git a/modules/ssh/ssh_graceful.go b/modules/ssh/ssh_graceful.go index cad2c685bd..825313ab1c 100644 --- a/modules/ssh/ssh_graceful.go +++ b/modules/ssh/ssh_graceful.go @@ -4,9 +4,9 @@ package ssh import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/gliderlabs/ssh" ) diff --git a/modules/storage/local.go b/modules/storage/local.go index 00c7f668aa..6f851983b1 100644 --- a/modules/storage/local.go +++ b/modules/storage/local.go @@ -11,9 +11,9 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) var _ ObjectStorage = &LocalStorage{} diff --git a/modules/storage/local_test.go b/modules/storage/local_test.go index e230323f67..d0dd3a6462 100644 --- a/modules/storage/local_test.go +++ b/modules/storage/local_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index b02eec7aa0..ee545edc10 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -15,9 +15,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/modules/storage/minio_test.go b/modules/storage/minio_test.go index 9ce1dbc7b4..99f70c4565 100644 --- a/modules/storage/minio_test.go +++ b/modules/storage/minio_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/minio/minio-go/v7" "github.com/stretchr/testify/assert" diff --git a/modules/storage/storage.go b/modules/storage/storage.go index 453d755fbb..db081e0768 100644 --- a/modules/storage/storage.go +++ b/modules/storage/storage.go @@ -11,8 +11,8 @@ import ( "net/url" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // ErrURLNotSupported represents url is not supported diff --git a/modules/storage/storage_test.go b/modules/storage/storage_test.go index 70bcd3155a..af3dd9520e 100644 --- a/modules/storage/storage_test.go +++ b/modules/storage/storage_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go index c97cdcb83c..0a3d4140c2 100644 --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -1,7 +1,7 @@ // Copyright 2017 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package structs // import "code.gitea.io/gitea/modules/structs" +package structs // import "forgejo.org/modules/structs" import ( "time" diff --git a/modules/structs/hook.go b/modules/structs/hook.go index 10b3a9db9b..1665dc4da6 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // ErrInvalidReceiveHook FIXME diff --git a/modules/structs/user.go b/modules/structs/user.go index 6c0468b5fb..49e4c495cf 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -6,7 +6,7 @@ package structs import ( "time" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // User represents a user diff --git a/modules/svg/svg.go b/modules/svg/svg.go index 016e1dc08b..e00d8de2d1 100644 --- a/modules/svg/svg.go +++ b/modules/svg/svg.go @@ -9,9 +9,9 @@ import ( "path" "strings" - gitea_html "code.gitea.io/gitea/modules/html" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/public" + gitea_html "forgejo.org/modules/html" + "forgejo.org/modules/log" + "forgejo.org/modules/public" ) var svgIcons map[string]string diff --git a/modules/sync/status_pool.go b/modules/sync/status_pool.go index 6f075d54b7..f22e3e155b 100644 --- a/modules/sync/status_pool.go +++ b/modules/sync/status_pool.go @@ -6,7 +6,7 @@ package sync import ( "sync" - "code.gitea.io/gitea/modules/container" + "forgejo.org/modules/container" ) // StatusTable is a table maintains true/false values. diff --git a/modules/system/appstate_test.go b/modules/system/appstate_test.go index 2f44c7b845..8a444aff0f 100644 --- a/modules/system/appstate_test.go +++ b/modules/system/appstate_test.go @@ -6,8 +6,8 @@ package system import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/system/db.go b/modules/system/db.go index 17178283d9..384087ab4f 100644 --- a/modules/system/db.go +++ b/modules/system/db.go @@ -6,9 +6,9 @@ package system import ( "context" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/system" + "forgejo.org/modules/json" + "forgejo.org/modules/util" ) // DBStore can be used to store app state items in local filesystem diff --git a/modules/templates/base.go b/modules/templates/base.go index 2c2f35bbed..76d8e3271e 100644 --- a/modules/templates/base.go +++ b/modules/templates/base.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func AssetFS() *assetfs.LayeredFS { diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go index e1babd83c9..c5752c8c72 100644 --- a/modules/templates/dynamic.go +++ b/modules/templates/dynamic.go @@ -6,8 +6,8 @@ package templates import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/templates/eval/eval.go b/modules/templates/eval/eval.go index 5d4ac915b9..487a1de4b0 100644 --- a/modules/templates/eval/eval.go +++ b/modules/templates/eval/eval.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) type Num struct { diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 023ba60fa9..02b175e6f6 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -14,14 +14,14 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/templates/eval" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/svg" + "forgejo.org/modules/templates/eval" + "forgejo.org/modules/util" + "forgejo.org/services/gitdiff" ) // NewFuncMap returns functions for injecting to templates diff --git a/modules/templates/htmlrenderer.go b/modules/templates/htmlrenderer.go index 55a55dd7f4..d60397df08 100644 --- a/modules/templates/htmlrenderer.go +++ b/modules/templates/htmlrenderer.go @@ -19,12 +19,12 @@ import ( "sync/atomic" texttemplate "text/template" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates/scopedtmpl" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates/scopedtmpl" + "forgejo.org/modules/util" ) type TemplateExecutor scopedtmpl.TemplateExecutor diff --git a/modules/templates/htmlrenderer_test.go b/modules/templates/htmlrenderer_test.go index a1d3783a75..7373605744 100644 --- a/modules/templates/htmlrenderer_test.go +++ b/modules/templates/htmlrenderer_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/assetfs" + "forgejo.org/modules/assetfs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index ee79755dbb..a40728d7c7 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -11,9 +11,9 @@ import ( "strings" texttmpl "text/template" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) var mailSubjectSplit = regexp.MustCompile(`(?m)^-{3,}\s*$`) diff --git a/modules/templates/main_test.go b/modules/templates/main_test.go index 977699f9c7..946bc603f6 100644 --- a/modules/templates/main_test.go +++ b/modules/templates/main_test.go @@ -7,12 +7,12 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" + "forgejo.org/models/unittest" + "forgejo.org/modules/markup" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/forgefed" - _ "code.gitea.io/gitea/models/issues" + _ "forgejo.org/models" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/issues" ) func TestMain(m *testing.M) { diff --git a/modules/templates/static.go b/modules/templates/static.go index b5a7e561ec..776548c853 100644 --- a/modules/templates/static.go +++ b/modules/templates/static.go @@ -8,8 +8,8 @@ package templates import ( "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/assetfs" + "forgejo.org/modules/timeutil" ) // GlobalModTime provide a global mod time for embedded asset files diff --git a/modules/templates/util_avatar.go b/modules/templates/util_avatar.go index a468361101..93ebec51e4 100644 --- a/modules/templates/util_avatar.go +++ b/modules/templates/util_avatar.go @@ -9,13 +9,13 @@ import ( "html" "html/template" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - gitea_html "code.gitea.io/gitea/modules/html" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/avatars" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + gitea_html "forgejo.org/modules/html" + "forgejo.org/modules/setting" ) type AvatarUtils struct { diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go index f521b39b79..bb83bf692a 100644 --- a/modules/templates/util_date.go +++ b/modules/templates/util_date.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" ) type DateUtils struct{} diff --git a/modules/templates/util_date_test.go b/modules/templates/util_date_test.go index 2f5c79f762..37caf0d422 100644 --- a/modules/templates/util_date_test.go +++ b/modules/templates/util_date_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/templates/util_dict.go b/modules/templates/util_dict.go index 8d6376b522..9d9af77fad 100644 --- a/modules/templates/util_dict.go +++ b/modules/templates/util_dict.go @@ -9,9 +9,9 @@ import ( "html/template" "reflect" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) func dictMerge(base map[string]any, arg any) bool { diff --git a/modules/templates/util_json.go b/modules/templates/util_json.go index 71a4e23d36..3bc80e8f21 100644 --- a/modules/templates/util_json.go +++ b/modules/templates/util_json.go @@ -6,7 +6,7 @@ package templates import ( "bytes" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) type JsonUtils struct{} //nolint:revive diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index 774385483b..12a65c87da 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -12,14 +12,14 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/svg" + activities_model "forgejo.org/models/activities" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + giturl "forgejo.org/modules/git/url" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/svg" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 3c337ae895..a4d7a82eea 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -14,14 +14,14 @@ import ( "strings" "unicode" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/emoji" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" ) // RenderCommitMessage renders commit message with XSS-safe and special links. diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 25a41f02c0..20c39eb417 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -8,10 +8,10 @@ import ( "html/template" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go index 685759dcbc..2d255e54a7 100644 --- a/modules/templates/util_string.go +++ b/modules/templates/util_string.go @@ -8,7 +8,7 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/base" + "forgejo.org/modules/base" ) type StringUtils struct{} diff --git a/modules/test/logchecker.go b/modules/test/logchecker.go index 0f12257f3e..8e8fc32216 100644 --- a/modules/test/logchecker.go +++ b/modules/test/logchecker.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) type LogChecker struct { diff --git a/modules/test/logchecker_test.go b/modules/test/logchecker_test.go index 0f410fed12..d81142bf1c 100644 --- a/modules/test/logchecker_test.go +++ b/modules/test/logchecker_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/modules/test/utils.go b/modules/test/utils.go index 3d884b6cbe..f60bad022e 100644 --- a/modules/test/utils.go +++ b/modules/test/utils.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "strings" - "code.gitea.io/gitea/modules/json" + "forgejo.org/modules/json" ) // RedirectURL returns the redirect URL of a http response. diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index caa8abd07b..b5f196ad4b 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -16,9 +16,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/util" ) var ( diff --git a/modules/timeutil/executable.go b/modules/timeutil/executable.go index 57ae8b2a9d..7b30176df0 100644 --- a/modules/timeutil/executable.go +++ b/modules/timeutil/executable.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" ) var ( diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 2c89ae38d5..b0bbe25f98 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" ) // Seconds-based time units diff --git a/modules/timeutil/since_test.go b/modules/timeutil/since_test.go index 40fefe8700..b47b2c76dd 100644 --- a/modules/timeutil/since_test.go +++ b/modules/timeutil/since_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go index 27a80b6682..783ccba30b 100644 --- a/modules/timeutil/timestamp.go +++ b/modules/timeutil/timestamp.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // TimeStamp defines a timestamp diff --git a/modules/timeutil/timestampnano.go b/modules/timeutil/timestampnano.go index 4a9f7955b9..e2e86b863f 100644 --- a/modules/timeutil/timestampnano.go +++ b/modules/timeutil/timestampnano.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // TimeStampNano is for nano time in database, do not use it unless there is a real requirement. diff --git a/modules/translation/i18n/dummy_test.go b/modules/translation/i18n/dummy_test.go index 7bc29ef839..1df3d0c348 100644 --- a/modules/translation/i18n/dummy_test.go +++ b/modules/translation/i18n/dummy_test.go @@ -6,7 +6,7 @@ package i18n_test import ( "testing" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/translation/i18n" "github.com/stretchr/testify/assert" ) diff --git a/modules/translation/i18n/errors.go b/modules/translation/i18n/errors.go index ee9436a8f7..63a5f48dfa 100644 --- a/modules/translation/i18n/errors.go +++ b/modules/translation/i18n/errors.go @@ -4,7 +4,7 @@ package i18n import ( - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) var ( diff --git a/modules/translation/i18n/localestore.go b/modules/translation/i18n/localestore.go index 0cfa96810e..823cadf8f9 100644 --- a/modules/translation/i18n/localestore.go +++ b/modules/translation/i18n/localestore.go @@ -8,10 +8,10 @@ import ( "html/template" "slices" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // This file implements the static LocaleStore that will not watch for changes diff --git a/modules/translation/plural_rules.go b/modules/translation/plural_rules.go index b8c00ceef7..7e9ae39111 100644 --- a/modules/translation/plural_rules.go +++ b/modules/translation/plural_rules.go @@ -12,8 +12,8 @@ package translation import ( "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/log" + "forgejo.org/modules/translation/i18n" ) // The constants refer to indices below in `PluralRules` and also in i18n.js, keep them in sync! diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 7be77536ca..1b763764f1 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -10,11 +10,11 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation/i18n" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation/i18n" + "forgejo.org/modules/util" "github.com/dustin/go-humanize" "golang.org/x/text/language" diff --git a/modules/translation/translation_test.go b/modules/translation/translation_test.go index 5b3eefb355..356b85f946 100644 --- a/modules/translation/translation_test.go +++ b/modules/translation/translation_test.go @@ -8,7 +8,7 @@ package translation import ( "testing" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/translation/i18n" "github.com/stretchr/testify/assert" ) diff --git a/modules/turnstile/turnstile.go b/modules/turnstile/turnstile.go index 38d0233446..31ba256195 100644 --- a/modules/turnstile/turnstile.go +++ b/modules/turnstile/turnstile.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) // Response is the structure of JSON returned from API diff --git a/modules/typesniffer/typesniffer.go b/modules/typesniffer/typesniffer.go index 212e50c4f1..a8fc70e54c 100644 --- a/modules/typesniffer/typesniffer.go +++ b/modules/typesniffer/typesniffer.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // Use at most this many bytes to determine Content Type. diff --git a/modules/updatechecker/update_checker.go b/modules/updatechecker/update_checker.go index 0c93f08d21..b0932ba663 100644 --- a/modules/updatechecker/update_checker.go +++ b/modules/updatechecker/update_checker.go @@ -11,10 +11,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/system" + "forgejo.org/modules/json" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" + "forgejo.org/modules/system" "github.com/hashicorp/go-version" ) diff --git a/modules/util/rotatingfilewriter/writer.go b/modules/util/rotatingfilewriter/writer.go index c595f49c49..ff234eea93 100644 --- a/modules/util/rotatingfilewriter/writer.go +++ b/modules/util/rotatingfilewriter/writer.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/graceful/releasereopen" + "forgejo.org/modules/util" ) type Options struct { diff --git a/modules/util/util.go b/modules/util/util.go index 88ac07567b..da405c9c4b 100644 --- a/modules/util/util.go +++ b/modules/util/util.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/modules/optional" "golang.org/x/crypto/ssh" "golang.org/x/text/cases" diff --git a/modules/util/util_test.go b/modules/util/util_test.go index 7344c8fbb7..5e0c4a9a0b 100644 --- a/modules/util/util_test.go +++ b/modules/util/util_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/optional" + "forgejo.org/modules/test" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/validation/binding.go b/modules/validation/binding.go index 006fbfafc1..f4f82278bd 100644 --- a/modules/validation/binding.go +++ b/modules/validation/binding.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/auth" + "forgejo.org/modules/git" + "forgejo.org/modules/util" "code.forgejo.org/go-chi/binding" "github.com/gobwas/glob" diff --git a/modules/validation/email.go b/modules/validation/email.go index 326e93378a..fb563c2b81 100644 --- a/modules/validation/email.go +++ b/modules/validation/email.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gobwas/glob" ) diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go index 2f88fcbc60..1f573564e6 100644 --- a/modules/validation/helpers.go +++ b/modules/validation/helpers.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) var externalTrackerRegex = regexp.MustCompile(`({?)(?:user|repo|index)+?(}?)`) diff --git a/modules/validation/helpers_test.go b/modules/validation/helpers_test.go index a1bdf2a29c..01a17f0d6b 100644 --- a/modules/validation/helpers_test.go +++ b/modules/validation/helpers_test.go @@ -6,7 +6,7 @@ package validation import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/validation/validatable.go b/modules/validation/validatable.go index 94b5cc135c..bc565bd194 100644 --- a/modules/validation/validatable.go +++ b/modules/validation/validatable.go @@ -10,7 +10,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" ) // ErrNotValid represents an validation error diff --git a/modules/validation/validatable_test.go b/modules/validation/validatable_test.go index 919f5a3183..0802d5cc92 100644 --- a/modules/validation/validatable_test.go +++ b/modules/validation/validatable_test.go @@ -6,7 +6,7 @@ package validation import ( "testing" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" ) type Sut struct { diff --git a/modules/web/handler.go b/modules/web/handler.go index 728cc5a160..4a7f28b1fa 100644 --- a/modules/web/handler.go +++ b/modules/web/handler.go @@ -9,9 +9,9 @@ import ( "net/http" "reflect" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/modules/web/types" + "forgejo.org/modules/log" + "forgejo.org/modules/web/routing" + "forgejo.org/modules/web/types" ) var responseStatusProviders = map[reflect.Type]func(req *http.Request) types.ResponseStatusProvider{} diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 4e43f6d4b3..9083e9b485 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -8,10 +8,10 @@ import ( "reflect" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" "code.forgejo.org/go-chi/binding" ) diff --git a/modules/web/middleware/cookie.go b/modules/web/middleware/cookie.go index f2d25f5b1c..3bfaeabe69 100644 --- a/modules/web/middleware/cookie.go +++ b/modules/web/middleware/cookie.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/session" + "forgejo.org/modules/setting" ) // SetRedirectToCookie convenience function to set the RedirectTo cookie consistently diff --git a/modules/web/middleware/data.go b/modules/web/middleware/data.go index 08d83f94be..4603e64052 100644 --- a/modules/web/middleware/data.go +++ b/modules/web/middleware/data.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // ContextDataStore represents a data store diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go index 9653a6f349..565fb2f502 100644 --- a/modules/web/middleware/locale.go +++ b/modules/web/middleware/locale.go @@ -6,8 +6,8 @@ package middleware import ( "net/http" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/translation/i18n" + "forgejo.org/modules/translation" + "forgejo.org/modules/translation/i18n" "golang.org/x/text/language" ) diff --git a/modules/web/route.go b/modules/web/route.go index eda6871d85..046c9f4ba7 100644 --- a/modules/web/route.go +++ b/modules/web/route.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/web/middleware" + "forgejo.org/modules/web/middleware" "code.forgejo.org/go-chi/binding" "github.com/go-chi/chi/v5" diff --git a/modules/web/routemock.go b/modules/web/routemock.go index cb41f63b91..33d2ad06eb 100644 --- a/modules/web/routemock.go +++ b/modules/web/routemock.go @@ -6,7 +6,7 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) // MockAfterMiddlewares is a general mock point, it's between middlewares and the handler diff --git a/modules/web/routemock_test.go b/modules/web/routemock_test.go index cd99b99323..43d4b28830 100644 --- a/modules/web/routemock_test.go +++ b/modules/web/routemock_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/web/routing/logger.go b/modules/web/routing/logger.go index 5f3a7592af..760e092914 100644 --- a/modules/web/routing/logger.go +++ b/modules/web/routing/logger.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web/types" + "forgejo.org/modules/log" + "forgejo.org/modules/web/types" ) // NewLoggerHandler is a handler that will log routing to the router log taking account of diff --git a/modules/web/routing/logger_manager.go b/modules/web/routing/logger_manager.go index aa25ec3a27..4b12419b44 100644 --- a/modules/web/routing/logger_manager.go +++ b/modules/web/routing/logger_manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" + "forgejo.org/modules/graceful" + "forgejo.org/modules/process" ) // Event indicates when the printer is triggered diff --git a/routers/api/actions/actions.go b/routers/api/actions/actions.go index a418b3a1c4..70158c4e18 100644 --- a/routers/api/actions/actions.go +++ b/routers/api/actions/actions.go @@ -6,9 +6,9 @@ package actions import ( "net/http" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/actions/ping" - "code.gitea.io/gitea/routers/api/actions/runner" + "forgejo.org/modules/web" + "forgejo.org/routers/api/actions/ping" + "forgejo.org/routers/api/actions/runner" ) func Routes(prefix string) *web.Route { diff --git a/routers/api/actions/artifacts.go b/routers/api/actions/artifacts.go index 405686a058..85a1f5f5be 100644 --- a/routers/api/actions/artifacts.go +++ b/routers/api/actions/artifacts.go @@ -69,18 +69,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/actions" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + web_types "forgejo.org/modules/web/types" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" ) const artifactRouteBase = "/_apis/pipelines/workflows/{run_id}/artifacts" diff --git a/routers/api/actions/artifacts_chunks.go b/routers/api/actions/artifacts_chunks.go index cdb56584b8..a15fa4fd1e 100644 --- a/routers/api/actions/artifacts_chunks.go +++ b/routers/api/actions/artifacts_chunks.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) func saveUploadChunkBase(st storage.ObjectStorage, ctx *ArtifactContext, diff --git a/routers/api/actions/artifacts_utils.go b/routers/api/actions/artifacts_utils.go index db602f1e14..18c8e3fbed 100644 --- a/routers/api/actions/artifacts_utils.go +++ b/routers/api/actions/artifacts_utils.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) const ( diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go index 0417f98242..c6bc39e7d2 100644 --- a/routers/api/actions/artifactsv4.go +++ b/routers/api/actions/artifactsv4.go @@ -98,16 +98,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/actions" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" "google.golang.org/protobuf/encoding/protojson" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/routers/api/actions/ping/ping.go b/routers/api/actions/ping/ping.go index 13985c93a3..6b3378b72e 100644 --- a/routers/api/actions/ping/ping.go +++ b/routers/api/actions/ping/ping.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/routers/api/actions/runner/interceptor.go b/routers/api/actions/runner/interceptor.go index b56e6870ac..be83af6997 100644 --- a/routers/api/actions/runner/interceptor.go +++ b/routers/api/actions/runner/interceptor.go @@ -9,11 +9,11 @@ import ( "errors" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "connectrpc.com/connect" ) diff --git a/routers/api/actions/runner/main_test.go b/routers/api/actions/runner/main_test.go index bed63c166e..112ebe3cb6 100644 --- a/routers/api/actions/runner/main_test.go +++ b/routers/api/actions/runner/main_test.go @@ -6,9 +6,9 @@ package runner import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 6cd37fd224..8aae69f463 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -9,13 +9,13 @@ import ( "fmt" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - actions_service "code.gitea.io/gitea/services/actions" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + actions_service "forgejo.org/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" diff --git a/routers/api/forgejo/v1/api.go b/routers/api/forgejo/v1/api.go index 88c7502e66..dfc5a29d05 100644 --- a/routers/api/forgejo/v1/api.go +++ b/routers/api/forgejo/v1/api.go @@ -4,8 +4,8 @@ package v1 import ( - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/shared" + "forgejo.org/modules/web" + "forgejo.org/routers/api/shared" ) func Routes() *web.Route { diff --git a/routers/api/forgejo/v1/forgejo.go b/routers/api/forgejo/v1/forgejo.go index 0f1f4f1932..b63db6fb9a 100644 --- a/routers/api/forgejo/v1/forgejo.go +++ b/routers/api/forgejo/v1/forgejo.go @@ -5,8 +5,8 @@ package v1 import ( "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) type Forgejo struct{} diff --git a/routers/api/packages/alpine/alpine.go b/routers/api/packages/alpine/alpine.go index 831a910e36..dc992ebb5a 100644 --- a/routers/api/packages/alpine/alpine.go +++ b/routers/api/packages/alpine/alpine.go @@ -13,16 +13,16 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - alpine_model "code.gitea.io/gitea/models/packages/alpine" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - alpine_service "code.gitea.io/gitea/services/packages/alpine" + packages_model "forgejo.org/models/packages" + alpine_model "forgejo.org/models/packages/alpine" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + alpine_module "forgejo.org/modules/packages/alpine" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + alpine_service "forgejo.org/services/packages/alpine" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/alt/alt.go b/routers/api/packages/alt/alt.go index 37a2b64563..a118459ce3 100644 --- a/routers/api/packages/alt/alt.go +++ b/routers/api/packages/alt/alt.go @@ -11,18 +11,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - alt_service "code.gitea.io/gitea/services/packages/alt" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" + alt_service "forgejo.org/services/packages/alt" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index ffc62254d0..ebd081ae77 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -8,37 +8,37 @@ import ( "regexp" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/packages/alpine" - "code.gitea.io/gitea/routers/api/packages/alt" - "code.gitea.io/gitea/routers/api/packages/arch" - "code.gitea.io/gitea/routers/api/packages/cargo" - "code.gitea.io/gitea/routers/api/packages/chef" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/routers/api/packages/conan" - "code.gitea.io/gitea/routers/api/packages/conda" - "code.gitea.io/gitea/routers/api/packages/container" - "code.gitea.io/gitea/routers/api/packages/cran" - "code.gitea.io/gitea/routers/api/packages/debian" - "code.gitea.io/gitea/routers/api/packages/generic" - "code.gitea.io/gitea/routers/api/packages/goproxy" - "code.gitea.io/gitea/routers/api/packages/helm" - "code.gitea.io/gitea/routers/api/packages/maven" - "code.gitea.io/gitea/routers/api/packages/npm" - "code.gitea.io/gitea/routers/api/packages/nuget" - "code.gitea.io/gitea/routers/api/packages/pub" - "code.gitea.io/gitea/routers/api/packages/pypi" - "code.gitea.io/gitea/routers/api/packages/rpm" - "code.gitea.io/gitea/routers/api/packages/rubygems" - "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/routers/api/packages/vagrant" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/routers/api/packages/alpine" + "forgejo.org/routers/api/packages/alt" + "forgejo.org/routers/api/packages/arch" + "forgejo.org/routers/api/packages/cargo" + "forgejo.org/routers/api/packages/chef" + "forgejo.org/routers/api/packages/composer" + "forgejo.org/routers/api/packages/conan" + "forgejo.org/routers/api/packages/conda" + "forgejo.org/routers/api/packages/container" + "forgejo.org/routers/api/packages/cran" + "forgejo.org/routers/api/packages/debian" + "forgejo.org/routers/api/packages/generic" + "forgejo.org/routers/api/packages/goproxy" + "forgejo.org/routers/api/packages/helm" + "forgejo.org/routers/api/packages/maven" + "forgejo.org/routers/api/packages/npm" + "forgejo.org/routers/api/packages/nuget" + "forgejo.org/routers/api/packages/pub" + "forgejo.org/routers/api/packages/pypi" + "forgejo.org/routers/api/packages/rpm" + "forgejo.org/routers/api/packages/rubygems" + "forgejo.org/routers/api/packages/swift" + "forgejo.org/routers/api/packages/vagrant" + "forgejo.org/services/auth" + "forgejo.org/services/context" ) func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) { diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index eedce5cdbc..a45f38dd08 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -13,15 +13,15 @@ import ( "regexp" "strings" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - arch_service "code.gitea.io/gitea/services/packages/arch" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + arch_module "forgejo.org/modules/packages/arch" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + arch_service "forgejo.org/services/packages/arch" ) var ( diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index 140e532efd..50dc8d1c3d 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -10,20 +10,20 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" - cargo_service "code.gitea.io/gitea/services/packages/cargo" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + cargo_module "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + "forgejo.org/services/convert" + packages_service "forgejo.org/services/packages" + cargo_service "forgejo.org/services/packages/cargo" ) // https://doc.rust-lang.org/cargo/reference/registries.html#web-api diff --git a/routers/api/packages/chef/auth.go b/routers/api/packages/chef/auth.go index a790e9a363..fc552c1f1b 100644 --- a/routers/api/packages/chef/auth.go +++ b/routers/api/packages/chef/auth.go @@ -23,10 +23,10 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth" + user_model "forgejo.org/models/user" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/util" + "forgejo.org/services/auth" ) const ( diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index b49f4e9d0a..909817861e 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -13,16 +13,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/composer/api.go b/routers/api/packages/composer/api.go index a3ea2c2f9a..dc491ea8a8 100644 --- a/routers/api/packages/composer/api.go +++ b/routers/api/packages/composer/api.go @@ -8,8 +8,8 @@ import ( "net/url" "time" - packages_model "code.gitea.io/gitea/models/packages" - composer_module "code.gitea.io/gitea/modules/packages/composer" + packages_model "forgejo.org/models/packages" + composer_module "forgejo.org/modules/packages/composer" ) // ServiceIndexResponse contains registry endpoints diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index a045da40de..9e67d419ec 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -12,17 +12,17 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + composer_module "forgejo.org/modules/packages/composer" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + "forgejo.org/services/convert" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/conan/auth.go b/routers/api/packages/conan/auth.go index e2e1901b08..1f5af77304 100644 --- a/routers/api/packages/conan/auth.go +++ b/routers/api/packages/conan/auth.go @@ -6,10 +6,10 @@ package conan import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/packages" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/services/auth" + "forgejo.org/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index e07907a8b1..927d131309 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -11,20 +11,20 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - conan_model "code.gitea.io/gitea/models/packages/conan" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + conan_model "forgejo.org/models/packages/conan" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/modules/setting" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/api/packages/conan/search.go b/routers/api/packages/conan/search.go index 7370c702cd..afc94afef5 100644 --- a/routers/api/packages/conan/search.go +++ b/routers/api/packages/conan/search.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - conan_model "code.gitea.io/gitea/models/packages/conan" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/services/context" + conan_model "forgejo.org/models/packages/conan" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/services/context" ) // SearchResult contains the found recipe names diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index c7e4544d52..52872d2543 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -10,16 +10,16 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - conda_model "code.gitea.io/gitea/models/packages/conda" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + conda_model "forgejo.org/models/packages/conda" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + conda_module "forgejo.org/modules/packages/conda" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/dsnet/compress/bzip2" ) diff --git a/routers/api/packages/container/auth.go b/routers/api/packages/container/auth.go index a8b3ec117a..71c237326e 100644 --- a/routers/api/packages/container/auth.go +++ b/routers/api/packages/container/auth.go @@ -6,10 +6,10 @@ package container import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/packages" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/services/auth" + "forgejo.org/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 24e52d0972..0e07b03c0c 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -12,14 +12,14 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" ) var uploadVersionMutex sync.Mutex diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index 9c9da38424..5276dd5706 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -14,20 +14,20 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" + auth_model "forgejo.org/models/auth" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + container_service "forgejo.org/services/packages/container" digest "github.com/opencontainers/go-digest" ) diff --git a/routers/api/packages/container/manifest.go b/routers/api/packages/container/manifest.go index 4a79a58f51..428e7605a6 100644 --- a/routers/api/packages/container/manifest.go +++ b/routers/api/packages/container/manifest.go @@ -11,17 +11,17 @@ import ( "os" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" digest "github.com/opencontainers/go-digest" oci "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/routers/api/packages/cran/cran.go b/routers/api/packages/cran/cran.go index f1d616724a..f73111278f 100644 --- a/routers/api/packages/cran/cran.go +++ b/routers/api/packages/cran/cran.go @@ -11,14 +11,14 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - cran_model "code.gitea.io/gitea/models/packages/cran" - packages_module "code.gitea.io/gitea/modules/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + cran_model "forgejo.org/models/packages/cran" + packages_module "forgejo.org/modules/packages" + cran_module "forgejo.org/modules/packages/cran" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go index 8c05476cbc..fd64e35657 100644 --- a/routers/api/packages/debian/debian.go +++ b/routers/api/packages/debian/debian.go @@ -11,16 +11,16 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - debian_service "code.gitea.io/gitea/services/packages/debian" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" + debian_service "forgejo.org/services/packages/debian" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index e66f3ee676..6e116e050d 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -10,12 +10,12 @@ import ( "strings" "unicode" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) var ( diff --git a/routers/api/packages/goproxy/goproxy.go b/routers/api/packages/goproxy/goproxy.go index 56a07dbd43..488850ecbf 100644 --- a/routers/api/packages/goproxy/goproxy.go +++ b/routers/api/packages/goproxy/goproxy.go @@ -11,14 +11,14 @@ import ( "sort" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - goproxy_module "code.gitea.io/gitea/modules/packages/goproxy" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + goproxy_module "forgejo.org/modules/packages/goproxy" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index efdb83ec0e..1d8efb8d68 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -12,17 +12,17 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + helm_module "forgejo.org/modules/packages/helm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "gopkg.in/yaml.v3" ) diff --git a/routers/api/packages/helper/helper.go b/routers/api/packages/helper/helper.go index cdb64109ad..99c0867bbb 100644 --- a/routers/api/packages/helper/helper.go +++ b/routers/api/packages/helper/helper.go @@ -9,10 +9,10 @@ import ( "net/http" "net/url" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // LogAndProcessError logs an error and calls a custom callback with the processed error message. diff --git a/routers/api/packages/maven/api.go b/routers/api/packages/maven/api.go index 167fe42b56..21d2aaa100 100644 --- a/routers/api/packages/maven/api.go +++ b/routers/api/packages/maven/api.go @@ -7,8 +7,8 @@ import ( "encoding/xml" "strings" - packages_model "code.gitea.io/gitea/models/packages" - maven_module "code.gitea.io/gitea/modules/packages/maven" + packages_model "forgejo.org/models/packages" + maven_module "forgejo.org/modules/packages/maven" ) // MetadataResponse https://maven.apache.org/ref/3.2.5/maven-repository-metadata/repository-metadata.html diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 92f20255e1..ea04a7b42e 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -19,15 +19,15 @@ import ( "strconv" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - maven_module "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + maven_module "forgejo.org/modules/packages/maven" + "forgejo.org/modules/sync" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/api/packages/npm/api.go b/routers/api/packages/npm/api.go index b4379f3f49..e610c29b4d 100644 --- a/routers/api/packages/npm/api.go +++ b/routers/api/packages/npm/api.go @@ -10,9 +10,9 @@ import ( "net/url" "sort" - packages_model "code.gitea.io/gitea/models/packages" - npm_module "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" + packages_model "forgejo.org/models/packages" + npm_module "forgejo.org/modules/packages/npm" + "forgejo.org/modules/setting" ) func createPackageMetadataResponse(registryURL string, pds []*packages_model.PackageDescriptor) *npm_module.PackageMetadata { diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index 84acfffae2..bf9d247b30 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -12,19 +12,19 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - npm_module "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + npm_module "forgejo.org/modules/packages/npm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/nuget/api_v2.go b/routers/api/packages/nuget/api_v2.go index 073b2700ef..13c93316d5 100644 --- a/routers/api/packages/nuget/api_v2.go +++ b/routers/api/packages/nuget/api_v2.go @@ -8,8 +8,8 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" + packages_model "forgejo.org/models/packages" + nuget_module "forgejo.org/modules/packages/nuget" ) type AtomTitle struct { diff --git a/routers/api/packages/nuget/api_v3.go b/routers/api/packages/nuget/api_v3.go index 2fe25dc0f8..f1f5300523 100644 --- a/routers/api/packages/nuget/api_v3.go +++ b/routers/api/packages/nuget/api_v3.go @@ -7,8 +7,8 @@ import ( "sort" "time" - packages_model "code.gitea.io/gitea/models/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" + packages_model "forgejo.org/models/packages" + nuget_module "forgejo.org/modules/packages/nuget" "golang.org/x/text/collate" "golang.org/x/text/language" diff --git a/routers/api/packages/nuget/auth.go b/routers/api/packages/nuget/auth.go index 1bb68d059b..bab08bb1b8 100644 --- a/routers/api/packages/nuget/auth.go +++ b/routers/api/packages/nuget/auth.go @@ -6,11 +6,11 @@ package nuget import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/auth" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + "forgejo.org/services/auth" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 0d7212d7f7..254f4311c1 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -14,18 +14,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - nuget_model "code.gitea.io/gitea/models/packages/nuget" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + nuget_model "forgejo.org/models/packages/nuget" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + nuget_module "forgejo.org/modules/packages/nuget" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index f87df52a29..1a1343083f 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -13,16 +13,16 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + pub_module "forgejo.org/modules/packages/pub" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) func jsonResponse(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 19d6dc6903..360632570e 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -12,14 +12,14 @@ import ( "strings" "unicode" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - pypi_module "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + pypi_module "forgejo.org/modules/packages/pypi" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) // https://peps.python.org/pep-0426/#name diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index d56678514c..cdbf893183 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -11,18 +11,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - rpm_service "code.gitea.io/gitea/services/packages/rpm" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + notify_service "forgejo.org/services/notify" + packages_service "forgejo.org/services/packages" + rpm_service "forgejo.org/services/packages/rpm" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index 28f584b391..eed19467ff 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -13,14 +13,14 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - rubygems_module "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + rubygems_module "forgejo.org/modules/packages/rubygems" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index fce2a36dd6..304230a85e 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -12,17 +12,17 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + swift_module "forgejo.org/modules/packages/swift" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go index 98a81da368..26131c2cf2 100644 --- a/routers/api/packages/vagrant/vagrant.go +++ b/routers/api/packages/vagrant/vagrant.go @@ -11,13 +11,13 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + vagrant_module "forgejo.org/modules/packages/vagrant" + "forgejo.org/modules/setting" + "forgejo.org/routers/api/packages/helper" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/shared/middleware.go b/routers/api/shared/middleware.go index 5e863cb9eb..f56acbe1bf 100644 --- a/routers/api/shared/middleware.go +++ b/routers/api/shared/middleware.go @@ -6,11 +6,11 @@ package shared import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/routers/common" + "forgejo.org/services/auth" + "forgejo.org/services/context" "github.com/go-chi/cors" ) diff --git a/routers/api/v1/activitypub/actor.go b/routers/api/v1/activitypub/actor.go index 4f128e74c4..7568a2a7c8 100644 --- a/routers/api/v1/activitypub/actor.go +++ b/routers/api/v1/activitypub/actor.go @@ -7,11 +7,11 @@ package activitypub import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index 995a148f0b..1da7933418 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/activitypub/repository.go b/routers/api/v1/activitypub/repository.go index 14381664d4..c506840f1c 100644 --- a/routers/api/v1/activitypub/repository.go +++ b/routers/api/v1/activitypub/repository.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/federation" + "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/federation" ap "github.com/go-ap/activitypub" ) diff --git a/routers/api/v1/activitypub/repository_test.go b/routers/api/v1/activitypub/repository_test.go index 1e5af6acac..8d448a4356 100644 --- a/routers/api/v1/activitypub/repository_test.go +++ b/routers/api/v1/activitypub/repository_test.go @@ -6,7 +6,7 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/modules/validation" ) func Test_UserEmailValidate(t *testing.T) { diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index 19d167b50b..a9bb4bd868 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -12,11 +12,11 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - gitea_context "code.gitea.io/gitea/services/context" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + gitea_context "forgejo.org/services/context" "github.com/42wim/httpsig" ap "github.com/go-ap/activitypub" diff --git a/routers/api/v1/activitypub/response.go b/routers/api/v1/activitypub/response.go index 42ef375f12..a97f363cc2 100644 --- a/routers/api/v1/activitypub/response.go +++ b/routers/api/v1/activitypub/response.go @@ -6,10 +6,10 @@ package activitypub import ( "net/http" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index a4708fe032..082411f2bc 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // ListUnadoptedRepositories lists the unadopted repositories that match the provided names diff --git a/routers/api/v1/admin/cron.go b/routers/api/v1/admin/cron.go index e1ca6048c9..5d68ab2dce 100644 --- a/routers/api/v1/admin/cron.go +++ b/routers/api/v1/admin/cron.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/cron" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/cron" ) // ListCronTasks api for getting cron tasks diff --git a/routers/api/v1/admin/email.go b/routers/api/v1/admin/email.go index ba963e9f69..906780a44b 100644 --- a/routers/api/v1/admin/email.go +++ b/routers/api/v1/admin/email.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetAllEmails diff --git a/routers/api/v1/admin/hooks.go b/routers/api/v1/admin/hooks.go index b246cb61b1..b3db2eb5e3 100644 --- a/routers/api/v1/admin/hooks.go +++ b/routers/api/v1/admin/hooks.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list system's webhooks diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index a5c299bbf0..d3a5cea056 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -7,14 +7,14 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // CreateOrg api for create organization diff --git a/routers/api/v1/admin/quota.go b/routers/api/v1/admin/quota.go index 1e7c11e007..c7da0e6398 100644 --- a/routers/api/v1/admin/quota.go +++ b/routers/api/v1/admin/quota.go @@ -6,9 +6,9 @@ package admin import ( "net/http" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + quota_model "forgejo.org/models/quota" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetUserQuota return information about a user's quota diff --git a/routers/api/v1/admin/quota_group.go b/routers/api/v1/admin/quota_group.go index e20b361eb5..afe33b639c 100644 --- a/routers/api/v1/admin/quota_group.go +++ b/routers/api/v1/admin/quota_group.go @@ -7,12 +7,12 @@ import ( go_context "context" "net/http" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListQuotaGroups returns all the quota groups diff --git a/routers/api/v1/admin/quota_rule.go b/routers/api/v1/admin/quota_rule.go index 85c05e1e9b..ea188107fa 100644 --- a/routers/api/v1/admin/quota_rule.go +++ b/routers/api/v1/admin/quota_rule.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - quota_model "code.gitea.io/gitea/models/quota" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + quota_model "forgejo.org/models/quota" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func toLimitSubjects(subjStrings []string) (*quota_model.LimitSubjects, error) { diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index c119d5390a..9f9118e0ab 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -4,10 +4,10 @@ package admin import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/repo" + "forgejo.org/services/context" ) // CreateRepo api for creating a repository diff --git a/routers/api/v1/admin/runners.go b/routers/api/v1/admin/runners.go index d0cfef8e48..e459b947ff 100644 --- a/routers/api/v1/admin/runners.go +++ b/routers/api/v1/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index db8f6627e6..32e1dd414d 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -10,26 +10,26 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" ) func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64) { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 3791a6fbba..2eb1ee4229 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -71,37 +71,37 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/shared" - "code.gitea.io/gitea/routers/api/v1/activitypub" - "code.gitea.io/gitea/routers/api/v1/admin" - "code.gitea.io/gitea/routers/api/v1/misc" - "code.gitea.io/gitea/routers/api/v1/notify" - "code.gitea.io/gitea/routers/api/v1/org" - "code.gitea.io/gitea/routers/api/v1/packages" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/settings" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/shared" + "forgejo.org/routers/api/v1/activitypub" + "forgejo.org/routers/api/v1/admin" + "forgejo.org/routers/api/v1/misc" + "forgejo.org/routers/api/v1/notify" + "forgejo.org/routers/api/v1/org" + "forgejo.org/routers/api/v1/packages" + "forgejo.org/routers/api/v1/repo" + "forgejo.org/routers/api/v1/settings" + "forgejo.org/routers/api/v1/user" + "forgejo.org/services/actions" + "forgejo.org/services/auth" + "forgejo.org/services/context" + "forgejo.org/services/forms" - _ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation + _ "forgejo.org/routers/api/v1/swagger" // for swagger generation "code.forgejo.org/go-chi/binding" ) diff --git a/routers/api/v1/misc/gitignore.go b/routers/api/v1/misc/gitignore.go index dffd771752..ec57038a9b 100644 --- a/routers/api/v1/misc/gitignore.go +++ b/routers/api/v1/misc/gitignore.go @@ -6,11 +6,11 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // Shows a list of all Gitignore templates diff --git a/routers/api/v1/misc/label_templates.go b/routers/api/v1/misc/label_templates.go index cc11f37626..dad5ee34c1 100644 --- a/routers/api/v1/misc/label_templates.go +++ b/routers/api/v1/misc/label_templates.go @@ -6,10 +6,10 @@ package misc import ( "net/http" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/util" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // Shows a list of all Label templates diff --git a/routers/api/v1/misc/licenses.go b/routers/api/v1/misc/licenses.go index 2a980f5084..c9b657a890 100644 --- a/routers/api/v1/misc/licenses.go +++ b/routers/api/v1/misc/licenses.go @@ -8,12 +8,12 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // Returns a list of all License templates diff --git a/routers/api/v1/misc/markup.go b/routers/api/v1/misc/markup.go index 155ad15712..e9f03fdd5c 100644 --- a/routers/api/v1/misc/markup.go +++ b/routers/api/v1/misc/markup.go @@ -6,12 +6,12 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" ) // Markup render markup document to HTML diff --git a/routers/api/v1/misc/markup_test.go b/routers/api/v1/misc/markup_test.go index 32568b805f..3335199e12 100644 --- a/routers/api/v1/misc/markup_test.go +++ b/routers/api/v1/misc/markup_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/misc/nodeinfo.go b/routers/api/v1/misc/nodeinfo.go index 70187e0ebf..9631de7edd 100644 --- a/routers/api/v1/misc/nodeinfo.go +++ b/routers/api/v1/misc/nodeinfo.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) const cacheKeyNodeInfoUsage = "API_NodeInfoUsage" diff --git a/routers/api/v1/misc/signing.go b/routers/api/v1/misc/signing.go index 24a46c1e70..945df6068f 100644 --- a/routers/api/v1/misc/signing.go +++ b/routers/api/v1/misc/signing.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" ) // SigningKey returns the public key of the default signing key if it exists diff --git a/routers/api/v1/misc/version.go b/routers/api/v1/misc/version.go index 3417475d21..5802c12462 100644 --- a/routers/api/v1/misc/version.go +++ b/routers/api/v1/misc/version.go @@ -6,9 +6,9 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) // Version shows the version of the Gitea server diff --git a/routers/api/v1/notify/notifications.go b/routers/api/v1/notify/notifications.go index 46b3c7f5e7..2e19fa0b9c 100644 --- a/routers/api/v1/notify/notifications.go +++ b/routers/api/v1/notify/notifications.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" ) // NewAvailable check if unread notifications exist diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go index 1744426ee8..64a9654d48 100644 --- a/routers/api/v1/notify/repo.go +++ b/routers/api/v1/notify/repo.go @@ -8,11 +8,11 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func statusStringToNotificationStatus(status string) activities_model.NotificationStatus { diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index 8e12d359cb..57c78f5f15 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetThread get notification by ID diff --git a/routers/api/v1/notify/user.go b/routers/api/v1/notify/user.go index 879f484cce..2b8cc8c112 100644 --- a/routers/api/v1/notify/user.go +++ b/routers/api/v1/notify/user.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListNotifications list users's notification threads diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go index 99e70e0740..0d8550a019 100644 --- a/routers/api/v1/org/action.go +++ b/routers/api/v1/org/action.go @@ -7,17 +7,17 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + secret_service "forgejo.org/services/secrets" ) // ListActionsSecrets list an organization's actions secrets diff --git a/routers/api/v1/org/avatar.go b/routers/api/v1/org/avatar.go index f11eb6c1cd..824a9f3495 100644 --- a/routers/api/v1/org/avatar.go +++ b/routers/api/v1/org/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // UpdateAvatarupdates the Avatar of an Organisation diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index c1dc0519ea..2877acd3c7 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -6,11 +6,11 @@ package org import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list an organziation's webhooks diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index b5ec54ccf4..172d531229 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/label" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListLabels list all the labels of an organization diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index 0895c53328..c6e67b2ab9 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -7,14 +7,14 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models" + "forgejo.org/models/organization" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // listMembers list an organization's members diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 7d503c3ad7..fcf2c6b412 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -8,21 +8,21 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/org" - user_service "code.gitea.io/gitea/services/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/org" + user_service "forgejo.org/services/user" ) func listUserOrgs(ctx *context.APIContext, u *user_model.User) { diff --git a/routers/api/v1/org/quota.go b/routers/api/v1/org/quota.go index 57c41f5ce3..f4f89b0aaf 100644 --- a/routers/api/v1/org/quota.go +++ b/routers/api/v1/org/quota.go @@ -4,8 +4,8 @@ package org import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // GetQuota returns the quota information for a given organization diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index bf28d54c42..680cc19ce8 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -8,22 +8,22 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/user" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) // ListTeams list all the teams of an organization diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go index a98b5dbc69..03057c4feb 100644 --- a/routers/api/v1/packages/package.go +++ b/routers/api/v1/packages/package.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + packages_service "forgejo.org/services/packages" ) // ListPackages gets all packages of an owner diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 2ce9ad253c..a39d4836e1 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -7,18 +7,18 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + "forgejo.org/services/convert" + secret_service "forgejo.org/services/secrets" ) // ListActionsSecrets list an repo's actions secrets diff --git a/routers/api/v1/repo/avatar.go b/routers/api/v1/repo/avatar.go index 698337ffd2..84aafe764d 100644 --- a/routers/api/v1/repo/avatar.go +++ b/routers/api/v1/repo/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // UpdateVatar updates the Avatar of an Repo diff --git a/routers/api/v1/repo/blob.go b/routers/api/v1/repo/blob.go index 3b116666ea..8ed57d4787 100644 --- a/routers/api/v1/repo/blob.go +++ b/routers/api/v1/repo/blob.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" ) // GetBlob get the blob of a repository file. diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 3ca97f7770..6263360a8e 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -9,22 +9,22 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" ) // GetBranch get a branch of a repository diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index 14915d31ba..3ef7721ef5 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -8,18 +8,18 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + repo_service "forgejo.org/services/repository" ) // ListCollaborators list a repository's collaborators diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go index c5e8cf99eb..4221e59f17 100644 --- a/routers/api/v1/repo/commits.go +++ b/routers/api/v1/repo/commits.go @@ -10,14 +10,14 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetSingleCommit get a commit via sha diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go index 7781e996f5..9c941ea07f 100644 --- a/routers/api/v1/repo/compare.go +++ b/routers/api/v1/repo/compare.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // CompareDiff compare two branches or commits diff --git a/routers/api/v1/repo/download.go b/routers/api/v1/repo/download.go index 3a0401a5b0..86910123e6 100644 --- a/routers/api/v1/repo/download.go +++ b/routers/api/v1/repo/download.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/services/context" - archiver_service "code.gitea.io/gitea/services/repository/archiver" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/services/context" + archiver_service "forgejo.org/services/repository/archiver" ) func DownloadArchive(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 55b245676d..fb71d76388 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -14,23 +14,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" + archiver_service "forgejo.org/services/repository/archiver" + files_service "forgejo.org/services/repository/files" ) const ( diff --git a/routers/api/v1/repo/flags.go b/routers/api/v1/repo/flags.go index ac5cb2e6d6..46af528f0f 100644 --- a/routers/api/v1/repo/flags.go +++ b/routers/api/v1/repo/flags.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" ) func ListFlags(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index c9dc9681c9..edb85cf54f 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -9,19 +9,19 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + repo_service "forgejo.org/services/repository" ) // ListForks list a repository's forks diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go index 26ae84d08d..31957c8b4d 100644 --- a/routers/api/v1/repo/git_hook.go +++ b/routers/api/v1/repo/git_hook.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListGitHooks list all Git hooks of a repository diff --git a/routers/api/v1/repo/git_ref.go b/routers/api/v1/repo/git_ref.go index 54da5eeaa7..b2e52ad95d 100644 --- a/routers/api/v1/repo/git_ref.go +++ b/routers/api/v1/repo/git_ref.go @@ -7,10 +7,10 @@ import ( "net/http" "net/url" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" ) // GetGitAllRefs get ref or an list all the refs of a repository diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index ffd2313591..5d277604b8 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -7,19 +7,19 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list all hooks of a repository diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go index a8065e4a60..77c86388f5 100644 --- a/routers/api/v1/repo/hook_test.go +++ b/routers/api/v1/repo/hook_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + "forgejo.org/models/webhook" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 57fc4b2f17..5495c4a6ba 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -12,23 +12,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // SearchIssues searches for issues across the repositories that the user has access to diff --git a/routers/api/v1/repo/issue_attachment.go b/routers/api/v1/repo/issue_attachment.go index a972ab0374..0cb1875af1 100644 --- a/routers/api/v1/repo/issue_attachment.go +++ b/routers/api/v1/repo/issue_attachment.go @@ -7,17 +7,17 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // GetIssueAttachment gets a single attachment of the issue diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 2fe7aaacb4..1b98c154c8 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -9,18 +9,18 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // ListIssueComments list all the comments of an issue diff --git a/routers/api/v1/repo/issue_comment_attachment.go b/routers/api/v1/repo/issue_comment_attachment.go index c45e2ebe89..9edc9a3cb1 100644 --- a/routers/api/v1/repo/issue_comment_attachment.go +++ b/routers/api/v1/repo/issue_comment_attachment.go @@ -7,17 +7,17 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // GetIssueCommentAttachment gets a single attachment of the comment diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go index c40e92c01b..bed1e7ecf9 100644 --- a/routers/api/v1/repo/issue_dependency.go +++ b/routers/api/v1/repo/issue_dependency.go @@ -7,15 +7,15 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetIssueDependencies list an issue's dependencies diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index 6458fbf514..85af1149ff 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -9,12 +9,12 @@ import ( "net/http" "reflect" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // ListIssueLabels list all the labels of an issue diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go index af3e06332a..84079ed452 100644 --- a/routers/api/v1/repo/issue_pin.go +++ b/routers/api/v1/repo/issue_pin.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // PinIssue pins a issue diff --git a/routers/api/v1/repo/issue_reaction.go b/routers/api/v1/repo/issue_reaction.go index c395255c13..2d6218bf46 100644 --- a/routers/api/v1/repo/issue_reaction.go +++ b/routers/api/v1/repo/issue_reaction.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" ) // GetIssueCommentReactions list reactions of a comment from an issue diff --git a/routers/api/v1/repo/issue_stopwatch.go b/routers/api/v1/repo/issue_stopwatch.go index dd61967ed0..83bcabbe15 100644 --- a/routers/api/v1/repo/issue_stopwatch.go +++ b/routers/api/v1/repo/issue_stopwatch.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // StartIssueStopwatch creates a stopwatch for the given issue. diff --git a/routers/api/v1/repo/issue_subscription.go b/routers/api/v1/repo/issue_subscription.go index 6b29218575..33654dc136 100644 --- a/routers/api/v1/repo/issue_subscription.go +++ b/routers/api/v1/repo/issue_subscription.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // AddIssueSubscription Subscribe user to issue diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index 3d8abfa5f3..7d88b1b2cd 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -8,15 +8,15 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListTrackedTimes list all the tracked times of an issue diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index 88444a2625..2abf95a189 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -10,18 +10,18 @@ import ( "net/http" "net/url" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index b6eb51fd20..bf722ace34 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -8,13 +8,13 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/label" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListLabels list all the labels of a repository diff --git a/routers/api/v1/repo/language.go b/routers/api/v1/repo/language.go index f1d5bbe45f..498aac3447 100644 --- a/routers/api/v1/repo/language.go +++ b/routers/api/v1/repo/language.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) type languageResponse []*repo_model.LanguageStat diff --git a/routers/api/v1/repo/main_test.go b/routers/api/v1/repo/main_test.go index 451f34d72f..a3655fb76b 100644 --- a/routers/api/v1/repo/main_test.go +++ b/routers/api/v1/repo/main_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + webhook_service "forgejo.org/services/webhook" ) func TestMain(m *testing.M) { diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 723a696b92..d0ab5e270e 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -10,28 +10,28 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - notify_service "code.gitea.io/gitea/services/notify" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + notify_service "forgejo.org/services/notify" + repo_service "forgejo.org/services/repository" ) // Migrate migrate remote git repository to gitea diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index b9534016e4..7aa9881bc4 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -9,15 +9,15 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListMilestones list milestones for a repository diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go index 11b026abb7..bc48c6acb7 100644 --- a/routers/api/v1/repo/mirror.go +++ b/routers/api/v1/repo/mirror.go @@ -9,21 +9,21 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" + "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" ) // MirrorSync adds a mirrored repository to the sync queue diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go index 9ed78ce80f..87903d9f36 100644 --- a/routers/api/v1/repo/notes.go +++ b/routers/api/v1/repo/notes.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetNote Get a note corresponding to a single commit from a repository diff --git a/routers/api/v1/repo/patch.go b/routers/api/v1/repo/patch.go index 27c5c17dce..6f35891627 100644 --- a/routers/api/v1/repo/patch.go +++ b/routers/api/v1/repo/patch.go @@ -7,14 +7,14 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/repository/files" ) // ApplyDiffPatch handles API call for applying a patch diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 1a791e8dd5..25c85e7531 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -12,35 +12,35 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/automerge" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + "forgejo.org/services/gitdiff" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" ) // ListPullRequests returns a list of all PRs diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go index 8fba085ff7..aa4c7318a2 100644 --- a/routers/api/v1/repo/pull_review.go +++ b/routers/api/v1/repo/pull_review.go @@ -8,18 +8,18 @@ import ( "net/http" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" ) // ListPullReviews lists all reviews of a pull request diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 2fc5f095cb..68254a530a 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -7,18 +7,18 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - release_service "code.gitea.io/gitea/services/release" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + release_service "forgejo.org/services/release" ) // GetRelease get a single release of a repository diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index d569f6e928..ba273a8d2a 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -11,15 +11,15 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" ) func checkReleaseMatchRepo(ctx *context.APIContext, releaseID int64) bool { diff --git a/routers/api/v1/repo/release_tags.go b/routers/api/v1/repo/release_tags.go index f845fad53b..b27f8584bc 100644 --- a/routers/api/v1/repo/release_tags.go +++ b/routers/api/v1/repo/release_tags.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - releaseservice "code.gitea.io/gitea/services/release" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/context" + "forgejo.org/services/convert" + releaseservice "forgejo.org/services/release" ) // GetReleaseByTag get a single release of a repository by tag name diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 457f179f39..59b32eb667 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -11,32 +11,32 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/issue" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/issue" + repo_service "forgejo.org/services/repository" + wiki_service "forgejo.org/services/wiki" ) // Search repositories via options diff --git a/routers/api/v1/repo/repo_test.go b/routers/api/v1/repo/repo_test.go index 8d6ca9e3b5..69eeb1cfdf 100644 --- a/routers/api/v1/repo/repo_test.go +++ b/routers/api/v1/repo/repo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/star.go b/routers/api/v1/repo/star.go index 99676de119..7a836cd506 100644 --- a/routers/api/v1/repo/star.go +++ b/routers/api/v1/repo/star.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListStargazers list a repository's stargazers diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go index 9e36ea0aed..f02150f881 100644 --- a/routers/api/v1/repo/status.go +++ b/routers/api/v1/repo/status.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + commitstatus_service "forgejo.org/services/repository/commitstatus" ) // NewCommitStatus creates a new CommitStatus diff --git a/routers/api/v1/repo/subscriber.go b/routers/api/v1/repo/subscriber.go index 8584182857..37a2bef85c 100644 --- a/routers/api/v1/repo/subscriber.go +++ b/routers/api/v1/repo/subscriber.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListSubscribers list a repo's subscribers (i.e. watchers) diff --git a/routers/api/v1/repo/tag.go b/routers/api/v1/repo/tag.go index 7dbdd1fcbd..f53a6da811 100644 --- a/routers/api/v1/repo/tag.go +++ b/routers/api/v1/repo/tag.go @@ -9,17 +9,17 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - releaseservice "code.gitea.io/gitea/services/release" + "forgejo.org/models" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + releaseservice "forgejo.org/services/release" ) // ListTags list all the tags of a repository diff --git a/routers/api/v1/repo/teams.go b/routers/api/v1/repo/teams.go index 0ecf3a39d8..4e9d3c40a9 100644 --- a/routers/api/v1/repo/teams.go +++ b/routers/api/v1/repo/teams.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/organization" + "forgejo.org/services/context" + "forgejo.org/services/convert" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) // ListTeams list a repository's teams diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go index 1d8e675bde..daa637936e 100644 --- a/routers/api/v1/repo/topic.go +++ b/routers/api/v1/repo/topic.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListTopics returns list of current topics for repo diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go index 0715aed064..3b6cb4d3f2 100644 --- a/routers/api/v1/repo/transfer.go +++ b/routers/api/v1/repo/transfer.go @@ -8,19 +8,19 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + repo_service "forgejo.org/services/repository" ) // Transfer transfers the ownership of a repository diff --git a/routers/api/v1/repo/tree.go b/routers/api/v1/repo/tree.go index 353a996d5b..af92170abb 100644 --- a/routers/api/v1/repo/tree.go +++ b/routers/api/v1/repo/tree.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" ) // GetTree get the tree of a repository. diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 12aaa8edf8..bb4cf0f211 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -9,17 +9,17 @@ import ( "net/http" "net/url" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + notify_service "forgejo.org/services/notify" + wiki_service "forgejo.org/services/wiki" ) // NewWikiPage response for wiki create request diff --git a/routers/api/v1/settings/settings.go b/routers/api/v1/settings/settings.go index c422315b22..32ef50423c 100644 --- a/routers/api/v1/settings/settings.go +++ b/routers/api/v1/settings/settings.go @@ -6,9 +6,9 @@ package settings import ( "net/http" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" ) // GetGeneralUISettings returns instance's global settings for ui diff --git a/routers/api/v1/shared/quota.go b/routers/api/v1/shared/quota.go index b892df4b2f..ceba9fea57 100644 --- a/routers/api/v1/shared/quota.go +++ b/routers/api/v1/shared/quota.go @@ -6,10 +6,10 @@ package shared import ( "net/http" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + quota_model "forgejo.org/models/quota" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func GetQuota(ctx *context.APIContext, userID int64) { diff --git a/routers/api/v1/shared/runners.go b/routers/api/v1/shared/runners.go index 9c27078326..a7811a95b5 100644 --- a/routers/api/v1/shared/runners.go +++ b/routers/api/v1/shared/runners.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // RegistrationToken is a string used to register a runner with a server diff --git a/routers/api/v1/swagger/action.go b/routers/api/v1/swagger/action.go index 2174b1ff17..6fc58abd76 100644 --- a/routers/api/v1/swagger/action.go +++ b/routers/api/v1/swagger/action.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitea.io/gitea/modules/structs" +import api "forgejo.org/modules/structs" // SecretList // swagger:response SecretList diff --git a/routers/api/v1/swagger/activity.go b/routers/api/v1/swagger/activity.go index 95e1ba9035..64466e5e7b 100644 --- a/routers/api/v1/swagger/activity.go +++ b/routers/api/v1/swagger/activity.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // ActivityFeedsList diff --git a/routers/api/v1/swagger/activitypub.go b/routers/api/v1/swagger/activitypub.go index 91341669da..6235009572 100644 --- a/routers/api/v1/swagger/activitypub.go +++ b/routers/api/v1/swagger/activitypub.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // ActivityPub diff --git a/routers/api/v1/swagger/app.go b/routers/api/v1/swagger/app.go index 6a08b11874..7d62b6d494 100644 --- a/routers/api/v1/swagger/app.go +++ b/routers/api/v1/swagger/app.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // OAuth2Application diff --git a/routers/api/v1/swagger/cron.go b/routers/api/v1/swagger/cron.go index 00cfbe0adb..2c26b22441 100644 --- a/routers/api/v1/swagger/cron.go +++ b/routers/api/v1/swagger/cron.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // CronList diff --git a/routers/api/v1/swagger/issue.go b/routers/api/v1/swagger/issue.go index 62458a3424..b2b5de2228 100644 --- a/routers/api/v1/swagger/issue.go +++ b/routers/api/v1/swagger/issue.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Issue diff --git a/routers/api/v1/swagger/key.go b/routers/api/v1/swagger/key.go index 8390833589..27aa72458d 100644 --- a/routers/api/v1/swagger/key.go +++ b/routers/api/v1/swagger/key.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // PublicKey diff --git a/routers/api/v1/swagger/misc.go b/routers/api/v1/swagger/misc.go index 0553eac2a9..df95a94571 100644 --- a/routers/api/v1/swagger/misc.go +++ b/routers/api/v1/swagger/misc.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // ServerVersion diff --git a/routers/api/v1/swagger/nodeinfo.go b/routers/api/v1/swagger/nodeinfo.go index 8650dfa092..227db61648 100644 --- a/routers/api/v1/swagger/nodeinfo.go +++ b/routers/api/v1/swagger/nodeinfo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // NodeInfo diff --git a/routers/api/v1/swagger/notify.go b/routers/api/v1/swagger/notify.go index 743d807a0a..cd60ef2bcb 100644 --- a/routers/api/v1/swagger/notify.go +++ b/routers/api/v1/swagger/notify.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // NotificationThread diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 48c11c467f..4860f10c98 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -5,9 +5,9 @@ package swagger import ( - ffed "code.gitea.io/gitea/modules/forgefed" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + ffed "forgejo.org/modules/forgefed" + api "forgejo.org/modules/structs" + "forgejo.org/services/forms" ) // not actually a response, just a hack to get go-swagger to include definitions diff --git a/routers/api/v1/swagger/org.go b/routers/api/v1/swagger/org.go index 0105446b00..2d081708a8 100644 --- a/routers/api/v1/swagger/org.go +++ b/routers/api/v1/swagger/org.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Organization diff --git a/routers/api/v1/swagger/package.go b/routers/api/v1/swagger/package.go index eada12d1ea..dd1b45e9aa 100644 --- a/routers/api/v1/swagger/package.go +++ b/routers/api/v1/swagger/package.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Package diff --git a/routers/api/v1/swagger/quota.go b/routers/api/v1/swagger/quota.go index 35e633c39d..b2ea59fb31 100644 --- a/routers/api/v1/swagger/quota.go +++ b/routers/api/v1/swagger/quota.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // QuotaInfo diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go index ca214b4900..445e3417fb 100644 --- a/routers/api/v1/swagger/repo.go +++ b/routers/api/v1/swagger/repo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" ) // Repository diff --git a/routers/api/v1/swagger/settings.go b/routers/api/v1/swagger/settings.go index a9466699df..3a07eaf2e0 100644 --- a/routers/api/v1/swagger/settings.go +++ b/routers/api/v1/swagger/settings.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitea.io/gitea/modules/structs" +import api "forgejo.org/modules/structs" // GeneralRepoSettings // swagger:response GeneralRepoSettings diff --git a/routers/api/v1/swagger/user.go b/routers/api/v1/swagger/user.go index 37e28664fb..805cfe3df4 100644 --- a/routers/api/v1/swagger/user.go +++ b/routers/api/v1/swagger/user.go @@ -4,8 +4,8 @@ package swagger import ( - activities_model "code.gitea.io/gitea/models/activities" - api "code.gitea.io/gitea/modules/structs" + activities_model "forgejo.org/models/activities" + api "forgejo.org/modules/structs" ) // User diff --git a/routers/api/v1/user/action.go b/routers/api/v1/user/action.go index c34c5950c0..dd816cb7ae 100644 --- a/routers/api/v1/user/action.go +++ b/routers/api/v1/user/action.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + secret_service "forgejo.org/services/secrets" ) // create or update one secret of the user scope diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index c4fb2ea38d..138ad5a1d2 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // ListAccessTokens list all the access tokens diff --git a/routers/api/v1/user/avatar.go b/routers/api/v1/user/avatar.go index d3833a32bb..453682a37b 100644 --- a/routers/api/v1/user/avatar.go +++ b/routers/api/v1/user/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // UpdateAvatar updates the Avatar of an User diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 6bd7e10dd8..7b18ea97b0 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + user_service "forgejo.org/services/user" ) // ListEmails list all of the authenticated user's email addresses diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 784e2325a3..643ad49b80 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func responseAPIUsers(ctx *context.APIContext, users []*user_model.User) { diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 652007a78b..1581358b66 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) { diff --git a/routers/api/v1/user/helper.go b/routers/api/v1/user/helper.go index 8b5c64e291..fe0943091f 100644 --- a/routers/api/v1/user/helper.go +++ b/routers/api/v1/user/helper.go @@ -6,8 +6,8 @@ package user import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/services/context" ) // GetUserByParamsName get user by name diff --git a/routers/api/v1/user/hook.go b/routers/api/v1/user/hook.go index 47b6498d85..c8cdf5040d 100644 --- a/routers/api/v1/user/hook.go +++ b/routers/api/v1/user/hook.go @@ -6,11 +6,11 @@ package user import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListHooks list the authenticated user's webhooks diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index 1b4ba0a40f..3aecf5fc3a 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -8,18 +8,18 @@ import ( "fmt" "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/api/v1/repo" + "forgejo.org/routers/api/v1/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/user/quota.go b/routers/api/v1/user/quota.go index ab2881b355..40c8ee43e9 100644 --- a/routers/api/v1/user/quota.go +++ b/routers/api/v1/user/quota.go @@ -4,8 +4,8 @@ package user import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // GetQuota returns the quota information for the authenticated user diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go index 7df13ee413..7b326812a7 100644 --- a/routers/api/v1/user/repo.go +++ b/routers/api/v1/user/repo.go @@ -6,13 +6,13 @@ package user import ( "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // listUserRepos - List the repositories owned by the given user. diff --git a/routers/api/v1/user/runners.go b/routers/api/v1/user/runners.go index 5e8cdbeb58..579e3eb932 100644 --- a/routers/api/v1/user/runners.go +++ b/routers/api/v1/user/runners.go @@ -4,8 +4,8 @@ package user import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/routers/api/v1/shared" + "forgejo.org/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/user/settings.go b/routers/api/v1/user/settings.go index 67ab0dd964..134b448718 100644 --- a/routers/api/v1/user/settings.go +++ b/routers/api/v1/user/settings.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + user_service "forgejo.org/services/user" ) // GetUserSettings returns user settings diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go index be84b13204..19fa49f2ad 100644 --- a/routers/api/v1/user/star.go +++ b/routers/api/v1/user/star.go @@ -9,15 +9,15 @@ import ( std_context "context" "net/http" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/repository" ) // getStarredRepos returns the repos that the user with the specified userID has diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index da1250b283..5bdd56c892 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -8,12 +8,12 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "forgejo.org/models/activities" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // Search search users diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index dc27a38a03..1358a63f51 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -7,14 +7,14 @@ import ( std_context "context" "net/http" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/routers/api/v1/utils" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // getWatchedRepos returns the repos that the user with the specified userID is watching diff --git a/routers/api/v1/utils/block.go b/routers/api/v1/utils/block.go index 34fad96034..a1f044d1ef 100644 --- a/routers/api/v1/utils/block.go +++ b/routers/api/v1/utils/block.go @@ -6,10 +6,10 @@ package utils import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // ListUserBlockedUsers lists the blocked users of the provided doer. diff --git a/routers/api/v1/utils/git.go b/routers/api/v1/utils/git.go index 4e25137817..5359a54899 100644 --- a/routers/api/v1/utils/git.go +++ b/routers/api/v1/utils/git.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // ResolveRefOrSha resolve ref to sha if exist diff --git a/routers/api/v1/utils/hook.go b/routers/api/v1/utils/hook.go index f1abd49a7d..d882845008 100644 --- a/routers/api/v1/utils/hook.go +++ b/routers/api/v1/utils/hook.go @@ -9,16 +9,16 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) // ListOwnerHooks lists the webhooks of the provided owner diff --git a/routers/api/v1/utils/page.go b/routers/api/v1/utils/page.go index 024ba7b8d9..4ab141ca64 100644 --- a/routers/api/v1/utils/page.go +++ b/routers/api/v1/utils/page.go @@ -4,9 +4,9 @@ package utils import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetListOptions returns list options using the page and limit parameters diff --git a/routers/common/auth.go b/routers/common/auth.go index 722c625e7b..d4b3b1fea7 100644 --- a/routers/common/auth.go +++ b/routers/common/auth.go @@ -4,10 +4,10 @@ package common import ( - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/web/middleware" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/context" ) type AuthResult struct { diff --git a/routers/common/compare.go b/routers/common/compare.go index 4d1cc2f0d8..9c158814d1 100644 --- a/routers/common/compare.go +++ b/routers/common/compare.go @@ -4,9 +4,9 @@ package common import ( - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" ) // CompareInfo represents the collected results from ParseCompareInfo diff --git a/routers/common/db.go b/routers/common/db.go index ac24303989..0646071264 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + system_model "forgejo.org/models/system" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" "xorm.io/xorm" ) diff --git a/routers/common/errpage.go b/routers/common/errpage.go index 402ca44c12..907c278ab1 100644 --- a/routers/common/errpage.go +++ b/routers/common/errpage.go @@ -7,15 +7,15 @@ import ( "fmt" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web/middleware" + "forgejo.org/modules/web/routing" + "forgejo.org/services/context" ) const tplStatus500 base.TplName = "status/500" diff --git a/routers/common/errpage_test.go b/routers/common/errpage_test.go index f15d3f1b35..3a492ea304 100644 --- a/routers/common/errpage_test.go +++ b/routers/common/errpage_test.go @@ -10,9 +10,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web/middleware" + "forgejo.org/models/unittest" + "forgejo.org/modules/test" + "forgejo.org/modules/web/middleware" "github.com/stretchr/testify/assert" ) diff --git a/routers/common/markup.go b/routers/common/markup.go index ce3a8acdb0..715d7d883f 100644 --- a/routers/common/markup.go +++ b/routers/common/markup.go @@ -9,11 +9,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/services/context" "mvdan.cc/xurls/v2" ) diff --git a/routers/common/middleware.go b/routers/common/middleware.go index ee2e504ff1..d44f046a1e 100644 --- a/routers/common/middleware.go +++ b/routers/common/middleware.go @@ -9,12 +9,12 @@ import ( "runtime/trace" "strings" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/cache" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" + "forgejo.org/modules/web/routing" + "forgejo.org/services/context" "code.forgejo.org/go-chi/session" "github.com/chi-middleware/proxy" diff --git a/routers/common/middleware_test.go b/routers/common/middleware_test.go index 6126e0afcc..b9c1b226e8 100644 --- a/routers/common/middleware_test.go +++ b/routers/common/middleware_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/web" + "forgejo.org/modules/web" chi "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/routers/common/redirect.go b/routers/common/redirect.go index 9bf2025e19..8c13911a9c 100644 --- a/routers/common/redirect.go +++ b/routers/common/redirect.go @@ -6,7 +6,7 @@ package common import ( "net/http" - "code.gitea.io/gitea/modules/httplib" + "forgejo.org/modules/httplib" ) // FetchRedirectDelegate helps the "fetch" requests to redirect to the correct location diff --git a/routers/common/serve.go b/routers/common/serve.go index 446908db75..9d017ec5a1 100644 --- a/routers/common/serve.go +++ b/routers/common/serve.go @@ -7,11 +7,11 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/git" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // ServeBlob download a git.Blob diff --git a/routers/init.go b/routers/init.go index 821a0ef38c..90a1cb1e89 100644 --- a/routers/init.go +++ b/routers/init.go @@ -8,50 +8,50 @@ import ( "reflect" "runtime" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - authmodel "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/external" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/ssh" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/system" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - actions_router "code.gitea.io/gitea/routers/api/actions" - forgejo "code.gitea.io/gitea/routers/api/forgejo/v1" - packages_router "code.gitea.io/gitea/routers/api/packages" - apiv1 "code.gitea.io/gitea/routers/api/v1" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/private" - web_routers "code.gitea.io/gitea/routers/web" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/cron" - feed_service "code.gitea.io/gitea/services/feed" - indexer_service "code.gitea.io/gitea/services/indexer" - "code.gitea.io/gitea/services/mailer" - mailer_incoming "code.gitea.io/gitea/services/mailer/incoming" - markup_service "code.gitea.io/gitea/services/markup" - repo_migrations "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/repository/archiver" - "code.gitea.io/gitea/services/task" - "code.gitea.io/gitea/services/uinotification" - "code.gitea.io/gitea/services/webhook" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + authmodel "forgejo.org/models/auth" + "forgejo.org/modules/cache" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/git" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/external" + "forgejo.org/modules/setting" + "forgejo.org/modules/ssh" + "forgejo.org/modules/storage" + "forgejo.org/modules/svg" + "forgejo.org/modules/system" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web" + actions_router "forgejo.org/routers/api/actions" + forgejo "forgejo.org/routers/api/forgejo/v1" + packages_router "forgejo.org/routers/api/packages" + apiv1 "forgejo.org/routers/api/v1" + "forgejo.org/routers/common" + "forgejo.org/routers/private" + web_routers "forgejo.org/routers/web" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/automerge" + "forgejo.org/services/cron" + feed_service "forgejo.org/services/feed" + indexer_service "forgejo.org/services/indexer" + "forgejo.org/services/mailer" + mailer_incoming "forgejo.org/services/mailer/incoming" + markup_service "forgejo.org/services/markup" + repo_migrations "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + pull_service "forgejo.org/services/pull" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" + "forgejo.org/services/repository/archiver" + "forgejo.org/services/task" + "forgejo.org/services/uinotification" + "forgejo.org/services/webhook" ) func mustInit(fn func() error) { diff --git a/routers/install/install.go b/routers/install/install.go index 86e342f1f9..b9333a9e16 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -15,25 +15,25 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - db_install "code.gitea.io/gitea/models/db/install" - "code.gitea.io/gitea/models/migrations" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + db_install "forgejo.org/models/db/install" + "forgejo.org/models/migrations" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/base" + "forgejo.org/modules/generate" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/routers/common" + "forgejo.org/services/context" + "forgejo.org/services/forms" "code.forgejo.org/go-chi/session" ) diff --git a/routers/install/routes.go b/routers/install/routes.go index 06c9d389a6..f7fb40f688 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -8,12 +8,12 @@ import ( "html" "net/http" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/services/forms" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/routers/web/healthcheck" + "forgejo.org/services/forms" ) // Routes registers the installation routes diff --git a/routers/install/routes_test.go b/routers/install/routes_test.go index 2aa7f5d7b7..a504cf1baa 100644 --- a/routers/install/routes_test.go +++ b/routers/install/routes_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/actions.go b/routers/private/actions.go index 425c480b3e..441fb881ed 100644 --- a/routers/private/actions.go +++ b/routers/private/actions.go @@ -10,14 +10,14 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // GenerateActionsRunnerToken generates a new runner token for a given scope diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go index af5d75634b..da185e1ab1 100644 --- a/routers/private/default_branch.go +++ b/routers/private/default_branch.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/private" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/private" + gitea_context "forgejo.org/services/context" ) // SetDefaultBranch updates the default branch diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index 11d1161e85..c7748b01c8 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -10,25 +10,25 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - timeutil "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - gitea_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + timeutil "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + gitea_context "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // HookPostReceive updates services and users diff --git a/routers/private/hook_post_receive_test.go b/routers/private/hook_post_receive_test.go index 28f1a7d0be..bbd0c45769 100644 --- a/routers/private/hook_post_receive_test.go +++ b/routers/private/hook_post_receive_test.go @@ -6,15 +6,15 @@ package private import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/private" + repo_module "forgejo.org/modules/repository" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/private/hook_pre_receive.go b/routers/private/hook_pre_receive.go index 4b8439d2da..191273209e 100644 --- a/routers/private/hook_pre_receive.go +++ b/routers/private/hook_pre_receive.go @@ -9,22 +9,22 @@ import ( "net/http" "os" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - gitea_context "code.gitea.io/gitea/services/context" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + gitea_context "forgejo.org/services/context" + pull_service "forgejo.org/services/pull" ) type preReceiveContext struct { diff --git a/routers/private/hook_proc_receive.go b/routers/private/hook_proc_receive.go index e4aabd858c..cd45794261 100644 --- a/routers/private/hook_proc_receive.go +++ b/routers/private/hook_proc_receive.go @@ -6,13 +6,13 @@ package private import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/agit" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/web" + "forgejo.org/services/agit" + gitea_context "forgejo.org/services/context" ) // HookProcReceive proc-receive hook - only handles agit Proc-Receive requests at present diff --git a/routers/private/hook_verification.go b/routers/private/hook_verification.go index 764c976fa9..e9a1967bd2 100644 --- a/routers/private/hook_verification.go +++ b/routers/private/hook_verification.go @@ -10,9 +10,9 @@ import ( "io" "os" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // This file contains commit verification functions for refs passed across in hooks diff --git a/routers/private/hook_verification_test.go b/routers/private/hook_verification_test.go index 47e06245ed..35458f672e 100644 --- a/routers/private/hook_verification_test.go +++ b/routers/private/hook_verification_test.go @@ -6,8 +6,8 @@ package private import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/require" ) diff --git a/routers/private/internal.go b/routers/private/internal.go index dfbdc6967b..5e8d51d970 100644 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -9,11 +9,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/private/internal_repo.go b/routers/private/internal_repo.go index e8ee8ba8ac..f237d2c676 100644 --- a/routers/private/internal_repo.go +++ b/routers/private/internal_repo.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + gitea_context "forgejo.org/services/context" ) // This file contains common functions relating to setting the Repository for the internal routes diff --git a/routers/private/key.go b/routers/private/key.go index 5b8f238a83..2d77c9c5be 100644 --- a/routers/private/key.go +++ b/routers/private/key.go @@ -6,10 +6,10 @@ package private import ( "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/context" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/private" + "forgejo.org/modules/timeutil" + "forgejo.org/services/context" ) // UpdatePublicKeyInRepo update public key and deploy key updates diff --git a/routers/private/mail.go b/routers/private/mail.go index cf3abb31c6..2b96ce910e 100644 --- a/routers/private/mail.go +++ b/routers/private/mail.go @@ -9,14 +9,14 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/mailer" ) // SendEmail pushes messages to mail queue diff --git a/routers/private/main_test.go b/routers/private/main_test.go index a6bec72b41..1b7f00f439 100644 --- a/routers/private/main_test.go +++ b/routers/private/main_test.go @@ -6,7 +6,7 @@ package private import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/private/manager.go b/routers/private/manager.go index a6aa03e4ec..7ab198f71b 100644 --- a/routers/private/manager.go +++ b/routers/private/manager.go @@ -7,16 +7,16 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/modules/graceful" + "forgejo.org/modules/graceful/releasereopen" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web" + "forgejo.org/services/context" ) // ReloadTemplates reloads all the templates diff --git a/routers/private/manager_process.go b/routers/private/manager_process.go index 9a0298a37c..87447da2be 100644 --- a/routers/private/manager_process.go +++ b/routers/private/manager_process.go @@ -11,10 +11,10 @@ import ( "runtime" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - process_module "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + process_module "forgejo.org/modules/process" + "forgejo.org/services/context" ) // Processes prints out the processes diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go index 311bfe6858..c831b44036 100644 --- a/routers/private/manager_unix.go +++ b/routers/private/manager_unix.go @@ -6,8 +6,8 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/graceful" + "forgejo.org/services/context" ) // Restart causes the server to perform a graceful restart diff --git a/routers/private/restore_repo.go b/routers/private/restore_repo.go index 4e95d3071d..6586c9bb2b 100644 --- a/routers/private/restore_repo.go +++ b/routers/private/restore_repo.go @@ -7,10 +7,10 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/private" - myCtx "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/migrations" + "forgejo.org/modules/json" + "forgejo.org/modules/private" + myCtx "forgejo.org/services/context" + "forgejo.org/services/migrations" ) // RestoreRepo restore a repository from data diff --git a/routers/private/serv.go b/routers/private/serv.go index ef3920d359..df61355fb0 100644 --- a/routers/private/serv.go +++ b/routers/private/serv.go @@ -8,19 +8,19 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" + wiki_service "forgejo.org/services/wiki" ) // ServNoCommand returns information about the provided keyid diff --git a/routers/private/ssh_log.go b/routers/private/ssh_log.go index 5bec632ead..f6974967c0 100644 --- a/routers/private/ssh_log.go +++ b/routers/private/ssh_log.go @@ -6,11 +6,11 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" ) // SSHLog hook to response ssh log diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index 067203b28b..96a714376b 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -11,20 +11,20 @@ import ( "runtime" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/updatechecker" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/cron" - "code.gitea.io/gitea/services/forms" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/updatechecker" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/cron" + "forgejo.org/services/forms" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/admin/admin_test.go b/routers/web/admin/admin_test.go index 3518869ede..d0c3c2b56f 100644 --- a/routers/web/admin/admin_test.go +++ b/routers/web/admin/admin_test.go @@ -6,11 +6,11 @@ package admin import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/contexttest" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/admin/applications.go b/routers/web/admin/applications.go index 8583398074..ba15e0a000 100644 --- a/routers/web/admin/applications.go +++ b/routers/web/admin/applications.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" ) var ( diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 8af14f6d52..2c6dc76305 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -10,20 +10,20 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - "code.gitea.io/gitea/services/auth/source/oauth2" - pam_service "code.gitea.io/gitea/services/auth/source/pam" - "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/auth/pam" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/auth/source/ldap" + "forgejo.org/services/auth/source/oauth2" + pam_service "forgejo.org/services/auth/source/pam" + "forgejo.org/services/auth/source/smtp" + "forgejo.org/services/context" + "forgejo.org/services/forms" "xorm.io/xorm/convert" ) diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 06d0ea60fb..f99a193960 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -10,17 +10,17 @@ import ( "strconv" "strings" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" + system_model "forgejo.org/models/system" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/setting/config" + "forgejo.org/modules/util" + "forgejo.org/services/context" + "forgejo.org/services/mailer" "code.forgejo.org/go-chi/session" ) diff --git a/routers/web/admin/diagnosis.go b/routers/web/admin/diagnosis.go index 959c9bc444..e436dca663 100644 --- a/routers/web/admin/diagnosis.go +++ b/routers/web/admin/diagnosis.go @@ -11,8 +11,8 @@ import ( "runtime/trace" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/httplib" + "forgejo.org/services/context" ) func MonitorDiagnosis(ctx *context.Context) { diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index f0d8555070..a4421cf495 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -8,14 +8,14 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/user" ) const ( diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index cdca0a5c2d..aeceffe848 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) const ( diff --git a/routers/web/admin/main_test.go b/routers/web/admin/main_test.go index e1294ddbb4..bccb0d7058 100644 --- a/routers/web/admin/main_test.go +++ b/routers/web/admin/main_test.go @@ -6,7 +6,7 @@ package admin import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/admin/notice.go b/routers/web/admin/notice.go index 36303cbc06..8bcaadf915 100644 --- a/routers/web/admin/notice.go +++ b/routers/web/admin/notice.go @@ -8,12 +8,12 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + system_model "forgejo.org/models/system" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index cea28f8220..6ece35dcaf 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -5,13 +5,13 @@ package admin import ( - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/routers/web/explore" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 39f064a1be..5c80a1eada 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -8,14 +8,14 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/modules/base" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + packages_service "forgejo.org/services/packages" + packages_cleanup_service "forgejo.org/services/packages/cleanup" ) const ( diff --git a/routers/web/admin/queue.go b/routers/web/admin/queue.go index 246ab379b5..03bbfe5af4 100644 --- a/routers/web/admin/queue.go +++ b/routers/web/admin/queue.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) func Queues(ctx *context.Context) { diff --git a/routers/web/admin/queue_tester.go b/routers/web/admin/queue_tester.go index 8f713b3bb1..831947fe41 100644 --- a/routers/web/admin/queue_tester.go +++ b/routers/web/admin/queue_tester.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) var testQueueOnce sync.Once diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index d0339fdd93..a94b9bb5c3 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -8,16 +8,16 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/web/explore" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index d73290a8db..c6451a9329 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/admin/stacktrace.go b/routers/web/admin/stacktrace.go index d6def94bb4..7c6cd98a56 100644 --- a/routers/web/admin/stacktrace.go +++ b/routers/web/admin/stacktrace.go @@ -7,9 +7,9 @@ import ( "net/http" "runtime" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // Stacktrace show admin monitor goroutines page diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 36ce8d286c..f53a0197cb 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -11,26 +11,26 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/explore" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models" + "forgejo.org/models/auth" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/routers/web/explore" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" ) const ( diff --git a/routers/web/admin/users_test.go b/routers/web/admin/users_test.go index ae3b130101..c8e6f8cb86 100644 --- a/routers/web/admin/users_test.go +++ b/routers/web/admin/users_test.go @@ -6,13 +6,13 @@ package admin import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/auth/2fa.go b/routers/web/auth/2fa.go index f93177bf96..7acf9a87d3 100644 --- a/routers/web/auth/2fa.go +++ b/routers/web/auth/2fa.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" ) var ( diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 1d00c97b6e..755126b8e0 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -11,30 +11,30 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - notify_service "code.gitea.io/gitea/services/notify" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/session" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + notify_service "forgejo.org/services/notify" + user_service "forgejo.org/services/user" "github.com/markbates/goth" ) diff --git a/routers/web/auth/auth_test.go b/routers/web/auth/auth_test.go index c6afbf877c..7a33a3841c 100644 --- a/routers/web/auth/auth_test.go +++ b/routers/web/auth/auth_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/modules/test" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/auth/linkaccount.go b/routers/web/auth/linkaccount.go index e6c9089380..9566652751 100644 --- a/routers/web/auth/linkaccount.go +++ b/routers/web/auth/linkaccount.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" "github.com/markbates/goth" ) diff --git a/routers/web/auth/main_test.go b/routers/web/auth/main_test.go index b438e5d518..a8a32b71f2 100644 --- a/routers/web/auth/main_test.go +++ b/routers/web/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 62b7b0b6d3..f1554638cb 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -17,29 +17,29 @@ import ( "sort" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - source_service "code.gitea.io/gitea/services/auth/source" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" - remote_service "code.gitea.io/gitea/services/remote" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + auth_module "forgejo.org/modules/auth" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + auth_service "forgejo.org/services/auth" + source_service "forgejo.org/services/auth/source" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" + "forgejo.org/services/forms" + remote_service "forgejo.org/services/remote" + user_service "forgejo.org/services/user" "code.forgejo.org/go-chi/binding" "github.com/golang-jwt/jwt/v5" diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go index a5f2dd7713..6275d63382 100644 --- a/routers/web/auth/oauth_test.go +++ b/routers/web/auth/oauth_test.go @@ -6,12 +6,12 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/auth/source/oauth2" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + "forgejo.org/services/auth/source/oauth2" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/routers/web/auth/openid.go b/routers/web/auth/openid.go index 83268faacb..b12dea84ea 100644 --- a/routers/web/auth/openid.go +++ b/routers/web/auth/openid.go @@ -8,16 +8,16 @@ import ( "net/http" "net/url" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/openid" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/auth" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index 84f343bfca..82c2d4e9d3 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -8,20 +8,20 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" ) var ( diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go index 5c93c1410e..ac69e03389 100644 --- a/routers/web/auth/webauthn.go +++ b/routers/web/auth/webauthn.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - wa "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + wa "forgejo.org/modules/auth/webauthn" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/externalaccount" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/base.go b/routers/web/base.go index 285d1ecddc..c1bc7fef5e 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -11,12 +11,12 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/routing" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/web/routing" ) func storageHandler(storageSetting *setting.Storage, prefix string, objStore storage.ObjectStorage) http.HandlerFunc { diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index dd20663f94..37496ca117 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/templates" + "forgejo.org/services/context" ) // List all devtest templates, they will be used for e2e tests for the UI components diff --git a/routers/web/events/events.go b/routers/web/events/events.go index 52f20e07dc..1672f12bda 100644 --- a/routers/web/events/events.go +++ b/routers/web/events/events.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/routers/web/auth" + "forgejo.org/services/context" ) // Events listens for events diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 0a4e828c71..f0b12e9142 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -6,12 +6,12 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index d13271ae53..6c9293e959 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -4,12 +4,12 @@ package explore import ( - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) // Organizations render explore organizations page diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 798fdf5654..0707420a8d 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/sitemap" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/explore/topic.go b/routers/web/explore/topic.go index 95fecfe2b8..3b67bd48b1 100644 --- a/routers/web/explore/topic.go +++ b/routers/web/explore/topic.go @@ -6,11 +6,11 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // TopicSearch search for creating topic diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 241e5f61a1..e349bb1e92 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -7,16 +7,16 @@ import ( "bytes" "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/sitemap" + "forgejo.org/modules/structs" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/feed/branch.go b/routers/web/feed/branch.go index a8a001e0cd..2337b43d4c 100644 --- a/routers/web/feed/branch.go +++ b/routers/web/feed/branch.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/repo" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/convert.go b/routers/web/feed/convert.go index 5f7687d803..24532334ea 100644 --- a/routers/web/feed/convert.go +++ b/routers/web/feed/convert.go @@ -12,16 +12,16 @@ import ( "strconv" "strings" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/util" + "forgejo.org/services/context" "github.com/gorilla/feeds" "github.com/jaytaylor/html2text" diff --git a/routers/web/feed/file.go b/routers/web/feed/file.go index 48f87c7c62..45ceedac12 100644 --- a/routers/web/feed/file.go +++ b/routers/web/feed/file.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/util" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index 08cbcd9e12..dd2fec186f 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -6,10 +6,10 @@ package feed import ( "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/release.go b/routers/web/feed/release.go index fb6e3add65..646241c021 100644 --- a/routers/web/feed/release.go +++ b/routers/web/feed/release.go @@ -6,9 +6,9 @@ package feed import ( "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/render.go b/routers/web/feed/render.go index dc99fb49ed..79681dd0fb 100644 --- a/routers/web/feed/render.go +++ b/routers/web/feed/render.go @@ -4,7 +4,7 @@ package feed import ( - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" ) // RenderBranchFeed render format for branch or file diff --git a/routers/web/feed/repo.go b/routers/web/feed/repo.go index a0033c7d45..0d105dc3a7 100644 --- a/routers/web/feed/repo.go +++ b/routers/web/feed/repo.go @@ -6,9 +6,9 @@ package feed import ( "time" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/githttp.go b/routers/web/githttp.go index 5f1dedce76..e5ed806f2e 100644 --- a/routers/web/githttp.go +++ b/routers/web/githttp.go @@ -6,10 +6,10 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" ) func requireSignIn(ctx *context.Context) { diff --git a/routers/web/goget.go b/routers/web/goget.go index 8d5612ebfe..0fcd755ca1 100644 --- a/routers/web/goget.go +++ b/routers/web/goget.go @@ -11,10 +11,10 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) func goGet(ctx *context.Context) { diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go index 83dfe62537..f0b51aa515 100644 --- a/routers/web/healthcheck/check.go +++ b/routers/web/healthcheck/check.go @@ -9,11 +9,11 @@ import ( "os" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/cache" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type status string diff --git a/routers/web/home.go b/routers/web/home.go index 4ea961c055..e0a466a81c 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -8,19 +8,19 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/routers/web/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/sitemap" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/routers/web/auth" + "forgejo.org/routers/web/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/metrics.go b/routers/web/metrics.go index 46c13f0a24..8c188e206e 100644 --- a/routers/web/metrics.go +++ b/routers/web/metrics.go @@ -7,7 +7,7 @@ import ( "crypto/subtle" "net/http" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/routers/web/misc/markup.go b/routers/web/misc/markup.go index 2bae122b91..d2b67f88c8 100644 --- a/routers/web/misc/markup.go +++ b/routers/web/misc/markup.go @@ -5,10 +5,10 @@ package misc import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" ) // Markup render markup document to HTML diff --git a/routers/web/misc/misc.go b/routers/web/misc/misc.go index 54c93763f6..306b15e3d5 100644 --- a/routers/web/misc/misc.go +++ b/routers/web/misc/misc.go @@ -7,11 +7,11 @@ import ( "net/http" "path" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/git" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) func SSHInfo(rw http.ResponseWriter, req *http.Request) { diff --git a/routers/web/misc/swagger-forgejo.go b/routers/web/misc/swagger-forgejo.go index e3aff02c5f..17e3814712 100644 --- a/routers/web/misc/swagger-forgejo.go +++ b/routers/web/misc/swagger-forgejo.go @@ -6,8 +6,8 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/services/context" ) // tplSwagger swagger page template diff --git a/routers/web/misc/swagger.go b/routers/web/misc/swagger.go index 5fddfa8885..226dddaff2 100644 --- a/routers/web/misc/swagger.go +++ b/routers/web/misc/swagger.go @@ -6,8 +6,8 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/services/context" ) // tplSwagger swagger page template diff --git a/routers/web/nodeinfo.go b/routers/web/nodeinfo.go index f1cc7bf530..d8c1727479 100644 --- a/routers/web/nodeinfo.go +++ b/routers/web/nodeinfo.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) type nodeInfoLinks struct { diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 1b58d8fde9..a3823565ed 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -9,18 +9,18 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/main_test.go b/routers/web/org/main_test.go index 92237d6e88..d1d4e89120 100644 --- a/routers/web/org/main_test.go +++ b/routers/web/org/main_test.go @@ -6,7 +6,7 @@ package org_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 3a5509f911..51ac566e1a 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -7,13 +7,13 @@ package org import ( "net/http" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models" + "forgejo.org/models/organization" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/org.go b/routers/web/org/org.go index dd3aab458b..e9907c04af 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -8,15 +8,15 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 02eae8052e..dc18c55aa3 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -6,13 +6,13 @@ package org import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/label" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // RetrieveLabels find all the labels of an organization diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 034483aba2..96bd0f1ee2 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -9,20 +9,20 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - attachment_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + project_model "forgejo.org/models/project" + attachment_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/json" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/org/projects_test.go b/routers/web/org/projects_test.go index ab419cc878..dec78502f2 100644 --- a/routers/web/org/projects_test.go +++ b/routers/web/org/projects_test.go @@ -6,9 +6,9 @@ package org_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/routers/web/org" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + "forgejo.org/routers/web/org" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 1683728a8e..284f406413 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -9,25 +9,25 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" + "forgejo.org/services/forms" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" + user_service "forgejo.org/services/user" + webhook_service "forgejo.org/services/webhook" ) const ( diff --git a/routers/web/org/setting/blocked_users.go b/routers/web/org/setting/blocked_users.go index 2cf3f39ef4..77b2791874 100644 --- a/routers/web/org/setting/blocked_users.go +++ b/routers/web/org/setting/blocked_users.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) const tplBlockedUsers = "org/settings/blocked_users" diff --git a/routers/web/org/setting/runners.go b/routers/web/org/setting/runners.go index fe05709237..8053ed7729 100644 --- a/routers/web/org/setting/runners.go +++ b/routers/web/org/setting/runners.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/org/setting/storage_overview.go b/routers/web/org/setting/storage_overview.go index 4b9bd02ca4..5714d7ee23 100644 --- a/routers/web/org/setting/storage_overview.go +++ b/routers/web/org/setting/storage_overview.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/routers/web/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/routers/web/shared" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/setting_oauth2.go b/routers/web/org/setting_oauth2.go index 7f855795d3..9c31063974 100644 --- a/routers/web/org/setting_oauth2.go +++ b/routers/web/org/setting_oauth2.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared_user "forgejo.org/routers/web/shared/user" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/setting_packages.go b/routers/web/org/setting_packages.go index af9836e42c..4457c8fb0f 100644 --- a/routers/web/org/setting_packages.go +++ b/routers/web/org/setting_packages.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/packages" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared "forgejo.org/routers/web/shared/packages" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index df9de4af98..659bee469f 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -12,24 +12,24 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/action_aggregator_test.go b/routers/web/repo/action_aggregator_test.go index 181c1120db..7da14f1912 100644 --- a/routers/web/repo/action_aggregator_test.go +++ b/routers/web/repo/action_aggregator_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + issue_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index e0ef709ea6..0a63f566e0 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -11,21 +11,21 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/unit" + "forgejo.org/modules/actions" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + "forgejo.org/services/convert" "github.com/nektos/act/pkg/model" ) diff --git a/routers/web/repo/actions/actions_test.go b/routers/web/repo/actions/actions_test.go index 939c4aaf57..232aacf96b 100644 --- a/routers/web/repo/actions/actions_test.go +++ b/routers/web/repo/actions/actions_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - unittest "code.gitea.io/gitea/models/unittest" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + unittest "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/actions/main_test.go b/routers/web/repo/actions/main_test.go index a82f9c6672..0f82a0e7ea 100644 --- a/routers/web/repo/actions/main_test.go +++ b/routers/web/repo/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/actions/manual.go b/routers/web/repo/actions/manual.go index 285dc7ab7e..413b087e8b 100644 --- a/routers/web/repo/actions/manual.go +++ b/routers/web/repo/actions/manual.go @@ -6,8 +6,8 @@ package actions import ( "net/url" - actions_service "code.gitea.io/gitea/services/actions" - context_module "code.gitea.io/gitea/services/context" + actions_service "forgejo.org/services/actions" + context_module "forgejo.org/services/context" ) func ManualRunWorkflow(ctx *context_module.Context) { diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index dea31bb1c4..2d009c5720 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -18,24 +18,24 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - actions_service "code.gitea.io/gitea/services/actions" - context_module "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/actions" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/templates" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + actions_service "forgejo.org/services/actions" + context_module "forgejo.org/services/context" "xorm.io/builder" ) diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go index af9cea0f33..c9cd2c13bb 100644 --- a/routers/web/repo/activity.go +++ b/routers/web/repo/activity.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go index b5078e1f63..e46c08fef8 100644 --- a/routers/web/repo/attachment.go +++ b/routers/web/repo/attachment.go @@ -7,18 +7,18 @@ import ( "fmt" "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - repo_service "code.gitea.io/gitea/services/repository" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/routers/common" + "forgejo.org/services/attachment" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + repo_service "forgejo.org/services/repository" ) // UploadIssueAttachment response for Issue/PR attachments diff --git a/routers/web/repo/badges/badges.go b/routers/web/repo/badges/badges.go index a2306d5836..e623a21fc0 100644 --- a/routers/web/repo/badges/badges.go +++ b/routers/web/repo/badges/badges.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/setting" - context_module "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/setting" + context_module "forgejo.org/services/context" ) func getBadgeURL(ctx *context_module.Context, label, text, color string) string { diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index c7fbaaefcb..ccdd59f2dd 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -10,16 +10,16 @@ import ( "net/url" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + user_model "forgejo.org/models/user" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/highlight" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/util" + "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" ) type blameRow struct { diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 4897a5f4fc..af8a838fc9 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -11,23 +11,23 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + "forgejo.org/services/context" + "forgejo.org/services/forms" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/card.go b/routers/web/repo/card.go index e73971cd94..449e5c4890 100644 --- a/routers/web/repo/card.go +++ b/routers/web/repo/card.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/card" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/card" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/services/context" ) // drawUser draws a user avatar in a summary card diff --git a/routers/web/repo/cherry_pick.go b/routers/web/repo/cherry_pick.go index 90dae704f4..0f57eb66f0 100644 --- a/routers/web/repo/cherry_pick.go +++ b/routers/web/repo/cherry_pick.go @@ -8,17 +8,17 @@ import ( "errors" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/repository/files" ) var tplCherryPick base.TplName = "repo/editor/cherry_pick" diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go index c76f492da0..04009b4afa 100644 --- a/routers/web/repo/code_frequency.go +++ b/routers/web/repo/code_frequency.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/base" + "forgejo.org/services/context" + contributors_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 857e34381e..3cd80a6777 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -12,26 +12,26 @@ import ( "path" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - git_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/repository/gitgraph" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/gitdiff" + git_service "forgejo.org/services/repository" + "forgejo.org/services/repository/gitgraph" ) const ( diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 24785d867e..db65e889e0 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -16,29 +16,29 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - csv_module "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + csv_module "forgejo.org/modules/csv" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/routers/common" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/gitdiff" ) const ( diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go index 762fbf9379..094d13b54b 100644 --- a/routers/web/repo/contributors.go +++ b/routers/web/repo/contributors.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/base" + "forgejo.org/services/context" + contributors_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go index d7fe368474..fc82ece4cb 100644 --- a/routers/web/repo/download.go +++ b/routers/web/repo/download.go @@ -7,15 +7,15 @@ package repo import ( "time" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + git_model "forgejo.org/models/git" + "forgejo.org/modules/git" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/routers/common" + "forgejo.org/services/context" ) // ServeBlobOrLFS download a git.Blob redirecting to LFS if necessary diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index f27ad62982..77f71fd2b1 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -10,26 +10,26 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + files_service "forgejo.org/services/repository/files" ) const ( diff --git a/routers/web/repo/editor_test.go b/routers/web/repo/editor_test.go index 4d565b5fd6..5b893cf258 100644 --- a/routers/web/repo/editor_test.go +++ b/routers/web/repo/editor_test.go @@ -6,11 +6,11 @@ package repo import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/services/contexttest" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/find.go b/routers/web/repo/find.go index 9da4237c1e..808323631c 100644 --- a/routers/web/repo/find.go +++ b/routers/web/repo/find.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/flags/manage.go b/routers/web/repo/flags/manage.go index 377a5c20f8..c97ef54818 100644 --- a/routers/web/repo/flags/manage.go +++ b/routers/web/repo/flags/manage.go @@ -6,10 +6,10 @@ package flags import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go index bced8e61b1..650b1d88f4 100644 --- a/routers/web/repo/githttp.go +++ b/routers/web/repo/githttp.go @@ -18,20 +18,20 @@ import ( "sync" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" "github.com/go-chi/cors" ) diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go index 6fa7579231..9d67f142fb 100644 --- a/routers/web/repo/helper.go +++ b/routers/web/repo/helper.go @@ -7,9 +7,9 @@ import ( "net/url" "slices" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/services/context" ) func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User { diff --git a/routers/web/repo/helper_test.go b/routers/web/repo/helper_test.go index 844ad5bf79..2607fd32f8 100644 --- a/routers/web/repo/helper_test.go +++ b/routers/web/repo/helper_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/user" + "forgejo.org/models/user" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index e45abd3952..ff3a903aed 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -20,44 +20,44 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - issue_template "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + issue_indexer "forgejo.org/modules/indexer/issues" + issue_template "forgejo.org/modules/issue/template" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/templates" + "forgejo.org/modules/templates/vars" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" "code.forgejo.org/go-chi/binding" ) diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index 4ce76b2bb9..5c71d75f80 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/avatars" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/avatars" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/services/context" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index 66b38688ec..3764a6bd7e 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // AddDependency adds new dependencies diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 81bee4dbb5..74674e9550 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -6,17 +6,17 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/modules/base" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + issue_service "forgejo.org/services/issue" ) const ( diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go index 2b4915e855..406ab4918c 100644 --- a/routers/web/repo/issue_label_test.go +++ b/routers/web/repo/issue_label_test.go @@ -8,13 +8,13 @@ import ( "strconv" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/repository" + "forgejo.org/modules/test" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/issue_lock.go b/routers/web/repo/issue_lock.go index 1d5fc8a5f3..dea67ab996 100644 --- a/routers/web/repo/issue_lock.go +++ b/routers/web/repo/issue_lock.go @@ -4,10 +4,10 @@ package repo import ( - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // LockIssue locks an issue. This would limit commenting abilities to diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go index 365c812681..5e2075a17f 100644 --- a/routers/web/repo/issue_pin.go +++ b/routers/web/repo/issue_pin.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // IssuePinOrUnpin pin or unpin a Issue diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go index 70d42b27c0..5bc49464dd 100644 --- a/routers/web/repo/issue_stopwatch.go +++ b/routers/web/repo/issue_stopwatch.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/eventsource" + "forgejo.org/services/context" ) // IssueStopwatch creates or stops a stopwatch for the given issue. diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go index 241e434049..e63f7e2dc2 100644 --- a/routers/web/repo/issue_timetrack.go +++ b/routers/web/repo/issue_timetrack.go @@ -7,12 +7,12 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // AddTimeManually tracks time manually diff --git a/routers/web/repo/issue_watch.go b/routers/web/repo/issue_watch.go index 5cff9f4ddd..5af223f865 100644 --- a/routers/web/repo/issue_watch.go +++ b/routers/web/repo/issue_watch.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/main_test.go b/routers/web/repo/main_test.go index 6e469cf2ed..8b30ad41ed 100644 --- a/routers/web/repo/main_test.go +++ b/routers/web/repo/main_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/middlewares.go b/routers/web/repo/middlewares.go index ddda9f3ff2..9aba447433 100644 --- a/routers/web/repo/middlewares.go +++ b/routers/web/repo/middlewares.go @@ -7,12 +7,12 @@ import ( "fmt" "strconv" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/optional" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // SetEditorconfigIfExists set editor config as render variable diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index 0acf966bca..86d2461e94 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -9,23 +9,23 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/services/task" + "forgejo.org/models" + admin_model "forgejo.org/models/admin" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + "forgejo.org/services/task" ) const ( diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index 1c53f73fdb..920a9ee12a 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -9,18 +9,18 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/base" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/issue" "xorm.io/builder" ) diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 11874ab0d0..c947fb99bf 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -6,13 +6,13 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index d234f6c964..688ef19375 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -6,16 +6,16 @@ package repo import ( "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + git_model "forgejo.org/models/git" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/repository/files" ) const ( diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 0689b0a721..80f699787c 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -9,22 +9,22 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - project_model "code.gitea.io/gitea/models/project" - attachment_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + project_model "forgejo.org/models/project" + attachment_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/json" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/repo/projects_test.go b/routers/web/repo/projects_test.go index d61230a57e..bc8b747980 100644 --- a/routers/web/repo/projects_test.go +++ b/routers/web/repo/projects_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 98dacc1a0d..a54a31ac36 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -16,39 +16,39 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - issue_template "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/emoji" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + issue_template "forgejo.org/modules/issue/template" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/utils" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/automerge" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + "forgejo.org/services/gitdiff" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" "github.com/gobwas/glob" ) diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index eb8dd83d9c..18a5b872f1 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -8,17 +8,17 @@ import ( "fmt" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + "forgejo.org/modules/base" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + pull_service "forgejo.org/services/pull" ) const ( diff --git a/routers/web/repo/pull_review_test.go b/routers/web/repo/pull_review_test.go index 329e83fe4b..14e6714a63 100644 --- a/routers/web/repo/pull_review_test.go +++ b/routers/web/repo/pull_review_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/templates" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" + "forgejo.org/services/pull" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/recent_commits.go b/routers/web/repo/recent_commits.go index c158fb30b6..6154de7377 100644 --- a/routers/web/repo/recent_commits.go +++ b/routers/web/repo/recent_commits.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/base" + "forgejo.org/services/context" + contributors_service "forgejo.org/services/repository" ) const ( diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 1791788743..024dd7b62d 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -10,29 +10,29 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - releaseservice "code.gitea.io/gitea/services/release" + "forgejo.org/models" + "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/web/feed" + "forgejo.org/services/context" + "forgejo.org/services/context/upload" + "forgejo.org/services/forms" + releaseservice "forgejo.org/services/release" ) const ( diff --git a/routers/web/repo/release_test.go b/routers/web/repo/release_test.go index 5c7b6e2e8f..785b1fdf69 100644 --- a/routers/web/repo/release_test.go +++ b/routers/web/repo/release_test.go @@ -6,13 +6,13 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go index e64db03e20..b31e2e203a 100644 --- a/routers/web/repo/render.go +++ b/routers/web/repo/render.go @@ -9,13 +9,13 @@ import ( "net/http" "path" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) // RenderFile renders a file by repos path diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 2e8ca61bf5..53b3f34347 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -12,32 +12,32 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" + archiver_service "forgejo.org/services/repository/archiver" + commitstatus_service "forgejo.org/services/repository/commitstatus" ) const ( diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index d10eb67528..1671378a3b 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -7,12 +7,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const tplSearch base.TplName = "repo/search" diff --git a/routers/web/repo/setting/avatar.go b/routers/web/repo/setting/avatar.go index 504f57cfc2..abbb12cacb 100644 --- a/routers/web/repo/setting/avatar.go +++ b/routers/web/repo/setting/avatar.go @@ -8,13 +8,13 @@ import ( "fmt" "io" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" ) // UpdateAvatarSetting update repo's avatar diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go index 75b55151e7..a816a16bc8 100644 --- a/routers/web/repo/setting/collaboration.go +++ b/routers/web/repo/setting/collaboration.go @@ -8,19 +8,19 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/mailer" + org_service "forgejo.org/services/org" + repo_service "forgejo.org/services/repository" ) // Collaboration render a repository's collaboration page diff --git a/routers/web/repo/setting/default_branch.go b/routers/web/repo/setting/default_branch.go index 881d148afc..1c6033f1e4 100644 --- a/routers/web/repo/setting/default_branch.go +++ b/routers/web/repo/setting/default_branch.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + git_model "forgejo.org/models/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // SetDefaultBranchPost set default branch diff --git a/routers/web/repo/setting/deploy_key.go b/routers/web/repo/setting/deploy_key.go index abc3eb4af1..c59f0e90c2 100644 --- a/routers/web/repo/setting/deploy_key.go +++ b/routers/web/repo/setting/deploy_key.go @@ -6,14 +6,14 @@ package setting import ( "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // DeployKeys render the deploy keys list of a repository page diff --git a/routers/web/repo/setting/git_hooks.go b/routers/web/repo/setting/git_hooks.go index 217a01c90c..a50bce2a27 100644 --- a/routers/web/repo/setting/git_hooks.go +++ b/routers/web/repo/setting/git_hooks.go @@ -6,8 +6,8 @@ package setting import ( "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/git" + "forgejo.org/services/context" ) // GitHooks hooks of a repository diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index 7e3634375a..2e9c34e8a7 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -14,20 +14,20 @@ import ( "strconv" "strings" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + git_model "forgejo.org/models/git" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pipeline" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/main_test.go b/routers/web/repo/setting/main_test.go index c414b853e5..6b5a70ba08 100644 --- a/routers/web/repo/setting/main_test.go +++ b/routers/web/repo/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go index b2f5798a26..18efbc37c4 100644 --- a/routers/web/repo/setting/protected_branch.go +++ b/routers/web/repo/setting/protected_branch.go @@ -11,17 +11,17 @@ import ( "strings" "time" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/services/repository" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/modules/base" + "forgejo.org/modules/web" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + "forgejo.org/services/forms" + pull_service "forgejo.org/services/pull" + "forgejo.org/services/repository" "github.com/gobwas/glob" ) diff --git a/routers/web/repo/setting/protected_tag.go b/routers/web/repo/setting/protected_tag.go index 2c25b650b9..5735149dfd 100644 --- a/routers/web/repo/setting/protected_tag.go +++ b/routers/web/repo/setting/protected_tag.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + git_model "forgejo.org/models/git" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go index 9dce5d13b7..32c8667825 100644 --- a/routers/web/repo/setting/runners.go +++ b/routers/web/repo/setting/runners.go @@ -8,13 +8,13 @@ import ( "net/http" "net/url" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - actions_shared "code.gitea.io/gitea/routers/web/shared/actions" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + actions_shared "forgejo.org/routers/web/shared/actions" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index d4d56bfc57..11c83e8bd6 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/secrets" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared "forgejo.org/routers/web/shared/secrets" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index df7e388680..2af2eef4a5 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -13,34 +13,34 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - actions_service "code.gitea.io/gitea/services/actions" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/federation" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + "forgejo.org/models" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/organization" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/indexer/code" + "forgejo.org/modules/indexer/stats" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + actions_service "forgejo.org/services/actions" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/federation" + "forgejo.org/services/forms" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + repo_service "forgejo.org/services/repository" + wiki_service "forgejo.org/services/wiki" ) const ( diff --git a/routers/web/repo/setting/settings_test.go b/routers/web/repo/setting/settings_test.go index 0c8553faea..6f05953bfb 100644 --- a/routers/web/repo/setting/settings_test.go +++ b/routers/web/repo/setting/settings_test.go @@ -7,19 +7,19 @@ import ( "net/http" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/setting/variables.go b/routers/web/repo/setting/variables.go index 4fb8c06e84..a83d2dea6f 100644 --- a/routers/web/repo/setting/variables.go +++ b/routers/web/repo/setting/variables.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/actions" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + shared "forgejo.org/routers/web/shared/actions" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index af54997794..6d4d9e47e2 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -11,22 +11,22 @@ import ( "net/url" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/context" + "forgejo.org/services/convert" + "forgejo.org/services/forms" + webhook_service "forgejo.org/services/webhook" "code.forgejo.org/go-chi/binding" ) diff --git a/routers/web/repo/topic.go b/routers/web/repo/topic.go index d81a695df9..a028afb042 100644 --- a/routers/web/repo/topic.go +++ b/routers/web/repo/topic.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) // TopicsPost response for creating repository diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go index d11af4669f..5c37f2ebca 100644 --- a/routers/web/repo/treelist.go +++ b/routers/web/repo/treelist.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/services/context" "github.com/go-enry/go-enry/v2" ) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 9030b03a90..b7a7a3f042 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -24,35 +24,35 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - activities_model "code.gitea.io/gitea/models/activities" - admin_model "code.gitea.io/gitea/models/admin" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/highlight" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - files_service "code.gitea.io/gitea/services/repository/files" + activities_model "forgejo.org/models/activities" + admin_model "forgejo.org/models/admin" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/actions" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/highlight" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/svg" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/routers/web/feed" + "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + files_service "forgejo.org/services/repository/files" "github.com/nektos/act/pkg/model" diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 070d07cdf3..9a21ac21a3 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -14,25 +14,25 @@ import ( "path/filepath" "strings" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - notify_service "code.gitea.io/gitea/services/notify" - wiki_service "code.gitea.io/gitea/services/wiki" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers/common" + "forgejo.org/services/context" + "forgejo.org/services/forms" + notify_service "forgejo.org/services/notify" + wiki_service "forgejo.org/services/wiki" ) const ( diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 0c49e7d902..cba416fc92 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" + wiki_service "forgejo.org/services/wiki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 66dce1412b..98a649d1d8 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -6,13 +6,13 @@ package actions import ( "errors" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // RunnersList prepares data for runners list diff --git a/routers/web/shared/actions/variables.go b/routers/web/shared/actions/variables.go index 47f1176f46..13dff2f11a 100644 --- a/routers/web/shared/actions/variables.go +++ b/routers/web/shared/actions/variables.go @@ -4,13 +4,13 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/web" + actions_service "forgejo.org/services/actions" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) func SetVariablesContext(ctx *context.Context, ownerID, repoID int64) { diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index af960f1c0c..1d4fb1588d 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -9,19 +9,19 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - container_service "code.gitea.io/gitea/services/packages/container" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + cargo_service "forgejo.org/services/packages/cargo" + container_service "forgejo.org/services/packages/container" ) func SetPackagesContext(ctx *context.Context, owner *user_model.User) { diff --git a/routers/web/shared/project/column.go b/routers/web/shared/project/column.go index 599842ea9e..40bb439452 100644 --- a/routers/web/shared/project/column.go +++ b/routers/web/shared/project/column.go @@ -4,9 +4,9 @@ package project import ( - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + project_model "forgejo.org/models/project" + "forgejo.org/modules/json" + "forgejo.org/services/context" ) // MoveColumns moves or keeps columns in a project and sorts them inside that project diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index 3bd421f86a..a853598939 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -4,14 +4,14 @@ package secrets import ( - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - secret_service "code.gitea.io/gitea/services/secrets" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + secret_service "forgejo.org/services/secrets" ) func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { diff --git a/routers/web/shared/storage_overview.go b/routers/web/shared/storage_overview.go index 3bebdfb688..fac4aa99e5 100644 --- a/routers/web/shared/storage_overview.go +++ b/routers/web/shared/storage_overview.go @@ -7,10 +7,10 @@ import ( "html/template" "net/http" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // StorageOverview render a size overview of the user, as well as relevant diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index fd7605c33b..c26ff19165 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -7,22 +7,22 @@ package user import ( "net/url" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // prepareContextForCommonProfile store some common data into context data for user's profile related pages (including the nav menu) diff --git a/routers/web/swagger_json.go b/routers/web/swagger_json.go index fc39b504a9..1569600734 100644 --- a/routers/web/swagger_json.go +++ b/routers/web/swagger_json.go @@ -4,7 +4,7 @@ package web import ( - "code.gitea.io/gitea/services/context" + "forgejo.org/services/context" ) // SwaggerV1Json render swagger v1 json diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go index 04f510161d..76cc342770 100644 --- a/routers/web/user/avatar.go +++ b/routers/web/user/avatar.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/avatars" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/avatars" + user_model "forgejo.org/models/user" + "forgejo.org/modules/httpcache" + "forgejo.org/services/context" ) func cacheableRedirect(ctx *context.Context, location string) { diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 019249e3e0..ac1852e410 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -6,13 +6,13 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/home.go b/routers/web/user/home.go index a0841c0227..9f22cebaba 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -13,27 +13,27 @@ import ( "strconv" "strings" - activities_model "code.gitea.io/gitea/models/activities" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "forgejo.org/models/activities" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/routers/web/feed" + "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/routers/web/user/home_test.go b/routers/web/user/home_test.go index c09f609161..af9d50538d 100644 --- a/routers/web/user/home_test.go +++ b/routers/web/user/home_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/user/main_test.go b/routers/web/user/main_test.go index 8b6ae69296..080e3fdcfe 100644 --- a/routers/web/user/main_test.go +++ b/routers/web/user/main_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index c3358dbf62..296951b2ff 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -11,21 +11,21 @@ import ( "net/url" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" ) const ( diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 70ea20d388..2862c6684b 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -8,28 +8,28 @@ import ( "net/http" "slices" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - arch_model "code.gitea.io/gitea/modules/packages/arch" - debian_module "code.gitea.io/gitea/modules/packages/debian" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - packages_helper "code.gitea.io/gitea/routers/api/packages/helper" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + alpine_module "forgejo.org/modules/packages/alpine" + arch_model "forgejo.org/modules/packages/arch" + debian_module "forgejo.org/modules/packages/debian" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + packages_helper "forgejo.org/routers/api/packages/helper" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/forms" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index de1c6850aa..5132b1da5c 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -11,23 +11,23 @@ import ( "path" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/org" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/routers/web/feed" + "forgejo.org/routers/web/org" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) const ( diff --git a/routers/web/user/search.go b/routers/web/user/search.go index be5eee90a9..411a356d9b 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // SearchCandidates searches candidate users for dropdown list diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index 6f40e39c8d..a0cdb25f44 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -9,23 +9,23 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/db" - "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - "code.gitea.io/gitea/services/user" + "forgejo.org/models" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/password" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/db" + "forgejo.org/services/auth/source/smtp" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" + "forgejo.org/services/user" ) const ( diff --git a/routers/web/user/setting/account_test.go b/routers/web/user/setting/account_test.go index 9fdc5e4d53..82e00bbf7c 100644 --- a/routers/web/user/setting/account_test.go +++ b/routers/web/user/setting/account_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/contexttest" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go index 171c1933d4..f7fd1c3803 100644 --- a/routers/web/user/setting/adopt.go +++ b/routers/web/user/setting/adopt.go @@ -6,12 +6,12 @@ package setting import ( "path/filepath" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" ) // AdoptOrDeleteRepository adopts or deletes a repository diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index 4dfd859a44..631d5958ea 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -7,14 +7,14 @@ package setting import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/user/setting/blocked_users.go b/routers/web/user/setting/blocked_users.go index 3f35b2eadf..1448dc9a3c 100644 --- a/routers/web/user/setting/blocked_users.go +++ b/routers/web/user/setting/blocked_users.go @@ -6,11 +6,11 @@ package setting import ( "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 9462be71c2..94d32b730f 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -8,15 +8,15 @@ import ( "fmt" "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) const ( diff --git a/routers/web/user/setting/main_test.go b/routers/web/user/setting/main_test.go index e398208d0d..38ac2842dd 100644 --- a/routers/web/user/setting/main_test.go +++ b/routers/web/user/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/setting/oauth2.go b/routers/web/user/setting/oauth2.go index 1f485e06c8..64b252e97f 100644 --- a/routers/web/user/setting/oauth2.go +++ b/routers/web/user/setting/oauth2.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go index 2132d127b8..7449e45216 100644 --- a/routers/web/user/setting/oauth2_common.go +++ b/routers/web/user/setting/oauth2_common.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + "forgejo.org/modules/base" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + shared_user "forgejo.org/routers/web/shared/user" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) type OAuth2CommonHandlers struct { diff --git a/routers/web/user/setting/packages.go b/routers/web/user/setting/packages.go index 4132659495..ba739a03fc 100644 --- a/routers/web/user/setting/packages.go +++ b/routers/web/user/setting/packages.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - shared "code.gitea.io/gitea/routers/web/shared/packages" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + shared "forgejo.org/routers/web/shared/packages" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 271621872f..173550ad19 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -15,23 +15,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/avatars" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/modules/typesniffer" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" + "forgejo.org/services/forms" + user_service "forgejo.org/services/user" ) const ( diff --git a/routers/web/user/setting/runner.go b/routers/web/user/setting/runner.go index 2bb10cceb9..5c8bba82a1 100644 --- a/routers/web/user/setting/runner.go +++ b/routers/web/user/setting/runner.go @@ -4,8 +4,8 @@ package setting import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go index 37ccb5e5c4..f1271c8370 100644 --- a/routers/web/user/setting/security/2fa.go +++ b/routers/web/user/setting/security/2fa.go @@ -12,13 +12,13 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/auth" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go index 8f788e1735..14660e1646 100644 --- a/routers/web/user/setting/security/openid.go +++ b/routers/web/user/setting/security/openid.go @@ -6,13 +6,13 @@ package security import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/openid" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" ) // OpenIDPost response for change user's openid diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go index 8d6859ab87..9acc6ab6f0 100644 --- a/routers/web/user/setting/security/security.go +++ b/routers/web/user/setting/security/security.go @@ -8,14 +8,14 @@ import ( "net/http" "sort" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go index bfbc06c701..a909d479c9 100644 --- a/routers/web/user/setting/security/webauthn.go +++ b/routers/web/user/setting/security/webauthn.go @@ -9,14 +9,14 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/auth" - wa "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/auth" + wa "forgejo.org/modules/auth/webauthn" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/mailer" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/user/setting/storage_overview.go b/routers/web/user/setting/storage_overview.go index 8a0c773077..4586600572 100644 --- a/routers/web/user/setting/storage_overview.go +++ b/routers/web/user/setting/storage_overview.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/routers/web/shared" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/base" + "forgejo.org/routers/web/shared" + "forgejo.org/services/context" ) const ( diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go index 3cc67d9def..bc07accad4 100644 --- a/routers/web/user/setting/webhooks.go +++ b/routers/web/user/setting/webhooks.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/db" + "forgejo.org/models/webhook" + "forgejo.org/modules/base" + "forgejo.org/modules/setting" + "forgejo.org/services/context" + webhook_service "forgejo.org/services/webhook" ) const ( diff --git a/routers/web/user/stop_watch.go b/routers/web/user/stop_watch.go index 38f74ea455..210b32d205 100644 --- a/routers/web/user/stop_watch.go +++ b/routers/web/user/stop_watch.go @@ -6,10 +6,10 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) // GetStopwatches get all stopwatches diff --git a/routers/web/user/task.go b/routers/web/user/task.go index 8476767e9e..296c44f809 100644 --- a/routers/web/user/task.go +++ b/routers/web/user/task.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + admin_model "forgejo.org/models/admin" + "forgejo.org/modules/json" + "forgejo.org/services/context" ) // TaskStatus returns task's status diff --git a/routers/web/web.go b/routers/web/web.go index 15264ccc89..303167a6b9 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -8,46 +8,46 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/perm" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/metrics" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/admin" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/routers/web/devtest" - "code.gitea.io/gitea/routers/web/events" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/routers/web/misc" - "code.gitea.io/gitea/routers/web/org" - org_setting "code.gitea.io/gitea/routers/web/org/setting" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/routers/web/repo/actions" - "code.gitea.io/gitea/routers/web/repo/badges" - repo_flags "code.gitea.io/gitea/routers/web/repo/flags" - repo_setting "code.gitea.io/gitea/routers/web/repo/setting" - "code.gitea.io/gitea/routers/web/shared/project" - "code.gitea.io/gitea/routers/web/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/routers/web/user/setting/security" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/lfs" + "forgejo.org/models/perm" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/metrics" + "forgejo.org/modules/public" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/structs" + "forgejo.org/modules/templates" + "forgejo.org/modules/validation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + "forgejo.org/modules/web/routing" + "forgejo.org/routers/common" + "forgejo.org/routers/web/admin" + "forgejo.org/routers/web/auth" + "forgejo.org/routers/web/devtest" + "forgejo.org/routers/web/events" + "forgejo.org/routers/web/explore" + "forgejo.org/routers/web/feed" + "forgejo.org/routers/web/healthcheck" + "forgejo.org/routers/web/misc" + "forgejo.org/routers/web/org" + org_setting "forgejo.org/routers/web/org/setting" + "forgejo.org/routers/web/repo" + "forgejo.org/routers/web/repo/actions" + "forgejo.org/routers/web/repo/badges" + repo_flags "forgejo.org/routers/web/repo/flags" + repo_setting "forgejo.org/routers/web/repo/setting" + "forgejo.org/routers/web/shared/project" + "forgejo.org/routers/web/user" + user_setting "forgejo.org/routers/web/user/setting" + "forgejo.org/routers/web/user/setting/security" + auth_service "forgejo.org/services/auth" + "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/lfs" - _ "code.gitea.io/gitea/modules/session" // to registers all internal adapters + _ "forgejo.org/modules/session" // to registers all internal adapters "code.forgejo.org/go-chi/captcha" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go index 1f3de70db0..be3c2925fe 100644 --- a/routers/web/webfinger.go +++ b/routers/web/webfinger.go @@ -9,10 +9,10 @@ import ( "net/url" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // https://datatracker.ietf.org/doc/html/draft-ietf-appsawg-webfinger-14#section-4.4 diff --git a/services/actions/auth.go b/services/actions/auth.go index 1ef21f6e0e..4dc86a35f3 100644 --- a/services/actions/auth.go +++ b/services/actions/auth.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/actions/auth_test.go b/services/actions/auth_test.go index 1400e61f47..93a5980bc5 100644 --- a/services/actions/auth_test.go +++ b/services/actions/auth_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go index 34fa2688e7..fde5286e60 100644 --- a/services/actions/cleanup.go +++ b/services/actions/cleanup.go @@ -10,12 +10,12 @@ import ( "os" "time" - actions_model "code.gitea.io/gitea/models/actions" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" + actions_model "forgejo.org/models/actions" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" ) // Cleanup removes expired actions logs, data and artifacts diff --git a/services/actions/cleanup_test.go b/services/actions/cleanup_test.go index 65fae840c1..67f68d4de9 100644 --- a/services/actions/cleanup_test.go +++ b/services/actions/cleanup_test.go @@ -6,10 +6,10 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index f146c22372..31e15ec927 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // StopZombieTasks stops the task which have running status, but haven't been updated for a long time diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 04dffbac88..1fffa6852f 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -8,15 +8,15 @@ import ( "fmt" "path" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + user_model "forgejo.org/models/user" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + commitstatus_service "forgejo.org/services/repository/commitstatus" "github.com/nektos/act/pkg/jobparser" ) diff --git a/services/actions/context.go b/services/actions/context.go index be1c85522b..bf187c56bf 100644 --- a/services/actions/context.go +++ b/services/actions/context.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" ) // GenerateGiteaContext generate the gitea context without token and gitea_runtime_token diff --git a/services/actions/context_test.go b/services/actions/context_test.go index 4cd8825870..c96094ade8 100644 --- a/services/actions/context_test.go +++ b/services/actions/context_test.go @@ -6,8 +6,8 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/unittest" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/init.go b/services/actions/init.go index 0f49cb6297..8f1db64e27 100644 --- a/services/actions/init.go +++ b/services/actions/init.go @@ -4,11 +4,11 @@ package actions import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + notify_service "forgejo.org/services/notify" ) func Init() { diff --git a/services/actions/interface.go b/services/actions/interface.go index 76bee6f153..54a30061bc 100644 --- a/services/actions/interface.go +++ b/services/actions/interface.go @@ -3,7 +3,7 @@ package actions -import "code.gitea.io/gitea/services/context" +import "forgejo.org/services/context" // API for actions of a repository or organization type API interface { diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index 1f859fcf70..d4ca029d46 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/queue" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/modules/graceful" + "forgejo.org/modules/queue" "github.com/nektos/act/pkg/jobparser" "xorm.io/builder" diff --git a/services/actions/job_emitter_test.go b/services/actions/job_emitter_test.go index 58c2dc3b24..a3e0e95d04 100644 --- a/services/actions/job_emitter_test.go +++ b/services/actions/job_emitter_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/main_test.go b/services/actions/main_test.go index 49629ecb03..71ec1d3426 100644 --- a/services/actions/main_test.go +++ b/services/actions/main_test.go @@ -6,11 +6,11 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 2dd81158a7..2d3a1d2107 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -6,20 +6,20 @@ package actions import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" + notify_service "forgejo.org/services/notify" ) type actionsNotifier struct { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 0a1dbb162d..9de0b75ac7 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -11,24 +11,24 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" diff --git a/services/actions/notifier_helper_test.go b/services/actions/notifier_helper_test.go index 0fa40c0168..9166dc3b95 100644 --- a/services/actions/notifier_helper_test.go +++ b/services/actions/notifier_helper_test.go @@ -6,10 +6,10 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - webhook_module "code.gitea.io/gitea/modules/webhook" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/rerun.go b/services/actions/rerun.go index 60f6650905..f6dd4af5c7 100644 --- a/services/actions/rerun.go +++ b/services/actions/rerun.go @@ -4,8 +4,8 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/container" + actions_model "forgejo.org/models/actions" + "forgejo.org/modules/container" ) // GetAllRerunJobs get all jobs that need to be rerun when job should be rerun diff --git a/services/actions/rerun_test.go b/services/actions/rerun_test.go index a98de7b788..4b822e8da1 100644 --- a/services/actions/rerun_test.go +++ b/services/actions/rerun_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go index 18f3324fd2..f66a6ca092 100644 --- a/services/actions/schedule_tasks.go +++ b/services/actions/schedule_tasks.go @@ -8,13 +8,13 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/nektos/act/pkg/jobparser" ) diff --git a/services/actions/task.go b/services/actions/task.go index bc54ade347..43c8deaa5f 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" diff --git a/services/actions/variables.go b/services/actions/variables.go index a5703898ab..fed1fd0890 100644 --- a/services/actions/variables.go +++ b/services/actions/variables.go @@ -8,10 +8,10 @@ import ( "regexp" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "forgejo.org/models/actions" + "forgejo.org/modules/log" + "forgejo.org/modules/util" + secret_service "forgejo.org/services/secrets" ) func CreateVariable(ctx context.Context, ownerID, repoID int64, name, data string) (*actions_model.ActionVariable, error) { diff --git a/services/actions/workflows.go b/services/actions/workflows.go index e3e342264d..7ec7c3abed 100644 --- a/services/actions/workflows.go +++ b/services/actions/workflows.go @@ -10,19 +10,19 @@ import ( "fmt" "strconv" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/perm" + "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/actions" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/modules/webhook" + "forgejo.org/services/convert" "github.com/nektos/act/pkg/jobparser" act_model "github.com/nektos/act/pkg/model" diff --git a/services/agit/agit.go b/services/agit/agit.go index a18f9ef728..20e87642c3 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -9,15 +9,15 @@ import ( "os" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pushoptions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/git/pushoptions" + "forgejo.org/modules/log" + "forgejo.org/modules/private" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" ) // ProcReceive handle proc receive work diff --git a/services/asymkey/deploy_key.go b/services/asymkey/deploy_key.go index e127cbfc6e..4a2cb53eec 100644 --- a/services/asymkey/deploy_key.go +++ b/services/asymkey/deploy_key.go @@ -6,10 +6,10 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // DeleteDeployKey deletes deploy key from its repository authorized_keys file if needed. diff --git a/services/asymkey/main_test.go b/services/asymkey/main_test.go index 060cc78cec..8ba76668b1 100644 --- a/services/asymkey/main_test.go +++ b/services/asymkey/main_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go index 8fb569939c..0030523b22 100644 --- a/services/asymkey/sign.go +++ b/services/asymkey/sign.go @@ -8,18 +8,18 @@ import ( "fmt" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" ) type signingMode string diff --git a/services/asymkey/ssh_key.go b/services/asymkey/ssh_key.go index 83d7edafa3..f20445891d 100644 --- a/services/asymkey/ssh_key.go +++ b/services/asymkey/ssh_key.go @@ -6,9 +6,9 @@ package asymkey import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // DeletePublicKey deletes SSH key information both in database and authorized_keys file. diff --git a/services/asymkey/ssh_key_test.go b/services/asymkey/ssh_key_test.go index d667a02557..24b28d295e 100644 --- a/services/asymkey/ssh_key_test.go +++ b/services/asymkey/ssh_key_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index c911945e5d..365bd7faf6 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -9,12 +9,12 @@ import ( "fmt" "io" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/services/context/upload" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/services/context/upload" "github.com/google/uuid" ) diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index c24b3f8006..70b1e80d6a 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/auth/auth.go b/services/auth/auth.go index c10872313f..85c9296ced 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -10,15 +10,15 @@ import ( "regexp" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - gitea_context "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/webauthn" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/session" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" + gitea_context "forgejo.org/services/context" + user_service "forgejo.org/services/user" ) // Init should be called exactly once when the application starts to allow plugins diff --git a/services/auth/auth_test.go b/services/auth/auth_test.go index 3adaa28664..a6c6c74022 100644 --- a/services/auth/auth_test.go +++ b/services/auth/auth_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func Test_isGitRawOrLFSPath(t *testing.T) { diff --git a/services/auth/basic.go b/services/auth/basic.go index d489164954..f259ad5f69 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -9,15 +9,15 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/middleware" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/modules/web/middleware" ) // Ensure the struct implements the interface. diff --git a/services/auth/group.go b/services/auth/group.go index aecf43cb24..b713301b50 100644 --- a/services/auth/group.go +++ b/services/auth/group.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" ) // Ensure the struct implements the interface. diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go index 83a36bef23..d3cbb8aa60 100644 --- a/services/auth/httpsign.go +++ b/services/auth/httpsign.go @@ -11,11 +11,11 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/services/auth/interface.go b/services/auth/interface.go index ece28af12d..12b04a7abf 100644 --- a/services/auth/interface.go +++ b/services/auth/interface.go @@ -7,9 +7,9 @@ import ( "context" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/session" + "forgejo.org/modules/web/middleware" ) // DataStore represents a data store diff --git a/services/auth/main_test.go b/services/auth/main_test.go index b81c39a1f2..0e6315b06e 100644 --- a/services/auth/main_test.go +++ b/services/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index b983e57ecd..e6d556d10b 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -11,15 +11,15 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth/source/oauth2" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/actions" + "forgejo.org/services/auth/source/oauth2" ) // Ensure the struct implements the interface. diff --git a/services/auth/oauth2_test.go b/services/auth/oauth2_test.go index 90e2fe4517..d6455b33ad 100644 --- a/services/auth/oauth2_test.go +++ b/services/auth/oauth2_test.go @@ -6,10 +6,10 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/actions" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/actions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go index 8a5a5dc992..eb9ceb8cf2 100644 --- a/services/auth/reverseproxy.go +++ b/services/auth/reverseproxy.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" gouuid "github.com/google/uuid" ) diff --git a/services/auth/reverseproxy_test.go b/services/auth/reverseproxy_test.go index 7f1b2a7782..70ce1f8b0b 100644 --- a/services/auth/reverseproxy_test.go +++ b/services/auth/reverseproxy_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/require" ) diff --git a/services/auth/session.go b/services/auth/session.go index 35d97e42da..a15c24c940 100644 --- a/services/auth/session.go +++ b/services/auth/session.go @@ -6,8 +6,8 @@ package auth import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" ) // Ensure the struct implements the interface. diff --git a/services/auth/signin.go b/services/auth/signin.go index 7c69da8f94..495b3d387e 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -7,17 +7,17 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/auth/source/smtp" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/services/auth/source/oauth2" + "forgejo.org/services/auth/source/smtp" - _ "code.gitea.io/gitea/services/auth/source/db" // register the sources (and below) - _ "code.gitea.io/gitea/services/auth/source/ldap" // register the ldap source - _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source + _ "forgejo.org/services/auth/source/db" // register the sources (and below) + _ "forgejo.org/services/auth/source/ldap" // register the ldap source + _ "forgejo.org/services/auth/source/pam" // register the pam source ) // UserSignIn validates user name and password. diff --git a/services/auth/source.go b/services/auth/source.go index 69b71a6dea..b13554efde 100644 --- a/services/auth/source.go +++ b/services/auth/source.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" ) // DeleteSource deletes a AuthSource record in DB. diff --git a/services/auth/source/db/assert_interface_test.go b/services/auth/source/db/assert_interface_test.go index 62387c78f0..1422e9693c 100644 --- a/services/auth/source/db/assert_interface_test.go +++ b/services/auth/source/db/assert_interface_test.go @@ -4,9 +4,9 @@ package db_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/db" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/db" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/db/authenticate.go b/services/auth/source/db/authenticate.go index 8160141863..7c18540a10 100644 --- a/services/auth/source/db/authenticate.go +++ b/services/auth/source/db/authenticate.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) // ErrUserPasswordNotSet represents a "ErrUserPasswordNotSet" kind of error. diff --git a/services/auth/source/db/source.go b/services/auth/source/db/source.go index bb2270cbd6..d158718bb2 100644 --- a/services/auth/source/db/source.go +++ b/services/auth/source/db/source.go @@ -6,8 +6,8 @@ package db import ( "context" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" ) // Source is a password authentication service diff --git a/services/auth/source/ldap/assert_interface_test.go b/services/auth/source/ldap/assert_interface_test.go index 33347687dc..859143a3f8 100644 --- a/services/auth/source/ldap/assert_interface_test.go +++ b/services/auth/source/ldap/assert_interface_test.go @@ -4,9 +4,9 @@ package ldap_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/ldap" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/ldap/source.go b/services/auth/source/ldap/source.go index ba407b351a..a094c1410c 100644 --- a/services/auth/source/ldap/source.go +++ b/services/auth/source/ldap/source.go @@ -6,10 +6,10 @@ package ldap import ( "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/modules/json" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" ) // .____ ________ _____ __________ diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index 68ecd16342..a2ff10cd07 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/optional" - source_service "code.gitea.io/gitea/services/auth/source" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + auth_module "forgejo.org/modules/auth" + "forgejo.org/modules/optional" + source_service "forgejo.org/services/auth/source" + user_service "forgejo.org/services/user" ) // Authenticate queries if login/password is valid against the LDAP directory pool, diff --git a/services/auth/source/ldap/source_search.go b/services/auth/source/ldap/source_search.go index 2a61386ae1..da7e225428 100644 --- a/services/auth/source/ldap/source_search.go +++ b/services/auth/source/ldap/source_search.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/container" + "forgejo.org/modules/log" "github.com/go-ldap/ldap/v3" ) diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index 1f70edaa82..cb6172ed1d 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -8,16 +8,16 @@ import ( "fmt" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - source_service "code.gitea.io/gitea/services/auth/source" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + auth_module "forgejo.org/modules/auth" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + source_service "forgejo.org/services/auth/source" + user_service "forgejo.org/services/user" ) // Sync causes this ldap source to synchronize its users with the db diff --git a/services/auth/source/oauth2/assert_interface_test.go b/services/auth/source/oauth2/assert_interface_test.go index 56fe0e4aa8..12fce257cf 100644 --- a/services/auth/source/oauth2/assert_interface_test.go +++ b/services/auth/source/oauth2/assert_interface_test.go @@ -4,9 +4,9 @@ package oauth2_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/oauth2" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/oauth2/init.go b/services/auth/source/oauth2/init.go index 5c25681548..6c78a14da4 100644 --- a/services/auth/source/oauth2/init.go +++ b/services/auth/source/oauth2/init.go @@ -9,11 +9,11 @@ import ( "net/http" "sync" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" "github.com/google/uuid" "github.com/gorilla/sessions" diff --git a/services/auth/source/oauth2/jwtsigningkey.go b/services/auth/source/oauth2/jwtsigningkey.go index 92adfc4d84..550945a812 100644 --- a/services/auth/source/oauth2/jwtsigningkey.go +++ b/services/auth/source/oauth2/jwtsigningkey.go @@ -18,9 +18,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/auth/source/oauth2/jwtsigningkey_test.go b/services/auth/source/oauth2/jwtsigningkey_test.go index 4db538b0e8..7cf2833696 100644 --- a/services/auth/source/oauth2/jwtsigningkey_test.go +++ b/services/auth/source/oauth2/jwtsigningkey_test.go @@ -13,8 +13,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/auth/source/oauth2/providers.go b/services/auth/source/oauth2/providers.go index f2c1bb4894..773ce19c12 100644 --- a/services/auth/source/oauth2/providers.go +++ b/services/auth/source/oauth2/providers.go @@ -12,11 +12,11 @@ import ( "net/url" "sort" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" "github.com/markbates/goth" ) diff --git a/services/auth/source/oauth2/providers_base.go b/services/auth/source/oauth2/providers_base.go index 63318b84ef..1ef8d0af72 100644 --- a/services/auth/source/oauth2/providers_base.go +++ b/services/auth/source/oauth2/providers_base.go @@ -6,8 +6,8 @@ package oauth2 import ( "html/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/svg" + "forgejo.org/modules/log" + "forgejo.org/modules/svg" ) // BaseProvider represents a common base for Provider diff --git a/services/auth/source/oauth2/providers_custom.go b/services/auth/source/oauth2/providers_custom.go index 65cf538ad7..51a412e0be 100644 --- a/services/auth/source/oauth2/providers_custom.go +++ b/services/auth/source/oauth2/providers_custom.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azureadv2" diff --git a/services/auth/source/oauth2/providers_openid.go b/services/auth/source/oauth2/providers_openid.go index f606581271..7950506ab7 100644 --- a/services/auth/source/oauth2/providers_openid.go +++ b/services/auth/source/oauth2/providers_openid.go @@ -6,9 +6,9 @@ package oauth2 import ( "html/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/svg" "github.com/markbates/goth" "github.com/markbates/goth/providers/openidConnect" diff --git a/services/auth/source/oauth2/providers_simple.go b/services/auth/source/oauth2/providers_simple.go index e95323a62a..8e2c0a7700 100644 --- a/services/auth/source/oauth2/providers_simple.go +++ b/services/auth/source/oauth2/providers_simple.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azuread" diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go index 3f8616c6ff..5245f88270 100644 --- a/services/auth/source/oauth2/source.go +++ b/services/auth/source/oauth2/source.go @@ -6,8 +6,8 @@ package oauth2 import ( "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) // Source holds configuration for the OAuth2 login source. diff --git a/services/auth/source/oauth2/source_authenticate.go b/services/auth/source/oauth2/source_authenticate.go index bbda35dee0..1efd7be02a 100644 --- a/services/auth/source/oauth2/source_authenticate.go +++ b/services/auth/source/oauth2/source_authenticate.go @@ -6,8 +6,8 @@ package oauth2 import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/auth/source/db" + user_model "forgejo.org/models/user" + "forgejo.org/services/auth/source/db" ) // Authenticate falls back to the db authenticator diff --git a/services/auth/source/oauth2/store.go b/services/auth/source/oauth2/store.go index e031653119..d52581ea2d 100644 --- a/services/auth/source/oauth2/store.go +++ b/services/auth/source/oauth2/store.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/log" - session_module "code.gitea.io/gitea/modules/session" + "forgejo.org/modules/log" + session_module "forgejo.org/modules/session" chiSession "code.forgejo.org/go-chi/session" "github.com/gorilla/sessions" diff --git a/services/auth/source/oauth2/token.go b/services/auth/source/oauth2/token.go index 3405619d3f..fba1fd8a01 100644 --- a/services/auth/source/oauth2/token.go +++ b/services/auth/source/oauth2/token.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/modules/timeutil" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/auth/source/pam/assert_interface_test.go b/services/auth/source/pam/assert_interface_test.go index 8e7648b8d3..8c54b7e9e2 100644 --- a/services/auth/source/pam/assert_interface_test.go +++ b/services/auth/source/pam/assert_interface_test.go @@ -4,9 +4,9 @@ package pam_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/pam" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/pam" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/pam/source.go b/services/auth/source/pam/source.go index 96b182e185..e1dc83ba43 100644 --- a/services/auth/source/pam/source.go +++ b/services/auth/source/pam/source.go @@ -4,8 +4,8 @@ package pam import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) // __________ _____ _____ diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go index 0df0b2bca1..6f3ffc2d9d 100644 --- a/services/auth/source/pam/source_authenticate.go +++ b/services/auth/source/pam/source_authenticate.go @@ -8,12 +8,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/auth/pam" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" "github.com/google/uuid" ) diff --git a/services/auth/source/remote/source.go b/services/auth/source/remote/source.go index 4165858a56..effbabc7d0 100644 --- a/services/auth/source/remote/source.go +++ b/services/auth/source/remote/source.go @@ -4,8 +4,8 @@ package remote import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) type Source struct { diff --git a/services/auth/source/smtp/assert_interface_test.go b/services/auth/source/smtp/assert_interface_test.go index 6c9cde66e1..6826dae873 100644 --- a/services/auth/source/smtp/assert_interface_test.go +++ b/services/auth/source/smtp/assert_interface_test.go @@ -4,9 +4,9 @@ package smtp_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "forgejo.org/models/auth" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/smtp" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go index 2a648e421e..d44971bab0 100644 --- a/services/auth/source/smtp/source.go +++ b/services/auth/source/smtp/source.go @@ -4,8 +4,8 @@ package smtp import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "forgejo.org/models/auth" + "forgejo.org/modules/json" ) // _________ __________________________ diff --git a/services/auth/source/smtp/source_authenticate.go b/services/auth/source/smtp/source_authenticate.go index 1f0a61c789..3d7ccd0669 100644 --- a/services/auth/source/smtp/source_authenticate.go +++ b/services/auth/source/smtp/source_authenticate.go @@ -10,10 +10,10 @@ import ( "net/textproto" "strings" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/util" ) // Authenticate queries if the provided login/password is authenticates against the SMTP server diff --git a/services/auth/source/source_group_sync.go b/services/auth/source/source_group_sync.go index 3a2411ec55..46be6937fb 100644 --- a/services/auth/source/source_group_sync.go +++ b/services/auth/source/source_group_sync.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models" + "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" ) type syncType int diff --git a/services/auth/sync.go b/services/auth/sync.go index 7562ac812b..c594be7a24 100644 --- a/services/auth/sync.go +++ b/services/auth/sync.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/modules/log" ) // SyncExternalUsers is used to synchronize users with external authorization source diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index d3cc4c6fb1..51a14edd9a 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -8,22 +8,22 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - shared_automerge "code.gitea.io/gitea/services/shared/automerge" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + shared_automerge "forgejo.org/services/shared/automerge" ) // Init runs the task queue to that handles auto merges diff --git a/services/automerge/notify.go b/services/automerge/notify.go index cb078214f6..3b5eae9d48 100644 --- a/services/automerge/notify.go +++ b/services/automerge/notify.go @@ -6,10 +6,10 @@ package automerge import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) type automergeNotifier struct { diff --git a/services/context/access_log.go b/services/context/access_log.go index 0926748ac5..7a54b746f6 100644 --- a/services/context/access_log.go +++ b/services/context/access_log.go @@ -12,10 +12,10 @@ import ( "text/template" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web/middleware" ) type routerLoggerOptions struct { diff --git a/services/context/api.go b/services/context/api.go index 871a2f012d..37f0e0f559 100644 --- a/services/context/api.go +++ b/services/context/api.go @@ -11,18 +11,18 @@ import ( "net/url" "strings" - issues_model "code.gitea.io/gitea/models/issues" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - mc "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" + issues_model "forgejo.org/models/issues" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + mc "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/web" + web_types "forgejo.org/modules/web/types" "code.forgejo.org/go-chi/cache" ) diff --git a/services/context/api_org.go b/services/context/api_org.go index dad02b1719..acc9594e48 100644 --- a/services/context/api_org.go +++ b/services/context/api_org.go @@ -3,7 +3,7 @@ package context -import "code.gitea.io/gitea/models/organization" +import "forgejo.org/models/organization" // APIOrganization contains organization and team type APIOrganization struct { diff --git a/services/context/api_test.go b/services/context/api_test.go index 6064fee1c3..90e4d5ec65 100644 --- a/services/context/api_test.go +++ b/services/context/api_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/context/base.go b/services/context/base.go index 0259e0d806..0275ea8a99 100644 --- a/services/context/base.go +++ b/services/context/base.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web/middleware" + "forgejo.org/modules/httplib" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/translation" + "forgejo.org/modules/web/middleware" "github.com/go-chi/chi/v5" ) diff --git a/services/context/base_test.go b/services/context/base_test.go index 823f20e00b..868ac00f8b 100644 --- a/services/context/base_test.go +++ b/services/context/base_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/captcha.go b/services/context/captcha.go index da837acb00..8ae8bdcae3 100644 --- a/services/context/captcha.go +++ b/services/context/captcha.go @@ -7,14 +7,14 @@ import ( "fmt" "sync" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/hcaptcha" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mcaptcha" - "code.gitea.io/gitea/modules/recaptcha" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/turnstile" + "forgejo.org/modules/base" + "forgejo.org/modules/cache" + "forgejo.org/modules/hcaptcha" + "forgejo.org/modules/log" + "forgejo.org/modules/mcaptcha" + "forgejo.org/modules/recaptcha" + "forgejo.org/modules/setting" + "forgejo.org/modules/turnstile" mc "code.forgejo.org/go-chi/cache" "code.forgejo.org/go-chi/captcha" diff --git a/services/context/context.go b/services/context/context.go index 91e7b1849d..91484c5ba3 100644 --- a/services/context/context.go +++ b/services/context/context.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - mc "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - web_types "code.gitea.io/gitea/modules/web/types" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + mc "forgejo.org/modules/cache" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/httpcache" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web" + "forgejo.org/modules/web/middleware" + web_types "forgejo.org/modules/web/types" "code.forgejo.org/go-chi/cache" "code.forgejo.org/go-chi/session" diff --git a/services/context/context_cookie.go b/services/context/context_cookie.go index 3699f81071..08ef84b5eb 100644 --- a/services/context/context_cookie.go +++ b/services/context/context_cookie.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web/middleware" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/web/middleware" ) const CookieNameFlash = "gitea_flash" diff --git a/services/context/context_model.go b/services/context/context_model.go index 4f70aac516..1a8751ee63 100644 --- a/services/context/context_model.go +++ b/services/context/context_model.go @@ -4,7 +4,7 @@ package context import ( - "code.gitea.io/gitea/models/unit" + "forgejo.org/models/unit" ) // IsUserSiteAdmin returns true if current user is a site admin diff --git a/services/context/context_response.go b/services/context/context_response.go index f36b834a44..e20e7dd852 100644 --- a/services/context/context_response.go +++ b/services/context/context_response.go @@ -16,13 +16,13 @@ import ( "syscall" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/httplib" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/web/middleware" ) // RedirectToUser redirect to a differently-named user diff --git a/services/context/context_test.go b/services/context/context_test.go index 033ce2ef0a..c2a271d2b7 100644 --- a/services/context/context_test.go +++ b/services/context/context_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/csrf.go b/services/context/csrf.go index 51127c6eb0..82dd9283ff 100644 --- a/services/context/csrf.go +++ b/services/context/csrf.go @@ -25,8 +25,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) const ( diff --git a/services/context/org.go b/services/context/org.go index 9673f2f5a9..31ad60704f 100644 --- a/services/context/org.go +++ b/services/context/org.go @@ -7,14 +7,14 @@ package context import ( "strings" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" ) // Organization contains organization context diff --git a/services/context/package.go b/services/context/package.go index c452c657e7..e597249e2a 100644 --- a/services/context/package.go +++ b/services/context/package.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/templates" ) // Package contains owner, access mode and optional the package descriptor diff --git a/services/context/pagination.go b/services/context/pagination.go index 655a278f9f..b826e59dea 100644 --- a/services/context/pagination.go +++ b/services/context/pagination.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/paginator" + "forgejo.org/modules/paginator" ) // Pagination provides a pagination via paginator.Paginator and additional configurations for the link params used in rendering diff --git a/services/context/permission.go b/services/context/permission.go index 14a9801dcc..b6af87f912 100644 --- a/services/context/permission.go +++ b/services/context/permission.go @@ -6,10 +6,10 @@ package context import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/log" ) // RequireRepoAdmin returns a middleware for requiring repository admin permission diff --git a/services/context/private.go b/services/context/private.go index 8b41949f60..3d7ed694f1 100644 --- a/services/context/private.go +++ b/services/context/private.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" + "forgejo.org/modules/graceful" + "forgejo.org/modules/process" + "forgejo.org/modules/web" + web_types "forgejo.org/modules/web/types" ) // PrivateContext represents a context for private routes diff --git a/services/context/quota.go b/services/context/quota.go index 94e8847696..f6e79e1ebe 100644 --- a/services/context/quota.go +++ b/services/context/quota.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/modules/base" + quota_model "forgejo.org/models/quota" + "forgejo.org/modules/base" ) type QuotaTargetType int diff --git a/services/context/repo.go b/services/context/repo.go index ff03844c03..a1e1cadf6c 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -15,26 +15,26 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/card" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/card" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + asymkey_service "forgejo.org/services/asymkey" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/services/context/repository.go b/services/context/repository.go index 422ac3f58d..7eef2c5068 100644 --- a/services/context/repository.go +++ b/services/context/repository.go @@ -6,7 +6,7 @@ package context import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" ) // RepositoryIDAssignmentAPI returns a middleware to handle context-repo assignment for api routes diff --git a/services/context/response.go b/services/context/response.go index 2f271f211b..8fc631e671 100644 --- a/services/context/response.go +++ b/services/context/response.go @@ -6,7 +6,7 @@ package context import ( "net/http" - web_types "code.gitea.io/gitea/modules/web/types" + web_types "forgejo.org/modules/web/types" ) // ResponseWriter represents a response writer for HTTP diff --git a/services/context/upload/upload.go b/services/context/upload/upload.go index 77a7eb9377..2fa177e604 100644 --- a/services/context/upload/upload.go +++ b/services/context/upload/upload.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/context" ) // ErrFileTypeForbidden not allowed file type error diff --git a/services/context/user.go b/services/context/user.go index 4c9cd2928b..a82c90d7a6 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" ) // UserAssignmentWeb returns a middleware to handle context-user assignment for web routes diff --git a/services/contexttest/context_tests.go b/services/contexttest/context_tests.go index 7c829f3598..ebab04f620 100644 --- a/services/contexttest/context_tests.go +++ b/services/contexttest/context_tests.go @@ -15,16 +15,16 @@ import ( "testing" "time" - org_model "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + org_model "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/services/convert/activity.go b/services/convert/activity.go index 01fef73e58..213db13772 100644 --- a/services/convert/activity.go +++ b/services/convert/activity.go @@ -6,12 +6,12 @@ package convert import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + activities_model "forgejo.org/models/activities" + perm_model "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" ) func ToActivity(ctx context.Context, ac *activities_model.Action, doer *user_model.User) *api.Activity { diff --git a/services/convert/attachment.go b/services/convert/attachment.go index d632c94c18..6617aac906 100644 --- a/services/convert/attachment.go +++ b/services/convert/attachment.go @@ -4,8 +4,8 @@ package convert import ( - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) func WebAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachment) string { diff --git a/services/convert/convert.go b/services/convert/convert.go index 7a094494e4..2ea24a1b51 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -11,24 +11,24 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" + actions_model "forgejo.org/models/actions" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/gitdiff" ) // ToEmail convert models.EmailAddress to api.Email diff --git a/services/convert/git_commit.go b/services/convert/git_commit.go index e0efcddbcb..e041361737 100644 --- a/services/convert/git_commit.go +++ b/services/convert/git_commit.go @@ -8,14 +8,14 @@ import ( "net/url" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - ctx "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/gitdiff" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + ctx "forgejo.org/services/context" + "forgejo.org/services/gitdiff" ) // ToCommitUser convert a git.Signature to an api.CommitUser diff --git a/services/convert/git_commit_test.go b/services/convert/git_commit_test.go index 68d1b05168..463b93aac3 100644 --- a/services/convert/git_commit_test.go +++ b/services/convert/git_commit_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/issue.go b/services/convert/issue.go index f514dc4313..c7803794d0 100644 --- a/services/convert/issue.go +++ b/services/convert/issue.go @@ -9,13 +9,13 @@ import ( "net/url" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" ) func ToIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) *api.Issue { diff --git a/services/convert/issue_comment.go b/services/convert/issue_comment.go index 9ec9ac7684..9ea315aee6 100644 --- a/services/convert/issue_comment.go +++ b/services/convert/issue_comment.go @@ -6,12 +6,12 @@ package convert import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // ToAPIComment converts a issues_model.Comment to the api.Comment format for API usage diff --git a/services/convert/issue_test.go b/services/convert/issue_test.go index 0aeb3e5612..97bacfb229 100644 --- a/services/convert/issue_test.go +++ b/services/convert/issue_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/main_test.go b/services/convert/main_test.go index b28b8f9446..5915d16be4 100644 --- a/services/convert/main_test.go +++ b/services/convert/main_test.go @@ -6,10 +6,10 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/convert/mirror.go b/services/convert/mirror.go index 85e0d1c856..9e7d2659ab 100644 --- a/services/convert/mirror.go +++ b/services/convert/mirror.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) // ToPushMirror convert from repo_model.PushMirror and remoteAddress to api.TopicResponse diff --git a/services/convert/notification.go b/services/convert/notification.go index 41063cf399..3a4239e0fe 100644 --- a/services/convert/notification.go +++ b/services/convert/notification.go @@ -7,10 +7,10 @@ import ( "context" "net/url" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - api "code.gitea.io/gitea/modules/structs" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + api "forgejo.org/modules/structs" ) // ToNotificationThread convert a Notification to api.NotificationThread diff --git a/services/convert/package.go b/services/convert/package.go index b5fca21a3c..a28e60e1b1 100644 --- a/services/convert/package.go +++ b/services/convert/package.go @@ -6,10 +6,10 @@ package convert import ( "context" - "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToPackage convert a packages.PackageDescriptor to api.Package diff --git a/services/convert/pull.go b/services/convert/pull.go index 70dc22445a..7bee2b4c44 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" ) // ToAPIPullRequest assumes following fields have been assigned with valid values: diff --git a/services/convert/pull_review.go b/services/convert/pull_review.go index f7990e7a5c..08ccc0e1fc 100644 --- a/services/convert/pull_review.go +++ b/services/convert/pull_review.go @@ -7,9 +7,9 @@ import ( "context" "strings" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToPullReview convert a review to api format diff --git a/services/convert/pull_test.go b/services/convert/pull_test.go index 1339ed5cc0..3e4875fc60 100644 --- a/services/convert/pull_test.go +++ b/services/convert/pull_test.go @@ -6,15 +6,15 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/quota.go b/services/convert/quota.go index 791cd8e038..ba729feaac 100644 --- a/services/convert/quota.go +++ b/services/convert/quota.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - action_model "code.gitea.io/gitea/models/actions" - issue_model "code.gitea.io/gitea/models/issues" - package_model "code.gitea.io/gitea/models/packages" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + action_model "forgejo.org/models/actions" + issue_model "forgejo.org/models/issues" + package_model "forgejo.org/models/packages" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) func ToQuotaRuleInfo(rule quota_model.Rule, withName bool) api.QuotaRuleInfo { diff --git a/services/convert/release.go b/services/convert/release.go index 8c0f61b56c..7773cf3b19 100644 --- a/services/convert/release.go +++ b/services/convert/release.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + api "forgejo.org/modules/structs" ) // ToAPIRelease convert a repo_model.Release to api.Release diff --git a/services/convert/release_test.go b/services/convert/release_test.go index 2e40bb9cdd..3abd2ff3ef 100644 --- a/services/convert/release_test.go +++ b/services/convert/release_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/repository.go b/services/convert/repository.go index e4b2c7b8bc..1b0f46b3da 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -7,14 +7,14 @@ import ( "context" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" ) // ToRepo converts a Repository to api.Repository diff --git a/services/convert/status.go b/services/convert/status.go index 6cef63c1cd..1a71e70a52 100644 --- a/services/convert/status.go +++ b/services/convert/status.go @@ -6,9 +6,9 @@ package convert import ( "context" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + git_model "forgejo.org/models/git" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToCommitStatus converts git_model.CommitStatus to api.CommitStatus diff --git a/services/convert/user.go b/services/convert/user.go index 7b6775dfb4..444089fd83 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -6,9 +6,9 @@ package convert import ( "context" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/perm" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" ) // ToUser convert user_model.User to api.User diff --git a/services/convert/user_test.go b/services/convert/user_test.go index 0f0b520c9b..01ce8101da 100644 --- a/services/convert/user_test.go +++ b/services/convert/user_test.go @@ -6,10 +6,10 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/convert/utils.go b/services/convert/utils.go index fe35fd2dac..3bbd4e39bd 100644 --- a/services/convert/utils.go +++ b/services/convert/utils.go @@ -7,8 +7,8 @@ package convert import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" ) // ToCorrectPageSize makes sure page size is in allowed range. diff --git a/services/convert/wiki.go b/services/convert/wiki.go index 767bfdb88d..adcbd52949 100644 --- a/services/convert/wiki.go +++ b/services/convert/wiki.go @@ -6,8 +6,8 @@ package convert import ( "time" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" ) // ToWikiCommit convert a git commit into a WikiCommit diff --git a/services/cron/cron.go b/services/cron/cron.go index 3c5737e371..d020f3fd6c 100644 --- a/services/cron/cron.go +++ b/services/cron/cron.go @@ -9,10 +9,10 @@ import ( "runtime/pprof" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/graceful" + "forgejo.org/modules/process" + "forgejo.org/modules/sync" + "forgejo.org/modules/translation" "github.com/go-co-op/gocron" ) diff --git a/services/cron/setting.go b/services/cron/setting.go index 6dad88830a..7fd4c4e1d8 100644 --- a/services/cron/setting.go +++ b/services/cron/setting.go @@ -6,7 +6,7 @@ package cron import ( "time" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" ) // Config represents a basic configuration interface that cron task diff --git a/services/cron/tasks.go b/services/cron/tasks.go index f8a7444c49..b547acdf05 100644 --- a/services/cron/tasks.go +++ b/services/cron/tasks.go @@ -11,14 +11,14 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/db" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) var ( diff --git a/services/cron/tasks_actions.go b/services/cron/tasks_actions.go index 59cfe36d14..a7fd3cd0bc 100644 --- a/services/cron/tasks_actions.go +++ b/services/cron/tasks_actions.go @@ -6,9 +6,9 @@ package cron import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - actions_service "code.gitea.io/gitea/services/actions" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + actions_service "forgejo.org/services/actions" ) func initActionsTasks() { diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 23eb0dd291..5ada7a8f5c 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -7,18 +7,18 @@ import ( "context" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" + "forgejo.org/models" + git_model "forgejo.org/models/git" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/services/auth" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + packages_cleanup_service "forgejo.org/services/packages/cleanup" + repo_service "forgejo.org/services/repository" + archiver_service "forgejo.org/services/repository/archiver" ) func registerUpdateMirrorTask() { diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go index e1ba5274e6..322fe27ca0 100644 --- a/services/cron/tasks_extended.go +++ b/services/cron/tasks_extended.go @@ -7,17 +7,17 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/updatechecker" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - user_service "code.gitea.io/gitea/services/user" + activities_model "forgejo.org/models/activities" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + issue_indexer "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/setting" + "forgejo.org/modules/updatechecker" + repo_service "forgejo.org/services/repository" + archiver_service "forgejo.org/services/repository/archiver" + user_service "forgejo.org/services/user" ) func registerDeleteInactiveUsers() { diff --git a/services/doctor/actions.go b/services/doctor/actions.go index 7c44fb8392..c382132265 100644 --- a/services/doctor/actions.go +++ b/services/doctor/actions.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_service "forgejo.org/services/repository" ) func disableMirrorActionsUnit(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/authorizedkeys.go b/services/doctor/authorizedkeys.go index 2920cf51d7..04a3680ff5 100644 --- a/services/doctor/authorizedkeys.go +++ b/services/doctor/authorizedkeys.go @@ -12,10 +12,10 @@ import ( "path/filepath" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) const tplCommentPrefix = `# gitea public key` diff --git a/services/doctor/breaking.go b/services/doctor/breaking.go index ec8433b8de..339f8e847c 100644 --- a/services/doctor/breaking.go +++ b/services/doctor/breaking.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/db" + "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" "xorm.io/builder" ) diff --git a/services/doctor/checkOldArchives.go b/services/doctor/checkOldArchives.go index 390dfb43aa..301e99391b 100644 --- a/services/doctor/checkOldArchives.go +++ b/services/doctor/checkOldArchives.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/util" ) func checkOldArchives(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go index 9e2fcb645f..6fcbd90940 100644 --- a/services/doctor/dbconsistency.go +++ b/services/doctor/dbconsistency.go @@ -6,16 +6,16 @@ package doctor import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/migrations" - org_model "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/migrations" + org_model "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type consistencyCheck struct { diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go index 2a102b2194..9c02c732e5 100644 --- a/services/doctor/dbversion.go +++ b/services/doctor/dbversion.go @@ -6,9 +6,9 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + "forgejo.org/modules/log" ) func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/doctor.go b/services/doctor/doctor.go index a4eb5e16b9..6d8e168bf2 100644 --- a/services/doctor/doctor.go +++ b/services/doctor/doctor.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // Check represents a Doctor check diff --git a/services/doctor/fix16961.go b/services/doctor/fix16961.go index 50d9ac6621..2212d9e903 100644 --- a/services/doctor/fix16961.go +++ b/services/doctor/fix16961.go @@ -9,12 +9,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/timeutil" "xorm.io/builder" ) diff --git a/services/doctor/fix16961_test.go b/services/doctor/fix16961_test.go index 498ed9c8d5..7a83c808c3 100644 --- a/services/doctor/fix16961_test.go +++ b/services/doctor/fix16961_test.go @@ -6,7 +6,7 @@ package doctor import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/fix8312.go b/services/doctor/fix8312.go index 4fc049873a..31cd6686d7 100644 --- a/services/doctor/fix8312.go +++ b/services/doctor/fix8312.go @@ -6,11 +6,11 @@ package doctor import ( "context" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/heads.go b/services/doctor/heads.go index 41fca01d57..7f9d1c73e8 100644 --- a/services/doctor/heads.go +++ b/services/doctor/heads.go @@ -6,9 +6,9 @@ package doctor import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/lfs.go b/services/doctor/lfs.go index 8531b7bbe8..fed127de5d 100644 --- a/services/doctor/lfs.go +++ b/services/doctor/lfs.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/repository" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/services/repository" ) func init() { diff --git a/services/doctor/mergebase.go b/services/doctor/mergebase.go index de460c4190..bebde30bee 100644 --- a/services/doctor/mergebase.go +++ b/services/doctor/mergebase.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/misc.go b/services/doctor/misc.go index 9300c3a25c..9b9c96b52b 100644 --- a/services/doctor/misc.go +++ b/services/doctor/misc.go @@ -11,17 +11,17 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/services/doctor/packages_nuget.go b/services/doctor/packages_nuget.go index 47fdb3ac12..f6a33db779 100644 --- a/services/doctor/packages_nuget.go +++ b/services/doctor/packages_nuget.go @@ -9,12 +9,12 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - packages_service "code.gitea.io/gitea/services/packages" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + nuget_module "forgejo.org/modules/packages/nuget" + packages_service "forgejo.org/services/packages" "xorm.io/builder" ) diff --git a/services/doctor/paths.go b/services/doctor/paths.go index 8e37f01ef5..4fbe19ea04 100644 --- a/services/doctor/paths.go +++ b/services/doctor/paths.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) type configurationFile struct { diff --git a/services/doctor/push_mirror_consistency.go b/services/doctor/push_mirror_consistency.go index 68b96d6415..07986770b2 100644 --- a/services/doctor/push_mirror_consistency.go +++ b/services/doctor/push_mirror_consistency.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/repository.go b/services/doctor/repository.go index 6c33426636..cd51483d88 100644 --- a/services/doctor/repository.go +++ b/services/doctor/repository.go @@ -6,11 +6,11 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + repo_service "forgejo.org/services/repository" "xorm.io/builder" ) diff --git a/services/doctor/storage.go b/services/doctor/storage.go index 3f3b562c37..7dbe475d6c 100644 --- a/services/doctor/storage.go +++ b/services/doctor/storage.go @@ -9,16 +9,16 @@ import ( "io/fs" "strings" - "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/git" + "forgejo.org/models/packages" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" ) type commonStorageCheckOptions struct { diff --git a/services/doctor/usertype.go b/services/doctor/usertype.go index ab32b78e62..0a034d8f9d 100644 --- a/services/doctor/usertype.go +++ b/services/doctor/usertype.go @@ -6,8 +6,8 @@ package doctor import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" ) func checkUserType(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/externalaccount/link.go b/services/externalaccount/link.go index d6e2ea7e94..f5d29b5ce5 100644 --- a/services/externalaccount/link.go +++ b/services/externalaccount/link.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "github.com/markbates/goth" ) diff --git a/services/externalaccount/user.go b/services/externalaccount/user.go index 3cfd8c81f9..68d085f6d0 100644 --- a/services/externalaccount/user.go +++ b/services/externalaccount/user.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/markbates/goth" ) diff --git a/services/f3/driver/asset.go b/services/f3/driver/asset.go index 61e571d1b6..c9d2ecdf2f 100644 --- a/services/f3/driver/asset.go +++ b/services/f3/driver/asset.go @@ -12,12 +12,12 @@ import ( "io" "os" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/attachment" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/services/attachment" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/assets.go b/services/f3/driver/assets.go index 88a3979713..106d5029f3 100644 --- a/services/f3/driver/assets.go +++ b/services/f3/driver/assets.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/comment.go b/services/f3/driver/comment.go index 166bfcd328..bd924930b5 100644 --- a/services/f3/driver/comment.go +++ b/services/f3/driver/comment.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/comments.go b/services/f3/driver/comments.go index eb79b74066..d8c84e290c 100644 --- a/services/f3/driver/comments.go +++ b/services/f3/driver/comments.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/forge.go b/services/f3/driver/forge.go index c232882753..03acb41450 100644 --- a/services/f3/driver/forge.go +++ b/services/f3/driver/forge.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" + user_model "forgejo.org/models/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/issue.go b/services/f3/driver/issue.go index 7e10f3a9db..6308c4cc2d 100644 --- a/services/f3/driver/issue.go +++ b/services/f3/driver/issue.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + issue_service "forgejo.org/services/issue" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/issues.go b/services/f3/driver/issues.go index 3a5a64e2b1..dd6828dc86 100644 --- a/services/f3/driver/issues.go +++ b/services/f3/driver/issues.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/label.go b/services/f3/driver/label.go index 509a69cf71..707ac2bab3 100644 --- a/services/f3/driver/label.go +++ b/services/f3/driver/label.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/labels.go b/services/f3/driver/labels.go index 03f986b57a..4f705ed206 100644 --- a/services/f3/driver/labels.go +++ b/services/f3/driver/labels.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/main.go b/services/f3/driver/main.go index 825d456692..eb6e4a6fb6 100644 --- a/services/f3/driver/main.go +++ b/services/f3/driver/main.go @@ -5,7 +5,7 @@ package driver import ( - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" "code.forgejo.org/f3/gof3/v3/options" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/main_test.go b/services/f3/driver/main_test.go index 8505b69b7e..b136fd5b23 100644 --- a/services/f3/driver/main_test.go +++ b/services/f3/driver/main_test.go @@ -7,14 +7,14 @@ package driver import ( "testing" - "code.gitea.io/gitea/models/unittest" - driver_options "code.gitea.io/gitea/services/f3/driver/options" + "forgejo.org/models/unittest" + driver_options "forgejo.org/services/f3/driver/options" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" - _ "code.gitea.io/gitea/services/f3/driver/tests" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/perm/access" + _ "forgejo.org/services/f3/driver/tests" tests_f3 "code.forgejo.org/f3/gof3/v3/tree/tests/f3" "github.com/stretchr/testify/require" diff --git a/services/f3/driver/milestone.go b/services/f3/driver/milestone.go index e57fee95a7..d10e6918ac 100644 --- a/services/f3/driver/milestone.go +++ b/services/f3/driver/milestone.go @@ -9,10 +9,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/milestones.go b/services/f3/driver/milestones.go index c816903bb1..cf0b70c158 100644 --- a/services/f3/driver/milestones.go +++ b/services/f3/driver/milestones.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/options.go b/services/f3/driver/options.go index abc5015dd0..516f9baf7a 100644 --- a/services/f3/driver/options.go +++ b/services/f3/driver/options.go @@ -7,7 +7,7 @@ package driver import ( "net/http" - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" "code.forgejo.org/f3/gof3/v3/options" ) diff --git a/services/f3/driver/organization.go b/services/f3/driver/organization.go index 8e818a231a..af1eea4dda 100644 --- a/services/f3/driver/organization.go +++ b/services/f3/driver/organization.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/organizations.go b/services/f3/driver/organizations.go index adebdbbe95..eca6bfb9d4 100644 --- a/services/f3/driver/organizations.go +++ b/services/f3/driver/organizations.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" f3_id "code.forgejo.org/f3/gof3/v3/id" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/project.go b/services/f3/driver/project.go index 2400663426..5a3ec81e40 100644 --- a/services/f3/driver/project.go +++ b/services/f3/driver/project.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + repo_service "forgejo.org/services/repository" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/projects.go b/services/f3/driver/projects.go index fb447f3f01..0c76854f43 100644 --- a/services/f3/driver/projects.go +++ b/services/f3/driver/projects.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" f3_id "code.forgejo.org/f3/gof3/v3/id" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/pullrequest.go b/services/f3/driver/pullrequest.go index b8cb06c4d5..664ee6b13b 100644 --- a/services/f3/driver/pullrequest.go +++ b/services/f3/driver/pullrequest.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - issue_service "code.gitea.io/gitea/services/issue" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + issue_service "forgejo.org/services/issue" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/pullrequests.go b/services/f3/driver/pullrequests.go index e7f2910314..227171994c 100644 --- a/services/f3/driver/pullrequests.go +++ b/services/f3/driver/pullrequests.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/optional" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/optional" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/reaction.go b/services/f3/driver/reaction.go index 4f12fa41db..74c50b9d13 100644 --- a/services/f3/driver/reaction.go +++ b/services/f3/driver/reaction.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/reactions.go b/services/f3/driver/reactions.go index b7fd5e8f0a..a546927b92 100644 --- a/services/f3/driver/reactions.go +++ b/services/f3/driver/reactions.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/release.go b/services/f3/driver/release.go index 86490e8b02..df38bd8bc0 100644 --- a/services/f3/driver/release.go +++ b/services/f3/driver/release.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/timeutil" - release_service "code.gitea.io/gitea/services/release" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/timeutil" + release_service "forgejo.org/services/release" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/releases.go b/services/f3/driver/releases.go index 3b46bc7c54..a631c0b60e 100644 --- a/services/f3/driver/releases.go +++ b/services/f3/driver/releases.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/repository.go b/services/f3/driver/repository.go index 118d5f2f2a..e7f4e43723 100644 --- a/services/f3/driver/repository.go +++ b/services/f3/driver/repository.go @@ -7,7 +7,7 @@ package driver import ( "context" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "forgejo.org/models/repo" "code.forgejo.org/f3/gof3/v3/f3" helpers_repository "code.forgejo.org/f3/gof3/v3/forges/helpers/repository" diff --git a/services/f3/driver/review.go b/services/f3/driver/review.go index d180ea96be..f4f5ff44b8 100644 --- a/services/f3/driver/review.go +++ b/services/f3/driver/review.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/reviewcomment.go b/services/f3/driver/reviewcomment.go index 7ba0e15802..22759b6df3 100644 --- a/services/f3/driver/reviewcomment.go +++ b/services/f3/driver/reviewcomment.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/reviewcomments.go b/services/f3/driver/reviewcomments.go index e11aaa489b..2aa4dea22c 100644 --- a/services/f3/driver/reviewcomments.go +++ b/services/f3/driver/reviewcomments.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/reviews.go b/services/f3/driver/reviews.go index a20d5741d1..7c3dcb37de 100644 --- a/services/f3/driver/reviews.go +++ b/services/f3/driver/reviews.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/tests/init.go b/services/f3/driver/tests/init.go index d7bf23ac88..9035296dc0 100644 --- a/services/f3/driver/tests/init.go +++ b/services/f3/driver/tests/init.go @@ -5,7 +5,7 @@ package tests import ( - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" tests_forge "code.forgejo.org/f3/gof3/v3/tree/tests/f3/forge" ) diff --git a/services/f3/driver/tests/new.go b/services/f3/driver/tests/new.go index dc6ac437e6..2f5c6c64db 100644 --- a/services/f3/driver/tests/new.go +++ b/services/f3/driver/tests/new.go @@ -7,7 +7,7 @@ package tests import ( "testing" - driver_options "code.gitea.io/gitea/services/f3/driver/options" + driver_options "forgejo.org/services/f3/driver/options" f3_kind "code.forgejo.org/f3/gof3/v3/kind" "code.forgejo.org/f3/gof3/v3/options" diff --git a/services/f3/driver/tests/options.go b/services/f3/driver/tests/options.go index adaa1da588..f61b10c9ef 100644 --- a/services/f3/driver/tests/options.go +++ b/services/f3/driver/tests/options.go @@ -7,9 +7,9 @@ package tests import ( "testing" - forgejo_log "code.gitea.io/gitea/modules/log" - driver_options "code.gitea.io/gitea/services/f3/driver/options" - "code.gitea.io/gitea/services/f3/util" + forgejo_log "forgejo.org/modules/log" + driver_options "forgejo.org/services/f3/driver/options" + "forgejo.org/services/f3/util" "code.forgejo.org/f3/gof3/v3/options" ) diff --git a/services/f3/driver/topic.go b/services/f3/driver/topic.go index eeb387cf93..cc94aa35fa 100644 --- a/services/f3/driver/topic.go +++ b/services/f3/driver/topic.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/topics.go b/services/f3/driver/topics.go index 2685a47928..38f03dbd2d 100644 --- a/services/f3/driver/topics.go +++ b/services/f3/driver/topics.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" "code.forgejo.org/f3/gof3/v3/tree/generic" diff --git a/services/f3/driver/tree.go b/services/f3/driver/tree.go index 2377d3794d..ff927df9d4 100644 --- a/services/f3/driver/tree.go +++ b/services/f3/driver/tree.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - forgejo_options "code.gitea.io/gitea/services/f3/driver/options" + forgejo_options "forgejo.org/services/f3/driver/options" f3_kind "code.forgejo.org/f3/gof3/v3/kind" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/driver/user.go b/services/f3/driver/user.go index 0ba6cbb7c6..bf8bfaf9c9 100644 --- a/services/f3/driver/user.go +++ b/services/f3/driver/user.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - user_service "code.gitea.io/gitea/services/user" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + user_service "forgejo.org/services/user" "code.forgejo.org/f3/gof3/v3/f3" f3_id "code.forgejo.org/f3/gof3/v3/id" diff --git a/services/f3/driver/users.go b/services/f3/driver/users.go index 59b10fc51d..cb413ae05d 100644 --- a/services/f3/driver/users.go +++ b/services/f3/driver/users.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" f3_id "code.forgejo.org/f3/gof3/v3/id" f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3" diff --git a/services/f3/util/logger.go b/services/f3/util/logger.go index 21d8d6bbfa..9a1409ae84 100644 --- a/services/f3/util/logger.go +++ b/services/f3/util/logger.go @@ -6,8 +6,8 @@ package util import ( "fmt" - forgejo_log "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" + forgejo_log "forgejo.org/modules/log" + "forgejo.org/modules/migration" "code.forgejo.org/f3/gof3/v3/logger" ) diff --git a/services/f3/util/logger_test.go b/services/f3/util/logger_test.go index db880aa439..4afd5dd57f 100644 --- a/services/f3/util/logger_test.go +++ b/services/f3/util/logger_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - forgejo_log "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/test" + forgejo_log "forgejo.org/modules/log" + "forgejo.org/modules/test" "code.forgejo.org/f3/gof3/v3/logger" "github.com/stretchr/testify/assert" diff --git a/services/federation/federation_service.go b/services/federation/federation_service.go index 4c6f5ca0ca..21c7be855b 100644 --- a/services/federation/federation_service.go +++ b/services/federation/federation_service.go @@ -11,15 +11,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/forgefed" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/auth/password" - fm "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" + "forgejo.org/models/forgefed" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/auth/password" + fm "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/validation" "github.com/google/uuid" ) diff --git a/services/feed/action.go b/services/feed/action.go index 2d6a6cb09a..a2cd0551a3 100644 --- a/services/feed/action.go +++ b/services/feed/action.go @@ -9,17 +9,17 @@ import ( "path" "strings" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) type actionNotifier struct { diff --git a/services/feed/action_test.go b/services/feed/action_test.go index 037cf08dfe..b0bbcdc3b6 100644 --- a/services/feed/action_test.go +++ b/services/feed/action_test.go @@ -7,18 +7,18 @@ import ( "strings" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/forgejo/main_test.go b/services/forgejo/main_test.go index 40ce1715b1..5523ed1aab 100644 --- a/services/forgejo/main_test.go +++ b/services/forgejo/main_test.go @@ -5,12 +5,12 @@ package forgejo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/forgejo/sanity.go b/services/forgejo/sanity.go index 5e817d67f5..70f15889d4 100644 --- a/services/forgejo/sanity.go +++ b/services/forgejo/sanity.go @@ -3,9 +3,9 @@ package forgejo import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) var ( diff --git a/services/forgejo/sanity_test.go b/services/forgejo/sanity_test.go index 657f7e2720..065a9fda4d 100644 --- a/services/forgejo/sanity_test.go +++ b/services/forgejo/sanity_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" "github.com/stretchr/testify/require" ) diff --git a/services/forgejo/sanity_v1TOv5_0_1Included.go b/services/forgejo/sanity_v1TOv5_0_1Included.go index 49de636f33..1d3f07d8e1 100644 --- a/services/forgejo/sanity_v1TOv5_0_1Included.go +++ b/services/forgejo/sanity_v1TOv5_0_1Included.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgejo/semver" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/forgejo/semver" + "forgejo.org/modules/setting" "github.com/hashicorp/go-version" ) diff --git a/services/forgejo/sanity_v1TOv5_0_1Included_test.go b/services/forgejo/sanity_v1TOv5_0_1Included_test.go index 56618ebd5f..2521afb496 100644 --- a/services/forgejo/sanity_v1TOv5_0_1Included_test.go +++ b/services/forgejo/sanity_v1TOv5_0_1Included_test.go @@ -6,10 +6,10 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgejo/semver" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + "forgejo.org/models/forgejo/semver" + "forgejo.org/models/unittest" + "forgejo.org/modules/log" "github.com/stretchr/testify/require" ) diff --git a/services/forms/admin.go b/services/forms/admin.go index 1f055cff55..5a5d46634b 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -6,9 +6,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go index 21443ff6a5..e665ca0d19 100644 --- a/services/forms/auth_form.go +++ b/services/forms/auth_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/org.go b/services/forms/org.go index dea2e159e9..a6e4e72c4a 100644 --- a/services/forms/org.go +++ b/services/forms/org.go @@ -7,9 +7,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/package_form.go b/services/forms/package_form.go index 7a7d8752cf..82e5a09f86 100644 --- a/services/forms/package_form.go +++ b/services/forms/package_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/repo_branch_form.go b/services/forms/repo_branch_form.go index 186a4ad367..c34e7c6d17 100644 --- a/services/forms/repo_branch_form.go +++ b/services/forms/repo_branch_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 8253a8957b..bd2eb769c6 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -12,14 +12,14 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/models" + issues_model "forgejo.org/models/issues" + project_model "forgejo.org/models/project" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/repo_form_test.go b/services/forms/repo_form_test.go index 2c5a8e2c0f..4047762096 100644 --- a/services/forms/repo_form_test.go +++ b/services/forms/repo_form_test.go @@ -6,7 +6,7 @@ package forms import ( "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/forms/repo_tag_form.go b/services/forms/repo_tag_form.go index 38f5996db3..1254c84d07 100644 --- a/services/forms/repo_tag_form.go +++ b/services/forms/repo_tag_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/runner.go b/services/forms/runner.go index f933750858..fcf6c5a694 100644 --- a/services/forms/runner.go +++ b/services/forms/runner.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/user_form.go b/services/forms/user_form.go index d76e97ceb1..dfd5b3da9b 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/validation" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/user_form_auth_openid.go b/services/forms/user_form_auth_openid.go index c5ab703fa1..02d4f873bc 100644 --- a/services/forms/user_form_auth_openid.go +++ b/services/forms/user_form_auth_openid.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "forgejo.org/modules/web/middleware" + "forgejo.org/services/context" "code.forgejo.org/go-chi/binding" ) diff --git a/services/forms/user_form_hidden_comments.go b/services/forms/user_form_hidden_comments.go index b9677c1800..74a1aaccb0 100644 --- a/services/forms/user_form_hidden_comments.go +++ b/services/forms/user_form_hidden_comments.go @@ -6,9 +6,9 @@ package forms import ( "math/big" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/log" + "forgejo.org/services/context" ) type hiddenCommentTypeGroupsType map[string][]issues_model.CommentType diff --git a/services/forms/user_form_test.go b/services/forms/user_form_test.go index 66050187c9..67fb64cabf 100644 --- a/services/forms/user_form_test.go +++ b/services/forms/user_form_test.go @@ -7,8 +7,8 @@ import ( "strconv" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/services/gitdiff/csv_test.go b/services/gitdiff/csv_test.go index 1dbe616374..9bffba33fd 100644 --- a/services/gitdiff/csv_test.go +++ b/services/gitdiff/csv_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - csv_module "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + csv_module "forgejo.org/modules/csv" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index f2070983e6..2e1fecda2a 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -17,19 +17,19 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + user_model "forgejo.org/models/user" + "forgejo.org/modules/analyze" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/highlight" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" "github.com/sergi/go-diff/diffmatchpatch" stdcharset "golang.org/x/net/html/charset" diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index f2c099d554..532255fe84 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" dmp "github.com/sergi/go-diff/diffmatchpatch" "github.com/stretchr/testify/assert" diff --git a/services/gitdiff/highlightdiff.go b/services/gitdiff/highlightdiff.go index c72959ea16..08681b8617 100644 --- a/services/gitdiff/highlightdiff.go +++ b/services/gitdiff/highlightdiff.go @@ -6,7 +6,7 @@ package gitdiff import ( "strings" - "code.gitea.io/gitea/modules/highlight" + "forgejo.org/modules/highlight" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/services/gitdiff/main_test.go b/services/gitdiff/main_test.go index 3d4d480530..cd7a6a4a6b 100644 --- a/services/gitdiff/main_test.go +++ b/services/gitdiff/main_test.go @@ -6,12 +6,12 @@ package gitdiff import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/indexer/indexer.go b/services/indexer/indexer.go index 38dd012a51..92036f95c3 100644 --- a/services/indexer/indexer.go +++ b/services/indexer/indexer.go @@ -4,10 +4,10 @@ package indexer import ( - code_indexer "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - stats_indexer "code.gitea.io/gitea/modules/indexer/stats" - notify_service "code.gitea.io/gitea/services/notify" + code_indexer "forgejo.org/modules/indexer/code" + issue_indexer "forgejo.org/modules/indexer/issues" + stats_indexer "forgejo.org/modules/indexer/stats" + notify_service "forgejo.org/services/notify" ) // Init initialize the repo indexer diff --git a/services/indexer/notify.go b/services/indexer/notify.go index e2cfe477d3..ddd89f733c 100644 --- a/services/indexer/notify.go +++ b/services/indexer/notify.go @@ -6,16 +6,16 @@ package indexer import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - stats_indexer "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + code_indexer "forgejo.org/modules/indexer/code" + issue_indexer "forgejo.org/modules/indexer/issues" + stats_indexer "forgejo.org/modules/indexer/stats" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + notify_service "forgejo.org/services/notify" ) type indexerNotifier struct { diff --git a/services/issue/assignee.go b/services/issue/assignee.go index 3d6d0b881a..a5f9c2731f 100644 --- a/services/issue/assignee.go +++ b/services/issue/assignee.go @@ -6,15 +6,15 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) // DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array diff --git a/services/issue/assignee_test.go b/services/issue/assignee_test.go index 2b70b8c8ce..66a66459cb 100644 --- a/services/issue/assignee_test.go +++ b/services/issue/assignee_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/comments.go b/services/issue/comments.go index 3ab577b83f..dedef6cc87 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/timeutil" + notify_service "forgejo.org/services/notify" ) // CreateRefComment creates a commit reference comment to issue. diff --git a/services/issue/comments_test.go b/services/issue/comments_test.go index 62547a584a..728af15529 100644 --- a/services/issue/comments_test.go +++ b/services/issue/comments_test.go @@ -6,17 +6,17 @@ package issue_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + issue_service "forgejo.org/services/issue" + "forgejo.org/tests" - _ "code.gitea.io/gitea/services/webhook" + _ "forgejo.org/services/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/commit.go b/services/issue/commit.go index 8b927d52b6..1e51fb32b7 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -13,15 +13,15 @@ import ( "strings" "time" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/references" + "forgejo.org/modules/repository" ) const ( diff --git a/services/issue/commit_test.go b/services/issue/commit_test.go index c3c3e4c042..e3a41d2305 100644 --- a/services/issue/commit_test.go +++ b/services/issue/commit_test.go @@ -6,14 +6,14 @@ package issue import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" "github.com/stretchr/testify/require" ) diff --git a/services/issue/content.go b/services/issue/content.go index 612a9a6b4c..d5c79e5fde 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -6,9 +6,9 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) // ChangeContent changes issue content, as the given user. diff --git a/services/issue/issue.go b/services/issue/issue.go index 5e726176d0..f6a3e90b10 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -8,19 +8,19 @@ import ( "fmt" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + notify_service "forgejo.org/services/notify" ) // NewIssue creates new issue with labels for repository. diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go index a0bb88e387..e15a0118ad 100644 --- a/services/issue/issue_test.go +++ b/services/issue/issue_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/label.go b/services/issue/label.go index 6b8070d8aa..bcac54272a 100644 --- a/services/issue/label.go +++ b/services/issue/label.go @@ -6,11 +6,11 @@ package issue import ( "context" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) // ClearLabels clears all of an issue's labels diff --git a/services/issue/label_test.go b/services/issue/label_test.go index b9d26345c1..73a028684b 100644 --- a/services/issue/label_test.go +++ b/services/issue/label_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/require" ) diff --git a/services/issue/main_test.go b/services/issue/main_test.go index c3da441537..673ec5e4cc 100644 --- a/services/issue/main_test.go +++ b/services/issue/main_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/webhook" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/services/webhook" - _ "code.gitea.io/gitea/models/actions" + _ "forgejo.org/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/issue/milestone.go b/services/issue/milestone.go index 407ad0a59b..3fa7083812 100644 --- a/services/issue/milestone.go +++ b/services/issue/milestone.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) func updateMilestoneCounters(ctx context.Context, issue *issues_model.Issue, id int64) error { diff --git a/services/issue/milestone_test.go b/services/issue/milestone_test.go index e75f64550c..4123433c2a 100644 --- a/services/issue/milestone_test.go +++ b/services/issue/milestone_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/issue/pull.go b/services/issue/pull.go index 3b61c00afa..b0a0c47d88 100644 --- a/services/issue/pull.go +++ b/services/issue/pull.go @@ -8,15 +8,15 @@ import ( "fmt" "time" - issues_model "code.gitea.io/gitea/models/issues" - org_model "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + issues_model "forgejo.org/models/issues" + org_model "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func getMergeBase(repo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) { diff --git a/services/issue/reaction.go b/services/issue/reaction.go index dbb4735de2..c6a11aa0f0 100644 --- a/services/issue/reaction.go +++ b/services/issue/reaction.go @@ -5,8 +5,8 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" ) // CreateIssueReaction creates a reaction on issue. diff --git a/services/issue/status.go b/services/issue/status.go index 9b6c683f4f..6664da7daa 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -6,10 +6,10 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) // ChangeStatus changes issue status to open or closed. diff --git a/services/issue/template.go b/services/issue/template.go index 9a2b048401..67a01825d2 100644 --- a/services/issue/template.go +++ b/services/issue/template.go @@ -10,11 +10,11 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/issue/template" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" "gopkg.in/yaml.v3" ) diff --git a/services/lfs/locks.go b/services/lfs/locks.go index 2a362b1c0d..a45b2cc93b 100644 --- a/services/lfs/locks.go +++ b/services/lfs/locks.go @@ -8,16 +8,16 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - lfs_module "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/json" + lfs_module "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" + "forgejo.org/services/convert" ) func handleLockListOut(ctx *context.Context, repo *repo_model.Repository, lock *git_model.LFSLock, err error) { diff --git a/services/lfs/server.go b/services/lfs/server.go index 51d6f42776..8eef62eabe 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -18,21 +18,21 @@ import ( "strconv" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - lfs_module "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + lfs_module "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/services/context" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/mailer/incoming/incoming.go b/services/mailer/incoming/incoming.go index 1b1be4c656..b1b9191df3 100644 --- a/services/mailer/incoming/incoming.go +++ b/services/mailer/incoming/incoming.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/token" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/services/mailer/token" "code.forgejo.org/forgejo/reply" "github.com/emersion/go-imap" diff --git a/services/mailer/incoming/incoming_handler.go b/services/mailer/incoming/incoming_handler.go index dc3c4ec69b..7505148978 100644 --- a/services/mailer/incoming/incoming_handler.go +++ b/services/mailer/incoming/incoming_handler.go @@ -8,19 +8,19 @@ import ( "context" "fmt" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context/upload" - issue_service "code.gitea.io/gitea/services/issue" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - "code.gitea.io/gitea/services/mailer/token" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + attachment_service "forgejo.org/services/attachment" + "forgejo.org/services/context/upload" + issue_service "forgejo.org/services/issue" + incoming_payload "forgejo.org/services/mailer/incoming/payload" + "forgejo.org/services/mailer/token" + pull_service "forgejo.org/services/pull" ) type MailHandler interface { diff --git a/services/mailer/incoming/payload/payload.go b/services/mailer/incoming/payload/payload.go index 00ada7826b..bb7a65e3d5 100644 --- a/services/mailer/incoming/payload/payload.go +++ b/services/mailer/incoming/payload/payload.go @@ -6,8 +6,8 @@ package payload import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/util" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/util" ) const replyPayloadVersion1 byte = 1 diff --git a/services/mailer/mail.go b/services/mailer/mail.go index bfede28bbe..c0a37d9fb2 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -16,21 +16,21 @@ import ( texttmpl "text/template" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - "code.gitea.io/gitea/services/mailer/token" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/emoji" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/translation" + incoming_payload "forgejo.org/services/mailer/incoming/payload" + "forgejo.org/services/mailer/token" "gopkg.in/gomail.v2" ) diff --git a/services/mailer/mail_admin_new_user.go b/services/mailer/mail_admin_new_user.go index 0713de8a95..ffb03197b7 100644 --- a/services/mailer/mail_admin_new_user.go +++ b/services/mailer/mail_admin_new_user.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/translation" ) const ( diff --git a/services/mailer/mail_admin_new_user_test.go b/services/mailer/mail_admin_new_user_test.go index 765c8cb6c9..9273691792 100644 --- a/services/mailer/mail_admin_new_user_test.go +++ b/services/mailer/mail_admin_new_user_test.go @@ -8,10 +8,10 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mail_auth_test.go b/services/mailer/mail_auth_test.go index 38e3721a22..e40a0d6fa0 100644 --- a/services/mailer/mail_auth_test.go +++ b/services/mailer/mail_auth_test.go @@ -6,14 +6,14 @@ package mailer_test import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" + "forgejo.org/services/mailer" + user_service "forgejo.org/services/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mail_comment.go b/services/mailer/mail_comment.go index 1812441d5a..b4ed3145ed 100644 --- a/services/mailer/mail_comment.go +++ b/services/mailer/mail_comment.go @@ -6,12 +6,12 @@ package mailer import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // MailParticipantsComment sends new comment emails to repository watchers and mentioned people. diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index 1bb6fdc7a3..b0329caa0b 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) func fallbackMailSubject(issue *issues_model.Issue) string { diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index 0b8b97e9cd..0f2ef33fe1 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -7,14 +7,14 @@ import ( "bytes" "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) const ( diff --git a/services/mailer/mail_repo.go b/services/mailer/mail_repo.go index 7003584786..eed650f3ac 100644 --- a/services/mailer/mail_repo.go +++ b/services/mailer/mail_repo.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) // SendRepoTransferNotifyMail triggers a notification e-mail when a pending repository transfer was created diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index ceecefa50f..a2a871d3c3 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -9,12 +9,12 @@ import ( "fmt" "net/url" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/translation" ) const ( diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 43e5d83890..616eea2d85 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -15,15 +15,15 @@ import ( "testing" texttmpl "text/template" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/markup" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go index 0a723f974a..4561240df5 100644 --- a/services/mailer/mailer.go +++ b/services/mailer/mailer.go @@ -18,14 +18,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/modules/base" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + notify_service "forgejo.org/services/notify" ntlmssp "github.com/Azure/go-ntlmssp" "github.com/jaytaylor/html2text" diff --git a/services/mailer/mailer_test.go b/services/mailer/mailer_test.go index 045701f3a5..aef242d908 100644 --- a/services/mailer/mailer_test.go +++ b/services/mailer/mailer_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go index 908976e7ef..9ef71dbdb3 100644 --- a/services/mailer/main_test.go +++ b/services/mailer/main_test.go @@ -7,13 +7,13 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/templates" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" - _ "code.gitea.io/gitea/models/actions" + _ "forgejo.org/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/mailer/notify.go b/services/mailer/notify.go index 54ab80aab9..e61ecd0511 100644 --- a/services/mailer/notify.go +++ b/services/mailer/notify.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + notify_service "forgejo.org/services/notify" ) type mailNotifier struct { diff --git a/services/mailer/token/token.go b/services/mailer/token/token.go index 1a52bce803..f3d7286cb0 100644 --- a/services/mailer/token/token.go +++ b/services/mailer/token/token.go @@ -11,8 +11,8 @@ import ( "fmt" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" ) // A token is a verifiable container describing an action. diff --git a/services/markup/main_test.go b/services/markup/main_test.go index 89fe3e7e34..1b085b4929 100644 --- a/services/markup/main_test.go +++ b/services/markup/main_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/markup/processorhelper.go b/services/markup/processorhelper.go index 40bf1d65da..b5fcd78cb7 100644 --- a/services/markup/processorhelper.go +++ b/services/markup/processorhelper.go @@ -7,16 +7,16 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - gitea_context "code.gitea.io/gitea/services/context" - file_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models/perm/access" + "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + gitea_context "forgejo.org/services/context" + file_service "forgejo.org/services/repository/files" ) func ProcessorHelper() *markup.ProcessorHelper { diff --git a/services/markup/processorhelper_test.go b/services/markup/processorhelper_test.go index 4d103048b5..8195451746 100644 --- a/services/markup/processorhelper_test.go +++ b/services/markup/processorhelper_test.go @@ -8,11 +8,11 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/models/user" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/codebase.go b/services/migrations/codebase.go index 492fc908e9..843df0f973 100644 --- a/services/migrations/codebase.go +++ b/services/migrations/codebase.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/proxy" + "forgejo.org/modules/structs" ) var ( diff --git a/services/migrations/codebase_test.go b/services/migrations/codebase_test.go index fbd4e70143..315c7be709 100644 --- a/services/migrations/codebase_test.go +++ b/services/migrations/codebase_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/common.go b/services/migrations/common.go index d88518899d..ee74461447 100644 --- a/services/migrations/common.go +++ b/services/migrations/common.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" + system_model "forgejo.org/models/system" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" ) // WarnAndNotice will log the provided message and send a repository notice diff --git a/services/migrations/dump.go b/services/migrations/dump.go index cb13cd3e5c..cbf6b87668 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -16,13 +16,13 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" "github.com/google/uuid" "gopkg.in/yaml.v3" diff --git a/services/migrations/forgejo_downloader.go b/services/migrations/forgejo_downloader.go index 25dbb6ec51..5f809b82be 100644 --- a/services/migrations/forgejo_downloader.go +++ b/services/migrations/forgejo_downloader.go @@ -4,7 +4,7 @@ package migrations import ( - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" ) func init() { diff --git a/services/migrations/forgejo_downloader_test.go b/services/migrations/forgejo_downloader_test.go index 5bd37551cc..db1930ebba 100644 --- a/services/migrations/forgejo_downloader_test.go +++ b/services/migrations/forgejo_downloader_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/structs" "github.com/stretchr/testify/require" ) diff --git a/services/migrations/git.go b/services/migrations/git.go index 22ffd5e765..46710b0abe 100644 --- a/services/migrations/git.go +++ b/services/migrations/git.go @@ -6,7 +6,7 @@ package migrations import ( "context" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" ) var _ base.Downloader = &PlainGitDownloader{} diff --git a/services/migrations/gitbucket.go b/services/migrations/gitbucket.go index 4fe9e30a39..b68fc01083 100644 --- a/services/migrations/gitbucket.go +++ b/services/migrations/gitbucket.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" ) var ( diff --git a/services/migrations/gitea_downloader.go b/services/migrations/gitea_downloader.go index b42c7aa4da..272a7d379a 100644 --- a/services/migrations/gitea_downloader.go +++ b/services/migrations/gitea_downloader.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" gitea_sdk "code.gitea.io/sdk/gitea" ) diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index b9ddb9b431..b3d49752f3 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 7bd6538ff2..7edaef5557 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -14,26 +14,26 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - base_module "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/uri" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + base_module "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/label" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/uri" + "forgejo.org/modules/util" + "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" "github.com/google/uuid" ) diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index e01f4664ba..e07c621acc 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/github.go b/services/migrations/github.go index 7025354f77..5052a68114 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/proxy" + "forgejo.org/modules/structs" "github.com/google/go-github/v64/github" "golang.org/x/oauth2" diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go index 080fd497ca..b1f20c4716 100644 --- a/services/migrations/github_test.go +++ b/services/migrations/github_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index 2eb3e6629d..ac0d3bcf7a 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -15,12 +15,12 @@ import ( "strings" "time" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" gitlab "gitlab.com/gitlab-org/api/client-go" ) diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go index f1404d946d..924dab5144 100644 --- a/services/migrations/gitlab_test.go +++ b/services/migrations/gitlab_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gogs.go b/services/migrations/gogs.go index 1fef4808b0..b6fb8cef0a 100644 --- a/services/migrations/gogs.go +++ b/services/migrations/gogs.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/proxy" + "forgejo.org/modules/structs" "github.com/gogs/go-gogs-client" ) diff --git a/services/migrations/gogs_test.go b/services/migrations/gogs_test.go index 450aeab5ef..7d7f10c2b9 100644 --- a/services/migrations/gogs_test.go +++ b/services/migrations/gogs_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/http_client.go b/services/migrations/http_client.go index 0b997e08f4..26962f2976 100644 --- a/services/migrations/http_client.go +++ b/services/migrations/http_client.go @@ -7,9 +7,9 @@ import ( "crypto/tls" "net/http" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/proxy" + "forgejo.org/modules/setting" ) // NewMigrationHTTPClient returns a HTTP client for migration diff --git a/services/migrations/main_test.go b/services/migrations/main_test.go index f78d75e4db..17e6505df2 100644 --- a/services/migrations/main_test.go +++ b/services/migrations/main_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "forgejo.org/models/unittest" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go index ccb9cb7e98..81d1c203fe 100644 --- a/services/migrations/migrate.go +++ b/services/migrations/migrate.go @@ -12,16 +12,16 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // MigrateOptions is equal to base.MigrateOptions diff --git a/services/migrations/migrate_test.go b/services/migrations/migrate_test.go index 6e45cbd906..804d01df7a 100644 --- a/services/migrations/migrate_test.go +++ b/services/migrations/migrate_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/stretchr/testify/require" ) diff --git a/services/migrations/onedev.go b/services/migrations/onedev.go index e2f7b771f3..a553a4d8f5 100644 --- a/services/migrations/onedev.go +++ b/services/migrations/onedev.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/structs" ) var ( diff --git a/services/migrations/onedev_test.go b/services/migrations/onedev_test.go index 46e3eb8d18..5bb2e2bb5c 100644 --- a/services/migrations/onedev_test.go +++ b/services/migrations/onedev_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/restore.go b/services/migrations/restore.go index e8725bc647..fe2628da52 100644 --- a/services/migrations/restore.go +++ b/services/migrations/restore.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strconv" - base "code.gitea.io/gitea/modules/migration" + base "forgejo.org/modules/migration" "gopkg.in/yaml.v3" ) diff --git a/services/migrations/update.go b/services/migrations/update.go index 4a49206f82..4d497c1e2e 100644 --- a/services/migrations/update.go +++ b/services/migrations/update.go @@ -6,11 +6,11 @@ package migrations import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/externalaccount" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + "forgejo.org/services/externalaccount" ) // UpdateMigrationPosterID updates all migrated repositories' issues and comments posterID diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go index bc2d6711cf..6d871ad5ff 100644 --- a/services/mirror/mirror.go +++ b/services/mirror/mirror.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) // doMirrorSync causes this request to mirror itself diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 085995df4f..a63cbcf40c 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -9,21 +9,21 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + giturl "forgejo.org/modules/git/url" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/proxy" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) // gitShortEmptySha Git short empty SHA diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index 4b1d7718b6..11b8ad459a 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -13,17 +13,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) var stripExitStatus = regexp.MustCompile(`exit status \d+ - `) diff --git a/services/mirror/notifier.go b/services/mirror/notifier.go index 93d904470d..8f8552f419 100644 --- a/services/mirror/notifier.go +++ b/services/mirror/notifier.go @@ -6,10 +6,10 @@ package mirror import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/repository" - notify_service "code.gitea.io/gitea/services/notify" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/repository" + notify_service "forgejo.org/services/notify" ) func init() { diff --git a/services/mirror/queue.go b/services/mirror/queue.go index 0d9a624730..b4869cf8c0 100644 --- a/services/mirror/queue.go +++ b/services/mirror/queue.go @@ -4,10 +4,10 @@ package mirror import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" ) var mirrorQueue *queue.WorkerPoolQueue[*SyncRequest] diff --git a/services/notify/notifier.go b/services/notify/notifier.go index 3230a5e5f5..00f98942d9 100644 --- a/services/notify/notifier.go +++ b/services/notify/notifier.go @@ -6,12 +6,12 @@ package notify import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/repository" ) // Notifier defines an interface to notify receiver diff --git a/services/notify/notify.go b/services/notify/notify.go index 5ed63646aa..fb30dfb609 100644 --- a/services/notify/notify.go +++ b/services/notify/notify.go @@ -6,13 +6,13 @@ package notify import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" ) var notifiers []Notifier diff --git a/services/notify/null.go b/services/notify/null.go index 894d118eac..7182e69abb 100644 --- a/services/notify/null.go +++ b/services/notify/null.go @@ -6,12 +6,12 @@ package notify import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/repository" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/repository" ) // NullNotifier implements a blank notifier diff --git a/services/org/org.go b/services/org/org.go index dca7794b47..b1bbe43046 100644 --- a/services/org/org.go +++ b/services/org/org.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + repo_service "forgejo.org/services/repository" ) // DeleteOrganization completely and permanently deletes everything of organization. diff --git a/services/org/org_test.go b/services/org/org_test.go index 07358438f6..b0f591c745 100644 --- a/services/org/org_test.go +++ b/services/org/org_test.go @@ -6,11 +6,11 @@ package org import ( "testing" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/org/repo.go b/services/org/repo.go index 78a829ef25..33f55b1191 100644 --- a/services/org/repo.go +++ b/services/org/repo.go @@ -7,10 +7,10 @@ import ( "context" "errors" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" ) // TeamAddRepository adds new repository to team of organization. diff --git a/services/org/repo_test.go b/services/org/repo_test.go index 2ddb8f9045..c51cbf4c28 100644 --- a/services/org/repo_test.go +++ b/services/org/repo_test.go @@ -6,10 +6,10 @@ package org import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/require" ) diff --git a/services/org/team_invite.go b/services/org/team_invite.go index 3f28044dbf..9c5da25522 100644 --- a/services/org/team_invite.go +++ b/services/org/team_invite.go @@ -6,9 +6,9 @@ package org import ( "context" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/mailer" + org_model "forgejo.org/models/organization" + user_model "forgejo.org/models/user" + "forgejo.org/services/mailer" ) // CreateTeamInvite make a persistent invite in db and mail it diff --git a/services/packages/alpine/repository.go b/services/packages/alpine/repository.go index 92f475bb7b..9435887a46 100644 --- a/services/packages/alpine/repository.go +++ b/services/packages/alpine/repository.go @@ -20,14 +20,14 @@ import ( "io" "strings" - packages_model "code.gitea.io/gitea/models/packages" - alpine_model "code.gitea.io/gitea/models/packages/alpine" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + alpine_model "forgejo.org/models/packages/alpine" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + alpine_module "forgejo.org/modules/packages/alpine" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" ) const ( diff --git a/services/packages/alt/repository.go b/services/packages/alt/repository.go index f49c435e64..317862da9d 100644 --- a/services/packages/alt/repository.go +++ b/services/packages/alt/repository.go @@ -14,15 +14,15 @@ import ( "path" "time" - packages_model "code.gitea.io/gitea/models/packages" - alt_model "code.gitea.io/gitea/models/packages/alt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + alt_model "forgejo.org/models/packages/alt" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/json" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + packages_service "forgejo.org/services/packages" "github.com/ulikunitz/xz" ) diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index e681f24561..2a865e6dbd 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -16,14 +16,14 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + arch_module "forgejo.org/modules/packages/arch" + "forgejo.org/modules/setting" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/auth.go b/services/packages/auth.go index c5bf5af532..ab2c347bc9 100644 --- a/services/packages/auth.go +++ b/services/packages/auth.go @@ -9,10 +9,10 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/packages/cargo/index.go b/services/packages/cargo/index.go index 59823cd3de..9afcd79571 100644 --- a/services/packages/cargo/index.go +++ b/services/packages/cargo/index.go @@ -13,17 +13,17 @@ import ( "strconv" "time" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + cargo_module "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" ) const ( diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go index d84bdf1b03..7e821e2630 100644 --- a/services/packages/cleanup/cleanup.go +++ b/services/packages/cleanup/cleanup.go @@ -8,20 +8,20 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - packages_service "code.gitea.io/gitea/services/packages" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - alt_service "code.gitea.io/gitea/services/packages/alt" - arch_service "code.gitea.io/gitea/services/packages/arch" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - container_service "code.gitea.io/gitea/services/packages/container" - debian_service "code.gitea.io/gitea/services/packages/debian" - rpm_service "code.gitea.io/gitea/services/packages/rpm" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + packages_service "forgejo.org/services/packages" + alpine_service "forgejo.org/services/packages/alpine" + alt_service "forgejo.org/services/packages/alt" + arch_service "forgejo.org/services/packages/arch" + cargo_service "forgejo.org/services/packages/cargo" + container_service "forgejo.org/services/packages/container" + debian_service "forgejo.org/services/packages/debian" + rpm_service "forgejo.org/services/packages/rpm" ) // Task method to execute cleanup rules and cleanup expired package data diff --git a/services/packages/cleanup/cleanup_sha256_test.go b/services/packages/cleanup/cleanup_sha256_test.go index 41dde28248..f26b98b4b0 100644 --- a/services/packages/cleanup/cleanup_sha256_test.go +++ b/services/packages/cleanup/cleanup_sha256_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - container_service "code.gitea.io/gitea/services/packages/container" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + container_service "forgejo.org/services/packages/container" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/packages/cleanup/main_test.go b/services/packages/cleanup/main_test.go index ded3d76c83..e9135c147a 100644 --- a/services/packages/cleanup/main_test.go +++ b/services/packages/cleanup/main_test.go @@ -6,7 +6,7 @@ package container import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/packages/container/blob_uploader.go b/services/packages/container/blob_uploader.go index bae2e2d6af..cc009d1f5c 100644 --- a/services/packages/container/blob_uploader.go +++ b/services/packages/container/blob_uploader.go @@ -9,10 +9,10 @@ import ( "io" "os" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + packages_model "forgejo.org/models/packages" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" ) var ( diff --git a/services/packages/container/cleanup.go b/services/packages/container/cleanup.go index b5563c688f..a4ae7118f5 100644 --- a/services/packages/container/cleanup.go +++ b/services/packages/container/cleanup.go @@ -7,11 +7,11 @@ import ( "context" "time" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/modules/optional" - container_module "code.gitea.io/gitea/modules/packages/container" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/modules/optional" + container_module "forgejo.org/modules/packages/container" + packages_service "forgejo.org/services/packages" digest "github.com/opencontainers/go-digest" ) diff --git a/services/packages/container/cleanup_sha256.go b/services/packages/container/cleanup_sha256.go index 16afc74b18..5d0d02c22d 100644 --- a/services/packages/container/cleanup_sha256.go +++ b/services/packages/container/cleanup_sha256.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/timeutil" ) var ( diff --git a/services/packages/container/common.go b/services/packages/container/common.go index 5a14ed5b7a..758ef51721 100644 --- a/services/packages/container/common.go +++ b/services/packages/container/common.go @@ -7,9 +7,9 @@ import ( "context" "strings" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" + packages_model "forgejo.org/models/packages" + user_model "forgejo.org/models/user" + container_module "forgejo.org/modules/packages/container" ) // UpdateRepositoryNames updates the repository name property for all packages of the specific owner diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go index e400f1e924..a8a401662e 100644 --- a/services/packages/debian/repository.go +++ b/services/packages/debian/repository.go @@ -14,14 +14,14 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - debian_model "code.gitea.io/gitea/models/packages/debian" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + debian_model "forgejo.org/models/packages/debian" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/package_update.go b/services/packages/package_update.go index 4a22ee7a62..7fa938e260 100644 --- a/services/packages/package_update.go +++ b/services/packages/package_update.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + org_model "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" ) func LinkToRepository(ctx context.Context, pkg *packages_model.Package, repo *repo_model.Repository, doer *user_model.User) error { diff --git a/services/packages/packages.go b/services/packages/packages.go index bf89b6ad35..1232e5914f 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -12,17 +12,17 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + notify_service "forgejo.org/services/notify" ) var ( diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index 705876e5c0..961de7828f 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -16,15 +16,15 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - rpm_model "code.gitea.io/gitea/models/packages/rpm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "forgejo.org/models/packages" + rpm_model "forgejo.org/models/packages/rpm" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/pull/check.go b/services/pull/check.go index 2d91ed07f5..d038b3d829 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -11,23 +11,23 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/timeutil" - asymkey_service "code.gitea.io/gitea/services/asymkey" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/timeutil" + asymkey_service "forgejo.org/services/asymkey" + notify_service "forgejo.org/services/notify" ) // prPatchCheckerQueue represents a queue to handle update pull request tests diff --git a/services/pull/check_test.go b/services/pull/check_test.go index dfb8ff708b..b965d90236 100644 --- a/services/pull/check_test.go +++ b/services/pull/check_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/comment.go b/services/pull/comment.go index 53587d4f54..25542daa9f 100644 --- a/services/pull/comment.go +++ b/services/pull/comment.go @@ -6,11 +6,11 @@ package pull import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" ) // getCommitIDsFromRepo get commit IDs from repo in between oldCommitID and newCommitID diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go index 2c77d9cf4e..3c864c8ef2 100644 --- a/services/pull/commit_status.go +++ b/services/pull/commit_status.go @@ -9,13 +9,13 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" "github.com/gobwas/glob" ) diff --git a/services/pull/commit_status_test.go b/services/pull/commit_status_test.go index 592acdd55c..593c88fb19 100644 --- a/services/pull/commit_status_test.go +++ b/services/pull/commit_status_test.go @@ -7,8 +7,8 @@ package pull import ( "testing" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/structs" + git_model "forgejo.org/models/git" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/edits.go b/services/pull/edits.go index c7550dcb07..dbf08e6851 100644 --- a/services/pull/edits.go +++ b/services/pull/edits.go @@ -8,10 +8,10 @@ import ( "context" "errors" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + unit_model "forgejo.org/models/unit" + user_model "forgejo.org/models/user" ) var ErrUserHasNoPermissionForAction = errors.New("user not allowed to do this action") diff --git a/services/pull/lfs.go b/services/pull/lfs.go index ed03583d4f..8d9f401641 100644 --- a/services/pull/lfs.go +++ b/services/pull/lfs.go @@ -11,12 +11,12 @@ import ( "strconv" "sync" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/modules/git/pipeline" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" ) // LFSPush pushes lfs objects referred to in new commits in the head repository from the base repository diff --git a/services/pull/main_test.go b/services/pull/main_test.go index 4bcb50fb96..5262b5be50 100644 --- a/services/pull/main_test.go +++ b/services/pull/main_test.go @@ -7,10 +7,10 @@ package pull import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/pull/merge.go b/services/pull/merge.go index a1585e64ab..9b0d632377 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -14,23 +14,23 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/references" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" ) // getMergeMessage composes the message used when merging a pull request. diff --git a/services/pull/merge_ff_only.go b/services/pull/merge_ff_only.go index f57c732104..1e1c337889 100644 --- a/services/pull/merge_ff_only.go +++ b/services/pull/merge_ff_only.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // doMergeStyleFastForwardOnly merges the tracking into the current HEAD - which is assumed to be staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_merge.go b/services/pull/merge_merge.go index bf56c071db..713e1f175d 100644 --- a/services/pull/merge_merge.go +++ b/services/pull/merge_merge.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // doMergeStyleMerge merges the tracking branch into the current HEAD - which is assumed to be the staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go index 88f6c037eb..fb09515dbd 100644 --- a/services/pull/merge_prepare.go +++ b/services/pull/merge_prepare.go @@ -14,13 +14,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + asymkey_service "forgejo.org/services/asymkey" ) type mergeContext struct { diff --git a/services/pull/merge_rebase.go b/services/pull/merge_rebase.go index ecf376220e..088934cdfb 100644 --- a/services/pull/merge_rebase.go +++ b/services/pull/merge_rebase.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" ) // getRebaseAmendMessage composes the message to amend commits in rebase merge of a pull request. diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index 6dda46eaec..1c6f734a25 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" ) // doMergeStyleSquash gets a commit author signature for squash commits diff --git a/services/pull/patch.go b/services/pull/patch.go index e90b4bdbbe..35d1b101e2 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -13,18 +13,18 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unit" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/gobwas/glob" ) diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go index c60c48d923..caa0318c48 100644 --- a/services/pull/patch_unmerged.go +++ b/services/pull/patch_unmerged.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // lsFileLine is a Quadruplet struct (+error) representing a partially parsed line from ls-files diff --git a/services/pull/pull.go b/services/pull/pull.go index 6af7d8ba0c..18f63cf95d 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -13,27 +13,27 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - gitea_context "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + gitea_context "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" ) // TODO: use clustered lock (unique queue? or *abuse* cache) diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index c51619e7f6..010b7a6404 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -7,13 +7,13 @@ package pull import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/review.go b/services/pull/review.go index 927c43150b..d61d9623b6 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -11,17 +11,17 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`) diff --git a/services/pull/review_test.go b/services/pull/review_test.go index 4cb3ad007c..0d9fe7f902 100644 --- a/services/pull/review_test.go +++ b/services/pull/review_test.go @@ -6,11 +6,11 @@ package pull_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + pull_service "forgejo.org/services/pull" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index 36bdbde55c..1805ffc527 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -11,12 +11,12 @@ import ( "path/filepath" "strings" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" ) // Temporary repos created here use standard branch names to help simplify diff --git a/services/pull/update.go b/services/pull/update.go index dbc1b711e2..1b4b6b039d 100644 --- a/services/pull/update.go +++ b/services/pull/update.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" ) // Update updates pull request with base branch. diff --git a/services/pull/update_rebase.go b/services/pull/update_rebase.go index 3e2a7be132..b12613985a 100644 --- a/services/pull/update_rebase.go +++ b/services/pull/update_rebase.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" ) // updateHeadByRebaseOnToBase handles updating a PR's head branch by rebasing it on the PR current base branch diff --git a/services/release/release.go b/services/release/release.go index b52e4b124e..f0682c4dca 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -9,22 +9,22 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/attachment" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/storage" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/services/attachment" + notify_service "forgejo.org/services/notify" ) type AttachmentChange struct { diff --git a/services/release/release_test.go b/services/release/release_test.go index 5a22c473cf..66106eb606 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -8,16 +8,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/services/attachment" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/services/attachment" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/release/tag.go b/services/release/tag.go index dae2b70f76..e1608d1897 100644 --- a/services/release/tag.go +++ b/services/release/tag.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + repo_module "forgejo.org/modules/repository" "xorm.io/builder" ) diff --git a/services/remote/promote.go b/services/remote/promote.go index eb41ace462..26a54fb635 100644 --- a/services/remote/promote.go +++ b/services/remote/promote.go @@ -6,12 +6,12 @@ package remote import ( "context" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth/source/oauth2" - remote_source "code.gitea.io/gitea/services/auth/source/remote" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + "forgejo.org/services/auth/source/oauth2" + remote_source "forgejo.org/services/auth/source/remote" ) type Reason int diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 3d6fe71a09..3651b018e6 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -11,19 +11,19 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" "github.com/gobwas/glob" ) diff --git a/services/repository/adopt_test.go b/services/repository/adopt_test.go index 71fb1fc885..a66b4c5ac0 100644 --- a/services/repository/adopt_test.go +++ b/services/repository/adopt_test.go @@ -8,11 +8,11 @@ import ( "path" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index 279067c002..cffb07210f 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" ) // ArchiveRequest defines the parameters of an archive request, which notably diff --git a/services/repository/archiver/archiver_test.go b/services/repository/archiver/archiver_test.go index e7a2422e55..ec4da2404f 100644 --- a/services/repository/archiver/archiver_test.go +++ b/services/repository/archiver/archiver_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/services/contexttest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/avatar.go b/services/repository/avatar.go index 32940a7aa3..a1cd3228df 100644 --- a/services/repository/avatar.go +++ b/services/repository/avatar.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) // UploadAvatar saves custom avatar for repository. diff --git a/services/repository/avatar_test.go b/services/repository/avatar_test.go index b3c498dfc8..e5fcf7f239 100644 --- a/services/repository/avatar_test.go +++ b/services/repository/avatar_test.go @@ -9,10 +9,10 @@ import ( "image/png" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/avatar" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/avatar" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/branch.go b/services/repository/branch.go index 8e1a6cd27f..689f35803d 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -9,28 +9,28 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/queue" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" + files_service "forgejo.org/services/repository/files" "xorm.io/builder" ) diff --git a/services/repository/cache.go b/services/repository/cache.go index b0811a99fc..cd5b95afa3 100644 --- a/services/repository/cache.go +++ b/services/repository/cache.go @@ -6,9 +6,9 @@ package repository import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" ) // CacheRef cachhe last commit information of the branch or the tag diff --git a/services/repository/check.go b/services/repository/check.go index 5cdcc14679..7e680f3c58 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/util" "xorm.io/builder" ) diff --git a/services/repository/collaboration.go b/services/repository/collaboration.go index dccc124748..7a0d7edb7f 100644 --- a/services/repository/collaboration.go +++ b/services/repository/collaboration.go @@ -7,10 +7,10 @@ package repository import ( "context" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" ) // DeleteCollaboration removes collaboration relation between the user and repository. diff --git a/services/repository/collaboration_test.go b/services/repository/collaboration_test.go index c087018be4..b27b91be23 100644 --- a/services/repository/collaboration_test.go +++ b/services/repository/collaboration_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/require" ) diff --git a/services/repository/commit.go b/services/repository/commit.go index e8c0262ef4..0ff4ea701e 100644 --- a/services/repository/commit.go +++ b/services/repository/commit.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/util" - gitea_ctx "code.gitea.io/gitea/services/context" + "forgejo.org/modules/util" + gitea_ctx "forgejo.org/services/context" ) type ContainedLinks struct { // TODO: better name? diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index 635b0b108e..03a62d0410 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -9,17 +9,17 @@ import ( "fmt" "slices" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - shared_automerge "code.gitea.io/gitea/services/shared/automerge" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + shared_automerge "forgejo.org/services/shared/automerge" ) func getCacheKey(repoID int64, brancheName string) string { diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go index 48871813bd..ad4cc400cb 100644 --- a/services/repository/contributors_graph.go +++ b/services/repository/contributors_graph.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/avatars" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/avatars" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" "code.forgejo.org/go-chi/cache" ) diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go index c62bef25a1..927c950bec 100644 --- a/services/repository/contributors_graph_test.go +++ b/services/repository/contributors_graph_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/test" "code.forgejo.org/go-chi/cache" "github.com/stretchr/testify/assert" diff --git a/services/repository/create.go b/services/repository/create.go index 8a1118cc2b..4491b12497 100644 --- a/services/repository/create.go +++ b/services/repository/create.go @@ -12,18 +12,18 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/templates/vars" + "forgejo.org/modules/util" ) // CreateRepoOptions contains the create repository options diff --git a/services/repository/create_test.go b/services/repository/create_test.go index 9cde285181..7eb3c0f805 100644 --- a/services/repository/create_test.go +++ b/services/repository/create_test.go @@ -7,13 +7,13 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/delete.go b/services/repository/delete.go index 09213e5c65..7c83ba12cd 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -7,29 +7,29 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - admin_model "code.gitea.io/gitea/models/admin" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - federation_service "code.gitea.io/gitea/services/federation" + "forgejo.org/models" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + admin_model "forgejo.org/models/admin" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + access_model "forgejo.org/models/perm/access" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + secret_model "forgejo.org/models/secret" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + federation_service "forgejo.org/services/federation" "xorm.io/builder" ) diff --git a/services/repository/files/cherry_pick.go b/services/repository/files/cherry_pick.go index 451a182155..b6d54c4086 100644 --- a/services/repository/files/cherry_pick.go +++ b/services/repository/files/cherry_pick.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/pull" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + "forgejo.org/services/pull" ) // CherryPick cherrypicks or reverts a commit to the given repository diff --git a/services/repository/files/commit.go b/services/repository/files/commit.go index e0dad29273..0c0671429b 100644 --- a/services/repository/files/commit.go +++ b/services/repository/files/commit.go @@ -6,10 +6,10 @@ package files import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/structs" + asymkey_model "forgejo.org/models/asymkey" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/structs" ) // CountDivergingCommits determines how many commits a branch is ahead or behind the repository's base branch diff --git a/services/repository/files/content.go b/services/repository/files/content.go index 32517e8d91..3eb3049f12 100644 --- a/services/repository/files/content.go +++ b/services/repository/files/content.go @@ -10,13 +10,13 @@ import ( "path" "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) // ContentType repo content type diff --git a/services/repository/files/content_test.go b/services/repository/files/content_test.go index f5e2b84690..ca2f861c0b 100644 --- a/services/repository/files/content_test.go +++ b/services/repository/files/content_test.go @@ -6,14 +6,14 @@ package files import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/files/diff.go b/services/repository/files/diff.go index bf8b938e21..354a343d12 100644 --- a/services/repository/files/diff.go +++ b/services/repository/files/diff.go @@ -7,8 +7,8 @@ import ( "context" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/gitdiff" + repo_model "forgejo.org/models/repo" + "forgejo.org/services/gitdiff" ) // GetDiffPreview produces and returns diff result of a file which is not yet committed. diff --git a/services/repository/files/diff_test.go b/services/repository/files/diff_test.go index 95de10e07e..d6265273c7 100644 --- a/services/repository/files/diff_test.go +++ b/services/repository/files/diff_test.go @@ -6,12 +6,12 @@ package files import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/json" + "forgejo.org/services/contexttest" + "forgejo.org/services/gitdiff" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/files/file.go b/services/repository/files/file.go index 7884d880e0..810c60163d 100644 --- a/services/repository/files/file.go +++ b/services/repository/files/file.go @@ -10,11 +10,11 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" ) func GetFilesResponseFromCommit(ctx context.Context, repo *repo_model.Repository, commit *git.Commit, branch string, treeNames []string) (*api.FilesResponse, error) { diff --git a/services/repository/files/patch.go b/services/repository/files/patch.go index e5f7e2af96..5b1dd65b5a 100644 --- a/services/repository/files/patch.go +++ b/services/repository/files/patch.go @@ -8,15 +8,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/structs" + asymkey_service "forgejo.org/services/asymkey" ) // ApplyDiffPatchOptions holds the repository diff patch update options diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index 30d95ba9ab..b3aadbc6cb 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -13,15 +13,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/gitdiff" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + asymkey_service "forgejo.org/services/asymkey" + "forgejo.org/services/gitdiff" ) // TemporaryUploadRepository is a type to wrap our upload repositories as a shallow clone diff --git a/services/repository/files/temp_repo_test.go b/services/repository/files/temp_repo_test.go index e7d85ea3cc..852e762267 100644 --- a/services/repository/files/temp_repo_test.go +++ b/services/repository/files/temp_repo_test.go @@ -6,10 +6,10 @@ package files import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" "github.com/stretchr/testify/require" ) diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go index e3a7f3b8b0..1e575f95e8 100644 --- a/services/repository/files/tree.go +++ b/services/repository/files/tree.go @@ -8,11 +8,11 @@ import ( "fmt" "net/url" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" ) // GetTreeBySHA get the GitTreeResponse of a repository using a sha hash. diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go index 9e5c5c1701..7865fcf2e2 100644 --- a/services/repository/files/tree_test.go +++ b/services/repository/files/tree_test.go @@ -6,9 +6,9 @@ package files import ( "testing" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/contexttest" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/files/update.go b/services/repository/files/update.go index d6025b6ced..5e8834c6de 100644 --- a/services/repository/files/update.go +++ b/services/repository/files/update.go @@ -11,17 +11,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "forgejo.org/models" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + asymkey_service "forgejo.org/services/asymkey" ) // IdentityOptions for a person's identity like an author or committer diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go index 1330116889..6359087e88 100644 --- a/services/repository/files/upload.go +++ b/services/repository/files/upload.go @@ -10,12 +10,12 @@ import ( "path" "strings" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" ) // UploadRepoFileOptions contains the uploaded repository file options diff --git a/services/repository/fork.go b/services/repository/fork.go index 0378f7bae6..9d15b6207d 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -9,17 +9,17 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/structs" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) // ErrForkAlreadyExist represents a "ForkAlreadyExist" kind of error. diff --git a/services/repository/fork_test.go b/services/repository/fork_test.go index 2e1e72aaad..227dd1850e 100644 --- a/services/repository/fork_test.go +++ b/services/repository/fork_test.go @@ -6,11 +6,11 @@ package repository import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/generate.go b/services/repository/generate.go index 4a312a33c3..9aeb057c3d 100644 --- a/services/repository/generate.go +++ b/services/repository/generate.go @@ -16,14 +16,14 @@ import ( "strings" "time" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/util" "github.com/gobwas/glob" "github.com/huandu/xstrings" diff --git a/services/repository/gitgraph/graph.go b/services/repository/gitgraph/graph.go index 4db5598015..bf15baed2a 100644 --- a/services/repository/gitgraph/graph.go +++ b/services/repository/gitgraph/graph.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" ) // GetCommitGraph return a list of commit (GraphItems) from all branches diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index 4e94468205..20107cc646 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -10,13 +10,13 @@ import ( "strings" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" ) // NewGraph creates a basic graph diff --git a/services/repository/gitgraph/graph_test.go b/services/repository/gitgraph/graph_test.go index e7e437e42d..374341b276 100644 --- a/services/repository/gitgraph/graph_test.go +++ b/services/repository/gitgraph/graph_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" + "forgejo.org/modules/git" ) func BenchmarkGetCommitGraph(b *testing.B) { diff --git a/services/repository/hooks.go b/services/repository/hooks.go index 97e9e290a3..d3021414cf 100644 --- a/services/repository/hooks.go +++ b/services/repository/hooks.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/webhook" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" "xorm.io/builder" ) diff --git a/services/repository/init.go b/services/repository/init.go index 817fa4abd7..525b322752 100644 --- a/services/repository/init.go +++ b/services/repository/init.go @@ -9,13 +9,13 @@ import ( "os" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - asymkey_service "code.gitea.io/gitea/services/asymkey" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + asymkey_service "forgejo.org/services/asymkey" ) // initRepoCommit temporarily changes with work directory. diff --git a/services/repository/lfs.go b/services/repository/lfs.go index 4cd1110e55..43acb8ee6c 100644 --- a/services/repository/lfs.go +++ b/services/repository/lfs.go @@ -8,14 +8,14 @@ import ( "fmt" "time" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" ) // GarbageCollectLFSMetaObjectsOptions provides options for GarbageCollectLFSMetaObjects function diff --git a/services/repository/lfs_test.go b/services/repository/lfs_test.go index 838386d845..e38c38e29c 100644 --- a/services/repository/lfs_test.go +++ b/services/repository/lfs_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/main_test.go b/services/repository/main_test.go index 7ad1540aee..942a805638 100644 --- a/services/repository/main_test.go +++ b/services/repository/main_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/repository/migrate.go b/services/repository/migrate.go index c8f65dd63d..80f5d68231 100644 --- a/services/repository/migrate.go +++ b/services/repository/migrate.go @@ -10,18 +10,18 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/lfs" + "forgejo.org/modules/log" + "forgejo.org/modules/migration" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" ) // MigrateRepositoryGitData starts migrating git related data after created migrating repository diff --git a/services/repository/push.go b/services/repository/push.go index 924f365c05..53574a7d93 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -10,23 +10,23 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/queue" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + issue_service "forgejo.org/services/issue" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" ) // pushQueue represents a queue to handle update pull request tests diff --git a/services/repository/repository.go b/services/repository/repository.go index 35bcdfd528..a2620740b1 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -8,21 +8,21 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + "forgejo.org/models/db" + "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + notify_service "forgejo.org/services/notify" + pull_service "forgejo.org/services/pull" ) // WebSearchRepository represents a repository returned by web search diff --git a/services/repository/repository_test.go b/services/repository/repository_test.go index a5c0b3efcd..c08f7151ca 100644 --- a/services/repository/repository_test.go +++ b/services/repository/repository_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/review.go b/services/repository/review.go index 40513e6bc6..c4000a2846 100644 --- a/services/repository/review.go +++ b/services/repository/review.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" ) // GetReviewerTeams get all teams can be requested to review diff --git a/services/repository/review_test.go b/services/repository/review_test.go index eb1712c2ce..5ece99a2e3 100644 --- a/services/repository/review_test.go +++ b/services/repository/review_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/setting.go b/services/repository/setting.go index 33b00cca8c..c127f3129e 100644 --- a/services/repository/setting.go +++ b/services/repository/setting.go @@ -7,12 +7,12 @@ import ( "context" "slices" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - actions_service "code.gitea.io/gitea/services/actions" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/modules/log" + actions_service "forgejo.org/services/actions" ) // UpdateRepositoryUnits updates a repository's units diff --git a/services/repository/star.go b/services/repository/star.go index 505da0f099..8cc2e0a243 100644 --- a/services/repository/star.go +++ b/services/repository/star.go @@ -6,10 +6,10 @@ package repository import ( "context" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/federation" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/services/federation" ) func StarRepoAndSendLikeActivities(ctx context.Context, doer user.User, repoID int64, star bool) error { diff --git a/services/repository/template.go b/services/repository/template.go index 36a680c8e2..3566aa2b7e 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -6,12 +6,12 @@ package repository import ( "context" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + notify_service "forgejo.org/services/notify" ) // GenerateIssueLabels generates issue labels from a template repository diff --git a/services/repository/transfer.go b/services/repository/transfer.go index 467c85ef6f..6026d85ae1 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -9,19 +9,19 @@ import ( "os" "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/sync" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/sync" + "forgejo.org/modules/util" + notify_service "forgejo.org/services/notify" ) // repoWorkingPool represents a working pool to order the parallel changes to the same repository diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index cc51a05781..4bb0fc140c 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -7,17 +7,17 @@ import ( "sync" "testing" - "code.gitea.io/gitea/models" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/feed" - notify_service "code.gitea.io/gitea/services/notify" + "forgejo.org/models" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/util" + "forgejo.org/services/feed" + notify_service "forgejo.org/services/notify" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go index 031c474dd7..2d5aebdbc1 100644 --- a/services/secrets/secrets.go +++ b/services/secrets/secrets.go @@ -6,8 +6,8 @@ package secrets import ( "context" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" + "forgejo.org/models/db" + secret_model "forgejo.org/models/secret" ) func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data string) (*secret_model.Secret, bool, error) { diff --git a/services/secrets/validation.go b/services/secrets/validation.go index 3db5b96452..44250ba87b 100644 --- a/services/secrets/validation.go +++ b/services/secrets/validation.go @@ -6,7 +6,7 @@ package secrets import ( "regexp" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/util" ) // https://docs.github.com/en/actions/security-guides/encrypted-secrets#naming-your-secrets diff --git a/services/shared/automerge/automerge.go b/services/shared/automerge/automerge.go index 8f38cf260a..1dc309f4b3 100644 --- a/services/shared/automerge/automerge.go +++ b/services/shared/automerge/automerge.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" ) // PRAutoMergeQueue represents a queue to handle update pull request tests diff --git a/services/task/migrate.go b/services/task/migrate.go index 9cef77a6c8..a9f76299fd 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -10,20 +10,20 @@ import ( "strings" "time" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/migrations" - notify_service "code.gitea.io/gitea/services/notify" + admin_model "forgejo.org/models/admin" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/migration" + "forgejo.org/modules/process" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + "forgejo.org/services/migrations" + notify_service "forgejo.org/services/notify" ) func handleCreateError(owner *user_model.User, err error) error { diff --git a/services/task/task.go b/services/task/task.go index ac659ac3e5..3181fc79d7 100644 --- a/services/task/task.go +++ b/services/task/task.go @@ -7,21 +7,21 @@ import ( "context" "fmt" - admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + admin_model "forgejo.org/models/admin" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + base "forgejo.org/modules/migration" + "forgejo.org/modules/queue" + "forgejo.org/modules/secret" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" + repo_service "forgejo.org/services/repository" ) // taskQueue is a global queue of tasks diff --git a/services/uinotification/notify.go b/services/uinotification/notify.go index be5f7019a2..25048e7b53 100644 --- a/services/uinotification/notify.go +++ b/services/uinotification/notify.go @@ -6,16 +6,16 @@ package uinotification import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "forgejo.org/models/activities" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/container" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/queue" + notify_service "forgejo.org/services/notify" ) type ( diff --git a/services/user/avatar.go b/services/user/avatar.go index 3f87466eaa..79dfc76503 100644 --- a/services/user/avatar.go +++ b/services/user/avatar.go @@ -10,11 +10,11 @@ import ( "io" "os" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/avatar" + "forgejo.org/modules/log" + "forgejo.org/modules/storage" ) // UploadAvatar saves custom avatar for user. diff --git a/services/user/avatar_test.go b/services/user/avatar_test.go index 21fca8dd09..b208efeb6f 100644 --- a/services/user/avatar_test.go +++ b/services/user/avatar_test.go @@ -10,11 +10,11 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/user/block.go b/services/user/block.go index 0b31119dfb..6be8dc5f70 100644 --- a/services/user/block.go +++ b/services/user/block.go @@ -5,10 +5,10 @@ package user import ( "context" - model "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + model "forgejo.org/models" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" "xorm.io/builder" ) diff --git a/services/user/block_test.go b/services/user/block_test.go index 13959e56b4..a2ba5d71a7 100644 --- a/services/user/block_test.go +++ b/services/user/block_test.go @@ -6,12 +6,12 @@ package user import ( "testing" - model "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + model "forgejo.org/models" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/user/delete.go b/services/user/delete.go index 587e3c2a8f..9ce917cd27 100644 --- a/services/user/delete.go +++ b/services/user/delete.go @@ -10,20 +10,20 @@ import ( _ "image/jpeg" // Needed for jpeg support - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - issue_service "code.gitea.io/gitea/services/issue" + actions_model "forgejo.org/models/actions" + activities_model "forgejo.org/models/activities" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + issue_service "forgejo.org/services/issue" "xorm.io/builder" ) diff --git a/services/user/email.go b/services/user/email.go index 31404aadaa..f49efde1be 100644 --- a/services/user/email.go +++ b/services/user/email.go @@ -8,12 +8,12 @@ import ( "errors" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/modules/validation" + "forgejo.org/services/mailer" ) // AdminAddOrSetPrimaryEmailAddress is used by admins to add or set a user's primary email address diff --git a/services/user/email_test.go b/services/user/email_test.go index 86f31a8984..b48936a27e 100644 --- a/services/user/email_test.go +++ b/services/user/email_test.go @@ -6,11 +6,11 @@ package user import ( "testing" - "code.gitea.io/gitea/models/db" - organization_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/db" + organization_model "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/services/user/update.go b/services/user/update.go index 62c30ac05f..65d3992751 100644 --- a/services/user/update.go +++ b/services/user/update.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - password_module "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/mailer" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + user_model "forgejo.org/models/user" + password_module "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/mailer" ) type UpdateOptions struct { diff --git a/services/user/update_test.go b/services/user/update_test.go index 11379d4508..f1754b2db9 100644 --- a/services/user/update_test.go +++ b/services/user/update_test.go @@ -6,12 +6,12 @@ package user import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - password_module "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + password_module "forgejo.org/modules/auth/password" + "forgejo.org/modules/optional" + "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/user/user.go b/services/user/user.go index 62fe44ca27..d90fbac978 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -11,24 +11,24 @@ import ( "strings" "time" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/agit" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + user_model "forgejo.org/models/user" + "forgejo.org/modules/eventsource" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/util" + "forgejo.org/services/agit" + org_service "forgejo.org/services/org" + "forgejo.org/services/packages" + container_service "forgejo.org/services/packages/container" + repo_service "forgejo.org/services/repository" ) // RenameUser renames a user diff --git a/services/user/user_test.go b/services/user/user_test.go index 058ff7b6ed..ebcdb17710 100644 --- a/services/user/user_test.go +++ b/services/user/user_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "forgejo.org/models" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/default.go b/services/webhook/default.go index 089ff8bae3..30717a7352 100644 --- a/services/webhook/default.go +++ b/services/webhook/default.go @@ -11,14 +11,14 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/svg" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/svg" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) var _ Handler = defaultHandler{} diff --git a/services/webhook/default_test.go b/services/webhook/default_test.go index 7056e77b47..f946870d57 100644 --- a/services/webhook/default_test.go +++ b/services/webhook/default_test.go @@ -6,9 +6,9 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + webhook_module "forgejo.org/modules/webhook" jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/assert" diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go index 25668143e6..0c7c039f10 100644 --- a/services/webhook/deliver.go +++ b/services/webhook/deliver.go @@ -14,16 +14,16 @@ import ( "sync" "time" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/graceful" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/log" + "forgejo.org/modules/process" + "forgejo.org/modules/proxy" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + webhook_module "forgejo.org/modules/webhook" "github.com/gobwas/glob" ) diff --git a/services/webhook/deliver_test.go b/services/webhook/deliver_test.go index c6d1cb60dc..4dd898e60a 100644 --- a/services/webhook/deliver_test.go +++ b/services/webhook/deliver_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/dingtalk.go b/services/webhook/dingtalk.go index 899c5b2d9f..9d5c7e573f 100644 --- a/services/webhook/dingtalk.go +++ b/services/webhook/dingtalk.go @@ -11,13 +11,13 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type dingtalkHandler struct{} diff --git a/services/webhook/dingtalk_test.go b/services/webhook/dingtalk_test.go index 762d29dddc..5d2a240660 100644 --- a/services/webhook/dingtalk_test.go +++ b/services/webhook/dingtalk_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/discord.go b/services/webhook/discord.go index cd25175ea1..3970a2552d 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -15,17 +15,17 @@ import ( "strings" "unicode/utf8" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" "code.forgejo.org/go-chi/binding" ) diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go index e0bb2225f7..ce3aaa10cf 100644 --- a/services/webhook/discord_test.go +++ b/services/webhook/discord_test.go @@ -6,11 +6,11 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/feishu.go b/services/webhook/feishu.go index f77c3bbd65..01b3d07983 100644 --- a/services/webhook/feishu.go +++ b/services/webhook/feishu.go @@ -10,12 +10,12 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type feishuHandler struct{} diff --git a/services/webhook/feishu_test.go b/services/webhook/feishu_test.go index 614e0f1ef4..7cf24b84ed 100644 --- a/services/webhook/feishu_test.go +++ b/services/webhook/feishu_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/general.go b/services/webhook/general.go index ef68f2885b..40a2467177 100644 --- a/services/webhook/general.go +++ b/services/webhook/general.go @@ -9,11 +9,11 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" ) type linkFormatter = func(string, string) string diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go index 8412293708..b321fb3f8c 100644 --- a/services/webhook/general_test.go +++ b/services/webhook/general_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - api "code.gitea.io/gitea/modules/structs" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/webhook/gogs.go b/services/webhook/gogs.go index 7dbf64343f..bbab1ad41d 100644 --- a/services/webhook/gogs.go +++ b/services/webhook/gogs.go @@ -7,10 +7,10 @@ import ( "html/template" "net/http" - webhook_model "code.gitea.io/gitea/models/webhook" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type gogsHandler struct{ defaultHandler } diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 6147aac499..97957291ca 100644 --- a/services/webhook/main_test.go +++ b/services/webhook/main_test.go @@ -6,13 +6,13 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/models/unittest" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/forgefed" + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go index 4b33bfb1d3..f1cc9384d3 100644 --- a/services/webhook/matrix.go +++ b/services/webhook/matrix.go @@ -16,16 +16,16 @@ import ( "regexp" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/modules/svg" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type matrixHandler struct{} diff --git a/services/webhook/matrix_test.go b/services/webhook/matrix_test.go index 46e0041a34..1644def0e1 100644 --- a/services/webhook/matrix_test.go +++ b/services/webhook/matrix_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index 736d084a8c..1ed03afd26 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -11,13 +11,13 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type msteamsHandler struct{} diff --git a/services/webhook/msteams_test.go b/services/webhook/msteams_test.go index d9a9724e5b..b210f299bc 100644 --- a/services/webhook/msteams_test.go +++ b/services/webhook/msteams_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index ddd7002890..e9fd52c940 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -6,20 +6,20 @@ package webhook import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "forgejo.org/models/issues" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/perm" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" + notify_service "forgejo.org/services/notify" ) func init() { diff --git a/services/webhook/notifier_test.go b/services/webhook/notifier_test.go index 36ec3b8bf1..6b1f170287 100644 --- a/services/webhook/notifier_test.go +++ b/services/webhook/notifier_test.go @@ -7,17 +7,17 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/packagist.go b/services/webhook/packagist.go index 9831a4e008..7ae3e0c48f 100644 --- a/services/webhook/packagist.go +++ b/services/webhook/packagist.go @@ -10,12 +10,12 @@ import ( "net/http" "net/url" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type packagistHandler struct{} diff --git a/services/webhook/packagist_test.go b/services/webhook/packagist_test.go index 0f696f1b99..e5bf4ec8d1 100644 --- a/services/webhook/packagist_test.go +++ b/services/webhook/packagist_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/shared/img.go b/services/webhook/shared/img.go index 2d65ba4e0f..95286c563e 100644 --- a/services/webhook/shared/img.go +++ b/services/webhook/shared/img.go @@ -5,7 +5,7 @@ import ( "html/template" "strconv" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func ImgIcon(name string, size int) template.HTML { diff --git a/services/webhook/shared/payloader.go b/services/webhook/shared/payloader.go index cf0bfa82cb..0a6535eddb 100644 --- a/services/webhook/shared/payloader.go +++ b/services/webhook/shared/payloader.go @@ -14,10 +14,10 @@ import ( "io" "net/http" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" ) var ErrPayloadTypeNotSupported = errors.New("unsupported webhook event") diff --git a/services/webhook/slack.go b/services/webhook/slack.go index 5ef3e4e06f..e854f89c6c 100644 --- a/services/webhook/slack.go +++ b/services/webhook/slack.go @@ -11,15 +11,15 @@ import ( "regexp" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" "code.forgejo.org/go-chi/binding" ) diff --git a/services/webhook/slack_test.go b/services/webhook/slack_test.go index ecc11d541f..62090fd310 100644 --- a/services/webhook/slack_test.go +++ b/services/webhook/slack_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/sourcehut/builds.go b/services/webhook/sourcehut/builds.go index 346ccd3c0b..bd3eeebc6c 100644 --- a/services/webhook/sourcehut/builds.go +++ b/services/webhook/sourcehut/builds.go @@ -13,17 +13,17 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" "code.forgejo.org/go-chi/binding" "gopkg.in/yaml.v3" diff --git a/services/webhook/sourcehut/builds_test.go b/services/webhook/sourcehut/builds_test.go index 689c369a7f..ac4172f5ff 100644 --- a/services/webhook/sourcehut/builds_test.go +++ b/services/webhook/sourcehut/builds_test.go @@ -7,14 +7,14 @@ import ( "strings" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/webhook/shared" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/telegram.go b/services/webhook/telegram.go index a02a7691e9..d0abd667f4 100644 --- a/services/webhook/telegram.go +++ b/services/webhook/telegram.go @@ -11,15 +11,15 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/markup" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type telegramHandler struct{} diff --git a/services/webhook/telegram_test.go b/services/webhook/telegram_test.go index 85a62f7615..5066e55b8c 100644 --- a/services/webhook/telegram_test.go +++ b/services/webhook/telegram_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/webhook.go b/services/webhook/webhook.go index 1366ea8e8f..989b535564 100644 --- a/services/webhook/webhook.go +++ b/services/webhook/webhook.go @@ -11,21 +11,21 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/sourcehut" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/sourcehut" "github.com/gobwas/glob" ) diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index 2ebbbe4a51..c9af09d3e9 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -7,15 +7,15 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/convert" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go index 87f8bb8b18..323d23aba7 100644 --- a/services/webhook/wechatwork.go +++ b/services/webhook/wechatwork.go @@ -10,12 +10,12 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/webhook/shared" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/forms" + "forgejo.org/services/webhook/shared" ) type wechatworkHandler struct{} diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 63196aa862..cf1477e72c 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -11,17 +11,17 @@ import ( "os" "strings" - repo_model "code.gitea.io/gitea/models/repo" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/sync" - asymkey_service "code.gitea.io/gitea/services/asymkey" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "forgejo.org/models/repo" + system_model "forgejo.org/models/system" + "forgejo.org/models/unit" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/sync" + asymkey_service "forgejo.org/services/asymkey" + repo_service "forgejo.org/services/repository" ) // TODO: use clustered lock (unique queue? or *abuse* cache) diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 74c7064043..ca312388af 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -8,11 +8,11 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/services/convert" ) // To define the wiki related concepts: diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index efcc13db99..d76104dfc7 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" - _ "code.gitea.io/gitea/models/actions" + _ "forgejo.org/models/actions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index cc95fc488d..231386e3aa 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -20595,7 +20595,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "APIForbiddenError": { "type": "object", @@ -20609,7 +20609,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIInternalServerError": { "type": "object", @@ -20623,7 +20623,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIInvalidTopicsError": { "type": "object", @@ -20640,7 +20640,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APINotFound": { "type": "object", @@ -20661,7 +20661,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIRepoArchivedError": { "type": "object", @@ -20675,7 +20675,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIUnauthorizedError": { "type": "object", @@ -20689,7 +20689,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "APIValidationError": { "type": "object", @@ -20703,7 +20703,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/services/context" + "x-go-package": "forgejo.org/services/context" }, "AccessToken": { "type": "object", @@ -20734,7 +20734,7 @@ "x-go-name": "TokenLastEight" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionRunJob": { "description": "ActionRunJob represents a job of a run", @@ -20791,7 +20791,7 @@ "x-go-name": "TaskID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionTask": { "description": "ActionTask represents a ActionTask", @@ -20855,7 +20855,7 @@ "x-go-name": "WorkflowID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionTaskResponse": { "description": "ActionTaskResponse returns a ActionTask", @@ -20874,7 +20874,7 @@ "x-go-name": "Entries" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActionVariable": { "description": "ActionVariable return value of the query API", @@ -20903,7 +20903,7 @@ "x-go-name": "RepoID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Activity": { "type": "object", @@ -20994,7 +20994,7 @@ "x-go-name": "UserID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ActivityPub": { "description": "ActivityPub type", @@ -21005,7 +21005,7 @@ "x-go-name": "Context" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AddCollaboratorOption": { "description": "AddCollaboratorOption options when adding a user as a collaborator of a repository", @@ -21021,7 +21021,7 @@ "x-go-name": "Permission" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AddTimeOption": { "description": "AddTimeOption options for adding time to an issue", @@ -21047,7 +21047,7 @@ "x-go-name": "User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AnnotatedTag": { "description": "AnnotatedTag represents an annotated tag", @@ -21082,7 +21082,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "AnnotatedTagObject": { "description": "AnnotatedTagObject contains meta information of the tag object", @@ -21101,7 +21101,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Attachment": { "description": "Attachment a generic attachment", @@ -21148,7 +21148,7 @@ "x-go-name": "UUID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "BlockedUser": { "type": "object", @@ -21165,7 +21165,7 @@ "x-go-name": "Created" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Branch": { "description": "Branch represents a repository branch", @@ -21211,7 +21211,7 @@ "x-go-name": "UserCanPush" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "BranchProtection": { "description": "BranchProtection represents a branch protection for a repository", @@ -21351,7 +21351,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ChangeFileOperation": { "description": "ChangeFileOperation for creating, updating or deleting a file", @@ -21392,7 +21392,7 @@ "x-go-name": "SHA" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ChangeFilesOptions": { "description": "ChangeFilesOptions options for creating, updating or deleting multiple files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -21439,7 +21439,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ChangedFile": { "description": "ChangedFile store information about files affected by the pull request", @@ -21485,7 +21485,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CombinedStatus": { "description": "CombinedStatus holds the combined state of several statuses for a single commit", @@ -21522,7 +21522,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Comment": { "description": "Comment represents a comment on a commit or issue", @@ -21579,7 +21579,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Commit": { "type": "object", @@ -21629,7 +21629,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitAffectedFiles": { "description": "CommitAffectedFiles store information about files affected by the commit", @@ -21644,7 +21644,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitDateOptions": { "description": "CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE", @@ -21661,7 +21661,7 @@ "x-go-name": "Committer" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitMeta": { "type": "object", @@ -21681,7 +21681,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitStats": { "description": "CommitStats is statistics for a RepoCommit", @@ -21703,7 +21703,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitStatus": { "description": "CommitStatus holds a single status of a single Commit", @@ -21747,12 +21747,12 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitStatusState": { "description": "CommitStatusState holds the state of a CommitStatus\nIt can be \"pending\", \"success\", \"error\" and \"failure\"", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CommitUser": { "type": "object", @@ -21772,7 +21772,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Compare": { "type": "object", @@ -21798,7 +21798,7 @@ "x-go-name": "TotalCommits" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ContentsResponse": { "description": "ContentsResponse contains information about a repo's entry's (dir, file, symlink, submodule) metadata and content", @@ -21870,7 +21870,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateAccessTokenOption": { "description": "CreateAccessTokenOption options when create access token", @@ -21891,7 +21891,7 @@ "x-go-name": "Scopes" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateBranchProtectionOption": { "description": "CreateBranchProtectionOption options for creating a branch protection", @@ -22021,7 +22021,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateBranchRepoOption": { "description": "CreateBranchRepoOption options when creating a branch in a repository", @@ -22049,7 +22049,7 @@ "x-go-name": "OldRefName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateEmailOption": { "description": "CreateEmailOption options when creating email addresses", @@ -22064,7 +22064,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateFileOptions": { "description": "CreateFileOptions options for creating files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -22108,7 +22108,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateForkOption": { "description": "CreateForkOption options for creating a fork", @@ -22125,7 +22125,7 @@ "x-go-name": "Organization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateGPGKeyOption": { "description": "CreateGPGKeyOption options create user GPG key", @@ -22145,7 +22145,7 @@ "x-go-name": "Signature" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateHookOption": { "description": "CreateHookOption options when create a hook", @@ -22196,7 +22196,7 @@ "x-go-name": "Type" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateHookOptionConfig": { "description": "CreateHookOptionConfig has all config options in it\nrequired are \"content_type\" and \"url\" Required", @@ -22204,7 +22204,7 @@ "additionalProperties": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateIssueCommentOption": { "description": "CreateIssueCommentOption options for creating a comment on an issue", @@ -22223,7 +22223,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateIssueOption": { "description": "CreateIssueOption options to create one issue", @@ -22281,7 +22281,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateKeyOption": { "description": "CreateKeyOption options when creating a key", @@ -22309,7 +22309,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateLabelOption": { "description": "CreateLabelOption options for creating a label", @@ -22343,7 +22343,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateMilestoneOption": { "description": "CreateMilestoneOption options for creating a milestone", @@ -22371,7 +22371,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateOAuth2ApplicationOptions": { "description": "CreateOAuth2ApplicationOptions holds options to create an oauth2 application", @@ -22393,7 +22393,7 @@ "x-go-name": "RedirectURIs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateOrUpdateSecretOption": { "description": "CreateOrUpdateSecretOption options when creating or updating secret", @@ -22408,7 +22408,7 @@ "x-go-name": "Data" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateOrgOption": { "description": "CreateOrgOption options for creating an organization", @@ -22456,7 +22456,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePullRequestOption": { "description": "CreatePullRequestOption options when creating a pull request", @@ -22508,7 +22508,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePullReviewComment": { "description": "CreatePullReviewComment represent a review comment for creation api", @@ -22536,7 +22536,7 @@ "x-go-name": "Path" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePullReviewCommentOptions": { "$ref": "#/definitions/CreatePullReviewComment" @@ -22564,7 +22564,7 @@ "$ref": "#/definitions/ReviewStateType" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreatePushMirrorOption": { "type": "object", @@ -22595,7 +22595,7 @@ "x-go-name": "UseSSH" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateQuotaGroupOptions": { "description": "CreateQutaGroupOptions represents the options for creating a quota group", @@ -22615,7 +22615,7 @@ "x-go-name": "Rules" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateQuotaRuleOptions": { "description": "CreateQuotaRuleOptions represents the options for creating a quota rule", @@ -22641,7 +22641,7 @@ "x-go-name": "Subjects" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateReleaseOption": { "description": "CreateReleaseOption options when creating a release", @@ -22679,7 +22679,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateRepoOption": { "description": "CreateRepoOption options when creating repository", @@ -22760,7 +22760,7 @@ "x-go-name": "TrustModel" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateStatusOption": { "description": "CreateStatusOption holds the information needed to create a new CommitStatus for a Commit", @@ -22782,7 +22782,7 @@ "x-go-name": "TargetURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateTagOption": { "description": "CreateTagOption options when creating a tag", @@ -22804,7 +22804,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateTagProtectionOption": { "description": "CreateTagProtectionOption options for creating a tag protection", @@ -22829,7 +22829,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateTeamOption": { "description": "CreateTeamOption options for creating a team", @@ -22891,7 +22891,7 @@ "example": "{\"repo.actions\",\"repo.packages\",\"repo.code\":\"read\",\"repo.issues\":\"write\",\"repo.ext_issues\":\"none\",\"repo.wiki\":\"admin\",\"repo.pulls\":\"owner\",\"repo.releases\":\"none\",\"repo.projects\":\"none\",\"repo.ext_wiki\":\"none\"}" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateUserOption": { "description": "CreateUserOption create user options", @@ -22950,7 +22950,7 @@ "x-go-name": "Visibility" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateVariableOption": { "description": "CreateVariableOption the option when creating variable", @@ -22965,7 +22965,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "CreateWikiPageOptions": { "description": "CreateWikiPageOptions form for creating wiki", @@ -22987,7 +22987,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Cron": { "description": "Cron represents a Cron task", @@ -23017,7 +23017,7 @@ "x-go-name": "Schedule" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeleteEmailOption": { "description": "DeleteEmailOption options when deleting email addresses", @@ -23032,7 +23032,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeleteFileOptions": { "description": "DeleteFileOptions options for deleting files (used for other File structs below)\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -23076,7 +23076,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeleteLabelsOption": { "description": "DeleteLabelOption options for deleting a label", @@ -23088,7 +23088,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DeployKey": { "description": "DeployKey a deploy key", @@ -23133,7 +23133,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DismissPullReviewOptions": { "description": "DismissPullReviewOptions are options to dismiss a pull review", @@ -23148,7 +23148,7 @@ "x-go-name": "Priors" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DispatchWorkflowOption": { "description": "DispatchWorkflowOption options when dispatching a workflow", @@ -23177,7 +23177,7 @@ "x-go-name": "ReturnRunInfo" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "DispatchWorkflowRun": { "description": "DispatchWorkflowRun represents a workflow run", @@ -23204,7 +23204,7 @@ "x-go-name": "RunNumber" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditAttachmentOptions": { "description": "EditAttachmentOptions options for editing attachments", @@ -23220,7 +23220,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditBranchProtectionOption": { "description": "EditBranchProtectionOption options for editing a branch protection", @@ -23341,7 +23341,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditDeadlineOption": { "description": "EditDeadlineOption options for creating a deadline", @@ -23356,7 +23356,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditGitHookOption": { "description": "EditGitHookOption options when modifying one Git hook", @@ -23367,7 +23367,7 @@ "x-go-name": "Content" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditHookOption": { "description": "EditHookOption options when modify one hook", @@ -23400,7 +23400,7 @@ "x-go-name": "Events" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditIssueCommentOption": { "description": "EditIssueCommentOption options for editing a comment", @@ -23419,7 +23419,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditIssueOption": { "description": "EditIssueOption options for editing an issue", @@ -23473,7 +23473,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditLabelOption": { "description": "EditLabelOption options for editing a label", @@ -23503,7 +23503,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditMilestoneOption": { "description": "EditMilestoneOption options for editing a milestone", @@ -23527,7 +23527,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditOrgOption": { "description": "EditOrgOption options for editing an organization", @@ -23568,7 +23568,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditPullRequestOption": { "description": "EditPullRequestOption options when modify pull request", @@ -23628,7 +23628,7 @@ "x-go-name": "RemoveDeadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditQuotaRuleOptions": { "description": "EditQuotaRuleOptions represents the options for editing a quota rule", @@ -23649,7 +23649,7 @@ "x-go-name": "Subjects" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditReactionOption": { "description": "EditReactionOption contain the reaction type", @@ -23660,7 +23660,7 @@ "x-go-name": "Reaction" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditReleaseOption": { "description": "EditReleaseOption options when editing a release", @@ -23695,7 +23695,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditRepoOption": { "description": "EditRepoOption options when editing a repository's properties", @@ -23867,7 +23867,7 @@ "x-go-name": "WikiBranch" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditTagProtectionOption": { "description": "EditTagProtectionOption options for editing a tag protection", @@ -23892,7 +23892,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditTeamOption": { "description": "EditTeamOption options for editing a team", @@ -23961,7 +23961,7 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "EditUserOption": { "description": "EditUserOption edit user options", @@ -24047,7 +24047,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Email": { "description": "Email an email address belonging to a user", @@ -24076,7 +24076,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ExternalTracker": { "description": "ExternalTracker represents settings for external tracker", @@ -24103,7 +24103,7 @@ "x-go-name": "ExternalTrackerURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ExternalWiki": { "description": "ExternalWiki represents setting for external wiki", @@ -24115,7 +24115,7 @@ "x-go-name": "ExternalWikiURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileCommitResponse": { "type": "object", @@ -24159,7 +24159,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileDeleteResponse": { "description": "FileDeleteResponse contains information about a repo's file that was deleted", @@ -24175,7 +24175,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileLinksResponse": { "description": "FileLinksResponse contains the links for a repo's file", @@ -24194,7 +24194,7 @@ "x-go-name": "Self" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FileResponse": { "description": "FileResponse contains information about a repo's file", @@ -24210,7 +24210,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "FilesResponse": { "description": "FilesResponse contains information about multiple files from a repo", @@ -24230,12 +24230,12 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ForgeLike": { "description": "ForgeLike activity data type", "type": "object", - "x-go-package": "code.gitea.io/gitea/modules/forgefed" + "x-go-package": "forgejo.org/modules/forgefed" }, "GPGKey": { "description": "GPGKey a user GPG key to sign commit and tag in repository", @@ -24303,7 +24303,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GPGKeyEmail": { "description": "GPGKeyEmail an email attached to a GPGKey", @@ -24318,7 +24318,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralAPISettings": { "description": "GeneralAPISettings contains global api settings exposed by it", @@ -24345,7 +24345,7 @@ "x-go-name": "MaxResponseItems" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralAttachmentSettings": { "description": "GeneralAttachmentSettings contains global Attachment settings exposed by API", @@ -24370,7 +24370,7 @@ "x-go-name": "MaxSize" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralRepoSettings": { "description": "GeneralRepoSettings contains global repository settings exposed by API", @@ -24405,7 +24405,7 @@ "x-go-name": "TimeTrackingDisabled" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GeneralUISettings": { "description": "GeneralUISettings contains global ui settings exposed by API", @@ -24430,7 +24430,7 @@ "x-go-name": "DefaultTheme" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GenerateRepoOption": { "description": "GenerateRepoOption options when creating repository using a template", @@ -24502,7 +24502,7 @@ "x-go-name": "Webhooks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitBlobResponse": { "description": "GitBlobResponse represents a git blob", @@ -24530,7 +24530,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitEntry": { "description": "GitEntry represents a git tree", @@ -24562,7 +24562,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitHook": { "description": "GitHook represents a Git repository hook", @@ -24581,7 +24581,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitObject": { "type": "object", @@ -24600,7 +24600,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitTreeResponse": { "description": "GitTreeResponse returns a git tree", @@ -24636,7 +24636,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "GitignoreTemplateInfo": { "description": "GitignoreTemplateInfo name and text of a gitignore template", @@ -24651,7 +24651,7 @@ "x-go-name": "Source" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Hook": { "description": "Hook a hook is a web hook when one repository changed", @@ -24715,7 +24715,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Identity": { "description": "Identity for a person's identity like an author or committer", @@ -24731,7 +24731,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "InternalTracker": { "description": "InternalTracker represents settings for internal tracker", @@ -24753,7 +24753,7 @@ "x-go-name": "EnableTimeTracker" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Issue": { "description": "Issue represents an issue in a repository", @@ -24872,7 +24872,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueConfig": { "type": "object", @@ -24889,7 +24889,7 @@ "x-go-name": "ContactLinks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueConfigContactLink": { "type": "object", @@ -24907,7 +24907,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueConfigValidation": { "type": "object", @@ -24921,7 +24921,7 @@ "x-go-name": "Valid" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueDeadline": { "description": "IssueDeadline represents an issue deadline", @@ -24933,7 +24933,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueFormField": { "description": "IssueFormField represents a form field", @@ -24964,17 +24964,17 @@ "x-go-name": "Visible" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueFormFieldType": { "type": "string", "title": "IssueFormFieldType defines issue form field type, can be \"markdown\", \"textarea\", \"input\", \"dropdown\" or \"checkboxes\"", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueFormFieldVisible": { "description": "IssueFormFieldVisible defines issue form field visible", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueLabelsOption": { "description": "IssueLabelsOption a collection of labels", @@ -24992,7 +24992,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueMeta": { "description": "IssueMeta basic issue information", @@ -25012,7 +25012,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueTemplate": { "description": "IssueTemplate represents an issue template for a repository", @@ -25053,14 +25053,14 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "IssueTemplateLabels": { "type": "array", "items": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Label": { "description": "Label a label to an issue or a pr", @@ -25099,7 +25099,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "LabelTemplate": { "description": "LabelTemplate info of a Label template", @@ -25124,7 +25124,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "LicenseTemplateInfo": { "description": "LicensesInfo contains information about a License", @@ -25151,7 +25151,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "LicensesTemplateListEntry": { "description": "LicensesListEntry is used for the API", @@ -25170,7 +25170,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "MarkdownOption": { "description": "MarkdownOption markdown options", @@ -25193,7 +25193,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "MarkupOption": { "description": "MarkupOption markup options", @@ -25224,7 +25224,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "MergePullRequestOption": { "description": "MergePullRequestForm form for merging Pull Request", @@ -25271,7 +25271,7 @@ } }, "x-go-name": "MergePullRequestForm", - "x-go-package": "code.gitea.io/gitea/services/forms" + "x-go-package": "forgejo.org/services/forms" }, "MigrateRepoOptions": { "description": "MigrateRepoOptions options for migrating repository's\nthis is used to interact with api v1", @@ -25375,7 +25375,7 @@ "x-go-name": "Wiki" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Milestone": { "description": "Milestone milestone is a collection of issues on one repository", @@ -25428,7 +25428,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NewIssuePinsAllowed": { "description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed", @@ -25443,7 +25443,7 @@ "x-go-name": "PullRequests" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfo": { "description": "NodeInfo contains standardized way of exposing metadata about a server running one of the distributed social networks", @@ -25478,7 +25478,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoServices": { "description": "NodeInfoServices contains the third party sites this server can connect to via their application API", @@ -25499,7 +25499,7 @@ "x-go-name": "Outbound" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoSoftware": { "description": "NodeInfoSoftware contains Metadata about server software in use", @@ -25522,7 +25522,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoUsage": { "description": "NodeInfoUsage contains usage statistics for this server", @@ -25542,7 +25542,7 @@ "$ref": "#/definitions/NodeInfoUsageUsers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NodeInfoUsageUsers": { "description": "NodeInfoUsageUsers contains statistics about the users of this server", @@ -25564,7 +25564,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Note": { "description": "Note contains information related to a git note", @@ -25578,7 +25578,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NoteOptions": { "type": "object", @@ -25588,7 +25588,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotificationCount": { "description": "NotificationCount number of unread notifications", @@ -25600,7 +25600,7 @@ "x-go-name": "New" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotificationSubject": { "description": "NotificationSubject contains the notification subject (Issue/Pull/Commit)", @@ -25633,7 +25633,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotificationThread": { "description": "NotificationThread expose Notification on API", @@ -25668,12 +25668,12 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "NotifySubjectType": { "description": "NotifySubjectType represent type of notification subject", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "OAuth2Application": { "type": "object", @@ -25713,7 +25713,7 @@ "x-go-name": "RedirectURIs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Organization": { "description": "Organization represents an organization", @@ -25766,7 +25766,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "OrganizationPermissions": { "description": "OrganizationPermissions list different users permissions on an organization", @@ -25793,7 +25793,7 @@ "x-go-name": "IsOwner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PRBranchInfo": { "description": "PRBranchInfo information about a branch", @@ -25820,7 +25820,7 @@ "x-go-name": "Sha" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Package": { "description": "Package represents a package", @@ -25862,7 +25862,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PackageFile": { "description": "PackageFile represents a package file", @@ -25898,7 +25898,7 @@ "x-go-name": "HashSHA512" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PayloadCommit": { "description": "PayloadCommit represents a commit", @@ -25953,7 +25953,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PayloadCommitVerification": { "description": "PayloadCommitVerification represents the GPG verification of a commit", @@ -25979,7 +25979,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PayloadUser": { "description": "PayloadUser represents the author or committer of a commit", @@ -26000,7 +26000,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Permission": { "description": "Permission represents a set of permissions", @@ -26019,7 +26019,7 @@ "x-go-name": "Push" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PublicKey": { "description": "PublicKey publickey is a user key to push code to repository", @@ -26063,7 +26063,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullRequest": { "description": "PullRequest represents a pull request", @@ -26237,7 +26237,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullRequestMeta": { "description": "PullRequestMeta PR info if an issue is a PR", @@ -26261,7 +26261,7 @@ "x-go-name": "Merged" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullReview": { "description": "PullReview represents a pull request review", @@ -26325,7 +26325,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullReviewComment": { "description": "PullReviewComment represents a comment on a pull request review", @@ -26396,7 +26396,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PullReviewRequestOptions": { "description": "PullReviewRequestOptions are options to add or remove pull review requests", @@ -26417,7 +26417,7 @@ "x-go-name": "TeamReviewers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "PushMirror": { "description": "PushMirror represents information of a push mirror", @@ -26462,7 +26462,7 @@ "x-go-name": "SyncOnCommit" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaGroup": { "description": "QuotaGroup represents a quota group", @@ -26482,7 +26482,7 @@ "x-go-name": "Rules" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaGroupList": { "description": "QuotaGroupList represents a list of quota groups", @@ -26490,7 +26490,7 @@ "items": { "$ref": "#/definitions/QuotaGroup" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaInfo": { "description": "QuotaInfo represents information about a user's quota", @@ -26503,7 +26503,7 @@ "$ref": "#/definitions/QuotaUsed" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaRuleInfo": { "description": "QuotaRuleInfo contains information about a quota rule", @@ -26529,7 +26529,7 @@ "x-go-name": "Subjects" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsed": { "description": "QuotaUsed represents the quota usage of a user", @@ -26539,7 +26539,7 @@ "$ref": "#/definitions/QuotaUsedSize" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedArtifact": { "description": "QuotaUsedArtifact represents an artifact counting towards a user's quota", @@ -26562,7 +26562,7 @@ "x-go-name": "Size" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedArtifactList": { "description": "QuotaUsedArtifactList represents a list of artifacts counting towards a user's quota", @@ -26570,7 +26570,7 @@ "items": { "$ref": "#/definitions/QuotaUsedArtifact" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedAttachment": { "description": "QuotaUsedAttachment represents an attachment counting towards a user's quota", @@ -26610,7 +26610,7 @@ "x-go-name": "Size" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedAttachmentList": { "description": "QuotaUsedAttachmentList represents a list of attachment counting towards a user's quota", @@ -26618,7 +26618,7 @@ "items": { "$ref": "#/definitions/QuotaUsedAttachment" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedPackage": { "description": "QuotaUsedPackage represents a package counting towards a user's quota", @@ -26651,7 +26651,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedPackageList": { "description": "QuotaUsedPackageList represents a list of packages counting towards a user's quota", @@ -26659,7 +26659,7 @@ "items": { "$ref": "#/definitions/QuotaUsedPackage" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSize": { "description": "QuotaUsedSize represents the size-based quota usage of a user", @@ -26675,7 +26675,7 @@ "$ref": "#/definitions/QuotaUsedSizeRepos" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeAssets": { "description": "QuotaUsedSizeAssets represents the size-based asset usage of a user", @@ -26694,7 +26694,7 @@ "$ref": "#/definitions/QuotaUsedSizeAssetsPackages" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeAssetsAttachments": { "description": "QuotaUsedSizeAssetsAttachments represents the size-based attachment quota usage of a user", @@ -26713,7 +26713,7 @@ "x-go-name": "Releases" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeAssetsPackages": { "description": "QuotaUsedSizeAssetsPackages represents the size-based package quota usage of a user", @@ -26726,7 +26726,7 @@ "x-go-name": "All" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeGit": { "description": "QuotaUsedSizeGit represents the size-based git (lfs) quota usage of a user", @@ -26738,7 +26738,7 @@ "format": "int64" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "QuotaUsedSizeRepos": { "description": "QuotaUsedSizeRepos represents the size-based repository quota usage of a user", @@ -26757,7 +26757,7 @@ "x-go-name": "Public" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Reaction": { "description": "Reaction contain one reaction", @@ -26776,7 +26776,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Reference": { "type": "object", @@ -26794,7 +26794,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Release": { "description": "Release represents a repository release", @@ -26877,7 +26877,7 @@ "x-go-name": "ZipURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RenameOrgOption": { "description": "RenameOrgOption options when renaming an organization", @@ -26893,7 +26893,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", @@ -26909,7 +26909,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ReplaceFlagsOption": { "description": "ReplaceFlagsOption options when replacing the flags of a repository", @@ -26923,7 +26923,7 @@ "x-go-name": "Flags" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoCollaboratorPermission": { "description": "RepoCollaboratorPermission to get repository permission for a collaborator", @@ -26941,7 +26941,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoCommit": { "type": "object", @@ -26968,7 +26968,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoTopicOptions": { "description": "RepoTopicOptions a collection of repo topic names", @@ -26983,7 +26983,7 @@ "x-go-name": "Topics" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepoTransfer": { "description": "RepoTransfer represents a pending repo transfer", @@ -27003,7 +27003,7 @@ "x-go-name": "Teams" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Repository": { "description": "Repository represents a repository", @@ -27275,7 +27275,7 @@ "x-go-name": "WikiBranch" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "RepositoryMeta": { "description": "RepositoryMeta basic repository information", @@ -27299,12 +27299,12 @@ "x-go-name": "Owner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ReviewStateType": { "description": "ReviewStateType review state type", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "SearchResults": { "description": "SearchResults results of a successful search", @@ -27322,7 +27322,7 @@ "x-go-name": "OK" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Secret": { "description": "Secret represents a secret", @@ -27339,7 +27339,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "ServerVersion": { "description": "ServerVersion wraps the version of the server", @@ -27350,7 +27350,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "SetUserQuotaGroupsOptions": { "description": "SetUserQuotaGroupsOptions represents the quota groups of a user", @@ -27368,12 +27368,12 @@ "x-go-name": "Groups" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "StateType": { "description": "StateType issue state type", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "StopWatch": { "description": "StopWatch represent a running stopwatch", @@ -27411,7 +27411,7 @@ "x-go-name": "Seconds" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "SubmitPullReviewOptions": { "description": "SubmitPullReviewOptions are options to submit a pending pull review", @@ -27425,7 +27425,7 @@ "$ref": "#/definitions/ReviewStateType" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Tag": { "description": "Tag represents a repository tag", @@ -27458,7 +27458,7 @@ "x-go-name": "ZipballURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TagArchiveDownloadCount": { "description": "TagArchiveDownloadCount counts how many times a archive was downloaded", @@ -27475,7 +27475,7 @@ "x-go-name": "Zip" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TagProtection": { "description": "TagProtection represents a tag protection", @@ -27515,7 +27515,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "Team": { "description": "Team represents a team in an organization", @@ -27591,13 +27591,13 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TimeStamp": { "description": "TimeStamp defines a timestamp", "type": "integer", "format": "int64", - "x-go-package": "code.gitea.io/gitea/modules/timeutil" + "x-go-package": "forgejo.org/modules/timeutil" }, "TimelineComment": { "description": "TimelineComment represents a timeline comment (comment of any type) on a commit or issue", @@ -27717,7 +27717,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TopicName": { "description": "TopicName a list of repo topic names", @@ -27731,7 +27731,7 @@ "x-go-name": "TopicNames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TopicResponse": { "description": "TopicResponse for returning topics", @@ -27762,7 +27762,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TrackedTime": { "description": "TrackedTime worked time for an issue / pr", @@ -27804,7 +27804,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "TransferRepoOption": { "description": "TransferRepoOption options when transfer a repository's ownership", @@ -27827,7 +27827,7 @@ "x-go-name": "TeamIDs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateBranchRepoOption": { "description": "UpdateBranchRepoOption options when updating a branch in a repository", @@ -27843,7 +27843,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateFileOptions": { "description": "UpdateFileOptions options for updating files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -27898,7 +27898,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateRepoAvatarOption": { "description": "UpdateRepoAvatarUserOption options when updating the repo avatar", @@ -27910,7 +27910,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateUserAvatarOption": { "description": "UpdateUserAvatarUserOption options when updating the user avatar", @@ -27922,7 +27922,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UpdateVariableOption": { "description": "UpdateVariableOption the option when updating variable", @@ -27942,7 +27942,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "User": { "description": "User represents a user", @@ -28068,7 +28068,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UserHeatmapData": { "description": "UserHeatmapData represents the data needed to create a heatmap", @@ -28083,7 +28083,7 @@ "$ref": "#/definitions/TimeStamp" } }, - "x-go-package": "code.gitea.io/gitea/models/activities" + "x-go-package": "forgejo.org/models/activities" }, "UserSettings": { "description": "UserSettings represents user settings", @@ -28139,7 +28139,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "UserSettingsOptions": { "description": "UserSettingsOptions represents options to change user settings", @@ -28195,7 +28195,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WatchInfo": { "description": "WatchInfo represents an API watch status of one repository", @@ -28226,7 +28226,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiCommit": { "description": "WikiCommit page commit/revision", @@ -28247,7 +28247,7 @@ "x-go-name": "ID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiCommitList": { "description": "WikiCommitList commit/revision list", @@ -28266,7 +28266,7 @@ "x-go-name": "Count" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiPage": { "description": "WikiPage a wiki page", @@ -28306,7 +28306,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" }, "WikiPageMetaData": { "description": "WikiPageMetaData wiki page meta information", @@ -28328,7 +28328,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "forgejo.org/modules/structs" } }, "responses": { diff --git a/tests/e2e/changes.go b/tests/e2e/changes.go index 1e5533bc6b..d1d318fd06 100644 --- a/tests/e2e/changes.go +++ b/tests/e2e/changes.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" + "forgejo.org/modules/log" "github.com/gobwas/glob" ) diff --git a/tests/e2e/debugserver_test.go b/tests/e2e/debugserver_test.go index 49461fabe5..8742790b14 100644 --- a/tests/e2e/debugserver_test.go +++ b/tests/e2e/debugserver_test.go @@ -17,7 +17,7 @@ import ( "syscall" "testing" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/setting" ) func TestDebugserver(t *testing.T) { diff --git a/tests/e2e/declare_repos_test.go b/tests/e2e/declare_repos_test.go index c55a42ac66..f701b11f97 100644 --- a/tests/e2e/declare_repos_test.go +++ b/tests/e2e/declare_repos_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index aecb2c70c7..1961a4b68a 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -16,15 +16,15 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers" + "forgejo.org/tests" ) var testE2eWebRoutes *web.Route diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go index b96d61fd2c..d57c7bc2d3 100644 --- a/tests/e2e/utils_e2e_test.go +++ b/tests/e2e/utils_e2e_test.go @@ -18,12 +18,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - modules_session "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + modules_session "forgejo.org/modules/session" + "forgejo.org/modules/setting" + "forgejo.org/tests" "code.forgejo.org/go-chi/session" "github.com/stretchr/testify/require" diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index d16f26c085..754c7ef064 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -9,9 +9,9 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" + "forgejo.org/modules/markup" + "forgejo.org/modules/markup/markdown" + "forgejo.org/modules/setting" ) var renderContext = markup.RenderContext{ diff --git a/tests/gitea-repositories-meta/user2/commits_search_test.git/config b/tests/gitea-repositories-meta/user2/commits_search_test.git/config index bfbada5989..534a026f8f 100644 --- a/tests/gitea-repositories-meta/user2/commits_search_test.git/config +++ b/tests/gitea-repositories-meta/user2/commits_search_test.git/config @@ -3,6 +3,6 @@ filemode = true bare = true [remote "origin"] - url = /home/mura/go/src/code.gitea.io/gitea/tests/gitea-repositories-meta/user2/commits_search_test/ + url = /home/mura/go/src/forgejo.org/tests/gitea-repositories-meta/user2/commits_search_test/ fetch = +refs/*:refs/* mirror = true diff --git a/tests/integration/actions_commit_status_test.go b/tests/integration/actions_commit_status_test.go index 0dae5db344..a14b427c98 100644 --- a/tests/integration/actions_commit_status_test.go +++ b/tests/integration/actions_commit_status_test.go @@ -7,16 +7,16 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/automerge" + actions_model "forgejo.org/models/actions" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/services/actions" + "forgejo.org/services/automerge" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index a2ccbf0e3d..412215086e 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go index d66eada950..2c2e2e88b3 100644 --- a/tests/integration/actions_log_test.go +++ b/tests/integration/actions_log_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_route_test.go b/tests/integration/actions_route_test.go index daeae30b38..2641fb6a04 100644 --- a/tests/integration/actions_route_test.go +++ b/tests/integration/actions_route_test.go @@ -11,12 +11,12 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go index 0cc4204567..93f38db9ee 100644 --- a/tests/integration/actions_runner_test.go +++ b/tests/integration/actions_runner_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index ecdf8b7076..2d5dd3b957 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -11,29 +11,29 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - actions_service "code.gitea.io/gitea/services/actions" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + actions_module "forgejo.org/modules/actions" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + webhook_module "forgejo.org/modules/webhook" + actions_service "forgejo.org/services/actions" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_variables_test.go b/tests/integration/actions_variables_test.go index 0179a543dc..0b59284f27 100644 --- a/tests/integration/actions_variables_test.go +++ b/tests/integration/actions_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/admin_config_test.go b/tests/integration/admin_config_test.go index 860a92d6a3..92faf7ef01 100644 --- a/tests/integration/admin_config_test.go +++ b/tests/integration/admin_config_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index b61c50f4a8..f98650c567 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/timeutil" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go index 6393fc53cc..dc2b86d28b 100644 --- a/tests/integration/api_actions_artifact_test.go +++ b/tests/integration/api_actions_artifact_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go index 43df1aeee0..9fa7590620 100644 --- a/tests/integration/api_actions_artifact_v4_test.go +++ b/tests/integration/api_actions_artifact_v4_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/routers/api/actions" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/storage" + "forgejo.org/routers/api/actions" + actions_service "forgejo.org/services/actions" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_activitypub_actor_test.go b/tests/integration/api_activitypub_actor_test.go index de4d669c9d..778a34d785 100644 --- a/tests/integration/api_activitypub_actor_test.go +++ b/tests/integration/api_activitypub_actor_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go index 846ae79891..d8492942e5 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_activitypub_repository_test.go b/tests/integration/api_activitypub_repository_test.go index a86e32b278..29fbe6d781 100644 --- a/tests/integration/api_activitypub_repository_test.go +++ b/tests/integration/api_activitypub_repository_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgefed" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - forgefed_modules "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/forgefed" + "forgejo.org/models/unittest" + "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + forgefed_modules "forgejo.org/modules/forgefed" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_admin_actions_test.go b/tests/integration/api_admin_actions_test.go index fd55f0fd2e..763c35544a 100644 --- a/tests/integration/api_admin_actions_test.go +++ b/tests/integration/api_admin_actions_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go index 823ef2f136..df5e961ec6 100644 --- a/tests/integration/api_admin_org_test.go +++ b/tests/integration/api_admin_org_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go index 5f8d360dec..c5f8906bfc 100644 --- a/tests/integration/api_admin_test.go +++ b/tests/integration/api_admin_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/gobwas/glob" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_block_test.go b/tests/integration/api_block_test.go index a69ee9b74f..8b25ce9283 100644 --- a/tests/integration/api_block_test.go +++ b/tests/integration/api_block_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index aa22b15ea1..df6b7022cd 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_attachment_test.go b/tests/integration/api_comment_attachment_test.go index db1b98a20f..16eb3c9b12 100644 --- a/tests/integration/api_comment_attachment_test.go +++ b/tests/integration/api_comment_attachment_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go index c6905293d0..fd0cadbb1a 100644 --- a/tests/integration/api_comment_test.go +++ b/tests/integration/api_comment_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/references" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/references" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_feed_plain_text_titles_test.go b/tests/integration/api_feed_plain_text_titles_test.go index b1247780d8..889d0a103a 100644 --- a/tests/integration/api_feed_plain_text_titles_test.go +++ b/tests/integration/api_feed_plain_text_titles_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_forgejo_root_test.go b/tests/integration/api_forgejo_root_test.go index d21c9449b3..a5c1b8abe0 100644 --- a/tests/integration/api_forgejo_root_test.go +++ b/tests/integration/api_forgejo_root_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_forgejo_version_test.go b/tests/integration/api_forgejo_version_test.go index 5c95fd373c..b42e4a2bd7 100644 --- a/tests/integration/api_forgejo_version_test.go +++ b/tests/integration/api_forgejo_version_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - v1 "code.gitea.io/gitea/routers/api/forgejo/v1" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + v1 "forgejo.org/routers/api/forgejo/v1" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go index 1d04a4b013..2809af2748 100644 --- a/tests/integration/api_fork_test.go +++ b/tests/integration/api_fork_test.go @@ -9,14 +9,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gitignore_templates_test.go b/tests/integration/api_gitignore_templates_test.go index c58f5eebfe..2412b55d3a 100644 --- a/tests/integration/api_gitignore_templates_test.go +++ b/tests/integration/api_gitignore_templates_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gpg_keys_test.go b/tests/integration/api_gpg_keys_test.go index ec0dafc2d6..1acbf91de0 100644 --- a/tests/integration/api_gpg_keys_test.go +++ b/tests/integration/api_gpg_keys_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_health_test.go b/tests/integration/api_health_test.go index 5657f4fd06..22f060e79b 100644 --- a/tests/integration/api_health_test.go +++ b/tests/integration/api_health_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/routers/web/healthcheck" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_helper_for_declarative_test.go b/tests/integration/api_helper_for_declarative_test.go index 4985f45b9c..b5941b3389 100644 --- a/tests/integration/api_helper_for_declarative_test.go +++ b/tests/integration/api_helper_for_declarative_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/queue" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + "forgejo.org/models/auth" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/queue" + api "forgejo.org/modules/structs" + "forgejo.org/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_httpsig_test.go b/tests/integration/api_httpsig_test.go index cca477f5e1..48a0b267eb 100644 --- a/tests/integration/api_httpsig_test.go +++ b/tests/integration/api_httpsig_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/tests/integration/api_issue_attachment_test.go b/tests/integration/api_issue_attachment_test.go index 77e752d122..ef7e6183f9 100644 --- a/tests/integration/api_issue_attachment_test.go +++ b/tests/integration/api_issue_attachment_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go index 16f81e785d..809be572da 100644 --- a/tests/integration/api_issue_config_test.go +++ b/tests/integration/api_issue_config_test.go @@ -9,11 +9,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_label_test.go b/tests/integration/api_issue_label_test.go index ebcf29a13d..7b2fbd18be 100644 --- a/tests/integration/api_issue_label_test.go +++ b/tests/integration/api_issue_label_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go index 32ac56298f..2ab7f9a346 100644 --- a/tests/integration/api_issue_milestone_test.go +++ b/tests/integration/api_issue_milestone_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_pin_test.go b/tests/integration/api_issue_pin_test.go index 2f257a89e0..2073241903 100644 --- a/tests/integration/api_issue_pin_test.go +++ b/tests/integration/api_issue_pin_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_reaction_test.go b/tests/integration/api_issue_reaction_test.go index 4ca909f281..817c07898c 100644 --- a/tests/integration/api_issue_reaction_test.go +++ b/tests/integration/api_issue_reaction_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go index 4765787e6f..f395ad1a61 100644 --- a/tests/integration/api_issue_stopwatch_test.go +++ b/tests/integration/api_issue_stopwatch_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_subscription_test.go b/tests/integration/api_issue_subscription_test.go index 7a716301c4..4d1b9b2fb1 100644 --- a/tests/integration/api_issue_subscription_test.go +++ b/tests/integration/api_issue_subscription_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_templates_test.go b/tests/integration/api_issue_templates_test.go index d634329514..49b1a6f277 100644 --- a/tests/integration/api_issue_templates_test.go +++ b/tests/integration/api_issue_templates_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index 2d3fd80c06..99fc158fdd 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go index 90a59fb481..41def89a55 100644 --- a/tests/integration/api_issue_tracked_time_test.go +++ b/tests/integration/api_issue_tracked_time_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_keys_test.go b/tests/integration/api_keys_test.go index 86daa8c506..a6f0fbe69b 100644 --- a/tests/integration/api_keys_test.go +++ b/tests/integration/api_keys_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_label_templates_test.go b/tests/integration/api_label_templates_test.go index 3039f8c60c..545a1736d0 100644 --- a/tests/integration/api_label_templates_test.go +++ b/tests/integration/api_label_templates_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_license_templates_test.go b/tests/integration/api_license_templates_test.go index e12aab7c2c..7bdd1bc7dc 100644 --- a/tests/integration/api_license_templates_test.go +++ b/tests/integration/api_license_templates_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/options" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index d000083717..c4f2309aac 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go index ad233d9e73..b9efaa43a3 100644 --- a/tests/integration/api_notification_test.go +++ b/tests/integration/api_notification_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_oauth2_apps_test.go b/tests/integration/api_oauth2_apps_test.go index 85c7184b64..2490a11888 100644 --- a/tests/integration/api_oauth2_apps_test.go +++ b/tests/integration/api_oauth2_apps_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_actions_test.go b/tests/integration/api_org_actions_test.go index 8c1948fc4a..ed8f91e5c2 100644 --- a/tests/integration/api_org_actions_test.go +++ b/tests/integration/api_org_actions_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_avatar_test.go b/tests/integration/api_org_avatar_test.go index bbe116cd60..aa5ca0fa08 100644 --- a/tests/integration/api_org_avatar_test.go +++ b/tests/integration/api_org_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go index 5f92271d64..37e6035045 100644 --- a/tests/integration/api_org_test.go +++ b/tests/integration/api_org_test.go @@ -9,17 +9,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + "forgejo.org/models/perm" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_alpine_test.go b/tests/integration/api_packages_alpine_test.go index 2264625556..d3cf56394c 100644 --- a/tests/integration/api_packages_alpine_test.go +++ b/tests/integration/api_packages_alpine_test.go @@ -14,13 +14,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + alpine_module "forgejo.org/modules/packages/alpine" + alpine_service "forgejo.org/services/packages/alpine" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_alt_test.go b/tests/integration/api_packages_alt_test.go index 5fc289c134..e84af7dd15 100644 --- a/tests/integration/api_packages_alt_test.go +++ b/tests/integration/api_packages_alt_test.go @@ -16,15 +16,15 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + packages_module "forgejo.org/modules/packages" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 57db324a2f..2463fd1c8e 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -18,12 +18,12 @@ import ( "testing" "testing/fstest" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - arch_model "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + arch_model "forgejo.org/modules/packages/arch" + "forgejo.org/tests" "github.com/ProtonMail/go-crypto/openpgp/armor" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 7a9105eb3a..048859e312 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -12,19 +12,19 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - cargo_router "code.gitea.io/gitea/routers/api/packages/cargo" - gitea_context "code.gitea.io/gitea/services/context" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + cargo_module "forgejo.org/modules/packages/cargo" + "forgejo.org/modules/setting" + cargo_router "forgejo.org/routers/api/packages/cargo" + gitea_context "forgejo.org/services/context" + cargo_service "forgejo.org/services/packages/cargo" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index febb1a8b6c..390ac50688 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - chef_router "code.gitea.io/gitea/routers/api/packages/chef" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + chef_module "forgejo.org/modules/packages/chef" + "forgejo.org/modules/setting" + chef_router "forgejo.org/routers/api/packages/chef" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 774676f8e2..9c906a8959 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -11,15 +11,15 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + composer_module "forgejo.org/modules/packages/composer" + "forgejo.org/modules/setting" + "forgejo.org/routers/api/packages/composer" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 9d8f435068..c0185c852d 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conan_model "code.gitea.io/gitea/models/packages/conan" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/setting" - conan_router "code.gitea.io/gitea/routers/api/packages/conan" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + conan_model "forgejo.org/models/packages/conan" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + conan_module "forgejo.org/modules/packages/conan" + "forgejo.org/modules/setting" + conan_router "forgejo.org/routers/api/packages/conan" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index 4625c5854c..6924968d35 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -12,13 +12,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/zstd" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + conda_module "forgejo.org/modules/packages/conda" + "forgejo.org/modules/zstd" + "forgejo.org/tests" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_cleanup_sha256_test.go b/tests/integration/api_packages_container_cleanup_sha256_test.go index eb63eff720..b1ed435b80 100644 --- a/tests/integration/api_packages_container_cleanup_sha256_test.go +++ b/tests/integration/api_packages_container_cleanup_sha256_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - packages_cleanup "code.gitea.io/gitea/services/packages/cleanup" - packages_container "code.gitea.io/gitea/services/packages/container" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + packages_cleanup "forgejo.org/services/packages/cleanup" + packages_container "forgejo.org/services/packages/container" + "forgejo.org/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index 3c28f45660..223c865dec 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -13,17 +13,17 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + container_module "forgejo.org/modules/packages/container" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cran_test.go b/tests/integration/api_packages_cran_test.go index d64b592327..2326d36171 100644 --- a/tests/integration/api_packages_cran_test.go +++ b/tests/integration/api_packages_cran_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + cran_module "forgejo.org/modules/packages/cran" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_debian_test.go b/tests/integration/api_packages_debian_test.go index d85f56fdbb..67498ec043 100644 --- a/tests/integration/api_packages_debian_test.go +++ b/tests/integration/api_packages_debian_test.go @@ -13,13 +13,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + debian_module "forgejo.org/modules/packages/debian" + "forgejo.org/tests" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 1a53f33387..5a3727cae5 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -10,12 +10,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_goproxy_test.go b/tests/integration/api_packages_goproxy_test.go index 716d90b242..1534fa73cc 100644 --- a/tests/integration/api_packages_goproxy_test.go +++ b/tests/integration/api_packages_goproxy_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 4b48b74ce0..df19e7cd03 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + helm_module "forgejo.org/modules/packages/helm" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index b453f10b69..438c2f0fb5 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -11,12 +11,12 @@ import ( "sync" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/maven" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index d0c54c306b..38c7ee54c0 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/npm" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index 47b9cfe86c..b4da9695f0 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -17,16 +17,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/packages/nuget" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + nuget_module "forgejo.org/modules/packages/nuget" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/routers/api/packages/nuget" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index d6bce3055e..72ba2f14cd 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -15,13 +15,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + pub_module "forgejo.org/modules/packages/pub" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index a75bae85ac..f025f8e577 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -13,12 +13,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/pypi" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go index 853c8f0f69..3abaec3462 100644 --- a/tests/integration/api_packages_rpm_test.go +++ b/tests/integration/api_packages_rpm_test.go @@ -15,14 +15,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + rpm_module "forgejo.org/modules/packages/rpm" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 0ec9b9321b..97c2c8bb5f 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -14,12 +14,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/packages/rubygems" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go index 3c2a8b0694..ec0d4a2b81 100644 --- a/tests/integration/api_packages_swift_test.go +++ b/tests/integration/api_packages_swift_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - swift_router "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + swift_module "forgejo.org/modules/packages/swift" + "forgejo.org/modules/setting" + swift_router "forgejo.org/routers/api/packages/swift" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index c74f40a689..a157d18cd5 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + container_model "forgejo.org/models/packages/container" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + packages_service "forgejo.org/services/packages" + packages_cleanup_service "forgejo.org/services/packages/cleanup" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_vagrant_test.go b/tests/integration/api_packages_vagrant_test.go index b446466296..b9977d61c5 100644 --- a/tests/integration/api_packages_vagrant_test.go +++ b/tests/integration/api_packages_vagrant_test.go @@ -12,14 +12,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + vagrant_module "forgejo.org/modules/packages/vagrant" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_private_serv_test.go b/tests/integration/api_private_serv_test.go index 11eb730915..a7dc59a611 100644 --- a/tests/integration/api_private_serv_test.go +++ b/tests/integration/api_private_serv_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/private" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/perm" + "forgejo.org/modules/private" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_commits_test.go b/tests/integration/api_pull_commits_test.go index d62b9d9140..bfdcd79e66 100644 --- a/tests/integration/api_pull_commits_test.go +++ b/tests/integration/api_pull_commits_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index b66e65ee41..930f9b816b 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -8,16 +8,16 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + api "forgejo.org/modules/structs" + issue_service "forgejo.org/services/issue" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index 7b95d441dd..e35eca38cf 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -11,18 +11,18 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/services/forms" + issue_service "forgejo.org/services/issue" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_push_mirror_test.go b/tests/integration/api_push_mirror_test.go index f2135cec62..282c3aaba0 100644 --- a/tests/integration/api_push_mirror_test.go +++ b/tests/integration/api_push_mirror_test.go @@ -17,22 +17,22 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_quota_management_test.go b/tests/integration/api_quota_management_test.go index 6337e66516..c46c857197 100644 --- a/tests/integration/api_quota_management_test.go +++ b/tests/integration/api_quota_management_test.go @@ -8,16 +8,16 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_quota_use_test.go b/tests/integration/api_quota_use_test.go index 11cbdcf145..2b50cca4ab 100644 --- a/tests/integration/api_quota_use_test.go +++ b/tests/integration/api_quota_use_test.go @@ -14,22 +14,22 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/migration" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/services/context" + "forgejo.org/services/forms" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 1327daf57e..98fc293fbc 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_actions_test.go b/tests/integration/api_repo_actions_test.go index 302f0c93cb..42c1038a0e 100644 --- a/tests/integration/api_repo_actions_test.go +++ b/tests/integration/api_repo_actions_test.go @@ -10,15 +10,15 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_activities_test.go b/tests/integration/api_repo_activities_test.go index dbdedec372..ea966c1cfe 100644 --- a/tests/integration/api_repo_activities_test.go +++ b/tests/integration/api_repo_activities_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index fab3dedfab..30e62943f0 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -11,11 +11,11 @@ import ( "regexp" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_avatar_test.go b/tests/integration/api_repo_avatar_test.go index 8ee256ec9f..0bd0a54f27 100644 --- a/tests/integration/api_repo_avatar_test.go +++ b/tests/integration/api_repo_avatar_test.go @@ -10,12 +10,12 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go index 83159022ea..caadea7e39 100644 --- a/tests/integration/api_repo_branch_test.go +++ b/tests/integration/api_repo_branch_test.go @@ -11,14 +11,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_collaborator_test.go b/tests/integration/api_repo_collaborator_test.go index 81d7a591f8..61f4f578d7 100644 --- a/tests/integration/api_repo_collaborator_test.go +++ b/tests/integration/api_repo_collaborator_test.go @@ -8,12 +8,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go index d4b170e60e..35f0a21d82 100644 --- a/tests/integration/api_repo_compare_test.go +++ b/tests/integration/api_repo_compare_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 7de8910ee0..288c645e37 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -9,13 +9,13 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 18aad34c98..cff891f6d8 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go index 7c93307e19..b76edf45ca 100644 --- a/tests/integration/api_repo_file_delete_test.go +++ b/tests/integration/api_repo_file_delete_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_get_test.go b/tests/integration/api_repo_file_get_test.go index 1a4e670bc1..7bd7393b01 100644 --- a/tests/integration/api_repo_file_get_test.go +++ b/tests/integration/api_repo_file_get_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go index 4350092b8b..09cf93d8a5 100644 --- a/tests/integration/api_repo_file_helpers.go +++ b/tests/integration/api_repo_file_helpers.go @@ -6,12 +6,12 @@ package integration import ( "strings" - "code.gitea.io/gitea/models" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - files_service "code.gitea.io/gitea/services/repository/files" + "forgejo.org/models" + repo_model "forgejo.org/models/repo" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + files_service "forgejo.org/services/repository/files" ) func createFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, branchName, content string) (*api.FilesResponse, error) { diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go index c8ce94a3f5..4ed0df2b08 100644 --- a/tests/integration/api_repo_file_update_test.go +++ b/tests/integration/api_repo_file_update_test.go @@ -11,14 +11,14 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go index aca58025d2..d188751dab 100644 --- a/tests/integration/api_repo_files_change_test.go +++ b/tests/integration/api_repo_files_change_test.go @@ -10,14 +10,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_get_contents_list_test.go b/tests/integration/api_repo_get_contents_list_test.go index e76ccd9932..543f10f6d2 100644 --- a/tests/integration/api_repo_get_contents_list_test.go +++ b/tests/integration/api_repo_get_contents_list_test.go @@ -9,15 +9,15 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go index cb321b8b1f..9cf266b3dd 100644 --- a/tests/integration/api_repo_get_contents_test.go +++ b/tests/integration/api_repo_get_contents_test.go @@ -9,15 +9,15 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_git_blobs_test.go b/tests/integration/api_repo_git_blobs_test.go index 184362e7e3..980fff1e52 100644 --- a/tests/integration/api_repo_git_blobs_test.go +++ b/tests/integration/api_repo_git_blobs_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_commits_test.go b/tests/integration/api_repo_git_commits_test.go index c4c626eb49..e80c0024b8 100644 --- a/tests/integration/api_repo_git_commits_test.go +++ b/tests/integration/api_repo_git_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_hook_test.go b/tests/integration/api_repo_git_hook_test.go index 9917b41790..aadc231d82 100644 --- a/tests/integration/api_repo_git_hook_test.go +++ b/tests/integration/api_repo_git_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_notes_test.go b/tests/integration/api_repo_git_notes_test.go index 1b5e5d652c..dfafec7135 100644 --- a/tests/integration/api_repo_git_notes_test.go +++ b/tests/integration/api_repo_git_notes_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_ref_test.go b/tests/integration/api_repo_git_ref_test.go index 875752ae3f..a4c05e208c 100644 --- a/tests/integration/api_repo_git_ref_test.go +++ b/tests/integration/api_repo_git_ref_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestAPIReposGitRefs(t *testing.T) { diff --git a/tests/integration/api_repo_git_tags_test.go b/tests/integration/api_repo_git_tags_test.go index c5883a8058..73d7250c46 100644 --- a/tests/integration/api_repo_git_tags_test.go +++ b/tests/integration/api_repo_git_tags_test.go @@ -8,15 +8,15 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_trees_test.go b/tests/integration/api_repo_git_trees_test.go index 8eec6d8d22..f321760218 100644 --- a/tests/integration/api_repo_git_trees_test.go +++ b/tests/integration/api_repo_git_trees_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestAPIReposGitTrees(t *testing.T) { diff --git a/tests/integration/api_repo_hook_test.go b/tests/integration/api_repo_hook_test.go index 9ae8119b28..b2b8b47d40 100644 --- a/tests/integration/api_repo_hook_test.go +++ b/tests/integration/api_repo_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go index 4ba01e6d9b..b3a295c2de 100644 --- a/tests/integration/api_repo_lfs_locks_test.go +++ b/tests/integration/api_repo_lfs_locks_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_migrate_test.go b/tests/integration/api_repo_lfs_migrate_test.go index de85b9160d..fcfa43cac4 100644 --- a/tests/integration/api_repo_lfs_migrate_test.go +++ b/tests/integration/api_repo_lfs_migrate_test.go @@ -8,14 +8,14 @@ import ( "path" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/services/migrations" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go index 7a2a92d415..078cedf78e 100644 --- a/tests/integration/api_repo_lfs_test.go +++ b/tests/integration/api_repo_lfs_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_raw_test.go b/tests/integration/api_repo_raw_test.go index e5f83d1c80..5ae11a8e71 100644 --- a/tests/integration/api_repo_raw_test.go +++ b/tests/integration/api_repo_raw_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_secrets_test.go b/tests/integration/api_repo_secrets_test.go index c3074d9ece..a2c9439f03 100644 --- a/tests/integration/api_repo_secrets_test.go +++ b/tests/integration/api_repo_secrets_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIRepoSecrets(t *testing.T) { diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go index 09f17ef475..81475249a1 100644 --- a/tests/integration/api_repo_tags_test.go +++ b/tests/integration/api_repo_tags_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_teams_test.go b/tests/integration/api_repo_teams_test.go index 91bfd66b3a..c75714d003 100644 --- a/tests/integration/api_repo_teams_test.go +++ b/tests/integration/api_repo_teams_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go index 6cc7aea2c8..cd79c6eee6 100644 --- a/tests/integration/api_repo_test.go +++ b/tests/integration/api_repo_test.go @@ -9,18 +9,18 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_topic_test.go b/tests/integration/api_repo_topic_test.go index dcb8ae09da..c826fbd818 100644 --- a/tests/integration/api_repo_topic_test.go +++ b/tests/integration/api_repo_topic_test.go @@ -10,12 +10,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_variables_test.go b/tests/integration/api_repo_variables_test.go index 7847962b07..6e3e8c1db6 100644 --- a/tests/integration/api_repo_variables_test.go +++ b/tests/integration/api_repo_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIRepoVariables(t *testing.T) { diff --git a/tests/integration/api_settings_test.go b/tests/integration/api_settings_test.go index 9881578fba..e13f4062da 100644 --- a/tests/integration/api_settings_test.go +++ b/tests/integration/api_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go index 4fee39d687..41d34dcd50 100644 --- a/tests/integration/api_team_test.go +++ b/tests/integration/api_team_test.go @@ -9,17 +9,17 @@ import ( "sort" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_team_user_test.go b/tests/integration/api_team_user_test.go index 6c80bc9f80..0c76dd459d 100644 --- a/tests/integration/api_team_user_test.go +++ b/tests/integration/api_team_user_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/services/convert" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index f94a0986f2..aba6a25256 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go index 9de096ed2f..6441b23199 100644 --- a/tests/integration/api_twofa_test.go +++ b/tests/integration/api_twofa_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_user_actions_test.go b/tests/integration/api_user_actions_test.go index a03d4e95ae..1eb5089ee4 100644 --- a/tests/integration/api_user_actions_test.go +++ b/tests/integration/api_user_actions_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_avatar_test.go b/tests/integration/api_user_avatar_test.go index 22dc09a6b7..858e6cf71f 100644 --- a/tests/integration/api_user_avatar_test.go +++ b/tests/integration/api_user_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_user_email_test.go b/tests/integration/api_user_email_test.go index 6441e2ed8e..b0907ad1cf 100644 --- a/tests/integration/api_user_email_test.go +++ b/tests/integration/api_user_email_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_follow_test.go b/tests/integration/api_user_follow_test.go index 68443eff48..703d8ff494 100644 --- a/tests/integration/api_user_follow_test.go +++ b/tests/integration/api_user_follow_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_heatmap_test.go b/tests/integration/api_user_heatmap_test.go index a23536735b..69d2524aaa 100644 --- a/tests/integration/api_user_heatmap_test.go +++ b/tests/integration/api_user_heatmap_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/timeutil" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_info_test.go b/tests/integration/api_user_info_test.go index 89f7266859..eefabe52ac 100644 --- a/tests/integration/api_user_info_test.go +++ b/tests/integration/api_user_info_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_org_perm_test.go b/tests/integration/api_user_org_perm_test.go index 85bb1db170..9a09a34087 100644 --- a/tests/integration/api_user_org_perm_test.go +++ b/tests/integration/api_user_org_perm_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_orgs_test.go b/tests/integration/api_user_orgs_test.go index e31199406d..ca3fc7df34 100644 --- a/tests/integration/api_user_orgs_test.go +++ b/tests/integration/api_user_orgs_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go index ab52b26531..3df3e45778 100644 --- a/tests/integration/api_user_search_test.go +++ b/tests/integration/api_user_search_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_secrets_test.go b/tests/integration/api_user_secrets_test.go index 56bf30e804..50ecdedfd6 100644 --- a/tests/integration/api_user_secrets_test.go +++ b/tests/integration/api_user_secrets_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIUserSecrets(t *testing.T) { diff --git a/tests/integration/api_user_star_test.go b/tests/integration/api_user_star_test.go index aafe9cfb8b..27e5b9e0ca 100644 --- a/tests/integration/api_user_star_test.go +++ b/tests/integration/api_user_star_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_variables_test.go b/tests/integration/api_user_variables_test.go index 9fd84ddf81..2e219be7ec 100644 --- a/tests/integration/api_user_variables_test.go +++ b/tests/integration/api_user_variables_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestAPIUserVariables(t *testing.T) { diff --git a/tests/integration/api_user_watch_test.go b/tests/integration/api_user_watch_test.go index 953e00551d..fd8964a8ed 100644 --- a/tests/integration/api_user_watch_test.go +++ b/tests/integration/api_user_watch_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index a1018e45be..1720587dd4 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -11,15 +11,15 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + api "forgejo.org/modules/structs" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/appearance_settings_test.go b/tests/integration/appearance_settings_test.go index ad87887331..33ca9f97aa 100644 --- a/tests/integration/appearance_settings_test.go +++ b/tests/integration/appearance_settings_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 7bd3e680f7..5920620f48 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/storage" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 42d19341ba..6b9a71a5aa 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - "code.gitea.io/gitea/tests" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + "forgejo.org/services/auth" + "forgejo.org/services/auth/source/ldap" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_token_test.go b/tests/integration/auth_token_test.go index d1fd5dda83..b4242c2681 100644 --- a/tests/integration/auth_token_test.go +++ b/tests/integration/auth_token_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/timeutil" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/benchmarks_test.go b/tests/integration/benchmarks_test.go index 62da761d2d..40875e0c7d 100644 --- a/tests/integration/benchmarks_test.go +++ b/tests/integration/benchmarks_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" ) // StringWithCharset random string (from https://www.calhoun.io/creating-random-strings-in-go/) diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go index 8eda4ffa54..d249737555 100644 --- a/tests/integration/block_test.go +++ b/tests/integration/block_test.go @@ -11,15 +11,15 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/models/activities" + "forgejo.org/models/db" + issue_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/branches_test.go b/tests/integration/branches_test.go index e0482b6f2e..c599106866 100644 --- a/tests/integration/branches_test.go +++ b/tests/integration/branches_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - gitea_context "code.gitea.io/gitea/services/context" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + gitea_context "forgejo.org/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/change_default_branch_test.go b/tests/integration/change_default_branch_test.go index 703834b712..84f02e41f9 100644 --- a/tests/integration/change_default_branch_test.go +++ b/tests/integration/change_default_branch_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestChangeDefaultBranch(t *testing.T) { diff --git a/tests/integration/cmd_admin_test.go b/tests/integration/cmd_admin_test.go index b493dff919..043ecef346 100644 --- a/tests/integration/cmd_admin_test.go +++ b/tests/integration/cmd_admin_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/cmd_forgejo_actions_test.go b/tests/integration/cmd_forgejo_actions_test.go index a458a6437d..bee50a6d98 100644 --- a/tests/integration/cmd_forgejo_actions_test.go +++ b/tests/integration/cmd_forgejo_actions_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/cmd_forgejo_f3_test.go b/tests/integration/cmd_forgejo_f3_test.go index 6c34a71c71..1eda413e4c 100644 --- a/tests/integration/cmd_forgejo_f3_test.go +++ b/tests/integration/cmd_forgejo_f3_test.go @@ -9,14 +9,14 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/cmd/forgejo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/f3/driver/options" - "code.gitea.io/gitea/tests" + "forgejo.org/cmd/forgejo" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/services/f3/driver/options" + "forgejo.org/tests" - _ "code.gitea.io/gitea/services/f3/driver" - _ "code.gitea.io/gitea/services/f3/driver/tests" + _ "forgejo.org/services/f3/driver" + _ "forgejo.org/services/f3/driver/tests" f3_filesystem_options "code.forgejo.org/f3/gof3/v3/forges/filesystem/options" f3_logger "code.forgejo.org/f3/gof3/v3/logger" diff --git a/tests/integration/cmd_keys_test.go b/tests/integration/cmd_keys_test.go index e93a8b5b57..c76055c4a8 100644 --- a/tests/integration/cmd_keys_test.go +++ b/tests/integration/cmd_keys_test.go @@ -9,8 +9,8 @@ import ( "os/exec" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/codeowner_test.go b/tests/integration/codeowner_test.go index e1df15426d..e2eeb843d8 100644 --- a/tests/integration/codeowner_test.go +++ b/tests/integration/codeowner_test.go @@ -13,15 +13,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/comment_roles_system_test.go b/tests/integration/comment_roles_system_test.go index 4c5d5ed8da..3b315f28f8 100644 --- a/tests/integration/comment_roles_system_test.go +++ b/tests/integration/comment_roles_system_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/commit_status_test.go b/tests/integration/commit_status_test.go index 924fc5b074..9dd1bcd283 100644 --- a/tests/integration/commit_status_test.go +++ b/tests/integration/commit_status_test.go @@ -6,11 +6,11 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + "forgejo.org/models/unittest" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index d134ebf40a..3c3e8adf94 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/optional" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/cors_test.go b/tests/integration/cors_test.go index 25dfbabf41..a050693035 100644 --- a/tests/integration/cors_test.go +++ b/tests/integration/cors_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go index ca2a775459..ed547c5b5a 100644 --- a/tests/integration/create_no_session_test.go +++ b/tests/integration/create_no_session_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + "forgejo.org/routers" + "forgejo.org/tests" "code.forgejo.org/go-chi/session" "github.com/stretchr/testify/assert" diff --git a/tests/integration/csrf_test.go b/tests/integration/csrf_test.go index fcb9661b8a..100614cbb4 100644 --- a/tests/integration/csrf_test.go +++ b/tests/integration/csrf_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go index 0e5bf00ed7..6bfe656b9b 100644 --- a/tests/integration/db_collation_test.go +++ b/tests/integration/db_collation_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/delete_user_test.go b/tests/integration/delete_user_test.go index fa407a75ad..767d6c9724 100644 --- a/tests/integration/delete_user_test.go +++ b/tests/integration/delete_user_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/organization" + access_model "forgejo.org/models/perm/access" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func assertUserDeleted(t *testing.T, userID int64, purged bool) { diff --git a/tests/integration/disable_forgotten_password_test.go b/tests/integration/disable_forgotten_password_test.go index 8a50c8d409..7a1e502d93 100644 --- a/tests/integration/disable_forgotten_password_test.go +++ b/tests/integration/disable_forgotten_password_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" ) func TestDisableForgottenPasswordFalse(t *testing.T) { diff --git a/tests/integration/doctor_packages_nuget_test.go b/tests/integration/doctor_packages_nuget_test.go index a012567efc..e505799730 100644 --- a/tests/integration/doctor_packages_nuget_test.go +++ b/tests/integration/doctor_packages_nuget_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - doctor "code.gitea.io/gitea/services/doctor" - packages_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/log" + packages_module "forgejo.org/modules/packages" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + doctor "forgejo.org/services/doctor" + packages_service "forgejo.org/services/packages" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/download_test.go b/tests/integration/download_test.go index efe5ac791c..d5e68402c5 100644 --- a/tests/integration/download_test.go +++ b/tests/integration/download_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dummy_lang_test.go b/tests/integration/dummy_lang_test.go index d26ea6edc4..08c5176731 100644 --- a/tests/integration/dummy_lang_test.go +++ b/tests/integration/dummy_lang_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go index e794c3fb15..239170a256 100644 --- a/tests/integration/dump_restore_test.go +++ b/tests/integration/dump_restore_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + base "forgejo.org/modules/migration" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/services/migrations" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/easymde_test.go b/tests/integration/easymde_test.go index 2b4630d8b4..7ecbe4f5b7 100644 --- a/tests/integration/easymde_test.go +++ b/tests/integration/easymde_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" ) func TestEasyMDESwitch(t *testing.T) { diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index 96d388ddb9..7321aa26c9 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -15,14 +15,14 @@ import ( "path" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/json" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index 637de7d5c7..baea2566ff 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -11,15 +11,15 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/eventsource_test.go b/tests/integration/eventsource_test.go index e081df0e57..8eb5110e54 100644 --- a/tests/integration/eventsource_test.go +++ b/tests/integration/eventsource_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/eventsource" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/eventsource" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/explore_code_test.go b/tests/integration/explore_code_test.go index 02b3a6a0f7..97cc97b996 100644 --- a/tests/integration/explore_code_test.go +++ b/tests/integration/explore_code_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/explore_org_test.go b/tests/integration/explore_org_test.go index e0c48ccf0d..111fd2dda7 100644 --- a/tests/integration/explore_org_test.go +++ b/tests/integration/explore_org_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_repos_test.go b/tests/integration/explore_repos_test.go index c0179c50da..604d473ac5 100644 --- a/tests/integration/explore_repos_test.go +++ b/tests/integration/explore_repos_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_user_test.go b/tests/integration/explore_user_test.go index d1e3fd85af..689e623e69 100644 --- a/tests/integration/explore_user_test.go +++ b/tests/integration/explore_user_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_repo_test.go b/tests/integration/feed_repo_test.go index f1f56c4f63..a4d5ef2610 100644 --- a/tests/integration/feed_repo_test.go +++ b/tests/integration/feed_repo_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/feed_user_test.go b/tests/integration/feed_user_test.go index d618f30566..51da24252a 100644 --- a/tests/integration/feed_user_test.go +++ b/tests/integration/feed_user_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/forgejo_confirmation_repo_test.go b/tests/integration/forgejo_confirmation_repo_test.go index 598baa48b4..0229046efc 100644 --- a/tests/integration/forgejo_confirmation_repo_test.go +++ b/tests/integration/forgejo_confirmation_repo_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/forgejo_git_test.go b/tests/integration/forgejo_git_test.go index ebad074e14..693d6d9209 100644 --- a/tests/integration/forgejo_git_test.go +++ b/tests/integration/forgejo_git_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index d2bd54eecd..89453296ca 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -17,10 +17,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 50b4de9219..110bb6c886 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_smart_http_test.go b/tests/integration/git_smart_http_test.go index 5d65cd9bd8..671ba07d23 100644 --- a/tests/integration/git_smart_http_test.go +++ b/tests/integration/git_smart_http_test.go @@ -11,13 +11,13 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/perm" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go index 551912b273..d8fed1df2e 100644 --- a/tests/integration/git_test.go +++ b/tests/integration/git_test.go @@ -18,22 +18,22 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - gitea_context "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/perm" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + gitea_context "forgejo.org/services/context" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/goget_test.go b/tests/integration/goget_test.go index 854f8d7a2d..d1187e4cb5 100644 --- a/tests/integration/goget_test.go +++ b/tests/integration/goget_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/gpg_git_test.go b/tests/integration/gpg_git_test.go index 5302997f6d..0fd998e815 100644 --- a/tests/integration/gpg_git_test.go +++ b/tests/integration/gpg_git_test.go @@ -10,15 +10,15 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index 66f833b28d..a47aaed87a 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/incoming" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - token_service "code.gitea.io/gitea/services/mailer/token" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/services/mailer/incoming" + incoming_payload "forgejo.org/services/mailer/incoming/payload" + token_service "forgejo.org/services/mailer/token" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 0110b44c29..4257a999d9 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -25,23 +25,23 @@ import ( "testing" "time" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/services/auth/source/remote" - gitea_context "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/tests" + "forgejo.org/cmd" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/graceful" + "forgejo.org/modules/json" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/modules/web" + "forgejo.org/routers" + "forgejo.org/services/auth/source/remote" + gitea_context "forgejo.org/services/context" + user_service "forgejo.org/services/user" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/markbates/goth" diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 70525c0c44..5b06b15dd7 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -15,22 +15,22 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/indexer/issues" + "forgejo.org/modules/optional" + "forgejo.org/modules/references" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/last_updated_time_test.go b/tests/integration/last_updated_time_test.go index 34ba9a471f..0b3f08677c 100644 --- a/tests/integration/last_updated_time_test.go +++ b/tests/integration/last_updated_time_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_getobject_test.go b/tests/integration/lfs_getobject_test.go index 351c1a38a4..ddaef827ef 100644 --- a/tests/integration/lfs_getobject_test.go +++ b/tests/integration/lfs_getobject_test.go @@ -11,14 +11,14 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/modules/json" + "forgejo.org/modules/lfs" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/klauspost/compress/gzhttp" gzipp "github.com/klauspost/compress/gzip" diff --git a/tests/integration/lfs_local_endpoint_test.go b/tests/integration/lfs_local_endpoint_test.go index d42888bbe1..8962e0a710 100644 --- a/tests/integration/lfs_local_endpoint_test.go +++ b/tests/integration/lfs_local_endpoint_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/lfs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go index 9b663fa8e7..6df5855ed6 100644 --- a/tests/integration/lfs_view_test.go +++ b/tests/integration/lfs_view_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/lfs" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/linguist_test.go b/tests/integration/linguist_test.go index 8690401d8a..85080c1d2e 100644 --- a/tests/integration/linguist_test.go +++ b/tests/integration/linguist_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/queue" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/indexer/stats" + "forgejo.org/modules/queue" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index e9ad933b24..3d240f900a 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -9,11 +9,11 @@ import ( "path" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go index 0eaa9669f4..e77d9682a4 100644 --- a/tests/integration/markup_external_test.go +++ b/tests/integration/markup_external_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/markup_test.go b/tests/integration/markup_test.go index d63190a885..ab6b437390 100644 --- a/tests/integration/markup_test.go +++ b/tests/integration/markup_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index 0b03a4136b..32b3ef867d 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -12,20 +12,20 @@ import ( "path/filepath" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/services/migrations" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index 729d8e0dff..8076dfa452 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -16,18 +16,18 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - migrate_base "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/migrations" + migrate_base "forgejo.org/models/migrations/base" + "forgejo.org/models/unittest" + "forgejo.org/modules/base" + "forgejo.org/modules/charset" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + "forgejo.org/modules/setting" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go index 3a1b7d6f1b..bdfdd2c6d9 100644 --- a/tests/integration/milestone_test.go +++ b/tests/integration/milestone_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go index 7072f1eb27..c9c8037e27 100644 --- a/tests/integration/mirror_pull_test.go +++ b/tests/integration/mirror_pull_test.go @@ -6,17 +6,17 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/migration" - mirror_service "code.gitea.io/gitea/services/mirror" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/migration" + mirror_service "forgejo.org/services/mirror" + release_service "forgejo.org/services/release" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index ae8d289184..ca8d536e46 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -16,23 +16,23 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - gitea_context "code.gitea.io/gitea/services/context" - doctor "code.gitea.io/gitea/services/doctor" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + asymkey_model "forgejo.org/models/asymkey" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + gitea_context "forgejo.org/services/context" + doctor "forgejo.org/services/doctor" + "forgejo.org/services/migrations" + mirror_service "forgejo.org/services/mirror" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/new_org_test.go b/tests/integration/new_org_test.go index ec9f2f244c..ab9ee4bc18 100644 --- a/tests/integration/new_org_test.go +++ b/tests/integration/new_org_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/translation" + "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/nonascii_branches_test.go b/tests/integration/nonascii_branches_test.go index 8917a9b574..2b27c8be45 100644 --- a/tests/integration/nonascii_branches_test.go +++ b/tests/integration/nonascii_branches_test.go @@ -9,7 +9,7 @@ import ( "path" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/notification_test.go b/tests/integration/notification_test.go index 6195ec2282..be1eecd1d1 100644 --- a/tests/integration/notification_test.go +++ b/tests/integration/notification_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" ) func TestNotification(t *testing.T) { diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 336d14c418..a4dea51a07 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -15,17 +15,17 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers/web/auth" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers/web/auth" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/opengraph_test.go b/tests/integration/opengraph_test.go index d54f59c9b8..38998d0c76 100644 --- a/tests/integration/opengraph_test.go +++ b/tests/integration/opengraph_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/org_count_test.go b/tests/integration/org_count_test.go index e3de9257f0..93035c8e5b 100644 --- a/tests/integration/org_count_test.go +++ b/tests/integration/org_count_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/org_nav_test.go b/tests/integration/org_nav_test.go index 37b62921ae..09736d12a0 100644 --- a/tests/integration/org_nav_test.go +++ b/tests/integration/org_nav_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_project_test.go b/tests/integration/org_project_test.go index 31d10f16ff..3ab2379b5e 100644 --- a/tests/integration/org_project_test.go +++ b/tests/integration/org_project_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/tests" ) func TestOrgProjectAccess(t *testing.T) { diff --git a/tests/integration/org_settings_test.go b/tests/integration/org_settings_test.go index 56b7b02271..fde57e2e26 100644 --- a/tests/integration/org_settings_test.go +++ b/tests/integration/org_settings_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index 2fe296e8c3..3ca236a5dd 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/organization" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index eabfe11dcd..bc1a5bbe72 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/organization" + "forgejo.org/models/perm" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/private_project_test.go b/tests/integration/private_project_test.go index 663c1c1e75..b2ad8d1cd7 100644 --- a/tests/integration/private_project_test.go +++ b/tests/integration/private_project_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - org_model "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + org_model "forgejo.org/models/organization" + project_model "forgejo.org/models/project" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 5362462f7d..84f09c64e1 100644 --- a/tests/integration/privateactivity_test.go +++ b/tests/integration/privateactivity_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "forgejo.org/models/activities" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/proctected_branch_test.go b/tests/integration/proctected_branch_test.go index 9c6e5e3cae..5024b63c42 100644 --- a/tests/integration/proctected_branch_test.go +++ b/tests/integration/proctected_branch_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index fc2986e1eb..7dc8bf112d 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go index 5ef6d6ceca..90d16d725d 100644 --- a/tests/integration/pull_commit_test.go +++ b/tests/integration/pull_commit_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/tests" + pull_service "forgejo.org/services/pull" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go index f5baf05965..adb24c60f6 100644 --- a/tests/integration/pull_compare_test.go +++ b/tests/integration/pull_compare_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index 7ccbce2eae..42155076a8 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -14,17 +14,17 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_diff_test.go b/tests/integration/pull_diff_test.go index 5411250935..70e0d5d33a 100644 --- a/tests/integration/pull_diff_test.go +++ b/tests/integration/pull_diff_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_editable_test.go b/tests/integration/pull_editable_test.go index dfd634f0b5..f2e6f2f52c 100644 --- a/tests/integration/pull_editable_test.go +++ b/tests/integration/pull_editable_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + api "forgejo.org/modules/structs" + "forgejo.org/tests" ) func TestPullEditable_ShowEditableLabel(t *testing.T) { diff --git a/tests/integration/pull_icon_test.go b/tests/integration/pull_icon_test.go index b678550c30..9ab8f244cf 100644 --- a/tests/integration/pull_icon_test.go +++ b/tests/integration/pull_icon_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index d583abe226..f60fc27bb3 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -17,32 +17,32 @@ import ( "testing" "time" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/automerge" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/pull" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" - files_service "code.gitea.io/gitea/services/repository/files" - webhook_service "code.gitea.io/gitea/services/webhook" - "code.gitea.io/gitea/tests" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + pull_model "forgejo.org/models/pull" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/hostmatcher" + "forgejo.org/modules/queue" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/services/automerge" + forgejo_context "forgejo.org/services/context" + "forgejo.org/services/forms" + "forgejo.org/services/pull" + commitstatus_service "forgejo.org/services/repository/commitstatus" + files_service "forgejo.org/services/repository/files" + webhook_service "forgejo.org/services/webhook" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_reopen_test.go b/tests/integration/pull_reopen_test.go index e510d59626..cf95f6b730 100644 --- a/tests/integration/pull_reopen_test.go +++ b/tests/integration/pull_reopen_test.go @@ -12,20 +12,20 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + issues_model "forgejo.org/models/issues" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_request_task_test.go b/tests/integration/pull_request_task_test.go index e268cb8cc5..777aac08a5 100644 --- a/tests/integration/pull_request_task_test.go +++ b/tests/integration/pull_request_task_test.go @@ -7,19 +7,19 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/log" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 1777d20d92..6dacdc4315 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -14,19 +14,19 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/services/mailer" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/gitrepo" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/test" + issue_service "forgejo.org/services/issue" + "forgejo.org/services/mailer" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go index 80eea34513..1fdc871bb3 100644 --- a/tests/integration/pull_status_test.go +++ b/tests/integration/pull_status_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_test.go b/tests/integration/pull_test.go index edca5f0384..3695ebe5f2 100644 --- a/tests/integration/pull_test.go +++ b/tests/integration/pull_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index f36ea88c2b..18766e8fa4 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -11,19 +11,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + pull_service "forgejo.org/services/pull" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/quota_use_test.go b/tests/integration/quota_use_test.go index 39c5c1ae5c..314dcff6e9 100644 --- a/tests/integration/quota_use_test.go +++ b/tests/integration/quota_use_test.go @@ -14,20 +14,20 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - quota_model "code.gitea.io/gitea/models/quota" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - forgejo_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + org_model "forgejo.org/models/organization" + quota_model "forgejo.org/models/quota" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + forgejo_context "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" gouuid "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/tests/integration/release_feed_test.go b/tests/integration/release_feed_test.go index fd1f42c3cd..0ab299f617 100644 --- a/tests/integration/release_feed_test.go +++ b/tests/integration/release_feed_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index c535c6c93d..b1162780ab 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/remote_test.go b/tests/integration/remote_test.go index 3c322deea1..506ee8ecaa 100644 --- a/tests/integration/remote_test.go +++ b/tests/integration/remote_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" - remote_service "code.gitea.io/gitea/services/remote" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/test" + remote_service "forgejo.org/services/remote" + "forgejo.org/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go index 20d4c9b48f..d7440e5125 100644 --- a/tests/integration/rename_branch_test.go +++ b/tests/integration/rename_branch_test.go @@ -8,11 +8,11 @@ import ( "net/url" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + gitea_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go index c1177fac11..6199373119 100644 --- a/tests/integration/repo_activity_test.go +++ b/tests/integration/repo_activity_test.go @@ -11,15 +11,15 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/test" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_archive_test.go b/tests/integration/repo_archive_test.go index aea500b9b1..f0ffedfd9b 100644 --- a/tests/integration/repo_archive_test.go +++ b/tests/integration/repo_archive_test.go @@ -13,14 +13,14 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/routers/web" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_archive_text_test.go b/tests/integration/repo_archive_text_test.go index e759246aa4..db133ce7d7 100644 --- a/tests/integration/repo_archive_text_test.go +++ b/tests/integration/repo_archive_text_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_badges_test.go b/tests/integration/repo_badges_test.go index a74d3979c2..baaa8c136a 100644 --- a/tests/integration/repo_badges_test.go +++ b/tests/integration/repo_badges_test.go @@ -12,19 +12,19 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/services/release" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/services/release" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index df9ea9a97c..46cd29d025 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -12,16 +12,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_citation_test.go b/tests/integration/repo_citation_test.go index 4f7e24ee51..5651ac3db3 100644 --- a/tests/integration/repo_citation_test.go +++ b/tests/integration/repo_citation_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_collaborator_test.go b/tests/integration/repo_collaborator_test.go index b3e7197c7e..e18308e7cb 100644 --- a/tests/integration/repo_collaborator_test.go +++ b/tests/integration/repo_collaborator_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_search_test.go b/tests/integration/repo_commits_search_test.go index 74ac25c0f5..92ff74ba68 100644 --- a/tests/integration/repo_commits_search_test.go +++ b/tests/integration/repo_commits_search_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index e399898958..f3d3a145ae 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -11,11 +11,11 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/json" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_delete_test.go b/tests/integration/repo_delete_test.go index 44ef26f19a..faabd13432 100644 --- a/tests/integration/repo_delete_test.go +++ b/tests/integration/repo_delete_test.go @@ -6,13 +6,13 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - repo_service "code.gitea.io/gitea/services/repository" + "forgejo.org/models/db" + "forgejo.org/models/organization" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + repo_service "forgejo.org/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_flags_test.go b/tests/integration/repo_flags_test.go index 8b64776a5a..c52610cd10 100644 --- a/tests/integration/repo_flags_test.go +++ b/tests/integration/repo_flags_test.go @@ -10,16 +10,16 @@ import ( "slices" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index b64991ae18..03bbba1b2c 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -12,16 +12,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + repo_service "forgejo.org/services/repository" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index d541a4b651..fd29156e4e 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_git_note_test.go b/tests/integration/repo_git_note_test.go index 6ad57c81b0..e6b23754db 100644 --- a/tests/integration/repo_git_note_test.go +++ b/tests/integration/repo_git_note_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_issue_title_test.go b/tests/integration/repo_issue_title_test.go index cf517a7a40..587db43223 100644 --- a/tests/integration/repo_issue_title_test.go +++ b/tests/integration/repo_issue_title_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + issue_service "forgejo.org/services/issue" + pull_service "forgejo.org/services/pull" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_mergecommit_revert_test.go b/tests/integration/repo_mergecommit_revert_test.go index eb75d45c15..600ee991f8 100644 --- a/tests/integration/repo_mergecommit_revert_test.go +++ b/tests/integration/repo_mergecommit_revert_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_migrate_test.go b/tests/integration/repo_migrate_test.go index 9fb7a73379..233a55ef8f 100644 --- a/tests/integration/repo_migrate_test.go +++ b/tests/integration/repo_migrate_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go index 594b09b490..5e2f0c0a76 100644 --- a/tests/integration/repo_migration_ui_test.go +++ b/tests/integration/repo_migration_ui_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_pagination_test.go b/tests/integration/repo_pagination_test.go index 1c1f2ac82e..692936353b 100644 --- a/tests/integration/repo_pagination_test.go +++ b/tests/integration/repo_pagination_test.go @@ -8,11 +8,11 @@ import ( "path" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 60eca66735..909668d3ca 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + code_indexer "forgejo.org/modules/indexer/code" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_settings_hook_test.go b/tests/integration/repo_settings_hook_test.go index 0a3dd57160..f7349d4e66 100644 --- a/tests/integration/repo_settings_hook_test.go +++ b/tests/integration/repo_settings_hook_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_settings_test.go b/tests/integration/repo_settings_test.go index 2c4ffba24d..f78df96a93 100644 --- a/tests/integration/repo_settings_test.go +++ b/tests/integration/repo_settings_test.go @@ -9,22 +9,22 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgefed" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - fm "code.gitea.io/gitea/modules/forgefed" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/validation" - gitea_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/forgefed" + git_model "forgejo.org/models/git" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + fm "forgejo.org/modules/forgefed" + "forgejo.org/modules/optional" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/validation" + gitea_context "forgejo.org/services/context" + repo_service "forgejo.org/services/repository" + user_service "forgejo.org/services/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_signed_tag_test.go b/tests/integration/repo_signed_tag_test.go index 41e663ce52..16d8841304 100644 --- a/tests/integration/repo_signed_tag_test.go +++ b/tests/integration/repo_signed_tag_test.go @@ -10,16 +10,16 @@ import ( "os/exec" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/graceful" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/repo_starwatch_test.go b/tests/integration/repo_starwatch_test.go index a8bad30109..3bcfa29fe3 100644 --- a/tests/integration/repo_starwatch_test.go +++ b/tests/integration/repo_starwatch_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 0ce0e142b9..9be33ec8a8 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/release" - "code.gitea.io/gitea/tests" + "forgejo.org/models" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + repo_module "forgejo.org/modules/repository" + api "forgejo.org/modules/structs" + "forgejo.org/services/release" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 5445ce6d4c..f8961443c5 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -12,18 +12,18 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_topic_test.go b/tests/integration/repo_topic_test.go index f5778a2861..6dc60e2c3a 100644 --- a/tests/integration/repo_topic_test.go +++ b/tests/integration/repo_topic_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_view_test.go b/tests/integration/repo_view_test.go index 46e75063bc..7ea4aeb4c6 100644 --- a/tests/integration/repo_view_test.go +++ b/tests/integration/repo_view_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/routers/web/repo" + "forgejo.org/services/context" + "forgejo.org/services/contexttest" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_watch_test.go b/tests/integration/repo_watch_test.go index ef3028f293..0bcb039b01 100644 --- a/tests/integration/repo_watch_test.go +++ b/tests/integration/repo_watch_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" ) func TestRepoWatch(t *testing.T) { diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 37bad56b9e..be1b9cbcec 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/webhook" - "code.gitea.io/gitea/tests" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/webhook" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_wiki_test.go b/tests/integration/repo_wiki_test.go index eeb49cc7cf..5cd893702d 100644 --- a/tests/integration/repo_wiki_test.go +++ b/tests/integration/repo_wiki_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index 1896971046..dce310b0fc 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/runner_test.go b/tests/integration/runner_test.go index bab2a67230..2ca0a6b996 100644 --- a/tests/integration/runner_test.go +++ b/tests/integration/runner_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + actions_model "forgejo.org/models/actions" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/session_test.go b/tests/integration/session_test.go index a5bcab269a..7af5645dec 100644 --- a/tests/integration/session_test.go +++ b/tests/integration/session_test.go @@ -6,10 +6,10 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 5635faad38..66790e5835 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go index f8e2e079ca..dd8322214a 100644 --- a/tests/integration/signin_test.go +++ b/tests/integration/signin_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index 7fd0b5c64a..efcf54f14d 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" ) func TestSignOut(t *testing.T) { diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go index 39533bbf89..91752d415e 100644 --- a/tests/integration/signup_test.go +++ b/tests/integration/signup_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/cache" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/size_translations_test.go b/tests/integration/size_translations_test.go index a0b88291f4..d34cd0b490 100644 --- a/tests/integration/size_translations_test.go +++ b/tests/integration/size_translations_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go index ebf0d26c2d..aece9c3fd9 100644 --- a/tests/integration/ssh_key_test.go +++ b/tests/integration/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/git" + api "forgejo.org/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/swagger_test.go b/tests/integration/swagger_test.go index 584601f7f9..ac10a91691 100644 --- a/tests/integration/swagger_test.go +++ b/tests/integration/swagger_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/json" + "forgejo.org/tests" swagger_spec "github.com/go-openapi/spec" "github.com/stretchr/testify/require" diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go index 10e539cbe6..49ae92033e 100644 --- a/tests/integration/timetracking_test.go +++ b/tests/integration/timetracking_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/test" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go index a7c0264aaa..b0d930d71f 100644 --- a/tests/integration/user_avatar_test.go +++ b/tests/integration/user_avatar_test.go @@ -12,11 +12,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/avatar" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/user_count_test.go b/tests/integration/user_count_test.go index 8fb78a61ee..5f762ca317 100644 --- a/tests/integration/user_count_test.go +++ b/tests/integration/user_count_test.go @@ -9,15 +9,15 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/organization" + packages_model "forgejo.org/models/packages" + project_model "forgejo.org/models/project" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/optional" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/user_dashboard_test.go b/tests/integration/user_dashboard_test.go index 20f3f858f9..b95bdab078 100644 --- a/tests/integration/user_dashboard_test.go +++ b/tests/integration/user_dashboard_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/translation" - issue_service "code.gitea.io/gitea/services/issue" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/translation" + issue_service "forgejo.org/services/issue" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_activity_test.go index f1269e5e93..eb9bfa1741 100644 --- a/tests/integration/user_profile_activity_test.go +++ b/tests/integration/user_profile_activity_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_profile_follows_test.go b/tests/integration/user_profile_follows_test.go index 24b74268e6..08bd58db16 100644 --- a/tests/integration/user_profile_follows_test.go +++ b/tests/integration/user_profile_follows_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_profile_test.go b/tests/integration/user_profile_test.go index 5532403510..04d87c49ab 100644 --- a/tests/integration/user_profile_test.go +++ b/tests/integration/user_profile_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_redirect_test.go b/tests/integration/user_redirect_test.go index 2235876859..52dc5d9d3a 100644 --- a/tests/integration/user_redirect_test.go +++ b/tests/integration/user_redirect_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/modules/timeutil" + forgejo_context "forgejo.org/services/context" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index 58ab4b52d7..5e02f90f9e 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -15,20 +15,20 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/models/db" + issues_model "forgejo.org/models/issues" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/modules/translation" + gitea_context "forgejo.org/services/context" + "forgejo.org/services/mailer" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/pquerna/otp/totp" diff --git a/tests/integration/version_test.go b/tests/integration/version_test.go index 144471adb2..9db586ee97 100644 --- a/tests/integration/version_test.go +++ b/tests/integration/version_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + auth_model "forgejo.org/models/auth" + "forgejo.org/modules/setting" + "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/routers" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/view_test.go b/tests/integration/view_test.go index 41e60b4d9b..80371b84ce 100644 --- a/tests/integration/view_test.go +++ b/tests/integration/view_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + files_service "forgejo.org/services/repository/files" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go index 18f509aca9..053528d919 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/webhook_test.go b/tests/integration/webhook_test.go index 60d4d48d7c..6d92a16dd8 100644 --- a/tests/integration/webhook_test.go +++ b/tests/integration/webhook_test.go @@ -8,17 +8,17 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/release" - "code.gitea.io/gitea/tests" + "forgejo.org/models/db" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/git" + "forgejo.org/modules/gitrepo" + "forgejo.org/modules/json" + webhook_module "forgejo.org/modules/webhook" + "forgejo.org/services/release" + "forgejo.org/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go index 587b138175..3e4761b9bd 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/wiki_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "forgejo.org/modules/git" + "forgejo.org/modules/util" + "forgejo.org/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go index 6ac5b062f2..2c4934c541 100644 --- a/tests/integration/xss_test.go +++ b/tests/integration/xss_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "forgejo.org/models/issues" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/test_utils.go b/tests/test_utils.go index c4d87ca619..e6aa9c7963 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -16,27 +16,27 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - wiki_service "code.gitea.io/gitea/services/wiki" + "forgejo.org/models/db" + packages_model "forgejo.org/models/packages" + repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/base" + "forgejo.org/modules/git" + "forgejo.org/modules/graceful" + "forgejo.org/modules/log" + "forgejo.org/modules/optional" + "forgejo.org/modules/process" + repo_module "forgejo.org/modules/repository" + "forgejo.org/modules/setting" + "forgejo.org/modules/storage" + "forgejo.org/modules/testlogger" + "forgejo.org/modules/util" + "forgejo.org/routers" + repo_service "forgejo.org/services/repository" + files_service "forgejo.org/services/repository/files" + wiki_service "forgejo.org/services/wiki" "github.com/google/uuid" "github.com/stretchr/testify/assert" From 7990bcf3333ffd84e722290cf309b82881a67dbb Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Thu, 27 Mar 2025 21:01:29 +0000 Subject: [PATCH 009/568] feat(ui): improve button gap consistency, make it variable, larger on touchscreens (#7271) * home buttons: use `button-sequence` for consistency of gaps with other ui * folder-actions: use `button-sequence` for better overflowing and so gap actually works instead of relying on whitespace, because currently it doesn't due to lack of flex * introduce variable `--button-spacing` for `button-row` and `button-sequence` * it's `0.33rem` on desktop for more pleasant hovering over button rows * it's `0.5rem` on touchscreens for worrying less about misstapping Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7271 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/repo/home.tmpl | 6 +++--- web_src/css/base.css | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 871790ce28..d1685f6a79 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -56,8 +56,8 @@ {{$l := Eval $n "-" 1}} {{$isHomepage := (eq $n 0)}}
-
- {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mr-1"}} +
+ {{template "repo/branch_dropdown" dict "root" .}} {{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}} {{$cmpBranch := ""}} {{if ne .Repository.ID .BaseRepo.ID}} @@ -141,7 +141,7 @@ {{template "repo/cite/cite_modal" .}} {{end}} {{if and (not $isHomepage) (not .IsViewFile) (not .IsBlame)}}{{/* IsViewDirectory (not home), TODO: split the templates, avoid using "if" tricks */}} -
+
{{svg "octicon-history" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.file_history"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 5b0085ee0d..cffc1ea1b1 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -27,6 +27,7 @@ --checkbox-size: 15px; /* height and width of checkbox and radio inputs */ --page-spacing: 16px; /* space between page elements */ --page-margin-x: 32px; /* minimum space on left and right side of page */ + --button-spacing: 0.33rem; } @media (min-width: 768px) and (max-width: 1200px) { @@ -41,6 +42,12 @@ } } +@media (pointer: coarse) { + :root { + --button-spacing: 0.5rem; + } +} + :root * { --fonts-regular: var(--fonts-override, var(--fonts-proportional)), "Noto Sans", "Liberation Sans", sans-serif, var(--fonts-emoji); } @@ -247,13 +254,13 @@ h1.error-code { } .button-row { - gap: 0.5rem; + gap: var(--button-spacing); } .button-sequence { display: flex; flex-flow: wrap; - gap: 0.5em; + gap: var(--button-spacing); } .button-sequence.right { From da8aa01466448f28ab958d0876e827b9cac7f13c Mon Sep 17 00:00:00 2001 From: Simon Ochsenreither Date: Thu, 27 Mar 2025 21:07:59 +0000 Subject: [PATCH 010/568] fix(ui): improve vertical alignment of icons with text in the overflow menu (#7314) - Add `vertical-align: baseline` to the svg class. - Improves the vertical alignment of the icons that contain text in the overflow menu, and possibly in other places. Co-authored-by: Simon Ochsenreither Co-committed-by: Simon Ochsenreither --- web_src/css/base.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/css/base.css b/web_src/css/base.css index cffc1ea1b1..77458ec134 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -382,6 +382,7 @@ a.label, } .ui.menu .item > .svg { + align-self: baseline; margin-right: 0.35em; } From 85ae9d710c44cae56adc827a0a3bf6ce4cc94bd1 Mon Sep 17 00:00:00 2001 From: Simon Ochsenreither Date: Fri, 28 Mar 2025 11:47:58 +0000 Subject: [PATCH 011/568] fix(ui): improve vertical alignment of icons with text in the overflow menu (#7356) - Follow up for #7314. Turns out this impacted the positioning of icons in tabs negatively, like the "Conversation"/"Commits"/"Files changed". - Limit the change to the `overflow-menu` element. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7356 Reviewed-by: Gusted Co-authored-by: Simon Ochsenreither Co-committed-by: Simon Ochsenreither --- web_src/css/base.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 77458ec134..e3d2345e21 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -382,7 +382,6 @@ a.label, } .ui.menu .item > .svg { - align-self: baseline; margin-right: 0.35em; } @@ -1060,6 +1059,10 @@ overflow-menu .overflow-menu-items .item { margin-bottom: 0 !important; /* reset fomantic's margin, because the active menu has special bottom border */ } +overflow-menu .overflow-menu-items .item > .svg { + align-self: baseline; +} + overflow-menu .ui.label { margin-left: 7px !important; /* save some space */ } From 6cac7702e93ded64eeb18b38da5aa353ee8811a2 Mon Sep 17 00:00:00 2001 From: ThomasBoom89 Date: Fri, 28 Mar 2025 11:50:05 +0000 Subject: [PATCH 012/568] fix(api): encode empty requested reviewers as an empty array (#7355) - Always initialize `RequestedReviewers` and `RequestedReviewersTeams`, this avoids the JSON encoder from encoding it to the zero value `null` and instead return a empty array. - Resolves #4108 - Integration test added. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7355 Reviewed-by: Gusted Co-authored-by: ThomasBoom89 Co-committed-by: ThomasBoom89 --- services/convert/pull.go | 52 ++++++++++++------------ tests/integration/api_repo_pulls_test.go | 34 ++++++++++++++++ 2 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 tests/integration/api_repo_pulls_test.go diff --git a/services/convert/pull.go b/services/convert/pull.go index 7bee2b4c44..0cb4070595 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -66,31 +66,33 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u } apiPullRequest := &api.PullRequest{ - ID: pr.ID, - URL: pr.Issue.HTMLURL(), - Index: pr.Index, - Poster: apiIssue.Poster, - Title: apiIssue.Title, - Body: apiIssue.Body, - Labels: apiIssue.Labels, - Milestone: apiIssue.Milestone, - Assignee: apiIssue.Assignee, - Assignees: apiIssue.Assignees, - State: apiIssue.State, - Draft: pr.IsWorkInProgress(ctx), - IsLocked: apiIssue.IsLocked, - Comments: apiIssue.Comments, - ReviewComments: pr.GetReviewCommentsCount(ctx), - HTMLURL: pr.Issue.HTMLURL(), - DiffURL: pr.Issue.DiffURL(), - PatchURL: pr.Issue.PatchURL(), - HasMerged: pr.HasMerged, - MergeBase: pr.MergeBase, - Mergeable: pr.Mergeable(ctx), - Deadline: apiIssue.Deadline, - Created: pr.Issue.CreatedUnix.AsTimePtr(), - Updated: pr.Issue.UpdatedUnix.AsTimePtr(), - PinOrder: apiIssue.PinOrder, + ID: pr.ID, + URL: pr.Issue.HTMLURL(), + Index: pr.Index, + Poster: apiIssue.Poster, + Title: apiIssue.Title, + Body: apiIssue.Body, + Labels: apiIssue.Labels, + Milestone: apiIssue.Milestone, + Assignee: apiIssue.Assignee, + Assignees: apiIssue.Assignees, + State: apiIssue.State, + Draft: pr.IsWorkInProgress(ctx), + IsLocked: apiIssue.IsLocked, + Comments: apiIssue.Comments, + ReviewComments: pr.GetReviewCommentsCount(ctx), + HTMLURL: pr.Issue.HTMLURL(), + DiffURL: pr.Issue.DiffURL(), + PatchURL: pr.Issue.PatchURL(), + HasMerged: pr.HasMerged, + MergeBase: pr.MergeBase, + Mergeable: pr.Mergeable(ctx), + Deadline: apiIssue.Deadline, + Created: pr.Issue.CreatedUnix.AsTimePtr(), + Updated: pr.Issue.UpdatedUnix.AsTimePtr(), + PinOrder: apiIssue.PinOrder, + RequestedReviewers: []*api.User{}, + RequestedReviewersTeams: []*api.Team{}, AllowMaintainerEdit: pr.AllowMaintainerEdit, diff --git a/tests/integration/api_repo_pulls_test.go b/tests/integration/api_repo_pulls_test.go new file mode 100644 index 0000000000..71cddcddf2 --- /dev/null +++ b/tests/integration/api_repo_pulls_test.go @@ -0,0 +1,34 @@ +// Copyright 2021 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "testing" + + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/unittest" + api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPIRepoPulls(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + // repo = user2/repo1 + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + + // issue id without assigned review member or review team + issueID := 5 + req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", repo.OwnerName, repo.Name, issueID)) + res := MakeRequest(t, req, http.StatusOK) + var pr *api.PullRequest + DecodeJSON(t, res, &pr) + + assert.NotNil(t, pr.RequestedReviewers) + assert.NotNil(t, pr.RequestedReviewersTeams) +} From 5380f23daba969057d9afc53c3dc746eca95188c Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 28 Mar 2025 12:06:07 +0000 Subject: [PATCH 013/568] chore: use correct import (#7371) - follow up for forgejo/forgejo#7355. It was merged before being rebased on the forgejo branch Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7371 Co-authored-by: Gusted Co-committed-by: Gusted --- tests/integration/api_repo_pulls_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/api_repo_pulls_test.go b/tests/integration/api_repo_pulls_test.go index 71cddcddf2..aec492e65f 100644 --- a/tests/integration/api_repo_pulls_test.go +++ b/tests/integration/api_repo_pulls_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) From e153e21177e0388315751f233d79026c134733c2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Mar 2025 12:42:09 +0000 Subject: [PATCH 014/568] Update module golang.org/x/net to v0.38.0 (v11.0/forgejo) (#7370) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7370 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4284ff362b..b4ca6c444d 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( go.uber.org/mock v0.5.0 golang.org/x/crypto v0.36.0 golang.org/x/image v0.25.0 - golang.org/x/net v0.37.0 + golang.org/x/net v0.38.0 golang.org/x/oauth2 v0.28.0 golang.org/x/sync v0.12.0 golang.org/x/sys v0.31.0 diff --git a/go.sum b/go.sum index 67a1642186..3e0bcb61b2 100644 --- a/go.sum +++ b/go.sum @@ -1647,8 +1647,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 1d1e0ced3e6e4a9dd751770e1f7f509e5d569969 Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Fri, 28 Mar 2025 13:22:41 +0000 Subject: [PATCH 015/568] [v11.0/forgejo] fix(api): encode empty requested reviewers as an empty array (#7365) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7355 - Always initialize `RequestedReviewers` and `RequestedReviewersTeams`, this avoids the JSON encoder from encoding it to the zero value `null` and instead return a empty array. - Resolves #4108 - Integration test added. Co-authored-by: ThomasBoom89 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7365 Reviewed-by: Gusted Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- services/convert/pull.go | 52 ++++++++++++------------ tests/integration/api_repo_pulls_test.go | 34 ++++++++++++++++ 2 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 tests/integration/api_repo_pulls_test.go diff --git a/services/convert/pull.go b/services/convert/pull.go index 7bee2b4c44..0cb4070595 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -66,31 +66,33 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u } apiPullRequest := &api.PullRequest{ - ID: pr.ID, - URL: pr.Issue.HTMLURL(), - Index: pr.Index, - Poster: apiIssue.Poster, - Title: apiIssue.Title, - Body: apiIssue.Body, - Labels: apiIssue.Labels, - Milestone: apiIssue.Milestone, - Assignee: apiIssue.Assignee, - Assignees: apiIssue.Assignees, - State: apiIssue.State, - Draft: pr.IsWorkInProgress(ctx), - IsLocked: apiIssue.IsLocked, - Comments: apiIssue.Comments, - ReviewComments: pr.GetReviewCommentsCount(ctx), - HTMLURL: pr.Issue.HTMLURL(), - DiffURL: pr.Issue.DiffURL(), - PatchURL: pr.Issue.PatchURL(), - HasMerged: pr.HasMerged, - MergeBase: pr.MergeBase, - Mergeable: pr.Mergeable(ctx), - Deadline: apiIssue.Deadline, - Created: pr.Issue.CreatedUnix.AsTimePtr(), - Updated: pr.Issue.UpdatedUnix.AsTimePtr(), - PinOrder: apiIssue.PinOrder, + ID: pr.ID, + URL: pr.Issue.HTMLURL(), + Index: pr.Index, + Poster: apiIssue.Poster, + Title: apiIssue.Title, + Body: apiIssue.Body, + Labels: apiIssue.Labels, + Milestone: apiIssue.Milestone, + Assignee: apiIssue.Assignee, + Assignees: apiIssue.Assignees, + State: apiIssue.State, + Draft: pr.IsWorkInProgress(ctx), + IsLocked: apiIssue.IsLocked, + Comments: apiIssue.Comments, + ReviewComments: pr.GetReviewCommentsCount(ctx), + HTMLURL: pr.Issue.HTMLURL(), + DiffURL: pr.Issue.DiffURL(), + PatchURL: pr.Issue.PatchURL(), + HasMerged: pr.HasMerged, + MergeBase: pr.MergeBase, + Mergeable: pr.Mergeable(ctx), + Deadline: apiIssue.Deadline, + Created: pr.Issue.CreatedUnix.AsTimePtr(), + Updated: pr.Issue.UpdatedUnix.AsTimePtr(), + PinOrder: apiIssue.PinOrder, + RequestedReviewers: []*api.User{}, + RequestedReviewersTeams: []*api.Team{}, AllowMaintainerEdit: pr.AllowMaintainerEdit, diff --git a/tests/integration/api_repo_pulls_test.go b/tests/integration/api_repo_pulls_test.go new file mode 100644 index 0000000000..aec492e65f --- /dev/null +++ b/tests/integration/api_repo_pulls_test.go @@ -0,0 +1,34 @@ +// Copyright 2021 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "testing" + + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + api "forgejo.org/modules/structs" + "forgejo.org/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPIRepoPulls(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + // repo = user2/repo1 + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + + // issue id without assigned review member or review team + issueID := 5 + req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", repo.OwnerName, repo.Name, issueID)) + res := MakeRequest(t, req, http.StatusOK) + var pr *api.PullRequest + DecodeJSON(t, res, &pr) + + assert.NotNil(t, pr.RequestedReviewers) + assert.NotNil(t, pr.RequestedReviewersTeams) +} From adce8fa7dda4d3602097d40742ea604bbe78491c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Mar 2025 13:23:33 +0000 Subject: [PATCH 016/568] Update dependency eslint-plugin-unicorn to v58 (forgejo) (#7372) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 50 ++++++++++++++++++----------------------------- package.json | 2 +- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e597bc511..98e651974a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ "eslint-plugin-regexp": "2.7.0", "eslint-plugin-sonarjs": "3.0.2", "eslint-plugin-toml": "0.12.0", - "eslint-plugin-unicorn": "57.0.0", + "eslint-plugin-unicorn": "58.0.0", "eslint-plugin-vitest-globals": "1.5.0", "eslint-plugin-vue": "10.0.0", "eslint-plugin-vue-scoped-css": "2.9.0", @@ -7002,21 +7002,22 @@ } }, "node_modules/eslint-plugin-unicorn": { - "version": "57.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-57.0.0.tgz", - "integrity": "sha512-zUYYa6zfNdTeG9BISWDlcLmz16c+2Ck2o5ZDHh0UzXJz3DEP7xjmlVDTzbyV0W+XksgZ0q37WEWzN2D2Ze+g9Q==", + "version": "58.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-58.0.0.tgz", + "integrity": "sha512-fc3iaxCm9chBWOHPVjn+Czb/wHS0D2Mko7wkOdobqo9R2bbFObc4LyZaLTNy0mhZOP84nKkLhTUQxlLOZ7EjKw==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", - "@eslint-community/eslint-utils": "^4.4.1", - "ci-info": "^4.1.0", + "@eslint-community/eslint-utils": "^4.5.1", + "@eslint/plugin-kit": "^0.2.7", + "ci-info": "^4.2.0", "clean-regexp": "^1.0.0", - "core-js-compat": "^3.40.0", + "core-js-compat": "^3.41.0", "esquery": "^1.6.0", - "globals": "^15.15.0", + "globals": "^16.0.0", "indent-string": "^5.0.0", - "is-builtin-module": "^4.0.0", + "is-builtin-module": "^5.0.0", "jsesc": "^3.1.0", "pluralize": "^8.0.0", "read-package-up": "^11.0.0", @@ -7026,26 +7027,13 @@ "strip-indent": "^4.0.0" }, "engines": { - "node": ">=18.18" + "node": "^18.20.0 || ^20.10.0 || >=21.0.0" }, "funding": { "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1" }, "peerDependencies": { - "eslint": ">=9.20.0" - } - }, - "node_modules/eslint-plugin-unicorn/node_modules/globals": { - "version": "15.15.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", - "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "eslint": ">=9.22.0" } }, "node_modules/eslint-plugin-vitest-globals": { @@ -8449,13 +8437,13 @@ } }, "node_modules/is-builtin-module": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-4.0.0.tgz", - "integrity": "sha512-rWP3AMAalQSesXO8gleROyL2iKU73SX5Er66losQn9rWOWL4Gef0a/xOEOVqjWGMuR2vHG3FJ8UUmT700O8oFg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz", + "integrity": "sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==", "dev": true, "license": "MIT", "dependencies": { - "builtin-modules": "^4.0.0" + "builtin-modules": "^5.0.0" }, "engines": { "node": ">=18.20" @@ -8465,9 +8453,9 @@ } }, "node_modules/is-builtin-module/node_modules/builtin-modules": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-4.0.0.tgz", - "integrity": "sha512-p1n8zyCkt1BVrKNFymOHjcDSAl7oq/gUvfgULv2EblgpPVQlQr9yHnWjg9IJ2MhfwPqiYqMMrr01OY7yQoK2yA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.0.0.tgz", + "integrity": "sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index a903935464..7a63b45903 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-plugin-playwright": "2.2.0", "eslint-plugin-regexp": "2.7.0", "eslint-plugin-sonarjs": "3.0.2", - "eslint-plugin-unicorn": "57.0.0", + "eslint-plugin-unicorn": "58.0.0", "eslint-plugin-toml": "0.12.0", "eslint-plugin-vitest-globals": "1.5.0", "eslint-plugin-vue": "10.0.0", From cdf254816b4c4836cb5f4b961831674ee2d07ebd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Mar 2025 14:12:05 +0000 Subject: [PATCH 017/568] Update module golang.org/x/net to v0.38.0 (forgejo) (#7362) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7362 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4284ff362b..b4ca6c444d 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( go.uber.org/mock v0.5.0 golang.org/x/crypto v0.36.0 golang.org/x/image v0.25.0 - golang.org/x/net v0.37.0 + golang.org/x/net v0.38.0 golang.org/x/oauth2 v0.28.0 golang.org/x/sync v0.12.0 golang.org/x/sys v0.31.0 diff --git a/go.sum b/go.sum index 67a1642186..3e0bcb61b2 100644 --- a/go.sum +++ b/go.sum @@ -1647,8 +1647,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 683eb5bf7817d85a44170b51b9a6cc9691cefd34 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Mar 2025 14:25:27 +0000 Subject: [PATCH 018/568] Update https://data.forgejo.org/tj-actions/changed-files action to v46 (forgejo) (#7366) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7366 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index 62136b1b28..4d88d3efb0 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -116,7 +116,7 @@ jobs: - uses: ./.forgejo/workflows-composite/build-backend - name: Get changed files id: changed-files - uses: https://data.forgejo.org/tj-actions/changed-files@v45 + uses: https://data.forgejo.org/tj-actions/changed-files@v46 with: separator: '\n' - run: | From 51ff4970ec8b91f5853aadc47e2e93724ff4d6e8 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Fri, 28 Mar 2025 19:50:43 +0000 Subject: [PATCH 019/568] ui: improve error pages (#7274) * add testing * make each page accessible via `/devtest/error` * allow translating the `Page not found` part of the title * code: improve consistency, remove unused * devtest: put index page in a container to fix alignment * 500: make navbar more like the real one, remove fake menu button * deadcode: remove unused `func NotFound`: it was added in https://codeberg.org/forgejo/forgejo/commit/bdd32f152d73f31beffa854fb7382072043ef235 and the only usage was removed in https://codeberg.org/forgejo/forgejo/commit/1bfb0a24d843e10d6d95c4319a84980485e584ed Preview: https://codeberg.org/attachments/1b75afb3-e898-410f-be02-f036a5400143 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7274 Reviewed-by: Gusted Reviewed-by: Beowulf --- .deadcode-out | 3 -- modules/testlogger/testlogger.go | 3 ++ options/locale_next/locale_en-US.json | 5 ++- routers/web/devtest/devtest.go | 13 ++++++ routers/web/home.go | 7 +--- routers/web/web.go | 2 + services/context/context_response.go | 11 +++-- templates/devtest/list.tmpl | 21 +++++++--- templates/status/500.tmpl | 17 +++----- tests/integration/devtest_error_test.go | 53 +++++++++++++++++++++++++ tests/integration/repo_test.go | 3 +- 11 files changed, 106 insertions(+), 32 deletions(-) create mode 100644 tests/integration/devtest_error_test.go diff --git a/.deadcode-out b/.deadcode-out index e366abee94..31184826ae 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -210,9 +210,6 @@ forgejo.org/modules/zstd Writer.Write Writer.Close -forgejo.org/routers/web - NotFound - forgejo.org/routers/web/org MustEnableProjects diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index b5f196ad4b..5567ea433e 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -363,6 +363,9 @@ var ignoredErrorMessage = []string{ // TestDatabaseCollation `[E] [Error SQL Query] INSERT INTO test_collation_tbl (txt) VALUES ('main') []`, + + // TestDevtestErrorpages + `ErrorPage() [E] Example error: Example error`, } func (w *testLoggerWriterCloser) recordError(msg string) { diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index 4f5d102392..e525598ed5 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -16,5 +16,6 @@ "incorrect_root_url": "This Forgejo instance is configured to be served on \"%s\". You are currently viewing Forgejo through a different URL, which may cause parts of the application to break. The canonical URL is controlled by Forgejo admins via the ROOT_URL setting in the app.ini.", "themes.names.forgejo-auto": "Forgejo (follow system theme)", "themes.names.forgejo-light": "Forgejo light", - "themes.names.forgejo-dark": "Forgejo dark" -} + "themes.names.forgejo-dark": "Forgejo dark", + "error.not_found.title": "Page not found" +} \ No newline at end of file diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index 37496ca117..2ef030cb92 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -1,9 +1,11 @@ // Copyright 2023 The Gitea Authors. All rights reserved. +// Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package devtest import ( + "errors" "net/http" "path" "strings" @@ -42,6 +44,17 @@ func FetchActionTest(ctx *context.Context) { ctx.JSONRedirect("") } +func ErrorPage(ctx *context.Context) { + if ctx.Params("errcode") == "404" { + ctx.NotFound("Example error", errors.New("Example error")) + return + } else if ctx.Params("errcode") == "413" { + ctx.HTML(http.StatusRequestEntityTooLarge, base.TplName("status/413")) + return + } + ctx.ServerError("Example error", errors.New("Example error")) +} + func Tmpl(ctx *context.Context) { now := time.Now() ctx.Data["TimeNow"] = now diff --git a/routers/web/home.go b/routers/web/home.go index e0a466a81c..bd9942748a 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -1,5 +1,6 @@ // Copyright 2014 The Gogs Authors. All rights reserved. // Copyright 2019 The Gitea Authors. All rights reserved. +// Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package web @@ -112,9 +113,3 @@ func HomeSitemap(ctx *context.Context) { log.Error("Failed writing sitemap: %v", err) } } - -// NotFound render 404 page -func NotFound(ctx *context.Context) { - ctx.Data["Title"] = "Page Not Found" - ctx.NotFound("home.NotFound", nil) -} diff --git a/routers/web/web.go b/routers/web/web.go index 303167a6b9..3643943b5b 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1,4 +1,5 @@ // Copyright 2017 The Gitea Authors. All rights reserved. +// Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package web @@ -1661,6 +1662,7 @@ func registerRoutes(m *web.Route) { m.Any("/devtest", devtest.List) m.Any("/devtest/fetch-action-test", devtest.FetchActionTest) m.Any("/devtest/{sub}", devtest.Tmpl) + m.Get("/devtest/error/{errcode}", devtest.ErrorPage) } m.NotFound(func(w http.ResponseWriter, req *http.Request) { diff --git a/services/context/context_response.go b/services/context/context_response.go index e20e7dd852..e64f478420 100644 --- a/services/context/context_response.go +++ b/services/context/context_response.go @@ -1,4 +1,5 @@ // Copyright 2023 The Gitea Authors. All rights reserved. +// Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package context @@ -66,7 +67,10 @@ func (ctx *Context) RedirectToFirst(location ...string) string { return setting.AppSubURL + "/" } -const tplStatus500 base.TplName = "status/500" +const ( + tplStatus404 base.TplName = "status/404" + tplStatus500 base.TplName = "status/500" +) // HTML calls Context.HTML and renders the template to HTTP response func (ctx *Context) HTML(status int, name base.TplName) { @@ -153,8 +157,8 @@ func (ctx *Context) notFoundInternal(logMsg string, logErr error) { } ctx.Data["IsRepo"] = ctx.Repo.Repository != nil - ctx.Data["Title"] = "Page Not Found" - ctx.HTML(http.StatusNotFound, base.TplName("status/404")) + ctx.Data["Title"] = ctx.Locale.TrString("error.not_found.title") + ctx.HTML(http.StatusNotFound, tplStatus404) } // ServerError displays a 500 (Internal Server Error) page and prints the given error, if any. @@ -177,7 +181,6 @@ func (ctx *Context) serverErrorInternal(logMsg string, logErr error) { } } - ctx.Data["Title"] = "Internal Server Error" ctx.HTML(http.StatusInternalServerError, tplStatus500) } diff --git a/templates/devtest/list.tmpl b/templates/devtest/list.tmpl index 90b1fcc9d0..e169311222 100644 --- a/templates/devtest/list.tmpl +++ b/templates/devtest/list.tmpl @@ -1,10 +1,21 @@ {{template "base/head" .}} -
    - {{range .SubNames}} -
  • {{.}}
    • - {{end}} -
+
+
    + {{range .SubNames}} +
  • {{.}}
    • + {{end}} +
+ + +
diff --git a/tests/integration/devtest_error_test.go b/tests/integration/devtest_error_test.go new file mode 100644 index 0000000000..8b86f1c552 --- /dev/null +++ b/tests/integration/devtest_error_test.go @@ -0,0 +1,53 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package integration + +import ( + "net/http" + "testing" + + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/routers" + + "github.com/stretchr/testify/assert" +) + +// `/devtest/error/{errcode}` provides a convenient way of testing various +// error pages sometimes which can be hard to reach otherwise. +// This file is a test of various attributes on those pages. + +func TestDevtestErrorpages(t *testing.T) { + defer test.MockVariableValue(&setting.IsProd, false)() + defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() + + t.Run("Server error", func(t *testing.T) { + // `/devtest/error/x` returns 500 for any x by default. + // `/500` is simply for good look here + req := NewRequest(t, "GET", "/devtest/error/500") + resp := MakeRequest(t, req, http.StatusInternalServerError) + doc := NewHTMLParser(t, resp.Body) + assert.EqualValues(t, "500", doc.Find(".error-code").Text()) + assert.Contains(t, doc.Find("head title").Text(), "Internal server error") + }) + + t.Run("Page not found", + func(t *testing.T) { + req := NewRequest(t, "GET", "/devtest/error/404"). + // Without this header `notFoundInternal` returns plaintext error message + SetHeader("Accept", "text/html") + resp := MakeRequest(t, req, http.StatusNotFound) + doc := NewHTMLParser(t, resp.Body) + assert.EqualValues(t, "404", doc.Find(".error-code").Text()) + assert.Contains(t, doc.Find("head title").Text(), "Page not found") + }) + + t.Run("Quota exhaustion", + func(t *testing.T) { + req := NewRequest(t, "GET", "/devtest/error/413") + resp := MakeRequest(t, req, http.StatusRequestEntityTooLarge) + doc := NewHTMLParser(t, resp.Body) + assert.EqualValues(t, "413", doc.Find(".error-code").Text()) + }) +} diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index f8961443c5..35cab81975 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -1,4 +1,5 @@ // Copyright 2017 The Gitea Authors. All rights reserved. +// Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package integration @@ -691,7 +692,7 @@ func TestCommitView(t *testing.T) { // Really ensure that 404 is being sent back. doc := NewHTMLParser(t, resp.Body) - doc.AssertElement(t, `[aria-label="Page Not Found"]`, true) + doc.AssertElement(t, `[aria-label="Page not found"]`, true) }) t.Run("Too short commit ID", func(t *testing.T) { From fed2d81c440edfccd160ce09f93d60433d47af5d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Mar 2025 22:22:21 +0000 Subject: [PATCH 020/568] Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v2 (forgejo) (#7367) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .golangci.yml | 269 +++++++++--------- Makefile | 2 +- build/lint-locale-usage/lint-locale-usage.go | 2 +- .../lint-locale-usage_test.go | 4 +- build/lint-locale/lint-locale_test.go | 40 +-- cmd/admin_auth_ldap_test.go | 12 +- cmd/doctor.go | 7 +- cmd/hook.go | 5 +- cmd/main.go | 6 +- cmd/main_test.go | 10 +- cmd/migrate_storage_test.go | 4 +- cmd/serv.go | 7 +- models/actions/forgejo_test.go | 84 +++--- models/actions/runner.go | 5 +- models/actions/runner_token_test.go | 6 +- models/activities/action_test.go | 6 +- models/activities/notification_list.go | 2 +- models/activities/notification_test.go | 12 +- models/activities/repo_activity_test.go | 8 +- models/asymkey/gpg_key_test.go | 2 +- models/asymkey/ssh_key_test.go | 10 +- models/auth/oauth2_test.go | 4 +- models/auth/session_test.go | 6 +- models/db/engine_test.go | 2 +- models/db/list_test.go | 2 +- models/dbfs/dbfs_test.go | 24 +- models/forgejo/semver/semver_test.go | 6 +- models/forgejo_migrations/v1_22/v8_test.go | 2 +- models/git/branch_test.go | 2 +- models/git/lfs_test.go | 10 +- models/git/protected_branch_list_test.go | 2 +- models/git/protected_branch_test.go | 2 +- models/issues/action_aggregator.go | 11 +- models/issues/comment_test.go | 12 +- models/issues/issue.go | 4 +- models/issues/issue_list_test.go | 18 +- models/issues/issue_project_test.go | 36 +-- models/issues/issue_test.go | 30 +- models/issues/label_test.go | 28 +- models/issues/milestone_test.go | 6 +- models/issues/pull_test.go | 4 +- models/issues/stopwatch_test.go | 2 +- models/migrations/migrations_test.go | 6 +- models/migrations/v1_15/v181_test.go | 4 +- models/migrations/v1_16/v189_test.go | 4 +- models/migrations/v1_16/v193_test.go | 4 +- models/migrations/v1_16/v210_test.go | 2 +- models/migrations/v1_19/v233_test.go | 2 +- models/migrations/v1_20/v259_test.go | 2 +- models/migrations/v1_22/v286_test.go | 4 +- models/org_team_test.go | 2 +- models/org_test.go | 2 +- models/organization/org.go | 4 +- models/organization/org_list_test.go | 2 +- models/organization/org_test.go | 22 +- models/organization/org_user_test.go | 2 +- models/organization/team_test.go | 6 +- models/perm/access/access.go | 2 +- models/project/column_test.go | 6 +- models/project/project_test.go | 4 +- models/repo/collaboration_test.go | 10 +- models/repo/pushmirror_test.go | 2 +- models/repo/repo.go | 11 +- models/repo/repo_list_test.go | 2 +- models/repo/repo_unit_test.go | 10 +- models/repo/topic_test.go | 2 +- models/repo/watch_test.go | 2 +- models/repo_test.go | 4 +- models/repo_transfer_test.go | 2 +- models/system/setting_test.go | 12 +- models/unittest/consistency.go | 10 +- models/unittest/mock_http.go | 2 +- models/user/search.go | 5 +- models/user/setting_test.go | 8 +- models/user/user.go | 2 +- models/user/user_test.go | 20 +- models/webhook/hooktask.go | 5 +- models/webhook/webhook.go | 46 +-- modules/assetfs/layered_test.go | 18 +- modules/avatar/avatar_test.go | 4 +- modules/avatar/hash_test.go | 8 +- modules/base/tool_test.go | 4 +- modules/cache/cache_test.go | 6 +- modules/cache/context_test.go | 4 +- modules/charset/ambiguous_gen_test.go | 2 +- modules/charset/charset_test.go | 2 +- modules/charset/escape_stream.go | 20 +- modules/charset/escape_test.go | 2 +- modules/container/set_test.go | 2 +- modules/csv/csv_test.go | 14 +- modules/git/command_test.go | 4 +- modules/git/commit.go | 2 +- modules/git/commit_sha256_test.go | 8 +- modules/git/commit_test.go | 16 +- modules/git/diff_test.go | 8 +- modules/git/error.go | 5 +- modules/git/log_name_status.go | 23 +- modules/git/parse_test.go | 4 +- modules/git/pushoptions/pushoptions_test.go | 6 +- modules/git/repo_attribute_test.go | 16 +- modules/git/repo_base_test.go | 8 +- modules/git/repo_branch_test.go | 12 +- modules/git/repo_commit_test.go | 8 +- modules/git/repo_language_stats.go | 2 +- modules/git/repo_language_stats_test.go | 4 +- modules/git/repo_ref.go | 7 +- modules/git/repo_stats_test.go | 2 +- modules/git/repo_tag_test.go | 102 +++---- modules/git/repo_tree.go | 4 +- modules/git/signature_test.go | 2 +- modules/git/submodule_test.go | 2 +- modules/git/tag_test.go | 20 +- modules/git/tree_test.go | 4 +- modules/git/url/url_test.go | 4 +- .../releasereopen/releasereopen_test.go | 12 +- modules/graceful/server.go | 2 +- modules/graceful/server_hooks.go | 5 +- modules/highlight/highlight_test.go | 4 +- .../code/elasticsearch/elasticsearch_test.go | 4 +- modules/indexer/code/indexer_test.go | 8 +- .../indexer/internal/bleve/metadata_test.go | 2 +- .../indexer/issues/internal/tests/tests.go | 20 +- .../issues/meilisearch/meilisearch_test.go | 12 +- modules/issue/template/template.go | 2 +- modules/issue/template/template_test.go | 2 +- modules/keying/keying_test.go | 24 +- modules/lfs/content_store.go | 4 +- modules/log/event_writer_base.go | 2 +- modules/log/flags_test.go | 14 +- modules/log/groutinelabel_test.go | 6 +- modules/log/logger_test.go | 6 +- modules/markup/common/footnote.go | 2 +- modules/markup/common/linkify.go | 5 +- modules/markup/console/console_test.go | 2 +- modules/markup/csv/csv_test.go | 2 +- modules/markup/html.go | 2 +- modules/markup/markdown/goldmark.go | 4 +- modules/markup/markdown/math/inline_parser.go | 8 +- modules/markup/markdown/meta_test.go | 4 +- modules/markup/markdown/transform_codespan.go | 2 +- modules/markup/mdstripper/mdstripper.go | 7 +- modules/markup/mdstripper/mdstripper_test.go | 4 +- modules/optional/serialization_test.go | 12 +- modules/packages/cargo/parser_test.go | 4 +- modules/process/manager_stacktraces_test.go | 48 ++-- modules/queue/base_test.go | 20 +- modules/queue/manager_test.go | 4 +- modules/queue/workerqueue_test.go | 32 +-- modules/references/references.go | 7 +- modules/references/references_test.go | 10 +- modules/regexplru/regexplru_test.go | 4 +- modules/repository/branch_test.go | 2 +- modules/repository/commits_test.go | 24 +- modules/repository/create.go | 7 +- modules/repository/create_test.go | 2 +- modules/repository/init_test.go | 6 +- modules/repository/license.go | 5 +- modules/repository/repo_test.go | 4 +- modules/setting/actions_test.go | 26 +- modules/setting/admin_test.go | 6 +- modules/setting/attachment_test.go | 22 +- modules/setting/config_env_test.go | 18 +- modules/setting/config_provider_test.go | 8 +- modules/setting/cron_test.go | 2 +- modules/setting/forgejo_storage_test.go | 4 +- modules/setting/git_test.go | 14 +- modules/setting/incoming_email_test.go | 10 +- modules/setting/lfs_test.go | 22 +- modules/setting/mailer_test.go | 8 +- modules/setting/oauth2_test.go | 2 +- modules/setting/packages_test.go | 24 +- modules/setting/repository_archive_test.go | 12 +- modules/setting/server_test.go | 2 +- modules/setting/service.go | 2 +- modules/setting/storage.go | 4 +- modules/setting/storage_test.go | 74 ++--- modules/storage/local_test.go | 2 +- modules/storage/minio.go | 4 +- modules/storage/minio_test.go | 12 +- modules/structs/repo_file.go | 8 +- modules/system/appstate_test.go | 6 +- modules/templates/htmlrenderer_test.go | 4 +- modules/templates/scopedtmpl/scopedtmpl.go | 18 +- modules/templates/util_misc.go | 5 +- modules/templates/util_render_test.go | 4 +- modules/templates/util_test.go | 2 +- modules/templates/vars/vars_test.go | 2 +- modules/timeutil/since.go | 6 +- modules/translation/i18n/i18n_test.go | 2 +- modules/translation/i18n/localestore.go | 7 +- modules/translation/translation_test.go | 28 +- modules/util/paginate_test.go | 14 +- modules/util/path.go | 5 +- modules/util/util_test.go | 4 +- modules/validation/email_test.go | 2 +- modules/web/route_test.go | 64 ++--- modules/web/routemock_test.go | 16 +- routers/api/actions/artifactsv4.go | 4 +- routers/api/packages/api.go | 5 +- routers/api/packages/chef/auth.go | 2 +- routers/api/packages/chef/chef.go | 2 +- routers/api/packages/nuget/auth.go | 2 +- routers/api/v1/api.go | 20 +- routers/api/v1/repo/branch.go | 6 +- routers/api/v1/repo/file.go | 2 +- routers/api/v1/repo/hook_test.go | 2 +- routers/api/v1/repo/issue_dependency.go | 22 +- routers/api/v1/repo/repo_test.go | 4 +- routers/api/v1/user/key.go | 7 +- routers/api/v1/user/repo.go | 2 +- routers/install/routes_test.go | 6 +- routers/private/hook_post_receive_test.go | 2 +- routers/private/hook_pre_receive.go | 7 +- routers/web/admin/admin_test.go | 2 +- routers/web/auth/auth.go | 5 +- routers/web/auth/oauth_test.go | 2 +- routers/web/org/members.go | 4 +- routers/web/repo/action_aggregator_test.go | 4 +- routers/web/repo/attachment.go | 2 +- routers/web/repo/compare.go | 13 +- routers/web/repo/editor_test.go | 2 +- routers/web/repo/githttp_test.go | 2 +- routers/web/repo/issue.go | 16 +- routers/web/repo/issue_content_history.go | 7 +- routers/web/repo/issue_label_test.go | 14 +- routers/web/repo/projects.go | 10 +- routers/web/repo/pull.go | 4 +- routers/web/repo/pull_review.go | 5 +- routers/web/repo/setting/avatar.go | 2 +- routers/web/repo/setting/settings_test.go | 22 +- routers/web/repo/wiki_test.go | 24 +- routers/web/user/home.go | 5 +- routers/web/user/home_test.go | 26 +- routers/web/user/notification.go | 5 +- routers/web/user/setting/account.go | 8 +- routers/web/user/setting/account_test.go | 2 +- routers/web/user/setting/profile.go | 2 +- routers/web/web.go | 6 +- services/actions/auth_test.go | 4 +- services/actions/cleanup_test.go | 2 +- services/attachment/attachment_test.go | 2 +- services/auth/reverseproxy_test.go | 16 +- .../auth/source/oauth2/jwtsigningkey_test.go | 16 +- services/context/api.go | 8 +- services/context/api_test.go | 2 +- services/context/context.go | 6 +- services/context/package.go | 2 +- services/context/private.go | 2 +- services/context/quota.go | 4 +- services/context/repo.go | 8 +- services/context/upload/upload.go | 7 +- services/contexttest/context_tests.go | 6 +- services/convert/git_commit_test.go | 2 +- services/convert/notification.go | 2 +- services/convert/pull_review.go | 2 +- services/convert/pull_test.go | 2 +- services/convert/release_test.go | 4 +- services/convert/user_test.go | 4 +- services/convert/utils_test.go | 8 +- services/doctor/fix16961_test.go | 4 +- services/f3/util/logger_test.go | 2 +- services/gitdiff/gitdiff.go | 2 +- services/gitdiff/highlightdiff.go | 5 +- services/gitdiff/highlightdiff_test.go | 6 +- services/issue/comments_test.go | 24 +- services/issue/issue_test.go | 4 +- services/lfs/server.go | 7 +- services/mailer/mail_issue.go | 7 +- services/mailer/mail_test.go | 4 +- services/mailer/mailer_test.go | 4 +- services/mailer/notify.go | 18 +- services/migrations/gitea_downloader_test.go | 4 +- services/migrations/gitea_uploader_test.go | 10 +- services/migrations/gitlab_test.go | 10 +- services/migrations/gogs_test.go | 6 +- services/mirror/mirror_test.go | 60 ++-- services/packages/cleanup/cleanup.go | 11 +- .../packages/cleanup/cleanup_sha256_test.go | 2 +- services/packages/container/blob_uploader.go | 2 +- services/pull/check_test.go | 2 +- services/pull/review.go | 2 +- services/release/release_test.go | 40 +-- services/repository/archiver/archiver_test.go | 6 +- services/repository/avatar_test.go | 2 +- .../repository/contributors_graph_test.go | 6 +- services/repository/files/content_test.go | 4 +- services/repository/files/diff_test.go | 4 +- services/repository/files/file_test.go | 4 +- services/repository/files/tree_test.go | 2 +- services/repository/lfs.go | 2 +- services/user/avatar_test.go | 8 +- services/user/user_test.go | 2 +- services/webhook/default_test.go | 2 +- services/webhook/deliver_test.go | 2 +- services/webhook/general.go | 14 +- services/webhook/msteams_test.go | 4 +- services/webhook/notifier_test.go | 4 +- services/wiki/wiki_test.go | 22 +- tests/integration/actions_variables_test.go | 8 +- tests/integration/admin_user_test.go | 2 +- tests/integration/api_admin_actions_test.go | 2 +- tests/integration/api_admin_test.go | 2 +- tests/integration/api_branch_test.go | 14 +- tests/integration/api_comment_test.go | 6 +- tests/integration/api_fork_test.go | 4 +- tests/integration/api_gpg_keys_test.go | 12 +- .../api_helper_for_declarative_test.go | 2 +- tests/integration/api_issue_label_test.go | 20 +- tests/integration/api_issue_milestone_test.go | 2 +- tests/integration/api_issue_stopwatch_test.go | 10 +- .../api_issue_subscription_test.go | 8 +- tests/integration/api_issue_test.go | 4 +- .../api_issue_tracked_time_test.go | 6 +- tests/integration/api_notification_test.go | 6 +- tests/integration/api_oauth2_apps_test.go | 20 +- tests/integration/api_org_actions_test.go | 2 +- tests/integration/api_org_test.go | 6 +- tests/integration/api_packages_alt_test.go | 2 +- tests/integration/api_packages_cargo_test.go | 4 +- tests/integration/api_packages_conan_test.go | 2 +- ..._packages_container_cleanup_sha256_test.go | 2 +- .../api_packages_container_test.go | 2 +- tests/integration/api_packages_nuget_test.go | 2 +- tests/integration/api_packages_rpm_test.go | 6 +- tests/integration/api_packages_test.go | 2 +- tests/integration/api_pull_review_test.go | 50 ++-- tests/integration/api_pull_test.go | 20 +- tests/integration/api_push_mirror_test.go | 12 +- .../integration/api_quota_management_test.go | 12 +- tests/integration/api_quota_use_test.go | 2 +- tests/integration/api_releases_test.go | 18 +- tests/integration/api_repo_actions_test.go | 2 +- tests/integration/api_repo_archive_test.go | 10 +- tests/integration/api_repo_branch_test.go | 26 +- .../integration/api_repo_file_create_test.go | 46 +-- .../integration/api_repo_file_delete_test.go | 4 +- .../integration/api_repo_file_update_test.go | 26 +- .../integration/api_repo_files_change_test.go | 38 +-- .../api_repo_get_contents_list_test.go | 10 +- .../integration/api_repo_get_contents_test.go | 16 +- .../integration/api_repo_git_commits_test.go | 22 +- tests/integration/api_repo_lfs_locks_test.go | 8 +- .../integration/api_repo_lfs_migrate_test.go | 2 +- tests/integration/api_repo_raw_test.go | 4 +- tests/integration/api_repo_tags_test.go | 10 +- tests/integration/api_repo_teams_test.go | 12 +- tests/integration/api_repo_test.go | 42 ++- tests/integration/api_repo_topic_test.go | 6 +- tests/integration/api_settings_test.go | 6 +- tests/integration/api_team_test.go | 8 +- tests/integration/api_team_user_test.go | 4 +- tests/integration/api_token_test.go | 2 +- tests/integration/api_twofa_test.go | 2 +- tests/integration/api_user_actions_test.go | 2 +- tests/integration/api_user_email_test.go | 6 +- tests/integration/api_user_search_test.go | 8 +- tests/integration/appearance_settings_test.go | 6 +- tests/integration/auth_ldap_test.go | 2 +- tests/integration/auth_token_test.go | 2 +- tests/integration/block_test.go | 6 +- tests/integration/cmd_forgejo_actions_test.go | 12 +- tests/integration/cmd_forgejo_f3_test.go | 8 +- .../integration/comment_roles_system_test.go | 2 +- tests/integration/comment_roles_test.go | 28 +- tests/integration/commit_status_test.go | 20 +- tests/integration/dump_restore_test.go | 16 +- tests/integration/editor_test.go | 34 +-- tests/integration/empty_repo_test.go | 2 +- tests/integration/explore_repos_test.go | 4 +- tests/integration/feed_repo_test.go | 2 +- .../forgejo_confirmation_repo_test.go | 10 +- tests/integration/git_push_test.go | 2 +- tests/integration/git_smart_http_test.go | 2 +- tests/integration/git_test.go | 8 +- tests/integration/gpg_git_test.go | 10 +- tests/integration/html_helper.go | 2 +- tests/integration/incoming_email_test.go | 4 +- tests/integration/integration_test.go | 6 +- tests/integration/issue_subscribe_test.go | 8 +- tests/integration/issue_test.go | 50 ++-- tests/integration/links_test.go | 4 +- tests/integration/markup_external_test.go | 4 +- tests/integration/migrate_test.go | 6 +- tests/integration/mirror_pull_test.go | 4 +- tests/integration/mirror_push_test.go | 2 +- tests/integration/new_org_test.go | 2 +- tests/integration/oauth_test.go | 2 +- tests/integration/opengraph_test.go | 2 +- tests/integration/org_nav_test.go | 4 +- tests/integration/org_test.go | 2 +- tests/integration/private_project_test.go | 10 +- tests/integration/project_test.go | 6 +- tests/integration/pull_compare_test.go | 2 +- tests/integration/pull_create_test.go | 8 +- tests/integration/pull_merge_test.go | 38 +-- tests/integration/pull_review_test.go | 14 +- tests/integration/pull_status_test.go | 4 +- tests/integration/pull_update_test.go | 24 +- tests/integration/quota_use_test.go | 2 +- tests/integration/release_feed_test.go | 4 +- tests/integration/release_test.go | 20 +- tests/integration/remote_test.go | 2 +- tests/integration/rename_branch_test.go | 2 +- tests/integration/repo_activity_test.go | 2 +- tests/integration/repo_collaborator_test.go | 6 +- tests/integration/repo_commits_search_test.go | 2 +- tests/integration/repo_commits_test.go | 2 +- tests/integration/repo_fork_test.go | 2 +- tests/integration/repo_generate_test.go | 4 +- .../repo_mergecommit_revert_test.go | 2 +- tests/integration/repo_migration_ui_test.go | 4 +- tests/integration/repo_search_test.go | 6 +- tests/integration/repo_settings_test.go | 2 +- tests/integration/repo_test.go | 44 +-- tests/integration/repo_topic_test.go | 6 +- tests/integration/repo_wiki_test.go | 2 +- tests/integration/repofiles_change_test.go | 50 ++-- tests/integration/runner_test.go | 4 +- tests/integration/session_test.go | 4 +- tests/integration/signin_test.go | 2 +- tests/integration/user_avatar_test.go | 2 +- tests/integration/user_dashboard_test.go | 12 +- .../integration/user_profile_activity_test.go | 10 +- tests/integration/user_redirect_test.go | 8 +- tests/integration/user_test.go | 28 +- tests/integration/wiki_test.go | 4 +- tests/integration/xss_test.go | 4 +- 427 files changed, 2043 insertions(+), 2046 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 136c0e624a..532132838d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,9 @@ +version: "2" +output: + sort-order: + - file linters: - enable-all: false - disable-all: true - fast: false + default: none enable: - bidichk - depguard @@ -9,142 +11,155 @@ linters: - errcheck - forbidigo - gocritic - - gofmt - - gofumpt - - gosimple - govet - ineffassign - nakedret - nolintlint - revive - staticcheck - - stylecheck - testifylint - - typecheck - unconvert - - unused - unparam + - unused - usetesting - wastedassign - -run: - timeout: 10m - -output: - sort-results: true - sort-order: [file] - show-stats: true - -linters-settings: - stylecheck: - checks: ["all", "-ST1005", "-ST1003"] - nakedret: - max-func-lines: 0 - gocritic: - disabled-checks: - - ifElseChain - revive: - severity: error + settings: + depguard: + rules: + main: + deny: + - pkg: encoding/json + desc: use gitea's modules/json instead of encoding/json + - pkg: github.com/unknwon/com + desc: use gitea's util and replacements + - pkg: io/ioutil + desc: use os or io instead + - pkg: golang.org/x/exp + desc: it's experimental and unreliable + - pkg: forgejo.org/modules/git/internal + desc: do not use the internal package, use AddXxx function instead + - pkg: gopkg.in/ini.v1 + desc: do not use the ini package, use gitea's config system instead + - pkg: github.com/minio/sha256-simd + desc: use crypto/sha256 instead, see https://codeberg.org/forgejo/forgejo/pulls/1528 + gocritic: + disabled-checks: + - ifElseChain + revive: + severity: error + rules: + - name: atomic + - name: bare-return + - name: blank-imports + - name: constant-logical-expr + - name: context-as-argument + - name: context-keys-type + - name: dot-imports + - name: duplicated-imports + - name: empty-lines + - name: error-naming + - name: error-return + - name: error-strings + - name: errorf + - name: exported + - name: identical-branches + - name: if-return + - name: increment-decrement + - name: indent-error-flow + - name: modifies-value-receiver + - name: package-comments + - name: range + - name: receiver-naming + - name: redefines-builtin-id + - name: string-of-int + - name: superfluous-else + - name: time-naming + - name: unconditional-recursion + - name: unexported-return + - name: unreachable-code + - name: var-declaration + - name: var-naming + - name: redefines-builtin-id + disabled: true + staticcheck: + checks: + - all + testifylint: + disable: + - go-require + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling rules: - - name: atomic - - name: bare-return - - name: blank-imports - - name: constant-logical-expr - - name: context-as-argument - - name: context-keys-type - - name: dot-imports - - name: duplicated-imports - - name: empty-lines - - name: error-naming - - name: error-return - - name: error-strings - - name: errorf - - name: exported - - name: identical-branches - - name: if-return - - name: increment-decrement - - name: indent-error-flow - - name: modifies-value-receiver - - name: package-comments - - name: range - - name: receiver-naming - - name: redefines-builtin-id - - name: string-of-int - - name: superfluous-else - - name: time-naming - - name: unconditional-recursion - - name: unexported-return - - name: unreachable-code - - name: var-declaration - - name: var-naming - - name: redefines-builtin-id - disabled: true - gofumpt: - extra-rules: true - depguard: - rules: - main: - deny: - - pkg: encoding/json - desc: use gitea's modules/json instead of encoding/json - - pkg: github.com/unknwon/com - desc: use gitea's util and replacements - - pkg: io/ioutil - desc: use os or io instead - - pkg: golang.org/x/exp - desc: it's experimental and unreliable - - pkg: forgejo.org/modules/git/internal - desc: do not use the internal package, use AddXxx function instead - - pkg: gopkg.in/ini.v1 - desc: do not use the ini package, use gitea's config system instead - - pkg: github.com/minio/sha256-simd - desc: use crypto/sha256 instead, see https://codeberg.org/forgejo/forgejo/pulls/1528 - testifylint: - disable: - - go-require - + - linters: + - nolintlint + path: models/db/sql_postgres_with_schema.go + - linters: + - dupl + - errcheck + - gocyclo + - gosec + - staticcheck + - unparam + path: _test\.go + - linters: + - dupl + - errcheck + - gocyclo + - gosec + path: models/migrations/v + - linters: + - forbidigo + path: cmd + - linters: + - dupl + text: (?i)webhook + - linters: + - gocritic + text: (?i)`ID' should not be capitalized + - linters: + - deadcode + - unused + text: (?i)swagger + - linters: + - staticcheck + text: (?i)argument x is overwritten before first use + - linters: + - gocritic + text: '(?i)commentFormatting: put a space between `//` and comment text' + - linters: + - gocritic + text: '(?i)exitAfterDefer:' + - linters: + - staticcheck + text: "(ST1005|ST1003|QF1001):" + paths: + - node_modules + - public + - web_src + - third_party$ + - builtin$ + - examples$ issues: max-issues-per-linter: 0 max-same-issues: 0 - exclude-dirs: [node_modules, public, web_src] - exclude-case-sensitive: true - exclude-rules: - - path: models/db/sql_postgres_with_schema.go - linters: - - nolintlint - - path: _test\.go - linters: - - gocyclo - - errcheck - - dupl - - gosec - - unparam - - staticcheck - - path: models/migrations/v - linters: - - gocyclo - - errcheck - - dupl - - gosec - - path: cmd - linters: - - forbidigo - - text: "webhook" - linters: - - dupl - - text: "`ID' should not be capitalized" - linters: - - gocritic - - text: "swagger" - linters: - - unused - - deadcode - - text: "argument x is overwritten before first use" - linters: - - staticcheck - - text: "commentFormatting: put a space between `//` and comment text" - linters: - - gocritic - - text: "exitAfterDefer:" - linters: - - gocritic +formatters: + enable: + - gofmt + - gofumpt + settings: + gofumpt: + extra-rules: true + exclusions: + generated: lax + paths: + - node_modules + - public + - web_src + - third_party$ + - builtin$ + - examples$ diff --git a/Makefile b/Makefile index 4fb06db918..5a392954ce 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.2.1 # renovate: datasource=go GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0 # renovate: datasource=go -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.6.0 # renovate: datasource=go SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renovate: datasource=go diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go index 8aeae26c4c..edbd086d0e 100644 --- a/build/lint-locale-usage/lint-locale-usage.go +++ b/build/lint-locale-usage/lint-locale-usage.go @@ -264,7 +264,7 @@ func (handler Handler) HandleTemplateFile(fname string, src any) error { Err: err, } } - handler.handleTemplateFileNodes(fset, tmplParsed.Tree.Root.Nodes) + handler.handleTemplateFileNodes(fset, tmplParsed.Root.Nodes) return nil } diff --git a/build/lint-locale-usage/lint-locale-usage_test.go b/build/lint-locale-usage/lint-locale-usage_test.go index e573fb196e..81ca12c6db 100644 --- a/build/lint-locale-usage/lint-locale-usage_test.go +++ b/build/lint-locale-usage/lint-locale-usage_test.go @@ -37,13 +37,13 @@ func HandleTemplateFileWrapped(t *testing.T, fname, src string) []string { func TestUsagesParser(t *testing.T) { t.Run("go, simple", func(t *testing.T) { - assert.EqualValues(t, + assert.Equal(t, []string{"what.an.example"}, HandleGoFileWrapped(t, "", "package main\nfunc Render(ctx *context.Context) string { return ctx.Tr(\"what.an.example\"); }\n")) }) t.Run("template, simple", func(t *testing.T) { - assert.EqualValues(t, + assert.Equal(t, []string{"what.an.example"}, HandleTemplateFileWrapped(t, "", "{{ ctx.Locale.Tr \"what.an.example\" }}\n")) }) diff --git a/build/lint-locale/lint-locale_test.go b/build/lint-locale/lint-locale_test.go index 791f5278bc..37407461c7 100644 --- a/build/lint-locale/lint-locale_test.go +++ b/build/lint-locale/lint-locale_test.go @@ -15,9 +15,9 @@ func TestLocalizationPolicy(t *testing.T) { t.Run("Remove tags", func(t *testing.T) { assert.Empty(t, checkLocaleContent([]byte(`hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all " added/removed
- +
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 2f40d58bec..f85ed4d2ab 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -121,7 +121,7 @@
- +
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 91c1a272c7..ebea97d807 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -123,7 +123,7 @@
- +
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index d93a00104a..c73a10529e 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -120,7 +120,7 @@
- +
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index 6c647be0ed..1d7623f9a2 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -120,7 +120,7 @@
- +
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index ec155555d0..7f1b3a900d 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -109,7 +109,7 @@
- +
diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go index 6154f44aa6..7251da5d7a 100644 --- a/tests/integration/repo_migration_ui_test.go +++ b/tests/integration/repo_migration_ui_test.go @@ -30,28 +30,28 @@ func TestRepoMigrationUI(t *testing.T) { 2: { "GitHub", []string{"issues", "pull_requests", "labels", "milestones", "releases"}, - false, + true, }, 3: { "Gitea", []string{"issues", "pull_requests", "labels", "milestones", "releases"}, - false, + true, }, 4: { "GitLab", // Note: the checkbox "Merge requests" has name "pull_requests" []string{"issues", "pull_requests", "labels", "milestones", "releases"}, - false, + true, }, 5: { "Gogs", []string{"issues", "labels", "milestones"}, - false, + true, }, 6: { "OneDev", []string{"issues", "pull_requests", "labels", "milestones"}, - false, + true, }, 7: { "GitBucket", @@ -62,12 +62,12 @@ func TestRepoMigrationUI(t *testing.T) { "Codebase", // Note: the checkbox "Merge requests" has name "pull_requests" []string{"issues", "pull_requests", "labels", "milestones"}, - false, + true, }, 9: { "Forgejo", []string{"issues", "pull_requests", "labels", "milestones", "releases"}, - false, + true, }, } From c9853e9e3a8c66c39680f2416a5a18fff562da90 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Sat, 29 Mar 2025 19:35:01 +0000 Subject: [PATCH 024/568] fix: ignore trailing slash for autogenerated name (#7307) - During the migration process, if a valid GitHub clone URL was pasted, https://github.com/yuvipanda/notebooksharing.space/, the form automatically generates an invalid Forgejo repository name that included the trailing slash. - Change the regex used to generate the name to ignore the trailing slash. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7307 Reviewed-by: Otto Reviewed-by: Gusted Co-authored-by: YuviPanda Co-committed-by: YuviPanda --- tests/e2e/repo-migrate.test.e2e.ts | 28 +++++++++++++++++++++++++++ web_src/js/features/repo-migration.js | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tests/e2e/repo-migrate.test.e2e.ts b/tests/e2e/repo-migrate.test.e2e.ts index 5e67f89ed1..ca20e4f4c2 100644 --- a/tests/e2e/repo-migrate.test.e2e.ts +++ b/tests/e2e/repo-migrate.test.e2e.ts @@ -7,6 +7,34 @@ import {test, save_visual, test_context} from './utils_e2e.ts'; test.use({user: 'user2'}); +test('Migration Repo Name detection', async ({page}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari'); + + await page.goto('/repo/migrate?service_type=2'); + + const form = page.locator('form'); + + // Test trailing slashes are stripped + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://github.com/example/test/'); + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).blur(); + await expect(form.getByRole('textbox', {name: 'Repository Name'})).toHaveValue('test'); + + // Test trailing .git is stripped + await page.reload(); + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://github.com/example/test.git'); + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).blur(); + await expect(form.getByRole('textbox', {name: 'Repository Name'})).toHaveValue('test'); + + // Test trailing .git and trailing / together is stripped + await page.reload(); + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://github.com/example/test.git/'); + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).blur(); + await expect(form.getByRole('textbox', {name: 'Repository Name'})).toHaveValue('test'); + + // Save screenshot only once + await save_visual(page); +}); + test('Migration Progress Page', async ({page, browser}, workerInfo) => { test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari'); diff --git a/web_src/js/features/repo-migration.js b/web_src/js/features/repo-migration.js index 59e282e4e7..eb2245b2ff 100644 --- a/web_src/js/features/repo-migration.js +++ b/web_src/js/features/repo-migration.js @@ -29,7 +29,7 @@ export function initRepoMigration() { cloneAddr?.addEventListener('change', () => { const repoName = document.getElementById('repo_name'); if (cloneAddr.value && !repoName?.value) { // Only modify if repo_name input is blank - repoName.value = cloneAddr.value.match(/^(.*\/)?((.+?)(\.git)?)$/)[3]; + repoName.value = cloneAddr.value.match(/^(.*\/)?((.+?)(\.git)?\/?)$/)[3]; } }); } From aecf60f2335471aca3b9537544048304d40b2e62 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Mar 2025 22:50:26 +0000 Subject: [PATCH 025/568] Update dependency @vitest/eslint-plugin to v1.1.38 (forgejo) (#7381) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 98e651974a..96eac626e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,7 +70,7 @@ "@typescript-eslint/parser": "8.26.1", "@vitejs/plugin-vue": "5.2.3", "@vitest/coverage-v8": "3.0.8", - "@vitest/eslint-plugin": "1.1.25", + "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", "eslint": "9.22.0", "eslint-import-resolver-typescript": "4.1.1", @@ -3648,13 +3648,13 @@ } }, "node_modules/@vitest/eslint-plugin": { - "version": "1.1.25", - "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.25.tgz", - "integrity": "sha512-u8DpDnMbPcqBmJOB4PeEtn6q7vKmLVTLFMpzoxSAo0hjYdl4iYSHRleqwPQo0ywc7UV0S6RKIahYRQ3BnZdMVw==", + "version": "1.1.38", + "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.38.tgz", + "integrity": "sha512-KcOTZyVz8RiM5HyriiDVrP1CyBGuhRxle+lBsmSs6NTJEO/8dKVAq+f5vQzHj1/Kc7bYXSDO6yBe62Zx0t5iaw==", "dev": true, "license": "MIT", "peerDependencies": { - "@typescript-eslint/utils": ">= 8.0", + "@typescript-eslint/utils": "^8.24.0", "eslint": ">= 8.57.0", "typescript": ">= 5.0.0", "vitest": "*" diff --git a/package.json b/package.json index 7a63b45903..78da51d1ab 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@typescript-eslint/parser": "8.26.1", "@vitejs/plugin-vue": "5.2.3", "@vitest/coverage-v8": "3.0.8", - "@vitest/eslint-plugin": "1.1.25", + "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", "eslint": "9.22.0", "eslint-import-resolver-typescript": "4.1.1", From 50798d0a6364f1c0bc63592fca077a10f5fdddf1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Mar 2025 23:02:53 +0000 Subject: [PATCH 026/568] Update dependency yamllint to v1.37.0 (forgejo) (#7383) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 5cda33c903..425acf1c33 100644 --- a/poetry.lock +++ b/poetry.lock @@ -404,13 +404,13 @@ files = [ [[package]] name = "yamllint" -version = "1.36.2" +version = "1.37.0" description = "A linter for YAML files." optional = false python-versions = ">=3.9" files = [ - {file = "yamllint-1.36.2-py3-none-any.whl", hash = "sha256:6ba19800513d86c987ed3cf48c0aba4e82b3624596e1dab55723b3733e11f35c"}, - {file = "yamllint-1.36.2.tar.gz", hash = "sha256:c9ccc818659736e7b13f7e2f9c3c9bb9ac77445be13e789e7d843e92cb8428ef"}, + {file = "yamllint-1.37.0-py3-none-any.whl", hash = "sha256:c03ab4e79ab4af964c8eb16ac9746880fc76a3bb0ffb14925b9a55220ae7dda0"}, + {file = "yamllint-1.37.0.tar.gz", hash = "sha256:ead81921d4d87216b2528b7a055664708f9fb8267beb0c427cb706ac6ab93580"}, ] [package.dependencies] @@ -423,4 +423,4 @@ dev = ["doc8", "flake8", "flake8-import-order", "rstcheck[sphinx]", "sphinx"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "6e4e2a74db7e165f0aa8cae9bb8932cbe1e84ea9bef64db42371e6d620d77c93" +content-hash = "e1f441dfab1cb658912d98d3ee43b55111e6fc12e04f0388a2aa9fc01a6f583b" diff --git a/pyproject.toml b/pyproject.toml index eb3b338794..5c4bd26e27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ python = "^3.10" [tool.poetry.group.dev.dependencies] djlint = "1.36.4" -yamllint = "1.36.2" +yamllint = "1.37.0" codespell = "2.4.1" [tool.djlint] From 32005ad2abbed57288879ec39b09ea97ac50c8c9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Mar 2025 23:08:52 +0000 Subject: [PATCH 027/568] Update linters (forgejo) (#7384) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 552 ++++++++++++++++++---------------------------- package.json | 12 +- 2 files changed, 222 insertions(+), 342 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96eac626e3..3ef5fa81ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,15 +67,15 @@ "@stoplight/spectral-cli": "6.14.3", "@stylistic/eslint-plugin-js": "4.2.0", "@stylistic/stylelint-plugin": "3.1.2", - "@typescript-eslint/parser": "8.26.1", + "@typescript-eslint/parser": "8.28.0", "@vitejs/plugin-vue": "5.2.3", "@vitest/coverage-v8": "3.0.8", "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", - "eslint": "9.22.0", - "eslint-import-resolver-typescript": "4.1.1", + "eslint": "9.23.0", + "eslint-import-resolver-typescript": "4.3.1", "eslint-plugin-array-func": "5.0.2", - "eslint-plugin-import-x": "4.7.0", + "eslint-plugin-import-x": "4.9.4", "eslint-plugin-no-jquery": "3.1.1", "eslint-plugin-no-use-extend-native": "0.7.2", "eslint-plugin-playwright": "2.2.0", @@ -92,13 +92,13 @@ "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.44.0", "postcss-html": "1.8.0", - "stylelint": "16.16.0", + "stylelint": "16.17.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.11", "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", "typescript": "5.7.3", - "typescript-eslint": "8.26.1", + "typescript-eslint": "8.28.0", "vite-string-plugin": "1.3.4", "vitest": "3.0.8" }, @@ -1063,9 +1063,9 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz", - "integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.0.tgz", + "integrity": "sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1171,9 +1171,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.22.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz", - "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", + "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", "dev": true, "license": "MIT", "engines": { @@ -1710,163 +1710,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@oxc-resolver/binding-darwin-arm64": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-5.0.1.tgz", - "integrity": "sha512-lY5mi+6ztYGM9tiyMhHbzZteE7LFaexu9PjDL2N0stCNuGkSHO1eeeabi2ckxGWBbu9EW01XovbQqir12NbA6A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@oxc-resolver/binding-darwin-x64": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-5.0.1.tgz", - "integrity": "sha512-wHKdPB2Q0dMVQy6b5depG8IGI0Y37CIUTZYrZDYEGMT3X481DAJjp6AIVVHQeolEZzy+lWrpUQdGPy0dQnt7IA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@oxc-resolver/binding-freebsd-x64": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-5.0.1.tgz", - "integrity": "sha512-TchNkHMASh2vZ2/FH71zqgAUNYuAlP8Bm1ocSnt7UVV43jZ9kG8HtQFc3AsYeVGzw06LZoeE3mVdSQVXUZhgzA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-5.0.1.tgz", - "integrity": "sha512-JhqYi6uTSYflXSDNG/ZPTvBUcvcPR+vr/09XLdWJpZfEYzpPEEr7YQ2ogiOfZVUmCZOJWVOP8jJdv735j46a5w==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oxc-resolver/binding-linux-arm64-gnu": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-5.0.1.tgz", - "integrity": "sha512-W2OXq25tYiFVhi0Eioc9b+KWnaK2Hj7x/eW2u6r6u4afd1cQ09U+o5u98jrj1rxowSOTfFyiKqMqQOrS4PAlFg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oxc-resolver/binding-linux-arm64-musl": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-5.0.1.tgz", - "integrity": "sha512-dYaXmy90L5fTpH0mWmWvsf5PC9me5Lyjcj5vOQYNVedSQUavGMbQ+sKOWOTAFIpS8xzzIhYRdLI7oj4WV9S2bQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oxc-resolver/binding-linux-x64-gnu": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-5.0.1.tgz", - "integrity": "sha512-lOgcxgtV7nM4TjolWgW9qk05iDQE2GGZTx2Zr+Jj+4GqdIhkkGpbqyGPJx2FRsY6kXhyaA9eOad4Bldfo8vAaw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oxc-resolver/binding-linux-x64-musl": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-5.0.1.tgz", - "integrity": "sha512-3Pg8eSolVs3hy3xoqkjCgoIC1uHKPAUY0rs4QX+KtsPMOZ7iO5b3JBbJHl+ZDIeuzE8dkSRG7aIuCNVonp5G1Q==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oxc-resolver/binding-wasm32-wasi": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-5.0.1.tgz", - "integrity": "sha512-rBEgV5AW5obb6ATeNUSUouW0FzpoADOweTYblprko+Cv6rW1NSQGzGxD6o6jhIk4yV7/CZBwBWAkz9xpL5JSUQ==", - "cpu": [ - "wasm32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@napi-rs/wasm-runtime": "^0.2.7" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@oxc-resolver/binding-win32-arm64-msvc": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-5.0.1.tgz", - "integrity": "sha512-okHg9C+z+2tCGKPszYVJDTZKhPHta7xKvhw0WMWPLTz9wbBMmHTuY9vVpgvFGhTU3N5iQ56LPollnSPtjvObCw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@oxc-resolver/binding-win32-x64-msvc": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-5.0.1.tgz", - "integrity": "sha512-ODlCn4Pbd0HEWMixonax1uJtNCG4lEne6Jq98iUsmwSibQYcBzutxPed1qhLKur6KtCsYYa4LtRxys7e/5lZwQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -3238,17 +3081,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz", - "integrity": "sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.28.0.tgz", + "integrity": "sha512-lvFK3TCGAHsItNdWZ/1FkvpzCxTHUVuFrdnOGLMa0GGCFIbCgQWVk3CzCGdA7kM3qGVc+dfW9tr0Z/sHnGDFyg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.26.1", - "@typescript-eslint/type-utils": "8.26.1", - "@typescript-eslint/utils": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1", + "@typescript-eslint/scope-manager": "8.28.0", + "@typescript-eslint/type-utils": "8.28.0", + "@typescript-eslint/utils": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3268,16 +3111,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.1.tgz", - "integrity": "sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.28.0.tgz", + "integrity": "sha512-LPcw1yHD3ToaDEoljFEfQ9j2xShY367h7FZ1sq5NJT9I3yj4LHer1Xd1yRSOdYy9BpsrxU7R+eoDokChYM53lQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.26.1", - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/typescript-estree": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1", + "@typescript-eslint/scope-manager": "8.28.0", + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/typescript-estree": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0", "debug": "^4.3.4" }, "engines": { @@ -3293,14 +3136,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz", - "integrity": "sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.28.0.tgz", + "integrity": "sha512-u2oITX3BJwzWCapoZ/pXw6BCOl8rJP4Ij/3wPoGvY8XwvXflOzd1kLrDUUUAIEdJSFh+ASwdTHqtan9xSg8buw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1" + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3311,14 +3154,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz", - "integrity": "sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.28.0.tgz", + "integrity": "sha512-oRoXu2v0Rsy/VoOGhtWrOKDiIehvI+YNrDk5Oqj40Mwm0Yt01FC/Q7nFqg088d3yAsR1ZcZFVfPCTTFCe/KPwg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.26.1", - "@typescript-eslint/utils": "8.26.1", + "@typescript-eslint/typescript-estree": "8.28.0", + "@typescript-eslint/utils": "8.28.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -3335,9 +3178,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.1.tgz", - "integrity": "sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.28.0.tgz", + "integrity": "sha512-bn4WS1bkKEjx7HqiwG2JNB3YJdC1q6Ue7GyGlwPHyt0TnVq6TtD/hiOdTZt71sq0s7UzqBFXD8t8o2e63tXgwA==", "dev": true, "license": "MIT", "engines": { @@ -3349,14 +3192,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz", - "integrity": "sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.28.0.tgz", + "integrity": "sha512-H74nHEeBGeklctAVUvmDkxB1mk+PAZ9FiOMPFncdqeRBXxk1lWSYraHw8V12b7aa6Sg9HOBNbGdSHobBPuQSuA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/visitor-keys": "8.26.1", + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -3392,16 +3235,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.1.tgz", - "integrity": "sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.28.0.tgz", + "integrity": "sha512-OELa9hbTYciYITqgurT1u/SzpQVtDLmQMFzy/N8pQE+tefOyCWT79jHsav294aTqV1q1u+VzqDGbuujvRYaeSQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.26.1", - "@typescript-eslint/types": "8.26.1", - "@typescript-eslint/typescript-estree": "8.26.1" + "@typescript-eslint/scope-manager": "8.28.0", + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/typescript-estree": "8.28.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3416,13 +3259,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz", - "integrity": "sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.28.0.tgz", + "integrity": "sha512-hbn8SZ8w4u2pRwgQ1GlUrPKE+t2XvcCW5tTRF7j6SMYIuYG37XuzIW44JCZPa36evi0Oy2SnM664BlIaAuQcvg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.26.1", + "@typescript-eslint/types": "8.28.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -3433,10 +3276,10 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@unrs/rspack-resolver-binding-darwin-arm64": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-darwin-arm64/-/rspack-resolver-binding-darwin-arm64-1.2.2.tgz", - "integrity": "sha512-i7z0B+C0P8Q63O/5PXJAzeFtA1ttY3OR2VSJgGv18S+PFNwD98xHgAgPOT1H5HIV6jlQP8Avzbp09qxJUdpPNw==", + "node_modules/@unrs/resolver-binding-darwin-arm64": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.3.3.tgz", + "integrity": "sha512-EpRILdWr3/xDa/7MoyfO7JuBIJqpBMphtu4+80BK1bRfFcniVT74h3Z7q1+WOc92FuIAYatB1vn9TJR67sORGw==", "cpu": [ "arm64" ], @@ -3447,10 +3290,10 @@ "darwin" ] }, - "node_modules/@unrs/rspack-resolver-binding-darwin-x64": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-darwin-x64/-/rspack-resolver-binding-darwin-x64-1.2.2.tgz", - "integrity": "sha512-YEdFzPjIbDUCfmehC6eS+AdJYtFWY35YYgWUnqqTM2oe/N58GhNy5yRllxYhxwJ9GcfHoNc6Ubze1yjkNv+9Qg==", + "node_modules/@unrs/resolver-binding-darwin-x64": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.3.3.tgz", + "integrity": "sha512-ntj/g7lPyqwinMJWZ+DKHBse8HhVxswGTmNgFKJtdgGub3M3zp5BSZ3bvMP+kBT6dnYJLSVlDqdwOq1P8i0+/g==", "cpu": [ "x64" ], @@ -3461,10 +3304,10 @@ "darwin" ] }, - "node_modules/@unrs/rspack-resolver-binding-freebsd-x64": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-freebsd-x64/-/rspack-resolver-binding-freebsd-x64-1.2.2.tgz", - "integrity": "sha512-TU4ntNXDgPN2giQyyzSnGWf/dVCem5lvwxg0XYvsvz35h5H19WrhTmHgbrULMuypCB3aHe1enYUC9rPLDw45mA==", + "node_modules/@unrs/resolver-binding-freebsd-x64": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.3.3.tgz", + "integrity": "sha512-l6BT8f2CU821EW7U8hSUK8XPq4bmyTlt9Mn4ERrfjJNoCw0/JoHAh9amZZtV3cwC3bwwIat+GUnrcHTG9+qixw==", "cpu": [ "x64" ], @@ -3475,10 +3318,10 @@ "freebsd" ] }, - "node_modules/@unrs/rspack-resolver-binding-linux-arm-gnueabihf": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-arm-gnueabihf/-/rspack-resolver-binding-linux-arm-gnueabihf-1.2.2.tgz", - "integrity": "sha512-ik3w4/rU6RujBvNWiDnKdXi1smBhqxEDhccNi/j2rHaMjm0Fk49KkJ6XKsoUnD2kZ5xaMJf9JjailW/okfUPIw==", + "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.3.3.tgz", + "integrity": "sha512-8ScEc5a4y7oE2BonRvzJ+2GSkBaYWyh0/Ko4Q25e/ix6ANpJNhwEPZvCR6GVRmsQAYMIfQvYLdM6YEN+qRjnAQ==", "cpu": [ "arm" ], @@ -3489,10 +3332,24 @@ "linux" ] }, - "node_modules/@unrs/rspack-resolver-binding-linux-arm64-gnu": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-arm64-gnu/-/rspack-resolver-binding-linux-arm64-gnu-1.2.2.tgz", - "integrity": "sha512-fp4Azi8kHz6TX8SFmKfyScZrMLfp++uRm2srpqRjsRZIIBzH74NtSkdEUHImR4G7f7XJ+sVZjCc6KDDK04YEpQ==", + "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.3.3.tgz", + "integrity": "sha512-8qQ6l1VTzLNd3xb2IEXISOKwMGXDCzY/UNy/7SovFW2Sp0K3YbL7Ao7R18v6SQkLqQlhhqSBIFRk+u6+qu5R5A==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.3.3.tgz", + "integrity": "sha512-v81R2wjqcWXJlQY23byqYHt9221h4anQ6wwN64oMD/WAE+FmxPHFZee5bhRkNVtzqO/q7wki33VFWlhiADwUeQ==", "cpu": [ "arm64" ], @@ -3503,10 +3360,10 @@ "linux" ] }, - "node_modules/@unrs/rspack-resolver-binding-linux-arm64-musl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-arm64-musl/-/rspack-resolver-binding-linux-arm64-musl-1.2.2.tgz", - "integrity": "sha512-gMiG3DCFioJxdGBzhlL86KcFgt9HGz0iDhw0YVYPsShItpN5pqIkNrI+L/Q/0gfDiGrfcE0X3VANSYIPmqEAlQ==", + "node_modules/@unrs/resolver-binding-linux-arm64-musl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.3.3.tgz", + "integrity": "sha512-cAOx/j0u5coMg4oct/BwMzvWJdVciVauUvsd+GQB/1FZYKQZmqPy0EjJzJGbVzFc6gbnfEcSqvQE6gvbGf2N8Q==", "cpu": [ "arm64" ], @@ -3517,10 +3374,38 @@ "linux" ] }, - "node_modules/@unrs/rspack-resolver-binding-linux-x64-gnu": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-x64-gnu/-/rspack-resolver-binding-linux-x64-gnu-1.2.2.tgz", - "integrity": "sha512-n/4n2CxaUF9tcaJxEaZm+lqvaw2gflfWQ1R9I7WQgYkKEKbRKbpG/R3hopYdUmLSRI4xaW1Cy0Bz40eS2Yi4Sw==", + "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.3.3.tgz", + "integrity": "sha512-mq2blqwErgDJD4gtFDlTX/HZ7lNP8YCHYFij2gkXPtMzrXxPW1hOtxL6xg4NWxvnj4bppppb0W3s/buvM55yfg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.3.3.tgz", + "integrity": "sha512-u0VRzfFYysarYHnztj2k2xr+eu9rmgoTUUgCCIT37Nr+j0A05Xk2c3RY8Mh5+DhCl2aYibihnaAEJHeR0UOFIQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-x64-gnu": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.3.3.tgz", + "integrity": "sha512-OrVo5ZsG29kBF0Ug95a2KidS16PqAMmQNozM6InbquOfW/udouk063e25JVLqIBhHLB2WyBnixOQ19tmeC/hIg==", "cpu": [ "x64" ], @@ -3531,10 +3416,10 @@ "linux" ] }, - "node_modules/@unrs/rspack-resolver-binding-linux-x64-musl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-x64-musl/-/rspack-resolver-binding-linux-x64-musl-1.2.2.tgz", - "integrity": "sha512-cHyhAr6rlYYbon1L2Ag449YCj3p6XMfcYTP0AQX+KkQo025d1y/VFtPWvjMhuEsE2lLvtHm7GdJozj6BOMtzVg==", + "node_modules/@unrs/resolver-binding-linux-x64-musl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.3.3.tgz", + "integrity": "sha512-PYnmrwZ4HMp9SkrOhqPghY/aoL+Rtd4CQbr93GlrRTjK6kDzfMfgz3UH3jt6elrQAfupa1qyr1uXzeVmoEAxUA==", "cpu": [ "x64" ], @@ -3545,10 +3430,10 @@ "linux" ] }, - "node_modules/@unrs/rspack-resolver-binding-wasm32-wasi": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-wasm32-wasi/-/rspack-resolver-binding-wasm32-wasi-1.2.2.tgz", - "integrity": "sha512-eogDKuICghDLGc32FtP+WniG38IB1RcGOGz0G3z8406dUdjJvxfHGuGs/dSlM9YEp/v0lEqhJ4mBu6X2nL9pog==", + "node_modules/@unrs/resolver-binding-wasm32-wasi": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.3.3.tgz", + "integrity": "sha512-81AnQY6fShmktQw4hWDUIilsKSdvr/acdJ5azAreu2IWNlaJOKphJSsUVWE+yCk6kBMoQyG9ZHCb/krb5K0PEA==", "cpu": [ "wasm32" ], @@ -3562,10 +3447,10 @@ "node": ">=14.0.0" } }, - "node_modules/@unrs/rspack-resolver-binding-win32-arm64-msvc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-win32-arm64-msvc/-/rspack-resolver-binding-win32-arm64-msvc-1.2.2.tgz", - "integrity": "sha512-7sWRJumhpXSi2lccX8aQpfFXHsSVASdWndLv8AmD8nDRA/5PBi8IplQVZNx2mYRx6+Bp91Z00kuVqpXO9NfCTg==", + "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.3.3.tgz", + "integrity": "sha512-X/42BMNw7cW6xrB9syuP5RusRnWGoq+IqvJO8IDpp/BZg64J1uuIW6qA/1Cl13Y4LyLXbJVYbYNSKwR/FiHEng==", "cpu": [ "arm64" ], @@ -3576,10 +3461,24 @@ "win32" ] }, - "node_modules/@unrs/rspack-resolver-binding-win32-x64-msvc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-win32-x64-msvc/-/rspack-resolver-binding-win32-x64-msvc-1.2.2.tgz", - "integrity": "sha512-hewo/UMGP1a7O6FG/ThcPzSJdm/WwrYDNkdGgWl6M18H6K6MSitklomWpT9MUtT5KGj++QJb06va/14QBC4pvw==", + "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.3.3.tgz", + "integrity": "sha512-EGNnNGQxMU5aTN7js3ETYvuw882zcO+dsVjs+DwO2j/fRVKth87C8e2GzxW1L3+iWAXMyJhvFBKRavk9Og1Z6A==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@unrs/resolver-binding-win32-x64-msvc": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.3.3.tgz", + "integrity": "sha512-GraLbYqOJcmW1qY3osB+2YIiD62nVf2/bVLHZmrb4t/YSUwE03l7TwcDJl08T/Tm3SVhepX8RQkpzWbag/Sb4w==", "cpu": [ "x64" ], @@ -6671,19 +6570,19 @@ } }, "node_modules/eslint": { - "version": "9.22.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz", - "integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", + "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.19.2", - "@eslint/config-helpers": "^0.1.0", + "@eslint/config-helpers": "^0.2.0", "@eslint/core": "^0.12.0", - "@eslint/eslintrc": "^3.3.0", - "@eslint/js": "9.22.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.23.0", "@eslint/plugin-kit": "^0.2.7", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -6770,24 +6669,24 @@ } }, "node_modules/eslint-import-resolver-typescript": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.1.1.tgz", - "integrity": "sha512-91As8PwH6xjPwndAbvhTuZ3DUfdl4HttocWRyaLOd5T4uUo6km8EDO7Sve4jzH50V1wbgql2nOFbE3GGfARJag==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.3.1.tgz", + "integrity": "sha512-/dR9YMomeBlvfuvX5q0C3Y/2PHC9OCRdT2ijFwdfq/4Bq+4m5/lqstEp9k3P6ocha1pCbhoY9fkwVYLmOqR0VQ==", "dev": true, "license": "ISC", "dependencies": { "debug": "^4.4.0", "get-tsconfig": "^4.10.0", - "is-bun-module": "^1.3.0", - "rspack-resolver": "^1.1.2", + "is-bun-module": "^2.0.0", "stable-hash": "^0.0.5", - "tinyglobby": "^0.2.12" + "tinyglobby": "^0.2.12", + "unrs-resolver": "^1.3.3" }, "engines": { "node": "^16.17.0 || >=18.6.0" }, "funding": { - "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" + "url": "https://opencollective.com/eslint-import-resolver-typescript" }, "peerDependencies": { "eslint": "*", @@ -6817,24 +6716,24 @@ } }, "node_modules/eslint-plugin-import-x": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.7.0.tgz", - "integrity": "sha512-LHxq8V6SJ99hSFYAexxUKk3gVsjb8fuNRGsbMinwlJGvcuREP9SVzCCNKJ3POdDowEHdExy/bPN6YfjraueIXA==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.9.4.tgz", + "integrity": "sha512-IPWbN0KBgBCpAiSlUcS17zc1eqMzRlYz15AzsFrw2Qfqt+e0IupxYbvYD96bGLKVlNdkNwa4ggv1skztpaZR/g==", "dev": true, "license": "MIT", "dependencies": { "@types/doctrine": "^0.0.9", - "@typescript-eslint/utils": "^8.26.1", + "@typescript-eslint/utils": "^8.28.0", "debug": "^4.4.0", "doctrine": "^3.0.0", "eslint-import-resolver-node": "^0.3.9", "get-tsconfig": "^4.10.0", "is-glob": "^4.0.3", "minimatch": "^10.0.1", - "oxc-resolver": "^5.0.0", "semver": "^7.7.1", "stable-hash": "^0.0.5", - "tslib": "^2.8.1" + "tslib": "^2.8.1", + "unrs-resolver": "^1.3.3" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7137,9 +7036,9 @@ } }, "node_modules/eslint/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -8466,13 +8365,13 @@ } }, "node_modules/is-bun-module": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz", - "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz", + "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==", "dev": true, "license": "MIT", "dependencies": { - "semver": "^7.6.3" + "semver": "^7.7.1" } }, "node_modules/is-callable": { @@ -10890,29 +10789,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/oxc-resolver": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-5.0.1.tgz", - "integrity": "sha512-BbclyCSxgnqO5mo05RGcwp8rkVdZL7sf0ugEnFWK67DIBAMq5wR0/GQlQCdPiPkpiv9GESAVX2cbh1DMFux/TQ==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/Boshen" - }, - "optionalDependencies": { - "@oxc-resolver/binding-darwin-arm64": "5.0.1", - "@oxc-resolver/binding-darwin-x64": "5.0.1", - "@oxc-resolver/binding-freebsd-x64": "5.0.1", - "@oxc-resolver/binding-linux-arm-gnueabihf": "5.0.1", - "@oxc-resolver/binding-linux-arm64-gnu": "5.0.1", - "@oxc-resolver/binding-linux-arm64-musl": "5.0.1", - "@oxc-resolver/binding-linux-x64-gnu": "5.0.1", - "@oxc-resolver/binding-linux-x64-musl": "5.0.1", - "@oxc-resolver/binding-wasm32-wasi": "5.0.1", - "@oxc-resolver/binding-win32-arm64-msvc": "5.0.1", - "@oxc-resolver/binding-win32-x64-msvc": "5.0.1" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -12313,29 +12189,6 @@ "points-on-path": "^0.2.1" } }, - "node_modules/rspack-resolver": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/rspack-resolver/-/rspack-resolver-1.2.2.tgz", - "integrity": "sha512-Fwc19jMBA3g+fxDJH2B4WxwZjE0VaaOL7OX/A4Wn5Zv7bOD/vyPZhzXfaO73Xc2GAlfi96g5fGUa378WbIGfFw==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/JounQin" - }, - "optionalDependencies": { - "@unrs/rspack-resolver-binding-darwin-arm64": "1.2.2", - "@unrs/rspack-resolver-binding-darwin-x64": "1.2.2", - "@unrs/rspack-resolver-binding-freebsd-x64": "1.2.2", - "@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "1.2.2", - "@unrs/rspack-resolver-binding-linux-arm64-gnu": "1.2.2", - "@unrs/rspack-resolver-binding-linux-arm64-musl": "1.2.2", - "@unrs/rspack-resolver-binding-linux-x64-gnu": "1.2.2", - "@unrs/rspack-resolver-binding-linux-x64-musl": "1.2.2", - "@unrs/rspack-resolver-binding-wasm32-wasi": "1.2.2", - "@unrs/rspack-resolver-binding-win32-arm64-msvc": "1.2.2", - "@unrs/rspack-resolver-binding-win32-x64-msvc": "1.2.2" - } - }, "node_modules/run-con": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.3.2.tgz", @@ -13123,9 +12976,9 @@ "license": "ISC" }, "node_modules/stylelint": { - "version": "16.16.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.16.0.tgz", - "integrity": "sha512-40X5UOb/0CEFnZVEHyN260HlSSUxPES+arrUphOumGWgXERHfwCD0kNBVILgQSij8iliYVwlc0V7M5bcLP9vPg==", + "version": "16.17.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.17.0.tgz", + "integrity": "sha512-I9OwVIWRMqVm2Br5iTbrfSqGRPWQUlvm6oXO1xZuYYu0Gpduy67N8wXOZv15p6E/JdlZiAtQaIoLKZEWk5hrjw==", "dev": true, "funding": [ { @@ -14156,15 +14009,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.26.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.26.1.tgz", - "integrity": "sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.28.0.tgz", + "integrity": "sha512-jfZtxJoHm59bvoCMYCe2BM0/baMswRhMmYhy+w6VfcyHrjxZ0OJe0tGasydCpIpA+A/WIJhTyZfb3EtwNC/kHQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.26.1", - "@typescript-eslint/parser": "8.26.1", - "@typescript-eslint/utils": "8.26.1" + "@typescript-eslint/eslint-plugin": "8.28.0", + "@typescript-eslint/parser": "8.28.0", + "@typescript-eslint/utils": "8.28.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -14251,6 +14104,33 @@ "node": ">= 10.0.0" } }, + "node_modules/unrs-resolver": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.3.3.tgz", + "integrity": "sha512-PFLAGQzYlyjniXdbmQ3dnGMZJXX5yrl2YS4DLRfR3BhgUsE1zpRIrccp9XMOGRfIHpdFvCn/nr5N1KMVda4x3A==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/JounQin" + }, + "optionalDependencies": { + "@unrs/resolver-binding-darwin-arm64": "1.3.3", + "@unrs/resolver-binding-darwin-x64": "1.3.3", + "@unrs/resolver-binding-freebsd-x64": "1.3.3", + "@unrs/resolver-binding-linux-arm-gnueabihf": "1.3.3", + "@unrs/resolver-binding-linux-arm-musleabihf": "1.3.3", + "@unrs/resolver-binding-linux-arm64-gnu": "1.3.3", + "@unrs/resolver-binding-linux-arm64-musl": "1.3.3", + "@unrs/resolver-binding-linux-ppc64-gnu": "1.3.3", + "@unrs/resolver-binding-linux-s390x-gnu": "1.3.3", + "@unrs/resolver-binding-linux-x64-gnu": "1.3.3", + "@unrs/resolver-binding-linux-x64-musl": "1.3.3", + "@unrs/resolver-binding-wasm32-wasi": "1.3.3", + "@unrs/resolver-binding-win32-arm64-msvc": "1.3.3", + "@unrs/resolver-binding-win32-ia32-msvc": "1.3.3", + "@unrs/resolver-binding-win32-x64-msvc": "1.3.3" + } + }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", diff --git a/package.json b/package.json index 78da51d1ab..9d000347f0 100644 --- a/package.json +++ b/package.json @@ -66,15 +66,15 @@ "@stoplight/spectral-cli": "6.14.3", "@stylistic/eslint-plugin-js": "4.2.0", "@stylistic/stylelint-plugin": "3.1.2", - "@typescript-eslint/parser": "8.26.1", + "@typescript-eslint/parser": "8.28.0", "@vitejs/plugin-vue": "5.2.3", "@vitest/coverage-v8": "3.0.8", "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", - "eslint": "9.22.0", - "eslint-import-resolver-typescript": "4.1.1", + "eslint": "9.23.0", + "eslint-import-resolver-typescript": "4.3.1", "eslint-plugin-array-func": "5.0.2", - "eslint-plugin-import-x": "4.7.0", + "eslint-plugin-import-x": "4.9.4", "eslint-plugin-no-jquery": "3.1.1", "eslint-plugin-no-use-extend-native": "0.7.2", "eslint-plugin-playwright": "2.2.0", @@ -91,13 +91,13 @@ "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.44.0", "postcss-html": "1.8.0", - "stylelint": "16.16.0", + "stylelint": "16.17.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.11", "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", "typescript": "5.7.3", - "typescript-eslint": "8.26.1", + "typescript-eslint": "8.28.0", "vite-string-plugin": "1.3.4", "vitest": "3.0.8" }, From d59495a4dbe42e5d952a0f4cd821b3d51be4299c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Mar 2025 00:32:48 +0000 Subject: [PATCH 028/568] Update vitest monorepo to v3.0.9 (forgejo) (#7382) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 100 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ef5fa81ff..c0668169d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "@stylistic/stylelint-plugin": "3.1.2", "@typescript-eslint/parser": "8.28.0", "@vitejs/plugin-vue": "5.2.3", - "@vitest/coverage-v8": "3.0.8", + "@vitest/coverage-v8": "3.0.9", "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", "eslint": "9.23.0", @@ -100,7 +100,7 @@ "typescript": "5.7.3", "typescript-eslint": "8.28.0", "vite-string-plugin": "1.3.4", - "vitest": "3.0.8" + "vitest": "3.0.9" }, "engines": { "node": ">= 20.0.0" @@ -3504,9 +3504,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.8.tgz", - "integrity": "sha512-y7SAKsQirsEJ2F8bulBck4DoluhI2EEgTimHd6EEUgJBGKy9tC25cpywh1MH4FvDGoG2Unt7+asVd1kj4qOSAw==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.9.tgz", + "integrity": "sha512-15OACZcBtQ34keIEn19JYTVuMFTlFrClclwWjHo/IRPg/8ELpkgNTl0o7WLP9WO9XGH6+tip9CPYtEOrIDJvBA==", "dev": true, "license": "MIT", "dependencies": { @@ -3527,8 +3527,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.0.8", - "vitest": "3.0.8" + "@vitest/browser": "3.0.9", + "vitest": "3.0.9" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -3568,14 +3568,14 @@ } }, "node_modules/@vitest/expect": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.8.tgz", - "integrity": "sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.9.tgz", + "integrity": "sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.8", - "@vitest/utils": "3.0.8", + "@vitest/spy": "3.0.9", + "@vitest/utils": "3.0.9", "chai": "^5.2.0", "tinyrainbow": "^2.0.0" }, @@ -3584,13 +3584,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.8.tgz", - "integrity": "sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.9.tgz", + "integrity": "sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.8", + "@vitest/spy": "3.0.9", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -3638,9 +3638,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.8.tgz", - "integrity": "sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz", + "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==", "dev": true, "license": "MIT", "dependencies": { @@ -3651,13 +3651,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.8.tgz", - "integrity": "sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.9.tgz", + "integrity": "sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.0.8", + "@vitest/utils": "3.0.9", "pathe": "^2.0.3" }, "funding": { @@ -3665,13 +3665,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.8.tgz", - "integrity": "sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.9.tgz", + "integrity": "sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.8", + "@vitest/pretty-format": "3.0.9", "magic-string": "^0.30.17", "pathe": "^2.0.3" }, @@ -3690,9 +3690,9 @@ } }, "node_modules/@vitest/spy": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.8.tgz", - "integrity": "sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.9.tgz", + "integrity": "sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3703,13 +3703,13 @@ } }, "node_modules/@vitest/utils": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.8.tgz", - "integrity": "sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.9.tgz", + "integrity": "sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.8", + "@vitest/pretty-format": "3.0.9", "loupe": "^3.1.3", "tinyrainbow": "^2.0.0" }, @@ -14307,9 +14307,9 @@ } }, "node_modules/vite-node": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.8.tgz", - "integrity": "sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.9.tgz", + "integrity": "sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==", "dev": true, "license": "MIT", "dependencies": { @@ -14428,19 +14428,19 @@ } }, "node_modules/vitest": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.8.tgz", - "integrity": "sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.9.tgz", + "integrity": "sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "3.0.8", - "@vitest/mocker": "3.0.8", - "@vitest/pretty-format": "^3.0.8", - "@vitest/runner": "3.0.8", - "@vitest/snapshot": "3.0.8", - "@vitest/spy": "3.0.8", - "@vitest/utils": "3.0.8", + "@vitest/expect": "3.0.9", + "@vitest/mocker": "3.0.9", + "@vitest/pretty-format": "^3.0.9", + "@vitest/runner": "3.0.9", + "@vitest/snapshot": "3.0.9", + "@vitest/spy": "3.0.9", + "@vitest/utils": "3.0.9", "chai": "^5.2.0", "debug": "^4.4.0", "expect-type": "^1.1.0", @@ -14452,7 +14452,7 @@ "tinypool": "^1.0.2", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0", - "vite-node": "3.0.8", + "vite-node": "3.0.9", "why-is-node-running": "^2.3.0" }, "bin": { @@ -14468,8 +14468,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.0.8", - "@vitest/ui": "3.0.8", + "@vitest/browser": "3.0.9", + "@vitest/ui": "3.0.9", "happy-dom": "*", "jsdom": "*" }, diff --git a/package.json b/package.json index 9d000347f0..7dbc283f50 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@stylistic/stylelint-plugin": "3.1.2", "@typescript-eslint/parser": "8.28.0", "@vitejs/plugin-vue": "5.2.3", - "@vitest/coverage-v8": "3.0.8", + "@vitest/coverage-v8": "3.0.9", "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", "eslint": "9.23.0", @@ -99,7 +99,7 @@ "typescript": "5.7.3", "typescript-eslint": "8.28.0", "vite-string-plugin": "1.3.4", - "vitest": "3.0.8" + "vitest": "3.0.9" }, "browserslist": [ "defaults" From 51caba694af5967056239055953cbdc96bd7f6cc Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 30 Mar 2025 05:04:36 +0000 Subject: [PATCH 029/568] fix(ui): prepend AppSubURL to visibility hint URLs (#7379) - If configured, add `AppSubUrl` to the visibility hint URLs shown to the user on the profile activity page. - Resolves https://codeberg.org/forgejo/forgejo/issues/7327 - Integration testing adjusted. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7379 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- templates/user/profile.tmpl | 6 +++--- tests/integration/user_profile_activity_test.go | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 1f39576ac2..1d62f3eea9 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -12,12 +12,12 @@ {{if eq .SignedUserID .ContextUser.ID}}

{{if .ContextUser.KeepActivityPrivate}} - {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private" "/user/settings#keep-activity-private"}} + {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private" (print AppSubUrl "/user/settings#keep-activity-private")}} {{else}} {{if eq .ContextUser.Visibility 2}} - {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private_profile" "/user/settings#visibility-setting"}} + {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private_profile" (print AppSubUrl "/user/settings#visibility-setting")}} {{else}} - {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_public" "/user/settings#keep-activity-private"}} + {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_public" (print AppSubUrl "/user/settings#keep-activity-private")}} {{end}} {{end}}

diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_activity_test.go index 26563fe2db..47a8df94b2 100644 --- a/tests/integration/user_profile_activity_test.go +++ b/tests/integration/user_profile_activity_test.go @@ -8,7 +8,9 @@ import ( "strconv" "testing" + "forgejo.org/modules/setting" "forgejo.org/modules/structs" + "forgejo.org/modules/test" "forgejo.org/tests" "github.com/stretchr/testify/assert" @@ -23,6 +25,7 @@ import ( // - Profile visibility // - Public activity visibility func TestUserProfileActivity(t *testing.T) { + defer test.MockVariableValue(&setting.AppSubURL, "/sub")() defer tests.PrepareTestEnv(t)() // This test needs multiple users with different access statuses to check for all possible states userAdmin := loginUser(t, "user1") @@ -52,7 +55,7 @@ func TestUserProfileActivity(t *testing.T) { // When profile activity is configured as public, but the profile is private, tell the user about this and link to visibility settings. hintLink := testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators because your profile is private. Configure.", true) - assert.Equal(t, "/user/settings#visibility-setting", hintLink) + assert.Equal(t, "/sub/user/settings#visibility-setting", hintLink) // When the profile is private, tell the admin about this. testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true) @@ -76,7 +79,7 @@ func TestUserProfileActivity(t *testing.T) { testUser2ActivityVisibility(t, userGuest, "This user has disabled the public visibility of the activity.", false) // Verify that Configure link is correct - assert.Equal(t, "/user/settings#keep-activity-private", hintLink) + assert.Equal(t, "/sub/user/settings#keep-activity-private", hintLink) } // testChangeUserActivityVisibility allows to easily change visibility of public activity for a user @@ -112,11 +115,11 @@ func testUser2ActivityVisibility(t *testing.T, session *TestSession, hint string assert.Equal(t, availability, page.Find("#activity-feed").Length() > 0) // Check availability of RSS feed button too - assert.Equal(t, availability, page.Find("#profile-avatar-card a[href='/user2.rss']").Length() > 0) + assert.Equal(t, availability, page.Find("#profile-avatar-card a[href='/sub/user2.rss']").Length() > 0) // Check that the current tab is displayed and is active regardless of it's actual availability // For example, on / it wouldn't be available to guest, but it should be still present on /?tab=activity - assert.Positive(t, page.Find("overflow-menu .active.item[href='/user2?tab=activity']").Length()) + assert.Positive(t, page.Find("overflow-menu .active.item[href='/sub/user2?tab=activity']").Length()) if hintLinkExists { return hintLink } @@ -128,5 +131,5 @@ func testUser2ActivityButtonsAvailability(t *testing.T, session *TestSession, bu t.Helper() response := session.MakeRequest(t, NewRequest(t, "GET", "/user2"), http.StatusOK) page := NewHTMLParser(t, response.Body) - assert.Equal(t, buttons, page.Find("overflow-menu .item[href='/user2?tab=activity']").Length() > 0) + assert.Equal(t, buttons, page.Find("overflow-menu .item[href='/sub/user2?tab=activity']").Length() > 0) } From bb4e1f426f325bcfdfb80a06991355856a9ce648 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 30 Mar 2025 11:28:19 +0000 Subject: [PATCH 030/568] feat: include a default robots.txt to reduce the impact of crawlers (#7387) - Add a strong strict default robots.txt, if one is not provided by the instance administrators. - Remove code for the legacy public asset path, the error has been logged for a few releases already (existed since v1.21). - Resolves forgejo/forgejo#923 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7387 Reviewed-by: Earl Warren Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- cmd/web.go | 3 -- routers/web/misc/misc.go | 97 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 12 deletions(-) diff --git a/cmd/web.go b/cmd/web.go index 3e7fdee4bf..1e67b2e922 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -198,9 +198,6 @@ func serveInstalled(ctx *cli.Context) error { for fn := range publicFilesSet.Seq() { log.Error("Found legacy public asset %q in CustomPath. Please move it to %s/public/assets/%s", fn, setting.CustomPath, fn) } - if _, err := os.Stat(filepath.Join(setting.CustomPath, "robots.txt")); err == nil { - log.Error(`Found legacy public asset "robots.txt" in CustomPath. Please move it to %s/public/robots.txt`, setting.CustomPath) - } routers.InitWebInstalled(graceful.GetManager().HammerContext()) diff --git a/routers/web/misc/misc.go b/routers/web/misc/misc.go index 306b15e3d5..2f1438b9d0 100644 --- a/routers/web/misc/misc.go +++ b/routers/web/misc/misc.go @@ -33,17 +33,96 @@ func DummyOK(w http.ResponseWriter, req *http.Request) { w.WriteHeader(http.StatusOK) } -func RobotsTxt(w http.ResponseWriter, req *http.Request) { - robotsTxt := util.FilePathJoinAbs(setting.CustomPath, "public/robots.txt") - if ok, _ := util.IsExist(robotsTxt); !ok { - robotsTxt = util.FilePathJoinAbs(setting.CustomPath, "robots.txt") // the legacy "robots.txt" - } - httpcache.SetCacheControlInHeader(w.Header(), setting.StaticCacheTime) - http.ServeFile(w, req, robotsTxt) -} - func StaticRedirect(target string) func(w http.ResponseWriter, req *http.Request) { return func(w http.ResponseWriter, req *http.Request) { http.Redirect(w, req, path.Join(setting.StaticURLPrefix, target), http.StatusMovedPermanently) } } + +var defaultRobotsTxt = []byte(`# The default Forgejo robots.txt +# For more information: https://forgejo.org/docs/latest/admin/search-engines-indexation/ + +User-agent: * +Disallow: /api/ +Disallow: /avatars/ +Disallow: /user/ +Disallow: /swagger.*.json +Disallow: /explore/*?* + +Disallow: /repo/create +Disallow: /repo/migrate +Disallow: /org/create +Disallow: /*/*/fork + +Disallow: /*/*/watchers +Disallow: /*/*/stargazers +Disallow: /*/*/forks + +Disallow: /*/*/src/ +Disallow: /*/*/blame/ +Disallow: /*/*/commit/ +Disallow: /*/*/commits/ +Disallow: /*/*/raw/ +Disallow: /*/*/media/ +Disallow: /*/*/tags +Disallow: /*/*/graph +Disallow: /*/*/branches +Disallow: /*/*/compare +Disallow: /*/*/lastcommit/ +Disallow: /*/*/rss/branch/ +Disallow: /*/*/atom/branch/ + +Disallow: /*/*/activity +Disallow: /*/*/activity_author_data + +Disallow: /*/*/actions +Disallow: /*/*/projects +Disallow: /*/*/labels +Disallow: /*/*/milestones + +Disallow: /*/*/find/ +Disallow: /*/*/tree-list/ +Disallow: /*/*/search/ +Disallow: /*/-/code + +Disallow: /*/*/issues/new +Disallow: /*/*/pulls/*/files +Disallow: /*/*/pulls/*/commits + +Disallow: /attachments/ +Disallow: /*/*/attachments/ +Disallow: /*/*/issues/*/attachments/ +Disallow: /*/*/pulls/*/attachments/ +Disallow: /*/*/releases/attachments +Disallow: /*/*/releases/download + +Disallow: /*/*/archive/ +Disallow: /*.bundle$ +Disallow: /*.patch$ +Disallow: /*.diff$ +Disallow: /*.atom$ +Disallow: /*.rss$ + +Disallow: /*lang=* +Disallow: /*redirect_to=* +Disallow: /*tab=* +Disallow: /*q=* +Disallow: /*sort=* +Disallow: /*repo-search-archived=* +`) + +func RobotsTxt(w http.ResponseWriter, req *http.Request) { + httpcache.SetCacheControlInHeader(w.Header(), setting.StaticCacheTime) + w.Header().Set("Content-Type", "text/plain") + + robotsTxt := util.FilePathJoinAbs(setting.CustomPath, "public/robots.txt") + if ok, _ := util.IsExist(robotsTxt); ok { + http.ServeFile(w, req, robotsTxt) + return + } + + _, err := w.Write(defaultRobotsTxt) + if err != nil { + log.Error("failed to write robots.txt: %v", err) + } +} From a23d0453a37620e3ca5e3d057bd16da3e166a1c0 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 30 Mar 2025 11:31:42 +0000 Subject: [PATCH 031/568] feat(ui/migrations): clarify desired autocompletion type for clone_addr (#7377) * Firefox thinks that this is a login form and that `clone_addr` is it's username field * It would have been an easy fix with with `autocomplete="off"`, but there's an issue with that approach: Firefox plays a cat-mouse game with web developers and intentionally ignores `autocomplete="off"` "for users' security". * Set it to the `url` autocompletion type, Firefox and maybe other browsers give actually somewhat relevant completion entries. They will not be always relevant, but they may be when a migration has to be re-done with different settings. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7377 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- tests/integration/repo_migration_ui_test.go | 8 +++++--- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 0b71c0d9b3..1343e52cdc 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index 5ebf4cfd6a..981260de5a 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index e8d6b60dea..b8d82eb7e2 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index f85ed4d2ab..baaff53d8d 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index ebea97d807..a23baf9780 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}} diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index c73a10529e..03edf5c787 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index 1d7623f9a2..52da3d243b 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index 7f1b3a900d..0434bcbe68 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
- + {{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}} diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go index 7251da5d7a..279e9861fe 100644 --- a/tests/integration/repo_migration_ui_test.go +++ b/tests/integration/repo_migration_ui_test.go @@ -79,10 +79,12 @@ func TestRepoMigrationUI(t *testing.T) { items := page.Find("#migrate_items .field .checkbox input") testRepoMigrationFormItems(t, items, migration.ExpectedItems) - descriptionInput := page.Find("#description") - assert.Equal(t, 1, descriptionInput.Length()) + page.AssertElement(t, "#clone_addr", true) + autocomplete, _ := page.Find("#clone_addr").Attr("autocomplete") + assert.Equal(t, "url", autocomplete) - _, descriptionHasPlaceholder := descriptionInput.Attr("placeholder") + page.AssertElement(t, "#description", true) + _, descriptionHasPlaceholder := page.Find("#description").Attr("placeholder") assert.Equal(t, migration.DescriptionHasPlaceholder, descriptionHasPlaceholder) }) } From 63a80bf2b97233cd7d99322d3fe27a73ffaad34f Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 30 Mar 2025 11:34:02 +0000 Subject: [PATCH 032/568] feat: use XORM EngineGroup instead of single Engine connection (#7212) Resolves #7207 Add new configuration to make XORM work with a main and replicas database instances. The follow configuration parameters were added: - `HOST_PRIMARY` - `HOST_REPLICAS` - `LOAD_BALANCE_POLICY`. Options: - `"WeightRandom"` -> `xorm.WeightRandomPolicy` - `"WeightRoundRobin` -> `WeightRoundRobinPolicy` - `"LeastCon"` -> `LeastConnPolicy` - `"RoundRobin"` -> `xorm.RoundRobinPolicy()` - default: `xorm.RandomPolicy()` - `LOAD_BALANCE_WEIGHTS` Co-authored-by: pat-s Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7212 Reviewed-by: Gusted Co-authored-by: pat-s Co-committed-by: pat-s --- cmd/doctor.go | 15 +- cmd/migrate.go | 8 +- cmd/migrate_storage.go | 5 +- models/db/engine.go | 184 ++++++++++++------ models/db/index_test.go | 8 +- models/db/iterate_test.go | 3 +- models/db/list_test.go | 5 +- models/migrations/migrations.go | 10 + models/migrations/test/tests.go | 5 +- models/unittest/fixtures.go | 19 +- modules/setting/database.go | 165 +++++++++++++--- modules/setting/database_test.go | 102 ++++++++++ modules/testlogger/testlogger.go | 3 + routers/common/db.go | 2 +- routers/install/install.go | 5 +- services/doctor/dbconsistency.go | 9 +- services/doctor/dbversion.go | 10 +- tests/integration/db_collation_test.go | 7 +- .../migration-test/migration_test.go | 27 ++- 19 files changed, 463 insertions(+), 129 deletions(-) diff --git a/cmd/doctor.go b/cmd/doctor.go index ba17e06de2..3807623ccd 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -20,7 +20,6 @@ import ( "forgejo.org/services/doctor" "github.com/urfave/cli/v2" - "xorm.io/xorm" ) // CmdDoctor represents the available doctor sub-command. @@ -120,7 +119,7 @@ func runRecreateTable(ctx *cli.Context) error { args := ctx.Args() names := make([]string, 0, ctx.NArg()) - for i := 0; i < ctx.NArg(); i++ { + for i := range ctx.NArg() { names = append(names, args.Get(i)) } @@ -130,11 +129,17 @@ func runRecreateTable(ctx *cli.Context) error { } recreateTables := migrate_base.RecreateTables(beans...) - return db.InitEngineWithMigration(stdCtx, func(x *xorm.Engine) error { - if err := migrations.EnsureUpToDate(x); err != nil { + return db.InitEngineWithMigration(stdCtx, func(x db.Engine) error { + engine, err := db.GetMasterEngine(x) + if err != nil { return err } - return recreateTables(x) + + if err := migrations.EnsureUpToDate(engine); err != nil { + return err + } + + return recreateTables(engine) }) } diff --git a/cmd/migrate.go b/cmd/migrate.go index ab291cfb66..c192ca1966 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -36,7 +36,13 @@ func runMigrate(ctx *cli.Context) error { log.Info("Log path: %s", setting.Log.RootPath) log.Info("Configuration file: %s", setting.CustomConf) - if err := db.InitEngineWithMigration(context.Background(), migrations.Migrate); err != nil { + if err := db.InitEngineWithMigration(context.Background(), func(dbEngine db.Engine) error { + masterEngine, err := db.GetMasterEngine(dbEngine) + if err != nil { + return err + } + return migrations.Migrate(masterEngine) + }); err != nil { log.Fatal("Failed to initialize ORM engine: %v", err) return err } diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index 1b839e7169..6a04dd48ae 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -23,6 +23,7 @@ import ( "forgejo.org/modules/storage" "github.com/urfave/cli/v2" + "xorm.io/xorm" ) // CmdMigrateStorage represents the available migrate storage sub-command. @@ -195,7 +196,9 @@ func runMigrateStorage(ctx *cli.Context) error { log.Info("Log path: %s", setting.Log.RootPath) log.Info("Configuration file: %s", setting.CustomConf) - if err := db.InitEngineWithMigration(context.Background(), migrations.Migrate); err != nil { + if err := db.InitEngineWithMigration(context.Background(), func(e db.Engine) error { + return migrations.Migrate(e.(*xorm.Engine)) + }); err != nil { log.Fatal("Failed to initialize ORM engine: %v", err) return err } diff --git a/models/db/engine.go b/models/db/engine.go index ca6576da8a..7283b1d516 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -95,34 +95,70 @@ func init() { } } -// newXORMEngine returns a new XORM engine from the configuration -func newXORMEngine() (*xorm.Engine, error) { - connStr, err := setting.DBConnStr() +// newXORMEngineGroup creates an xorm.EngineGroup (with one master and one or more slaves). +// It assumes you have separate master and slave DSNs defined via the settings package. +func newXORMEngineGroup() (Engine, error) { + // Retrieve master DSN from settings. + masterConnStr, err := setting.DBMasterConnStr() if err != nil { - return nil, err + return nil, fmt.Errorf("failed to determine master DSN: %w", err) } - var engine *xorm.Engine - + var masterEngine *xorm.Engine + // For PostgreSQL: if a schema is provided, we use the special "postgresschema" driver. if setting.Database.Type.IsPostgreSQL() && len(setting.Database.Schema) > 0 { - // OK whilst we sort out our schema issues - create a schema aware postgres registerPostgresSchemaDriver() - engine, err = xorm.NewEngine("postgresschema", connStr) + masterEngine, err = xorm.NewEngine("postgresschema", masterConnStr) } else { - engine, err = xorm.NewEngine(setting.Database.Type.String(), connStr) + masterEngine, err = xorm.NewEngine(setting.Database.Type.String(), masterConnStr) } - if err != nil { - return nil, err + return nil, fmt.Errorf("failed to create master engine: %w", err) } if setting.Database.Type.IsMySQL() { - engine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"}) + masterEngine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"}) } - engine.SetSchema(setting.Database.Schema) - return engine, nil + masterEngine.SetSchema(setting.Database.Schema) + + slaveConnStrs, err := setting.DBSlaveConnStrs() + if err != nil { + return nil, fmt.Errorf("failed to load slave DSNs: %w", err) + } + + var slaveEngines []*xorm.Engine + // Iterate over all slave DSNs and create engines + for _, dsn := range slaveConnStrs { + slaveEngine, err := xorm.NewEngine(setting.Database.Type.String(), dsn) + if err != nil { + return nil, fmt.Errorf("failed to create slave engine for dsn %q: %w", dsn, err) + } + if setting.Database.Type.IsMySQL() { + slaveEngine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"}) + } + slaveEngine.SetSchema(setting.Database.Schema) + slaveEngines = append(slaveEngines, slaveEngine) + } + + policy := setting.BuildLoadBalancePolicy(&setting.Database, slaveEngines) + + // Create the EngineGroup using the selected policy + group, err := xorm.NewEngineGroup(masterEngine, slaveEngines, policy) + if err != nil { + return nil, fmt.Errorf("failed to create engine group: %w", err) + } + return engineGroupWrapper{group}, nil } -// SyncAllTables sync the schemas of all tables, is required by unit test code +type engineGroupWrapper struct { + *xorm.EngineGroup +} + +func (w engineGroupWrapper) AddHook(hook contexts.Hook) bool { + w.EngineGroup.AddHook(hook) + return true +} + +// SyncAllTables sync the schemas of all tables func SyncAllTables() error { _, err := x.StoreEngine("InnoDB").SyncWithOptions(xorm.SyncOptions{ WarnIfDatabaseColumnMissed: true, @@ -130,52 +166,61 @@ func SyncAllTables() error { return err } -// InitEngine initializes the xorm.Engine and sets it as db.DefaultContext +// InitEngine initializes the xorm EngineGroup and sets it as db.DefaultContext func InitEngine(ctx context.Context) error { - xormEngine, err := newXORMEngine() + xormEngine, err := newXORMEngineGroup() if err != nil { return fmt.Errorf("failed to connect to database: %w", err) } + // Try to cast to the concrete type to access diagnostic methods + if eng, ok := xormEngine.(engineGroupWrapper); ok { + eng.SetMapper(names.GonicMapper{}) + // WARNING: for serv command, MUST remove the output to os.Stdout, + // so use a log file instead of printing to stdout. + eng.SetLogger(NewXORMLogger(setting.Database.LogSQL)) + eng.ShowSQL(setting.Database.LogSQL) + eng.SetMaxOpenConns(setting.Database.MaxOpenConns) + eng.SetMaxIdleConns(setting.Database.MaxIdleConns) + eng.SetConnMaxLifetime(setting.Database.ConnMaxLifetime) + eng.SetConnMaxIdleTime(setting.Database.ConnMaxIdleTime) + eng.SetDefaultContext(ctx) - xormEngine.SetMapper(names.GonicMapper{}) - // WARNING: for serv command, MUST remove the output to os.stdout, - // so use log file to instead print to stdout. - xormEngine.SetLogger(NewXORMLogger(setting.Database.LogSQL)) - xormEngine.ShowSQL(setting.Database.LogSQL) - xormEngine.SetMaxOpenConns(setting.Database.MaxOpenConns) - xormEngine.SetMaxIdleConns(setting.Database.MaxIdleConns) - xormEngine.SetConnMaxLifetime(setting.Database.ConnMaxLifetime) - xormEngine.SetConnMaxIdleTime(setting.Database.ConnMaxIdleTime) - xormEngine.SetDefaultContext(ctx) + if setting.Database.SlowQueryThreshold > 0 { + eng.AddHook(&SlowQueryHook{ + Treshold: setting.Database.SlowQueryThreshold, + Logger: log.GetLogger("xorm"), + }) + } - if setting.Database.SlowQueryThreshold > 0 { - xormEngine.AddHook(&SlowQueryHook{ - Treshold: setting.Database.SlowQueryThreshold, - Logger: log.GetLogger("xorm"), + errorLogger := log.GetLogger("xorm") + if setting.IsInTesting { + errorLogger = log.GetLogger(log.DEFAULT) + } + + eng.AddHook(&ErrorQueryHook{ + Logger: errorLogger, }) + + eng.AddHook(&TracingHook{}) + + SetDefaultEngine(ctx, eng) + } else { + // Fallback: if type assertion fails, set default engine without extended diagnostics + SetDefaultEngine(ctx, xormEngine) } - - errorLogger := log.GetLogger("xorm") - if setting.IsInTesting { - errorLogger = log.GetLogger(log.DEFAULT) - } - - xormEngine.AddHook(&ErrorQueryHook{ - Logger: errorLogger, - }) - - xormEngine.AddHook(&TracingHook{}) - - SetDefaultEngine(ctx, xormEngine) return nil } -// SetDefaultEngine sets the default engine for db -func SetDefaultEngine(ctx context.Context, eng *xorm.Engine) { - x = eng +// SetDefaultEngine sets the default engine for db. +func SetDefaultEngine(ctx context.Context, eng Engine) { + masterEngine, err := GetMasterEngine(eng) + if err == nil { + x = masterEngine + } + DefaultContext = &Context{ Context: ctx, - e: x, + e: eng, } } @@ -191,12 +236,12 @@ func UnsetDefaultEngine() { DefaultContext = nil } -// InitEngineWithMigration initializes a new xorm.Engine and sets it as the db.DefaultContext +// InitEngineWithMigration initializes a new xorm EngineGroup, runs migrations, and sets it as db.DefaultContext // This function must never call .Sync() if the provided migration function fails. // When called from the "doctor" command, the migration function is a version check // that prevents the doctor from fixing anything in the database if the migration level // is different from the expected value. -func InitEngineWithMigration(ctx context.Context, migrateFunc func(*xorm.Engine) error) (err error) { +func InitEngineWithMigration(ctx context.Context, migrateFunc func(Engine) error) (err error) { if err = InitEngine(ctx); err != nil { return err } @@ -230,14 +275,14 @@ func InitEngineWithMigration(ctx context.Context, migrateFunc func(*xorm.Engine) return nil } -// NamesToBean return a list of beans or an error +// NamesToBean returns a list of beans given names func NamesToBean(names ...string) ([]any, error) { beans := []any{} if len(names) == 0 { beans = append(beans, tables...) return beans, nil } - // Need to map provided names to beans... + // Map provided names to beans beanMap := make(map[string]any) for _, bean := range tables { beanMap[strings.ToLower(reflect.Indirect(reflect.ValueOf(bean)).Type().Name())] = bean @@ -259,7 +304,7 @@ func NamesToBean(names ...string) ([]any, error) { return beans, nil } -// DumpDatabase dumps all data from database according the special database SQL syntax to file system. +// DumpDatabase dumps all data from database using special SQL syntax to the file system. func DumpDatabase(filePath, dbType string) error { var tbs []*schemas.Table for _, t := range tables { @@ -295,29 +340,33 @@ func MaxBatchInsertSize(bean any) int { return 999 / len(t.ColumnsSeq()) } -// IsTableNotEmpty returns true if table has at least one record +// IsTableNotEmpty returns true if the table has at least one record func IsTableNotEmpty(beanOrTableName any) (bool, error) { return x.Table(beanOrTableName).Exist() } -// DeleteAllRecords will delete all the records of this table +// DeleteAllRecords deletes all records in the given table. func DeleteAllRecords(tableName string) error { _, err := x.Exec(fmt.Sprintf("DELETE FROM %s", tableName)) return err } -// GetMaxID will return max id of the table +// GetMaxID returns the maximum id in the table func GetMaxID(beanOrTableName any) (maxID int64, err error) { _, err = x.Select("MAX(id)").Table(beanOrTableName).Get(&maxID) return maxID, err } func SetLogSQL(ctx context.Context, on bool) { - e := GetEngine(ctx) - if x, ok := e.(*xorm.Engine); ok { - x.ShowSQL(on) - } else if sess, ok := e.(*xorm.Session); ok { + ctxEngine := GetEngine(ctx) + + if sess, ok := ctxEngine.(*xorm.Session); ok { sess.Engine().ShowSQL(on) + } else if wrapper, ok := ctxEngine.(engineGroupWrapper); ok { + // Handle engineGroupWrapper directly + wrapper.ShowSQL(on) + } else if masterEngine, err := GetMasterEngine(ctxEngine); err == nil { + masterEngine.ShowSQL(on) } } @@ -374,3 +423,18 @@ func (h *ErrorQueryHook) AfterProcess(c *contexts.ContextHook) error { } return nil } + +// GetMasterEngine extracts the master xorm.Engine from the provided xorm.Engine. +// This handles both direct xorm.Engine cases and engines that implement a Master() method. +func GetMasterEngine(x Engine) (*xorm.Engine, error) { + if getter, ok := x.(interface{ Master() *xorm.Engine }); ok { + return getter.Master(), nil + } + + engine, ok := x.(*xorm.Engine) + if !ok { + return nil, fmt.Errorf("unsupported engine type: %T", x) + } + + return engine, nil +} diff --git a/models/db/index_test.go b/models/db/index_test.go index 929e514329..b64a816bd2 100644 --- a/models/db/index_test.go +++ b/models/db/index_test.go @@ -33,10 +33,11 @@ func getCurrentResourceIndex(ctx context.Context, tableName string, groupID int6 func TestSyncMaxResourceIndex(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) - xe := unittest.GetXORMEngine() + xe, err := unittest.GetXORMEngine() + require.NoError(t, err) require.NoError(t, xe.Sync(&TestIndex{})) - err := db.SyncMaxResourceIndex(db.DefaultContext, "test_index", 10, 51) + err = db.SyncMaxResourceIndex(db.DefaultContext, "test_index", 10, 51) require.NoError(t, err) // sync new max index @@ -88,7 +89,8 @@ func TestSyncMaxResourceIndex(t *testing.T) { func TestGetNextResourceIndex(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) - xe := unittest.GetXORMEngine() + xe, err := unittest.GetXORMEngine() + require.NoError(t, err) require.NoError(t, xe.Sync(&TestIndex{})) // create a new record diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 47b6a956f4..bdeaa876d5 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -17,7 +17,8 @@ import ( func TestIterate(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) - xe := unittest.GetXORMEngine() + xe, err := unittest.GetXORMEngine() + require.NoError(t, err) require.NoError(t, xe.Sync(&repo_model.RepoUnit{})) cnt, err := db.GetEngine(db.DefaultContext).Count(&repo_model.RepoUnit{}) diff --git a/models/db/list_test.go b/models/db/list_test.go index 7108b64ead..502372782d 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -29,11 +29,12 @@ func (opts mockListOptions) ToConds() builder.Cond { func TestFind(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) - xe := unittest.GetXORMEngine() + xe, err := unittest.GetXORMEngine() + require.NoError(t, err) require.NoError(t, xe.Sync(&repo_model.RepoUnit{})) var repoUnitCount int - _, err := db.GetEngine(db.DefaultContext).SQL("SELECT COUNT(*) FROM repo_unit").Get(&repoUnitCount) + _, err = db.GetEngine(db.DefaultContext).SQL("SELECT COUNT(*) FROM repo_unit").Get(&repoUnitCount) require.NoError(t, err) assert.NotEmpty(t, repoUnitCount) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 11933014d7..aea9b593bd 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -8,6 +8,7 @@ import ( "context" "fmt" + "forgejo.org/models/db" "forgejo.org/models/forgejo_migrations" "forgejo.org/models/migrations/v1_10" "forgejo.org/models/migrations/v1_11" @@ -510,3 +511,12 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t // Execute Forgejo specific migrations. return forgejo_migrations.Migrate(x) } + +// WrapperMigrate is a wrapper for Migrate to be called in diagnostics +func WrapperMigrate(e db.Engine) error { + engine, err := db.GetMasterEngine(e) + if err != nil { + return err + } + return Migrate(engine) +} diff --git a/models/migrations/test/tests.go b/models/migrations/test/tests.go index 07487cf58a..c1f0caf19b 100644 --- a/models/migrations/test/tests.go +++ b/models/migrations/test/tests.go @@ -175,7 +175,10 @@ func newXORMEngine() (*xorm.Engine, error) { if err := db.InitEngine(context.Background()); err != nil { return nil, err } - x := unittest.GetXORMEngine() + x, err := unittest.GetXORMEngine() + if err != nil { + return nil, err + } return x, nil } diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 6402fd9466..940830d20f 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -22,11 +22,11 @@ import ( var fixturesLoader *testfixtures.Loader // GetXORMEngine gets the XORM engine -func GetXORMEngine(engine ...*xorm.Engine) (x *xorm.Engine) { +func GetXORMEngine(engine ...*xorm.Engine) (x *xorm.Engine, err error) { if len(engine) == 1 { - return engine[0] + return engine[0], nil } - return db.DefaultContext.(*db.Context).Engine().(*xorm.Engine) + return db.GetMasterEngine(db.DefaultContext.(*db.Context).Engine()) } func OverrideFixtures(opts FixturesOptions, engine ...*xorm.Engine) func() { @@ -41,7 +41,10 @@ func OverrideFixtures(opts FixturesOptions, engine ...*xorm.Engine) func() { // InitFixtures initialize test fixtures for a test database func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) { - e := GetXORMEngine(engine...) + e, err := GetXORMEngine(engine...) + if err != nil { + return err + } var fixtureOptionFiles func(*testfixtures.Loader) error if opts.Dir != "" { fixtureOptionFiles = testfixtures.Directory(opts.Dir) @@ -93,10 +96,12 @@ func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) { // LoadFixtures load fixtures for a test database func LoadFixtures(engine ...*xorm.Engine) error { - e := GetXORMEngine(engine...) - var err error + e, err := GetXORMEngine(engine...) + if err != nil { + return err + } // (doubt) database transaction conflicts could occur and result in ROLLBACK? just try for a few times. - for i := 0; i < 5; i++ { + for range 5 { if err = fixturesLoader.Load(); err == nil { break } diff --git a/modules/setting/database.go b/modules/setting/database.go index 76fae27164..b5131d3782 100644 --- a/modules/setting/database.go +++ b/modules/setting/database.go @@ -10,8 +10,13 @@ import ( "net/url" "os" "path/filepath" + "strconv" "strings" "time" + + "forgejo.org/modules/log" + + "xorm.io/xorm" ) var ( @@ -24,35 +29,41 @@ var ( EnableSQLite3 bool // Database holds the database settings - Database = struct { - Type DatabaseType - Host string - Name string - User string - Passwd string - Schema string - SSLMode string - Path string - LogSQL bool - MysqlCharset string - CharsetCollation string - Timeout int // seconds - SQLiteJournalMode string - DBConnectRetries int - DBConnectBackoff time.Duration - MaxIdleConns int - MaxOpenConns int - ConnMaxIdleTime time.Duration - ConnMaxLifetime time.Duration - IterateBufferSize int - AutoMigration bool - SlowQueryThreshold time.Duration - }{ + Database = DatabaseSettings{ Timeout: 500, IterateBufferSize: 50, } ) +type DatabaseSettings struct { + Type DatabaseType + Host string + HostPrimary string + HostReplica string + LoadBalancePolicy string + LoadBalanceWeights string + Name string + User string + Passwd string + Schema string + SSLMode string + Path string + LogSQL bool + MysqlCharset string + CharsetCollation string + Timeout int // seconds + SQLiteJournalMode string + DBConnectRetries int + DBConnectBackoff time.Duration + MaxIdleConns int + MaxOpenConns int + ConnMaxIdleTime time.Duration + ConnMaxLifetime time.Duration + IterateBufferSize int + AutoMigration bool + SlowQueryThreshold time.Duration +} + // LoadDBSetting loads the database settings func LoadDBSetting() { loadDBSetting(CfgProvider) @@ -63,6 +74,10 @@ func loadDBSetting(rootCfg ConfigProvider) { Database.Type = DatabaseType(sec.Key("DB_TYPE").String()) Database.Host = sec.Key("HOST").String() + Database.HostPrimary = sec.Key("HOST_PRIMARY").String() + Database.HostReplica = sec.Key("HOST_REPLICA").String() + Database.LoadBalancePolicy = sec.Key("LOAD_BALANCE_POLICY").String() + Database.LoadBalanceWeights = sec.Key("LOAD_BALANCE_WEIGHTS").String() Database.Name = sec.Key("NAME").String() Database.User = sec.Key("USER").String() if len(Database.Passwd) == 0 { @@ -99,8 +114,93 @@ func loadDBSetting(rootCfg ConfigProvider) { } } -// DBConnStr returns database connection string -func DBConnStr() (string, error) { +// DBMasterConnStr returns the connection string for the master (primary) database. +// If a primary host is defined in the configuration, it is used; +// otherwise, it falls back to Database.Host. +// Returns an error if no master host is provided but a slave is defined. +func DBMasterConnStr() (string, error) { + var host string + if Database.HostPrimary != "" { + host = Database.HostPrimary + } else { + host = Database.Host + } + if host == "" && Database.HostReplica != "" { + return "", errors.New("master host is not defined while slave is defined; cannot proceed") + } + + // For SQLite, no host is needed + if host == "" && !Database.Type.IsSQLite3() { + return "", errors.New("no database host defined") + } + + return dbConnStrWithHost(host) +} + +// DBSlaveConnStrs returns one or more connection strings for the replica databases. +// If a replica host is defined (possibly as a comma-separated list) then those DSNs are returned. +// Otherwise, this function falls back to the master DSN (with a warning log). +func DBSlaveConnStrs() ([]string, error) { + var dsns []string + if Database.HostReplica != "" { + // support multiple replica hosts separated by commas + replicas := strings.SplitSeq(Database.HostReplica, ",") + for r := range replicas { + trimmed := strings.TrimSpace(r) + if trimmed == "" { + continue + } + dsn, err := dbConnStrWithHost(trimmed) + if err != nil { + return nil, err + } + dsns = append(dsns, dsn) + } + } + // Fall back to master if no slave DSN was provided. + if len(dsns) == 0 { + master, err := DBMasterConnStr() + if err != nil { + return nil, err + } + log.Debug("Database: No dedicated replica host defined; falling back to primary DSN for replica connections") + dsns = append(dsns, master) + } + return dsns, nil +} + +func BuildLoadBalancePolicy(settings *DatabaseSettings, slaveEngines []*xorm.Engine) xorm.GroupPolicy { + var policy xorm.GroupPolicy + switch settings.LoadBalancePolicy { // Use the settings parameter directly + case "WeightRandom": + var weights []int + if settings.LoadBalanceWeights != "" { // Use the settings parameter directly + for part := range strings.SplitSeq(settings.LoadBalanceWeights, ",") { + w, err := strconv.Atoi(strings.TrimSpace(part)) + if err != nil { + w = 1 // use a default weight if conversion fails + } + weights = append(weights, w) + } + } + // If no valid weights were provided, default each slave to weight 1 + if len(weights) == 0 { + weights = make([]int, len(slaveEngines)) + for i := range weights { + weights[i] = 1 + } + } + policy = xorm.WeightRandomPolicy(weights) + case "RoundRobin": + policy = xorm.RoundRobinPolicy() + default: + policy = xorm.RandomPolicy() + } + return policy +} + +// dbConnStrWithHost constructs the connection string, given a host value. +func dbConnStrWithHost(host string) (string, error) { var connStr string paramSep := "?" if strings.Contains(Database.Name, paramSep) { @@ -109,23 +209,25 @@ func DBConnStr() (string, error) { switch Database.Type { case "mysql": connType := "tcp" - if len(Database.Host) > 0 && Database.Host[0] == '/' { // looks like a unix socket + // if the host starts with '/' it is assumed to be a unix socket path + if len(host) > 0 && host[0] == '/' { connType = "unix" } tls := Database.SSLMode - if tls == "disable" { // allow (Postgres-inspired) default value to work in MySQL + // allow the "disable" value (borrowed from Postgres defaults) to behave as false + if tls == "disable" { tls = "false" } connStr = fmt.Sprintf("%s:%s@%s(%s)/%s%sparseTime=true&tls=%s", - Database.User, Database.Passwd, connType, Database.Host, Database.Name, paramSep, tls) + Database.User, Database.Passwd, connType, host, Database.Name, paramSep, tls) case "postgres": - connStr = getPostgreSQLConnectionString(Database.Host, Database.User, Database.Passwd, Database.Name, Database.SSLMode) + connStr = getPostgreSQLConnectionString(host, Database.User, Database.Passwd, Database.Name, Database.SSLMode) case "sqlite3": if !EnableSQLite3 { return "", errors.New("this Gitea binary was not built with SQLite3 support") } if err := os.MkdirAll(filepath.Dir(Database.Path), os.ModePerm); err != nil { - return "", fmt.Errorf("Failed to create directories: %w", err) + return "", fmt.Errorf("failed to create directories: %w", err) } journalMode := "" if Database.SQLiteJournalMode != "" { @@ -136,7 +238,6 @@ func DBConnStr() (string, error) { default: return "", fmt.Errorf("unknown database type: %s", Database.Type) } - return connStr, nil } diff --git a/modules/setting/database_test.go b/modules/setting/database_test.go index a742d54f8c..ce816d53e8 100644 --- a/modules/setting/database_test.go +++ b/modules/setting/database_test.go @@ -4,6 +4,7 @@ package setting import ( + "strings" "testing" "github.com/stretchr/testify/assert" @@ -107,3 +108,104 @@ func Test_getPostgreSQLConnectionString(t *testing.T) { assert.Equal(t, test.Output, connStr) } } + +func getPostgreSQLEngineGroupConnectionStrings(primaryHost, replicaHosts, user, passwd, name, sslmode string) (string, []string) { + // Determine the primary connection string. + primary := primaryHost + if strings.TrimSpace(primary) == "" { + primary = "127.0.0.1:5432" + } + primaryConn := getPostgreSQLConnectionString(primary, user, passwd, name, sslmode) + + // Build the replica connection strings. + replicaConns := []string{} + if strings.TrimSpace(replicaHosts) != "" { + // Split comma-separated replica host values. + hosts := strings.Split(replicaHosts, ",") + for _, h := range hosts { + trimmed := strings.TrimSpace(h) + if trimmed != "" { + replicaConns = append(replicaConns, + getPostgreSQLConnectionString(trimmed, user, passwd, name, sslmode)) + } + } + } + + return primaryConn, replicaConns +} + +func Test_getPostgreSQLEngineGroupConnectionStrings(t *testing.T) { + tests := []struct { + primaryHost string // primary host setting (e.g. "localhost" or "[::1]:1234") + replicaHosts string // comma-separated replica hosts (e.g. "replica1,replica2:2345") + user string + passwd string + name string + sslmode string + outputPrimary string + outputReplicas []string + }{ + { + // No primary override (empty => default) and no replicas. + primaryHost: "", + replicaHosts: "", + user: "", + passwd: "", + name: "", + sslmode: "", + outputPrimary: "postgres://:@127.0.0.1:5432?sslmode=", + outputReplicas: []string{}, + }, + { + // Primary set and one replica. + primaryHost: "localhost", + replicaHosts: "replicahost", + user: "user", + passwd: "pass", + name: "gitea", + sslmode: "disable", + outputPrimary: "postgres://user:pass@localhost:5432/gitea?sslmode=disable", + outputReplicas: []string{"postgres://user:pass@replicahost:5432/gitea?sslmode=disable"}, + }, + { + // Primary with explicit port; multiple replicas (one without and one with an explicit port). + primaryHost: "localhost:5433", + replicaHosts: "replica1,replica2:5434", + user: "test", + passwd: "secret", + name: "db", + sslmode: "require", + outputPrimary: "postgres://test:secret@localhost:5433/db?sslmode=require", + outputReplicas: []string{ + "postgres://test:secret@replica1:5432/db?sslmode=require", + "postgres://test:secret@replica2:5434/db?sslmode=require", + }, + }, + { + // IPv6 addresses for primary and replica. + primaryHost: "[::1]:1234", + replicaHosts: "[::2]:2345", + user: "ipv6", + passwd: "ipv6pass", + name: "ipv6db", + sslmode: "disable", + outputPrimary: "postgres://ipv6:ipv6pass@[::1]:1234/ipv6db?sslmode=disable", + outputReplicas: []string{ + "postgres://ipv6:ipv6pass@[::2]:2345/ipv6db?sslmode=disable", + }, + }, + } + + for _, test := range tests { + primary, replicas := getPostgreSQLEngineGroupConnectionStrings( + test.primaryHost, + test.replicaHosts, + test.user, + test.passwd, + test.name, + test.sslmode, + ) + assert.Equal(t, test.outputPrimary, primary) + assert.Equal(t, test.outputReplicas, replicas) + } +} diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index 5567ea433e..772ae47e71 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -364,6 +364,9 @@ var ignoredErrorMessage = []string{ // TestDatabaseCollation `[E] [Error SQL Query] INSERT INTO test_collation_tbl (txt) VALUES ('main') []`, + // Test_CmdForgejo_Actions + `DB: No dedicated replica host defined; falling back to primary DSN for replica connections`, + // TestDevtestErrorpages `ErrorPage() [E] Example error: Example error`, } diff --git a/routers/common/db.go b/routers/common/db.go index 0646071264..0f78d8debc 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -28,7 +28,7 @@ func InitDBEngine(ctx context.Context) (err error) { default: } log.Info("ORM engine initialization attempt #%d/%d...", i+1, setting.Database.DBConnectRetries) - if err = db.InitEngineWithMigration(ctx, migrateWithSetting); err == nil { + if err = db.InitEngineWithMigration(ctx, func(eng db.Engine) error { return migrateWithSetting(eng.(*xorm.Engine)) }); err == nil { break } else if i == setting.Database.DBConnectRetries-1 { return err diff --git a/routers/install/install.go b/routers/install/install.go index b9333a9e16..ace0b2c8ed 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -361,7 +361,8 @@ func SubmitInstall(ctx *context.Context) { } // Init the engine with migration - if err = db.InitEngineWithMigration(ctx, migrations.Migrate); err != nil { + // Wrap migrations.Migrate into a function of type func(db.Engine) error to fix diagnostics. + if err = db.InitEngineWithMigration(ctx, migrations.WrapperMigrate); err != nil { db.UnsetDefaultEngine() ctx.Data["Err_DbSetting"] = true ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form) @@ -587,7 +588,7 @@ func SubmitInstall(ctx *context.Context) { go func() { // Sleep for a while to make sure the user's browser has loaded the post-install page and its assets (images, css, js) - // What if this duration is not long enough? That's impossible -- if the user can't load the simple page in time, how could they install or use Gitea in the future .... + // What if this duration is not long enough? That's impossible -- if the user can't load the simple page in time, how could they install or use Forgejo in the future .... time.Sleep(3 * time.Second) // Now get the http.Server from this request and shut it down diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go index 6fcbd90940..6fe4c9c5e6 100644 --- a/services/doctor/dbconsistency.go +++ b/services/doctor/dbconsistency.go @@ -78,7 +78,14 @@ func genericOrphanCheck(name, subject, refobject, joincond string) consistencyCh func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) error { // make sure DB version is up-to-date - if err := db.InitEngineWithMigration(ctx, migrations.EnsureUpToDate); err != nil { + ensureUpToDateWrapper := func(e db.Engine) error { + engine, err := db.GetMasterEngine(e) + if err != nil { + return err + } + return migrations.EnsureUpToDate(engine) + } + if err := db.InitEngineWithMigration(ctx, ensureUpToDateWrapper); err != nil { logger.Critical("Model version on the database does not match the current Gitea version. Model consistency will not be checked until the database is upgraded") return err } diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go index 9c02c732e5..c0ff22915d 100644 --- a/services/doctor/dbversion.go +++ b/services/doctor/dbversion.go @@ -9,11 +9,15 @@ import ( "forgejo.org/models/db" "forgejo.org/models/migrations" "forgejo.org/modules/log" + + "xorm.io/xorm" ) func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error { logger.Info("Expected database version: %d", migrations.ExpectedDBVersion()) - if err := db.InitEngineWithMigration(ctx, migrations.EnsureUpToDate); err != nil { + if err := db.InitEngineWithMigration(ctx, func(eng db.Engine) error { + return migrations.EnsureUpToDate(eng.(*xorm.Engine)) + }); err != nil { if !autofix { logger.Critical("Error: %v during ensure up to date", err) return err @@ -21,7 +25,9 @@ func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error logger.Warn("Got Error: %v during ensure up to date", err) logger.Warn("Attempting to migrate to the latest DB version to fix this.") - err = db.InitEngineWithMigration(ctx, migrations.Migrate) + err = db.InitEngineWithMigration(ctx, func(eng db.Engine) error { + return migrations.Migrate(eng.(*xorm.Engine)) + }) if err != nil { logger.Critical("Error: %v during migration", err) } diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go index 6bfe656b9b..5b84dae823 100644 --- a/tests/integration/db_collation_test.go +++ b/tests/integration/db_collation_test.go @@ -16,7 +16,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "xorm.io/xorm" ) type TestCollationTbl struct { @@ -48,11 +47,13 @@ func TestDatabaseCollationSelfCheckUI(t *testing.T) { } func TestDatabaseCollation(t *testing.T) { - x := db.GetEngine(db.DefaultContext).(*xorm.Engine) + engine, err := db.GetMasterEngine(db.GetEngine(db.DefaultContext)) + require.NoError(t, err) + x := engine // all created tables should use case-sensitive collation by default _, _ = x.Exec("DROP TABLE IF EXISTS test_collation_tbl") - err := x.Sync(&TestCollationTbl{}) + err = x.Sync(&TestCollationTbl{}) require.NoError(t, err) _, _ = x.Exec("INSERT INTO test_collation_tbl (txt) VALUES ('main')") _, _ = x.Exec("INSERT INTO test_collation_tbl (txt) VALUES ('Main')") // case-sensitive, so it inserts a new row diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index 8076dfa452..798161a560 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -278,23 +278,36 @@ func doMigrationTest(t *testing.T, version string) { setting.InitSQLLoggersForCli(log.INFO) - err := db.InitEngineWithMigration(t.Context(), wrappedMigrate) + err := db.InitEngineWithMigration(t.Context(), func(e db.Engine) error { + engine, err := db.GetMasterEngine(e) + if err != nil { + return err + } + currentEngine = engine + return wrappedMigrate(engine) + }) require.NoError(t, err) currentEngine.Close() beans, _ := db.NamesToBean() - err = db.InitEngineWithMigration(t.Context(), func(x *xorm.Engine) error { - currentEngine = x - return migrate_base.RecreateTables(beans...)(x) + err = db.InitEngineWithMigration(t.Context(), func(e db.Engine) error { + currentEngine, err = db.GetMasterEngine(e) + if err != nil { + return err + } + return migrate_base.RecreateTables(beans...)(currentEngine) }) require.NoError(t, err) currentEngine.Close() // We do this a second time to ensure that there is not a problem with retained indices - err = db.InitEngineWithMigration(t.Context(), func(x *xorm.Engine) error { - currentEngine = x - return migrate_base.RecreateTables(beans...)(x) + err = db.InitEngineWithMigration(t.Context(), func(e db.Engine) error { + currentEngine, err = db.GetMasterEngine(e) + if err != nil { + return err + } + return migrate_base.RecreateTables(beans...)(currentEngine) }) require.NoError(t, err) From ba1e3405d66fa64dd4cfe14cfca283641b5b1216 Mon Sep 17 00:00:00 2001 From: Lucas Grzegorczyk Date: Sun, 30 Mar 2025 11:37:15 +0000 Subject: [PATCH 033/568] feat(ui): Suggest `git switch` instead of `git checkout` (#7385) - A minor change that replaces the usages of `git checkout` to `git switch` in the UI. `git switch` is preferred over `git checkout` by git. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7385 Reviewed-by: Gusted Reviewed-by: Beowulf Co-authored-by: Lucas Grzegorczyk Co-committed-by: Lucas Grzegorczyk --- templates/repo/empty.tmpl | 2 +- .../view_content/pull_merge_instruction.tmpl | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index d3a81bc51d..2032b7e5d2 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -51,7 +51,7 @@ 
touch README.md
 git init
-{{if ne .Repository.DefaultBranch "master"}}git checkout -b {{.Repository.DefaultBranch}}{{end}}
+{{if ne .Repository.DefaultBranch "master"}}git switch -c {{.Repository.DefaultBranch}}{{end}}
 git add README.md
 git commit -m "first commit"
 git remote add origin {{$.CloneButtonOriginLink.HTTPS}}
diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
index b7aae53424..dd30a3a8d6 100644
--- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl
+++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -12,7 +12,7 @@
 		{{else}}
 			
git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}

 		{{end}}
-		
git checkout {{$localBranch}}

+		
git switch {{$localBranch}}
{{if .ShowMergeInstructions}}
@@ -24,31 +24,31 @@
-
git checkout {{.PullRequest.BaseBranch}}
+
git switch {{.PullRequest.BaseBranch}}
git merge --no-ff {{$localBranch}}
-
git checkout {{$localBranch}}
+
git switch {{$localBranch}}
git rebase {{.PullRequest.BaseBranch}}
-
git checkout {{.PullRequest.BaseBranch}}
+
git switch {{.PullRequest.BaseBranch}}
git merge --ff-only {{$localBranch}}
-
git checkout {{$localBranch}}
+
git switch {{$localBranch}}
git rebase {{.PullRequest.BaseBranch}}
-
git checkout {{.PullRequest.BaseBranch}}
+
git switch {{.PullRequest.BaseBranch}}
git merge --no-ff {{$localBranch}}
-
git checkout {{.PullRequest.BaseBranch}}
+
git switch {{.PullRequest.BaseBranch}}
git merge --squash {{$localBranch}}
-
git checkout {{.PullRequest.BaseBranch}}
+
git switch {{.PullRequest.BaseBranch}}
git merge --ff-only {{$localBranch}}
-
git checkout {{.PullRequest.BaseBranch}}
+
git switch {{.PullRequest.BaseBranch}}
git merge {{$localBranch}}
git push origin {{.PullRequest.BaseBranch}}
From facc2bb28e7bf633880fb743b35cfd359590a3f6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Mar 2025 14:33:38 +0000 Subject: [PATCH 034/568] Update github.com/google/pprof digest to a4b03ec (forgejo) (#7391) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7391 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b4ca6c444d..a36ab38aa1 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/golang-jwt/jwt/v5 v5.2.2 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/google/go-github/v64 v64.0.0 - github.com/google/pprof v0.0.0-20241017200806-017d972448fc + github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e github.com/google/uuid v1.6.0 github.com/gorilla/feeds v1.2.0 github.com/gorilla/sessions v1.4.0 diff --git a/go.sum b/go.sum index 3e0bcb61b2..09cda25c31 100644 --- a/go.sum +++ b/go.sum @@ -1091,8 +1091,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20241017200806-017d972448fc h1:NGyrhhFhwvRAZg02jnYVg3GBQy0qGBKmFQJwaPmpmxs= -github.com/google/pprof v0.0.0-20241017200806-017d972448fc/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= From 7baf9994bdd5556709a36356cb5b1763c5132c3a Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 30 Mar 2025 14:48:52 +0000 Subject: [PATCH 035/568] chore: improve repo migrate e2e test (#7378) - Generate a repository name for each run, such that retries will use a new repository and not have any leftover. - Make the test actually pass by ensuring the unauthenticated page didn't reuse storage state that contained authenticated cookies. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7378 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- tests/e2e/repo-migrate.test.e2e.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/e2e/repo-migrate.test.e2e.ts b/tests/e2e/repo-migrate.test.e2e.ts index ca20e4f4c2..89e981f596 100644 --- a/tests/e2e/repo-migrate.test.e2e.ts +++ b/tests/e2e/repo-migrate.test.e2e.ts @@ -38,21 +38,22 @@ test('Migration Repo Name detection', async ({page}, workerInfo) => { test('Migration Progress Page', async ({page, browser}, workerInfo) => { test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari'); - expect((await page.goto('/user2/invalidrepo'))?.status(), 'repo should not exist yet').toBe(404); + const repoName = `invalidrepo-${globalThis.crypto.randomUUID()}`; + expect((await page.goto(`/user2/${repoName}`))?.status(), 'repo should not exist yet').toBe(404); await page.goto('/repo/migrate?service_type=1'); const form = page.locator('form'); - await form.getByRole('textbox', {name: 'Repository Name'}).fill('invalidrepo'); - await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://codeberg.org/forgejo/invalidrepo'); + await form.getByRole('textbox', {name: 'Repository Name'}).fill(repoName); + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill(`https://codeberg.org/forgejo/${repoName}`); await save_visual(page); await form.locator('button.primary').click({timeout: 5000}); - await expect(page).toHaveURL('user2/invalidrepo'); + await expect(page).toHaveURL(`user2/${repoName}`); await save_visual(page); - const ctx = await test_context(browser); + const ctx = await test_context(browser, {storageState: {cookies: [], origins: []}}); const unauthenticatedPage = await ctx.newPage(); - expect((await unauthenticatedPage.goto('/user2/invalidrepo'))?.status(), 'public migration page should be accessible').toBe(200); + expect((await unauthenticatedPage.goto(`/user2/${repoName}`))?.status(), 'public migration page should be accessible').toBe(200); await expect(unauthenticatedPage.locator('#repo_migrating_progress')).toBeVisible(); await page.reload(); @@ -60,7 +61,7 @@ test('Migration Progress Page', async ({page, browser}, workerInfo) => { await save_visual(page); await page.getByRole('button', {name: 'Delete this repository'}).click(); const deleteModal = page.locator('#delete-repo-modal'); - await deleteModal.getByRole('textbox', {name: 'Confirmation string'}).fill('user2/invalidrepo'); + await deleteModal.getByRole('textbox', {name: 'Confirmation string'}).fill(`user2/${repoName}`); await save_visual(page); await deleteModal.getByRole('button', {name: 'Delete repository'}).click(); await expect(page).toHaveURL('/'); From 2348955af55c628c7f8d5b69993dcd312b68b075 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Mar 2025 14:49:48 +0000 Subject: [PATCH 036/568] Lock file maintenance (forgejo) (#7392) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7392 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 254 ++++++++++++++--------------- poetry.lock | 6 +- web_src/fomantic/package-lock.json | 12 +- 3 files changed, 136 insertions(+), 136 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0668169d5..d8c64a9f1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -216,12 +216,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", - "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", + "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", "license": "MIT", "dependencies": { - "@babel/types": "^7.26.10" + "@babel/types": "^7.27.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -231,9 +231,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", - "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz", + "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -243,9 +243,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", - "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", + "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -528,9 +528,9 @@ } }, "node_modules/@emnapi/core": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", - "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.0.tgz", + "integrity": "sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==", "dev": true, "license": "MIT", "optional": true, @@ -540,9 +540,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", - "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.0.tgz", + "integrity": "sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==", "dev": true, "license": "MIT", "optional": true, @@ -1803,9 +1803,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.37.0.tgz", - "integrity": "sha512-l7StVw6WAa8l3vA1ov80jyetOAEo1FtHvZDbzXDO/02Sq/QVvqlHkYoFwDJPIMj0GKiistsBudfx5tGFnwYWDQ==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.38.0.tgz", + "integrity": "sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==", "cpu": [ "arm" ], @@ -1817,9 +1817,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.37.0.tgz", - "integrity": "sha512-6U3SlVyMxezt8Y+/iEBcbp945uZjJwjZimu76xoG7tO1av9VO691z8PkhzQ85ith2I8R2RddEPeSfcbyPfD4hA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.38.0.tgz", + "integrity": "sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==", "cpu": [ "arm64" ], @@ -1831,9 +1831,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.37.0.tgz", - "integrity": "sha512-+iTQ5YHuGmPt10NTzEyMPbayiNTcOZDWsbxZYR1ZnmLnZxG17ivrPSWFO9j6GalY0+gV3Jtwrrs12DBscxnlYA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.38.0.tgz", + "integrity": "sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==", "cpu": [ "arm64" ], @@ -1845,9 +1845,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.37.0.tgz", - "integrity": "sha512-m8W2UbxLDcmRKVjgl5J/k4B8d7qX2EcJve3Sut7YGrQoPtCIQGPH5AMzuFvYRWZi0FVS0zEY4c8uttPfX6bwYQ==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.38.0.tgz", + "integrity": "sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==", "cpu": [ "x64" ], @@ -1859,9 +1859,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.37.0.tgz", - "integrity": "sha512-FOMXGmH15OmtQWEt174v9P1JqqhlgYge/bUjIbiVD1nI1NeJ30HYT9SJlZMqdo1uQFyt9cz748F1BHghWaDnVA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.38.0.tgz", + "integrity": "sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==", "cpu": [ "arm64" ], @@ -1873,9 +1873,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.37.0.tgz", - "integrity": "sha512-SZMxNttjPKvV14Hjck5t70xS3l63sbVwl98g3FlVVx2YIDmfUIy29jQrsw06ewEYQ8lQSuY9mpAPlmgRD2iSsA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.38.0.tgz", + "integrity": "sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==", "cpu": [ "x64" ], @@ -1887,9 +1887,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.37.0.tgz", - "integrity": "sha512-hhAALKJPidCwZcj+g+iN+38SIOkhK2a9bqtJR+EtyxrKKSt1ynCBeqrQy31z0oWU6thRZzdx53hVgEbRkuI19w==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.38.0.tgz", + "integrity": "sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==", "cpu": [ "arm" ], @@ -1901,9 +1901,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.37.0.tgz", - "integrity": "sha512-jUb/kmn/Gd8epbHKEqkRAxq5c2EwRt0DqhSGWjPFxLeFvldFdHQs/n8lQ9x85oAeVb6bHcS8irhTJX2FCOd8Ag==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.38.0.tgz", + "integrity": "sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==", "cpu": [ "arm" ], @@ -1915,9 +1915,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.37.0.tgz", - "integrity": "sha512-oNrJxcQT9IcbcmKlkF+Yz2tmOxZgG9D9GRq+1OE6XCQwCVwxixYAa38Z8qqPzQvzt1FCfmrHX03E0pWoXm1DqA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.38.0.tgz", + "integrity": "sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==", "cpu": [ "arm64" ], @@ -1929,9 +1929,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.37.0.tgz", - "integrity": "sha512-pfxLBMls+28Ey2enpX3JvjEjaJMBX5XlPCZNGxj4kdJyHduPBXtxYeb8alo0a7bqOoWZW2uKynhHxF/MWoHaGQ==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.38.0.tgz", + "integrity": "sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==", "cpu": [ "arm64" ], @@ -1943,9 +1943,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.37.0.tgz", - "integrity": "sha512-yCE0NnutTC/7IGUq/PUHmoeZbIwq3KRh02e9SfFh7Vmc1Z7atuJRYWhRME5fKgT8aS20mwi1RyChA23qSyRGpA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.38.0.tgz", + "integrity": "sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==", "cpu": [ "loong64" ], @@ -1957,9 +1957,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.37.0.tgz", - "integrity": "sha512-NxcICptHk06E2Lh3a4Pu+2PEdZ6ahNHuK7o6Np9zcWkrBMuv21j10SQDJW3C9Yf/A/P7cutWoC/DptNLVsZ0VQ==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.38.0.tgz", + "integrity": "sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==", "cpu": [ "ppc64" ], @@ -1971,9 +1971,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.37.0.tgz", - "integrity": "sha512-PpWwHMPCVpFZLTfLq7EWJWvrmEuLdGn1GMYcm5MV7PaRgwCEYJAwiN94uBuZev0/J/hFIIJCsYw4nLmXA9J7Pw==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.38.0.tgz", + "integrity": "sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==", "cpu": [ "riscv64" ], @@ -1985,9 +1985,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.37.0.tgz", - "integrity": "sha512-DTNwl6a3CfhGTAOYZ4KtYbdS8b+275LSLqJVJIrPa5/JuIufWWZ/QFvkxp52gpmguN95eujrM68ZG+zVxa8zHA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz", + "integrity": "sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==", "cpu": [ "riscv64" ], @@ -1999,9 +1999,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.37.0.tgz", - "integrity": "sha512-hZDDU5fgWvDdHFuExN1gBOhCuzo/8TMpidfOR+1cPZJflcEzXdCy1LjnklQdW8/Et9sryOPJAKAQRw8Jq7Tg+A==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.38.0.tgz", + "integrity": "sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==", "cpu": [ "s390x" ], @@ -2013,9 +2013,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.37.0.tgz", - "integrity": "sha512-pKivGpgJM5g8dwj0ywBwe/HeVAUSuVVJhUTa/URXjxvoyTT/AxsLTAbkHkDHG7qQxLoW2s3apEIl26uUe08LVQ==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.38.0.tgz", + "integrity": "sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==", "cpu": [ "x64" ], @@ -2027,9 +2027,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.37.0.tgz", - "integrity": "sha512-E2lPrLKE8sQbY/2bEkVTGDEk4/49UYRVWgj90MY8yPjpnGBQ+Xi1Qnr7b7UIWw1NOggdFQFOLZ8+5CzCiz143w==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.38.0.tgz", + "integrity": "sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==", "cpu": [ "x64" ], @@ -2041,9 +2041,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.37.0.tgz", - "integrity": "sha512-Jm7biMazjNzTU4PrQtr7VS8ibeys9Pn29/1bm4ph7CP2kf21950LgN+BaE2mJ1QujnvOc6p54eWWiVvn05SOBg==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.38.0.tgz", + "integrity": "sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==", "cpu": [ "arm64" ], @@ -2055,9 +2055,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.37.0.tgz", - "integrity": "sha512-e3/1SFm1OjefWICB2Ucstg2dxYDkDTZGDYgwufcbsxTHyqQps1UQf33dFEChBNmeSsTOyrjw2JJq0zbG5GF6RA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.38.0.tgz", + "integrity": "sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==", "cpu": [ "ia32" ], @@ -2069,9 +2069,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.37.0.tgz", - "integrity": "sha512-LWbXUBwn/bcLx2sSsqy7pK5o+Nr+VCoRoAohfJ5C/aBio9nfJmGQqHAhU6pwxV/RmyTk5AqdySma7uwWGlmeuA==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.38.0.tgz", + "integrity": "sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==", "cpu": [ "x64" ], @@ -3028,9 +3028,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.13.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.11.tgz", - "integrity": "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g==", + "version": "22.13.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz", + "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -3611,9 +3611,9 @@ } }, "node_modules/@vitest/mocker/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -6227,9 +6227,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.123", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz", - "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==", + "version": "1.5.128", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz", + "integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -11029,9 +11029,9 @@ } }, "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", "license": "MIT", "engines": { "node": ">= 6" @@ -13904,9 +13904,9 @@ } }, "node_modules/type-fest": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.37.0.tgz", - "integrity": "sha512-S/5/0kFftkq27FPNye0XM1e2NsnoD/3FS+pBmbjmmtLT6I+i344KoOf7pvXreaFsDamWeaJX55nczA1m5PsBDg==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz", + "integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -14235,9 +14235,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.2.tgz", - "integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.3.tgz", + "integrity": "sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==", "dev": true, "license": "MIT", "dependencies": { @@ -14337,9 +14337,9 @@ "license": "BSD-2-Clause" }, "node_modules/vite/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -14388,13 +14388,13 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.37.0.tgz", - "integrity": "sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg==", + "version": "4.38.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.38.0.tgz", + "integrity": "sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.6" + "@types/estree": "1.0.7" }, "bin": { "rollup": "dist/bin/rollup" @@ -14404,26 +14404,26 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.37.0", - "@rollup/rollup-android-arm64": "4.37.0", - "@rollup/rollup-darwin-arm64": "4.37.0", - "@rollup/rollup-darwin-x64": "4.37.0", - "@rollup/rollup-freebsd-arm64": "4.37.0", - "@rollup/rollup-freebsd-x64": "4.37.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.37.0", - "@rollup/rollup-linux-arm-musleabihf": "4.37.0", - "@rollup/rollup-linux-arm64-gnu": "4.37.0", - "@rollup/rollup-linux-arm64-musl": "4.37.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.37.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.37.0", - "@rollup/rollup-linux-riscv64-gnu": "4.37.0", - "@rollup/rollup-linux-riscv64-musl": "4.37.0", - "@rollup/rollup-linux-s390x-gnu": "4.37.0", - "@rollup/rollup-linux-x64-gnu": "4.37.0", - "@rollup/rollup-linux-x64-musl": "4.37.0", - "@rollup/rollup-win32-arm64-msvc": "4.37.0", - "@rollup/rollup-win32-ia32-msvc": "4.37.0", - "@rollup/rollup-win32-x64-msvc": "4.37.0", + "@rollup/rollup-android-arm-eabi": "4.38.0", + "@rollup/rollup-android-arm64": "4.38.0", + "@rollup/rollup-darwin-arm64": "4.38.0", + "@rollup/rollup-darwin-x64": "4.38.0", + "@rollup/rollup-freebsd-arm64": "4.38.0", + "@rollup/rollup-freebsd-x64": "4.38.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.38.0", + "@rollup/rollup-linux-arm-musleabihf": "4.38.0", + "@rollup/rollup-linux-arm64-gnu": "4.38.0", + "@rollup/rollup-linux-arm64-musl": "4.38.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.38.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.38.0", + "@rollup/rollup-linux-riscv64-gnu": "4.38.0", + "@rollup/rollup-linux-riscv64-musl": "4.38.0", + "@rollup/rollup-linux-s390x-gnu": "4.38.0", + "@rollup/rollup-linux-x64-gnu": "4.38.0", + "@rollup/rollup-linux-x64-musl": "4.38.0", + "@rollup/rollup-win32-arm64-msvc": "4.38.0", + "@rollup/rollup-win32-ia32-msvc": "4.38.0", + "@rollup/rollup-win32-x64-msvc": "4.38.0", "fsevents": "~2.3.2" } }, @@ -14800,9 +14800,9 @@ } }, "node_modules/webpack/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/webpack/node_modules/eslint-scope": { @@ -15138,9 +15138,9 @@ } }, "node_modules/yaml": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", - "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz", + "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==", "license": "ISC", "bin": { "yaml": "bin.mjs" diff --git a/poetry.lock b/poetry.lock index 425acf1c33..4f0a372ef5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -393,13 +393,13 @@ telegram = ["requests"] [[package]] name = "typing-extensions" -version = "4.12.2" +version = "4.13.0" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, - {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, + {file = "typing_extensions-4.13.0-py3-none-any.whl", hash = "sha256:c8dd92cc0d6425a97c18fbb9d1954e5ff92c1ca881a309c45f06ebc0b79058e5"}, + {file = "typing_extensions-4.13.0.tar.gz", hash = "sha256:0a4ac55a5820789d87e297727d229866c9650f6521b64206413c4fbada24d95b"}, ] [[package]] diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index f3fb7fc8a8..9d5ec0ca2a 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -494,9 +494,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.13.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.11.tgz", - "integrity": "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g==", + "version": "22.13.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz", + "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -2005,9 +2005,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.123", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz", - "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==", + "version": "1.5.128", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz", + "integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==", "license": "ISC" }, "node_modules/emoji-regex": { From 86039a89fc86a48624b27bbecae1128e694e1c01 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 30 Mar 2025 14:51:37 +0000 Subject: [PATCH 037/568] fix(a11y): unreadable image captcha with dark themes (#7390) - When the user has a dark theme selected, image captchas are sometimes unreadable. - Make sure the image captcha always has a white background color. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7390 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Reviewed-by: Beowulf Reviewed-by: Gusted Co-authored-by: Andreas Shimokawa Co-committed-by: Andreas Shimokawa --- templates/user/auth/captcha.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl index 9d0d6cfb6f..29f8ab07a2 100644 --- a/templates/user/auth/captcha.tmpl +++ b/templates/user/auth/captcha.tmpl @@ -1,7 +1,7 @@ {{if .EnableCaptcha}}{{if eq .CaptchaType "image"}}
- {{ctx.Locale.Tr + {{ctx.Locale.Tr
From 5275fbd4ea4f936a31270c1049b78bf2251fb5e2 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 30 Mar 2025 18:08:05 +0000 Subject: [PATCH 038/568] fix(ui): clarify repo init instruction for sha256 (#7394) - When the repository is initalized with a different objectformat than sha1, ensure that the empty repository instructions reflects that the `git init` command also needs to be initialized with that objectformat. - Resolves https://codeberg.org/codeberg/community/issues/1837 - Added integration test. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7394 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- templates/repo/empty.tmpl | 2 +- tests/integration/repo_test.go | 57 ++++++++++++++++++++++++++++++++++ tests/test_utils.go | 18 ++++++----- 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 2032b7e5d2..3a8995bfea 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -50,7 +50,7 @@

{{ctx.Locale.Tr "repo.create_new_repo_command"}}

touch README.md
-git init
+git init{{if eq .Repository.ObjectFormatName "sha256"}} --object-format=sha256{{end}}
 {{if ne .Repository.DefaultBranch "master"}}git switch -c {{.Repository.DefaultBranch}}{{end}}
 git add README.md
 git commit -m "first commit"
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index cd81b37ffc..59cf642719 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"net/url"
 	"path"
+	"regexp"
 	"strings"
 	"testing"
 	"time"
@@ -19,6 +20,7 @@ import (
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
+	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
 	"forgejo.org/modules/translation"
@@ -1438,3 +1440,58 @@ func TestBlameDirectory(t *testing.T) {
 	req = NewRequest(t, "GET", "/user2/repo59/blame/branch/master/deep")
 	MakeRequest(t, req, http.StatusNotFound)
 }
+
+func TestInitInstructions(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	session := loginUser(t, user.Name)
+
+	sha256Repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{
+		Name:         optional.Some("sha256-instruction"),
+		AutoInit:     optional.Some(false),
+		EnabledUnits: optional.Some([]unit_model.Type{unit_model.TypeCode}),
+		ObjectFormat: optional.Some("sha256"),
+	})
+	defer f()
+
+	sha1Repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{
+		Name:         optional.Some("sha1-instruction"),
+		AutoInit:     optional.Some(false),
+		EnabledUnits: optional.Some([]unit_model.Type{unit_model.TypeCode}),
+		ObjectFormat: optional.Some("sha1"),
+	})
+	defer f()
+
+	portMatcher := regexp.MustCompile(`localhost:\d+`)
+
+	t.Run("sha256", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/"+sha256Repo.FullName()), http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		assert.Equal(t, `touch README.md
+git init --object-format=sha256
+git switch -c main
+git add README.md
+git commit -m "first commit"
+git remote add origin http://localhost/user2/sha256-instruction.git
+git push -u origin main`, portMatcher.ReplaceAllString(htmlDoc.Find(".empty-repo-guide code").First().Text(), "localhost"))
+	})
+
+	t.Run("sha1", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/"+sha1Repo.FullName()), http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		assert.Equal(t, `touch README.md
+git init
+git switch -c main
+git add README.md
+git commit -m "first commit"
+git remote add origin http://localhost/user2/sha1-instruction.git
+git push -u origin main`, portMatcher.ReplaceAllString(htmlDoc.Find(".empty-repo-guide code").First().Text(), "localhost"))
+	})
+}
diff --git a/tests/test_utils.go b/tests/test_utils.go
index e6aa9c7963..721adbd497 100644
--- a/tests/test_utils.go
+++ b/tests/test_utils.go
@@ -355,6 +355,7 @@ type DeclarativeRepoOptions struct {
 	WikiBranch    optional.Option[string]
 	AutoInit      optional.Option[bool]
 	IsTemplate    optional.Option[bool]
+	ObjectFormat  optional.Option[string]
 }
 
 func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts DeclarativeRepoOptions) (*repo_model.Repository, string, func()) {
@@ -378,14 +379,15 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
 
 	// Create the repository
 	repo, err := repo_service.CreateRepository(db.DefaultContext, owner, owner, repo_service.CreateRepoOptions{
-		Name:          repoName,
-		Description:   "Temporary Repo",
-		AutoInit:      autoInit,
-		Gitignores:    "",
-		License:       "WTFPL",
-		Readme:        "Default",
-		DefaultBranch: "main",
-		IsTemplate:    opts.IsTemplate.Value(),
+		Name:             repoName,
+		Description:      "Temporary Repo",
+		AutoInit:         autoInit,
+		Gitignores:       "",
+		License:          "WTFPL",
+		Readme:           "Default",
+		DefaultBranch:    "main",
+		IsTemplate:       opts.IsTemplate.Value(),
+		ObjectFormatName: opts.ObjectFormat.Value(),
 	})
 	require.NoError(t, err)
 	assert.NotEmpty(t, repo)

From 3769259c937b312e3c737c92bd3a84a3fa39deb6 Mon Sep 17 00:00:00 2001
From: Gusted 
Date: Sun, 30 Mar 2025 21:41:33 +0000
Subject: [PATCH 039/568] chore: use dynamic id (#7396)

- Follow up forgejo/forgejo#7378
- See https://codeberg.org/forgejo/forgejo/pulls/7378#issuecomment-3167157

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7396
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto 
Co-authored-by: Gusted 
Co-committed-by: Gusted 
---
 tests/e2e/repo-migrate.test.e2e.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/repo-migrate.test.e2e.ts b/tests/e2e/repo-migrate.test.e2e.ts
index 89e981f596..b6541179f0 100644
--- a/tests/e2e/repo-migrate.test.e2e.ts
+++ b/tests/e2e/repo-migrate.test.e2e.ts
@@ -3,7 +3,7 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, save_visual, test_context} from './utils_e2e.ts';
+import {test, save_visual, test_context, dynamic_id} from './utils_e2e.ts';
 
 test.use({user: 'user2'});
 
@@ -38,7 +38,7 @@ test('Migration Repo Name detection', async ({page}, workerInfo) => {
 test('Migration Progress Page', async ({page, browser}, workerInfo) => {
   test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari');
 
-  const repoName = `invalidrepo-${globalThis.crypto.randomUUID()}`;
+  const repoName = dynamic_id();
   expect((await page.goto(`/user2/${repoName}`))?.status(), 'repo should not exist yet').toBe(404);
 
   await page.goto('/repo/migrate?service_type=1');

From b0dd490ae126ea614131cf2e8400ffcd6e34b7d0 Mon Sep 17 00:00:00 2001
From: Ellen Emilia Anna Zscheile 
Date: Sun, 30 Mar 2025 21:58:34 +0000
Subject: [PATCH 040/568] feat(repo,locale): merge PR/issues cases for some
 repo/issue strings (#7092)

- Merge `archive.nocomment` and `comment.blocked_by_user`'s variants for issue and pull request to a unified string and no longer have a issue and pull request variant.
- Fixes #6443

Signed-off-by: Ellen Emilia Anna Zscheile 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7092
Reviewed-by: Panagiotis "Ivory" Vasilopoulos 
Reviewed-by: Gusted 
Co-authored-by: Ellen Emilia Anna Zscheile 
Co-committed-by: Ellen Emilia Anna Zscheile 
---
 options/locale/locale_en-US.ini        |  6 ++----
 routers/web/repo/issue.go              |  6 +-----
 routers/web/repo/pull.go               |  4 ++--
 templates/repo/issue/view_content.tmpl | 18 +++---------------
 tests/integration/block_test.go        |  6 +++---
 5 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a67f891604..ea7191b906 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1217,8 +1217,7 @@ template.invalid = Must select a template repository
 
 archive.title = This repository is archived. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.
 archive.title_date = This repository has been archived on %s. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.
-archive.issue.nocomment = This repository is archived. You cannot comment on issues.
-archive.pull.nocomment = This repository is archived. You cannot comment on pull requests.
+archive.nocomment = Commenting is not possible because the repository is archived.
 archive.pull.noreview = This repository is archived. You cannot review pull requests.
 
 form.reach_limit_of_creation_1 = The owner has already reached the limit of %d repository.
@@ -1882,7 +1881,7 @@ issues.content_history.delete_from_history_confirm = Delete from history?
 issues.content_history.options = Options
 issues.reference_link = Reference: %s
 issues.blocked_by_user = You cannot create issues in this repository because you are blocked by the repository owner.
-issues.comment.blocked_by_user = You cannot comment on this issue because you are blocked by the repository owner or the poster of the issue.
+comment.blocked_by_user = Commenting is not possible because you are blocked by the repository owner or the author.
 issues.reopen.blocked_by_user = You cannot reopen this issue because you are blocked by the repository owner or the poster of this issue.
 issues.summary_card_alt = Summary card of an issue titled "%s" in repository %s
 
@@ -1967,7 +1966,6 @@ pulls.waiting_count_1 = %d waiting review
 pulls.waiting_count_n = %d waiting reviews
 pulls.wrong_commit_id = commit id must be a commit id on the target branch
 pulls.blocked_by_user = You cannot create a pull request on this repository because you are blocked by the repository owner.
-pulls.comment.blocked_by_user = You cannot comment on this pull request because you are blocked by the repository owner or the poster of the pull request.
 
 pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
 pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index e51d143ede..dc662a654e 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -3255,11 +3255,7 @@ func NewComment(ctx *context.Context) {
 	comment, err := issue_service.CreateIssueComment(ctx, ctx.Doer, ctx.Repo.Repository, issue, form.Content, attachments)
 	if err != nil {
 		if errors.Is(err, user_model.ErrBlockedByUser) {
-			if issue.IsPull {
-				ctx.JSONError(ctx.Tr("repo.pulls.comment.blocked_by_user"))
-			} else {
-				ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_by_user"))
-			}
+			ctx.JSONError(ctx.Tr("repo.comment.blocked_by_user"))
 		} else {
 			ctx.ServerError("CreateIssueComment", err)
 		}
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index bda357fff9..7ae7fd416c 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1321,8 +1321,8 @@ func MergePullRequest(ctx *context.Context) {
 		} else if models.IsErrMergeConflicts(err) {
 			conflictError := err.(models.ErrMergeConflicts)
 			flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
-				"Message": ctx.Tr("repo.editor.merge_conflict"),
-				"Summary": ctx.Tr("repo.editor.merge_conflict_summary"),
+				"Message": ctx.Tr("repo.pulls.merge_conflict"),
+				"Summary": ctx.Tr("repo.pulls.merge_conflict_summary"),
 				"Details": utils.SanitizeFlashErrorString(conflictError.StdErr) + "
" + utils.SanitizeFlashErrorString(conflictError.StdOut),
 			})
 			if err != nil {
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 8ede0f36e5..268c77d880 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -116,29 +116,17 @@
{{else if .Repository.IsArchived}}
- {{if .Issue.IsPull}} - {{ctx.Locale.Tr "repo.archive.pull.nocomment"}} - {{else}} - {{ctx.Locale.Tr "repo.archive.issue.nocomment"}} - {{end}} + {{ctx.Locale.Tr "repo.archive.nocomment"}}
{{end}} {{else if .IsBlocked}}
- {{if .Issue.IsPull}} - {{ctx.Locale.Tr "repo.pulls.comment.blocked_by_user"}} - {{else}} - {{ctx.Locale.Tr "repo.issues.comment.blocked_by_user"}} - {{end}} + {{ctx.Locale.Tr "repo.comment.blocked_by_user"}}
{{else}} {{/* not .IsSigned */}} {{if .Repository.IsArchived}}
- {{if .Issue.IsPull}} - {{ctx.Locale.Tr "repo.archive.pull.nocomment"}} - {{else}} - {{ctx.Locale.Tr "repo.archive.issue.nocomment"}} - {{end}} + {{ctx.Locale.Tr "repo.archive.nocomment"}}
{{else}}
diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go index b0d4f727de..67443f40cf 100644 --- a/tests/integration/block_test.go +++ b/tests/integration/block_test.go @@ -236,7 +236,7 @@ func TestBlockActions(t *testing.T) { // Ensures that comment creation on doer's owned repositories and doer's // posted issues are blocked. t.Run("Comment creation", func(t *testing.T) { - expectedMessage := locale.Tr("repo.issues.comment.blocked_by_user") + expectedMessage := locale.Tr("repo.comment.blocked_by_user") t.Run("Blocked by repository owner", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -258,7 +258,7 @@ func TestBlockActions(t *testing.T) { resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) msg := htmlDoc.doc.Find("div .warning").Text() - assert.Contains(t, msg, "You cannot comment on this issue because you are blocked") + assert.Contains(t, msg, expectedMessage) }) t.Run("Blocked by issue poster", func(t *testing.T) { @@ -285,7 +285,7 @@ func TestBlockActions(t *testing.T) { resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) msg := htmlDoc.doc.Find("div .warning").Text() - assert.Contains(t, msg, "You cannot comment on this issue because you are blocked") + assert.Contains(t, msg, expectedMessage) }) }) From 114cd6d4b60435c9dc6a04ba923b0303761ab8e9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 31 Mar 2025 00:40:07 +0000 Subject: [PATCH 041/568] Lock file maintenance (forgejo) (#7400) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7400 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 206 +++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8c64a9f1d..f45893a1ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -562,9 +562,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz", - "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", + "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==", "cpu": [ "ppc64" ], @@ -578,9 +578,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz", - "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz", + "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==", "cpu": [ "arm" ], @@ -594,9 +594,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz", - "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz", + "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==", "cpu": [ "arm64" ], @@ -610,9 +610,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz", - "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz", + "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==", "cpu": [ "x64" ], @@ -626,9 +626,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz", - "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz", + "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==", "cpu": [ "arm64" ], @@ -642,9 +642,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz", - "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz", + "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==", "cpu": [ "x64" ], @@ -658,9 +658,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz", - "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz", + "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==", "cpu": [ "arm64" ], @@ -674,9 +674,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz", - "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz", + "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==", "cpu": [ "x64" ], @@ -690,9 +690,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz", - "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz", + "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==", "cpu": [ "arm" ], @@ -706,9 +706,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz", - "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz", + "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==", "cpu": [ "arm64" ], @@ -722,9 +722,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz", - "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz", + "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==", "cpu": [ "ia32" ], @@ -738,9 +738,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz", - "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz", + "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==", "cpu": [ "loong64" ], @@ -754,9 +754,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz", - "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz", + "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==", "cpu": [ "mips64el" ], @@ -770,9 +770,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz", - "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz", + "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==", "cpu": [ "ppc64" ], @@ -786,9 +786,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz", - "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz", + "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==", "cpu": [ "riscv64" ], @@ -802,9 +802,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz", - "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz", + "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==", "cpu": [ "s390x" ], @@ -818,9 +818,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz", - "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz", + "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==", "cpu": [ "x64" ], @@ -834,9 +834,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz", - "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz", + "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==", "cpu": [ "arm64" ], @@ -850,9 +850,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz", - "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz", + "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==", "cpu": [ "x64" ], @@ -866,9 +866,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz", - "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz", + "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==", "cpu": [ "arm64" ], @@ -882,9 +882,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz", - "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz", + "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==", "cpu": [ "x64" ], @@ -898,9 +898,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz", - "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz", + "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==", "cpu": [ "x64" ], @@ -914,9 +914,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz", - "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz", + "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==", "cpu": [ "arm64" ], @@ -930,9 +930,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz", - "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz", + "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==", "cpu": [ "ia32" ], @@ -946,9 +946,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz", - "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz", + "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==", "cpu": [ "x64" ], @@ -6478,9 +6478,9 @@ } }, "node_modules/esbuild": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz", - "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz", + "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==", "hasInstallScript": true, "license": "MIT", "bin": { @@ -6490,31 +6490,31 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.1", - "@esbuild/android-arm": "0.25.1", - "@esbuild/android-arm64": "0.25.1", - "@esbuild/android-x64": "0.25.1", - "@esbuild/darwin-arm64": "0.25.1", - "@esbuild/darwin-x64": "0.25.1", - "@esbuild/freebsd-arm64": "0.25.1", - "@esbuild/freebsd-x64": "0.25.1", - "@esbuild/linux-arm": "0.25.1", - "@esbuild/linux-arm64": "0.25.1", - "@esbuild/linux-ia32": "0.25.1", - "@esbuild/linux-loong64": "0.25.1", - "@esbuild/linux-mips64el": "0.25.1", - "@esbuild/linux-ppc64": "0.25.1", - "@esbuild/linux-riscv64": "0.25.1", - "@esbuild/linux-s390x": "0.25.1", - "@esbuild/linux-x64": "0.25.1", - "@esbuild/netbsd-arm64": "0.25.1", - "@esbuild/netbsd-x64": "0.25.1", - "@esbuild/openbsd-arm64": "0.25.1", - "@esbuild/openbsd-x64": "0.25.1", - "@esbuild/sunos-x64": "0.25.1", - "@esbuild/win32-arm64": "0.25.1", - "@esbuild/win32-ia32": "0.25.1", - "@esbuild/win32-x64": "0.25.1" + "@esbuild/aix-ppc64": "0.25.2", + "@esbuild/android-arm": "0.25.2", + "@esbuild/android-arm64": "0.25.2", + "@esbuild/android-x64": "0.25.2", + "@esbuild/darwin-arm64": "0.25.2", + "@esbuild/darwin-x64": "0.25.2", + "@esbuild/freebsd-arm64": "0.25.2", + "@esbuild/freebsd-x64": "0.25.2", + "@esbuild/linux-arm": "0.25.2", + "@esbuild/linux-arm64": "0.25.2", + "@esbuild/linux-ia32": "0.25.2", + "@esbuild/linux-loong64": "0.25.2", + "@esbuild/linux-mips64el": "0.25.2", + "@esbuild/linux-ppc64": "0.25.2", + "@esbuild/linux-riscv64": "0.25.2", + "@esbuild/linux-s390x": "0.25.2", + "@esbuild/linux-x64": "0.25.2", + "@esbuild/netbsd-arm64": "0.25.2", + "@esbuild/netbsd-x64": "0.25.2", + "@esbuild/openbsd-arm64": "0.25.2", + "@esbuild/openbsd-x64": "0.25.2", + "@esbuild/sunos-x64": "0.25.2", + "@esbuild/win32-arm64": "0.25.2", + "@esbuild/win32-ia32": "0.25.2", + "@esbuild/win32-x64": "0.25.2" } }, "node_modules/esbuild-loader": { From 4b56c05e65223986d4a3482ade0d066b4e9628ba Mon Sep 17 00:00:00 2001 From: Gusted Date: Mon, 31 Mar 2025 03:33:18 +0000 Subject: [PATCH 042/568] fix: validate input for default_{merge,update}_style (#7395) - Add `binding:"In(...)"` to the `default_merge_style` and `default_update_style` fields to only accept recognized merge and update styles. - Resolves https://codeberg.org/forgejo/forgejo/issues/7389 - Added integration test for the API (`binding` works in the exact same way for the API and web routes). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7395 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- modules/structs/repo.go | 6 +- routers/web/repo/setting/setting.go | 4 + services/forms/repo_form.go | 4 +- templates/swagger/v1_json.tmpl | 2 +- tests/integration/api_repo_edit_test.go | 448 +++++++++++++----------- 5 files changed, 248 insertions(+), 216 deletions(-) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index b5f54a2a7a..c9cd729cf3 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -224,10 +224,10 @@ type EditRepoOption struct { AllowRebaseUpdate *bool `json:"allow_rebase_update,omitempty"` // set to `true` to delete pr branch after merge by default DefaultDeleteBranchAfterMerge *bool `json:"default_delete_branch_after_merge,omitempty"` - // set to a merge style to be used by this repository: "merge", "rebase", "rebase-merge", "squash", or "fast-forward-only". - DefaultMergeStyle *string `json:"default_merge_style,omitempty"` + // set to a merge style to be used by this repository: "merge", "rebase", "rebase-merge", "squash", "fast-forward-only", "manually-merged", or "rebase-update-only". + DefaultMergeStyle *string `json:"default_merge_style,omitempty" binding:"In(merge,rebase,rebase-merge,squash,fast-forward-only,manually-merged,rebase-update-only)"` // set to a update style to be used by this repository: "rebase" or "merge" - DefaultUpdateStyle *string `json:"default_update_style,omitempty"` + DefaultUpdateStyle *string `json:"default_update_style,omitempty" binding:"In(merge,rebase)"` // set to `true` to allow edits from maintainers by default DefaultAllowMaintainerEdit *bool `json:"default_allow_maintainer_edit,omitempty"` // set to `true` to archive this repository. diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 2af2eef4a5..083cc4ae82 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -105,6 +105,10 @@ func Units(ctx *context.Context) { func UnitsPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.RepoUnitSettingForm) + if ctx.HasError() { + ctx.Redirect(ctx.Repo.Repository.Link() + "/settings/units") + return + } repo := ctx.Repo.Repository diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index bd2eb769c6..c39c6a7b36 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -188,8 +188,8 @@ type RepoUnitSettingForm struct { PullsAllowSquash bool PullsAllowFastForwardOnly bool PullsAllowManualMerge bool - PullsDefaultMergeStyle string - PullsDefaultUpdateStyle string + PullsDefaultMergeStyle string `binding:"In(merge,rebase,rebase-merge,squash,fast-forward-only,manually-merged,rebase-update-only)"` + PullsDefaultUpdateStyle string `binding:"In(merge,rebase)"` EnableAutodetectManualMerge bool PullsAllowRebaseUpdate bool DefaultDeleteBranchAfterMerge bool diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 231386e3aa..400c71af1a 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -23762,7 +23762,7 @@ "x-go-name": "DefaultDeleteBranchAfterMerge" }, "default_merge_style": { - "description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", or \"fast-forward-only\".", + "description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", \"fast-forward-only\", \"manually-merged\", or \"rebase-update-only\".", "type": "string", "x-go-name": "DefaultMergeStyle" }, diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 288c645e37..341cb0961f 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -6,7 +6,6 @@ package integration import ( "fmt" "net/http" - "net/url" "testing" auth_model "forgejo.org/models/auth" @@ -16,6 +15,7 @@ import ( "forgejo.org/models/unittest" user_model "forgejo.org/models/user" api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) @@ -137,232 +137,260 @@ func getNewRepoEditOption(opts *api.EditRepoOption) *api.EditRepoOption { } func TestAPIRepoEdit(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - bFalse, bTrue := false, true + defer tests.PrepareTestEnv(t)() + bFalse, bTrue := false, true - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo1 & repo16 - org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) // owner of the repo3, is an org - user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // owner of neither repos - repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) // public repo - repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) // public repo - repo15 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) // empty repo - repo16 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) // private repo + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo1 & repo16 + org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) // owner of the repo3, is an org + user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // owner of neither repos + repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) // public repo + repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) // public repo + repo15 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) // empty repo + repo16 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) // private repo - // Get user2's token - session := loginUser(t, user2.Name) - token2 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - // Get user4's token - session = loginUser(t, user4.Name) - token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + // Get user2's token + session := loginUser(t, user2.Name) + token2 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + // Get user4's token + session = loginUser(t, user4.Name) + token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - // Test editing a repo1 which user2 owns, changing name and many properties - origRepoEditOption := getRepoEditOptionFromRepo(repo1) - repoEditOption := getNewRepoEditOption(origRepoEditOption) - req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). - AddTokenAuth(token2) - resp := MakeRequest(t, req, http.StatusOK) - var repo api.Repository - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check response - assert.Equal(t, *repoEditOption.Name, repo.Name) - assert.Equal(t, *repoEditOption.Description, repo.Description) - assert.Equal(t, *repoEditOption.Website, repo.Website) - assert.Equal(t, *repoEditOption.Archived, repo.Archived) - // check repo1 from database - repo1edited := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption := getRepoEditOptionFromRepo(repo1edited) - assert.Equal(t, *repoEditOption.Name, *repo1editedOption.Name) - assert.Equal(t, *repoEditOption.Description, *repo1editedOption.Description) - assert.Equal(t, *repoEditOption.Website, *repo1editedOption.Website) - assert.Equal(t, *repoEditOption.Archived, *repo1editedOption.Archived) - assert.Equal(t, *repoEditOption.Private, *repo1editedOption.Private) - assert.Equal(t, *repoEditOption.HasWiki, *repo1editedOption.HasWiki) + // Test editing a repo1 which user2 owns, changing name and many properties + origRepoEditOption := getRepoEditOptionFromRepo(repo1) + repoEditOption := getNewRepoEditOption(origRepoEditOption) + req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). + AddTokenAuth(token2) + resp := MakeRequest(t, req, http.StatusOK) + var repo api.Repository + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check response + assert.Equal(t, *repoEditOption.Name, repo.Name) + assert.Equal(t, *repoEditOption.Description, repo.Description) + assert.Equal(t, *repoEditOption.Website, repo.Website) + assert.Equal(t, *repoEditOption.Archived, repo.Archived) + // check repo1 from database + repo1edited := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption := getRepoEditOptionFromRepo(repo1edited) + assert.Equal(t, *repoEditOption.Name, *repo1editedOption.Name) + assert.Equal(t, *repoEditOption.Description, *repo1editedOption.Description) + assert.Equal(t, *repoEditOption.Website, *repo1editedOption.Website) + assert.Equal(t, *repoEditOption.Archived, *repo1editedOption.Archived) + assert.Equal(t, *repoEditOption.Private, *repo1editedOption.Private) + assert.Equal(t, *repoEditOption.HasWiki, *repo1editedOption.HasWiki) - // Test editing repo1 to use internal issue and wiki (default) - *repoEditOption.HasIssues = true - repoEditOption.ExternalTracker = nil - repoEditOption.InternalTracker = &api.InternalTracker{ - EnableTimeTracker: false, - AllowOnlyContributorsToTrackTime: false, - EnableIssueDependencies: false, - } - *repoEditOption.HasWiki = true - repoEditOption.ExternalWiki = nil - url := fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name) - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check repo1 was written to database - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.True(t, *repo1editedOption.HasIssues) - assert.Nil(t, repo1editedOption.ExternalTracker) - assert.Equal(t, *repo1editedOption.InternalTracker, *repoEditOption.InternalTracker) - assert.True(t, *repo1editedOption.HasWiki) - assert.Nil(t, repo1editedOption.ExternalWiki) + // Test editing repo1 to use internal issue and wiki (default) + *repoEditOption.HasIssues = true + repoEditOption.ExternalTracker = nil + repoEditOption.InternalTracker = &api.InternalTracker{ + EnableTimeTracker: false, + AllowOnlyContributorsToTrackTime: false, + EnableIssueDependencies: false, + } + *repoEditOption.HasWiki = true + repoEditOption.ExternalWiki = nil + url := fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name) + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check repo1 was written to database + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.True(t, *repo1editedOption.HasIssues) + assert.Nil(t, repo1editedOption.ExternalTracker) + assert.Equal(t, *repo1editedOption.InternalTracker, *repoEditOption.InternalTracker) + assert.True(t, *repo1editedOption.HasWiki) + assert.Nil(t, repo1editedOption.ExternalWiki) - // Test editing repo1 to use external issue and wiki - repoEditOption.ExternalTracker = &api.ExternalTracker{ - ExternalTrackerURL: "http://www.somewebsite.com", - ExternalTrackerFormat: "http://www.somewebsite.com/{user}/{repo}?issue={index}", - ExternalTrackerStyle: "alphanumeric", - } - repoEditOption.ExternalWiki = &api.ExternalWiki{ - ExternalWikiURL: "http://www.somewebsite.com", - } - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check repo1 was written to database - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.True(t, *repo1editedOption.HasIssues) - assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) - assert.True(t, *repo1editedOption.HasWiki) - assert.Equal(t, *repo1editedOption.ExternalWiki, *repoEditOption.ExternalWiki) + // Test editing repo1 to use external issue and wiki + repoEditOption.ExternalTracker = &api.ExternalTracker{ + ExternalTrackerURL: "http://www.somewebsite.com", + ExternalTrackerFormat: "http://www.somewebsite.com/{user}/{repo}?issue={index}", + ExternalTrackerStyle: "alphanumeric", + } + repoEditOption.ExternalWiki = &api.ExternalWiki{ + ExternalWikiURL: "http://www.somewebsite.com", + } + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check repo1 was written to database + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.True(t, *repo1editedOption.HasIssues) + assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) + assert.True(t, *repo1editedOption.HasWiki) + assert.Equal(t, *repo1editedOption.ExternalWiki, *repoEditOption.ExternalWiki) - repoEditOption.ExternalTracker.ExternalTrackerStyle = "regexp" - repoEditOption.ExternalTracker.ExternalTrackerRegexpPattern = `(\d+)` - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.True(t, *repo1editedOption.HasIssues) - assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) + repoEditOption.ExternalTracker.ExternalTrackerStyle = "regexp" + repoEditOption.ExternalTracker.ExternalTrackerRegexpPattern = `(\d+)` + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.True(t, *repo1editedOption.HasIssues) + assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) - // Do some tests with invalid URL for external tracker and wiki - repoEditOption.ExternalTracker.ExternalTrackerURL = "htp://www.somewebsite.com" - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusUnprocessableEntity) - repoEditOption.ExternalTracker.ExternalTrackerURL = "http://www.somewebsite.com" - repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user/{repo}?issue={index}" - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusUnprocessableEntity) - repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user}/{repo}?issue={index}" - repoEditOption.ExternalWiki.ExternalWikiURL = "htp://www.somewebsite.com" - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusUnprocessableEntity) + // Do some tests with invalid URL for external tracker and wiki + repoEditOption.ExternalTracker.ExternalTrackerURL = "htp://www.somewebsite.com" + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusUnprocessableEntity) + repoEditOption.ExternalTracker.ExternalTrackerURL = "http://www.somewebsite.com" + repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user/{repo}?issue={index}" + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusUnprocessableEntity) + repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user}/{repo}?issue={index}" + repoEditOption.ExternalWiki.ExternalWikiURL = "htp://www.somewebsite.com" + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusUnprocessableEntity) - // Test small repo change through API with issue and wiki option not set; They shall not be touched. - *repoEditOption.Description = "small change" - repoEditOption.HasIssues = nil - repoEditOption.ExternalTracker = nil - repoEditOption.HasWiki = nil - repoEditOption.ExternalWiki = nil - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check repo1 was written to database - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.Equal(t, *repo1editedOption.Description, *repoEditOption.Description) - assert.True(t, *repo1editedOption.HasIssues) - assert.NotNil(t, *repo1editedOption.ExternalTracker) - assert.True(t, *repo1editedOption.HasWiki) - assert.NotNil(t, *repo1editedOption.ExternalWiki) + // Test small repo change through API with issue and wiki option not set; They shall not be touched. + *repoEditOption.Description = "small change" + repoEditOption.HasIssues = nil + repoEditOption.ExternalTracker = nil + repoEditOption.HasWiki = nil + repoEditOption.ExternalWiki = nil + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check repo1 was written to database + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.Equal(t, *repo1editedOption.Description, *repoEditOption.Description) + assert.True(t, *repo1editedOption.HasIssues) + assert.NotNil(t, *repo1editedOption.ExternalTracker) + assert.True(t, *repo1editedOption.HasWiki) + assert.NotNil(t, *repo1editedOption.ExternalWiki) - // reset repo in db - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // reset repo in db + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test editing a non-existing repo - name := "repodoesnotexist" - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, name), &api.EditRepoOption{Name: &name}). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusNotFound) + // Test editing a non-existing repo + name := "repodoesnotexist" + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, name), &api.EditRepoOption{Name: &name}). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusNotFound) - // Test editing repo16 by user4 who does not have write access - origRepoEditOption = getRepoEditOptionFromRepo(repo16) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). - AddTokenAuth(token4) - MakeRequest(t, req, http.StatusNotFound) + // Test editing repo16 by user4 who does not have write access + origRepoEditOption = getRepoEditOptionFromRepo(repo16) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). + AddTokenAuth(token4) + MakeRequest(t, req, http.StatusNotFound) - // Tests a repo with no token given so will fail - origRepoEditOption = getRepoEditOptionFromRepo(repo16) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption) - _ = MakeRequest(t, req, http.StatusNotFound) + // Tests a repo with no token given so will fail + origRepoEditOption = getRepoEditOptionFromRepo(repo16) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption) + _ = MakeRequest(t, req, http.StatusNotFound) - // Test using access token for a private repo that the user of the token owns - origRepoEditOption = getRepoEditOptionFromRepo(repo16) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) - // reset repo in db - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test using access token for a private repo that the user of the token owns + origRepoEditOption = getRepoEditOptionFromRepo(repo16) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) + // reset repo in db + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test making a repo public that is private - repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) - assert.True(t, repo16.IsPrivate) - repoEditOption = &api.EditRepoOption{ - Private: &bFalse, - } - url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) - repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) - assert.False(t, repo16.IsPrivate) - // Make it private again - repoEditOption.Private = &bTrue - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test making a repo public that is private + repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) + assert.True(t, repo16.IsPrivate) + repoEditOption = &api.EditRepoOption{ + Private: &bFalse, + } + url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) + repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) + assert.False(t, repo16.IsPrivate) + // Make it private again + repoEditOption.Private = &bTrue + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test to change empty repo - assert.False(t, repo15.IsArchived) - url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo15.Name) - req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ - Archived: &bTrue, - }).AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) - repo15 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) - assert.True(t, repo15.IsArchived) - req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ - Archived: &bFalse, - }).AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test to change empty repo + assert.False(t, repo15.IsArchived) + url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo15.Name) + req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + Archived: &bTrue, + }).AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) + repo15 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) + assert.True(t, repo15.IsArchived) + req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + Archived: &bFalse, + }).AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test using org repo "org3/repo3" where user2 is a collaborator - origRepoEditOption = getRepoEditOptionFromRepo(repo3) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusOK) - // reset repo in db - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, *repoEditOption.Name), &origRepoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test using org repo "org3/repo3" where user2 is a collaborator + origRepoEditOption = getRepoEditOptionFromRepo(repo3) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusOK) + // reset repo in db + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, *repoEditOption.Name), &origRepoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test using org repo "org3/repo3" with no user token - origRepoEditOption = getRepoEditOptionFromRepo(repo3) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption) - MakeRequest(t, req, http.StatusNotFound) + // Test using org repo "org3/repo3" with no user token + origRepoEditOption = getRepoEditOptionFromRepo(repo3) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption) + MakeRequest(t, req, http.StatusNotFound) - // Test using repo "user2/repo1" where user4 is a NOT collaborator - origRepoEditOption = getRepoEditOptionFromRepo(repo1) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). - AddTokenAuth(token4) - MakeRequest(t, req, http.StatusForbidden) + // Test using repo "user2/repo1" where user4 is a NOT collaborator + origRepoEditOption = getRepoEditOptionFromRepo(repo1) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). + AddTokenAuth(token4) + MakeRequest(t, req, http.StatusForbidden) + + t.Run("Default merge style", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + updateStyle := "invalid" + MakeRequest(t, NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + DefaultUpdateStyle: &updateStyle, + }).AddTokenAuth(token2), http.StatusUnprocessableEntity) + + MakeRequest(t, NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + DefaultMergeStyle: &updateStyle, + }).AddTokenAuth(token2), http.StatusUnprocessableEntity) + + var apiRepo api.Repository + DecodeJSON(t, MakeRequest(t, NewRequest(t, "GET", url).AddTokenAuth(token2), http.StatusOK), &apiRepo) + assert.Equal(t, "merge", apiRepo.DefaultMergeStyle) + assert.Equal(t, "merge", apiRepo.DefaultUpdateStyle) + + updateStyle = "rebase" + MakeRequest(t, NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + DefaultMergeStyle: &updateStyle, + DefaultUpdateStyle: &updateStyle, + HasPullRequests: &bTrue, + }).AddTokenAuth(token2), http.StatusOK) + + DecodeJSON(t, MakeRequest(t, NewRequest(t, "GET", url).AddTokenAuth(token2), http.StatusOK), &apiRepo) + assert.Equal(t, "rebase", apiRepo.DefaultMergeStyle) + assert.Equal(t, "rebase", apiRepo.DefaultUpdateStyle) }) } From a9faf1ff7b87c6fe18109bb444569b9b7bbce218 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 31 Mar 2025 06:49:32 +0000 Subject: [PATCH 043/568] Update renovate to v39.222.0 (forgejo) (#7399) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/workflows/renovate.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml index dbba9a82bb..2d6da0c63e 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -28,7 +28,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/renovate/renovate:39.212.0 + image: data.forgejo.org/renovate/renovate:39.222.1 steps: - name: Load renovate repo cache diff --git a/Makefile b/Makefile index 5a392954ce..c28e4e92ca 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.31.0 # renovate: datasource=go GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.18.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.212.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.222.1 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From fa8d75b3e5700239cab02013c4c58936a34bdccd Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Mon, 31 Mar 2025 09:43:46 +0000 Subject: [PATCH 044/568] [v11.0/forgejo] fix: validate input for default_{merge,update}_style (#7401) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7395 - Add `binding:"In(...)"` to the `default_merge_style` and `default_update_style` fields to only accept recognized merge and update styles. - Resolves forgejo/forgejo#7389 - Added integration test for the API (`binding` works in the exact same way for the API and web routes). Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7401 Reviewed-by: Earl Warren Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- modules/structs/repo.go | 6 +- routers/web/repo/setting/setting.go | 4 + services/forms/repo_form.go | 4 +- templates/swagger/v1_json.tmpl | 2 +- tests/integration/api_repo_edit_test.go | 448 +++++++++++++----------- 5 files changed, 248 insertions(+), 216 deletions(-) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index b5f54a2a7a..c9cd729cf3 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -224,10 +224,10 @@ type EditRepoOption struct { AllowRebaseUpdate *bool `json:"allow_rebase_update,omitempty"` // set to `true` to delete pr branch after merge by default DefaultDeleteBranchAfterMerge *bool `json:"default_delete_branch_after_merge,omitempty"` - // set to a merge style to be used by this repository: "merge", "rebase", "rebase-merge", "squash", or "fast-forward-only". - DefaultMergeStyle *string `json:"default_merge_style,omitempty"` + // set to a merge style to be used by this repository: "merge", "rebase", "rebase-merge", "squash", "fast-forward-only", "manually-merged", or "rebase-update-only". + DefaultMergeStyle *string `json:"default_merge_style,omitempty" binding:"In(merge,rebase,rebase-merge,squash,fast-forward-only,manually-merged,rebase-update-only)"` // set to a update style to be used by this repository: "rebase" or "merge" - DefaultUpdateStyle *string `json:"default_update_style,omitempty"` + DefaultUpdateStyle *string `json:"default_update_style,omitempty" binding:"In(merge,rebase)"` // set to `true` to allow edits from maintainers by default DefaultAllowMaintainerEdit *bool `json:"default_allow_maintainer_edit,omitempty"` // set to `true` to archive this repository. diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 2af2eef4a5..083cc4ae82 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -105,6 +105,10 @@ func Units(ctx *context.Context) { func UnitsPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.RepoUnitSettingForm) + if ctx.HasError() { + ctx.Redirect(ctx.Repo.Repository.Link() + "/settings/units") + return + } repo := ctx.Repo.Repository diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index bd2eb769c6..c39c6a7b36 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -188,8 +188,8 @@ type RepoUnitSettingForm struct { PullsAllowSquash bool PullsAllowFastForwardOnly bool PullsAllowManualMerge bool - PullsDefaultMergeStyle string - PullsDefaultUpdateStyle string + PullsDefaultMergeStyle string `binding:"In(merge,rebase,rebase-merge,squash,fast-forward-only,manually-merged,rebase-update-only)"` + PullsDefaultUpdateStyle string `binding:"In(merge,rebase)"` EnableAutodetectManualMerge bool PullsAllowRebaseUpdate bool DefaultDeleteBranchAfterMerge bool diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 231386e3aa..400c71af1a 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -23762,7 +23762,7 @@ "x-go-name": "DefaultDeleteBranchAfterMerge" }, "default_merge_style": { - "description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", or \"fast-forward-only\".", + "description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", \"fast-forward-only\", \"manually-merged\", or \"rebase-update-only\".", "type": "string", "x-go-name": "DefaultMergeStyle" }, diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 288c645e37..341cb0961f 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -6,7 +6,6 @@ package integration import ( "fmt" "net/http" - "net/url" "testing" auth_model "forgejo.org/models/auth" @@ -16,6 +15,7 @@ import ( "forgejo.org/models/unittest" user_model "forgejo.org/models/user" api "forgejo.org/modules/structs" + "forgejo.org/tests" "github.com/stretchr/testify/assert" ) @@ -137,232 +137,260 @@ func getNewRepoEditOption(opts *api.EditRepoOption) *api.EditRepoOption { } func TestAPIRepoEdit(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - bFalse, bTrue := false, true + defer tests.PrepareTestEnv(t)() + bFalse, bTrue := false, true - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo1 & repo16 - org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) // owner of the repo3, is an org - user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // owner of neither repos - repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) // public repo - repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) // public repo - repo15 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) // empty repo - repo16 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) // private repo + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo1 & repo16 + org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) // owner of the repo3, is an org + user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // owner of neither repos + repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) // public repo + repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) // public repo + repo15 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) // empty repo + repo16 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) // private repo - // Get user2's token - session := loginUser(t, user2.Name) - token2 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - // Get user4's token - session = loginUser(t, user4.Name) - token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + // Get user2's token + session := loginUser(t, user2.Name) + token2 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + // Get user4's token + session = loginUser(t, user4.Name) + token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - // Test editing a repo1 which user2 owns, changing name and many properties - origRepoEditOption := getRepoEditOptionFromRepo(repo1) - repoEditOption := getNewRepoEditOption(origRepoEditOption) - req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). - AddTokenAuth(token2) - resp := MakeRequest(t, req, http.StatusOK) - var repo api.Repository - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check response - assert.Equal(t, *repoEditOption.Name, repo.Name) - assert.Equal(t, *repoEditOption.Description, repo.Description) - assert.Equal(t, *repoEditOption.Website, repo.Website) - assert.Equal(t, *repoEditOption.Archived, repo.Archived) - // check repo1 from database - repo1edited := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption := getRepoEditOptionFromRepo(repo1edited) - assert.Equal(t, *repoEditOption.Name, *repo1editedOption.Name) - assert.Equal(t, *repoEditOption.Description, *repo1editedOption.Description) - assert.Equal(t, *repoEditOption.Website, *repo1editedOption.Website) - assert.Equal(t, *repoEditOption.Archived, *repo1editedOption.Archived) - assert.Equal(t, *repoEditOption.Private, *repo1editedOption.Private) - assert.Equal(t, *repoEditOption.HasWiki, *repo1editedOption.HasWiki) + // Test editing a repo1 which user2 owns, changing name and many properties + origRepoEditOption := getRepoEditOptionFromRepo(repo1) + repoEditOption := getNewRepoEditOption(origRepoEditOption) + req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). + AddTokenAuth(token2) + resp := MakeRequest(t, req, http.StatusOK) + var repo api.Repository + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check response + assert.Equal(t, *repoEditOption.Name, repo.Name) + assert.Equal(t, *repoEditOption.Description, repo.Description) + assert.Equal(t, *repoEditOption.Website, repo.Website) + assert.Equal(t, *repoEditOption.Archived, repo.Archived) + // check repo1 from database + repo1edited := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption := getRepoEditOptionFromRepo(repo1edited) + assert.Equal(t, *repoEditOption.Name, *repo1editedOption.Name) + assert.Equal(t, *repoEditOption.Description, *repo1editedOption.Description) + assert.Equal(t, *repoEditOption.Website, *repo1editedOption.Website) + assert.Equal(t, *repoEditOption.Archived, *repo1editedOption.Archived) + assert.Equal(t, *repoEditOption.Private, *repo1editedOption.Private) + assert.Equal(t, *repoEditOption.HasWiki, *repo1editedOption.HasWiki) - // Test editing repo1 to use internal issue and wiki (default) - *repoEditOption.HasIssues = true - repoEditOption.ExternalTracker = nil - repoEditOption.InternalTracker = &api.InternalTracker{ - EnableTimeTracker: false, - AllowOnlyContributorsToTrackTime: false, - EnableIssueDependencies: false, - } - *repoEditOption.HasWiki = true - repoEditOption.ExternalWiki = nil - url := fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name) - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check repo1 was written to database - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.True(t, *repo1editedOption.HasIssues) - assert.Nil(t, repo1editedOption.ExternalTracker) - assert.Equal(t, *repo1editedOption.InternalTracker, *repoEditOption.InternalTracker) - assert.True(t, *repo1editedOption.HasWiki) - assert.Nil(t, repo1editedOption.ExternalWiki) + // Test editing repo1 to use internal issue and wiki (default) + *repoEditOption.HasIssues = true + repoEditOption.ExternalTracker = nil + repoEditOption.InternalTracker = &api.InternalTracker{ + EnableTimeTracker: false, + AllowOnlyContributorsToTrackTime: false, + EnableIssueDependencies: false, + } + *repoEditOption.HasWiki = true + repoEditOption.ExternalWiki = nil + url := fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name) + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check repo1 was written to database + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.True(t, *repo1editedOption.HasIssues) + assert.Nil(t, repo1editedOption.ExternalTracker) + assert.Equal(t, *repo1editedOption.InternalTracker, *repoEditOption.InternalTracker) + assert.True(t, *repo1editedOption.HasWiki) + assert.Nil(t, repo1editedOption.ExternalWiki) - // Test editing repo1 to use external issue and wiki - repoEditOption.ExternalTracker = &api.ExternalTracker{ - ExternalTrackerURL: "http://www.somewebsite.com", - ExternalTrackerFormat: "http://www.somewebsite.com/{user}/{repo}?issue={index}", - ExternalTrackerStyle: "alphanumeric", - } - repoEditOption.ExternalWiki = &api.ExternalWiki{ - ExternalWikiURL: "http://www.somewebsite.com", - } - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check repo1 was written to database - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.True(t, *repo1editedOption.HasIssues) - assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) - assert.True(t, *repo1editedOption.HasWiki) - assert.Equal(t, *repo1editedOption.ExternalWiki, *repoEditOption.ExternalWiki) + // Test editing repo1 to use external issue and wiki + repoEditOption.ExternalTracker = &api.ExternalTracker{ + ExternalTrackerURL: "http://www.somewebsite.com", + ExternalTrackerFormat: "http://www.somewebsite.com/{user}/{repo}?issue={index}", + ExternalTrackerStyle: "alphanumeric", + } + repoEditOption.ExternalWiki = &api.ExternalWiki{ + ExternalWikiURL: "http://www.somewebsite.com", + } + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check repo1 was written to database + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.True(t, *repo1editedOption.HasIssues) + assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) + assert.True(t, *repo1editedOption.HasWiki) + assert.Equal(t, *repo1editedOption.ExternalWiki, *repoEditOption.ExternalWiki) - repoEditOption.ExternalTracker.ExternalTrackerStyle = "regexp" - repoEditOption.ExternalTracker.ExternalTrackerRegexpPattern = `(\d+)` - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.True(t, *repo1editedOption.HasIssues) - assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) + repoEditOption.ExternalTracker.ExternalTrackerStyle = "regexp" + repoEditOption.ExternalTracker.ExternalTrackerRegexpPattern = `(\d+)` + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.True(t, *repo1editedOption.HasIssues) + assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker) - // Do some tests with invalid URL for external tracker and wiki - repoEditOption.ExternalTracker.ExternalTrackerURL = "htp://www.somewebsite.com" - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusUnprocessableEntity) - repoEditOption.ExternalTracker.ExternalTrackerURL = "http://www.somewebsite.com" - repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user/{repo}?issue={index}" - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusUnprocessableEntity) - repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user}/{repo}?issue={index}" - repoEditOption.ExternalWiki.ExternalWikiURL = "htp://www.somewebsite.com" - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusUnprocessableEntity) + // Do some tests with invalid URL for external tracker and wiki + repoEditOption.ExternalTracker.ExternalTrackerURL = "htp://www.somewebsite.com" + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusUnprocessableEntity) + repoEditOption.ExternalTracker.ExternalTrackerURL = "http://www.somewebsite.com" + repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user/{repo}?issue={index}" + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusUnprocessableEntity) + repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user}/{repo}?issue={index}" + repoEditOption.ExternalWiki.ExternalWikiURL = "htp://www.somewebsite.com" + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusUnprocessableEntity) - // Test small repo change through API with issue and wiki option not set; They shall not be touched. - *repoEditOption.Description = "small change" - repoEditOption.HasIssues = nil - repoEditOption.ExternalTracker = nil - repoEditOption.HasWiki = nil - repoEditOption.ExternalWiki = nil - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &repo) - assert.NotNil(t, repo) - // check repo1 was written to database - repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - repo1editedOption = getRepoEditOptionFromRepo(repo1edited) - assert.Equal(t, *repo1editedOption.Description, *repoEditOption.Description) - assert.True(t, *repo1editedOption.HasIssues) - assert.NotNil(t, *repo1editedOption.ExternalTracker) - assert.True(t, *repo1editedOption.HasWiki) - assert.NotNil(t, *repo1editedOption.ExternalWiki) + // Test small repo change through API with issue and wiki option not set; They shall not be touched. + *repoEditOption.Description = "small change" + repoEditOption.HasIssues = nil + repoEditOption.ExternalTracker = nil + repoEditOption.HasWiki = nil + repoEditOption.ExternalWiki = nil + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + resp = MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &repo) + assert.NotNil(t, repo) + // check repo1 was written to database + repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + repo1editedOption = getRepoEditOptionFromRepo(repo1edited) + assert.Equal(t, *repo1editedOption.Description, *repoEditOption.Description) + assert.True(t, *repo1editedOption.HasIssues) + assert.NotNil(t, *repo1editedOption.ExternalTracker) + assert.True(t, *repo1editedOption.HasWiki) + assert.NotNil(t, *repo1editedOption.ExternalWiki) - // reset repo in db - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // reset repo in db + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test editing a non-existing repo - name := "repodoesnotexist" - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, name), &api.EditRepoOption{Name: &name}). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusNotFound) + // Test editing a non-existing repo + name := "repodoesnotexist" + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, name), &api.EditRepoOption{Name: &name}). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusNotFound) - // Test editing repo16 by user4 who does not have write access - origRepoEditOption = getRepoEditOptionFromRepo(repo16) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). - AddTokenAuth(token4) - MakeRequest(t, req, http.StatusNotFound) + // Test editing repo16 by user4 who does not have write access + origRepoEditOption = getRepoEditOptionFromRepo(repo16) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). + AddTokenAuth(token4) + MakeRequest(t, req, http.StatusNotFound) - // Tests a repo with no token given so will fail - origRepoEditOption = getRepoEditOptionFromRepo(repo16) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption) - _ = MakeRequest(t, req, http.StatusNotFound) + // Tests a repo with no token given so will fail + origRepoEditOption = getRepoEditOptionFromRepo(repo16) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption) + _ = MakeRequest(t, req, http.StatusNotFound) - // Test using access token for a private repo that the user of the token owns - origRepoEditOption = getRepoEditOptionFromRepo(repo16) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) - // reset repo in db - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test using access token for a private repo that the user of the token owns + origRepoEditOption = getRepoEditOptionFromRepo(repo16) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) + // reset repo in db + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test making a repo public that is private - repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) - assert.True(t, repo16.IsPrivate) - repoEditOption = &api.EditRepoOption{ - Private: &bFalse, - } - url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) - repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) - assert.False(t, repo16.IsPrivate) - // Make it private again - repoEditOption.Private = &bTrue - req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test making a repo public that is private + repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) + assert.True(t, repo16.IsPrivate) + repoEditOption = &api.EditRepoOption{ + Private: &bFalse, + } + url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) + repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) + assert.False(t, repo16.IsPrivate) + // Make it private again + repoEditOption.Private = &bTrue + req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test to change empty repo - assert.False(t, repo15.IsArchived) - url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo15.Name) - req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ - Archived: &bTrue, - }).AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) - repo15 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) - assert.True(t, repo15.IsArchived) - req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ - Archived: &bFalse, - }).AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test to change empty repo + assert.False(t, repo15.IsArchived) + url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo15.Name) + req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + Archived: &bTrue, + }).AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) + repo15 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) + assert.True(t, repo15.IsArchived) + req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + Archived: &bFalse, + }).AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test using org repo "org3/repo3" where user2 is a collaborator - origRepoEditOption = getRepoEditOptionFromRepo(repo3) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption). - AddTokenAuth(token2) - MakeRequest(t, req, http.StatusOK) - // reset repo in db - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, *repoEditOption.Name), &origRepoEditOption). - AddTokenAuth(token2) - _ = MakeRequest(t, req, http.StatusOK) + // Test using org repo "org3/repo3" where user2 is a collaborator + origRepoEditOption = getRepoEditOptionFromRepo(repo3) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption). + AddTokenAuth(token2) + MakeRequest(t, req, http.StatusOK) + // reset repo in db + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, *repoEditOption.Name), &origRepoEditOption). + AddTokenAuth(token2) + _ = MakeRequest(t, req, http.StatusOK) - // Test using org repo "org3/repo3" with no user token - origRepoEditOption = getRepoEditOptionFromRepo(repo3) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption) - MakeRequest(t, req, http.StatusNotFound) + // Test using org repo "org3/repo3" with no user token + origRepoEditOption = getRepoEditOptionFromRepo(repo3) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption) + MakeRequest(t, req, http.StatusNotFound) - // Test using repo "user2/repo1" where user4 is a NOT collaborator - origRepoEditOption = getRepoEditOptionFromRepo(repo1) - repoEditOption = getNewRepoEditOption(origRepoEditOption) - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). - AddTokenAuth(token4) - MakeRequest(t, req, http.StatusForbidden) + // Test using repo "user2/repo1" where user4 is a NOT collaborator + origRepoEditOption = getRepoEditOptionFromRepo(repo1) + repoEditOption = getNewRepoEditOption(origRepoEditOption) + req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). + AddTokenAuth(token4) + MakeRequest(t, req, http.StatusForbidden) + + t.Run("Default merge style", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + updateStyle := "invalid" + MakeRequest(t, NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + DefaultUpdateStyle: &updateStyle, + }).AddTokenAuth(token2), http.StatusUnprocessableEntity) + + MakeRequest(t, NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + DefaultMergeStyle: &updateStyle, + }).AddTokenAuth(token2), http.StatusUnprocessableEntity) + + var apiRepo api.Repository + DecodeJSON(t, MakeRequest(t, NewRequest(t, "GET", url).AddTokenAuth(token2), http.StatusOK), &apiRepo) + assert.Equal(t, "merge", apiRepo.DefaultMergeStyle) + assert.Equal(t, "merge", apiRepo.DefaultUpdateStyle) + + updateStyle = "rebase" + MakeRequest(t, NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ + DefaultMergeStyle: &updateStyle, + DefaultUpdateStyle: &updateStyle, + HasPullRequests: &bTrue, + }).AddTokenAuth(token2), http.StatusOK) + + DecodeJSON(t, MakeRequest(t, NewRequest(t, "GET", url).AddTokenAuth(token2), http.StatusOK), &apiRepo) + assert.Equal(t, "rebase", apiRepo.DefaultMergeStyle) + assert.Equal(t, "rebase", apiRepo.DefaultUpdateStyle) }) } From 10c8ca62d2dd059c8922bb045ea2e20cd83cbd23 Mon Sep 17 00:00:00 2001 From: "Panagiotis \"Ivory\" Vasilopoulos" Date: Mon, 31 Mar 2025 16:33:47 +0000 Subject: [PATCH 045/568] refactor(cli): improve dump's temporary file handling (#7350) - Create temporary directory inside of a temporary directory (useful for a work-in-progress Landlock implementation, as we will not want to "whitelist" the entirety of the /tmp directory in our case, i.e. /tmp/forgejo-dump-133552095). - The database is always removed after dump is complete. - The temporary directory is removed if no temporary directory has been explicitly set (as in, created by Forgejo in /tmp or equivalent). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7350 Reviewed-by: Gusted Co-authored-by: Panagiotis "Ivory" Vasilopoulos Co-committed-by: Panagiotis "Ivory" Vasilopoulos --- cmd/dump.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cmd/dump.go b/cmd/dump.go index ac72a2bb18..bc0b269924 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -122,7 +122,6 @@ It can be used for backup and capture Forgejo server image to send to maintainer &cli.StringFlag{ Name: "tempdir", Aliases: []string{"t"}, - Value: os.TempDir(), Usage: "Temporary dir path", }, &cli.StringFlag{ @@ -288,18 +287,31 @@ func runDump(ctx *cli.Context) error { } tmpDir := ctx.String("tempdir") + if tmpDir == "" { + tmpDir, err = os.MkdirTemp("", "forgejo-dump-*") + if err != nil { + fatal("Failed to create temporary directory: %v", err) + } + + defer func() { + if err := util.Remove(tmpDir); err != nil { + log.Warn("Failed to remove temporary directory: %s: Error: %v", tmpDir, err) + } + }() + } + if _, err := os.Stat(tmpDir); os.IsNotExist(err) { fatal("Path does not exist: %s", tmpDir) } dbDump, err := os.CreateTemp(tmpDir, "forgejo-db.sql") if err != nil { - fatal("Failed to create tmp file: %v", err) + fatal("Failed to create temporary file: %v", err) } defer func() { _ = dbDump.Close() if err := util.Remove(dbDump.Name()); err != nil { - log.Warn("Failed to remove temporary file: %s: Error: %v", dbDump.Name(), err) + log.Warn("Failed to remove temporary database file: %s: Error: %v", dbDump.Name(), err) } }() From dbeab2a0c32b3dc869518e4fbf2d9c3c1f352333 Mon Sep 17 00:00:00 2001 From: "Panagiotis \"Ivory\" Vasilopoulos" Date: Mon, 31 Mar 2025 16:35:20 +0000 Subject: [PATCH 046/568] chore: introduce gitNeeded bool in setup (#7348) There are various commands of the Forgejo CLI that do not actually need Git, because i.e. they only issue network requests. Matter of fact, most occurrences do not actually require Git. By removing the Git initialization, operations by e.g. the manager will not fail in the absence of a Git binary. This is mostly relevant for an in-the-works Landlock implementation, which aims to minimize access to paths depending on the situation. Although we should expect that Git will be installed on the same system that the user is running Forgejo from, it somewhat slows things down, whereas the same edge cases that we are trying to protect the user from _could_ be achieved by keeping the `setting.RepoRootPath` check. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7348 Reviewed-by: Gusted Co-authored-by: Panagiotis "Ivory" Vasilopoulos Co-committed-by: Panagiotis "Ivory" Vasilopoulos --- cmd/hook.go | 6 +++--- cmd/keys.go | 2 +- cmd/manager.go | 10 +++++----- cmd/manager_logging.go | 14 +++++++------- cmd/serv.go | 11 +++++++---- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/cmd/hook.go b/cmd/hook.go index 26064c2f4d..935c1b08ea 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -168,7 +168,7 @@ func runHookPreReceive(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), true) if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 { if setting.OnlyAllowPushIfGiteaEnvironmentSet { @@ -327,7 +327,7 @@ func runHookPostReceive(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), true) // First of all run update-server-info no matter what if _, _, err := git.NewCommand(ctx, "update-server-info").RunStdString(nil); err != nil { @@ -491,7 +491,7 @@ func runHookProcReceive(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), true) if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 { if setting.OnlyAllowPushIfGiteaEnvironmentSet { diff --git a/cmd/keys.go b/cmd/keys.go index b12daee1bc..2d241984c4 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -71,7 +71,7 @@ func runKeys(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), true) authorizedString, extra := private.AuthorizedPublicKeyByContent(ctx, content) // do not use handleCliResponseExtra or cli.NewExitError, if it exists immediately, it breaks some tests like Test_CmdKeys diff --git a/cmd/manager.go b/cmd/manager.go index 0cb1e60f73..56089947fd 100644 --- a/cmd/manager.go +++ b/cmd/manager.go @@ -112,7 +112,7 @@ func runShutdown(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) extra := private.Shutdown(ctx) return handleCliResponseExtra(extra) } @@ -121,7 +121,7 @@ func runRestart(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) extra := private.Restart(ctx) return handleCliResponseExtra(extra) } @@ -130,7 +130,7 @@ func runReloadTemplates(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) extra := private.ReloadTemplates(ctx) return handleCliResponseExtra(extra) } @@ -139,7 +139,7 @@ func runFlushQueues(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) extra := private.FlushQueues(ctx, c.Duration("timeout"), c.Bool("non-blocking")) return handleCliResponseExtra(extra) } @@ -148,7 +148,7 @@ func runProcesses(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) extra := private.Processes(ctx, os.Stdout, c.Bool("flat"), c.Bool("no-system"), c.Bool("stacktraces"), c.Bool("json"), c.String("cancel")) return handleCliResponseExtra(extra) } diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index ac2c1eb418..c6db2bb05a 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -199,7 +199,7 @@ func runRemoveLogger(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) logger := c.String("logger") if len(logger) == 0 { logger = log.DEFAULT @@ -214,7 +214,7 @@ func runAddConnLogger(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) vals := map[string]any{} mode := "conn" vals["net"] = "tcp" @@ -244,7 +244,7 @@ func runAddFileLogger(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) vals := map[string]any{} mode := "file" if c.IsSet("filename") { @@ -311,7 +311,7 @@ func runPauseLogging(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) userMsg := private.PauseLogging(ctx) _, _ = fmt.Fprintln(os.Stdout, userMsg) return nil @@ -321,7 +321,7 @@ func runResumeLogging(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) userMsg := private.ResumeLogging(ctx) _, _ = fmt.Fprintln(os.Stdout, userMsg) return nil @@ -331,7 +331,7 @@ func runReleaseReopenLogging(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) userMsg := private.ReleaseReopenLogging(ctx) _, _ = fmt.Fprintln(os.Stdout, userMsg) return nil @@ -340,7 +340,7 @@ func runReleaseReopenLogging(c *cli.Context) error { func runSetLogSQL(c *cli.Context) error { ctx, cancel := installSignals() defer cancel() - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), false) extra := private.SetLogSQL(ctx, !c.Bool("off")) return handleCliResponseExtra(extra) diff --git a/cmd/serv.go b/cmd/serv.go index 9d9e86992d..4b288632d2 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -57,19 +57,22 @@ var CmdServ = &cli.Command{ }, } -func setup(ctx context.Context, debug bool) { +func setup(ctx context.Context, debug, gitNeeded bool) { if debug { setupConsoleLogger(log.TRACE, false, os.Stderr) } else { setupConsoleLogger(log.FATAL, false, os.Stderr) } setting.MustInstalled() + // Sanity check to ensure path is not relative, see: https://github.com/go-gitea/gitea/pull/19317 if _, err := os.Stat(setting.RepoRootPath); err != nil { _ = fail(ctx, "Unable to access repository path", "Unable to access repository path %q, err: %v", setting.RepoRootPath, err) return } - if err := git.InitSimple(context.Background()); err != nil { - _ = fail(ctx, "Failed to init git", "Failed to init git, err: %v", err) + if gitNeeded { + if err := git.InitSimple(context.Background()); err != nil { + _ = fail(ctx, "Failed to init git", "Failed to init git, err: %v", err) + } } } @@ -133,7 +136,7 @@ func runServ(c *cli.Context) error { defer cancel() // FIXME: This needs to internationalised - setup(ctx, c.Bool("debug")) + setup(ctx, c.Bool("debug"), true) if setting.SSH.Disabled { fmt.Println("Forgejo: SSH has been disabled") From 4ba5c957e06351456ce0af1302dcdbc01e2f6d36 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Sat, 15 Mar 2025 17:45:37 +0100 Subject: [PATCH 047/568] Fix cannot delete runners via the modal dialog (#33895) delete-button and show-modal class are conflicting Closes #33894 (cherry picked from commit 7e8168f555b0a463866afcc10e9fddc34d363811) --- templates/shared/actions/runner_edit.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index 54250f830b..d452d69f7a 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -40,7 +40,7 @@
-
From 839739fb717c7897f88b0f16563a3f23b6cab28b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 17 Mar 2025 23:21:04 +0800 Subject: [PATCH 048/568] Defer captcha script loading (#33919) Fix #33899 (cherry picked from commit fdaf1cca65e118562b3cc2eb9e7c077b28f77213) --- templates/user/auth/captcha.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl index 29f8ab07a2..b2deb5a2c9 100644 --- a/templates/user/auth/captcha.tmpl +++ b/templates/user/auth/captcha.tmpl @@ -11,12 +11,12 @@
- + {{else if eq .CaptchaType "hcaptcha"}}
- + {{else if eq .CaptchaType "mcaptcha"}}
@@ -26,5 +26,5 @@
- + {{end}}{{end}} From 9d8624f3413a12b8490873aed40782fdff1bc021 Mon Sep 17 00:00:00 2001 From: charles <30816317+charles7668@users.noreply.github.com> Date: Sat, 22 Mar 2025 03:00:02 +0800 Subject: [PATCH 049/568] Fix file name could not be searched if the file was not a text file when using the Bleve indexer (#33959) Close #33828 --------- Co-authored-by: wxiaoguang (cherry picked from commit b956cee06f462c4f34a7911351b7c878ce890725) --- modules/indexer/code/bleve/bleve.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index f793b5db3f..6adee68a0d 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -179,7 +179,8 @@ func (b *Indexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserErro return err } else if !typesniffer.DetectContentType(fileContents).IsText() { // FIXME: UTF-16 files will probably fail here - return nil + // Even if the file is not recognized as a "text file", we could still put its name into the indexers to make the filename become searchable, while leave the content to empty. + fileContents = nil } if _, err = batchReader.Discard(1); err != nil { From 9018e5bc1988e9502ec88c57d49aa8176e2fbba3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 21 Mar 2025 21:48:06 +0100 Subject: [PATCH 050/568] Cover `go.mod` and `go.sum` in `.editorconfig` (#33960) These files were previously set to use spaces for indendation but they are supposed to use tabs, so set this in editorconfig. (cherry picked from commit d1a755e5b7c676750f3dfad2254e047e2d23c4ac) --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index a547e8a585..5476eb02fb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,9 @@ insert_final_newline = true [{*.{go,tmpl,html},Makefile,go.mod}] indent_style = tab +[go.*] +indent_style = tab + [templates/custom/*.tmpl] insert_final_newline = false From f68d49cb9e88a309d4d4f1ed6fc97b0593d3d444 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 23 Mar 2025 20:53:30 -0700 Subject: [PATCH 051/568] Move ParseBool to optional (#33979) (cherry picked from commit 25b6f388651c893ecafce918f27bef7e4ae9a967) --- modules/optional/option.go | 11 +++++++++++ modules/optional/option_test.go | 13 +++++++++++++ modules/setting/setting.go | 4 ++-- modules/util/util.go | 11 ----------- modules/util/util_test.go | 14 -------------- routers/web/admin/users.go | 11 +++++------ 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/modules/optional/option.go b/modules/optional/option.go index af9e5ac852..ccbad259c2 100644 --- a/modules/optional/option.go +++ b/modules/optional/option.go @@ -3,6 +3,8 @@ package optional +import "strconv" + type Option[T any] []T func None[T any]() Option[T] { @@ -43,3 +45,12 @@ func (o Option[T]) ValueOrDefault(v T) T { } return v } + +// ParseBool get the corresponding optional.Option[bool] of a string using strconv.ParseBool +func ParseBool(s string) Option[bool] { + v, e := strconv.ParseBool(s) + if e != nil { + return None[bool]() + } + return Some(v) +} diff --git a/modules/optional/option_test.go b/modules/optional/option_test.go index f6d22d2431..a674caf633 100644 --- a/modules/optional/option_test.go +++ b/modules/optional/option_test.go @@ -57,3 +57,16 @@ func TestOption(t *testing.T) { assert.True(t, opt3.Has()) assert.Equal(t, int(1), opt3.Value()) } + +func Test_ParseBool(t *testing.T) { + assert.Equal(t, optional.None[bool](), optional.ParseBool("")) + assert.Equal(t, optional.None[bool](), optional.ParseBool("x")) + + assert.Equal(t, optional.Some(false), optional.ParseBool("0")) + assert.Equal(t, optional.Some(false), optional.ParseBool("f")) + assert.Equal(t, optional.Some(false), optional.ParseBool("False")) + + assert.Equal(t, optional.Some(true), optional.ParseBool("1")) + assert.Equal(t, optional.Some(true), optional.ParseBool("t")) + assert.Equal(t, optional.Some(true), optional.ParseBool("True")) +} diff --git a/modules/setting/setting.go b/modules/setting/setting.go index eb7b9e9373..80db4dfa3c 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -12,8 +12,8 @@ import ( "time" "forgejo.org/modules/log" + "forgejo.org/modules/optional" "forgejo.org/modules/user" - "forgejo.org/modules/util" ) var ForgejoVersion = "1.0.0" @@ -162,7 +162,7 @@ func loadRunModeFrom(rootCfg ConfigProvider) { // The following is a purposefully undocumented option. Please do not run Forgejo as root. It will only cause future headaches. // Please don't use root as a bandaid to "fix" something that is broken, instead the broken thing should instead be fixed properly. unsafeAllowRunAsRoot := ConfigSectionKeyBool(rootSec, "I_AM_BEING_UNSAFE_RUNNING_AS_ROOT") - unsafeAllowRunAsRoot = unsafeAllowRunAsRoot || util.OptionalBoolParse(os.Getenv("GITEA_I_AM_BEING_UNSAFE_RUNNING_AS_ROOT")).Value() + unsafeAllowRunAsRoot = unsafeAllowRunAsRoot || optional.ParseBool(os.Getenv("GITEA_I_AM_BEING_UNSAFE_RUNNING_AS_ROOT")).Value() RunMode = os.Getenv("GITEA_RUN_MODE") if RunMode == "" { RunMode = rootSec.Key("RUN_MODE").MustString("prod") diff --git a/modules/util/util.go b/modules/util/util.go index da405c9c4b..fc3fcc35f0 100644 --- a/modules/util/util.go +++ b/modules/util/util.go @@ -14,22 +14,11 @@ import ( "strconv" "strings" - "forgejo.org/modules/optional" - "golang.org/x/crypto/ssh" "golang.org/x/text/cases" "golang.org/x/text/language" ) -// OptionalBoolParse get the corresponding optional.Option[bool] of a string using strconv.ParseBool -func OptionalBoolParse(s string) optional.Option[bool] { - v, e := strconv.ParseBool(s) - if e != nil { - return optional.None[bool]() - } - return optional.Some(v) -} - // IsEmptyString checks if the provided string is empty func IsEmptyString(s string) bool { return len(strings.TrimSpace(s)) == 0 diff --git a/modules/util/util_test.go b/modules/util/util_test.go index d2fef1a035..61f98de88a 100644 --- a/modules/util/util_test.go +++ b/modules/util/util_test.go @@ -11,7 +11,6 @@ import ( "strings" "testing" - "forgejo.org/modules/optional" "forgejo.org/modules/test" "forgejo.org/modules/util" @@ -181,19 +180,6 @@ func Test_RandomBytes(t *testing.T) { assert.NotEqual(t, bytes3, bytes4) } -func TestOptionalBoolParse(t *testing.T) { - assert.Equal(t, optional.None[bool](), util.OptionalBoolParse("")) - assert.Equal(t, optional.None[bool](), util.OptionalBoolParse("x")) - - assert.Equal(t, optional.Some(false), util.OptionalBoolParse("0")) - assert.Equal(t, optional.Some(false), util.OptionalBoolParse("f")) - assert.Equal(t, optional.Some(false), util.OptionalBoolParse("False")) - - assert.Equal(t, optional.Some(true), util.OptionalBoolParse("1")) - assert.Equal(t, optional.Some(true), util.OptionalBoolParse("t")) - assert.Equal(t, optional.Some(true), util.OptionalBoolParse("True")) -} - // Test case for any function which accepts and returns a single string. type StringTest struct { in, out string diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index f53a0197cb..cefdfadc53 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -22,7 +22,6 @@ import ( "forgejo.org/modules/log" "forgejo.org/modules/optional" "forgejo.org/modules/setting" - "forgejo.org/modules/util" "forgejo.org/modules/validation" "forgejo.org/modules/web" "forgejo.org/routers/web/explore" @@ -77,11 +76,11 @@ func Users(ctx *context.Context) { PageSize: setting.UI.Admin.UserPagingNum, }, SearchByEmail: true, - IsActive: util.OptionalBoolParse(statusFilterMap["is_active"]), - IsAdmin: util.OptionalBoolParse(statusFilterMap["is_admin"]), - IsRestricted: util.OptionalBoolParse(statusFilterMap["is_restricted"]), - IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]), - IsProhibitLogin: util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]), + IsActive: optional.ParseBool(statusFilterMap["is_active"]), + IsAdmin: optional.ParseBool(statusFilterMap["is_admin"]), + IsRestricted: optional.ParseBool(statusFilterMap["is_restricted"]), + IsTwoFactorEnabled: optional.ParseBool(statusFilterMap["is_2fa_enabled"]), + IsProhibitLogin: optional.ParseBool(statusFilterMap["is_prohibit_login"]), IncludeReserved: true, // administrator needs to list all accounts include reserved, bot, remote ones Load2FAStatus: true, ExtraParamStrings: extraParamStrings, From 50f8563c6798d30f22e17d403014398bd7319f70 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 25 Mar 2025 00:20:08 -0700 Subject: [PATCH 052/568] Git client will follow 301 but 307 (#34005) Fix #28460 --------- Co-authored-by: wxiaoguang (cherry picked from commit 356b707dde00f61f806c8a27879830a1d9b5b895) --- services/context/repo.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/context/repo.go b/services/context/repo.go index 7c966e339f..369a94c870 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -361,7 +361,9 @@ func RedirectToRepo(ctx *Base, redirectRepoID int64) { if ctx.Req.URL.RawQuery != "" { redirectPath += "?" + ctx.Req.URL.RawQuery } - ctx.Redirect(path.Join(setting.AppSubURL, redirectPath), http.StatusTemporaryRedirect) + // Git client needs a 301 redirect by default to follow the new location + // It's not documentated in git documentation, but it's the behavior of git client + ctx.Redirect(path.Join(setting.AppSubURL, redirectPath), http.StatusMovedPermanently) } func repoAssignment(ctx *Context, repo *repo_model.Repository) { From 6d5fc194642239a994f2c1f1f170914880fcbb71 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 25 Mar 2025 19:24:48 +0100 Subject: [PATCH 053/568] Enable color output in govulncheck (#34012) Make `govulncheck` show color, which by default it doesn't for some reason. (cherry picked from commit 2089401653cb4d351aa6e0bb6a86d987d115acb8) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c28e4e92ca..0594ea8866 100644 --- a/Makefile +++ b/Makefile @@ -523,7 +523,7 @@ lint-yaml: .venv .PHONY: security-check security-check: - go run $(GOVULNCHECK_PACKAGE) ./... + go run $(GOVULNCHECK_PACKAGE) -show color ./... ### # Development and testing targets From adc2a215c15c598351474b03407c6b673142dcb5 Mon Sep 17 00:00:00 2001 From: Royce Remer Date: Wed, 26 Mar 2025 11:04:46 -0700 Subject: [PATCH 054/568] Fail mirroring more gracefully (#34002) * reuse recoverable error checks across mirror_pull * add new cases for 'cannot lock ref/not our ref' (race condition in fetch) and 'Unable to create/lock" * move lfs sync right after commit graph write, and before other maintenance which may fail * try a prune for 'broken reference' as well as 'not our ref' * always sync LFS right after commit graph write, and before other maintenance which may fail This handles a few cases where our very large and very active repositories could serve mirrored git refs, but be missing lfs files: ## Case 1 (multiple variants): Race condition in git fetch There was already a check for 'unable to resolve reference' on a failed git fetch, after which a git prune and then subsequent fetch are performed. This is to work around a race condition where the git remote tells Gitea about a ref for some HEAD of a branch, then fails a few seconds later because the remote branch was deleted, or the ref was updated (force push). There are two more variants to the error message you can get, but for the same kind of race condition. These *may* be related to the git binary version Gitea has access to (in my case, it was 2.48.1). ## Case 2: githttp.go can serve updated git refs before it's synced lfs oids There is probably a more aggressive refactor we could do here to have the cat-file loop use FETCH_HEAD instead of relying on the commit graphs to be committed locally (and thus serveable to clients of Gitea), but a simple reduction in the occurrences of this for me was to move the lfs sync block immediately after the commit-graph write and before any other time-consuming (or potentially erroring/exiting) blocks. --------- Co-authored-by: wxiaoguang (cherry picked from commit e0ad72e2233f885669c26d9063a91abd594fb9f6) --- services/mirror/mirror_pull.go | 40 ++++++++++++++----- .../{mirror_test.go => mirror_pull_test.go} | 28 +++++++++++++ 2 files changed, 57 insertions(+), 11 deletions(-) rename services/mirror/{mirror_test.go => mirror_pull_test.go} (56%) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index a63cbcf40c..c46323f283 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -244,6 +244,24 @@ func pruneBrokenReferences(ctx context.Context, return pruneErr } +// checkRecoverableSyncError takes an error message from a git fetch command and returns false if it should be a fatal/blocking error +func checkRecoverableSyncError(stderrMessage string) bool { + switch { + case strings.Contains(stderrMessage, "unable to resolve reference") && strings.Contains(stderrMessage, "reference broken"): + return true + case strings.Contains(stderrMessage, "remote error") && strings.Contains(stderrMessage, "not our ref"): + return true + case strings.Contains(stderrMessage, "cannot lock ref") && strings.Contains(stderrMessage, "but expected"): + return true + case strings.Contains(stderrMessage, "cannot lock ref") && strings.Contains(stderrMessage, "unable to resolve reference"): + return true + case strings.Contains(stderrMessage, "Unable to create") && strings.Contains(stderrMessage, ".lock"): + return true + default: + return false + } +} + // runSync returns true if sync finished without error. func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bool) { repoPath := m.Repo.RepoPath() @@ -286,7 +304,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo stdoutMessage := util.SanitizeCredentialURLs(stdout) // Now check if the error is a resolve reference due to broken reference - if strings.Contains(stderr, "unable to resolve reference") && strings.Contains(stderr, "reference broken") { + if checkRecoverableSyncError(stderr) { log.Warn("SyncMirrors [repo: %-v]: failed to update mirror repository due to broken references:\nStdout: %s\nStderr: %s\nErr: %v\nAttempting Prune", m.Repo, stdoutMessage, stderrMessage, err) err = nil @@ -337,6 +355,15 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo return nil, false } + if m.LFS && setting.LFS.StartServer { + log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo) + endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint) + lfsClient := lfs.NewClient(endpoint, nil) + if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil { + log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo, err) + } + } + log.Trace("SyncMirrors [repo: %-v]: syncing branches...", m.Repo) if _, err = repo_module.SyncRepoBranchesWithRepo(ctx, m.Repo, gitRepo, 0); err != nil { log.Error("SyncMirrors [repo: %-v]: failed to synchronize branches: %v", m.Repo, err) @@ -346,15 +373,6 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo if err = repo_module.SyncReleasesWithTags(ctx, m.Repo, gitRepo); err != nil { log.Error("SyncMirrors [repo: %-v]: failed to synchronize tags to releases: %v", m.Repo, err) } - - if m.LFS && setting.LFS.StartServer { - log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo) - endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint) - lfsClient := lfs.NewClient(endpoint, nil) - if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil { - log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo, err) - } - } gitRepo.Close() log.Trace("SyncMirrors [repo: %-v]: updating size of repository", m.Repo) @@ -382,7 +400,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo stdoutMessage := util.SanitizeCredentialURLs(stdout) // Now check if the error is a resolve reference due to broken reference - if strings.Contains(stderrMessage, "unable to resolve reference") && strings.Contains(stderrMessage, "reference broken") { + if checkRecoverableSyncError(stderrMessage) { log.Warn("SyncMirrors [repo: %-v Wiki]: failed to update mirror wiki repository due to broken references:\nStdout: %s\nStderr: %s\nErr: %v\nAttempting Prune", m.Repo, stdoutMessage, stderrMessage, err) err = nil diff --git a/services/mirror/mirror_test.go b/services/mirror/mirror_pull_test.go similarity index 56% rename from services/mirror/mirror_test.go rename to services/mirror/mirror_pull_test.go index 60565b8c5e..97859be5b0 100644 --- a/services/mirror/mirror_test.go +++ b/services/mirror/mirror_pull_test.go @@ -64,3 +64,31 @@ func Test_parseRemoteUpdateOutput(t *testing.T) { assert.Equal(t, "1c97ebc746", results[9].oldCommitID) assert.Equal(t, "976d27d52f", results[9].newCommitID) } + +func Test_checkRecoverableSyncError(t *testing.T) { + cases := []struct { + recoverable bool + message string + }{ + // A race condition in http git-fetch where certain refs were listed on the remote and are no longer there, would exit status 128 + {true, "fatal: remote error: upload-pack: not our ref 988881adc9fc3655077dc2d4d757d480b5ea0e11"}, + // A race condition where a local gc/prune removes a named ref during a git-fetch would exit status 1 + {true, "cannot lock ref 'refs/pull/123456/merge': unable to resolve reference 'refs/pull/134153/merge'"}, + // A race condition in http git-fetch where named refs were listed on the remote and are no longer there + {true, "error: cannot lock ref 'refs/remotes/origin/foo': unable to resolve reference 'refs/remotes/origin/foo': reference broken"}, + // A race condition in http git-fetch where named refs were force-pushed during the update, would exit status 128 + {true, "error: cannot lock ref 'refs/pull/123456/merge': is at 988881adc9fc3655077dc2d4d757d480b5ea0e11 but expected 7f894307ffc9553edbd0b671cab829786866f7b2"}, + // A race condition with other local git operations, such as git-maintenance, would exit status 128 (well, "Unable" the "U" is uppercase) + {true, "fatal: Unable to create '/data/gitea-repositories/foo-org/bar-repo.git/./objects/info/commit-graphs/commit-graph-chain.lock': File exists."}, + // Missing or unauthorized credentials, would exit status 128 + {false, "fatal: Authentication failed for 'https://example.com/foo-does-not-exist/bar.git/'"}, + // A non-existent remote repository, would exit status 128 + {false, "fatal: Could not read from remote repository."}, + // A non-functioning proxy, would exit status 128 + {false, "fatal: unable to access 'https://example.com/foo-does-not-exist/bar.git/': Failed to connect to configured-https-proxy port 1080 after 0 ms: Couldn't connect to server"}, + } + + for _, c := range cases { + assert.Equal(t, c.recoverable, checkRecoverableSyncError(c.message), "test case: %s", c.message) + } +} From b2963548732d61473a8c7ee32da997bec5b25cdc Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Mar 2025 21:04:40 -0700 Subject: [PATCH 055/568] Hide activity contributors, recent commits and code frequrency left tabs if there is no code permission (#34053) When a team have no code unit permission of a repository, the member of the team should not view activity contributors, recent commits and code frequrency. --------- Co-authored-by: wxiaoguang (cherry picked from commit 49899070cd600e7b7bd31a750f4d49de1722db23) --- routers/web/repo/code_frequency.go | 2 +- routers/web/repo/recent_commits.go | 15 --------------- routers/web/web.go | 2 +- templates/repo/navbar.tmpl | 22 +++++++++++++--------- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go index 04009b4afa..44c07e617e 100644 --- a/routers/web/repo/code_frequency.go +++ b/routers/web/repo/code_frequency.go @@ -34,7 +34,7 @@ func CodeFrequencyData(ctx *context.Context) { ctx.Status(http.StatusAccepted) return } - ctx.ServerError("GetCodeFrequencyData", err) + ctx.ServerError("GetContributorStats", err) } else { ctx.JSON(http.StatusOK, contributorStats["total"].Weeks) } diff --git a/routers/web/repo/recent_commits.go b/routers/web/repo/recent_commits.go index 6154de7377..211b1b2b12 100644 --- a/routers/web/repo/recent_commits.go +++ b/routers/web/repo/recent_commits.go @@ -4,12 +4,10 @@ package repo import ( - "errors" "net/http" "forgejo.org/modules/base" "forgejo.org/services/context" - contributors_service "forgejo.org/services/repository" ) const ( @@ -26,16 +24,3 @@ func RecentCommits(ctx *context.Context) { ctx.HTML(http.StatusOK, tplRecentCommits) } - -// RecentCommitsData returns JSON of recent commits data -func RecentCommitsData(ctx *context.Context) { - if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil { - if errors.Is(err, contributors_service.ErrAwaitGeneration) { - ctx.Status(http.StatusAccepted) - return - } - ctx.ServerError("RecentCommitsData", err) - } else { - ctx.JSON(http.StatusOK, contributorStats["total"].Weeks) - } -} diff --git a/routers/web/web.go b/routers/web/web.go index 5f0dfb64d2..58aa5d8766 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1455,7 +1455,7 @@ func registerRoutes(m *web.Route) { }, repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypeCode)) m.Group("/recent-commits", func() { m.Get("", repo.RecentCommits) - m.Get("/data", repo.RecentCommitsData) + m.Get("/data", repo.CodeFrequencyData) }, repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypeCode)) }, context.RepoRef(), context.RequireRepoReaderOr(unit.TypeCode, unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases)) diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl index b2471dc17e..7536b96c63 100644 --- a/templates/repo/navbar.tmpl +++ b/templates/repo/navbar.tmpl @@ -1,14 +1,18 @@ +{{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} +
{{ctx.Locale.Tr "repo.activity.navbar.pulse"}} - - {{ctx.Locale.Tr "repo.activity.navbar.contributors"}} - - - {{ctx.Locale.Tr "repo.activity.navbar.code_frequency"}} - - - {{ctx.Locale.Tr "repo.activity.navbar.recent_commits"}} - + {{if $canReadCode}} + + {{ctx.Locale.Tr "repo.activity.navbar.contributors"}} + + + {{ctx.Locale.Tr "repo.activity.navbar.code_frequency"}} + + + {{ctx.Locale.Tr "repo.activity.navbar.recent_commits"}} + + {{end}}
From 8fdcde5f22538f5a61ac2ad8f804b8fa3c6e0dbd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 00:44:50 +0000 Subject: [PATCH 056/568] Update linters to v8.29.0 (forgejo) (#7406) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 100 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index f45893a1ee..4c14304b94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,7 +67,7 @@ "@stoplight/spectral-cli": "6.14.3", "@stylistic/eslint-plugin-js": "4.2.0", "@stylistic/stylelint-plugin": "3.1.2", - "@typescript-eslint/parser": "8.28.0", + "@typescript-eslint/parser": "8.29.0", "@vitejs/plugin-vue": "5.2.3", "@vitest/coverage-v8": "3.0.9", "@vitest/eslint-plugin": "1.1.38", @@ -98,7 +98,7 @@ "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", "typescript": "5.7.3", - "typescript-eslint": "8.28.0", + "typescript-eslint": "8.29.0", "vite-string-plugin": "1.3.4", "vitest": "3.0.9" }, @@ -3081,17 +3081,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.28.0.tgz", - "integrity": "sha512-lvFK3TCGAHsItNdWZ/1FkvpzCxTHUVuFrdnOGLMa0GGCFIbCgQWVk3CzCGdA7kM3qGVc+dfW9tr0Z/sHnGDFyg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz", + "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.28.0", - "@typescript-eslint/type-utils": "8.28.0", - "@typescript-eslint/utils": "8.28.0", - "@typescript-eslint/visitor-keys": "8.28.0", + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/type-utils": "8.29.0", + "@typescript-eslint/utils": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3111,16 +3111,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.28.0.tgz", - "integrity": "sha512-LPcw1yHD3ToaDEoljFEfQ9j2xShY367h7FZ1sq5NJT9I3yj4LHer1Xd1yRSOdYy9BpsrxU7R+eoDokChYM53lQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz", + "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.28.0", - "@typescript-eslint/types": "8.28.0", - "@typescript-eslint/typescript-estree": "8.28.0", - "@typescript-eslint/visitor-keys": "8.28.0", + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/typescript-estree": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "debug": "^4.3.4" }, "engines": { @@ -3136,14 +3136,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.28.0.tgz", - "integrity": "sha512-u2oITX3BJwzWCapoZ/pXw6BCOl8rJP4Ij/3wPoGvY8XwvXflOzd1kLrDUUUAIEdJSFh+ASwdTHqtan9xSg8buw==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz", + "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.28.0", - "@typescript-eslint/visitor-keys": "8.28.0" + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3154,14 +3154,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.28.0.tgz", - "integrity": "sha512-oRoXu2v0Rsy/VoOGhtWrOKDiIehvI+YNrDk5Oqj40Mwm0Yt01FC/Q7nFqg088d3yAsR1ZcZFVfPCTTFCe/KPwg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz", + "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.28.0", - "@typescript-eslint/utils": "8.28.0", + "@typescript-eslint/typescript-estree": "8.29.0", + "@typescript-eslint/utils": "8.29.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -3178,9 +3178,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.28.0.tgz", - "integrity": "sha512-bn4WS1bkKEjx7HqiwG2JNB3YJdC1q6Ue7GyGlwPHyt0TnVq6TtD/hiOdTZt71sq0s7UzqBFXD8t8o2e63tXgwA==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz", + "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==", "dev": true, "license": "MIT", "engines": { @@ -3192,14 +3192,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.28.0.tgz", - "integrity": "sha512-H74nHEeBGeklctAVUvmDkxB1mk+PAZ9FiOMPFncdqeRBXxk1lWSYraHw8V12b7aa6Sg9HOBNbGdSHobBPuQSuA==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz", + "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.28.0", - "@typescript-eslint/visitor-keys": "8.28.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -3235,16 +3235,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.28.0.tgz", - "integrity": "sha512-OELa9hbTYciYITqgurT1u/SzpQVtDLmQMFzy/N8pQE+tefOyCWT79jHsav294aTqV1q1u+VzqDGbuujvRYaeSQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz", + "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.28.0", - "@typescript-eslint/types": "8.28.0", - "@typescript-eslint/typescript-estree": "8.28.0" + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/typescript-estree": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3259,13 +3259,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.28.0.tgz", - "integrity": "sha512-hbn8SZ8w4u2pRwgQ1GlUrPKE+t2XvcCW5tTRF7j6SMYIuYG37XuzIW44JCZPa36evi0Oy2SnM664BlIaAuQcvg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz", + "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/types": "8.29.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -14009,15 +14009,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.28.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.28.0.tgz", - "integrity": "sha512-jfZtxJoHm59bvoCMYCe2BM0/baMswRhMmYhy+w6VfcyHrjxZ0OJe0tGasydCpIpA+A/WIJhTyZfb3EtwNC/kHQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz", + "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.28.0", - "@typescript-eslint/parser": "8.28.0", - "@typescript-eslint/utils": "8.28.0" + "@typescript-eslint/eslint-plugin": "8.29.0", + "@typescript-eslint/parser": "8.29.0", + "@typescript-eslint/utils": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/package.json b/package.json index 7dbc283f50..6695686be2 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@stoplight/spectral-cli": "6.14.3", "@stylistic/eslint-plugin-js": "4.2.0", "@stylistic/stylelint-plugin": "3.1.2", - "@typescript-eslint/parser": "8.28.0", + "@typescript-eslint/parser": "8.29.0", "@vitejs/plugin-vue": "5.2.3", "@vitest/coverage-v8": "3.0.9", "@vitest/eslint-plugin": "1.1.38", @@ -97,7 +97,7 @@ "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", "typescript": "5.7.3", - "typescript-eslint": "8.28.0", + "typescript-eslint": "8.29.0", "vite-string-plugin": "1.3.4", "vitest": "3.0.9" }, From dde7c4a7706ded56d706cff331ac8326170abd07 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 1 Apr 2025 03:55:34 +0200 Subject: [PATCH 057/568] chore: add new `no-jquery` rules Were added in version v3.1.0. --- eslint.config.mjs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eslint.config.mjs b/eslint.config.mjs index 17f461a8f4..035c70a338 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -318,6 +318,7 @@ export default tseslint.config( 'no-jquery/no-data': [0], 'no-jquery/no-deferred': [2], 'no-jquery/no-delegate': [2], + 'no-jquery/no-done-fail': [2], 'no-jquery/no-each-collection': [0], 'no-jquery/no-each-util': [0], 'no-jquery/no-each': [0], @@ -331,6 +332,7 @@ export default tseslint.config( 'no-jquery/no-find-collection': [0], 'no-jquery/no-find-util': [2], 'no-jquery/no-find': [0], + 'no-jquery/no-fx': [2], 'no-jquery/no-fx-interval': [2], 'no-jquery/no-global-eval': [2], 'no-jquery/no-global-selector': [0], From 9eb67ba8eded4d64a4a21e641e6c28a1e70f3830 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 1 Apr 2025 03:58:09 +0200 Subject: [PATCH 058/568] chore: enable `no-jquery/no-sizzle` Don't rely on Jquery's CSS selector engine. --- eslint.config.mjs | 2 +- web_src/js/features/comp/ReactionSelector.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 035c70a338..1b130cd2e6 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -376,7 +376,7 @@ export default tseslint.config( 'no-jquery/no-selector-prop': [2], 'no-jquery/no-serialize': [2], 'no-jquery/no-size': [2], - 'no-jquery/no-sizzle': [0], + 'no-jquery/no-sizzle': [2], 'no-jquery/no-slide': [2], 'no-jquery/no-sub': [2], 'no-jquery/no-support': [2], diff --git a/web_src/js/features/comp/ReactionSelector.js b/web_src/js/features/comp/ReactionSelector.js index fd4601fb91..357a33f469 100644 --- a/web_src/js/features/comp/ReactionSelector.js +++ b/web_src/js/features/comp/ReactionSelector.js @@ -23,7 +23,7 @@ export function initCompReactionSelector($parent) { $react.remove(); } if (!data.empty) { - const $attachments = $content.find('.segment.bottom:first'); + const $attachments = $content.find('.segment.bottom').first(); $react = $(data.html); if ($attachments.length > 0) { $react.insertBefore($attachments); From c124014115c477e4577d154555b72bb1f12d2640 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 1 Apr 2025 03:59:12 +0200 Subject: [PATCH 059/568] chore: enable `no-jquery/no-each-util` - No longer allow `$.each`. This can easily be done with vanilla javascript. --- eslint.config.mjs | 2 +- web_src/js/features/org-team.js | 5 ++--- web_src/js/features/repo-issue.js | 8 ++++---- web_src/js/features/repo-settings.js | 5 ++--- web_src/js/features/repo-template.js | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 1b130cd2e6..c7d01c79da 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -320,7 +320,7 @@ export default tseslint.config( 'no-jquery/no-delegate': [2], 'no-jquery/no-done-fail': [2], 'no-jquery/no-each-collection': [0], - 'no-jquery/no-each-util': [0], + 'no-jquery/no-each-util': [2], 'no-jquery/no-each': [0], 'no-jquery/no-error-shorthand': [2], 'no-jquery/no-error': [2], diff --git a/web_src/js/features/org-team.js b/web_src/js/features/org-team.js index 9b059b3a46..fe816da865 100644 --- a/web_src/js/features/org-team.js +++ b/web_src/js/features/org-team.js @@ -10,13 +10,12 @@ export function initOrgTeamSearchRepoBox() { url: `${appSubUrl}/repo/search?q={query}&uid=${$searchRepoBox.data('uid')}`, onResponse(response) { const items = []; - $.each(response.data, (_i, item) => { + for (const item of response.data) { items.push({ title: item.repository.full_name.split('/')[1], description: item.repository.full_name, }); - }); - + } return {results: items}; }, }, diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index c28bf08442..77ceb0401c 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -139,7 +139,7 @@ export function initRepoIssueSidebarList() { const filteredResponse = {success: true, results: []}; const currIssueId = $('#new-dependency-drop-list').data('issue-id'); // Parse the response from the api to work with our dropdown - $.each(response, (_i, issue) => { + for (const [_, issue] of Object.entries(response)) { // Don't list current issue in the dependency list. if (issue.id === currIssueId) { return; @@ -149,7 +149,7 @@ export function initRepoIssueSidebarList() { }
${htmlEscape(issue.repository.full_name)}
`, value: issue.id, }); - }); + } return filteredResponse; }, cache: false, @@ -345,12 +345,12 @@ export function initRepoIssueReferenceRepositorySearch() { url: `${appSubUrl}/repo/search?q={query}&limit=20`, onResponse(response) { const filteredResponse = {success: true, results: []}; - $.each(response.data, (_r, repo) => { + for (const repo of response.data) { filteredResponse.results.push({ name: htmlEscape(repo.repository.full_name), value: repo.repository.full_name, }); - }); + } return filteredResponse; }, cache: false, diff --git a/web_src/js/features/repo-settings.js b/web_src/js/features/repo-settings.js index 52c5de2bfa..47ada545de 100644 --- a/web_src/js/features/repo-settings.js +++ b/web_src/js/features/repo-settings.js @@ -55,13 +55,12 @@ export function initRepoSettingSearchTeamBox() { headers: {'X-Csrf-Token': csrfToken}, onResponse(response) { const items = []; - $.each(response.data, (_i, item) => { + for (const item of response.data) { items.push({ title: item.name, description: `${item.permission} access`, // TODO: translate this string }); - }); - + } return {results: items}; }, }, diff --git a/web_src/js/features/repo-template.js b/web_src/js/features/repo-template.js index 5f63e8b3ba..5f01be5ad3 100644 --- a/web_src/js/features/repo-template.js +++ b/web_src/js/features/repo-template.js @@ -32,12 +32,12 @@ export function initRepoTemplateSearch() { value: '', }); // Parse the response from the api to work with our dropdown - $.each(response.data, (_r, repo) => { + for (const repo of response.data) { filteredResponse.results.push({ name: htmlEscape(repo.repository.full_name), value: repo.repository.id, }); - }); + } return filteredResponse; }, cache: false, From 9420d3d0a5caad8968aaaa588a0c2ec84fc4340a Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 1 Apr 2025 04:41:57 +0200 Subject: [PATCH 060/568] chore: enable `no-jquery/no-trigger` - A lot of substitution to `.requestSubmit()`. - Where possible, rewrite some other jquery to vanilla javascript to ease the linter fix. --- eslint.config.mjs | 2 +- .../js/components/RepoBranchTagSelector.vue | 4 ++-- web_src/js/features/admin/common.js | 10 ++++++---- web_src/js/features/common-global.js | 4 ++-- web_src/js/features/comp/LabelEdit.js | 4 ++-- web_src/js/features/repo-code.js | 3 ++- web_src/js/features/repo-common.js | 16 +++++++-------- web_src/js/features/repo-editor.js | 2 +- web_src/js/features/repo-issue.js | 20 +++++++++---------- 9 files changed, 34 insertions(+), 31 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index c7d01c79da..cb11195d4d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -381,7 +381,7 @@ export default tseslint.config( 'no-jquery/no-sub': [2], 'no-jquery/no-support': [2], 'no-jquery/no-text': [0], - 'no-jquery/no-trigger': [0], + 'no-jquery/no-trigger': [2], 'no-jquery/no-trim': [2], 'no-jquery/no-type': [2], 'no-jquery/no-unique': [2], diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index cd86499ddc..12ff564aa7 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -98,14 +98,14 @@ const sfc = { $(`#${this.branchForm} input[name="refType"]`).val('branch'); } if (this.submitForm) { - $(`#${this.branchForm}`).trigger('submit'); + document.getElementById(this.branchForm).requestSubmit(); } this.menuVisible = false; } }, createNewBranch() { if (!this.showCreateNewBranch) return; - $(this.$refs.newBranchForm).trigger('submit'); + this.$refs.newBranchForm.requestSubmit(); }, focusSearchField() { nextTick(() => { diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js index 9934c3dd17..b46f4f8a74 100644 --- a/web_src/js/features/admin/common.js +++ b/web_src/js/features/admin/common.js @@ -175,7 +175,7 @@ export function initAdminCommon() { onUsePagedSearchChange(); } }); - $('#auth_type').trigger('change'); + document.getElementById('auth_type').dispatchEvent(new Event('change')); document.getElementById('security_protocol')?.addEventListener('change', onSecurityProtocolChange); document.getElementById('use_paged_search')?.addEventListener('change', onUsePagedSearchChange); document.getElementById('oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true)); @@ -200,10 +200,12 @@ export function initAdminCommon() { } if (document.querySelector('.admin.authentication')) { - $('#auth_name').on('input', function () { + const authNameEl = document.getElementById('auth_name'); + authNameEl.addEventListener('input', (el) => { // appSubUrl is either empty or is a path that starts with `/` and doesn't have a trailing slash. - document.getElementById('oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(this.value)}/callback`; - }).trigger('input'); + document.getElementById('oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(el.target.value)}/callback`; + }); + authNameEl.dispatchEvent(new Event('input')); } // Notice diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 7848a14b66..7d553f9692 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -57,7 +57,7 @@ export function initGlobalEnterQuickSubmit() { export function initGlobalButtonClickOnEnter() { $(document).on('keypress', 'div.ui.button,span.ui.button', (e) => { if (e.code === ' ' || e.code === 'Enter') { - $(e.target).trigger('click'); + e.target.click(); e.preventDefault(); } }); @@ -314,7 +314,7 @@ export function initGlobalLinkActions() { closable: false, onApprove: async () => { if ($this.data('type') === 'form') { - $($this.data('form')).trigger('submit'); + document.querySelector($this.data('form')).requestSubmit(); return; } if ($this[0].getAttribute('hx-confirm')) { diff --git a/web_src/js/features/comp/LabelEdit.js b/web_src/js/features/comp/LabelEdit.js index 2cc75cc6b0..a97c7fe34c 100644 --- a/web_src/js/features/comp/LabelEdit.js +++ b/web_src/js/features/comp/LabelEdit.js @@ -38,7 +38,7 @@ export function initCompLabelEdit(selector) { form.reportValidity(); return false; } - $('.new-label.form').trigger('submit'); + document.querySelector('.new-label.form').requestSubmit(); }, }).modal('show'); return false; @@ -75,7 +75,7 @@ export function initCompLabelEdit(selector) { form.reportValidity(); return false; } - $('.edit-label.form').trigger('submit'); + document.querySelector('.edit-label.form').requestSubmit(); }, }).modal('show'); return false; diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js index 794cc38010..2ff9e611ae 100644 --- a/web_src/js/features/repo-code.js +++ b/web_src/js/features/repo-code.js @@ -184,7 +184,8 @@ export function initRepoCodeView() { $('html, body').scrollTop($first.offset().top - 200); } } - }).trigger('hashchange'); + }); + window.dispatchEvent(new Event('hashchange')); } $(document).on('click', '.fold-file', ({currentTarget}) => { invertFileFolding(currentTarget.closest('.file-content'), currentTarget); diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 88aa93d850..02a0499f95 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -33,25 +33,25 @@ export function initRepoArchiveLinks() { } export function initRepoCloneLink() { - const $repoCloneSsh = $('#repo-clone-ssh'); - const $repoCloneHttps = $('#repo-clone-https'); - const $inputLink = $('#repo-clone-url'); + const repoCloneSSH = document.getElementById('repo-clone-ssh'); + const repoCloneHTTPS = document.getElementById('repo-clone-https'); + const inputLink = document.getElementById('repo-clone-url'); - if ((!$repoCloneSsh.length && !$repoCloneHttps.length) || !$inputLink.length) { + if ((!repoCloneSSH && !repoCloneHTTPS) || !inputLink) { return; } - $repoCloneSsh.on('click', () => { + repoCloneSSH.addEventListener('click', () => { localStorage.setItem('repo-clone-protocol', 'ssh'); window.updateCloneStates(); }); - $repoCloneHttps.on('click', () => { + repoCloneHTTPS.addEventListener('click', () => { localStorage.setItem('repo-clone-protocol', 'https'); window.updateCloneStates(); }); - $inputLink.on('focus', () => { - $inputLink.trigger('select'); + inputLink.addEventListener('focus', () => { + inputLink.select(); }); } diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js index 5b59b66f80..d3f5f2f8a9 100644 --- a/web_src/js/features/repo-editor.js +++ b/web_src/js/features/repo-editor.js @@ -185,7 +185,7 @@ export function initRepoEditor() { $('#edit-empty-content-modal') .modal({ onApprove() { - $('.edit.form').trigger('submit'); + document.querySelector('.edit.form').requestSubmit(); }, }) .modal('show'); diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 77ceb0401c..889687da3e 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -37,27 +37,27 @@ export function initRepoIssueTimeTracking() { $('.issue-start-time-modal').modal({ duration: 200, onApprove() { - $('#add_time_manual_form').trigger('submit'); + document.getElementById('add_time_manual_form').requestSubmit(); }, }).modal('show'); $('.issue-start-time-modal input').on('keydown', (e) => { if ((e.keyCode || e.key) === 13) { - $('#add_time_manual_form').trigger('submit'); + document.getElementById('add_time_manual_form').requestSubmit(); } }); }); $(document).on('click', '.issue-start-time, .issue-stop-time', () => { - $('#toggle_stopwatch_form').trigger('submit'); + document.getElementById('toggle_stopwatch_form').requestSubmit(); }); $(document).on('click', '.issue-cancel-time', () => { - $('#cancel_stopwatch_form').trigger('submit'); + document.getElementById('cancel_stopwatch_form').requestSubmit(); }); $(document).on('click', 'button.issue-delete-time', function () { const sel = `.issue-delete-time-modal[data-id="${$(this).data('id')}"]`; $(sel).modal({ duration: 200, onApprove() { - $(`${sel} form`).trigger('submit'); + document.getElementById(`${sel} form`).requestSubmit(); }, }).modal('show'); }); @@ -247,7 +247,7 @@ export function initRepoIssueDependencyDelete() { onApprove: () => { $('#removeDependencyID').val(id); $('#dependencyType').val(type); - $('#removeDependencyForm').trigger('submit'); + document.getElementById('removeDependencyForm').requestSubmit(); }, }).modal('show'); }); @@ -369,9 +369,9 @@ export function initRepoIssueWipTitle() { $('.title_wip_desc > a').on('click', (e) => { e.preventDefault(); - const $issueTitle = $('#issue_title'); - $issueTitle.trigger('focus'); - const value = $issueTitle.val().trim().toUpperCase(); + const issueTitleEl = document.getElementById('issue_title'); + issueTitleEl.focus(); + const value = issueTitleEl.value.trim().toUpperCase(); const wipPrefixes = $('.title_wip_desc').data('wip-prefixes'); for (const prefix of wipPrefixes) { @@ -380,7 +380,7 @@ export function initRepoIssueWipTitle() { } } - $issueTitle.val(`${wipPrefixes[0]} ${$issueTitle.val()}`); + issueTitleEl.value = `${wipPrefixes[0]} ${issueTitleEl.value}`; }); } From d9892e57bd65e0955a80344993ff98d471d15f18 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 1 Apr 2025 04:44:44 +0200 Subject: [PATCH 061/568] chore: enable `no-jquery/no-map-collection` No linter errors reported. --- eslint.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index cb11195d4d..f635a8b504 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -352,7 +352,7 @@ export default tseslint.config( 'no-jquery/no-live': [2], 'no-jquery/no-load-shorthand': [2], 'no-jquery/no-load': [2], - 'no-jquery/no-map-collection': [0], + 'no-jquery/no-map-collection': [2], 'no-jquery/no-map-util': [2], 'no-jquery/no-map': [2], 'no-jquery/no-merge': [2], From c9c8fb6501ddfdeeb297752c0a40fdfcd3cdc7ed Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 02:52:46 +0000 Subject: [PATCH 062/568] Update vitest monorepo to v3.1.1 (forgejo) (#7407) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 106 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c14304b94..e292568a83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "@stylistic/stylelint-plugin": "3.1.2", "@typescript-eslint/parser": "8.29.0", "@vitejs/plugin-vue": "5.2.3", - "@vitest/coverage-v8": "3.0.9", + "@vitest/coverage-v8": "3.1.1", "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", "eslint": "9.23.0", @@ -100,7 +100,7 @@ "typescript": "5.7.3", "typescript-eslint": "8.29.0", "vite-string-plugin": "1.3.4", - "vitest": "3.0.9" + "vitest": "3.1.1" }, "engines": { "node": ">= 20.0.0" @@ -3504,9 +3504,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.9.tgz", - "integrity": "sha512-15OACZcBtQ34keIEn19JYTVuMFTlFrClclwWjHo/IRPg/8ELpkgNTl0o7WLP9WO9XGH6+tip9CPYtEOrIDJvBA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.1.tgz", + "integrity": "sha512-MgV6D2dhpD6Hp/uroUoAIvFqA8AuvXEFBC2eepG3WFc1pxTfdk1LEqqkWoWhjz+rytoqrnUUCdf6Lzco3iHkLQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3519,7 +3519,7 @@ "istanbul-reports": "^3.1.7", "magic-string": "^0.30.17", "magicast": "^0.3.5", - "std-env": "^3.8.0", + "std-env": "^3.8.1", "test-exclude": "^7.0.1", "tinyrainbow": "^2.0.0" }, @@ -3527,8 +3527,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.0.9", - "vitest": "3.0.9" + "@vitest/browser": "3.1.1", + "vitest": "3.1.1" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -3568,14 +3568,14 @@ } }, "node_modules/@vitest/expect": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.9.tgz", - "integrity": "sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.1.tgz", + "integrity": "sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.9", - "@vitest/utils": "3.0.9", + "@vitest/spy": "3.1.1", + "@vitest/utils": "3.1.1", "chai": "^5.2.0", "tinyrainbow": "^2.0.0" }, @@ -3584,13 +3584,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.9.tgz", - "integrity": "sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.1.tgz", + "integrity": "sha512-bmpJJm7Y7i9BBELlLuuM1J1Q6EQ6K5Ye4wcyOpOMXMcePYKSIYlpcrCm4l/O6ja4VJA5G2aMJiuZkZdnxlC3SA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.9", + "@vitest/spy": "3.1.1", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -3638,9 +3638,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz", - "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.1.tgz", + "integrity": "sha512-dg0CIzNx+hMMYfNmSqJlLSXEmnNhMswcn3sXO7Tpldr0LiGmg3eXdLLhwkv2ZqgHb/d5xg5F7ezNFRA1fA13yA==", "dev": true, "license": "MIT", "dependencies": { @@ -3651,13 +3651,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.9.tgz", - "integrity": "sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.1.tgz", + "integrity": "sha512-X/d46qzJuEDO8ueyjtKfxffiXraPRfmYasoC4i5+mlLEJ10UvPb0XH5M9C3gWuxd7BAQhpK42cJgJtq53YnWVA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.0.9", + "@vitest/utils": "3.1.1", "pathe": "^2.0.3" }, "funding": { @@ -3665,13 +3665,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.9.tgz", - "integrity": "sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.1.tgz", + "integrity": "sha512-bByMwaVWe/+1WDf9exFxWWgAixelSdiwo2p33tpqIlM14vW7PRV5ppayVXtfycqze4Qhtwag5sVhX400MLBOOw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.9", + "@vitest/pretty-format": "3.1.1", "magic-string": "^0.30.17", "pathe": "^2.0.3" }, @@ -3690,9 +3690,9 @@ } }, "node_modules/@vitest/spy": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.9.tgz", - "integrity": "sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.1.tgz", + "integrity": "sha512-+EmrUOOXbKzLkTDwlsc/xrwOlPDXyVk3Z6P6K4oiCndxz7YLpp/0R0UsWVOKT0IXWjjBJuSMk6D27qipaupcvQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3703,13 +3703,13 @@ } }, "node_modules/@vitest/utils": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.9.tgz", - "integrity": "sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.1.tgz", + "integrity": "sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.9", + "@vitest/pretty-format": "3.1.1", "loupe": "^3.1.3", "tinyrainbow": "^2.0.0" }, @@ -14307,9 +14307,9 @@ } }, "node_modules/vite-node": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.9.tgz", - "integrity": "sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.1.tgz", + "integrity": "sha512-V+IxPAE2FvXpTCHXyNem0M+gWm6J7eRyWPR6vYoG/Gl+IscNOjXzztUhimQgTxaAoUoj40Qqimaa0NLIOOAH4w==", "dev": true, "license": "MIT", "dependencies": { @@ -14428,31 +14428,31 @@ } }, "node_modules/vitest": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.9.tgz", - "integrity": "sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.1.tgz", + "integrity": "sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "3.0.9", - "@vitest/mocker": "3.0.9", - "@vitest/pretty-format": "^3.0.9", - "@vitest/runner": "3.0.9", - "@vitest/snapshot": "3.0.9", - "@vitest/spy": "3.0.9", - "@vitest/utils": "3.0.9", + "@vitest/expect": "3.1.1", + "@vitest/mocker": "3.1.1", + "@vitest/pretty-format": "^3.1.1", + "@vitest/runner": "3.1.1", + "@vitest/snapshot": "3.1.1", + "@vitest/spy": "3.1.1", + "@vitest/utils": "3.1.1", "chai": "^5.2.0", "debug": "^4.4.0", - "expect-type": "^1.1.0", + "expect-type": "^1.2.0", "magic-string": "^0.30.17", "pathe": "^2.0.3", - "std-env": "^3.8.0", + "std-env": "^3.8.1", "tinybench": "^2.9.0", "tinyexec": "^0.3.2", "tinypool": "^1.0.2", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0", - "vite-node": "3.0.9", + "vite-node": "3.1.1", "why-is-node-running": "^2.3.0" }, "bin": { @@ -14468,8 +14468,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.0.9", - "@vitest/ui": "3.0.9", + "@vitest/browser": "3.1.1", + "@vitest/ui": "3.1.1", "happy-dom": "*", "jsdom": "*" }, diff --git a/package.json b/package.json index 6695686be2..a7e56a7d9e 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@stylistic/stylelint-plugin": "3.1.2", "@typescript-eslint/parser": "8.29.0", "@vitejs/plugin-vue": "5.2.3", - "@vitest/coverage-v8": "3.0.9", + "@vitest/coverage-v8": "3.1.1", "@vitest/eslint-plugin": "1.1.38", "@vue/test-utils": "2.4.6", "eslint": "9.23.0", @@ -99,7 +99,7 @@ "typescript": "5.7.3", "typescript-eslint": "8.29.0", "vite-string-plugin": "1.3.4", - "vitest": "3.0.9" + "vitest": "3.1.1" }, "browserslist": [ "defaults" From da62c2cac646b18142c205b4ba68b917fd0a9880 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Tue, 1 Apr 2025 15:55:56 +0000 Subject: [PATCH 063/568] chore(ui): remove ineffective class small in inline code preview (#7414) Followup to https://codeberg.org/forgejo/forgejo/pulls/2669 Ref https://codeberg.org/forgejo/forgejo/issues/5067 Since Forgejo v9 this class is overridden here by other CSS and is ineffective. But it looks ok and gives good visibility. If it needs to be re-implemed, it can be done via CSS, like: ```css .file-preview-box .header span {font-size:0.8rem;} ``` Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7414 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- modules/markup/file_preview.go | 2 +- modules/markup/html_test.go | 28 ++++++++++++++-------------- modules/markup/sanitizer.go | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go index 5499eff18c..8b1442ed08 100644 --- a/modules/markup/file_preview.go +++ b/modules/markup/file_preview.go @@ -341,7 +341,7 @@ func (p *FilePreview) CreateHTML(locale translation.Locale) *html.Node { psubtitle := &html.Node{ Type: html.ElementNode, Data: atom.Span.String(), - Attr: []html.Attribute{{Key: "class", Val: "text small grey"}}, + Attr: []html.Attribute{{Key: "class", Val: "text grey"}}, } psubtitle.AppendChild(&html.Node{ Type: html.RawNode, diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index d503796eb6..9d0c40c9e8 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -721,7 +721,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -755,7 +755,7 @@ func TestRender_FilePreview(t *testing.T) { `gogits/gogs – `+ `path/to/file.go`+ `
`+ - ``+ + ``+ `Lines 2 to 3 in gogits/gogs@190d949`+ ``+ `
`+ @@ -791,7 +791,7 @@ func TestRender_FilePreview(t *testing.T) { `gogits/gogs – `+ `single-line.txt`+ `
`+ - ``+ + ``+ `Line 1 in gogits/gogs@4c1aaf5`+ ``+ `
`+ @@ -834,7 +834,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -865,7 +865,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -898,7 +898,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -923,7 +923,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -954,7 +954,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -979,7 +979,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -1004,7 +1004,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -1039,7 +1039,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 1 to 2 in c991312`+ ``+ `
`+ @@ -1072,7 +1072,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 1 to 2 in c991312`+ ``+ `
`+ @@ -1107,7 +1107,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Lines 2 to 3 in 190d949`+ ``+ `
`+ @@ -1142,7 +1142,7 @@ func TestRender_FilePreview(t *testing.T) { ``+ - ``+ + ``+ `Line 1 in eeb243c`+ ``+ `
`+ diff --git a/modules/markup/sanitizer.go b/modules/markup/sanitizer.go index 7ff11f0844..384dd1fe94 100644 --- a/modules/markup/sanitizer.go +++ b/modules/markup/sanitizer.go @@ -122,7 +122,7 @@ func createDefaultPolicy() *bluemonday.Policy { policy.AllowAttrs("class").Matching(regexp.MustCompile("^ui table$")).OnElements("div") policy.AllowAttrs("class").Matching(regexp.MustCompile("^header$")).OnElements("div") policy.AllowAttrs("data-line-number").Matching(regexp.MustCompile("^[0-9]+$")).OnElements("span") - policy.AllowAttrs("class").Matching(regexp.MustCompile("^text small grey$")).OnElements("span") + policy.AllowAttrs("class").Matching(regexp.MustCompile("^text grey$")).OnElements("span") policy.AllowAttrs("class").Matching(regexp.MustCompile("^file-preview$")).OnElements("table") policy.AllowAttrs("class").Matching(regexp.MustCompile("^lines-escape$")).OnElements("td") policy.AllowAttrs("class").Matching(regexp.MustCompile("^toggle-escape-button btn interact-bg$")).OnElements("button") From 6ad625b0c173fef12d28890d1403f9b5030c5d5b Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Tue, 1 Apr 2025 16:14:38 +0000 Subject: [PATCH 064/568] feat(ui): make JS asset load error message translatable (#7388) - The 'Failed to load asset files from [...]' is now an translatable string. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7388 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- options/locale_next/locale_en-US.json | 3 +- templates/base/footer.tmpl | 2 +- tests/integration/common_navigation_test.go | 41 +++++++++++++++++++++ tests/integration/user_dashboard_test.go | 17 +-------- 4 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 tests/integration/common_navigation_test.go diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index e525598ed5..def49e1a58 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -17,5 +17,6 @@ "themes.names.forgejo-auto": "Forgejo (follow system theme)", "themes.names.forgejo-light": "Forgejo light", "themes.names.forgejo-dark": "Forgejo dark", - "error.not_found.title": "Page not found" + "error.not_found.title": "Page not found", + "alert.asset_load_failed": "Failed to load asset files from {path}. Please make sure the asset files can be accessed." } \ No newline at end of file diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index fed426a469..3c2def228a 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -13,7 +13,7 @@ {{template "base/footer_content" .}} - + {{template "custom/footer" .}} diff --git a/tests/integration/common_navigation_test.go b/tests/integration/common_navigation_test.go new file mode 100644 index 0000000000..93a2c15ece --- /dev/null +++ b/tests/integration/common_navigation_test.go @@ -0,0 +1,41 @@ +// Copyright 2024-2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package integration + +import ( + "fmt" + "net/http" + "strings" + "testing" + + "forgejo.org/models/unittest" + "forgejo.org/modules/translation" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +// This test verifies common elements that are visible on all pages but most +// likely to be first seen on `/` +func TestCommonNavigationElements(t *testing.T) { + require.NoError(t, unittest.PrepareTestDatabase()) + + session := loginUser(t, "user1") + locale := translation.NewLocale("en-US") + + response := session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK) + page := NewHTMLParser(t, response.Body) + + // Navbar + links := page.Find("#navbar .dropdown[data-tooltip-content='Create…'] .menu") + assert.Equal(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href='/repo/create']").Text())) + assert.Equal(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href='/repo/migrate']").Text())) + assert.Equal(t, locale.TrString("new_org.link"), strings.TrimSpace(links.Find("a[href='/org/create']").Text())) + + // After footer: index.js + page.AssertElement(t, "script[src^='/assets/js/index.js']", true) + onerror, _ := page.Find("script[src^='/assets/js/index.js']").Attr("onerror") + expected := fmt.Sprintf("alert('%s'.replace('{path}', this.src))", locale.TrString("alert.asset_load_failed")) + assert.Equal(t, expected, onerror) +} diff --git a/tests/integration/user_dashboard_test.go b/tests/integration/user_dashboard_test.go index 9e1e04c29f..b18f96c090 100644 --- a/tests/integration/user_dashboard_test.go +++ b/tests/integration/user_dashboard_test.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. +// Copyright 2024-2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: GPL-3.0-or-later package integration @@ -14,7 +14,6 @@ import ( unit_model "forgejo.org/models/unit" "forgejo.org/models/unittest" user_model "forgejo.org/models/user" - "forgejo.org/modules/translation" issue_service "forgejo.org/services/issue" files_service "forgejo.org/services/repository/files" "forgejo.org/tests" @@ -24,20 +23,6 @@ import ( "github.com/stretchr/testify/require" ) -func TestUserDashboardActionLinks(t *testing.T) { - require.NoError(t, unittest.PrepareTestDatabase()) - - session := loginUser(t, "user1") - locale := translation.NewLocale("en-US") - - response := session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK) - page := NewHTMLParser(t, response.Body) - links := page.Find("#navbar .dropdown[data-tooltip-content='Create…'] .menu") - assert.Equal(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href='/repo/create']").Text())) - assert.Equal(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href='/repo/migrate']").Text())) - assert.Equal(t, locale.TrString("new_org.link"), strings.TrimSpace(links.Find("a[href='/org/create']").Text())) -} - func TestUserDashboardFeedWelcome(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) From 61885a0eaaeb36d9506c18b0328a73377c06a457 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Apr 2025 18:34:02 +0000 Subject: [PATCH 065/568] Update dependency go to v1.24.2 (forgejo) (#7417) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7417 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a36ab38aa1..33ca017729 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module forgejo.org go 1.24 -toolchain go1.24.1 +toolchain go1.24.2 require ( code.forgejo.org/f3/gof3/v3 v3.10.6 From 18c38ed1f37ece7c5aba755fad616ac1a4a702c5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Apr 2025 00:44:39 +0000 Subject: [PATCH 066/568] Update module github.com/mattn/go-sqlite3 to v1.14.25 (forgejo) (#7424) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7424 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 33ca017729..f92cd9f3ad 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/lib/pq v1.10.9 github.com/markbates/goth v1.80.0 github.com/mattn/go-isatty v0.0.20 - github.com/mattn/go-sqlite3 v1.14.24 + github.com/mattn/go-sqlite3 v1.14.25 github.com/meilisearch/meilisearch-go v0.31.0 github.com/mholt/archiver/v3 v3.5.1 github.com/microcosm-cc/bluemonday v1.0.27 diff --git a/go.sum b/go.sum index 09cda25c31..e88f5c3112 100644 --- a/go.sum +++ b/go.sum @@ -1252,8 +1252,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= -github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.25 h1:rszkIulEvxqZ8JfFG4yWEZh5u9qAKeSOdea67p8kk6s= +github.com/mattn/go-sqlite3 v1.14.25/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/meilisearch/meilisearch-go v0.31.0 h1:yZRhY1qJqdH8h6GFZALGtkDLyj8f9v5aJpsNMyrUmnY= github.com/meilisearch/meilisearch-go v0.31.0/go.mod h1:aNtyuwurDg/ggxQIcKqWH6G9g2ptc8GyY7PLY4zMn/g= github.com/mholt/acmez/v3 v3.1.1 h1:Jh+9uKHkPxUJdxM16q5mOr+G2V0aqkuFtNA28ihCxhQ= From d656978818c8a5b82dd822b631854b168288cc8d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Apr 2025 10:43:36 +0000 Subject: [PATCH 067/568] Update module github.com/go-webauthn/webauthn to v0.12.3 (forgejo) (#7423) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7423 Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f92cd9f3ad..0f551f4c3f 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/go-openapi/spec v0.20.14 github.com/go-sql-driver/mysql v1.9.1 github.com/go-testfixtures/testfixtures/v3 v3.14.0 - github.com/go-webauthn/webauthn v0.12.2 + github.com/go-webauthn/webauthn v0.12.3 github.com/gobwas/glob v0.2.3 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 @@ -177,7 +177,7 @@ require ( github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/fxamacker/cbor/v2 v2.8.0 // indirect github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7 // indirect github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect @@ -190,7 +190,7 @@ require ( github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect github.com/go-openapi/swag v0.22.7 // indirect - github.com/go-webauthn/x v0.1.19 // indirect + github.com/go-webauthn/x v0.1.20 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect diff --git a/go.sum b/go.sum index e88f5c3112..889b829e88 100644 --- a/go.sum +++ b/go.sum @@ -895,8 +895,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= -github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU= +github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9 h1:j2TrkUG/NATGi/EQS+MvEoF79CxiRUmT16ErFroNcKI= github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9/go.mod h1:cJ9Ye0ZNSMN7RzZDBRY3E+8M3Bpf/R1JX22Ir9yX6WI= @@ -967,10 +967,10 @@ github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U= github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-testfixtures/testfixtures/v3 v3.14.0 h1:aRt5qyH2XjzFgCC5NizNs6QrzjO7rC4pQZ1oJpPIdo8= github.com/go-testfixtures/testfixtures/v3 v3.14.0/go.mod h1:HHb6Yd8spzm6aFZU6jwBj9qFvVUNNkx5nGbjG4UHeOE= -github.com/go-webauthn/webauthn v0.12.2 h1:yLaNPgBUEXDQtWnOjhsGhMMCEWbXwjg/aNkC8riJQI8= -github.com/go-webauthn/webauthn v0.12.2/go.mod h1:Q8SZPPj4sZ469fNTcQXxRpzJOdb30jQrn/36FX8jilA= -github.com/go-webauthn/x v0.1.19 h1:IUfdHiBRoTdujpBA/14qbrMXQ3LGzYe/PRGWdZcmudg= -github.com/go-webauthn/x v0.1.19/go.mod h1:C5arLuTQ3pVHKPw89v7CDGnqAZSZJj+4Jnr40dsn7tk= +github.com/go-webauthn/webauthn v0.12.3 h1:hHQl1xkUuabUU9uS+ISNCMLs9z50p9mDUZI/FmkayNE= +github.com/go-webauthn/webauthn v0.12.3/go.mod h1:4JRe8Z3W7HIw8NGEWn2fnUwecoDzkkeach/NnvhkqGY= +github.com/go-webauthn/x v0.1.20 h1:brEBDqfiPtNNCdS/peu8gARtq8fIPsHz0VzpPjGvgiw= +github.com/go-webauthn/x v0.1.20/go.mod h1:n/gAc8ssZJGATM0qThE+W+vfgXiMedsWi3wf/C4lld0= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= From f691f03741a46ccf180ab8f9d38c3e93c2d08037 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 2 Apr 2025 12:54:54 +0000 Subject: [PATCH 068/568] chore(ui): remove fomantic's dimmer module (#7416) - Fomantic's dimmer module is responsible for dimming the page and make some element the primary focus on the page (e.g. modal). This module is only used by Fomantic's modal module. - Remove it and replace the javascript with our own `Dimmer` class that is able to provide Fomantic's modal module with everything it needs. - Replace the CSS with our own bare minimum CSS. - No functionality or visual is affected by this replacement. - E2E test added. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7416 Reviewed-by: Michael Kriese Co-authored-by: Gusted Co-committed-by: Gusted --- tests/e2e/dimmer.test.e2e.ts | 39 ++ web_src/css/base.css | 4 - web_src/css/index.css | 1 + web_src/css/modules/dimmer.css | 20 + web_src/fomantic/build/semantic.css | 357 ------------- web_src/fomantic/build/semantic.js | 754 ---------------------------- web_src/fomantic/semantic.json | 1 - web_src/js/modules/dimmer.ts | 47 ++ web_src/js/modules/fomantic.js | 2 + 9 files changed, 109 insertions(+), 1116 deletions(-) create mode 100644 tests/e2e/dimmer.test.e2e.ts create mode 100644 web_src/css/modules/dimmer.css create mode 100644 web_src/js/modules/dimmer.ts diff --git a/tests/e2e/dimmer.test.e2e.ts b/tests/e2e/dimmer.test.e2e.ts new file mode 100644 index 0000000000..04c6433a5a --- /dev/null +++ b/tests/e2e/dimmer.test.e2e.ts @@ -0,0 +1,39 @@ +// @watch start +// templates/shared/user/** +// web_src/css/modules/dimmer.ts +// web_src/css/modules/dimmer.css +// @watch end + +import {expect} from '@playwright/test'; +import {save_visual, test} from './utils_e2e.ts'; + +test.use({user: 'user2'}); + +test('Dimmed modal', async ({page}) => { + await page.goto('/user1'); + + await expect(page.locator('.block')).toContainText('Block'); + + // Ensure the modal is hidden + await expect(page.locator('#block-user')).toBeHidden(); + + await page.locator('.block').click(); + + // Modal and dimmer should be visible. + await expect(page.locator('#block-user')).toBeVisible(); + await expect(page.locator('.ui.dimmer')).toBeVisible(); + await save_visual(page); + + // After canceling, modal and dimmer should be hidden. + await page.locator('#block-user .cancel').click(); + await expect(page.locator('.ui.dimmer')).toBeHidden(); + await expect(page.locator('#block-user')).toBeHidden(); + await save_visual(page); + + // Open the block modal and make the dimmer visible again. + await page.locator('.block').click(); + await expect(page.locator('#block-user')).toBeVisible(); + await expect(page.locator('.ui.dimmer')).toBeVisible(); + await expect(page.locator('.ui.dimmer')).toHaveCount(1); + await save_visual(page); +}); diff --git a/web_src/css/base.css b/web_src/css/base.css index e3d2345e21..bfe8cd54ae 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -757,10 +757,6 @@ img.ui.avatar, box-shadow: 0 6px 18px var(--color-shadow) !important; } -.ui.dimmer { - background: var(--color-overlay-backdrop); -} - /* Override semantic selector '.ui.menu:not(.vertical) .item > .button' */ /* This fixes the commit graph button on the commits page */ /* modal svg icons, copied from fomantic except width and height */ diff --git a/web_src/css/index.css b/web_src/css/index.css index 12830299cf..eec17eab13 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -16,6 +16,7 @@ @import "./modules/card.css"; @import "./modules/checkbox.css"; @import "./modules/modal.css"; +@import "./modules/dimmer.css"; @import "./modules/switch.css"; @import "./modules/select.css"; diff --git a/web_src/css/modules/dimmer.css b/web_src/css/modules/dimmer.css new file mode 100644 index 0000000000..1d0bf83390 --- /dev/null +++ b/web_src/css/modules/dimmer.css @@ -0,0 +1,20 @@ +.ui.active.dimmer { + display: flex; + opacity: 1; +} + +.ui.dimmer { + align-items: center; + animation-fill-mode: both; + background: var(--color-overlay-backdrop); + display: none; + flex-direction: column; + height: 100%; + position: absolute; + opacity: 0; + justify-content: center; + user-select: none; + width: 100%; + will-change: opacity; + z-index: 1000; +} diff --git a/web_src/fomantic/build/semantic.css b/web_src/fomantic/build/semantic.css index 49c00c4dad..bd9a5f4594 100644 --- a/web_src/fomantic/build/semantic.css +++ b/web_src/fomantic/build/semantic.css @@ -2326,363 +2326,6 @@ /******************************* Site Overrides *******************************/ -/*! - * # Fomantic-UI - Dimmer - * http://github.com/fomantic/Fomantic-UI/ - * - * - * Released under the MIT license - * http://opensource.org/licenses/MIT - * - */ - -/******************************* - Dimmer -*******************************/ - -.dimmable:not(body) { - position: relative; -} - -.ui.dimmer { - display: none; - position: absolute; - top: 0 !important; - left: 0 !important; - width: 100%; - height: 100%; - text-align: center; - vertical-align: middle; - padding: 1em; - background: rgba(0, 0, 0, 0.85); - opacity: 0; - line-height: 1; - animation-fill-mode: both; - animation-duration: 0.5s; - transition: background-color 0.5s linear; - flex-direction: column; - align-items: center; - justify-content: center; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; - will-change: opacity; - z-index: 1000; -} - -/* Dimmer Content */ - -.ui.dimmer > .content { - -webkit-user-select: text; - -moz-user-select: text; - user-select: text; - color: #FFFFFF; -} - -/* Loose Coupling */ - -.ui.segment > .ui.dimmer:not(.page) { - border-radius: inherit; -} - -/* Scrollbars */ - -/******************************* - States -*******************************/ - -/* Animating */ - -.animating.dimmable:not(body), -.dimmed.dimmable:not(body) { - overflow: hidden; -} - -/* Animating / Active / Visible */ - -.dimmed.dimmable > .ui.animating.dimmer, -.dimmed.dimmable > .ui.visible.dimmer, -.ui.active.dimmer { - display: flex; - opacity: 1; -} - -/* Disabled */ - -.ui.disabled.dimmer { - width: 0 !important; - height: 0 !important; -} - -/******************************* - Variations -*******************************/ - -/*-------------- - Legacy - ---------------*/ - -/* Animating / Active / Visible */ - -.dimmed.dimmable > .ui.animating.legacy.dimmer, -.dimmed.dimmable > .ui.visible.legacy.dimmer, -.ui.active.legacy.dimmer { - display: block; -} - -/*-------------- - Alignment - ---------------*/ - -.ui[class*="top aligned"].dimmer { - justify-content: flex-start; -} - -.ui[class*="bottom aligned"].dimmer { - justify-content: flex-end; -} - -/*-------------- - Page - ---------------*/ - -.ui.page.dimmer { - position: fixed; - transform-style: ''; - perspective: 2000px; - transform-origin: center center; -} - -.ui.page.dimmer.modals { - -moz-perspective: none; -} - -body.animating.in.dimmable, -body.dimmed.dimmable { - overflow: hidden; -} - -body.dimmable > .dimmer { - position: fixed; -} - -/*-------------- - Blurring - ---------------*/ - -.blurring.dimmable > :not(.dimmer) { - filter: initial; - transition: 800ms filter ease; -} - -.blurring.dimmed.dimmable > :not(.dimmer):not(.popup) { - filter: blur(5px) grayscale(0.7); -} - -/* Dimmer Color */ - -.blurring.dimmable > .dimmer { - background: rgba(0, 0, 0, 0.6); -} - -.blurring.dimmable > .inverted.dimmer { - background: rgba(255, 255, 255, 0.6); -} - -/*-------------- - Aligned - ---------------*/ - -.ui.dimmer > .top.aligned.content > * { - vertical-align: top; -} - -.ui.dimmer > .bottom.aligned.content > * { - vertical-align: bottom; -} - -/*-------------- - Shades - ---------------*/ - -.medium.medium.medium.medium.medium.dimmer { - background: rgba(0, 0, 0, 0.65); -} - -.light.light.light.light.light.dimmer { - background: rgba(0, 0, 0, 0.45); -} - -.very.light.light.light.light.dimmer { - background: rgba(0, 0, 0, 0.25); -} - -/*-------------- - Simple - ---------------*/ - -/* Displays without javascript */ - -.ui.simple.dimmer { - display: block; - overflow: hidden; - opacity: 0; - width: 0; - height: 0; - z-index: -100; - background: rgba(0, 0, 0, 0); -} - -.dimmed.dimmable > .ui.simple.dimmer { - overflow: visible; - opacity: 1; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.85); - z-index: 1; -} - -.ui.simple.inverted.dimmer { - background: rgba(255, 255, 255, 0); -} - -.dimmed.dimmable > .ui.simple.inverted.dimmer { - background: rgba(255, 255, 255, 0.85); -} - -/*-------------- - Partially - ----------------*/ - -.ui[class*="top dimmer"], -.ui[class*="center dimmer"], -.ui[class*="bottom dimmer"] { - height: auto; -} - -.ui[class*="bottom dimmer"] { - top: auto !important; - bottom: 0; -} - -.ui[class*="center dimmer"] { - top: 50% !important; - transform: translateY(-50%); - -webkit-transform: translateY(calc(-50% - 0.5px)); -} - -.ui.segment > .ui.ui[class*="top dimmer"] { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.ui.segment > .ui.ui[class*="center dimmer"] { - border-radius: 0; -} - -.ui.segment > .ui.ui[class*="bottom dimmer"] { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.ui[class*="center dimmer"].transition[class*="fade up"].in { - animation-name: fadeInUpCenter; -} - -.ui[class*="center dimmer"].transition[class*="fade down"].in { - animation-name: fadeInDownCenter; -} - -.ui[class*="center dimmer"].transition[class*="fade up"].out { - animation-name: fadeOutUpCenter; -} - -.ui[class*="center dimmer"].transition[class*="fade down"].out { - animation-name: fadeOutDownCenter; -} - -.ui[class*="center dimmer"].bounce.transition { - animation-name: bounceCenter; -} - -@keyframes fadeInUpCenter { - 0% { - opacity: 0; - transform: translateY(-40%); - -webkit-transform: translateY(calc(-40% - 0.5px)); - } - - 100% { - opacity: 1; - transform: translateY(-50%); - -webkit-transform: translateY(calc(-50% - 0.5px)); - } -} - -@keyframes fadeInDownCenter { - 0% { - opacity: 0; - transform: translateY(-60%); - -webkit-transform: translateY(calc(-60% - 0.5px)); - } - - 100% { - opacity: 1; - transform: translateY(-50%); - -webkit-transform: translateY(calc(-50% - 0.5px)); - } -} - -@keyframes fadeOutUpCenter { - 0% { - opacity: 1; - transform: translateY(-50%); - -webkit-transform: translateY(calc(-50% - 0.5px)); - } - - 100% { - opacity: 0; - transform: translateY(-45%); - -webkit-transform: translateY(calc(-45% - 0.5px)); - } -} - -@keyframes fadeOutDownCenter { - 0% { - opacity: 1; - transform: translateY(-50%); - -webkit-transform: translateY(calc(-50% - 0.5px)); - } - - 100% { - opacity: 0; - transform: translateY(-55%); - -webkit-transform: translateY(calc(-55% - 0.5px)); - } -} - -@keyframes bounceCenter { - 0%, 20%, 50%, 80%, 100% { - transform: translateY(-50%); - -webkit-transform: translateY(calc(-50% - 0.5px)); - } - - 40% { - transform: translateY(calc(-50% - 30px)); - } - - 60% { - transform: translateY(calc(-50% - 15px)); - } -} - -/******************************* - Theme Overrides -*******************************/ - -/******************************* - User Overrides -*******************************/ /*! * # Fomantic-UI - Dropdown * http://github.com/fomantic/Fomantic-UI/ diff --git a/web_src/fomantic/build/semantic.js b/web_src/fomantic/build/semantic.js index fb68705c08..393d9d8142 100644 --- a/web_src/fomantic/build/semantic.js +++ b/web_src/fomantic/build/semantic.js @@ -1184,760 +1184,6 @@ $.api.settings = { -})( jQuery, window, document ); - -/*! - * # Fomantic-UI - Dimmer - * http://github.com/fomantic/Fomantic-UI/ - * - * - * Released under the MIT license - * http://opensource.org/licenses/MIT - * - */ - -;(function ($, window, document, undefined) { - -'use strict'; - -$.isFunction = $.isFunction || function(obj) { - return typeof obj === "function" && typeof obj.nodeType !== "number"; -}; - -window = (typeof window != 'undefined' && window.Math == Math) - ? window - : (typeof self != 'undefined' && self.Math == Math) - ? self - : Function('return this')() -; - -$.fn.dimmer = function(parameters) { - var - $allModules = $(this), - - time = new Date().getTime(), - performance = [], - - query = arguments[0], - methodInvoked = (typeof query == 'string'), - queryArguments = [].slice.call(arguments, 1), - - returnedValue - ; - - $allModules - .each(function() { - var - settings = ( $.isPlainObject(parameters) ) - ? $.extend(true, {}, $.fn.dimmer.settings, parameters) - : $.extend({}, $.fn.dimmer.settings), - - selector = settings.selector, - namespace = settings.namespace, - className = settings.className, - error = settings.error, - - eventNamespace = '.' + namespace, - moduleNamespace = 'module-' + namespace, - moduleSelector = $allModules.selector || '', - - clickEvent = "click", unstableClickEvent = ('ontouchstart' in document.documentElement) - ? 'touchstart' - : 'click', - - $module = $(this), - $dimmer, - $dimmable, - - element = this, - instance = $module.data(moduleNamespace), - module - ; - - module = { - - preinitialize: function() { - if( module.is.dimmer() ) { - - $dimmable = $module.parent(); - $dimmer = $module; - } - else { - $dimmable = $module; - if( module.has.dimmer() ) { - if(settings.dimmerName) { - $dimmer = $dimmable.find(selector.dimmer).filter('.' + settings.dimmerName); - } - else { - $dimmer = $dimmable.find(selector.dimmer); - } - } - else { - $dimmer = module.create(); - } - } - }, - - initialize: function() { - module.debug('Initializing dimmer', settings); - - module.bind.events(); - module.set.dimmable(); - module.instantiate(); - }, - - instantiate: function() { - module.verbose('Storing instance of module', module); - instance = module; - $module - .data(moduleNamespace, instance) - ; - }, - - destroy: function() { - module.verbose('Destroying previous module', $dimmer); - module.unbind.events(); - module.remove.variation(); - $dimmable - .off(eventNamespace) - ; - }, - - bind: { - events: function() { - if(settings.on == 'hover') { - $dimmable - .on('mouseenter' + eventNamespace, module.show) - .on('mouseleave' + eventNamespace, module.hide) - ; - } - else if(settings.on == 'click') { - $dimmable - .on(clickEvent + eventNamespace, module.toggle) - ; - } - if( module.is.page() ) { - module.debug('Setting as a page dimmer', $dimmable); - module.set.pageDimmer(); - } - - if( module.is.closable() ) { - module.verbose('Adding dimmer close event', $dimmer); - $dimmable - .on(clickEvent + eventNamespace, selector.dimmer, module.event.click) - ; - } - } - }, - - unbind: { - events: function() { - $module - .removeData(moduleNamespace) - ; - $dimmable - .off(eventNamespace) - ; - } - }, - - event: { - click: function(event) { - module.verbose('Determining if event occurred on dimmer', event); - if( $dimmer.find(event.target).length === 0 || $(event.target).is(selector.content) ) { - module.hide(); - event.stopImmediatePropagation(); - } - } - }, - - addContent: function(element) { - var - $content = $(element) - ; - module.debug('Add content to dimmer', $content); - if($content.parent()[0] !== $dimmer[0]) { - $content.detach().appendTo($dimmer); - } - }, - - create: function() { - var - $element = $( settings.template.dimmer(settings) ) - ; - if(settings.dimmerName) { - module.debug('Creating named dimmer', settings.dimmerName); - $element.addClass(settings.dimmerName); - } - $element - .appendTo($dimmable) - ; - return $element; - }, - - show: function(callback) { - callback = $.isFunction(callback) - ? callback - : function(){} - ; - module.debug('Showing dimmer', $dimmer, settings); - module.set.variation(); - if( (!module.is.dimmed() || module.is.animating()) && module.is.enabled() ) { - module.animate.show(callback); - settings.onShow.call(element); - settings.onChange.call(element); - } - else { - module.debug('Dimmer is already shown or disabled'); - } - }, - - hide: function(callback) { - callback = $.isFunction(callback) - ? callback - : function(){} - ; - if( module.is.dimmed() || module.is.animating() ) { - module.debug('Hiding dimmer', $dimmer); - module.animate.hide(callback); - settings.onHide.call(element); - settings.onChange.call(element); - } - else { - module.debug('Dimmer is not visible'); - } - }, - - toggle: function() { - module.verbose('Toggling dimmer visibility', $dimmer); - if( !module.is.dimmed() ) { - module.show(); - } - else { - if ( module.is.closable() ) { - module.hide(); - } - } - }, - - animate: { - show: function(callback) { - callback = $.isFunction(callback) - ? callback - : function(){} - ; - if(settings.useCSS && $.fn.transition !== undefined && $dimmer.transition('is supported')) { - if(settings.useFlex) { - module.debug('Using flex dimmer'); - module.remove.legacy(); - } - else { - module.debug('Using legacy non-flex dimmer'); - module.set.legacy(); - } - if(settings.opacity !== 'auto') { - module.set.opacity(); - } - $dimmer - .transition({ - displayType : settings.useFlex - ? 'flex' - : 'block', - animation : settings.transition + ' in', - queue : false, - duration : module.get.duration(), - useFailSafe : true, - onStart : function() { - module.set.dimmed(); - }, - onComplete : function() { - module.set.active(); - callback(); - } - }) - ; - } - else { - module.verbose('Showing dimmer animation with javascript'); - module.set.dimmed(); - if(settings.opacity == 'auto') { - settings.opacity = 0.8; - } - $dimmer - .stop() - .css({ - opacity : 0, - width : '100%', - height : '100%' - }) - .fadeTo(module.get.duration(), settings.opacity, function() { - $dimmer.removeAttr('style'); - module.set.active(); - callback(); - }) - ; - } - }, - hide: function(callback) { - callback = $.isFunction(callback) - ? callback - : function(){} - ; - if(settings.useCSS && $.fn.transition !== undefined && $dimmer.transition('is supported')) { - module.verbose('Hiding dimmer with css'); - $dimmer - .transition({ - displayType : settings.useFlex - ? 'flex' - : 'block', - animation : settings.transition + ' out', - queue : false, - duration : module.get.duration(), - useFailSafe : true, - onComplete : function() { - module.remove.dimmed(); - module.remove.variation(); - module.remove.active(); - callback(); - } - }) - ; - } - else { - module.verbose('Hiding dimmer with javascript'); - $dimmer - .stop() - .fadeOut(module.get.duration(), function() { - module.remove.dimmed(); - module.remove.active(); - $dimmer.removeAttr('style'); - callback(); - }) - ; - } - } - }, - - get: { - dimmer: function() { - return $dimmer; - }, - duration: function() { - if(typeof settings.duration == 'object') { - if( module.is.active() ) { - return settings.duration.hide; - } - else { - return settings.duration.show; - } - } - return settings.duration; - } - }, - - has: { - dimmer: function() { - if(settings.dimmerName) { - return ($module.find(selector.dimmer).filter('.' + settings.dimmerName).length > 0); - } - else { - return ( $module.find(selector.dimmer).length > 0 ); - } - } - }, - - is: { - active: function() { - return $dimmer.hasClass(className.active); - }, - animating: function() { - return ( $dimmer.is(':animated') || $dimmer.hasClass(className.animating) ); - }, - closable: function() { - if(settings.closable == 'auto') { - if(settings.on == 'hover') { - return false; - } - return true; - } - return settings.closable; - }, - dimmer: function() { - return $module.hasClass(className.dimmer); - }, - dimmable: function() { - return $module.hasClass(className.dimmable); - }, - dimmed: function() { - return $dimmable.hasClass(className.dimmed); - }, - disabled: function() { - return $dimmable.hasClass(className.disabled); - }, - enabled: function() { - return !module.is.disabled(); - }, - page: function () { - return $dimmable.is('body'); - }, - pageDimmer: function() { - return $dimmer.hasClass(className.pageDimmer); - } - }, - - can: { - show: function() { - return !$dimmer.hasClass(className.disabled); - } - }, - - set: { - opacity: function(opacity) { - var - color = $dimmer.css('background-color'), - colorArray = color.split(','), - isRGB = (colorArray && colorArray.length >= 3) - ; - opacity = settings.opacity === 0 ? 0 : settings.opacity || opacity; - if(isRGB) { - colorArray[2] = colorArray[2].replace(')',''); - colorArray[3] = opacity + ')'; - color = colorArray.join(','); - } - else { - color = 'rgba(0, 0, 0, ' + opacity + ')'; - } - module.debug('Setting opacity to', opacity); - $dimmer.css('background-color', color); - }, - legacy: function() { - $dimmer.addClass(className.legacy); - }, - active: function() { - $dimmer.addClass(className.active); - }, - dimmable: function() { - $dimmable.addClass(className.dimmable); - }, - dimmed: function() { - $dimmable.addClass(className.dimmed); - }, - pageDimmer: function() { - $dimmer.addClass(className.pageDimmer); - }, - disabled: function() { - $dimmer.addClass(className.disabled); - }, - variation: function(variation) { - variation = variation || settings.variation; - if(variation) { - $dimmer.addClass(variation); - } - } - }, - - remove: { - active: function() { - $dimmer - .removeClass(className.active) - ; - }, - legacy: function() { - $dimmer.removeClass(className.legacy); - }, - dimmed: function() { - $dimmable.removeClass(className.dimmed); - }, - disabled: function() { - $dimmer.removeClass(className.disabled); - }, - variation: function(variation) { - variation = variation || settings.variation; - if(variation) { - $dimmer.removeClass(variation); - } - } - }, - - setting: function(name, value) { - module.debug('Changing setting', name, value); - if( $.isPlainObject(name) ) { - $.extend(true, settings, name); - } - else if(value !== undefined) { - if($.isPlainObject(settings[name])) { - $.extend(true, settings[name], value); - } - else { - settings[name] = value; - } - } - else { - return settings[name]; - } - }, - internal: function(name, value) { - if( $.isPlainObject(name) ) { - $.extend(true, module, name); - } - else if(value !== undefined) { - module[name] = value; - } - else { - return module[name]; - } - }, - debug: function() { - if(!settings.silent && settings.debug) { - if(settings.performance) { - module.performance.log(arguments); - } - else { - module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':'); - module.debug.apply(console, arguments); - } - } - }, - verbose: function() { - if(!settings.silent && settings.verbose && settings.debug) { - if(settings.performance) { - module.performance.log(arguments); - } - else { - module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':'); - module.verbose.apply(console, arguments); - } - } - }, - error: function() { - if(!settings.silent) { - module.error = Function.prototype.bind.call(console.error, console, settings.name + ':'); - module.error.apply(console, arguments); - } - }, - performance: { - log: function(message) { - var - currentTime, - executionTime, - previousTime - ; - if(settings.performance) { - currentTime = new Date().getTime(); - previousTime = time || currentTime; - executionTime = currentTime - previousTime; - time = currentTime; - performance.push({ - 'Name' : message[0], - 'Arguments' : [].slice.call(message, 1) || '', - 'Element' : element, - 'Execution Time' : executionTime - }); - } - clearTimeout(module.performance.timer); - module.performance.timer = setTimeout(module.performance.display, 500); - }, - display: function() { - var - title = settings.name + ':', - totalTime = 0 - ; - time = false; - clearTimeout(module.performance.timer); - $.each(performance, function(index, data) { - totalTime += data['Execution Time']; - }); - title += ' ' + totalTime + 'ms'; - if(moduleSelector) { - title += ' \'' + moduleSelector + '\''; - } - if($allModules.length > 1) { - title += ' ' + '(' + $allModules.length + ')'; - } - if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) { - console.groupCollapsed(title); - if(console.table) { - console.table(performance); - } - else { - $.each(performance, function(index, data) { - console.log(data['Name'] + ': ' + data['Execution Time']+'ms'); - }); - } - console.groupEnd(); - } - performance = []; - } - }, - invoke: function(query, passedArguments, context) { - var - object = instance, - maxDepth, - found, - response - ; - passedArguments = passedArguments || queryArguments; - context = element || context; - if(typeof query == 'string' && object !== undefined) { - query = query.split(/[\. ]/); - maxDepth = query.length - 1; - $.each(query, function(depth, value) { - var camelCaseValue = (depth != maxDepth) - ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1) - : query - ; - if( $.isPlainObject( object[camelCaseValue] ) && (depth != maxDepth) ) { - object = object[camelCaseValue]; - } - else if( object[camelCaseValue] !== undefined ) { - found = object[camelCaseValue]; - return false; - } - else if( $.isPlainObject( object[value] ) && (depth != maxDepth) ) { - object = object[value]; - } - else if( object[value] !== undefined ) { - found = object[value]; - return false; - } - else { - module.error(error.method, query); - return false; - } - }); - } - if ( $.isFunction( found ) ) { - response = found.apply(context, passedArguments); - } - else if(found !== undefined) { - response = found; - } - if(Array.isArray(returnedValue)) { - returnedValue.push(response); - } - else if(returnedValue !== undefined) { - returnedValue = [returnedValue, response]; - } - else if(response !== undefined) { - returnedValue = response; - } - return found; - } - }; - - module.preinitialize(); - - if(methodInvoked) { - if(instance === undefined) { - module.initialize(); - } - module.invoke(query); - } - else { - if(instance !== undefined) { - instance.invoke('destroy'); - } - module.initialize(); - } - }) - ; - - return (returnedValue !== undefined) - ? returnedValue - : this - ; -}; - -$.fn.dimmer.settings = { - - name : 'Dimmer', - namespace : 'dimmer', - - silent : false, - debug : false, - verbose : false, - performance : true, - - // whether should use flex layout - useFlex : true, - - // name to distinguish between multiple dimmers in context - dimmerName : false, - - // whether to add a variation type - variation : false, - - // whether to bind close events - closable : 'auto', - - // whether to use css animations - useCSS : true, - - // css animation to use - transition : 'fade', - - // event to bind to - on : false, - - // overriding opacity value - opacity : 'auto', - - // transition durations - duration : { - show : 500, - hide : 500 - }, -// whether the dynamically created dimmer should have a loader - displayLoader: false, - loaderText : false, - loaderVariation : '', - - onChange : function(){}, - onShow : function(){}, - onHide : function(){}, - - error : { - method : 'The method you called is not defined.' - }, - - className : { - active : 'active', - animating : 'animating', - dimmable : 'dimmable', - dimmed : 'dimmed', - dimmer : 'dimmer', - disabled : 'disabled', - hide : 'hide', - legacy : 'legacy', - pageDimmer : 'page', - show : 'show', - loader : 'ui loader' - }, - - selector: { - dimmer : '> .ui.dimmer', - content : '.ui.dimmer > .content, .ui.dimmer > .content > .center' - }, - - template: { - dimmer: function(settings) { - var d = $('
').addClass('ui dimmer'),l; - if(settings.displayLoader) { - l = $('
') - .addClass(settings.className.loader) - .addClass(settings.loaderVariation); - if(!!settings.loaderText){ - l.text(settings.loaderText); - l.addClass('text'); - } - d.append(l); - } - return d; - } - } - -}; - })( jQuery, window, document ); /*! diff --git a/web_src/fomantic/semantic.json b/web_src/fomantic/semantic.json index 5db57bc8d4..69474b7539 100644 --- a/web_src/fomantic/semantic.json +++ b/web_src/fomantic/semantic.json @@ -23,7 +23,6 @@ "components": [ "api", "button", - "dimmer", "dropdown", "form", "menu", diff --git a/web_src/js/modules/dimmer.ts b/web_src/js/modules/dimmer.ts new file mode 100644 index 0000000000..7f1cbaa7ad --- /dev/null +++ b/web_src/js/modules/dimmer.ts @@ -0,0 +1,47 @@ +import $ from 'jquery'; + +class Dimmer { + dimmerEl: HTMLDivElement; + active: boolean; + + constructor() { + this.dimmerEl = document.querySelector('body > div.ui.dimmer') as HTMLDivElement; + if (!this.dimmerEl) { + this.dimmerEl = document.createElement('div'); + this.dimmerEl.classList.add('ui', 'dimmer', 'transition'); + document.body.append(this.dimmerEl); + } + } + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + dimmer(functionName: string, ...args: any[]) { + if (functionName === 'add content') { + this.dimmerEl.append(args[0][0]); + } else if (functionName === 'get dimmer') { + return $(this.dimmerEl); + } else if (functionName === 'show') { + this.dimmerEl.classList.add('active'); + this.dimmerEl.classList.remove('hidden'); + this.active = true; + } else if (functionName === 'hide') { + this.dimmerEl.classList.remove('active'); + this.dimmerEl.classList.add('hidden'); + this.active = false; + } else if (functionName === 'is active') { + return this.active; + } + } + + // JQuery compatibility functions. + get(_index: number): HTMLElement { + return document.body; + } + removeClass() {} + hasClass() {} +} + +export function initDimmer() { + $.fn.dimmer = (arg: string | object) => { + if (typeof arg === 'object') return new Dimmer(); + }; +} diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index c04bc6e863..c736026c6c 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -6,6 +6,7 @@ import {initAriaDropdownPatch} from './fomantic/dropdown.js'; import {initAriaModalPatch} from './fomantic/modal.js'; import {initFomanticTransition} from './fomantic/transition.js'; import {svg} from '../svg.js'; +import {initDimmer} from './dimmer.ts'; export const fomanticMobileScreen = window.matchMedia('only screen and (max-width: 767.98px)'); @@ -31,4 +32,5 @@ export function initGiteaFomantic() { initAriaFormFieldPatch(); initAriaDropdownPatch(); initAriaModalPatch(); + initDimmer(); } From bd9366e7fc834d42fd60dbe5391c268f65452db7 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 2 Apr 2025 14:50:02 +0000 Subject: [PATCH 069/568] fix(i18n): fix several usages of i18n (#7422) - Add new translations, if an existing one couldn't be used. - Use existing translations, if one existed and fit the purpose. - Spotted by the lint-locale-usage tooling by @fogti. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7422 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- options/locale/locale_en-US.ini | 2 +- options/locale_next/locale_en-US.json | 5 ++++- routers/web/repo/editor.go | 2 +- templates/admin/auth/list.tmpl | 2 +- templates/admin/emails/list.tmpl | 2 +- templates/admin/notice.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- templates/repo/settings/lfs_file.tmpl | 2 +- templates/user/auth/finalize_openid.tmpl | 2 +- 12 files changed, 15 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ea7191b906..d97f90ec9c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1436,7 +1436,7 @@ editor.file_is_a_symlink = `"%s" is a symbolic link. Symbolic links cannot be ed editor.filename_is_a_directory = Filename "%s" is already used as a directory name in this repository. editor.file_editing_no_longer_exists = The file being edited, "%s", no longer exists in this repository. editor.file_deleting_no_longer_exists = The file being deleted, "%s", no longer exists in this repository. -editor.file_changed_while_editing = The file contents have changed since you started editing. Click here to see them or Commit changes again to overwrite them. +editor.file_changed_while_editing = The file contents have changed since you opened the file. Click here to see them or Commit changes again to overwrite them. editor.file_already_exists = A file named "%s" already exists in this repository. editor.commit_id_not_matching = The file was changed while you were editing it. Commit to a new branch and then merge. editor.push_out_of_date = The push appears to be out of date. diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index def49e1a58..7f9b81a77b 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -18,5 +18,8 @@ "themes.names.forgejo-light": "Forgejo light", "themes.names.forgejo-dark": "Forgejo dark", "error.not_found.title": "Page not found", - "alert.asset_load_failed": "Failed to load asset files from {path}. Please make sure the asset files can be accessed." + "alert.asset_load_failed": "Failed to load asset files from {path}. Please make sure the asset files can be accessed.", + "settings.adopt": "Adopt", + "install.invalid_lfs_path": "Unable to create the LFS root at the specified path: %[1]s", + "install.lfs_jwt_secret_failed": "Unable to generate a LFS JWT secret: %[1]s" } \ No newline at end of file diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 77f71fd2b1..5114cc9c05 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -585,7 +585,7 @@ func DeleteFilePost(ctx *context.Context) { ctx.Error(http.StatusInternalServerError, err.Error()) } } else if models.IsErrCommitIDDoesNotMatch(err) || git.IsErrPushOutOfDate(err) { - ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_deleting", ctx.Repo.RepoLink+"/compare/"+util.PathEscapeSegments(form.LastCommit)+"..."+util.PathEscapeSegments(ctx.Repo.CommitID)), tplDeleteFile, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+util.PathEscapeSegments(form.LastCommit)+"..."+util.PathEscapeSegments(ctx.Repo.CommitID)), tplDeleteFile, &form) } else if git.IsErrPushRejected(err) { errPushRej := err.(*git.ErrPushRejected) if len(errPushRej.Message) == 0 { diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index 9c283fe3d8..0c7138bd68 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -31,7 +31,7 @@ {{svg "octicon-pencil"}} {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 8796794aee..5c30df87af 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -67,7 +67,7 @@ {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 4f8783dd42..08f0a4f204 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -25,7 +25,7 @@ {{svg "octicon-note" 16}} {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} {{if .Notices}} diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index b719d259e0..8c9c198897 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -67,7 +67,7 @@ {{svg "octicon-pencil"}} {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index f22600a449..5f9965e34c 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -75,7 +75,7 @@ {{svg "octicon-trash"}} {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 0422705ea9..7a75ceded7 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -87,7 +87,7 @@ {{svg "octicon-trash"}} {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index f4609edbbf..368e113d24 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -110,7 +110,7 @@ {{else}} - {{ctx.Locale.Tr "no_results_found"}} + {{ctx.Locale.Tr "repo.pulls.no_results"}} {{end}} diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index 941d09f3e6..3b6b763536 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -31,7 +31,7 @@ {{ctx.Locale.Tr "repo.audio_not_supported_in_browser"}} {{else if .IsPDFFile}} -
+
{{else}} {{ctx.Locale.Tr "repo.file_view_raw"}} {{end}} diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl index f84f860b02..372471368f 100644 --- a/templates/user/auth/finalize_openid.tmpl +++ b/templates/user/auth/finalize_openid.tmpl @@ -30,7 +30,7 @@
- {{ctx.Locale.Tr "auth.forget_password"}} + {{ctx.Locale.Tr "auth.forgot_password"}}
{{if .ShowRegistrationButton}}
From 15a2338ff24d8388781b6151b3eedf45d912f7e8 Mon Sep 17 00:00:00 2001 From: Ellen Emilia Anna Zscheile Date: Wed, 2 Apr 2025 14:57:45 +0000 Subject: [PATCH 070/568] feat(build): teach lint-locale-usage about trPluralString (#7425) This requires using the more complicated parsing from localestore.go In order to avoid future code drift and code duplication, localestore.go was refactored to call IterateMessagesContent instead of essentially duplicating the code of RecursivelyAddTranslationsFromJSON with small adjustments. locale/utils.go was moved to translation/localeiter/utils.go in order to avoid spreading translation-related routines among completely different places. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7425 Reviewed-by: Gusted Co-authored-by: Ellen Emilia Anna Zscheile Co-committed-by: Ellen Emilia Anna Zscheile --- .deadcode-out | 3 ++ build/lint-locale-usage/lint-locale-usage.go | 17 +++--- build/lint-locale/lint-locale.go | 12 +++-- build/lint-locale/lint-locale_test.go | 12 +++++ modules/translation/i18n/localestore.go | 53 ++++--------------- .../localeiter}/utils.go | 42 +++++++++++---- 6 files changed, 73 insertions(+), 66 deletions(-) rename modules/{locale => translation/localeiter}/utils.go (56%) diff --git a/.deadcode-out b/.deadcode-out index 31184826ae..5b5698c5de 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -192,6 +192,9 @@ forgejo.org/modules/translation MockLocale.HasKey MockLocale.PrettyNumber +forgejo.org/modules/translation/localeiter + IterateMessagesContent + forgejo.org/modules/util OptionalArg diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go index edbd086d0e..88375c1c36 100644 --- a/build/lint-locale-usage/lint-locale-usage.go +++ b/build/lint-locale-usage/lint-locale-usage.go @@ -18,8 +18,8 @@ import ( tmplParser "text/template/parse" "forgejo.org/modules/container" - "forgejo.org/modules/locale" fjTemplates "forgejo.org/modules/templates" + "forgejo.org/modules/translation/localeiter" "forgejo.org/modules/util" ) @@ -300,10 +300,6 @@ func main() { } msgids := make(container.Set[string]) - onMsgid := func(trKey, trValue string) error { - msgids[trKey] = struct{}{} - return nil - } localeFile := filepath.Join(filepath.Join("options", "locale"), "locale_en-US.ini") localeContent, err := os.ReadFile(localeFile) @@ -312,7 +308,10 @@ func main() { os.Exit(2) } - if err = locale.IterateMessagesContent(localeContent, onMsgid); err != nil { + if err = localeiter.IterateMessagesContent(localeContent, func(trKey, trValue string) error { + msgids[trKey] = struct{}{} + return nil + }); err != nil { fmt.Printf("%s:\tERROR: %s\n", localeFile, err.Error()) os.Exit(2) } @@ -324,7 +323,11 @@ func main() { os.Exit(2) } - if err := locale.IterateMessagesNextContent(localeContent, onMsgid); err != nil { + if err := localeiter.IterateMessagesNextContent(localeContent, func(trKey, pluralForm, trValue string) error { + // ignore plural form + msgids[trKey] = struct{}{} + return nil + }); err != nil { fmt.Printf("%s:\tERROR: %s\n", localeFile, err.Error()) os.Exit(2) } diff --git a/build/lint-locale/lint-locale.go b/build/lint-locale/lint-locale.go index 94ce941e62..0d80ffa4b0 100644 --- a/build/lint-locale/lint-locale.go +++ b/build/lint-locale/lint-locale.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - "forgejo.org/modules/locale" + "forgejo.org/modules/translation/localeiter" "github.com/microcosm-cc/bluemonday" "github.com/sergi/go-diff/diffmatchpatch" @@ -100,7 +100,7 @@ func checkValue(trKey, value string) []string { func checkLocaleContent(localeContent []byte) []string { errors := []string{} - if err := locale.IterateMessagesContent(localeContent, func(trKey, trValue string) error { + if err := localeiter.IterateMessagesContent(localeContent, func(trKey, trValue string) error { errors = append(errors, checkValue(trKey, trValue)...) return nil }); err != nil { @@ -113,8 +113,12 @@ func checkLocaleContent(localeContent []byte) []string { func checkLocaleNextContent(localeContent []byte) []string { errors := []string{} - if err := locale.IterateMessagesNextContent(localeContent, func(trKey, trValue string) error { - errors = append(errors, checkValue(trKey, trValue)...) + if err := localeiter.IterateMessagesNextContent(localeContent, func(trKey, pluralForm, trValue string) error { + fullKey := trKey + if pluralForm != "" { + fullKey = trKey + "." + pluralForm + } + errors = append(errors, checkValue(fullKey, trValue)...) return nil }); err != nil { panic(err) diff --git a/build/lint-locale/lint-locale_test.go b/build/lint-locale/lint-locale_test.go index 37407461c7..d481a80e37 100644 --- a/build/lint-locale/lint-locale_test.go +++ b/build/lint-locale/lint-locale_test.go @@ -91,4 +91,16 @@ func TestNextLocalizationPolicy(t *testing.T) { "settings.hidden_comment_types_description": "\"
+ + {{if .CanSyncFork}} +
+
+ {{ctx.Locale.TrN .ForkCommitsBehind "repo.sync_fork.branch_behind_one" "repo.sync_fork.branch_behind_few" .ForkCommitsBehind (printf "%s:%s" .BaseBranchLink .Repository.BaseRepo.FullName .BranchName | SafeHTML)}} +
+ + {{ctx.Locale.Tr "repo.sync_fork.button"}} + +
+ {{end}} + {{if .IsViewFile}} {{template "repo/view_file" .}} {{else if .IsBlame}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index a16deb61a8..97529248e9 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -15630,6 +15630,172 @@ } } }, + "/repos/{owner}/{repo}/sync_fork": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "Gets information about syncing the fork default branch with the base branch", + "operationId": "repoSyncForkDefaultInfo", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "$ref": "#/responses/SyncForkInfo" + }, + "400": { + "$ref": "#/responses/error" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + }, + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "Syncs the default branch of a fork with the base branch", + "operationId": "repoSyncForkDefault", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + } + ], + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "400": { + "$ref": "#/responses/error" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, + "/repos/{owner}/{repo}/sync_fork/{branch}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "Gets information about syncing a fork branch with the base branch", + "operationId": "repoSyncForkBranchInfo", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "The branch", + "name": "branch", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "$ref": "#/responses/SyncForkInfo" + }, + "400": { + "$ref": "#/responses/error" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + }, + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "Syncs a fork branch with the base branch", + "operationId": "repoSyncForkBranch", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "The branch", + "name": "branch", + "in": "path", + "required": true + } + ], + "responses": { + "204": { + "$ref": "#/responses/empty" + }, + "400": { + "$ref": "#/responses/error" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, "/repos/{owner}/{repo}/tag_protections": { "get": { "produces": [ @@ -27432,6 +27598,30 @@ }, "x-go-package": "forgejo.org/modules/structs" }, + "SyncForkInfo": { + "description": "SyncForkInfo information about syncing a fork", + "type": "object", + "properties": { + "allowed": { + "type": "boolean", + "x-go-name": "Allowed" + }, + "base_commit": { + "type": "string", + "x-go-name": "BaseCommit" + }, + "commits_behind": { + "type": "integer", + "format": "int64", + "x-go-name": "CommitsBehind" + }, + "fork_commit": { + "type": "string", + "x-go-name": "ForkCommit" + } + }, + "x-go-package": "forgejo.org/modules/structs" + }, "Tag": { "description": "Tag represents a repository tag", "type": "object", @@ -29211,6 +29401,15 @@ } } }, + "SyncForkInfo": { + "description": "SyncForkInfo", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/SyncForkInfo" + } + } + }, "Tag": { "description": "Tag", "schema": { diff --git a/tests/integration/repo_sync_fork_test.go b/tests/integration/repo_sync_fork_test.go new file mode 100644 index 0000000000..956494cfc6 --- /dev/null +++ b/tests/integration/repo_sync_fork_test.go @@ -0,0 +1,117 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "net/url" + "testing" + + auth_model "forgejo.org/models/auth" + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + api "forgejo.org/modules/structs" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func syncForkTest(t *testing.T, forkName, urlPart string, webSync bool) { + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 20}) + + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + baseUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: baseRepo.OwnerID}) + + session := loginUser(t, user.Name) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + + /// Create a new fork + req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks", baseUser.Name, baseRepo.LowerName), &api.CreateForkOption{Name: &forkName}).AddTokenAuth(token) + MakeRequest(t, req, http.StatusAccepted) + + req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/%s", user.Name, forkName, urlPart).AddTokenAuth(token) + resp := MakeRequest(t, req, http.StatusOK) + + var syncForkInfo *api.SyncForkInfo + DecodeJSON(t, resp, &syncForkInfo) + + // This is a new fork, so the commits in both branches should be the same + assert.False(t, syncForkInfo.Allowed) + assert.Equal(t, syncForkInfo.BaseCommit, syncForkInfo.ForkCommit) + + // Make a commit on the base branch + err := createOrReplaceFileInBranch(baseUser, baseRepo, "sync_fork.txt", "master", "Hello") + require.NoError(t, err) + + req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/%s", user.Name, forkName, urlPart).AddTokenAuth(token) + resp = MakeRequest(t, req, http.StatusOK) + + DecodeJSON(t, resp, &syncForkInfo) + + // The commits should no longer be the same and we can sync + assert.True(t, syncForkInfo.Allowed) + assert.NotEqual(t, syncForkInfo.BaseCommit, syncForkInfo.ForkCommit) + + // Sync the fork + if webSync { + session.MakeRequest(t, NewRequestf(t, "GET", "/%s/%s/sync_fork/master", user.Name, forkName), http.StatusSeeOther) + } else { + req = NewRequestf(t, "POST", "/api/v1/repos/%s/%s/%s", user.Name, forkName, urlPart).AddTokenAuth(token) + MakeRequest(t, req, http.StatusNoContent) + } + + req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/%s", user.Name, forkName, urlPart).AddTokenAuth(token) + resp = MakeRequest(t, req, http.StatusOK) + + DecodeJSON(t, resp, &syncForkInfo) + + // After the sync both commits should be the same again + assert.False(t, syncForkInfo.Allowed) + assert.Equal(t, syncForkInfo.BaseCommit, syncForkInfo.ForkCommit) +} + +func TestAPIRepoSyncForkDefault(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + syncForkTest(t, "SyncForkDefault", "sync_fork", false) + }) +} + +func TestAPIRepoSyncForkBranch(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + syncForkTest(t, "SyncForkBranch", "sync_fork/master", false) + }) +} + +func TestWebRepoSyncForkBranch(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + syncForkTest(t, "SyncForkBranch", "sync_fork/master", true) + }) +} + +func TestWebRepoSyncForkHomepage(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + forkName := "SyncForkHomepage" + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 20}) + + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + baseUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: baseRepo.OwnerID}) + + session := loginUser(t, user.Name) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + + /// Create a new fork + req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks", baseUser.Name, baseRepo.LowerName), &api.CreateForkOption{Name: &forkName}).AddTokenAuth(token) + MakeRequest(t, req, http.StatusAccepted) + + // Make a commit on the base branch + err := createOrReplaceFileInBranch(baseUser, baseRepo, "sync_fork.txt", "master", "Hello") + require.NoError(t, err) + + resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/%s", user.Name, forkName), http.StatusOK) + + assert.Contains(t, resp.Body.String(), fmt.Sprintf("This branch is 1 commit behind user2/repo1:master", u.Port())) + }) +} From 39341df8cbff2aeb80d3e555c764c621d17548de Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Mon, 31 Mar 2025 11:56:03 +0800 Subject: [PATCH 106/568] Fix markup content overflow (#34072) Fix #34069: use `overflow-wrap: anywhere` to correctly wrap overflowed content. (cherry picked from commit 0fd5392087d35ebe2268f32de422342020e573b9) --- web_src/css/markup/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index 947480a7e8..6574d413fc 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -2,7 +2,7 @@ overflow: hidden; font-size: 16px; line-height: 1.5 !important; - word-wrap: break-word; + overflow-wrap: anywhere; } .markup > *:first-child { From afffbe29827c6278184b15ef172b8c0eefb3810f Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 7 Apr 2025 13:47:13 +0000 Subject: [PATCH 107/568] ui: use switch for markdown editor modes (#7481) Replaces https://codeberg.org/forgejo/forgejo/pulls/5478 Closes https://codeberg.org/forgejo/forgejo/issues/244 Use switch for preview mode switching instead of tabs. It is placed in line with the toolbar buttons. Preview: * https://codeberg.org/attachments/38910747-c14c-41d1-9935-c35f3e17033b * https://codeberg.org/attachments/ff8ea47a-f157-424f-8b7f-af1008d5e8b5 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7481 Reviewed-by: Gusted Reviewed-by: Beowulf --- templates/shared/combomarkdowneditor.tmpl | 73 ++++++++++--------- tests/e2e/markdown-editor.test.e2e.ts | 48 +++++++++++- web_src/css/editor/combomarkdowneditor.css | 8 ++ .../js/features/comp/ComboMarkdownEditor.js | 5 +- web_src/js/features/repo-legacy.js | 2 +- 5 files changed, 94 insertions(+), 42 deletions(-) diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 1ea22660f7..6d82c37c58 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -13,43 +13,44 @@ Template Attributes: * EasyMDE: whether to display button for switching to legacy editor */}}
- {{if .MarkdownPreviewUrl}} -
- {{ctx.Locale.Tr "write"}} - {{ctx.Locale.Tr "preview"}} -
- {{end}} + + + {{if .MarkdownPreviewUrl}} +
+ {{ctx.Locale.Tr "write"}} + {{ctx.Locale.Tr "preview"}} +
+ {{end}} +
+ {{svg "octicon-heading"}} + {{svg "octicon-bold"}} + {{svg "octicon-italic"}} +
+
+ {{svg "octicon-quote"}} + {{svg "octicon-code"}} + +
+
+ {{svg "octicon-list-unordered"}} + {{svg "octicon-list-ordered"}} + {{svg "octicon-tasklist"}} + + +
+
+ + {{svg "octicon-mention"}} + {{svg "octicon-cross-reference"}} +
+
+ + {{if .EasyMDE}} + + {{end}} +
+
- -
- {{svg "octicon-heading"}} - {{svg "octicon-bold"}} - {{svg "octicon-italic"}} -
-
- {{svg "octicon-quote"}} - {{svg "octicon-code"}} - -
-
- {{svg "octicon-list-unordered"}} - {{svg "octicon-list-ordered"}} - {{svg "octicon-tasklist"}} - - -
-
- - {{svg "octicon-mention"}} - {{svg "octicon-cross-reference"}} -
-
- - {{if .EasyMDE}} - - {{end}} -
- diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts index 39ced25bc3..c69c9a7f0c 100644 --- a/tests/e2e/markdown-editor.test.e2e.ts +++ b/tests/e2e/markdown-editor.test.e2e.ts @@ -39,7 +39,7 @@ test('Markdown image preview behaviour', async ({page}, workerInfo) => { await save_visual(page); }); -test('markdown indentation', async ({page}) => { +test('Markdown indentation', async ({page}) => { const initText = `* first\n* second\n* third\n* last`; const response = await page.goto('/user2/repo1/issues/new'); @@ -109,7 +109,7 @@ test('markdown indentation', async ({page}) => { await expect(textarea).toHaveValue(initText); }); -test('markdown list continuation', async ({page}) => { +test('Markdown list continuation', async ({page}) => { const initText = `* first\n* second`; const response = await page.goto('/user2/repo1/issues/new'); @@ -202,7 +202,7 @@ test('markdown list continuation', async ({page}) => { } }); -test('markdown insert table', async ({page}) => { +test('Markdown insert table', async ({page}) => { const response = await page.goto('/user2/repo1/issues/new'); expect(response?.status()).toBe(200); @@ -225,7 +225,7 @@ test('markdown insert table', async ({page}) => { await save_visual(page); }); -test('markdown insert link', async ({page}) => { +test('Markdown insert link', async ({page}) => { const response = await page.goto('/user2/repo1/issues/new'); expect(response?.status()).toBe(200); @@ -277,3 +277,43 @@ test('text expander has higher prio then prefix continuation', async ({page}) => await textarea.press('Enter'); await expect(textarea).toHaveValue(`* first\n* 😸\n* @user2 \n* `); }); + +test('Combo Markdown: preview mode switch', async ({page}) => { + // Load page with editor + const response = await page.goto('/user2/repo1/issues/new'); + expect(response?.status()).toBe(200); + + const toolbarItem = page.locator('md-header'); + const editorPanel = page.locator('[data-tab-panel="markdown-writer"]'); + const previewPanel = page.locator('[data-tab-panel="markdown-previewer"]'); + + // Verify correct visibility of related UI elements + await expect(toolbarItem).toBeVisible(); + await expect(editorPanel).toBeVisible(); + await expect(previewPanel).toBeHidden(); + + // Fill some content + const textarea = page.locator('textarea.markdown-text-editor'); + await textarea.fill('**Content** :100: _100_'); + + // Switch to preview mode + await page.locator('a[data-tab-for="markdown-previewer"]').click(); + + // Verify that the related UI elements were switched correctly + await expect(toolbarItem).toBeHidden(); + await expect(editorPanel).toBeHidden(); + await expect(previewPanel).toBeVisible(); + await save_visual(page); + + // Verify that some content rendered + await expect(page.locator('[data-tab-panel="markdown-previewer"] .emoji[data-alias="100"]')).toBeVisible(); + + // Switch back to edit mode + await page.locator('a[data-tab-for="markdown-writer"]').click(); + + // Verify that the related UI elements were switched back correctly + await expect(toolbarItem).toBeVisible(); + await expect(editorPanel).toBeVisible(); + await expect(previewPanel).toBeHidden(); + await save_visual(page); +}); diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css index f190c7eb1f..a40f0c175c 100644 --- a/web_src/css/editor/combomarkdowneditor.css +++ b/web_src/css/editor/combomarkdowneditor.css @@ -11,6 +11,14 @@ flex-wrap: wrap; } +markdown-toolbar .switch .item { + padding: 0.25em 1em; +} + +.markdown-toolbar-hidden .markdown-toolbar-button { + display: none; +} + .combo-markdown-editor .markdown-toolbar-group { display: flex; } diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js index efd068f354..53c6b85728 100644 --- a/web_src/js/features/comp/ComboMarkdownEditor.js +++ b/web_src/js/features/comp/ComboMarkdownEditor.js @@ -151,7 +151,7 @@ class ComboMarkdownEditor { setupTab() { const $container = $(this.container); - const tabs = $container[0].querySelectorAll('.tabular.menu > .item'); + const tabs = $container[0].querySelectorAll('.switch > .item'); // Fomantic Tab requires the "data-tab" to be globally unique. // So here it uses our defined "data-tab-for" and "data-tab-panel" to generate the "data-tab" attribute for Fomantic. @@ -159,12 +159,14 @@ class ComboMarkdownEditor { const tabPreviewer = Array.from(tabs).find((tab) => tab.getAttribute('data-tab-for') === 'markdown-previewer'); tabEditor.setAttribute('data-tab', `markdown-writer-${elementIdCounter}`); tabPreviewer.setAttribute('data-tab', `markdown-previewer-${elementIdCounter}`); + const toolbar = $container[0].querySelector('markdown-toolbar'); const panelEditor = $container[0].querySelector('.ui.tab[data-tab-panel="markdown-writer"]'); const panelPreviewer = $container[0].querySelector('.ui.tab[data-tab-panel="markdown-previewer"]'); panelEditor.setAttribute('data-tab', `markdown-writer-${elementIdCounter}`); panelPreviewer.setAttribute('data-tab', `markdown-previewer-${elementIdCounter}`); tabEditor.addEventListener('click', () => { + toolbar.classList.remove('markdown-toolbar-hidden'); requestAnimationFrame(() => { this.focus(); }); @@ -177,6 +179,7 @@ class ComboMarkdownEditor { this.previewMode = this.options.previewMode ?? 'comment'; this.previewWiki = this.options.previewWiki ?? false; tabPreviewer.addEventListener('click', async () => { + toolbar.classList.add('markdown-toolbar-hidden'); const formData = new FormData(); formData.append('mode', this.previewMode); formData.append('context', this.previewContext); diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index c74ba1efbe..2f7db50e64 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -469,7 +469,7 @@ async function onEditContent(event) { editContentZone.querySelector('button[data-button-name="cancel-edit"]').addEventListener('click', cancelAndReset); editContentZone.querySelector('button[data-button-name="save-edit"]').addEventListener('click', saveAndRefresh); } else { - const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.tabular.menu > a[data-tab-for=markdown-writer]'); + const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.switch > a[data-tab-for=markdown-writer]'); tabEditor?.click(); } From 02d9c7cd27e05ef86a981b1a14ce9513e18b6311 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 1 Apr 2025 18:03:27 -0700 Subject: [PATCH 108/568] Return default avatar url when user id is zero rather than updating database (#34094) (cherry picked from commit 88352e0b252e9186a5633d39124a8a65ab89f831) --- models/user/avatar.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user/avatar.go b/models/user/avatar.go index 27af7f774d..d534bd7bea 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -62,7 +62,7 @@ func GenerateRandomAvatar(ctx context.Context, u *User) error { // AvatarLinkWithSize returns a link to the user's avatar with size. size <= 0 means default size func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string { - if u.IsGhost() { + if u.IsGhost() || u.ID <= 0 { return avatars.DefaultAvatarLink() } From f7b19964a7fff9a5d6be01a7f14bdd1c1f3c8f41 Mon Sep 17 00:00:00 2001 From: Kemal Zebari <60799661+kemzeb@users.noreply.github.com> Date: Wed, 2 Apr 2025 07:00:54 -0700 Subject: [PATCH 109/568] Add new CLI flags to set name and scopes when creating a user with access token (#34080) Resolves #33474. --------- Co-authored-by: wxiaoguang (cherry picked from commit 55a69ae4c63ee8551eadb161cb901ba0a2a2e194) --- cmd/admin_user_create.go | 46 +++++++++++++++++++----- cmd/admin_user_generate_access_token.go | 9 +++-- models/auth/access_token_scope.go | 4 +++ routers/web/user/setting/applications.go | 3 ++ 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go index 33e61c0753..81a2a828de 100644 --- a/cmd/admin_user_create.go +++ b/cmd/admin_user_create.go @@ -6,6 +6,7 @@ package cmd import ( "errors" "fmt" + "strings" auth_model "forgejo.org/models/auth" "forgejo.org/models/db" @@ -61,6 +62,16 @@ var microcmdUserCreate = &cli.Command{ Name: "access-token", Usage: "Generate access token for the user", }, + &cli.StringFlag{ + Name: "access-token-name", + Usage: `Name of the generated access token`, + Value: "gitea-admin", + }, + &cli.StringFlag{ + Name: "access-token-scopes", + Usage: `Scopes of the generated access token, comma separated. Examples: "all", "public-only,read:issue", "write:repository,write:user"`, + Value: "all", + }, &cli.BoolFlag{ Name: "restricted", Usage: "Make a restricted user account", @@ -157,23 +168,40 @@ func runCreateUser(c *cli.Context) error { IsRestricted: restricted, } + var accessTokenName string + var accessTokenScope auth_model.AccessTokenScope + if c.IsSet("access-token") { + accessTokenName = strings.TrimSpace(c.String("access-token-name")) + if accessTokenName == "" { + return errors.New("access-token-name cannot be empty") + } + var err error + accessTokenScope, err = auth_model.AccessTokenScope(c.String("access-token-scopes")).Normalize() + if err != nil { + return fmt.Errorf("invalid access token scope provided: %w", err) + } + if !accessTokenScope.HasPermissionScope() { + return errors.New("access token does not have any permission") + } + } else if c.IsSet("access-token-name") || c.IsSet("access-token-scopes") { + return errors.New("access-token-name and access-token-scopes flags are only valid when access-token flag is set") + } + + // arguments should be prepared before creating the user & access token, in case there is anything wrong + + // create the user if err := user_model.CreateUser(ctx, u, overwriteDefault); err != nil { return fmt.Errorf("CreateUser: %w", err) } + fmt.Printf("New user '%s' has been successfully created!\n", username) - if c.Bool("access-token") { - t := &auth_model.AccessToken{ - Name: "gitea-admin", - UID: u.ID, - } - + // create the access token + if accessTokenScope != "" { + t := &auth_model.AccessToken{Name: accessTokenName, UID: u.ID, Scope: accessTokenScope} if err := auth_model.NewAccessToken(ctx, t); err != nil { return err } - fmt.Printf("Access token was successfully created... %s\n", t.Token) } - - fmt.Printf("New user '%s' has been successfully created!\n", username) return nil } diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go index abb874bd5f..1a6c003171 100644 --- a/cmd/admin_user_generate_access_token.go +++ b/cmd/admin_user_generate_access_token.go @@ -34,8 +34,8 @@ var microcmdUserGenerateAccessToken = &cli.Command{ }, &cli.StringFlag{ Name: "scopes", - Value: "", - Usage: "Comma separated list of scopes to apply to access token", + Value: "all", + Usage: `Comma separated list of scopes to apply to access token, examples: "all", "public-only,read:issue", "write:repository,write:user"`, }, }, Action: runGenerateAccessToken, @@ -43,7 +43,7 @@ var microcmdUserGenerateAccessToken = &cli.Command{ func runGenerateAccessToken(c *cli.Context) error { if !c.IsSet("username") { - return errors.New("You must provide a username to generate a token for") + return errors.New("you must provide a username to generate a token for") } ctx, cancel := installSignals() @@ -77,6 +77,9 @@ func runGenerateAccessToken(c *cli.Context) error { if err != nil { return fmt.Errorf("invalid access token scope provided: %w", err) } + if !accessTokenScope.HasPermissionScope() { + return errors.New("access token does not have any permission") + } t.Scope = accessTokenScope // create the token diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go index 802ad5aa07..d14838cf02 100644 --- a/models/auth/access_token_scope.go +++ b/models/auth/access_token_scope.go @@ -283,6 +283,10 @@ func (s AccessTokenScope) Normalize() (AccessTokenScope, error) { return bitmap.toScope(), nil } +func (s AccessTokenScope) HasPermissionScope() bool { + return s != "" && s != AccessTokenScopePublicOnly +} + // PublicOnly checks if this token scope is limited to public resources func (s AccessTokenScope) PublicOnly() (bool, error) { bitmap, err := s.parse() diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index 631d5958ea..e73239b79b 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -49,6 +49,9 @@ func ApplicationsPost(ctx *context.Context) { ctx.ServerError("GetScope", err) return } + if !scope.HasPermissionScope() { + ctx.Flash.Error(ctx.Tr("settings.at_least_one_permission"), true) + } t := &auth_model.AccessToken{ UID: ctx.Doer.ID, Name: form.Name, From 51990751a696a2b87af0a4373093f646312ec82f Mon Sep 17 00:00:00 2001 From: ManInDark <61268856+ManInDark@users.noreply.github.com> Date: Thu, 3 Apr 2025 20:34:54 +0200 Subject: [PATCH 110/568] also check default ssh-cert location for host (#34099) (#34100) (cherry picked from commit f8d549436ea70142514557b6a1d23d578d6aef42) --- docker/root/etc/s6/openssh/setup | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker/root/etc/s6/openssh/setup b/docker/root/etc/s6/openssh/setup index dbb3bafd35..6fbc599cc5 100755 --- a/docker/root/etc/s6/openssh/setup +++ b/docker/root/etc/s6/openssh/setup @@ -31,6 +31,18 @@ if [ -e /data/ssh/ssh_host_ecdsa_cert ]; then SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_cert"} fi +if [ -e /data/ssh/ssh_host_ed25519-cert.pub ]; then + SSH_ED25519_CERT=${SSH_ED25519_CERT:-"/data/ssh/ssh_host_ed25519-cert.pub"} +fi + +if [ -e /data/ssh/ssh_host_rsa-cert.pub ]; then + SSH_RSA_CERT=${SSH_RSA_CERT:-"/data/ssh/ssh_host_rsa-cert.pub"} +fi + +if [ -e /data/ssh/ssh_host_ecdsa-cert.pub ]; then + SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa-cert.pub"} +fi + if [ -d /etc/ssh ]; then SSH_PORT=${SSH_PORT:-"22"} \ SSH_LISTEN_PORT=${SSH_LISTEN_PORT:-"${SSH_PORT}"} \ From 3e3a109dd23f263a498032fa0db811dac8f65c07 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Thu, 3 Apr 2025 21:00:00 +0200 Subject: [PATCH 111/568] Fix invalid version in RPM package path (#34112) (cherry picked from commit 8fed70afdc0f63636cdd6f5ea3fdf88061ad8dc2) --- services/packages/rpm/repository.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index 961de7828f..f3b6f5148a 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -410,7 +410,6 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs [] files = append(files, f) } } - packageVersion := fmt.Sprintf("%s-%s", pd.FileMetadata.Version, pd.FileMetadata.Release) packages = append(packages, &Package{ Type: "rpm", Name: pd.Package.Name, @@ -439,7 +438,7 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs [] Archive: pd.FileMetadata.ArchiveSize, }, Location: Location{ - Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, packageVersion, pd.FileMetadata.Architecture, pd.Package.Name, packageVersion, pd.FileMetadata.Architecture), + Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, pd.Version.Version, pd.FileMetadata.Architecture, pd.Package.Name, pd.Version.Version, pd.FileMetadata.Architecture), }, Format: Format{ License: pd.VersionMetadata.License, From 64cc883ac1fdd22b8c70aac963b2a381486385f2 Mon Sep 17 00:00:00 2001 From: Mopcho <47301161+Mopcho@users.noreply.github.com> Date: Fri, 4 Apr 2025 21:09:40 +0300 Subject: [PATCH 112/568] Fix discord webhook 400 status code when description limit is exceeded (#34084) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes [#34027](https://github.com/go-gitea/gitea/issues/34027) Discord does not allow for description bigger than 2048 bytes. If the description is bigger than that it will throw 400 and the event won't appear in discord. To fix that, in the createPayload method we now slice the description to ensure it doesn’t exceed the limit. --------- Co-authored-by: wxiaoguang (cherry picked from commit 013b2686fe6d306c4fb800147207b099866683b9) --- modules/util/truncate.go | 9 +++++++++ modules/util/truncate_test.go | 15 +++++++++++++++ services/webhook/discord.go | 19 +++++++++++++------ services/webhook/discord_test.go | 2 +- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/modules/util/truncate.go b/modules/util/truncate.go index f2edbdc673..7207a89177 100644 --- a/modules/util/truncate.go +++ b/modules/util/truncate.go @@ -54,3 +54,12 @@ func SplitTrimSpace(input, sep string) []string { return stringList } + +// TruncateRunes returns a truncated string with given rune limit, +// it returns input string if its rune length doesn't exceed the limit. +func TruncateRunes(str string, limit int) string { + if utf8.RuneCountInString(str) < limit { + return str + } + return string([]rune(str)[:limit]) +} diff --git a/modules/util/truncate_test.go b/modules/util/truncate_test.go index dfe1230fd4..8187b13eb2 100644 --- a/modules/util/truncate_test.go +++ b/modules/util/truncate_test.go @@ -44,3 +44,18 @@ func TestSplitString(t *testing.T) { } test(tc, SplitStringAtByteN) } + +func TestTruncateRunes(t *testing.T) { + assert.Empty(t, TruncateRunes("", 0)) + assert.Empty(t, TruncateRunes("", 1)) + + assert.Empty(t, TruncateRunes("ab", 0)) + assert.Equal(t, "a", TruncateRunes("ab", 1)) + assert.Equal(t, "ab", TruncateRunes("ab", 2)) + assert.Equal(t, "ab", TruncateRunes("ab", 3)) + + assert.Empty(t, TruncateRunes("测试", 0)) + assert.Equal(t, "测", TruncateRunes("测试", 1)) + assert.Equal(t, "测试", TruncateRunes("测试", 2)) + assert.Equal(t, "测试", TruncateRunes("测试", 3)) +} diff --git a/services/webhook/discord.go b/services/webhook/discord.go index 3970a2552d..f60903c276 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -151,6 +151,18 @@ var ( redColor = color("ff3232") ) +// https://discord.com/developers/docs/resources/message#embed-object-embed-limits +// Discord has some limits in place for the embeds. +// According to some tests, there is no consistent limit for different character sets. +// For example: 4096 ASCII letters are allowed, but only 2490 emoji characters are allowed. +// To keep it simple, we currently truncate at 2000. +const discordDescriptionCharactersLimit = 2000 + +type discordConvertor struct { + Username string + AvatarURL string +} + // Create implements PayloadConvertor Create method func (d discordConvertor) Create(p *api.CreatePayload) (DiscordPayload, error) { // created tag/branch @@ -312,11 +324,6 @@ func (d discordConvertor) Package(p *api.PackagePayload) (DiscordPayload, error) return d.createPayload(p.Sender, text, "", p.Package.HTMLURL, color), nil } -type discordConvertor struct { - Username string - AvatarURL string -} - var _ shared.PayloadConvertor[DiscordPayload] = discordConvertor{} func (discordHandler) NewRequest(ctx context.Context, w *webhook_model.Webhook, t *webhook_model.HookTask) (*http.Request, []byte, error) { @@ -357,7 +364,7 @@ func (d discordConvertor) createPayload(s *api.User, title, text, url string, co Embeds: []DiscordEmbed{ { Title: title, - Description: text, + Description: util.TruncateRunes(text, discordDescriptionCharactersLimit), URL: url, Color: color, Author: DiscordEmbedAuthor{ diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go index ce3aaa10cf..b04be30bc6 100644 --- a/services/webhook/discord_test.go +++ b/services/webhook/discord_test.go @@ -175,7 +175,7 @@ func TestDiscordPayload(t *testing.T) { require.NoError(t, err) assert.Len(t, pl.Embeds, 1) - assert.Len(t, pl.Embeds[0].Description, 4096) + assert.Len(t, pl.Embeds[0].Description, 2000) }) t.Run("IssueComment", func(t *testing.T) { From b54d210eb36a82aa099a533dc8167ca3a182fcc2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 8 Apr 2025 05:19:29 +0000 Subject: [PATCH 113/568] Update dependency webpack to v5.99.1 (forgejo) (#7490) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7490 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index daa4aa5a87..c2129fea5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", - "webpack": "5.98.0", + "webpack": "5.99.1", "webpack-cli": "6.0.1", "wrap-ansi": "9.0.0" }, @@ -14679,9 +14679,9 @@ } }, "node_modules/webpack": { - "version": "5.98.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz", - "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==", + "version": "5.99.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.1.tgz", + "integrity": "sha512-o9gY7ibHPFxLjF6NtvQ6+5CGknsPTRllsL6SEnqR2Zhjk02hiIioJYLS7dvrWaykrRbbmhvDeKp36mKHNbKYiw==", "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.7", diff --git a/package.json b/package.json index 62e2905e63..792c731d65 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", - "webpack": "5.98.0", + "webpack": "5.99.1", "webpack-cli": "6.0.1", "wrap-ansi": "9.0.0" }, From 5b6cbd8195a3a319b89899e720668d7e070e4605 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 8 Apr 2025 11:11:21 +0000 Subject: [PATCH 114/568] Update module go.uber.org/mock to v0.5.1 (forgejo) (#7488) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go.uber.org/mock](https://github.com/uber/mock) | require | patch | `v0.5.0` -> `v0.5.1` | --- ### Release Notes
uber/mock (go.uber.org/mock) ### [`v0.5.1`](https://github.com/uber-go/mock/releases/tag/v0.5.1) [Compare Source](https://github.com/uber/mock/compare/v0.5.0...v0.5.1) #### 0.5.1 (7 Apr 2025) ##### Fixed - [#​220][]: Package mode will now generate code that uses aliases of types when they are used in the source. - [#​219][]: Fixed a collision between function argument names and package names in generated code. - [#​165][]: Fixed an issue where aliases specified by `-imports` were not being respected in generated code. [#​220]: https://github.com/uber-go/mock/pull/220 [#​219]: https://github.com/uber-go/mock/pull/219 [#​165]: https://github.com/uber-go/mock/pull/165 Thanks to [@​mtoader](https://github.com/mtoader) and [@​bstncartwright](https://github.com/bstncartwright) for their contributions to this release.
--- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7488 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 +- modules/queue/mock/redisuniversalclient.go | 159 +++++++++++---------- 4 files changed, 84 insertions(+), 83 deletions(-) diff --git a/Makefile b/Makefile index 4188561b45..d4a03752d0 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasource=go GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.31.0 # renovate: datasource=go -GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go +GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.5.1 # renovate: datasource=go GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.18.1 # renovate: datasource=go RENOVATE_NPM_PACKAGE ?= renovate@39.233.5 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate diff --git a/go.mod b/go.mod index 7f4e813ee0..4c47a9f47c 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/yuin/goldmark v1.7.8 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc gitlab.com/gitlab-org/api/client-go v0.126.0 - go.uber.org/mock v0.5.0 + go.uber.org/mock v0.5.1 golang.org/x/crypto v0.37.0 golang.org/x/image v0.25.0 golang.org/x/net v0.38.0 diff --git a/go.sum b/go.sum index dbdd833225..be8743379f 100644 --- a/go.sum +++ b/go.sum @@ -1491,8 +1491,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= -go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= +go.uber.org/mock v0.5.1 h1:ASgazW/qBmR+A32MYFDB6E2POoTgOwT509VP0CT/fjs= +go.uber.org/mock v0.5.1/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= diff --git a/modules/queue/mock/redisuniversalclient.go b/modules/queue/mock/redisuniversalclient.go index 65bac755d1..a19e639ac1 100644 --- a/modules/queue/mock/redisuniversalclient.go +++ b/modules/queue/mock/redisuniversalclient.go @@ -22,6 +22,7 @@ import ( type MockRedisClient struct { ctrl *gomock.Controller recorder *MockRedisClientMockRecorder + isgomock struct{} } // MockRedisClientMockRecorder is the mock recorder for MockRedisClient. @@ -56,38 +57,38 @@ func (mr *MockRedisClientMockRecorder) Close() *gomock.Call { } // DBSize mocks base method. -func (m *MockRedisClient) DBSize(arg0 context.Context) *redis.IntCmd { +func (m *MockRedisClient) DBSize(ctx context.Context) *redis.IntCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DBSize", arg0) + ret := m.ctrl.Call(m, "DBSize", ctx) ret0, _ := ret[0].(*redis.IntCmd) return ret0 } // DBSize indicates an expected call of DBSize. -func (mr *MockRedisClientMockRecorder) DBSize(arg0 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) DBSize(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DBSize", reflect.TypeOf((*MockRedisClient)(nil).DBSize), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DBSize", reflect.TypeOf((*MockRedisClient)(nil).DBSize), ctx) } // Decr mocks base method. -func (m *MockRedisClient) Decr(arg0 context.Context, arg1 string) *redis.IntCmd { +func (m *MockRedisClient) Decr(ctx context.Context, key string) *redis.IntCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Decr", arg0, arg1) + ret := m.ctrl.Call(m, "Decr", ctx, key) ret0, _ := ret[0].(*redis.IntCmd) return ret0 } // Decr indicates an expected call of Decr. -func (mr *MockRedisClientMockRecorder) Decr(arg0, arg1 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Decr(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockRedisClient)(nil).Decr), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockRedisClient)(nil).Decr), ctx, key) } // Del mocks base method. -func (m *MockRedisClient) Del(arg0 context.Context, arg1 ...string) *redis.IntCmd { +func (m *MockRedisClient) Del(ctx context.Context, keys ...string) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range keys { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Del", varargs...) @@ -96,17 +97,17 @@ func (m *MockRedisClient) Del(arg0 context.Context, arg1 ...string) *redis.IntCm } // Del indicates an expected call of Del. -func (mr *MockRedisClientMockRecorder) Del(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Del(ctx any, keys ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, keys...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Del", reflect.TypeOf((*MockRedisClient)(nil).Del), varargs...) } // Exists mocks base method. -func (m *MockRedisClient) Exists(arg0 context.Context, arg1 ...string) *redis.IntCmd { +func (m *MockRedisClient) Exists(ctx context.Context, keys ...string) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range keys { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exists", varargs...) @@ -115,45 +116,45 @@ func (m *MockRedisClient) Exists(arg0 context.Context, arg1 ...string) *redis.In } // Exists indicates an expected call of Exists. -func (mr *MockRedisClientMockRecorder) Exists(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Exists(ctx any, keys ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, keys...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exists", reflect.TypeOf((*MockRedisClient)(nil).Exists), varargs...) } // FlushDB mocks base method. -func (m *MockRedisClient) FlushDB(arg0 context.Context) *redis.StatusCmd { +func (m *MockRedisClient) FlushDB(ctx context.Context) *redis.StatusCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FlushDB", arg0) + ret := m.ctrl.Call(m, "FlushDB", ctx) ret0, _ := ret[0].(*redis.StatusCmd) return ret0 } // FlushDB indicates an expected call of FlushDB. -func (mr *MockRedisClientMockRecorder) FlushDB(arg0 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) FlushDB(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FlushDB", reflect.TypeOf((*MockRedisClient)(nil).FlushDB), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FlushDB", reflect.TypeOf((*MockRedisClient)(nil).FlushDB), ctx) } // Get mocks base method. -func (m *MockRedisClient) Get(arg0 context.Context, arg1 string) *redis.StringCmd { +func (m *MockRedisClient) Get(ctx context.Context, key string) *redis.StringCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Get", arg0, arg1) + ret := m.ctrl.Call(m, "Get", ctx, key) ret0, _ := ret[0].(*redis.StringCmd) return ret0 } // Get indicates an expected call of Get. -func (mr *MockRedisClientMockRecorder) Get(arg0, arg1 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Get(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockRedisClient)(nil).Get), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockRedisClient)(nil).Get), ctx, key) } // HDel mocks base method. -func (m *MockRedisClient) HDel(arg0 context.Context, arg1 string, arg2 ...string) *redis.IntCmd { +func (m *MockRedisClient) HDel(ctx context.Context, key string, fields ...string) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, key} + for _, a := range fields { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "HDel", varargs...) @@ -162,31 +163,31 @@ func (m *MockRedisClient) HDel(arg0 context.Context, arg1 string, arg2 ...string } // HDel indicates an expected call of HDel. -func (mr *MockRedisClientMockRecorder) HDel(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) HDel(ctx, key any, fields ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, key}, fields...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HDel", reflect.TypeOf((*MockRedisClient)(nil).HDel), varargs...) } // HKeys mocks base method. -func (m *MockRedisClient) HKeys(arg0 context.Context, arg1 string) *redis.StringSliceCmd { +func (m *MockRedisClient) HKeys(ctx context.Context, key string) *redis.StringSliceCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HKeys", arg0, arg1) + ret := m.ctrl.Call(m, "HKeys", ctx, key) ret0, _ := ret[0].(*redis.StringSliceCmd) return ret0 } // HKeys indicates an expected call of HKeys. -func (mr *MockRedisClientMockRecorder) HKeys(arg0, arg1 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) HKeys(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HKeys", reflect.TypeOf((*MockRedisClient)(nil).HKeys), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HKeys", reflect.TypeOf((*MockRedisClient)(nil).HKeys), ctx, key) } // HSet mocks base method. -func (m *MockRedisClient) HSet(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd { +func (m *MockRedisClient) HSet(ctx context.Context, key string, values ...any) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, key} + for _, a := range values { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "HSet", varargs...) @@ -195,73 +196,73 @@ func (m *MockRedisClient) HSet(arg0 context.Context, arg1 string, arg2 ...any) * } // HSet indicates an expected call of HSet. -func (mr *MockRedisClientMockRecorder) HSet(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) HSet(ctx, key any, values ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, key}, values...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HSet", reflect.TypeOf((*MockRedisClient)(nil).HSet), varargs...) } // Incr mocks base method. -func (m *MockRedisClient) Incr(arg0 context.Context, arg1 string) *redis.IntCmd { +func (m *MockRedisClient) Incr(ctx context.Context, key string) *redis.IntCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Incr", arg0, arg1) + ret := m.ctrl.Call(m, "Incr", ctx, key) ret0, _ := ret[0].(*redis.IntCmd) return ret0 } // Incr indicates an expected call of Incr. -func (mr *MockRedisClientMockRecorder) Incr(arg0, arg1 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Incr(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockRedisClient)(nil).Incr), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockRedisClient)(nil).Incr), ctx, key) } // LLen mocks base method. -func (m *MockRedisClient) LLen(arg0 context.Context, arg1 string) *redis.IntCmd { +func (m *MockRedisClient) LLen(ctx context.Context, key string) *redis.IntCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LLen", arg0, arg1) + ret := m.ctrl.Call(m, "LLen", ctx, key) ret0, _ := ret[0].(*redis.IntCmd) return ret0 } // LLen indicates an expected call of LLen. -func (mr *MockRedisClientMockRecorder) LLen(arg0, arg1 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) LLen(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LLen", reflect.TypeOf((*MockRedisClient)(nil).LLen), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LLen", reflect.TypeOf((*MockRedisClient)(nil).LLen), ctx, key) } // LPop mocks base method. -func (m *MockRedisClient) LPop(arg0 context.Context, arg1 string) *redis.StringCmd { +func (m *MockRedisClient) LPop(ctx context.Context, key string) *redis.StringCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LPop", arg0, arg1) + ret := m.ctrl.Call(m, "LPop", ctx, key) ret0, _ := ret[0].(*redis.StringCmd) return ret0 } // LPop indicates an expected call of LPop. -func (mr *MockRedisClientMockRecorder) LPop(arg0, arg1 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) LPop(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LPop", reflect.TypeOf((*MockRedisClient)(nil).LPop), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LPop", reflect.TypeOf((*MockRedisClient)(nil).LPop), ctx, key) } // Ping mocks base method. -func (m *MockRedisClient) Ping(arg0 context.Context) *redis.StatusCmd { +func (m *MockRedisClient) Ping(ctx context.Context) *redis.StatusCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Ping", arg0) + ret := m.ctrl.Call(m, "Ping", ctx) ret0, _ := ret[0].(*redis.StatusCmd) return ret0 } // Ping indicates an expected call of Ping. -func (mr *MockRedisClientMockRecorder) Ping(arg0 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Ping(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ping", reflect.TypeOf((*MockRedisClient)(nil).Ping), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ping", reflect.TypeOf((*MockRedisClient)(nil).Ping), ctx) } // RPush mocks base method. -func (m *MockRedisClient) RPush(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd { +func (m *MockRedisClient) RPush(ctx context.Context, key string, values ...any) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, key} + for _, a := range values { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "RPush", varargs...) @@ -270,17 +271,17 @@ func (m *MockRedisClient) RPush(arg0 context.Context, arg1 string, arg2 ...any) } // RPush indicates an expected call of RPush. -func (mr *MockRedisClientMockRecorder) RPush(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) RPush(ctx, key any, values ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, key}, values...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RPush", reflect.TypeOf((*MockRedisClient)(nil).RPush), varargs...) } // SAdd mocks base method. -func (m *MockRedisClient) SAdd(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd { +func (m *MockRedisClient) SAdd(ctx context.Context, key string, members ...any) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, key} + for _, a := range members { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "SAdd", varargs...) @@ -289,31 +290,31 @@ func (m *MockRedisClient) SAdd(arg0 context.Context, arg1 string, arg2 ...any) * } // SAdd indicates an expected call of SAdd. -func (mr *MockRedisClientMockRecorder) SAdd(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) SAdd(ctx, key any, members ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, key}, members...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SAdd", reflect.TypeOf((*MockRedisClient)(nil).SAdd), varargs...) } // SIsMember mocks base method. -func (m *MockRedisClient) SIsMember(arg0 context.Context, arg1 string, arg2 any) *redis.BoolCmd { +func (m *MockRedisClient) SIsMember(ctx context.Context, key string, member any) *redis.BoolCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SIsMember", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "SIsMember", ctx, key, member) ret0, _ := ret[0].(*redis.BoolCmd) return ret0 } // SIsMember indicates an expected call of SIsMember. -func (mr *MockRedisClientMockRecorder) SIsMember(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) SIsMember(ctx, key, member any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SIsMember", reflect.TypeOf((*MockRedisClient)(nil).SIsMember), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SIsMember", reflect.TypeOf((*MockRedisClient)(nil).SIsMember), ctx, key, member) } // SRem mocks base method. -func (m *MockRedisClient) SRem(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd { +func (m *MockRedisClient) SRem(ctx context.Context, key string, members ...any) *redis.IntCmd { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, key} + for _, a := range members { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "SRem", varargs...) @@ -322,22 +323,22 @@ func (m *MockRedisClient) SRem(arg0 context.Context, arg1 string, arg2 ...any) * } // SRem indicates an expected call of SRem. -func (mr *MockRedisClientMockRecorder) SRem(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) SRem(ctx, key any, members ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, key}, members...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SRem", reflect.TypeOf((*MockRedisClient)(nil).SRem), varargs...) } // Set mocks base method. -func (m *MockRedisClient) Set(arg0 context.Context, arg1 string, arg2 any, arg3 time.Duration) *redis.StatusCmd { +func (m *MockRedisClient) Set(ctx context.Context, key string, value any, expiration time.Duration) *redis.StatusCmd { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Set", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "Set", ctx, key, value, expiration) ret0, _ := ret[0].(*redis.StatusCmd) return ret0 } // Set indicates an expected call of Set. -func (mr *MockRedisClientMockRecorder) Set(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockRedisClientMockRecorder) Set(ctx, key, value, expiration any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockRedisClient)(nil).Set), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockRedisClient)(nil).Set), ctx, key, value, expiration) } From bca6ae786269508bdaabf416a2032531999575c8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 9 Apr 2025 06:05:01 +0000 Subject: [PATCH 115/568] Update module github.com/minio/minio-go/v7 to v7.0.90 (forgejo) (#7495) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) | require | patch | `v7.0.88` -> `v7.0.90` | --- ### Release Notes
minio/minio-go (github.com/minio/minio-go/v7) ### [`v7.0.90`](https://github.com/minio/minio-go/releases/tag/v7.0.90): Bugfix v7.0.90 [Compare Source](https://github.com/minio/minio-go/compare/v7.0.89...v7.0.90) #### What's Changed - Add anonymous chunked encoding with trailing headers by [@​klauspost](https://github.com/klauspost) in https://github.com/minio/minio-go/pull/2084 - Implement AppendObject() API by [@​harshavardhana](https://github.com/harshavardhana) in https://github.com/minio/minio-go/pull/2082 - Update x/net version by [@​BorjaOuterelo](https://github.com/BorjaOuterelo) in https://github.com/minio/minio-go/pull/2085 - Rety iterators by [@​tlyons-cs](https://github.com/tlyons-cs) in https://github.com/minio/minio-go/pull/2087 - Add function for getting creds of remote client by [@​shtripat](https://github.com/shtripat) in https://github.com/minio/minio-go/pull/2089 #### New Contributors - [@​BorjaOuterelo](https://github.com/BorjaOuterelo) made their first contribution in https://github.com/minio/minio-go/pull/2085 - [@​tlyons-cs](https://github.com/tlyons-cs) made their first contribution in https://github.com/minio/minio-go/pull/2087 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.89...v7.0.90 ### [`v7.0.89`](https://github.com/minio/minio-go/releases/tag/v7.0.89): Bugfix Release [Compare Source](https://github.com/minio/minio-go/compare/v7.0.88...v7.0.89) #### What's Changed - add PurgeOnDelete to versioning config by [@​poornas](https://github.com/poornas) in https://github.com/minio/minio-go/pull/2074 - Adds `TokenRevokeType` field to credential providers. by [@​taran-p](https://github.com/taran-p) in https://github.com/minio/minio-go/pull/2075 - make downtime info as map to denote per target info by [@​Praveenrajmani](https://github.com/Praveenrajmani) in https://github.com/minio/minio-go/pull/2079 - update deps and move CI/CD to go1.23, go1.24 by [@​harshavardhana](https://github.com/harshavardhana) in https://github.com/minio/minio-go/pull/2080 - update golint version by [@​harshavardhana](https://github.com/harshavardhana) in https://github.com/minio/minio-go/pull/2083 #### New Contributors - [@​taran-p](https://github.com/taran-p) made their first contribution in https://github.com/minio/minio-go/pull/2075 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.88...v7.0.89
--- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7495 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4c47a9f47c..83d423d30e 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/jhillyerd/enmime/v2 v2.1.0 github.com/json-iterator/go v1.1.12 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/klauspost/compress v1.17.11 + github.com/klauspost/compress v1.18.0 github.com/klauspost/cpuid/v2 v2.2.10 github.com/lib/pq v1.10.9 github.com/markbates/goth v1.80.0 @@ -76,7 +76,7 @@ require ( github.com/meilisearch/meilisearch-go v0.31.0 github.com/mholt/archiver/v3 v3.5.1 github.com/microcosm-cc/bluemonday v1.0.27 - github.com/minio/minio-go/v7 v7.0.88 + github.com/minio/minio-go/v7 v7.0.90 github.com/msteinert/pam/v2 v2.0.0 github.com/nektos/act v0.2.52 github.com/niklasfasching/go-org v1.7.0 diff --git a/go.sum b/go.sum index be8743379f..71d880aa72 100644 --- a/go.sum +++ b/go.sum @@ -1203,8 +1203,8 @@ github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= -github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -1268,8 +1268,8 @@ github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.88 h1:v8MoIJjwYxOkehp+eiLIuvXk87P2raUtoU5klrAAshs= -github.com/minio/minio-go/v7 v7.0.88/go.mod h1:33+O8h0tO7pCeCWwBVa07RhVVfB/3vS4kEX7rwYKmIg= +github.com/minio/minio-go/v7 v7.0.90 h1:TmSj1083wtAD0kEYTx7a5pFsv3iRYMsOJ6A4crjA1lE= +github.com/minio/minio-go/v7 v7.0.90/go.mod h1:uvMUcGrpgeSAAI6+sD3818508nUyMULw94j2Nxku/Go= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= From 3be290457f5bb2e912d9128d659d7cd9ce501be1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 9 Apr 2025 06:11:23 +0000 Subject: [PATCH 116/568] Update module golang.org/x/image to v0.26.0 (forgejo) (#7497) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [golang.org/x/image](https://pkg.go.dev/golang.org/x/image) | require | minor | [`v0.25.0` -> `v0.26.0`](https://cs.opensource.google/go/x/image/+/refs/tags/v0.25.0...refs/tags/v0.26.0) | --- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7497 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 83d423d30e..a91f621c15 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( gitlab.com/gitlab-org/api/client-go v0.126.0 go.uber.org/mock v0.5.1 golang.org/x/crypto v0.37.0 - golang.org/x/image v0.25.0 + golang.org/x/image v0.26.0 golang.org/x/net v0.38.0 golang.org/x/oauth2 v0.29.0 golang.org/x/sync v0.13.0 diff --git a/go.sum b/go.sum index 71d880aa72..cce3efc8bb 100644 --- a/go.sum +++ b/go.sum @@ -1546,8 +1546,8 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= -golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= +golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY= +golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= From eca57cc3e94cb1175380c18aa046c0fc5c2ef675 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 9 Apr 2025 09:51:31 +0000 Subject: [PATCH 117/568] Update dependency webpack to v5.99.5 (forgejo) (#7494) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7494 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2129fea5b..ef1bbf6f0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", - "webpack": "5.99.1", + "webpack": "5.99.5", "webpack-cli": "6.0.1", "wrap-ansi": "9.0.0" }, @@ -14679,9 +14679,9 @@ } }, "node_modules/webpack": { - "version": "5.99.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.1.tgz", - "integrity": "sha512-o9gY7ibHPFxLjF6NtvQ6+5CGknsPTRllsL6SEnqR2Zhjk02hiIioJYLS7dvrWaykrRbbmhvDeKp36mKHNbKYiw==", + "version": "5.99.5", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.5.tgz", + "integrity": "sha512-q+vHBa6H9qwBLUlHL4Y7L0L1/LlyBKZtS9FHNCQmtayxjI5RKC9yD8gpvLeqGv5lCQp1Re04yi0MF40pf30Pvg==", "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.7", diff --git a/package.json b/package.json index 792c731d65..3f504588a5 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", - "webpack": "5.99.1", + "webpack": "5.99.5", "webpack-cli": "6.0.1", "wrap-ansi": "9.0.0" }, From 282125e90f744fd307ccee6dc68f40d2426d2f1f Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Wed, 9 Apr 2025 17:37:46 +0000 Subject: [PATCH 118/568] fix(ui): ensure consistent switch position in markdown editor (#7492) Followup to https://codeberg.org/forgejo/forgejo/pulls/7481. Fix a bug reported by @Gusted where the switch would jump ~1px up when switched to preview mode. It was because the switch is always center-aligning to the largest element in the toolbar. With toolbar buttons disappearing, the largest element was the switch itself. By placing it in a box with same height as the buttons we can ensure it can always stay in the same position. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7492 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/shared/combomarkdowneditor.tmpl | 8 +++++--- web_src/css/editor/combomarkdowneditor.css | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 6d82c37c58..e9fbb67313 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -16,9 +16,11 @@ Template Attributes: {{if .MarkdownPreviewUrl}} -
- {{ctx.Locale.Tr "write"}} - {{ctx.Locale.Tr "preview"}} +
+
+ {{ctx.Locale.Tr "write"}} + {{ctx.Locale.Tr "preview"}} +
{{end}}
diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css index a40f0c175c..b151080c64 100644 --- a/web_src/css/editor/combomarkdowneditor.css +++ b/web_src/css/editor/combomarkdowneditor.css @@ -11,7 +11,11 @@ flex-wrap: wrap; } -markdown-toolbar .switch .item { +.markdown-toolbar-switch { + display: flex; + height: 30px; +} +.markdown-toolbar-switch .switch .item { padding: 0.25em 1em; } From c31be003d14d3e4c6892082ce14a4d8a2008a41f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 10 Apr 2025 01:41:48 +0000 Subject: [PATCH 119/568] Update module golang.org/x/net to v0.39.0 (forgejo) (#7504) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7504 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a91f621c15..7152cf99d3 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( go.uber.org/mock v0.5.1 golang.org/x/crypto v0.37.0 golang.org/x/image v0.26.0 - golang.org/x/net v0.38.0 + golang.org/x/net v0.39.0 golang.org/x/oauth2 v0.29.0 golang.org/x/sync v0.13.0 golang.org/x/sys v0.32.0 diff --git a/go.sum b/go.sum index cce3efc8bb..467f1d832f 100644 --- a/go.sum +++ b/go.sum @@ -1647,8 +1647,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= +golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 911806879f5d04387679d9dc2d4d7c68fba65f72 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 10 Apr 2025 02:36:29 +0000 Subject: [PATCH 120/568] Update module golang.org/x/tools/cmd/deadcode to v0.32.0 (forgejo) (#7505) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d4a03752d0..942605aa19 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renova XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasource=go GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go -DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.31.0 # renovate: datasource=go +DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.32.0 # renovate: datasource=go GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.5.1 # renovate: datasource=go GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.18.1 # renovate: datasource=go RENOVATE_NPM_PACKAGE ?= renovate@39.233.5 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate From 0bfb3751fb33153fcc5cfde1a2ae101389bf06b8 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 10 Apr 2025 05:25:01 +0000 Subject: [PATCH 121/568] i18n: update of translations from Codeberg Translate Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Benedikt Straub Co-authored-by: Codeberg Translate Co-authored-by: Edgarsons Co-authored-by: Fjuro Co-authored-by: Gusted Co-authored-by: Kita Ikuyo Co-authored-by: Miguel P.L Co-authored-by: Outbreak2096 Co-authored-by: Porrumentzio Co-authored-by: SomeTr Co-authored-by: Wuzzy Co-authored-by: artnay Co-authored-by: earl-warren Co-authored-by: nekoedges Co-authored-by: tacaly Co-authored-by: xtex Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/cs/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/de/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/fil/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/nds/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/nl/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/ru/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/uk/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/cs/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/de/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/es/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fi/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fil/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fr/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/nds/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/ru/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/uk/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/zh_Hans/ Translation: Forgejo/forgejo Translation: Forgejo/forgejo-next --- options/locale/locale_cs-CZ.ini | 7 ++- options/locale/locale_da.ini | 3 ++ options/locale/locale_de-DE.ini | 2 +- options/locale/locale_es-ES.ini | 16 ++++-- options/locale/locale_eu.ini | 1 + options/locale/locale_fi-FI.ini | 78 +++++++++++++++++++++++---- options/locale/locale_fil.ini | 5 +- options/locale/locale_fr-FR.ini | 54 +++++++++++++++---- options/locale/locale_lv-LV.ini | 5 +- options/locale/locale_nds.ini | 3 ++ options/locale/locale_ru-RU.ini | 17 +++--- options/locale/locale_uk-UA.ini | 5 +- options/locale/locale_zh-CN.ini | 21 ++++---- options/locale_next/locale_cs-CZ.json | 5 +- options/locale_next/locale_da.json | 5 +- options/locale_next/locale_de-DE.json | 5 +- options/locale_next/locale_fil.json | 6 ++- options/locale_next/locale_lv-LV.json | 5 +- options/locale_next/locale_nds.json | 5 +- options/locale_next/locale_nl-NL.json | 4 +- options/locale_next/locale_ru-RU.json | 6 ++- options/locale_next/locale_uk-UA.json | 5 +- options/locale_next/locale_zh-CN.json | 6 +-- 23 files changed, 205 insertions(+), 64 deletions(-) create mode 100644 options/locale/locale_eu.ini diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index caa3db3af9..ea464e3c91 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1414,7 +1414,7 @@ editor.file_is_a_symlink=`„%s“ je symbolický odkaz. Symbolické odkazy nemo editor.filename_is_a_directory=Jméno souboru „%s“ je již použito jako jméno adresáře v tomto repozitáři. editor.file_editing_no_longer_exists=Upravovaný soubor „%s“ již není součástí tohoto repozitáře. editor.file_deleting_no_longer_exists=Odstraňovaný soubor „%s“ již není součástí tohoto repozitáře. -editor.file_changed_while_editing=Obsah souboru se od zahájení úprav změnil. Klikněte sem pro jeho zobrazení nebo odešlete změny ještě jednou pro jeho přepsání. +editor.file_changed_while_editing=Obsah souboru se od doby, kdy jste ho otevřeli, změnil. Klikněte sem pro jeho zobrazení nebo odešlete změny ještě jednou pro jeho přepsání. editor.file_already_exists=Soubor „%s“ již existuje v tomto repozitáři. editor.commit_empty_file_header=Odeslat prázdný soubor editor.commit_empty_file_text=Soubor, který se chystáte odeslat, je prázdný. Pokračovat? @@ -2912,6 +2912,9 @@ issues.filter_no_results = Žádné výsledky migrate.repo_desc_helper = Ponechte prázdné pro importování existujícího popisu archive.nocomment = Komentování není možné, protože je repozitář archivován. comment.blocked_by_user = Komentování není možné, protože jste byli zablokováni majitelem repozitáře nebo autorem. +sync_fork.branch_behind_few = Tato větev je %d revizí pozadu za %s +sync_fork.button = Synchronizovat +sync_fork.branch_behind_one = Tato větev je %d revizi pozadu za %s [graphs] component_loading_info = Tohle může chvíli trvat… @@ -3930,7 +3933,7 @@ runners.delete_runner=Odstranit tento runner runners.delete_runner_success=Runner byl úspěšně odstraněn runners.delete_runner_failed=Odstranění runneru selhalo runners.delete_runner_header=Potvrdit odstranění tohoto runneru -runners.delete_runner_notice=Pokud na tomto runneru běží úloha, bude ukončena a označena jako neúspěšná. Může dojít k přerušení vytváření pracovního postupu. +runners.delete_runner_notice=Pokud na tomto runneru běží úloha, bude ukončena a označena jako neúspěšná. Může dojít k přerušení vytváření workflow. runners.status.unspecified=Neznámý runners.status.idle=Nečinný runners.status.active=Aktivní diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index 3de53b2ebf..e63280e845 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -2725,6 +2725,9 @@ branch.rename_branch_to = Omdøb "%s" til: migrate.repo_desc_helper = Lad være tom for at importere eksisterende beskrivelse archive.nocomment = Det er ikke muligt at kommentere, fordi depotet er arkiveret. comment.blocked_by_user = Det er ikke muligt at kommentere, fordi du er blokeret af depots ejer eller forfatteren. +sync_fork.branch_behind_few = Denne gren er %d commits bag %s +sync_fork.button = Sync +sync_fork.branch_behind_one = Denne gren er %d commit bag %s [notification] watching = Overvåger diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 77c011677b..745e98a226 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1412,7 +1412,7 @@ editor.file_is_a_symlink=`„%s“ ist ein symbolischer Link. Symbolische Links editor.filename_is_a_directory=Der Dateiname „%s“ wird bereits als Verzeichnisname in diesem Repository verwendet. editor.file_editing_no_longer_exists=Die bearbeitete Datei „%s“ existiert nicht mehr in diesem Repository. editor.file_deleting_no_longer_exists=Die zu löschende Datei „%s“ existiert nicht mehr in diesem Repository. -editor.file_changed_while_editing=Der Inhalt der Datei hat sich seit dem Beginn der Bearbeitung geändert. Hier klicken, um die Änderungen anzusehen, oder Änderungen erneut comitten, um sie zu überschreiben. +editor.file_changed_while_editing=Der Inhalt der Datei hat sich nach dem Öffnen geändert. Hier klicken, um die Änderungen anzusehen, oder Änderungen erneut committen, um sie zu überschreiben. editor.file_already_exists=Eine Datei mit dem Namen „%s“ existiert bereits in diesem Repository. editor.commit_empty_file_header=Leere Datei committen editor.commit_empty_file_text=Die Datei, die du commiten willst, ist leer. Fortfahren? diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 57e3369d67..1d04ef1450 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -1075,6 +1075,11 @@ keep_pronouns_private = Mostrar pronombres solo a personas autenticadas storage_overview = Resumen del almacenamiento quota.sizes.assets.artifacts = Artefactos quota.sizes.assets.attachments.releases = Archivos adjuntos del lanzamiento +change_username_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +change_username_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d día, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +quota.rule.exceeded = Excedido +quota.rule.no_limit = Ilimitado +quota.sizes.assets.all = Activos [repo] owner=Propietario @@ -1237,7 +1242,7 @@ migrate.migrate_items_options=Se necesita un token de acceso para migrar element migrated_from=Migrado desde %[2]s migrated_from_fake=Migrado desde %[1]s migrate.migrate=Migrar desde %s -migrate.migrating=Migrando desde %s... +migrate.migrating=Migrando desde %s… migrate.migrating_failed=La migración desde %s ha fallado. migrate.migrating_failed.error=Error al migrar: %s migrate.migrating_failed_no_addr=Migración fallida. @@ -2532,7 +2537,7 @@ settings.lfs_invalid_locking_path=Ruta no válida: %s settings.lfs_invalid_lock_directory=No se puede bloquear el directorio: %s settings.lfs_lock_already_exists=El bloqueo ya existe: %s settings.lfs_lock=Bloquear -settings.lfs_lock_path=Ruta del archivo a bloquear... +settings.lfs_lock_path=Ruta del archivo a bloquear… settings.lfs_locks_no_locks=Sin bloqueos settings.lfs_lock_file_no_exist=El archivo bloqueado no existe en la rama por defecto settings.lfs_force_unlock=Forzar desbloqueo @@ -2862,9 +2867,10 @@ release.add_external_asset = Añadir un recurso externo settings.enforce_on_admins_desc = Los administradores del repositorio no pueden saltarse esta regla. pulls.editable = Editable issues.filter_no_results = No hay resultados +release.type_attachment = Archivo adjunto [graphs] -component_loading = Cargando %s... +component_loading = Cargando %s… component_loading_failed = No se pudo cargar %s contributors.what = contribuciones recent_commits.what = commits recientes @@ -2997,7 +3003,7 @@ teams.invite.by=Invitado por %s teams.invite.description=Por favor, haga clic en el botón de abajo para unirse al equipo. follow_blocked_user = No puedes seguir a esta organización porque esta organización te ha bloqueado. open_dashboard = Abrir panel de control -settings.change_orgname_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estará disponible para cualquiera después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +settings.change_orgname_redirect_prompt.with_cooldown.few = El antiguo nombre de la organización estará disponible para todos después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre durante el periodo de tiempo de espera. settings.change_orgname_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estará disponible para cualquiera después un periodo de tiempo de espera de %[1]d día, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. [admin] @@ -3799,6 +3805,8 @@ alt.install = Instalar paquete alt.repository = Información del repositorio alt.repository.architectures = Arquitecturas alt.repository.multiple_groups = Este paquete está disponible en múltiples grupos. +arch.version.description = Descripción +arch.version.provides = Proveedores [secrets] secrets=Secretos diff --git a/options/locale/locale_eu.ini b/options/locale/locale_eu.ini new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/options/locale/locale_eu.ini @@ -0,0 +1 @@ + diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 11b2b3eb0c..0cc2cc9b1f 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -545,6 +545,7 @@ issue_assigned.issue = @%[1]s osoitti sinulle ongelman %[2]s repossa %[3]s. register_notify.text_1 = tämä on %s:n rekistöröitymisen vahvistussähköposti! reset_password.text = jos tämä oli sinun toimestasi, ole hyvä ja klikkaa oheista linkkiä palauttaaksesi tilisi %s sisällä: totp_disabled.no_2fa = Muita kaksivaiheisen tunnistautumisen menetelmiä ei ole konfiguroituna, joten et tarvitse kaksivaiheista tunnistautumista kirjautuaaksesi tilillesi. +totp_enrolled.subject = Olet aktivoinut TOTP:in kaksivaiheisen todennuksen menetelmäksi @@ -666,6 +667,8 @@ follow_blocked_user = Et voi seurata tätä käyttäjää, koska olet estänyt k disabled_public_activity = Käyttäjä on poistanut käytöstä toiminnan julkisen näkyvyyden. form.name_reserved = Käyttäjätunnus "%s" on varattu. form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu käyttäjätunnuksessa. +public_activity.visibility_hint.admin_private = Aktiivisuus on näkyvissä sinulle, koska olet ylläpitäjä, mutta käyttäjä haluaa pitää aktiivisuutensa yksityisenä. +public_activity.visibility_hint.self_private_profile = Aktiivisuutesi on näkyvissä vain sinulle ja instanssin ylläpitäjille, koska profiilisi on yksityinen. Määritä. [settings] @@ -994,12 +997,12 @@ download_tar=Lataa TAR.GZ repo_desc=Kuvaus repo_lang=Kieli repo_gitignore_helper=Valitse .gitignore-mallit -issue_labels=Ongelmien tunnisteet +issue_labels=Tunnisteet issue_labels_helper=Valitse nimiöjoukko license=Lisenssi license_helper=Valitse lisenssitiedosto readme=README -auto_init=Alusta repo (Luo .gitignore, License ja README) +auto_init=Alusta repo create_repo=Luo repo default_branch=Oletushaara mirror_prune=Karsi @@ -1168,7 +1171,7 @@ issues.new_label=Uusi tunniste issues.new_label_placeholder=Tunnisteen nimi issues.new_label_desc_placeholder=Kuvaus issues.create_label=Luo tunniste -issues.label_templates.helper=Valitse tunnistejoukko +issues.label_templates.helper=Valitse tunnisteen esiasetus issues.add_milestone_at=`lisäsi tämän merkkipaaluun %s %s` issues.change_milestone_at=`vaihtoi merkkipaalun %s merkkipaaluun %s %s` issues.remove_milestone_at=`poisti tämän %s merkkipaalusta %s` @@ -1244,7 +1247,7 @@ issues.label_count=%d tunnistetta issues.label_open_issues=%d avointa ongelmaa issues.label_edit=Muokkaa issues.label_delete=Poista -issues.label_modify=Muokkaa tunniste +issues.label_modify=Muokkaa tunnistetta issues.label_deletion=Poista tunniste issues.label.filter_sort.alphabetically=Aakkosjärjestyksessä issues.label.filter_sort.reverse_alphabetically=Käänteisessä aakkosjärjestyksessä @@ -1272,7 +1275,7 @@ issues.start_tracking_history=`aloitti työskentelyn %s` issues.tracker_auto_close=Ajan seuranta pysähtyy automaattisesti kun tämä ongelma on suljettu issues.stop_tracking=Pysäytä ajanotto issues.stop_tracking_history=`lopetti työskentelyn %s` -issues.add_time=Lisää aika käsin +issues.add_time=Lisää aika manuaalisesti issues.add_time_short=Lisää aika issues.add_time_cancel=Peruuta issues.add_time_history=`lisäsi käytetyn ajan %s` @@ -2129,13 +2132,62 @@ archive.pull.noreview = Tämä repo on arkistoitu. Et voi katselmoida vetopyynt tree_path_not_found_tag = Polkua %[1]s ei ole olemassa tagissa %[2]s transfer.no_permission_to_accept = Sinulla ei ole oikeutta hyväksyä tätä siirtoa. settings.web_hook_name_feishu = Feishu / Lark Suite +issues.review.reviewers = Katselmoijat +issues.new.no_reviewers = Ei katselmoijia +issues.add_label = lisäsi tunnisteen %s %s +issues.due_date_added = lisäsi määräpäivän %s %s +issues.review.add_review_request = pyysi katselmointia käyttäjältä %[1]s %[2]s +issues.ref_pull_from = `viittasi tähän vetopyyntöön %[4]s %[2]s` +pulls.commit_ref_at = `viittasi tähän vetopyyntöön kommitista %[2]s` +issues.review.comment = katselmoi %s +issues.add_labels = lisäsi tunnisteet %s %s +issues.review.add_review_requests = pyysi katselmointeja käyttäjiltä %[1]s %[2]s +pulls.blocked_by_official_review_requests = Tämä vetopyyntö on estetty, koska siltä puuttuu hyväksyntä yhdeltä tai useammalta viralliselta katselmoijalta. +issues.author.tooltip.issue = Tämä käyttäjä on tämän ongelman tekijä. +issues.author.tooltip.pr = Tämä käyttäjä on tämän vetopyynnön tekijä. +issues.role.contributor_helper = Tämä käyttäjä on aiemmin kommitoinut tähän repoon. +settings.event_pull_request_label = Tunnisteet +issues.due_date_remove = poisti määräpäivän %s %s +settings.event_issue_label = Tunnisteet +settings.authorization_header = Authorization-otsake +diff.has_escaped = Tällä rivillä on piilotettuja Unicode-merkkejä +issues.max_pinned = Et voi kiinnittää enempää ongelmia +settings.external_tracker_url_error = Ulkoisen ongelmienseurannan URL-osoite ei ole kelvollinen. +settings.event_pull_request_review = Katselmoinnit +settings.event_pull_request_review_request = Katselmointipyynnöt +issues.num_reviews_one = %d katselmointi +issues.num_reviews_few = %d katselmointia +issues.filter_no_results = Ei tuloksia +issues.filter_no_results_placeholder = Kokeile määrittää eri hakusuodattimet. +projects.edit_subheader = Projektit organisoivat ongelmia ja seuraavat edistymistä. +issues.label_templates.title = Lataa tunnisteen esiasetus +issues.label_deletion_desc = Tunnisteen poistaminen poistaa sen kaikista ongelmista. Jatketaanko? +issues.attachment.download = `Napsauta ladataksesi "%s"` +issues.review.option.hide_outdated_comments = Piilota vanhentuneet kommentit +issues.review.show_outdated = Näytä vanhentuneet +issues.review.hide_outdated = Piilota vanhentuneet +settings.external_wiki_url_error = Ulkoisen wikin URL-osoite ei ole kelvollinen. +issues.attachment.open_tab = `Napsauta nähdäksesi "%s" uudessa välilehdessä` +issues.unpin_issue = Poista ongelman kiinnitys +issues.review.outdated_description = Sisältö on muuttunut siitä ajanhetkestä, kun tämä kommentti luotiin +issues.review.option.show_outdated_comments = Näytä vanhentuneet kommentit +issues.review.outdated = Vanhentunut +issues.label_templates.use = Käytä tunnisteen esiasetusta +issues.label_deletion_success = Tunniste on poistettu. +issues.cancel_tracking = Hylkää +issues.choose.get_started = Aloitetaan +settings.event_fork = Forkkaus +pulls.no_merge_access = Sinulla ei ole valtuutta yhdistää tätä vetopyyntöä. +pulls.sign_in_require = Kirjaudu sisään luodaksesi uuden vetopyynnön. +delete_preexisting = Poista olemassa olevat tiedostot +issues.reaction.add = Lisää reaktio [graphs] component_loading_info = Tämä saattaa kestää hetken… component_failed_to_load = Odottamaton virhe. -component_loading = Ladataan %s... +component_loading = Ladataan %s… contributors.what = kontribuutiot recent_commits.what = viimeisimmät kommitit code_frequency.what = koodifrekvenssi @@ -2319,7 +2371,7 @@ users.password_helper=Jätä salasanakenttä tyhjäksi jos haluat pitää sen mu users.update_profile_success=Käyttäjän tili on päivitetty. users.edit_account=Muokkaa käyttäjätiliä users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa.) -users.is_activated=Käyttäjätili on aktivoitu +users.is_activated=Aktivoitu tili users.prohibit_login=Ota sisäänkirjautuminen pois käytöstä users.is_admin=Ylläpitäjätili users.is_restricted=Rajoitettu tili @@ -2406,7 +2458,7 @@ auths.edit=Muokkaa todennuslähdettä auths.update_success=Todennuslähde on päivitetty. auths.update=Päivitä todennuslähde auths.delete=Poista todennuslähde -auths.delete_auth_title=Todennuslähteen poisto +auths.delete_auth_title=Poista todennuslähde auths.delete_auth_desc=Todennuslähteen poisto estää käyttäjiä käyttämästä sitä kirjautumiseen. Jatketaanko? auths.deletion_success=Todennuslähde on poistettu. @@ -2445,7 +2497,7 @@ config.show_registration_button=Näytä rekisteröitymispainike config.enable_captcha=Ota CAPTCHA käyttöön config.active_code_lives=Aktivointikoodin vanhenemisaika config.default_keep_email_private=Piilota sähköpostiosoitteet oletuksena -config.default_visibility_organization=Uuden organisaation oletusnäkyvyys +config.default_visibility_organization=Uusien organisaatioiden oletusnäkyvyys config.webhook_config=Webkoukkujen asetukset config.queue_length=Jonon pituus @@ -2468,7 +2520,7 @@ config.cache_conn=Välimuistin yhteys merkkijono config.session_config=Istunnon asetukset config.session_provider=Istunnon toimittaja config.provider_config=Toimittajan asetukset -config.cookie_name=Evästenimi +config.cookie_name=Evästeen nimi config.gc_interval_time=GC aikaväli aika config.session_life_time=Istunnon elinikä config.https_only=Vain HTTPS @@ -2602,6 +2654,12 @@ config.default_allow_only_contributors_to_track_time = Salli vain avustajien seu monitor.download_diagnosis_report = Lataa diagnostiikkaraportti monitor.duration = Kesto (s) monitor.last_execution_result = Tulos +users.bot = Botti +auths.syncenabled = Käytä käyttäjäsynkronointia +auths.enable_ldap_groups = Käytä LDAP-ryhmiä +dashboard.sync_branch.started = Haarasynkronointi aloitettu +dashboard.sync_tag.started = Tagisynkronointi aloitettu +auths.login_source_exist = Todennuslähde "%s" on jo olemassa. [action] diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini index efa93f5d2c..f8237caab2 100644 --- a/options/locale/locale_fil.ini +++ b/options/locale/locale_fil.ini @@ -1536,7 +1536,7 @@ pulls.merged_by =ni/ng %[3]s ay naisama %[1]s commitstatus.pending = Nakabinbin issues.review.pending = Nakabinbin pulls.status_checking = Nakabinbin ang ilang mga pagsusuri -editor.file_changed_while_editing = Ang nilalaman ng file ay nagbago mula noong nagsimula kang mag-edit. Mag-click dito upang makita ang mga pagbabago o Mag-commit ng mga pagbabago muli para i-overwrite sila. +editor.file_changed_while_editing = Ang nilalaman ng file ay nagbago mula noong binuksan mo ang file. Mag-click dito upang makita ang mga pagbabago o Mag-commit ng mga pagbabago muli para i-overwrite sila. editor.file_already_exists = Umiiral na ang file na may pangalang "%s" sa repositoryong ito. issues.review.review = Suriin activity.git_stats_push_to_branch = sa %s at @@ -2770,6 +2770,9 @@ issues.filter_no_results_placeholder = Subukang ayusin ang iyong mga filter sa p migrate.repo_desc_helper = Iwanang walang laman para i-import ang umiiral na paglalarawan archive.nocomment = Hindi posible ang pagkomento dahil naka-archive ang repositoryo. comment.blocked_by_user = Hindi posible ang pagkomento dahil hinarang ka ng may-ari ng repositoryo o ng may-akda. +sync_fork.button = I-sync +sync_fork.branch_behind_one = Ang branch na ito ay %d commit sa likod ng %s +sync_fork.branch_behind_few = Ang branch na ito ay %d mga commit sa likod ng %s [search] commit_kind = Maghanap ng mga commit… diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 218c9af843..b3a04d28ea 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1064,6 +1064,32 @@ user_block_yourself = Vous ne pouvez pas vous bloquer vous même. pronouns_custom_label = Pronoms personnalisés change_username_redirect_prompt.with_cooldown.one = L'ancien pseudonyme sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. change_username_redirect_prompt.with_cooldown.few = L'ancien pseudonyme sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. +quota.rule.exceeded = Dépassé +regenerate_token = Régénérer +access_token_regeneration = Régénérer le token d'accès +access_token_regeneration_desc = La régénération d'un token révoquera l'accès à votre compte pour les applications qui l'utilisaient. Cela n'est pas reversible. Continuer ? +regenerate_token_success = Le token a été régénéré. Les applications qui l'utilisent n'ont plus accès à votre compte et doivent être mises à jour avec le nouveau token. +quota.applies_to_org = Les quotas suivants s'applique à cette organisation +quota.rule.no_limit = Sans limite +quota.sizes.all = Tout +quota.sizes.repos.all = Dépôts +quota.sizes.repos.public = Dépôts publics +quota.sizes.repos.private = Dépôts privés +quota.sizes.git.all = Contenu dans Git +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Contenus +quota.sizes.assets.attachments.all = Attachements +quota.sizes.assets.attachments.issues = Attachements de tickets +quota.sizes.assets.attachments.releases = Attachements de version +quota.sizes.assets.artifacts = Artefacts +quota.sizes.assets.packages.all = Paquets +quota.sizes.wiki = Wiki +quota.applies_to_user = Les quotas suivants s'appliquent à votre compte +quota.rule.exceeded.helper = La taille totale des objets pour cette règle ont dépassé le quota. +keep_pronouns_private = Ne montrer les pronoms qu'aux utilisateurs authentifiés +keep_pronouns_private.description = Cela masquera votre pronoms aux visiteurs qui ne sont pas authentifiés. +storage_overview = Vue d'ensemble du stockage +quota = Quota [repo] new_repo_helper=Un dépôt contient tous les fichiers d’un projet, ainsi que l’historique de leurs modifications. Vous avez déjà ça ailleurs ? Migrez-le ici.. @@ -1228,7 +1254,7 @@ migrate.migrate_items_options=Un jeton d'accès est requis pour migrer des élé migrated_from=Migré de %[2]s migrated_from_fake=Migré de %[1]s migrate.migrate=Migrer depuis %s -migrate.migrating=Migration de %s ... +migrate.migrating=Migration de %s … migrate.migrating_failed=La migration de %s a échoué. migrate.migrating_failed.error=Échec de la migration : %s migrate.migrating_failed_no_addr=Échec de la migration. @@ -1388,7 +1414,7 @@ editor.file_is_a_symlink=`« %s » est un lien symbolique. Ce type de fichiers editor.filename_is_a_directory=« %s » est déjà utilisé comme nom de dossier dans ce dépôt. editor.file_editing_no_longer_exists=Impossible de modifier le fichier « %s » car il n’existe plus dans ce dépôt. editor.file_deleting_no_longer_exists=Impossible de supprimer le fichier « %s » car il n’existe plus dans ce dépôt. -editor.file_changed_while_editing=Le contenu du fichier a changé depuis que vous avez commencé à éditer. Cliquez ici pour voir les changements ou soumettez de nouveau pour les écraser. +editor.file_changed_while_editing=Le contenu du fichier a changé depuis que vous avez ouvert le fichier. Cliquez ici pour voir les changements ou soumettez de nouveau pour les écraser. editor.file_already_exists=Un fichier nommé "%s" existe déjà dans ce dépôt. editor.commit_empty_file_header=Réviser un fichier vide editor.commit_empty_file_text=Le fichier que vous allez réviser est vide. Continuer ? @@ -2540,7 +2566,7 @@ settings.lfs_invalid_locking_path=Chemin invalide : %s settings.lfs_invalid_lock_directory=Impossible de verrouiller le répertoire : %s settings.lfs_lock_already_exists=Verrou déjà existant : %s settings.lfs_lock=Verrou -settings.lfs_lock_path=Chemin de fichier à verrouiller... +settings.lfs_lock_path=Chemin de fichier à verrouiller… settings.lfs_locks_no_locks=Pas de verrous settings.lfs_lock_file_no_exist=Le fichier verrouillé n'existe pas dans la branche par défaut settings.lfs_force_unlock=Forcer le déverrouillage @@ -2732,7 +2758,7 @@ editor.invalid_commit_mail = Courriel invalide pour la création d'un commit. commits.browse_further = Continuer la navigation commits.renamed_from = Renommé depuis %s pulls.nothing_to_compare_have_tag = La branche ou le tag sélectionné sont identiques. -issues.blocked_by_user = Vous ne pouvez pas créer un ticket sur ce dépôt car vous avez été bloqué par son propriétaire. +issues.blocked_by_user = Vous ne pouvez pas créer de tickets sur ce dépôt car vous avez été bloqué par son propriétaire. pulls.blocked_by_user = Vous ne pouvez pas créer une pull request sur ce dépôt car vous êtes bloqué par son propriétaire. wiki.cancel = Annuler settings.wiki_globally_editable = Permettre l'édition du wiki a tout le monde @@ -2876,9 +2902,19 @@ summary_card_alt = Carte résumé du dépôt %s archive.pull.noreview = Ce dépôt est archivé. Vous ne pouvez pas faire de revue de demandes d'ajout. editor.commit_email = Courriel de commit commits.view_single_diff = Voir les changements dans ce fichier introduit par ce commit +issues.reopen.blocked_by_user = Vous ne pouvez pas ré-ouvrir ce ticket care vous êtes bloqués par le propriétaire du dépôt ou le créateur de ce ticket. +migrate.repo_desc_helper = Laisser vide afin d'importer une description existante +issues.filter_no_results = Pas de résultats +issues.filter_no_results_placeholder = Essayez d'ajuster vos critères de recherche. +archive.nocomment = Il n'est pas possible de commenter car le dépôt est archivé. +comment.blocked_by_user = Il n'est pas possible de commenter car vous avez été bloqué par le propriétaire du dépôt ou l'auteur. +pulls.editable = Editable +pulls.editable_explanation = Cette pull request peut être éditée par les mainteneurs. Vous pouvez y contribuer directement. +sync_fork.branch_behind_one = Cette branche a %d commits de retard sur %s +sync_fork.branch_behind_few = Cettte branche a %d commits de retard sur %s [graphs] -component_loading = Chargement %s... +component_loading = Chargement %s… component_loading_failed = Échec de chargement de %s component_loading_info = Cela peut prendre du temps… @@ -3013,8 +3049,8 @@ teams.invite.by=Invité par %s teams.invite.description=Veuillez cliquer sur le bouton ci-dessous pour rejoindre l’équipe. follow_blocked_user = Vous ne pouvez pas suivre cette organisation car elle vous a bloqué. open_dashboard = Ouvrir le tableau de bord -settings.change_orgname_redirect_prompt.with_cooldown.few = L'ancien pseudonyme sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. -settings.change_orgname_redirect_prompt.with_cooldown.one = L'ancien pseudonyme sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. +settings.change_orgname_redirect_prompt.with_cooldown.few = L'ancien nom d'organisation sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période. +settings.change_orgname_redirect_prompt.with_cooldown.one = L'ancien nom d'organisation sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période. [admin] dashboard=Tableau de bord @@ -3840,7 +3876,7 @@ alt.registry = Configurez ce registre à partir d'un terminal : alt.registry.install = Pour installer le paquet, exécutez la commande suivante : alt.install = Installer le paquet alt.repository.multiple_groups = Ce paquet est disponible dans plusieurs groupes. -alt.setup = Ajouter un dépôt à la liste des dépôts connecté (choisissez l'architecture nécessaire à la place de '_arch') : +alt.setup = Ajouter un dépôt à la liste des dépôts connecté (choisissez l'architecture nécessaire à la place de "_arch") : [secrets] secrets=Secrets @@ -4005,7 +4041,7 @@ exact_tooltip = Inclure uniquement les résultats qui correspondent exactement a issue_kind = Rechercher dans les tickets… union = Union union_tooltip = Inclus les résultats contenant au moins un des mots clé séparés par des espaces -pull_kind = Rechercher dans les demande d'ajout +pull_kind = Rechercher dans les demande d'ajout… milestone_kind = Recherche dans les jalons... regexp_tooltip = Interpréter le terme de recherche comme une expression régulière regexp = RegExp diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index e59ee89f7e..99a0412e4d 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1412,7 +1412,7 @@ editor.file_is_a_symlink=`"%s" ir simboliska saite. Simboliskās saites tīmekļ editor.filename_is_a_directory=Datnes nosaukums "%s" šajā glabātavā jau tiek izmantos kā mapes nosaukums. editor.file_editing_no_longer_exists=Datne, kas tiek labota ("%s"), šajā glabātavā vairs nepastāv. editor.file_deleting_no_longer_exists=Datne, kas tiek izdzēsta ("%s"), šajā glabātavā vairs nepastāv. -editor.file_changed_while_editing=Datnes saturs ir mainījies kopš labošanas uzsākšanas. Klikšķināt šeit, lai apskatītu vai atkārtoti iesūtītu izmaiņas, lai tās pārrakstītu. +editor.file_changed_while_editing=Datnes saturs ir mainījies kopš tās atvēršanas. Klikšķināt šeit, lai apskatītu vai atkārtoti iesūtītu izmaiņas, lai tās pārrakstītu. editor.file_already_exists=Datne ar nosaukumu "%s" jau pastāv šajā glabātavā. editor.commit_empty_file_header=Iesūtīt tukšu datni editor.commit_empty_file_text=Iesūtāmā datne ir tukša. Turpināt? @@ -2910,6 +2910,9 @@ issues.filter_no_results_placeholder = Jāmēģina pielāgot meklēšanas atlas migrate.repo_desc_helper = Atstāt tukšu, lai ievietotu esošo aprakstu archive.nocomment = Piebilžu pievienošana nav iespējama, jo glabātava ir arhivēta. comment.blocked_by_user = Piebilžu pievienošana nav iespējama, jo glabātavas īpašnieks vai autors ir nolieguši Tevi. +sync_fork.branch_behind_one = Šis zars ir %d iesūtījumu aiz %s +sync_fork.button = Sinhronizēt +sync_fork.branch_behind_few = Šis zars ir %d iesūtījumus aiz %s [graphs] component_loading=Ielādē %s… diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini index c0701cd018..a12a3e2034 100644 --- a/options/locale/locale_nds.ini +++ b/options/locale/locale_nds.ini @@ -2611,6 +2611,9 @@ issues.filter_no_results_placeholder = Versöök, diene Söök-Filters antopasse migrate.repo_desc_helper = Leeg laten, um de bestahn Beschrieven to importeren comment.blocked_by_user = Kommenteren gaht hier nich, denn du büst vun de Repositoriums-Eegner of de Autor blockeert worden. archive.nocomment = Kommenteren gaht hier nich, denn dat Repositorium is archiveert. +sync_fork.button = Vernejen +sync_fork.branch_behind_one = Deeser Twieg is %d Kommitteren achter %s +sync_fork.branch_behind_few = Deeser Twieg is %d Kommitterens achter %s [repo.permissions] code.read = Lesen: De Quelltext vun deesem Repositorium ankieken un klonen. diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index a11cf4d1f0..0df8796e30 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1399,7 +1399,7 @@ editor.file_is_a_symlink=`«%s» является символической с editor.filename_is_a_directory=Имя файла «%s» уже используется в качестве каталога в этом репозитории. editor.file_editing_no_longer_exists=Редактируемый файл «%s» больше не существует в этом репозитории. editor.file_deleting_no_longer_exists=Удаляемый файл «%s» больше не существует в этом репозитории. -editor.file_changed_while_editing=Содержимое файла изменилось с момента начала редактирования. Нажмите здесь, чтобы увидеть, что было изменено, или Зафиксировать изменения снова, чтобы заменить их. +editor.file_changed_while_editing=Содержимое файла изменилось после того, как он был открыт. Ознакомьтесь с произошедшими изменениями или сохраните ещё раз, чтобы перезаписать их. editor.file_already_exists=Файл с названием «%s» уже существует в этом репозитории. editor.commit_empty_file_header=Закоммитить пустой файл editor.commit_empty_file_text=Файл, который вы собираетесь зафиксировать, пуст. Продолжить? @@ -2237,11 +2237,11 @@ settings.trust_model.default.desc=Использовать фактор дове settings.trust_model.collaborator=Соучастник settings.trust_model.collaborator.long=Соучастник: доверять подписям соучастников settings.trust_model.collaborator.desc=Действительные подписи соучастников этого репозитория будут помечены как «доверенные» (независимо от того, соответствуют ли они автору коммита). В остальных случаях действительные подписи будут помечены как «недоверенные», если подпись соответствует автору коммита, и «не совпадающие», если нет. -settings.trust_model.committer=Коммитер -settings.trust_model.committer.long=Коммитер: доверять подписям, соответствующим коммитерам (соответствует GitHub и требует коммиты, подписанные Forgejo, иметь Forgejo в качестве коммитера) +settings.trust_model.committer=Автор коммита +settings.trust_model.committer.long=Автор коммита: доверять подписям, соответствующим авторам коммитов. Это поведение соответствует GitHub и требует, чтобы коммиты, подписанные Forgejo, имели Forgejo в качестве автора settings.trust_model.committer.desc=Действительные подписи будут помечены «доверенными», только если они соответствуют автору коммита, в противном случае они будут помечены «не совпадающими». Это заставит Forgejo быть автором подписанных коммитов, а фактический автор будет обозначен в трейлерах Co-Authored-By: и Co-Committed-By: коммита. Ключ Forgejo по умолчанию должен соответствовать пользователю в базе данных. -settings.trust_model.collaboratorcommitter=Соучастник+Коммитер -settings.trust_model.collaboratorcommitter.long=Соучастник+Коммитер: доверять подписям соучастников, которые соответствуют автору коммита +settings.trust_model.collaboratorcommitter=Соучастник и автор коммита +settings.trust_model.collaboratorcommitter.long=Соучастник и автор коммита: доверять подписям соучастников, которые соответствуют автору коммита settings.trust_model.collaboratorcommitter.desc=Действительные подписи соучастников этого репозитория будут помечены «доверенными», если они соответствуют автору коммита. Действительные подписи будут помечены как «недоверенные», если подпись соответствует автору коммита, и «не совпадающие» впротивном случае. Это заставит Forgejo быть отмеченным в качестве автора подписанного коммита, а фактический автор будет указан в трейлерах Co-Authored-By: и Co-Committed-By: коммита. Ключ Forgejo по умолчанию должен соответствовать пользователю в базе данных. settings.wiki_delete=Стереть данные вики settings.wiki_delete_desc=Будьте внимательны! Как только вы удалите вики — пути назад не будет. @@ -2913,6 +2913,9 @@ issues.filter_no_results_placeholder = Попробуйте поискать п migrate.repo_desc_helper = Оставьте пустым, чтобы скопировать описание из источника archive.nocomment = Комментирование невозможно, потому что этот репозиторий архивирован. comment.blocked_by_user = Комментирование невозможно, потому что вы заблокированы его владельцем или автором обсуждения. +sync_fork.branch_behind_few = Эта ветвь отстаёт от %s на %d коммитов +sync_fork.button = Синхронизировать +sync_fork.branch_behind_one = Эта ветвь отстаёт от %s на %d коммит [graphs] component_loading_failed = Не удалось загрузить %s @@ -3697,7 +3700,7 @@ no_subscriptions=Нет подписок default_key=Подписано ключом по умолчанию error.extract_sign=Не удалось извлечь подпись error.generate_hash=Не удалось создать хеш коммита -error.no_committer_account=Учётная запись с эл. почтой этого коммитера не найдена +error.no_committer_account=Учётная запись с эл. почтой автора этого коммита не найдена error.no_gpg_keys_found=Не найден ключ, соответствующий данной подписи error.not_signed_commit=Неподписанный коммит error.failed_retrieval_gpg_keys=Не удалось получить ни одного ключа GPG автора коммита @@ -4054,7 +4057,7 @@ union_tooltip = Включает результаты с совпавшими к union = Обычный milestone_kind = Найти этапы... regexp = Регулярное выражение -regexp_tooltip = Интерпретировать поисковый запрос как регулярное выражение +regexp_tooltip = Поисковый запрос будет воспринят как регулярное выражение [markup] diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 7e51b27fc6..a4c660021e 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -299,7 +299,7 @@ disable_gravatar.description=Вимкнути Gravatar або інші стор federated_avatar_lookup=Увімкнути федеровані аватари federated_avatar_lookup.description=Увімкнути зовнішні аватари за допомогою Libravatar. disable_registration=Вимкнути самостійну реєстрацію -disable_registration.description=Тільки адміністратор може створювати нові облікові записи. Наполегливо рекомендуємо залишити реєстрацію вимкненою, якщо ви не збираєтеся розміщувати загальнодоступний екземпляр та сприяти появі величезної кількості спам-акаунтів. +disable_registration.description=Тільки адміністратор може створювати нові облікові записи. Настійно рекомендуємо залишити реєстрацію вимкненою, якщо ви не збираєтеся розміщувати загальнодоступний екземпляр та сприяти появі величезної кількості спам-акаунтів. allow_only_external_registration.description=Користувачам буде дозволено реєструватись лише через налаштовані сторонні сервіси. openid_signin=Увімкнути реєстрацію за допомогою OpenID openid_signin.description=Увімкнути вхід за допомогою OpenID. @@ -2659,6 +2659,9 @@ release.asset_name = Назва ресурсу release.add_external_asset = Додати зовнішній ресурс find_file.no_matching = Не знайдено відповідного файлу commits.search.tooltip = До ключових слів можна додавати префікси «author:», «committer:», «after:» або «before:», наприклад, «revert author:Alice before:2019-01-13». +sync_fork.button = Синхронізувати +sync_fork.branch_behind_one = Ця гілка на %d коміт позаду %s +sync_fork.branch_behind_few = Ця гілка на %d комітів позаду %s [graphs] contributors.what = внески diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index fe2bcde489..19ce1e589f 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -285,7 +285,7 @@ log_root_path=日志路径 log_root_path_helper=日志文件将写入此目录。 optional_title=可选设置 -email_title=电子邮箱设置 +email_title=电子邮件设置 smtp_addr=SMTP 主机地址 smtp_port=SMTP 端口 smtp_from=电子邮件发件人 @@ -354,7 +354,7 @@ app_slogan = 实例标语 app_slogan_helper = 在此处输入您的实例标语。留空则禁用。 [home] -uname_holder=用户名或电子邮箱 +uname_holder=用户名或电子邮件地址 password_holder=密码 switch_dashboard_context=切换控制面板用户 my_repos=仓库列表 @@ -685,7 +685,7 @@ Description = 描述 Pronouns = 代称 Biography = 简历 username_claiming_cooldown = 用户名不能被认领，因为其仍处于保护期。其可以在%[1]s后被认领。 -email_domain_is_not_allowed = 用户电子邮箱的域名%s与EMAIL_DOMAIN_ALLOWLIST或EMAIL_DOMAIN_BLOCKLIST冲突。请确保您正确设置了电子邮件地址。 +email_domain_is_not_allowed = 用户电子邮件地址的域名%s与EMAIL_DOMAIN_ALLOWLIST或EMAIL_DOMAIN_BLOCKLIST冲突。请确保您正确设置了电子邮件地址。 [user] change_avatar=修改头像… @@ -794,7 +794,7 @@ privacy=隐私设置 keep_activity_private=隐藏个人资料页面中的活动 keep_activity_private_popup=您的活动将只对您自己和本实例的管理员可见 -lookup_avatar_by_mail=使用电子邮箱地址查找头像 +lookup_avatar_by_mail=使用电子邮件地址查找头像 federated_avatar_lookup=查找联合头像 enable_custom_avatar=使用自定义头像 choose_new_avatar=选择新的头像 @@ -828,8 +828,8 @@ activations_pending=等待激活 can_not_add_email_activations_pending=有一个待处理的激活请求，请稍等几分钟后再尝试添加新的电子邮件地址。 delete_email=移除 email_deletion=移除电子邮件地址 -email_deletion_desc=电子邮箱地址和相关信息将会被删除。使用此电子邮箱地址发送的Git提交将会保留，继续？ -email_deletion_success=您的电子邮箱地址已被移除。 +email_deletion_desc=电子邮件地址和相关信息将会被删除。使用此电子邮件地址发送的Git提交将会保留，继续？ +email_deletion_success=您的电子邮件地址已被移除。 theme_update_success=您的主题已更新。 theme_update_error=所选主题不存在。 openid_deletion=移除 OpenID 地址 @@ -2912,6 +2912,9 @@ issues.filter_no_results_placeholder = 尝试调整搜索筛选条件。 migrate.repo_desc_helper = 留空以导入现有描述 archive.nocomment = 您无法评论，因为此仓库已存档。 comment.blocked_by_user = 您无法评论，因为您已被仓库所有者或作者屏蔽。 +sync_fork.button = 同步 +sync_fork.branch_behind_one = 此分支落后于 %s %d 个提交 +sync_fork.branch_behind_few = 此分支落后于 %s %d 个提交 [graphs] component_loading=正在加载 %s… @@ -3291,7 +3294,7 @@ auths.attribute_username=用户名属性 auths.attribute_username_placeholder=置空将使用Forgejo的用户名。 auths.attribute_name=名字属性 auths.attribute_surname=姓氏属性 -auths.attribute_mail=电子邮箱属性 +auths.attribute_mail=电子邮件地址属性 auths.attribute_ssh_public_key=SSH公钥属性 auths.attribute_avatar=头像属性 auths.attributes_in_bind=从 bind DN 中拉取属性信息 @@ -3722,7 +3725,7 @@ details.project_site=项目站点 details.repository_site=仓库网站 details.documentation_site=文档站点 details.license=许可协议 -assets=文件 +assets=资源 versions=版本 versions.view_all=查看全部 dependency.id=ID @@ -3932,7 +3935,7 @@ runners.delete_runner=删除运行器 runners.delete_runner_success=运行器删除成功 runners.delete_runner_failed=删除运行器失败 runners.delete_runner_header=确认要删除此运行器 -runners.delete_runner_notice=如果一个任务正在运行在此运行器上，它将被终止并标记为失败。它可能会打断正在构建的工作流。 +runners.delete_runner_notice=如果一个任务正在此运行器上运行，它将被终止并标记为失败。它可能会中断正在构建的工作流。 runners.none=无可用的 Runner runners.status.unspecified=未知 runners.status.idle=空闲 diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json index c297196777..2b03bdef5e 100644 --- a/options/locale_next/locale_cs-CZ.json +++ b/options/locale_next/locale_cs-CZ.json @@ -20,5 +20,8 @@ "themes.names.forgejo-light": "Forgejo – světlé", "themes.names.forgejo-dark": "Forgejo – tmavé", "error.not_found.title": "Stránka nenalezena", - "alert.asset_load_failed": "Nepodařilo se načíst soubory příloh z {path}. Ujistěte se, že jsou dané soubory přístupné." + "alert.asset_load_failed": "Nepodařilo se načíst soubory příloh z {path}. Ujistěte se, že jsou dané soubory přístupné.", + "install.invalid_lfs_path": "Nepodařilo se vytvořit kořen LFS na zvolené cestě: %[1]s", + "alert.range_error": " musí být číslo mezi %[1]s a %[2]s.", + "meta.last_line": "Díky všem přispěvatelům za pomoc!" } diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json index 32d44fbf22..0294c31960 100644 --- a/options/locale_next/locale_da.json +++ b/options/locale_next/locale_da.json @@ -20,7 +20,6 @@ "error.not_found.title": "Siden blev ikke fundet", "alert.asset_load_failed": "Kunne ikke indlæse aktivfiler fra {path}. Sørg for, at aktivfilerne er tilgængelige.", "install.invalid_lfs_path": "Kan ikke oprette LFS-roden på den angivne sti: %[1]s", - "install.lfs_jwt_secret_failed": "Kan ikke generere en LFS JWT-hemmelighed: %[1]s", - "settings.adopt": "Adoptere", - "alert.range_error": " skal være et tal mellem %[1]s og %[2]s." + "alert.range_error": " skal være et tal mellem %[1]s og %[2]s.", + "meta.last_line": "Livet er det dejligste eventyr. - (H.C. Andersen)" } diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json index 2fdd0b528f..87b18e1ada 100644 --- a/options/locale_next/locale_de-DE.json +++ b/options/locale_next/locale_de-DE.json @@ -18,5 +18,8 @@ "themes.names.forgejo-light": "Forgejo hell", "themes.names.forgejo-dark": "Forgejo dunkel", "error.not_found.title": "Seite nicht gefunden", - "alert.asset_load_failed": "Konnte Asset-Dateien nicht von {path} laden. Bitte stelle sicher, dass auf die Asset-Dateien zugegriffen werden kann." + "alert.asset_load_failed": "Konnte Asset-Dateien nicht von {path} laden. Bitte stelle sicher, dass auf die Asset-Dateien zugegriffen werden kann.", + "install.invalid_lfs_path": "Der LFS-Root konnte nicht am angegebenen Pfad erstellt werden: %[1]s", + "alert.range_error": " muss eine Zahl zwischen %[1]s und %[2]s sein.", + "meta.last_line": "Vielen Dank für die Übersetzung von Forgejo! Diese Zeile wird von den Benutzern nicht gesehen, dient aber anderen Zwecken im Übersetzungsmanagement. Du kannst eine lustige Tatsache in der Übersetzung platzieren, anstatt sie zu übersetzen." } diff --git a/options/locale_next/locale_fil.json b/options/locale_next/locale_fil.json index 5ee4c3bb7a..dfe00cebc6 100644 --- a/options/locale_next/locale_fil.json +++ b/options/locale_next/locale_fil.json @@ -17,5 +17,9 @@ "home.explore_repos": "Tuklasin ang mga repositoryo", "home.explore_users": "Tuklasin ang mga user", "home.explore_orgs": "Tuklasin ang mga organisasyon", - "error.not_found.title": "Hindi nahanap ang pahina" + "error.not_found.title": "Hindi nahanap ang pahina", + "alert.asset_load_failed": "Nabigong i-load ang mga asset file mula sa {path}. Siguraduhin na maa-access ang mga asset file.", + "install.invalid_lfs_path": "Nabigong gawin ang LFS root sa tinakdang path: %[1]s", + "alert.range_error": " dapat ay numero sa pagitan ng %[1]s at %[2]s.", + "meta.last_line": "Sayori... I love you. — MC from Doki Doki Literature Club" } diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json index 6891c84f15..2f767107f1 100644 --- a/options/locale_next/locale_lv-LV.json +++ b/options/locale_next/locale_lv-LV.json @@ -20,5 +20,8 @@ "themes.names.forgejo-light": "Forgejo gaišais", "themes.names.forgejo-dark": "Forgejo tumšais", "error.not_found.title": "Lapa nav atrasta", - "alert.asset_load_failed": "Neizdevās ielādēt līdzekļu datnes no {path}. Lūgums pārliecināties, ka līdzekļu datnēm var piekļūt." + "alert.asset_load_failed": "Neizdevās ielādēt līdzekļu datnes no {path}. Lūgums pārliecināties, ka līdzekļu datnēm var piekļūt.", + "install.invalid_lfs_path": "Nav iespējams izveidot LFS pamatmapi norādītajā ceļā: %[1]s", + "alert.range_error": " jābūt skaitlin starp %[1]s un %[2]s.", + "meta.last_line": "Šis žagaru saišķis nav mans žagaru saišķis." } diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json index f637cd31c7..5985eb377c 100644 --- a/options/locale_next/locale_nds.json +++ b/options/locale_next/locale_nds.json @@ -19,8 +19,7 @@ "themes.names.forgejo-auto": "Forgejo (Systeem-Thema nagahn)", "error.not_found.title": "Sied nich funnen", "alert.asset_load_failed": "Kunn Objekt-Dateien ut {path} nich laden. Bidde wees wiss, dat up de Objekt-Dateien togriepen worden kann.", - "install.lfs_jwt_secret_failed": "Kunn dat LFS-JWT-Geheemst nich maken: %[1]s", - "settings.adopt": "Övernehmen", "install.invalid_lfs_path": "Kunn de LFS-Ruut an de angeven Padd nich maken: %[1]s", - "alert.range_error": " mutt eene Tahl tüsken %[1]s un %[2]s wesen." + "alert.range_error": " mutt eene Tahl tüsken %[1]s un %[2]s wesen.", + "meta.last_line": "Moin!" } diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json index cb2d250006..a5973bf1e1 100644 --- a/options/locale_next/locale_nl-NL.json +++ b/options/locale_next/locale_nl-NL.json @@ -19,7 +19,7 @@ "themes.names.forgejo-dark": "Forgejo donker", "error.not_found.title": "Pagina niet gevonden", "alert.asset_load_failed": "Het laden van asset-bestanden van {path} is mislukt. Controleer of de asset-bestanden toegankelijk zijn.", - "settings.adopt": "Adopteer", "install.invalid_lfs_path": "Kan de LFS-root niet aanmaken op het opgegeven pad: %[1]s", - "install.lfs_jwt_secret_failed": "Kan geen LFS JWT-geheim genereren: %[1]s" + "alert.range_error": " moet een getal zijn tussen %[1]s en %[2]s.", + "meta.last_line": "Wist je dat de paprika, behalve in de bekende kleuren rood, geel, oranje en groen, ook in de kleuren wit, paars, lila, muntgroen en bruin voorkomt." } diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json index 0fae237134..06128b0990 100644 --- a/options/locale_next/locale_ru-RU.json +++ b/options/locale_next/locale_ru-RU.json @@ -19,5 +19,9 @@ "themes.names.forgejo-light": "Forgejo – светлая", "themes.names.forgejo-auto": "Forgejo – как в системе", "themes.names.forgejo-dark": "Forgejo – тёмная", - "error.not_found.title": "Страница не найдена" + "error.not_found.title": "Страница не найдена", + "alert.asset_load_failed": "Не удалось получить ресурсы из {path}. Убедитесь, что файлы ресурсов доступны.", + "install.invalid_lfs_path": "Не удалось расположить корень LFS по указанному пути: %[1]s", + "alert.range_error": " - число должно быть в диапазоне от %[1]s-%[2]s.", + "meta.last_line": "Спасибо Forgejo за такую возможность :3. Интересный факт: мне не удавалось вставить свой вклад в перевод Forgejo и это первый раз, когда у меня это вышло. ❤️." } diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json index 54b5b8532f..146f8934f9 100644 --- a/options/locale_next/locale_uk-UA.json +++ b/options/locale_next/locale_uk-UA.json @@ -22,7 +22,6 @@ "error.not_found.title": "Сторінку не знайдено", "alert.asset_load_failed": "Не вдалося завантажити файли ресурсів з {path}. Переконайтеся, що до файлів ресурсів є доступ.", "install.invalid_lfs_path": "Не вдалося створити корінь LFS за вказаним шляхом: %[1]s", - "settings.adopt": "Прийняти", - "install.lfs_jwt_secret_failed": "Не вдалося створити секрет LFS JWT: %[1]s", - "alert.range_error": " має бути числом від %[1]s до %[2]s." + "alert.range_error": " має бути числом від %[1]s до %[2]s.", + "meta.last_line": "Не зливай злий запити на злиття — зіллється зле." } diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json index 77cbd7ab0f..976b81e99b 100644 --- a/options/locale_next/locale_zh-CN.json +++ b/options/locale_next/locale_zh-CN.json @@ -12,8 +12,8 @@ "themes.names.forgejo-light": "Forgejo 浅色", "themes.names.forgejo-dark": "Forgejo 深色", "error.not_found.title": "页面不存在", - "alert.asset_load_failed": "无法从 {path} 加载资源文件。请确保可以访问资源文件。", - "install.lfs_jwt_secret_failed": "无法生成 LFS JWT 密钥：%[1]s", + "alert.asset_load_failed": "无法从 {path} 加载资源文件。请确保资源文件可以被访问。", "install.invalid_lfs_path": "无法在指定路径创建 LFS 根目录：%[1]s", - "alert.range_error": " 必须是一个介于 %[1]s 和 %[2]s 之间的数字。" + "alert.range_error": " 必须是一个介于 %[1]s 和 %[2]s 之间的数字。", + "meta.last_line": "感谢各位的支持和帮助！不需要翻译这个。" } From 1c2a29807ba69815002fba951e35c7f8690001cb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 10 Apr 2025 05:58:44 +0000 Subject: [PATCH 122/568] Update dependency katex to v0.16.22 (forgejo) (#7503) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [katex](https://katex.org) ([source](https://github.com/KaTeX/KaTeX)) | dependencies | patch | [`0.16.21` -> `0.16.22`](https://renovatebot.com/diffs/npm/katex/0.16.21/0.16.22) | --- ### Release Notes
KaTeX/KaTeX (katex) ### [`v0.16.22`](https://github.com/KaTeX/KaTeX/blob/HEAD/CHANGELOG.md#01622-2025-04-09) [Compare Source](https://github.com/KaTeX/KaTeX/compare/v0.16.21...v0.16.22) ##### Bug Fixes - \relax in base or exponent of super/subscript ([#​4045](https://github.com/KaTeX/KaTeX/issues/4045)) ([1f43c84](https://github.com/KaTeX/KaTeX/commit/1f43c84a175fb689f8c8d1d72b1e8b896a8b43d1))
--- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7503 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef1bbf6f0c..0250d2a364 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", - "katex": "0.16.21", + "katex": "0.16.22", "mermaid": "11.6.0", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", @@ -9186,9 +9186,9 @@ "license": "MIT" }, "node_modules/katex": { - "version": "0.16.21", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.21.tgz", - "integrity": "sha512-XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A==", + "version": "0.16.22", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz", + "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==", "funding": [ "https://opencollective.com/katex", "https://github.com/sponsors/katex" diff --git a/package.json b/package.json index 3f504588a5..44591d8286 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", - "katex": "0.16.21", + "katex": "0.16.22", "mermaid": "11.6.0", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", From 81b5c7ca6f21ecb5b38194bb9a3a5a115690e46f Mon Sep 17 00:00:00 2001 From: christopher-besch Date: Tue, 8 Apr 2025 14:32:16 +0200 Subject: [PATCH 123/568] feat: move StopTask, CancelPreviousJobs and CleanRepoScheduleTasks to services/actions This enables all action run state changes (from a not done to a done state) to also send a notification. Moved these: - models/actions/task.go|423 col 6| func StopTask(ctx context.Context, taskID int64, status Status) error { - models/actions/run.go|190 col 6| func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) error { - models/actions/schedule.go|122 col 6| func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository, cancelPreviousJobs bool) error { --- models/actions/run.go | 69 --------------------- models/actions/schedule.go | 22 ------- models/actions/task.go | 51 ---------------- routers/api/v1/repo/repo.go | 3 +- routers/web/repo/actions/view.go | 2 +- routers/web/repo/setting/setting.go | 3 +- services/actions/clear_tasks.go | 2 +- services/actions/notifier_helper.go | 6 +- services/actions/schedule_tasks.go | 93 ++++++++++++++++++++++++++++- services/actions/task.go | 53 ++++++++++++++++ services/repository/branch.go | 5 +- services/repository/setting.go | 3 +- 12 files changed, 156 insertions(+), 156 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 671177a892..c1e04071a8 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -185,75 +185,6 @@ func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) err return err } -// CancelPreviousJobs cancels all previous jobs of the same repository, reference, workflow, and event. -// It's useful when a new run is triggered, and all previous runs needn't be continued anymore. -func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) error { - // Find all runs in the specified repository, reference, and workflow with non-final status - runs, total, err := db.FindAndCount[ActionRun](ctx, FindRunOptions{ - RepoID: repoID, - Ref: ref, - WorkflowID: workflowID, - TriggerEvent: event, - Status: []Status{StatusRunning, StatusWaiting, StatusBlocked}, - }) - if err != nil { - return err - } - - // If there are no runs found, there's no need to proceed with cancellation, so return nil. - if total == 0 { - return nil - } - - // Iterate over each found run and cancel its associated jobs. - for _, run := range runs { - // Find all jobs associated with the current run. - jobs, err := db.Find[ActionRunJob](ctx, FindRunJobOptions{ - RunID: run.ID, - }) - if err != nil { - return err - } - - // Iterate over each job and attempt to cancel it. - for _, job := range jobs { - // Skip jobs that are already in a terminal state (completed, cancelled, etc.). - status := job.Status - if status.IsDone() { - continue - } - - // If the job has no associated task (probably an error), set its status to 'Cancelled' and stop it. - if job.TaskID == 0 { - job.Status = StatusCancelled - job.Stopped = timeutil.TimeStampNow() - - // Update the job's status and stopped time in the database. - n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped") - if err != nil { - return err - } - - // If the update affected 0 rows, it means the job has changed in the meantime, so we need to try again. - if n == 0 { - return fmt.Errorf("job has changed, try again") - } - - // Continue with the next job. - continue - } - - // If the job has an associated task, try to stop the task, effectively cancelling the job. - if err := StopTask(ctx, job.TaskID, StatusCancelled); err != nil { - return err - } - } - } - - // Return nil to indicate successful cancellation of all running and waiting jobs. - return nil -} - // InsertRun inserts a run // The title will be cut off at 255 characters if it's longer than 255 characters. func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWorkflow) error { diff --git a/models/actions/schedule.go b/models/actions/schedule.go index 633582e017..cc68e9eafc 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -5,7 +5,6 @@ package actions import ( "context" - "fmt" "time" "forgejo.org/models/db" @@ -119,27 +118,6 @@ func DeleteScheduleTaskByRepo(ctx context.Context, id int64) error { return committer.Commit() } -func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository, cancelPreviousJobs bool) error { - // If actions disabled when there is schedule task, this will remove the outdated schedule tasks - // There is no other place we can do this because the app.ini will be changed manually - if err := DeleteScheduleTaskByRepo(ctx, repo.ID); err != nil { - return fmt.Errorf("DeleteCronTaskByRepo: %v", err) - } - if cancelPreviousJobs { - // cancel running cron jobs of this repository and delete old schedules - if err := CancelPreviousJobs( - ctx, - repo.ID, - repo.DefaultBranch, - "", - webhook_module.HookEventSchedule, - ); err != nil { - return fmt.Errorf("CancelPreviousJobs: %v", err) - } - } - return nil -} - type FindScheduleOptions struct { db.ListOptions RepoID int64 diff --git a/models/actions/task.go b/models/actions/task.go index 63cbc6e586..db18eaa0b3 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -420,57 +420,6 @@ func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.Task return task, nil } -func StopTask(ctx context.Context, taskID int64, status Status) error { - if !status.IsDone() { - return fmt.Errorf("cannot stop task with status %v", status) - } - e := db.GetEngine(ctx) - - task := &ActionTask{} - if has, err := e.ID(taskID).Get(task); err != nil { - return err - } else if !has { - return util.ErrNotExist - } - if task.Status.IsDone() { - return nil - } - - now := timeutil.TimeStampNow() - task.Status = status - task.Stopped = now - if _, err := UpdateRunJob(ctx, &ActionRunJob{ - ID: task.JobID, - Status: task.Status, - Stopped: task.Stopped, - }, nil); err != nil { - return err - } - - if err := UpdateTask(ctx, task, "status", "stopped"); err != nil { - return err - } - - if err := task.LoadAttributes(ctx); err != nil { - return err - } - - for _, step := range task.Steps { - if !step.Status.IsDone() { - step.Status = status - if step.Started == 0 { - step.Started = now - } - step.Stopped = now - } - if _, err := e.ID(step.ID).Update(step); err != nil { - return err - } - } - - return nil -} - func FindOldTasksToExpire(ctx context.Context, olderThan timeutil.TimeStamp, limit int) ([]*ActionTask, error) { e := db.GetEngine(ctx) diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 59b32eb667..50f628e035 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -11,7 +11,6 @@ import ( "strings" "time" - actions_model "forgejo.org/models/actions" activities_model "forgejo.org/models/activities" "forgejo.org/models/db" "forgejo.org/models/organization" @@ -1065,7 +1064,7 @@ func updateRepoArchivedState(ctx *context.APIContext, opts api.EditRepoOption) e ctx.Error(http.StatusInternalServerError, "ArchiveRepoState", err) return err } - if err := actions_model.CleanRepoScheduleTasks(ctx, repo, true); err != nil { + if err := actions_service.CleanRepoScheduleTasks(ctx, repo, true); err != nil { log.Error("CleanRepoScheduleTasks for archived repo %s/%s: %v", ctx.Repo.Owner.Name, repo.Name, err) } log.Trace("Repository was archived: %s/%s", ctx.Repo.Owner.Name, repo.Name) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 2d009c5720..563832297d 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -521,7 +521,7 @@ func Cancel(ctx *context_module.Context) { } continue } - if err := actions_model.StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil { + if err := actions_service.StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil { return err } } diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 083cc4ae82..6e4f0f4829 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -14,7 +14,6 @@ import ( "time" "forgejo.org/models" - actions_model "forgejo.org/models/actions" "forgejo.org/models/db" "forgejo.org/models/organization" quota_model "forgejo.org/models/quota" @@ -1034,7 +1033,7 @@ func SettingsPost(ctx *context.Context) { return } - if err := actions_model.CleanRepoScheduleTasks(ctx, repo, true); err != nil { + if err := actions_service.CleanRepoScheduleTasks(ctx, repo, true); err != nil { log.Error("CleanRepoScheduleTasks for archived repo %s/%s: %v", ctx.Repo.Owner.Name, repo.Name, err) } diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index 31e15ec927..f34c07fe5c 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -41,7 +41,7 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error { jobs := make([]*actions_model.ActionRunJob, 0, len(tasks)) for _, task := range tasks { if err := db.WithTx(ctx, func(ctx context.Context) error { - if err := actions_model.StopTask(ctx, task.ID, actions_model.StatusFailure); err != nil { + if err := StopTask(ctx, task.ID, actions_model.StatusFailure); err != nil { return err } if err := task.LoadJob(ctx); err != nil { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 9de0b75ac7..e55714a2c3 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -139,7 +139,7 @@ func notify(ctx context.Context, input *notifyInput) error { return nil } if unit_model.TypeActions.UnitGlobalDisabled() { - if err := actions_model.CleanRepoScheduleTasks(ctx, input.Repo, true); err != nil { + if err := CleanRepoScheduleTasks(ctx, input.Repo, true); err != nil { log.Error("CleanRepoScheduleTasks: %v", err) } return nil @@ -373,7 +373,7 @@ func handleWorkflows( // cancel running jobs if the event is push or pull_request_sync if run.Event == webhook_module.HookEventPush || run.Event == webhook_module.HookEventPullRequestSync { - if err := actions_model.CancelPreviousJobs( + if err := CancelPreviousJobs( ctx, run.RepoID, run.Ref, @@ -504,7 +504,7 @@ func handleSchedules( log.Error("CountSchedules: %v", err) return err } else if count > 0 { - if err := actions_model.CleanRepoScheduleTasks(ctx, input.Repo, false); err != nil { + if err := CleanRepoScheduleTasks(ctx, input.Repo, false); err != nil { log.Error("CleanRepoScheduleTasks: %v", err) } } diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go index f66a6ca092..8d41797a0e 100644 --- a/services/actions/schedule_tasks.go +++ b/services/actions/schedule_tasks.go @@ -17,6 +17,7 @@ import ( webhook_module "forgejo.org/modules/webhook" "github.com/nektos/act/pkg/jobparser" + "xorm.io/builder" ) // StartScheduleTasks start the task @@ -55,7 +56,7 @@ func startTasks(ctx context.Context) error { // cancel running jobs if the event is push if row.Schedule.Event == webhook_module.HookEventPush { // cancel running jobs of the same workflow - if err := actions_model.CancelPreviousJobs( + if err := CancelPreviousJobs( ctx, row.RepoID, row.Schedule.Ref, @@ -152,3 +153,93 @@ func CreateScheduleTask(ctx context.Context, cron *actions_model.ActionSchedule) // Return nil if no errors occurred return nil } + +// CancelPreviousJobs cancels all previous jobs of the same repository, reference, workflow, and event. +// It's useful when a new run is triggered, and all previous runs needn't be continued anymore. +func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) error { + // Find all runs in the specified repository, reference, and workflow with non-final status + runs, total, err := db.FindAndCount[actions_model.ActionRun](ctx, actions_model.FindRunOptions{ + RepoID: repoID, + Ref: ref, + WorkflowID: workflowID, + TriggerEvent: event, + Status: []actions_model.Status{actions_model.StatusRunning, actions_model.StatusWaiting, actions_model.StatusBlocked}, + }) + if err != nil { + return err + } + + // If there are no runs found, there's no need to proceed with cancellation, so return nil. + if total == 0 { + return nil + } + + // Iterate over each found run and cancel its associated jobs. + for _, run := range runs { + // Find all jobs associated with the current run. + jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{ + RunID: run.ID, + }) + if err != nil { + return err + } + + // Iterate over each job and attempt to cancel it. + for _, job := range jobs { + // Skip jobs that are already in a terminal state (completed, cancelled, etc.). + status := job.Status + if status.IsDone() { + continue + } + + // If the job has no associated task (probably an error), set its status to 'Cancelled' and stop it. + if job.TaskID == 0 { + job.Status = actions_model.StatusCancelled + job.Stopped = timeutil.TimeStampNow() + + // Update the job's status and stopped time in the database. + n, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped") + if err != nil { + return err + } + + // If the update affected 0 rows, it means the job has changed in the meantime, so we need to try again. + if n == 0 { + return fmt.Errorf("job has changed, try again") + } + + // Continue with the next job. + continue + } + + // If the job has an associated task, try to stop the task, effectively cancelling the job. + if err := StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil { + return err + } + } + } + + // Return nil to indicate successful cancellation of all running and waiting jobs. + return nil +} + +func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository, cancelPreviousJobs bool) error { + // If actions disabled when there is schedule task, this will remove the outdated schedule tasks + // There is no other place we can do this because the app.ini will be changed manually + if err := actions_model.DeleteScheduleTaskByRepo(ctx, repo.ID); err != nil { + return fmt.Errorf("DeleteCronTaskByRepo: %v", err) + } + if cancelPreviousJobs { + // cancel running cron jobs of this repository and delete old schedules + if err := CancelPreviousJobs( + ctx, + repo.ID, + repo.DefaultBranch, + "", + webhook_module.HookEventSchedule, + ); err != nil { + return fmt.Errorf("CancelPreviousJobs: %v", err) + } + } + return nil +} diff --git a/services/actions/task.go b/services/actions/task.go index 43c8deaa5f..40bf4a8e42 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -10,6 +10,8 @@ import ( actions_model "forgejo.org/models/actions" "forgejo.org/models/db" secret_model "forgejo.org/models/secret" + "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" @@ -105,3 +107,54 @@ func findTaskNeeds(ctx context.Context, taskJob *actions_model.ActionRunJob) (ma } return ret, nil } + +func StopTask(ctx context.Context, taskID int64, status actions_model.Status) error { + if !status.IsDone() { + return fmt.Errorf("cannot stop task with status %v", status) + } + e := db.GetEngine(ctx) + + task := &actions_model.ActionTask{} + if has, err := e.ID(taskID).Get(task); err != nil { + return err + } else if !has { + return util.ErrNotExist + } + if task.Status.IsDone() { + return nil + } + + now := timeutil.TimeStampNow() + task.Status = status + task.Stopped = now + if _, err := actions_model.UpdateRunJob(ctx, &actions_model.ActionRunJob{ + ID: task.JobID, + Status: task.Status, + Stopped: task.Stopped, + }, nil); err != nil { + return err + } + + if err := actions_model.UpdateTask(ctx, task, "status", "stopped"); err != nil { + return err + } + + if err := task.LoadAttributes(ctx); err != nil { + return err + } + + for _, step := range task.Steps { + if !step.Status.IsDone() { + step.Status = status + if step.Started == 0 { + step.Started = now + } + step.Stopped = now + } + if _, err := e.ID(step.ID).Update(step); err != nil { + return err + } + } + + return nil +} diff --git a/services/repository/branch.go b/services/repository/branch.go index 689f35803d..d5b68c1fa7 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -28,6 +28,7 @@ import ( "forgejo.org/modules/timeutil" "forgejo.org/modules/util" webhook_module "forgejo.org/modules/webhook" + actions_service "forgejo.org/services/actions" notify_service "forgejo.org/services/notify" pull_service "forgejo.org/services/pull" files_service "forgejo.org/services/repository/files" @@ -377,7 +378,7 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m log.Error("DeleteCronTaskByRepo: %v", err) } // cancel running cron jobs of this repository and delete old schedules - if err := actions_model.CancelPreviousJobs( + if err := actions_service.CancelPreviousJobs( ctx, repo.ID, from, @@ -578,7 +579,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, gitR log.Error("DeleteCronTaskByRepo: %v", err) } // cancel running cron jobs of this repository and delete old schedules - if err := actions_model.CancelPreviousJobs( + if err := actions_service.CancelPreviousJobs( ctx, repo.ID, oldDefaultBranchName, diff --git a/services/repository/setting.go b/services/repository/setting.go index c127f3129e..68cdfc370b 100644 --- a/services/repository/setting.go +++ b/services/repository/setting.go @@ -7,7 +7,6 @@ import ( "context" "slices" - actions_model "forgejo.org/models/actions" "forgejo.org/models/db" repo_model "forgejo.org/models/repo" "forgejo.org/models/unit" @@ -29,7 +28,7 @@ func UpdateRepositoryUnits(ctx context.Context, repo *repo_model.Repository, uni } if slices.Contains(deleteUnitTypes, unit.TypeActions) { - if err := actions_model.CleanRepoScheduleTasks(ctx, repo, true); err != nil { + if err := actions_service.CleanRepoScheduleTasks(ctx, repo, true); err != nil { log.Error("CleanRepoScheduleTasks: %v", err) } } From cdb4682bca34a78fc9f70a8195f9dd4f16e61fa4 Mon Sep 17 00:00:00 2001 From: christopher-besch Date: Tue, 8 Apr 2025 17:41:13 +0200 Subject: [PATCH 124/568] feat: move UpdateTaskByState to services This function is also can't be in models in order to enable calling the action run state change notification channel. --- models/actions/task.go | 92 ---------------------------- routers/api/actions/runner/runner.go | 2 +- services/actions/task.go | 91 +++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 93 deletions(-) diff --git a/models/actions/task.go b/models/actions/task.go index db18eaa0b3..c68b5b97ff 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -17,10 +17,8 @@ import ( "forgejo.org/modules/timeutil" "forgejo.org/modules/util" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru/v2" "github.com/nektos/act/pkg/jobparser" - "google.golang.org/protobuf/types/known/timestamppb" "xorm.io/builder" ) @@ -337,89 +335,6 @@ func UpdateTask(ctx context.Context, task *ActionTask, cols ...string) error { return err } -// UpdateTaskByState updates the task by the state. -// It will always update the task if the state is not final, even there is no change. -// So it will update ActionTask.Updated to avoid the task being judged as a zombie task. -func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.TaskState) (*ActionTask, error) { - stepStates := map[int64]*runnerv1.StepState{} - for _, v := range state.Steps { - stepStates[v.Id] = v - } - - ctx, commiter, err := db.TxContext(ctx) - if err != nil { - return nil, err - } - defer commiter.Close() - - e := db.GetEngine(ctx) - - task := &ActionTask{} - if has, err := e.ID(state.Id).Get(task); err != nil { - return nil, err - } else if !has { - return nil, util.ErrNotExist - } else if runnerID != task.RunnerID { - return nil, fmt.Errorf("invalid runner for task") - } - - if task.Status.IsDone() { - // the state is final, do nothing - return task, nil - } - - // state.Result is not unspecified means the task is finished - if state.Result != runnerv1.Result_RESULT_UNSPECIFIED { - task.Status = Status(state.Result) - task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix()) - if err := UpdateTask(ctx, task, "status", "stopped"); err != nil { - return nil, err - } - if _, err := UpdateRunJob(ctx, &ActionRunJob{ - ID: task.JobID, - Status: task.Status, - Stopped: task.Stopped, - }, nil); err != nil { - return nil, err - } - } else { - // Force update ActionTask.Updated to avoid the task being judged as a zombie task - task.Updated = timeutil.TimeStampNow() - if err := UpdateTask(ctx, task, "updated"); err != nil { - return nil, err - } - } - - if err := task.LoadAttributes(ctx); err != nil { - return nil, err - } - - for _, step := range task.Steps { - var result runnerv1.Result - if v, ok := stepStates[step.Index]; ok { - result = v.Result - step.LogIndex = v.LogIndex - step.LogLength = v.LogLength - step.Started = convertTimestamp(v.StartedAt) - step.Stopped = convertTimestamp(v.StoppedAt) - } - if result != runnerv1.Result_RESULT_UNSPECIFIED { - step.Status = Status(result) - } else if step.Started != 0 { - step.Status = StatusRunning - } - if _, err := e.ID(step.ID).Update(step); err != nil { - return nil, err - } - } - - if err := commiter.Commit(); err != nil { - return nil, err - } - - return task, nil -} - func FindOldTasksToExpire(ctx context.Context, olderThan timeutil.TimeStamp, limit int) ([]*ActionTask, error) { e := db.GetEngine(ctx) @@ -430,13 +345,6 @@ func FindOldTasksToExpire(ctx context.Context, olderThan timeutil.TimeStamp, lim Find(&tasks) } -func convertTimestamp(timestamp *timestamppb.Timestamp) timeutil.TimeStamp { - if timestamp.GetSeconds() == 0 && timestamp.GetNanos() == 0 { - return timeutil.TimeStamp(0) - } - return timeutil.TimeStamp(timestamp.AsTime().Unix()) -} - func logFileName(repoFullName string, taskID int64) string { ret := fmt.Sprintf("%s/%02x/%d.log", repoFullName, taskID%256, taskID) diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 8aae69f463..a971cd3fbf 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -178,7 +178,7 @@ func (s *Service) UpdateTask( ) (*connect.Response[runnerv1.UpdateTaskResponse], error) { runner := GetRunner(ctx) - task, err := actions_model.UpdateTaskByState(ctx, runner.ID, req.Msg.State) + task, err := actions_service.UpdateTaskByState(ctx, runner.ID, req.Msg.State) if err != nil { return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("update task: %w", err)) } diff --git a/services/actions/task.go b/services/actions/task.go index 40bf4a8e42..6d89afed45 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -15,6 +15,7 @@ import ( runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" + "google.golang.org/protobuf/types/known/timestamppb" ) func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) { @@ -158,3 +159,93 @@ func StopTask(ctx context.Context, taskID int64, status actions_model.Status) er return nil } + +// UpdateTaskByState updates the task by the state. +// It will always update the task if the state is not final, even there is no change. +// So it will update ActionTask.Updated to avoid the task being judged as a zombie task. +func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.TaskState) (*actions_model.ActionTask, error) { + stepStates := map[int64]*runnerv1.StepState{} + for _, v := range state.Steps { + stepStates[v.Id] = v + } + + ctx, commiter, err := db.TxContext(ctx) + if err != nil { + return nil, err + } + defer commiter.Close() + + e := db.GetEngine(ctx) + + task := &actions_model.ActionTask{} + if has, err := e.ID(state.Id).Get(task); err != nil { + return nil, err + } else if !has { + return nil, util.ErrNotExist + } else if runnerID != task.RunnerID { + return nil, fmt.Errorf("invalid runner for task") + } + + if task.Status.IsDone() { + // the state is final, do nothing + return task, nil + } + + // state.Result is not unspecified means the task is finished + if state.Result != runnerv1.Result_RESULT_UNSPECIFIED { + task.Status = actions_model.Status(state.Result) + task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix()) + if err := actions_model.UpdateTask(ctx, task, "status", "stopped"); err != nil { + return nil, err + } + if _, err := actions_model.UpdateRunJob(ctx, &actions_model.ActionRunJob{ + ID: task.JobID, + Status: task.Status, + Stopped: task.Stopped, + }, nil); err != nil { + return nil, err + } + } else { + // Force update ActionTask.Updated to avoid the task being judged as a zombie task + task.Updated = timeutil.TimeStampNow() + if err := actions_model.UpdateTask(ctx, task, "updated"); err != nil { + return nil, err + } + } + + if err := task.LoadAttributes(ctx); err != nil { + return nil, err + } + + for _, step := range task.Steps { + var result runnerv1.Result + if v, ok := stepStates[step.Index]; ok { + result = v.Result + step.LogIndex = v.LogIndex + step.LogLength = v.LogLength + step.Started = convertTimestamp(v.StartedAt) + step.Stopped = convertTimestamp(v.StoppedAt) + } + if result != runnerv1.Result_RESULT_UNSPECIFIED { + step.Status = actions_model.Status(result) + } else if step.Started != 0 { + step.Status = actions_model.StatusRunning + } + if _, err := e.ID(step.ID).Update(step); err != nil { + return nil, err + } + } + + if err := commiter.Commit(); err != nil { + return nil, err + } + + return task, nil +} + +func convertTimestamp(timestamp *timestamppb.Timestamp) timeutil.TimeStamp { + if timestamp.GetSeconds() == 0 && timestamp.GetNanos() == 0 { + return timeutil.TimeStamp(0) + } + return timeutil.TimeStamp(timestamp.AsTime().Unix()) +} From eb3feaad45215298a870330db9119342b5ae9835 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Thu, 10 Apr 2025 10:30:22 +0000 Subject: [PATCH 125/568] chore(i18n): update contributing documentation with JSON format (#7499) Things have changed and the readme file in `locale` became significantly less relevant, suggesting things like > When you work on Forgejo features, you should only modify `locale_en-US.ini`. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7499 Reviewed-by: Earl Warren Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- options/locale/readme.md | 19 +-------------- options/locale_readme.md | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 options/locale_readme.md diff --git a/options/locale/readme.md b/options/locale/readme.md index f6f198a936..fe8cd579c0 100644 --- a/options/locale/readme.md +++ b/options/locale/readme.md @@ -1,21 +1,4 @@ -# Forgejo translations - -This directory contains all .INI translations. - -## Working on base language - -When you work on Forgejo features, you should only modify `locale_en-US.ini`. - -* consult https://forgejo.org/docs/next/contributor/localization-english/ -* add strings when your change requires doing so -* remove strings when your change renders them unused - -## Working on other languages - -Translations are done on Codeberg Translate and not via individual pull requests. - -* consult https://forgejo.org/docs/next/contributor/localization/ -* see the project: https://translate.codeberg.org/projects/forgejo/forgejo/ +See [locale_readme.md](../locale_readme.md) for modification instructions. ## Attribution diff --git a/options/locale_readme.md b/options/locale_readme.md new file mode 100644 index 0000000000..4adbce2123 --- /dev/null +++ b/options/locale_readme.md @@ -0,0 +1,50 @@ +# Forgejo translations + +All translations are stored in directories `locale` and `locale_next`. + +`locale` is a historical directory that contains translations in INI format. Forgejo inherited it from Gitea, and Gitea inherited it from Gogs. + +Because the INI format had many issues and prevented good translatability, in early 2025 Forgejo started switching to a new format - `go-i18n`+`json`. + +## Working on base language + +Here are some tips: +* when working on non-i18n changes, only change `en-US` files + * non-base files are normally modified through Weblate. We appreciate the intention to provide localization for the change you're working on, however, modifying those files leads to merge conflicts with Weblate that aren't easy to resolve. [Learn about translating Forgejo](#working-on-other-languages). +* when new strings are added, it's preferred that they're added to `locale_en-US.json` +* when strings are modified in `locale_en-US.ini`, it's preferred that they stay here because moving them around is complicated +* make sure to remove strings if your change renders them unused +* consult https://forgejo.org/docs/next/contributor/localization-english/ + +### JSON translations + +It is preferred that all new strings added to Forgejo UI are added to the JSON translations instead of INI. + +Even though Forgejo parser supports nested sections, linters and Weblate do not. Because of this, most strings need to have all sections flattened into their keys like so: +```json +"some.nested.section.key": "UI text" +``` + +However, plural variations of a string, if it has any, are stored in a nested dictionary: +```json +"some.nested.section.key": { + "one": "%d comment", + "other": "%d comments" +} +``` + +> [!IMPORTANT] +> Please avoid adding unnecessary sections to the keys. Sections like `repo` are vague and represent a large part of the codebase. Keep the sections scoped to where or how the strings are really used, like `user_settings` or `error`. + +> [!TIP] +> Due to the flat sections, you can easily find both JSON strings and their usages in the codebase by grepping an entire key. + +> [!TIP] +> 3rd party software can determine whether string has plural variations or not from type of it's value in `en-US.json`. + +## Working on other languages + +Translations are done on Codeberg Translate and not via individual pull requests. + +* consult https://forgejo.org/docs/next/contributor/localization/ +* see the project: https://translate.codeberg.org/projects/forgejo/ From 2a1759ba3be4fc63bf79d40e17ca86ae109c9e4e Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Thu, 10 Apr 2025 13:49:18 +0200 Subject: [PATCH 126/568] use base.TruncateString instead of TruncateRune --- modules/util/truncate.go | 9 --------- modules/util/truncate_test.go | 15 --------------- services/webhook/discord.go | 3 ++- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/modules/util/truncate.go b/modules/util/truncate.go index 7207a89177..f2edbdc673 100644 --- a/modules/util/truncate.go +++ b/modules/util/truncate.go @@ -54,12 +54,3 @@ func SplitTrimSpace(input, sep string) []string { return stringList } - -// TruncateRunes returns a truncated string with given rune limit, -// it returns input string if its rune length doesn't exceed the limit. -func TruncateRunes(str string, limit int) string { - if utf8.RuneCountInString(str) < limit { - return str - } - return string([]rune(str)[:limit]) -} diff --git a/modules/util/truncate_test.go b/modules/util/truncate_test.go index 8187b13eb2..dfe1230fd4 100644 --- a/modules/util/truncate_test.go +++ b/modules/util/truncate_test.go @@ -44,18 +44,3 @@ func TestSplitString(t *testing.T) { } test(tc, SplitStringAtByteN) } - -func TestTruncateRunes(t *testing.T) { - assert.Empty(t, TruncateRunes("", 0)) - assert.Empty(t, TruncateRunes("", 1)) - - assert.Empty(t, TruncateRunes("ab", 0)) - assert.Equal(t, "a", TruncateRunes("ab", 1)) - assert.Equal(t, "ab", TruncateRunes("ab", 2)) - assert.Equal(t, "ab", TruncateRunes("ab", 3)) - - assert.Empty(t, TruncateRunes("测试", 0)) - assert.Equal(t, "测", TruncateRunes("测试", 1)) - assert.Equal(t, "测试", TruncateRunes("测试", 2)) - assert.Equal(t, "测试", TruncateRunes("测试", 3)) -} diff --git a/services/webhook/discord.go b/services/webhook/discord.go index f60903c276..2b58bf892d 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -16,6 +16,7 @@ import ( "unicode/utf8" webhook_model "forgejo.org/models/webhook" + "forgejo.org/modules/base" "forgejo.org/modules/git" "forgejo.org/modules/json" "forgejo.org/modules/log" @@ -364,7 +365,7 @@ func (d discordConvertor) createPayload(s *api.User, title, text, url string, co Embeds: []DiscordEmbed{ { Title: title, - Description: util.TruncateRunes(text, discordDescriptionCharactersLimit), + Description: base.TruncateString(text, discordDescriptionCharactersLimit), URL: url, Color: color, Author: DiscordEmbedAuthor{ From eb85681b4161d35c5b47aaedb7921b10ba606b7a Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 11 Apr 2025 12:28:03 +0000 Subject: [PATCH 127/568] fix: package_blob.has_blake2b may be null (#7520) - When looking for an existing blob, has_blake2b will be null when it was created prior to v26 migration in v11, when the field was introduced. - Add unit test and minimal refactoring to load fixtures. The AddFixture function should not be where it currently is because it cannot be used by some packages (circular import). But that's a refactor that needs to be elsewhere for backporting purposes. Fixes https://codeberg.org/forgejo/forgejo/issues/7519 Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- .../package_blob.yml | 17 +++++ models/packages/main_test.go | 31 +++++++++ models/packages/package_blob.go | 21 +++--- models/packages/package_blob_test.go | 65 +++++++++++++++++++ models/packages/package_test.go | 9 --- 5 files changed, 126 insertions(+), 17 deletions(-) create mode 100644 models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml create mode 100644 models/packages/main_test.go create mode 100644 models/packages/package_blob_test.go diff --git a/models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml b/models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml new file mode 100644 index 0000000000..ec90787c43 --- /dev/null +++ b/models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml @@ -0,0 +1,17 @@ +- + id: 1 + size: 10 + hash_md5: HASHMD5_1 + hash_sha1: HASHSHA1_1 + hash_sha256: HASHSHA256_1 + hash_sha512: HASHSHA512_1 + hash_blake2b: HASHBLAKE2B_1 + created_unix: 946687980 +- + id: 2 + size: 20 + hash_md5: HASHMD5_2 + hash_sha1: HASHSHA1_2 + hash_sha256: HASHSHA256_2 + hash_sha512: HASHSHA512_2 + created_unix: 946687980 diff --git a/models/packages/main_test.go b/models/packages/main_test.go new file mode 100644 index 0000000000..8114461502 --- /dev/null +++ b/models/packages/main_test.go @@ -0,0 +1,31 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package packages + +import ( + "path/filepath" + "testing" + + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" +) + +func AddFixtures(dirs ...string) func() { + return unittest.OverrideFixtures( + unittest.FixturesOptions{ + Dir: filepath.Join(setting.AppWorkPath, "models/fixtures/"), + Base: setting.AppWorkPath, + Dirs: dirs, + }, + ) +} + +func TestMain(m *testing.M) { + unittest.MainTest(m) +} diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index e86f652540..0de4434ef8 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -44,14 +44,19 @@ func GetOrInsertBlob(ctx context.Context, pb *PackageBlob) (*PackageBlob, bool, existing := &PackageBlob{} - has, err := e.Where(builder.Eq{ - "size": pb.Size, - "hash_md5": pb.HashMD5, - "hash_sha1": pb.HashSHA1, - "hash_sha256": pb.HashSHA256, - "hash_sha512": pb.HashSHA512, - "hash_blake2b": pb.HashBlake2b, - }).Get(existing) + has, err := e.Where(builder.And( + builder.Eq{ + "size": pb.Size, + "hash_md5": pb.HashMD5, + "hash_sha1": pb.HashSHA1, + "hash_sha256": pb.HashSHA256, + "hash_sha512": pb.HashSHA512, + }, + builder.Or( + builder.Eq{"hash_blake2b": pb.HashBlake2b}, + builder.IsNull{"hash_blake2b"}, + ), + )).Get(existing) if err != nil { return nil, false, err } diff --git a/models/packages/package_blob_test.go b/models/packages/package_blob_test.go new file mode 100644 index 0000000000..3ad45a56f9 --- /dev/null +++ b/models/packages/package_blob_test.go @@ -0,0 +1,65 @@ +// Copyright 2025 The Forgejo Authors. +// SPDX-License-Identifier: GPL-3.0-or-later + +package packages + +import ( + "testing" + + "forgejo.org/models/unittest" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestPackagesGetOrInsertBlob(t *testing.T) { + defer AddFixtures("models/fixtures/TestPackagesGetOrInsertBlob/")() + require.NoError(t, unittest.PrepareTestDatabase()) + + blake2bIsSet := unittest.AssertExistsAndLoadBean(t, &PackageBlob{ID: 1}) + blake2bNotSet := unittest.AssertExistsAndLoadBean(t, &PackageBlob{ID: 2}) + + var blake2bSetToRandom PackageBlob + blake2bSetToRandom = *blake2bNotSet + blake2bSetToRandom.HashBlake2b = "SOMETHING RANDOM" + + for _, testCase := range []struct { + name string + exists bool + packageBlob *PackageBlob + }{ + { + name: "exists and blake2b is not null in the database", + exists: true, + packageBlob: blake2bIsSet, + }, + { + name: "exists and blake2b is null in the database", + exists: true, + packageBlob: &blake2bSetToRandom, + }, + { + name: "does not exists", + exists: false, + packageBlob: &PackageBlob{ + Size: 30, + HashMD5: "HASHMD5_3", + HashSHA1: "HASHSHA1_3", + HashSHA256: "HASHSHA256_3", + HashSHA512: "HASHSHA512_3", + HashBlake2b: "HASHBLAKE2B_3", + }, + }, + } { + t.Run(testCase.name, func(t *testing.T) { + found, has, _ := GetOrInsertBlob(t.Context(), testCase.packageBlob) + assert.Equal(t, testCase.exists, has) + require.NotNil(t, found) + if testCase.exists { + assert.Equal(t, found.ID, testCase.packageBlob.ID) + } else { + unittest.BeanExists(t, &PackageBlob{ID: found.ID}) + } + }) + } +} diff --git a/models/packages/package_test.go b/models/packages/package_test.go index ab2d49c94c..3c1ec413fd 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -13,18 +13,9 @@ import ( "forgejo.org/models/unittest" user_model "forgejo.org/models/user" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/require" ) -func TestMain(m *testing.M) { - unittest.MainTest(m) -} - func prepareExamplePackage(t *testing.T) *packages_model.Package { require.NoError(t, unittest.PrepareTestDatabase()) From 6bcdfd6efbb9aa24129086d9fb19f51797338cce Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Fri, 11 Apr 2025 13:08:56 +0000 Subject: [PATCH 128/568] [v11.0/forgejo] fix: package_blob.has_blake2b may be null (#7521) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7520 - When looking for an existing blob, has_blake2b will be null when it was created prior to v26 migration in v11, when the field was introduced. - Add unit test and minimal refactoring to load fixtures. The AddFixture function should not be where it currently is because it cannot be used by some packages (circular import). But that's a refactor that needs to be elsewhere for backporting purposes. Fixes https://codeberg.org/forgejo/forgejo/issues/7519 When the fix is missing, the test fails like so: ``` --- FAIL: TestPackagesGetOrInsertBlob (0.03s) --- FAIL: TestPackagesGetOrInsertBlob/exists_and_blake2b_is_null_in_the_database (0.00s) package_blob_test.go:55: Error Trace: /home/earl-warren/software/forgejo/models/packages/package_blob_test.go:55 Error: Not equal: expected: true actual : false Test: TestPackagesGetOrInsertBlob/exists_and_blake2b_is_null_in_the_database package_blob_test.go:56: Error Trace: /home/earl-warren/software/forgejo/models/packages/package_blob_test.go:56 Error: Expected value not to be nil. Test: TestPackagesGetOrInsertBlob/exists_and_blake2b_is_null_in_the_database ``` ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/.md` to be be used for the release notes instead of the title. Co-authored-by: Earl Warren Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7521 Reviewed-by: Earl Warren Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- .../package_blob.yml | 17 +++++ models/packages/main_test.go | 31 +++++++++ models/packages/package_blob.go | 21 +++--- models/packages/package_blob_test.go | 64 +++++++++++++++++++ models/packages/package_test.go | 9 --- 5 files changed, 125 insertions(+), 17 deletions(-) create mode 100644 models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml create mode 100644 models/packages/main_test.go create mode 100644 models/packages/package_blob_test.go diff --git a/models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml b/models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml new file mode 100644 index 0000000000..ec90787c43 --- /dev/null +++ b/models/fixtures/TestPackagesGetOrInsertBlob/package_blob.yml @@ -0,0 +1,17 @@ +- + id: 1 + size: 10 + hash_md5: HASHMD5_1 + hash_sha1: HASHSHA1_1 + hash_sha256: HASHSHA256_1 + hash_sha512: HASHSHA512_1 + hash_blake2b: HASHBLAKE2B_1 + created_unix: 946687980 +- + id: 2 + size: 20 + hash_md5: HASHMD5_2 + hash_sha1: HASHSHA1_2 + hash_sha256: HASHSHA256_2 + hash_sha512: HASHSHA512_2 + created_unix: 946687980 diff --git a/models/packages/main_test.go b/models/packages/main_test.go new file mode 100644 index 0000000000..8114461502 --- /dev/null +++ b/models/packages/main_test.go @@ -0,0 +1,31 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package packages + +import ( + "path/filepath" + "testing" + + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + + _ "forgejo.org/models" + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/forgefed" +) + +func AddFixtures(dirs ...string) func() { + return unittest.OverrideFixtures( + unittest.FixturesOptions{ + Dir: filepath.Join(setting.AppWorkPath, "models/fixtures/"), + Base: setting.AppWorkPath, + Dirs: dirs, + }, + ) +} + +func TestMain(m *testing.M) { + unittest.MainTest(m) +} diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index e86f652540..0de4434ef8 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -44,14 +44,19 @@ func GetOrInsertBlob(ctx context.Context, pb *PackageBlob) (*PackageBlob, bool, existing := &PackageBlob{} - has, err := e.Where(builder.Eq{ - "size": pb.Size, - "hash_md5": pb.HashMD5, - "hash_sha1": pb.HashSHA1, - "hash_sha256": pb.HashSHA256, - "hash_sha512": pb.HashSHA512, - "hash_blake2b": pb.HashBlake2b, - }).Get(existing) + has, err := e.Where(builder.And( + builder.Eq{ + "size": pb.Size, + "hash_md5": pb.HashMD5, + "hash_sha1": pb.HashSHA1, + "hash_sha256": pb.HashSHA256, + "hash_sha512": pb.HashSHA512, + }, + builder.Or( + builder.Eq{"hash_blake2b": pb.HashBlake2b}, + builder.IsNull{"hash_blake2b"}, + ), + )).Get(existing) if err != nil { return nil, false, err } diff --git a/models/packages/package_blob_test.go b/models/packages/package_blob_test.go new file mode 100644 index 0000000000..7de6aab15a --- /dev/null +++ b/models/packages/package_blob_test.go @@ -0,0 +1,64 @@ +// Copyright 2025 The Forgejo Authors. +// SPDX-License-Identifier: GPL-3.0-or-later + +package packages + +import ( + "testing" + + "forgejo.org/models/unittest" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestPackagesGetOrInsertBlob(t *testing.T) { + defer AddFixtures("models/fixtures/TestPackagesGetOrInsertBlob/")() + require.NoError(t, unittest.PrepareTestDatabase()) + + blake2bIsSet := unittest.AssertExistsAndLoadBean(t, &PackageBlob{ID: 1}) + blake2bNotSet := unittest.AssertExistsAndLoadBean(t, &PackageBlob{ID: 2}) + + blake2bSetToRandom := *blake2bNotSet + blake2bSetToRandom.HashBlake2b = "SOMETHING RANDOM" + + for _, testCase := range []struct { + name string + exists bool + packageBlob *PackageBlob + }{ + { + name: "exists and blake2b is not null in the database", + exists: true, + packageBlob: blake2bIsSet, + }, + { + name: "exists and blake2b is null in the database", + exists: true, + packageBlob: &blake2bSetToRandom, + }, + { + name: "does not exists", + exists: false, + packageBlob: &PackageBlob{ + Size: 30, + HashMD5: "HASHMD5_3", + HashSHA1: "HASHSHA1_3", + HashSHA256: "HASHSHA256_3", + HashSHA512: "HASHSHA512_3", + HashBlake2b: "HASHBLAKE2B_3", + }, + }, + } { + t.Run(testCase.name, func(t *testing.T) { + found, has, _ := GetOrInsertBlob(t.Context(), testCase.packageBlob) + assert.Equal(t, testCase.exists, has) + require.NotNil(t, found) + if testCase.exists { + assert.Equal(t, found.ID, testCase.packageBlob.ID) + } else { + unittest.BeanExists(t, &PackageBlob{ID: found.ID}) + } + }) + } +} diff --git a/models/packages/package_test.go b/models/packages/package_test.go index ab2d49c94c..3c1ec413fd 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -13,18 +13,9 @@ import ( "forgejo.org/models/unittest" user_model "forgejo.org/models/user" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/require" ) -func TestMain(m *testing.M) { - unittest.MainTest(m) -} - func prepareExamplePackage(t *testing.T) *packages_model.Package { require.NoError(t, unittest.PrepareTestDatabase()) From b55c72828e75f47abaebe829492909b32cfbd6b4 Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 11 Apr 2025 13:25:35 +0000 Subject: [PATCH 129/568] feat(sec): Add SSH signing support for instances (#6897) - Add support to set `gpg.format` in the Git config, via the new `[repository.signing].FORMAT` option. This is to tell Git that the instance would like to use SSH instead of OpenPGP to sign its commits. This is guarded behind a Git version check for v2.34.0 and a check that a `ssh-keygen` binary is present. - Add support to recognize the public SSH key that is given to `[repository.signing].SIGNING_KEY` as the signing key by the instance. - Thus this allows the instance to use SSH commit signing for commits that the instance creates (e.g. initial and squash commits) instead of using PGP. - Technically (although I have no clue how as this is not documented) you can have a different PGP signing key for different repositories; this is not implemented for SSH signing. - Add unit and integration testing. - `TestInstanceSigning` was reworked from `TestGPGGit`, now also includes testing for SHA256 repositories. Is the main integration test that actually signs commits and checks that they are marked as verified by Forgejo. - `TestParseCommitWithSSHSignature` is a unit test that makes sure that if a SSH instnace signing key is set, that it is used to possibly verify instance SSH signed commits. - `TestSyncConfigGPGFormat` is a unit test that makes sure the correct git config is set according to the signing format setting. Also checks that the guarded git version check and ssh-keygen binary presence check is done correctly. - `TestSSHInstanceKey` is a unit test that makes sure the parsing of a SSH signing key is done correctly. - `TestAPISSHSigningKey` is a integration test that makes sure the newly added API route `/api/v1/signing-key.ssh` responds correctly. Documentation PR: forgejo/docs#1122 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6897 Reviewed-by: Earl Warren Co-authored-by: Gusted Co-committed-by: Gusted --- custom/conf/app.example.ini | 6 +- models/asymkey/gpg_key_object_verification.go | 2 +- models/asymkey/ssh_key_object_verification.go | 18 + .../ssh_key_object_verification_test.go | 41 +++ modules/git/git.go | 52 +++ modules/git/git_test.go | 56 +++ modules/setting/repository.go | 19 + modules/setting/repository_test.go | 59 ++++ routers/api/v1/api.go | 1 + routers/api/v1/misc/signing.go | 29 ++ services/asymkey/sign.go | 7 + templates/swagger/v1_json.tmpl | 23 ++ tests/integration/api_misc_test.go | 38 ++ tests/integration/gpg_git_test.go | 304 ---------------- tests/integration/signing_git_test.go | 330 ++++++++++++++++++ tests/integration/ssh-signing-key | 7 + tests/integration/ssh-signing-key.pub | 1 + 17 files changed, 687 insertions(+), 306 deletions(-) create mode 100644 modules/setting/repository_test.go create mode 100644 tests/integration/api_misc_test.go delete mode 100644 tests/integration/gpg_git_test.go create mode 100644 tests/integration/signing_git_test.go create mode 100644 tests/integration/ssh-signing-key create mode 100644 tests/integration/ssh-signing-key.pub diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 79793ad47f..11c5d5eb0a 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1163,9 +1163,13 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; +;; Signing format that Forgejo should use, openpgp uses GPG and ssh uses OpenSSH. +;FORMAT = openpgp +;; ;; GPG key to use to sign commits, Defaults to the default - that is the value of git config --get user.signingkey ;; run in the context of the RUN_USER -;; Switch to none to stop signing completely +;; Switch to none to stop signing completely. +;; If `FORMAT` is set to **ssh** this should be set to an absolute path to an public OpenSSH key. ;SIGNING_KEY = default ;; ;; If a SIGNING_KEY ID is provided and is not set to default, use the provided Name and Email address as the signer. diff --git a/models/asymkey/gpg_key_object_verification.go b/models/asymkey/gpg_key_object_verification.go index 407a29c221..ae2ee3661d 100644 --- a/models/asymkey/gpg_key_object_verification.go +++ b/models/asymkey/gpg_key_object_verification.go @@ -201,7 +201,7 @@ func ParseObjectWithSignature(ctx context.Context, c *GitObject) *ObjectVerifica } } - if setting.Repository.Signing.SigningKey != "" && setting.Repository.Signing.SigningKey != "default" && setting.Repository.Signing.SigningKey != "none" { + if setting.Repository.Signing.Format == "openpgp" && setting.Repository.Signing.SigningKey != "" && setting.Repository.Signing.SigningKey != "default" && setting.Repository.Signing.SigningKey != "none" { // OK we should try the default key gpgSettings := git.GPGSettings{ Sign: true, diff --git a/models/asymkey/ssh_key_object_verification.go b/models/asymkey/ssh_key_object_verification.go index e0476fe5a8..5d933d35f9 100644 --- a/models/asymkey/ssh_key_object_verification.go +++ b/models/asymkey/ssh_key_object_verification.go @@ -12,8 +12,10 @@ import ( "forgejo.org/models/db" user_model "forgejo.org/models/user" "forgejo.org/modules/log" + "forgejo.org/modules/setting" "github.com/42wim/sshsig" + "golang.org/x/crypto/ssh" ) // ParseObjectWithSSHSignature check if signature is good against keystore. @@ -62,6 +64,22 @@ func ParseObjectWithSSHSignature(ctx context.Context, c *GitObject, committer *u } } + // If the SSH instance key is set, try to verify it with that key. + if setting.SSHInstanceKey != nil { + instanceSSHKey := &PublicKey{ + Content: string(ssh.MarshalAuthorizedKey(setting.SSHInstanceKey)), + Fingerprint: ssh.FingerprintSHA256(setting.SSHInstanceKey), + } + instanceUser := &user_model.User{ + Name: setting.Repository.Signing.SigningName, + Email: setting.Repository.Signing.SigningEmail, + } + commitVerification := verifySSHObjectVerification(c.Signature.Signature, c.Signature.Payload, instanceSSHKey, committer, instanceUser, setting.Repository.Signing.SigningEmail) + if commitVerification != nil { + return commitVerification + } + } + return &ObjectVerification{ CommittingUser: committer, Verified: false, diff --git a/models/asymkey/ssh_key_object_verification_test.go b/models/asymkey/ssh_key_object_verification_test.go index 5d1b7edc27..4bfd79d56e 100644 --- a/models/asymkey/ssh_key_object_verification_test.go +++ b/models/asymkey/ssh_key_object_verification_test.go @@ -4,6 +4,7 @@ package asymkey import ( + "os" "testing" "forgejo.org/models/db" @@ -15,6 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "golang.org/x/crypto/ssh" ) func TestParseCommitWithSSHSignature(t *testing.T) { @@ -150,4 +152,43 @@ muPLbvEduU+Ze/1Ol1pgk= assert.Equal(t, "user2 / SHA256:TKfwbZMR7e9OnlV2l1prfah1TXH8CmqR0PvFEXVCXA4", commitVerification.Reason) assert.Equal(t, sshKey, commitVerification.SigningSSHKey) }) + + t.Run("Instance key", func(t *testing.T) { + pubKeyContent, err := os.ReadFile("../../tests/integration/ssh-signing-key.pub") + require.NoError(t, err) + pubKey, _, _, _, err := ssh.ParseAuthorizedKey(pubKeyContent) + require.NoError(t, err) + + defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")() + defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "fox@example.com")() + defer test.MockVariableValue(&setting.SSHInstanceKey, pubKey)() + + gitCommit := &git.Commit{ + Committer: &git.Signature{ + Email: "fox@example.com", + }, + Signature: &git.ObjectSignature{ + Payload: `tree f96f1a4f1a51dc42e2983592f503980b60b8849c +parent 93f84db542dd8c6e952c8130bc2fcbe2e299b8b4 +author OwO 1738961379 +0100 +committer UwU 1738961379 +0100 + +Fox +`, + Signature: `-----BEGIN SSH SIGNATURE----- +U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgV5ELwZ8XJe2LLR/UTuEu/vsFdb +t7ry0W8hyzz/b1iocAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 +AAAAQCnyMRkWVVNoZxZkvi/ZoknUhs4LNBmEwZs9e9214WIt+mhKfc6BiHoE2qeluR2McD +Y5RzHnA8Ke9wXddEePCQE= +-----END SSH SIGNATURE----- +`, + }, + } + + o := commitToGitObject(gitCommit) + commitVerification := ParseObjectWithSSHSignature(db.DefaultContext, &o, user2) + assert.True(t, commitVerification.Verified) + assert.Equal(t, "UwU / SHA256:QttK41r/zMUeAW71b5UgVSb8xGFF/DlZJ6TyADW+uoI", commitVerification.Reason) + assert.Equal(t, "SHA256:QttK41r/zMUeAW71b5UgVSb8xGFF/DlZJ6TyADW+uoI", commitVerification.SigningSSHKey.Fingerprint) + }) } diff --git a/modules/git/git.go b/modules/git/git.go index c7d5a31b31..30d41933b2 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -278,6 +278,49 @@ func syncGitConfig() (err error) { return err } + switch setting.Repository.Signing.Format { + case "ssh": + // First do a git version check. + if CheckGitVersionAtLeast("2.34.0") != nil { + return errors.New("ssh signing requires Git >= 2.34.0") + } + + // Get the ssh-keygen binary that Git will use. + // This can be overriden in app.ini in [git.config] section, so we must + // query this information. + sshKeygenPath, err := configGet("gpg.ssh.program") + if err != nil { + return err + } + // git is very stubborn and does not give a default value, so we must do + // this ourselves. + if len(sshKeygenPath) == 0 { + // Default value of git, very unlikely to change. + // https://github.com/git/git/blob/5b97a56fa0e7d580dc8865b73107407c9b3f0eff/gpg-interface.c#L116 + sshKeygenPath = "ssh-keygen" + } + + // Although there's a version requirement of 8.2p1, there's no cross-version + // method to get the version of ssh-keygen. Therefore we do a simple binary + // presence check and hope for the best. + if _, err := exec.LookPath(sshKeygenPath); err != nil { + if errors.Is(err, exec.ErrNotFound) { + return errors.New("git signing requires a ssh-keygen binary") + } + return err + } + + if err := configSet("gpg.format", "ssh"); err != nil { + return err + } + // openpgp is already the default value, so in the case of a non SSH format + // set the value to openpgp. + default: + if err := configSet("gpg.format", "openpgp"); err != nil { + return err + } + } + // By default partial clones are disabled, enable them from git v2.22 if !setting.Git.DisablePartialClone && CheckGitVersionAtLeast("2.22") == nil { if err = configSet("uploadpack.allowfilter", "true"); err != nil { @@ -324,6 +367,15 @@ func CheckGitVersionEqual(equal string) error { return nil } +func configGet(key string) (string, error) { + stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) + if err != nil && !IsErrorExitCode(err, 1) { + return "", fmt.Errorf("failed to get git config %s, err: %w", key, err) + } + + return strings.TrimSpace(stdout), nil +} + func configSet(key, value string) error { stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err != nil && !IsErrorExitCode(err, 1) { diff --git a/modules/git/git_test.go b/modules/git/git_test.go index bb07367e3b..a3faf85f16 100644 --- a/modules/git/git_test.go +++ b/modules/git/git_test.go @@ -11,8 +11,10 @@ import ( "testing" "forgejo.org/modules/setting" + "forgejo.org/modules/test" "forgejo.org/modules/util" + "github.com/hashicorp/go-version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -94,3 +96,57 @@ func TestSyncConfig(t *testing.T) { assert.True(t, gitConfigContains("[sync-test]")) assert.True(t, gitConfigContains("cfg-key-a = CfgValA")) } + +func TestSyncConfigGPGFormat(t *testing.T) { + defer test.MockProtect(&setting.GitConfig)() + + t.Run("No format", func(t *testing.T) { + defer test.MockVariableValue(&setting.Repository.Signing.Format, "")() + require.NoError(t, syncGitConfig()) + assert.True(t, gitConfigContains("[gpg]")) + assert.True(t, gitConfigContains("format = openpgp")) + }) + + t.Run("SSH format", func(t *testing.T) { + r, err := os.OpenRoot(t.TempDir()) + require.NoError(t, err) + f, err := r.OpenFile("ssh-keygen", os.O_CREATE|os.O_TRUNC, 0o700) + require.NoError(t, f.Close()) + require.NoError(t, err) + t.Setenv("PATH", r.Name()) + defer test.MockVariableValue(&setting.Repository.Signing.Format, "ssh")() + + require.NoError(t, syncGitConfig()) + assert.True(t, gitConfigContains("[gpg]")) + assert.True(t, gitConfigContains("format = ssh")) + + t.Run("Old version", func(t *testing.T) { + oldVersion, err := version.NewVersion("2.33.0") + require.NoError(t, err) + defer test.MockVariableValue(&gitVersion, oldVersion)() + require.ErrorContains(t, syncGitConfig(), "ssh signing requires Git >= 2.34.0") + }) + + t.Run("No ssh-keygen binary", func(t *testing.T) { + require.NoError(t, r.Remove("ssh-keygen")) + require.ErrorContains(t, syncGitConfig(), "git signing requires a ssh-keygen binary") + }) + + t.Run("Dynamic ssh-keygen binary location", func(t *testing.T) { + f, err := r.OpenFile("ssh-keygen-2", os.O_CREATE|os.O_TRUNC, 0o700) + require.NoError(t, f.Close()) + require.NoError(t, err) + defer test.MockVariableValue(&setting.GitConfig.Options, map[string]string{ + "gpg.ssh.program": "ssh-keygen-2", + })() + require.NoError(t, syncGitConfig()) + }) + }) + + t.Run("OpenPGP format", func(t *testing.T) { + defer test.MockVariableValue(&setting.Repository.Signing.Format, "openpgp")() + require.NoError(t, syncGitConfig()) + assert.True(t, gitConfigContains("[gpg]")) + assert.True(t, gitConfigContains("format = openpgp")) + }) +} diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 9efd674f8b..a770740f86 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -4,12 +4,15 @@ package setting import ( + "os" "os/exec" "path" "path/filepath" "strings" "forgejo.org/modules/log" + + "golang.org/x/crypto/ssh" ) // enumerates all the policy repository creating @@ -26,6 +29,8 @@ var MaxUserCardsPerPage = 36 // MaxForksPerPage sets maximum amount of forks shown per page var MaxForksPerPage = 40 +var SSHInstanceKey ssh.PublicKey + // Repository settings var ( Repository = struct { @@ -109,6 +114,7 @@ var ( SigningKey string SigningName string SigningEmail string + Format string InitialCommit []string CRUDActions []string `ini:"CRUD_ACTIONS"` Merges []string @@ -262,6 +268,7 @@ var ( SigningKey string SigningName string SigningEmail string + Format string InitialCommit []string CRUDActions []string `ini:"CRUD_ACTIONS"` Merges []string @@ -271,6 +278,7 @@ var ( SigningKey: "default", SigningName: "", SigningEmail: "", + Format: "openpgp", InitialCommit: []string{"always"}, CRUDActions: []string{"pubkey", "twofa", "parentsigned"}, Merges: []string{"pubkey", "twofa", "basesigned", "commitssigned"}, @@ -376,4 +384,15 @@ func loadRepositoryFrom(rootCfg ConfigProvider) { log.Fatal("loadRepoArchiveFrom: %v", err) } Repository.EnableFlags = sec.Key("ENABLE_FLAGS").MustBool() + + if Repository.Signing.Format == "ssh" && Repository.Signing.SigningKey != "none" && Repository.Signing.SigningKey != "" { + sshPublicKey, err := os.ReadFile(Repository.Signing.SigningKey) + if err != nil { + log.Fatal("Could not read repository signing key in %q: %v", Repository.Signing.SigningKey, err) + } + SSHInstanceKey, _, _, _, err = ssh.ParseAuthorizedKey(sshPublicKey) + if err != nil { + log.Fatal("Could not parse the SSH signing key %q: %v", sshPublicKey, err) + } + } } diff --git a/modules/setting/repository_test.go b/modules/setting/repository_test.go new file mode 100644 index 0000000000..d36e739f6b --- /dev/null +++ b/modules/setting/repository_test.go @@ -0,0 +1,59 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package setting + +import ( + "fmt" + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "golang.org/x/crypto/ssh" +) + +func TestSSHInstanceKey(t *testing.T) { + sshSigningKeyPath, err := filepath.Abs("../../tests/integration/ssh-signing-key.pub") + require.NoError(t, err) + + t.Run("None value", func(t *testing.T) { + cfg, err := NewConfigProviderFromData(` +[repository.signing] +FORMAT = ssh +SIGNING_KEY = none +`) + require.NoError(t, err) + + loadRepositoryFrom(cfg) + + assert.Nil(t, SSHInstanceKey) + }) + + t.Run("No value", func(t *testing.T) { + cfg, err := NewConfigProviderFromData(` +[repository.signing] +FORMAT = ssh +`) + require.NoError(t, err) + + loadRepositoryFrom(cfg) + + assert.Nil(t, SSHInstanceKey) + }) + t.Run("Normal", func(t *testing.T) { + iniStr := fmt.Sprintf(` +[repository.signing] +FORMAT = ssh +SIGNING_KEY = %s +`, sshSigningKeyPath) + cfg, err := NewConfigProviderFromData(iniStr) + require.NoError(t, err) + + loadRepositoryFrom(cfg) + + assert.NotNil(t, SSHInstanceKey) + assert.Equal(t, "ssh-ed25519", SSHInstanceKey.Type()) + assert.EqualValues(t, "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeRC8GfFyXtiy0f1E7hLv77BXW7e68tFvIcs8/29YqH\n", ssh.MarshalAuthorizedKey(SSHInstanceKey)) + }) +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 1c6f260b23..d638e79a60 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -865,6 +865,7 @@ func Routes() *web.Route { m.Group("", func() { m.Get("/version", misc.Version) m.Get("/signing-key.gpg", misc.SigningKey) + m.Get("/signing-key.ssh", misc.SSHSigningKey) m.Post("/markup", reqToken(), bind(api.MarkupOption{}), misc.Markup) m.Post("/markdown", reqToken(), bind(api.MarkdownOption{}), misc.Markdown) m.Post("/markdown/raw", reqToken(), misc.MarkdownRaw) diff --git a/routers/api/v1/misc/signing.go b/routers/api/v1/misc/signing.go index 945df6068f..9f829b8443 100644 --- a/routers/api/v1/misc/signing.go +++ b/routers/api/v1/misc/signing.go @@ -7,8 +7,11 @@ import ( "fmt" "net/http" + "forgejo.org/modules/setting" asymkey_service "forgejo.org/services/asymkey" "forgejo.org/services/context" + + "golang.org/x/crypto/ssh" ) // SigningKey returns the public key of the default signing key if it exists @@ -61,3 +64,29 @@ func SigningKey(ctx *context.APIContext) { ctx.Error(http.StatusInternalServerError, "gpg export", fmt.Errorf("Error writing key content %w", err)) } } + +// SSHSigningKey returns the public SSH key of the default signing key if it exists +func SSHSigningKey(ctx *context.APIContext) { + // swagger:operation GET /signing-key.ssh miscellaneous getSSHSigningKey + // --- + // summary: Get default signing-key.ssh + // produces: + // - text/plain + // responses: + // "200": + // description: "SSH public key in OpenSSH authorized key format" + // schema: + // type: string + // "404": + // "$ref": "#/responses/notFound" + + if setting.SSHInstanceKey == nil { + ctx.NotFound() + return + } + + _, err := ctx.Write(ssh.MarshalAuthorizedKey(setting.SSHInstanceKey)) + if err != nil { + ctx.Error(http.StatusInternalServerError, "ssh export", err) + } +} diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go index 0030523b22..592396769d 100644 --- a/services/asymkey/sign.go +++ b/services/asymkey/sign.go @@ -90,6 +90,13 @@ func SigningKey(ctx context.Context, repoPath string) (string, *git.Signature) { return "", nil } + if setting.Repository.Signing.Format == "ssh" { + return setting.Repository.Signing.SigningKey, &git.Signature{ + Name: setting.Repository.Signing.SigningName, + Email: setting.Repository.Signing.SigningEmail, + } + } + if setting.Repository.Signing.SigningKey == "default" || setting.Repository.Signing.SigningKey == "" { // Can ignore the error here as it means that commit.gpgsign is not set value, _, _ := git.NewCommand(ctx, "config", "--get", "commit.gpgsign").RunStdString(&git.RunOpts{Dir: repoPath}) diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 97529248e9..21679881b2 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -17315,6 +17315,29 @@ } } }, + "/signing-key.ssh": { + "get": { + "produces": [ + "text/plain" + ], + "tags": [ + "miscellaneous" + ], + "summary": "Get default signing-key.ssh", + "operationId": "getSSHSigningKey", + "responses": { + "200": { + "description": "SSH public key in OpenSSH authorized key format", + "schema": { + "type": "string" + } + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, "/teams/{id}": { "get": { "produces": [ diff --git a/tests/integration/api_misc_test.go b/tests/integration/api_misc_test.go new file mode 100644 index 0000000000..2687a9bb31 --- /dev/null +++ b/tests/integration/api_misc_test.go @@ -0,0 +1,38 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package integration + +import ( + "net/http" + "testing" + + "forgejo.org/modules/setting" + "forgejo.org/modules/test" + "forgejo.org/tests" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "golang.org/x/crypto/ssh" +) + +func TestAPISSHSigningKey(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + t.Run("No signing key", func(t *testing.T) { + defer test.MockVariableValue(&setting.SSHInstanceKey, nil)() + defer tests.PrintCurrentTest(t)() + + MakeRequest(t, NewRequest(t, "GET", "/api/v1/signing-key.ssh"), http.StatusNotFound) + }) + t.Run("With signing key", func(t *testing.T) { + publicKey := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeRC8GfFyXtiy0f1E7hLv77BXW7e68tFvIcs8/29YqH\n" + pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(publicKey)) + require.NoError(t, err) + defer test.MockVariableValue(&setting.SSHInstanceKey, pubKey)() + defer tests.PrintCurrentTest(t)() + + resp := MakeRequest(t, NewRequest(t, "GET", "/api/v1/signing-key.ssh"), http.StatusOK) + assert.Equal(t, publicKey, resp.Body.String()) + }) +} diff --git a/tests/integration/gpg_git_test.go b/tests/integration/gpg_git_test.go deleted file mode 100644 index 271c225a3f..0000000000 --- a/tests/integration/gpg_git_test.go +++ /dev/null @@ -1,304 +0,0 @@ -// Copyright 2019 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "encoding/base64" - "fmt" - "net/url" - "os" - "testing" - - auth_model "forgejo.org/models/auth" - "forgejo.org/models/unittest" - user_model "forgejo.org/models/user" - "forgejo.org/modules/git" - "forgejo.org/modules/process" - "forgejo.org/modules/setting" - api "forgejo.org/modules/structs" - "forgejo.org/modules/test" - "forgejo.org/tests" - - "github.com/ProtonMail/go-crypto/openpgp" - "github.com/ProtonMail/go-crypto/openpgp/armor" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestGPGGit(t *testing.T) { - tmpDir := t.TempDir() // use a temp dir to avoid messing with the user's GPG keyring - err := os.Chmod(tmpDir, 0o700) - require.NoError(t, err) - - t.Setenv("GNUPGHOME", tmpDir) - require.NoError(t, err) - - // Need to create a root key - rootKeyPair, err := importTestingKey() - require.NoError(t, err, "importTestingKey") - - defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())() - defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "gitea")() - defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "gitea@fake.local")() - defer test.MockVariableValue(&setting.Repository.Signing.InitialCommit, []string{"never"})() - defer test.MockVariableValue(&setting.Repository.Signing.CRUDActions, []string{"never"})() - - username := "user2" - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: username}) - baseAPITestContext := NewAPITestContext(t, username, "repo1") - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - u.Path = baseAPITestContext.GitPath() - - t.Run("Unsigned-Initial", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat - t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { - assert.NotNil(t, branch.Commit) - assert.NotNil(t, branch.Commit.Verification) - assert.False(t, branch.Commit.Verification.Verified) - assert.Empty(t, branch.Commit.Verification.Signature) - })) - t.Run("CreateCRUDFile-Never", crudActionCreateFile( - t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) { - assert.False(t, response.Verification.Verified) - })) - t.Run("CreateCRUDFile-Never", crudActionCreateFile( - t, testCtx, user, "never", "never2", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) { - assert.False(t, response.Verification.Verified) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"parentsigned"} - t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile( - t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) { - assert.False(t, response.Verification.Verified) - })) - t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile( - t, testCtx, user, "parentsigned", "parentsigned2", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) { - assert.False(t, response.Verification.Verified) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"never"} - t.Run("Unsigned-Initial-CRUD-Never", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateCRUDFile-Never", crudActionCreateFile( - t, testCtx, user, "parentsigned", "parentsigned-never", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) { - assert.False(t, response.Verification.Verified) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"always"} - t.Run("Unsigned-Initial-CRUD-Always", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateCRUDFile-Always", crudActionCreateFile( - t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) { - assert.NotNil(t, response.Verification) - if response.Verification == nil { - assert.FailNow(t, "no verification provided with response", "response: %v", response) - } - assert.True(t, response.Verification.Verified) - if !response.Verification.Verified { - t.FailNow() - } - assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) - })) - t.Run("CreateCRUDFile-ParentSigned-always", crudActionCreateFile( - t, testCtx, user, "parentsigned", "parentsigned-always", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) { - assert.NotNil(t, response.Verification) - if response.Verification == nil { - assert.FailNow(t, "no verification provided with response", "response: %v", response) - } - assert.True(t, response.Verification.Verified) - if !response.Verification.Verified { - t.FailNow() - } - assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"parentsigned"} - t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateCRUDFile-Always-ParentSigned", crudActionCreateFile( - t, testCtx, user, "always", "always-parentsigned", "signed-always-parentsigned.txt", func(t *testing.T, response api.FileResponse) { - assert.NotNil(t, response.Verification) - if response.Verification == nil { - assert.FailNow(t, "no verification provided with response", "response: %v", response) - } - assert.True(t, response.Verification.Verified) - if !response.Verification.Verified { - t.FailNow() - } - assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) - })) - }) - - setting.Repository.Signing.InitialCommit = []string{"always"} - t.Run("AlwaysSign-Initial", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-always", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat - t.Run("CheckMasterBranchSigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { - assert.NotNil(t, branch.Commit) - if branch.Commit == nil { - assert.FailNow(t, "no commit provided with branch", "branch: %v", branch) - } - assert.NotNil(t, branch.Commit.Verification) - if branch.Commit.Verification == nil { - assert.FailNow(t, "no verification provided with branch commit", "commit: %v", branch.Commit) - } - assert.True(t, branch.Commit.Verification.Verified) - if !branch.Commit.Verification.Verified { - t.FailNow() - } - assert.Equal(t, "gitea@fake.local", branch.Commit.Verification.Signer.Email) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"never"} - t.Run("AlwaysSign-Initial-CRUD-Never", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-always-never", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat - t.Run("CreateCRUDFile-Never", crudActionCreateFile( - t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) { - assert.False(t, response.Verification.Verified) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"parentsigned"} - t.Run("AlwaysSign-Initial-CRUD-ParentSigned-On-Always", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-always-parent", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat - t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile( - t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) { - assert.True(t, response.Verification.Verified) - if !response.Verification.Verified { - t.FailNow() - return - } - assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) - })) - }) - - setting.Repository.Signing.CRUDActions = []string{"always"} - t.Run("AlwaysSign-Initial-CRUD-Always", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-always-always", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat - t.Run("CreateCRUDFile-Always", crudActionCreateFile( - t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) { - assert.True(t, response.Verification.Verified) - if !response.Verification.Verified { - t.FailNow() - return - } - assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email) - })) - }) - - setting.Repository.Signing.Merges = []string{"commitssigned"} - t.Run("UnsignedMerging", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreatePullRequest", func(t *testing.T) { - pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "never2")(t) - require.NoError(t, err) - t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) - }) - t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { - assert.NotNil(t, branch.Commit) - assert.NotNil(t, branch.Commit.Verification) - assert.False(t, branch.Commit.Verification.Verified) - assert.Empty(t, branch.Commit.Verification.Signature) - })) - }) - - setting.Repository.Signing.Merges = []string{"basesigned"} - t.Run("BaseSignedMerging", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreatePullRequest", func(t *testing.T) { - pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "parentsigned2")(t) - require.NoError(t, err) - t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) - }) - t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { - assert.NotNil(t, branch.Commit) - assert.NotNil(t, branch.Commit.Verification) - assert.False(t, branch.Commit.Verification.Verified) - assert.Empty(t, branch.Commit.Verification.Signature) - })) - }) - - setting.Repository.Signing.Merges = []string{"commitssigned"} - t.Run("CommitsSignedMerging", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - t.Run("CreatePullRequest", func(t *testing.T) { - pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "always-parentsigned")(t) - require.NoError(t, err) - t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) - }) - t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { - assert.NotNil(t, branch.Commit) - assert.NotNil(t, branch.Commit.Verification) - assert.True(t, branch.Commit.Verification.Verified) - })) - }) - }) -} - -func crudActionCreateFile(_ *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { - return doAPICreateFile(ctx, path, &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: from, - NewBranchName: to, - Message: fmt.Sprintf("from:%s to:%s path:%s", from, to, path), - Author: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, - Committer: api.Identity{ - Name: user.FullName, - Email: user.Email, - }, - }, - ContentBase64: base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("This is new text for %s", path))), - }, callback...) -} - -func importTestingKey() (*openpgp.Entity, error) { - if _, _, err := process.GetManager().Exec("gpg --import tests/integration/private-testing.key", "gpg", "--import", "tests/integration/private-testing.key"); err != nil { - return nil, err - } - keyringFile, err := os.Open("tests/integration/private-testing.key") - if err != nil { - return nil, err - } - defer keyringFile.Close() - - block, err := armor.Decode(keyringFile) - if err != nil { - return nil, err - } - - keyring, err := openpgp.ReadKeyRing(block.Body) - if err != nil { - return nil, fmt.Errorf("Keyring access failed: '%w'", err) - } - - // There should only be one entity in this file. - return keyring[0], nil -} diff --git a/tests/integration/signing_git_test.go b/tests/integration/signing_git_test.go new file mode 100644 index 0000000000..bc662ee3bb --- /dev/null +++ b/tests/integration/signing_git_test.go @@ -0,0 +1,330 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "context" + "encoding/base64" + "fmt" + "net/url" + "os" + "path/filepath" + "testing" + + auth_model "forgejo.org/models/auth" + "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/git" + "forgejo.org/modules/process" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + "forgejo.org/modules/test" + "forgejo.org/tests" + + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/armor" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "golang.org/x/crypto/ssh" +) + +func TestInstanceSigning(t *testing.T) { + t.Cleanup(func() { + // Cannot use t.Context(), it is in the done state. + require.NoError(t, git.InitFull(context.Background())) //nolint:usetesting + }) + + onGiteaRun(t, func(t *testing.T, u *url.URL) { + defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")() + defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "fox@example.com")() + defer test.MockProtect(&setting.Repository.Signing.InitialCommit)() + defer test.MockProtect(&setting.Repository.Signing.CRUDActions)() + + t.Run("SSH", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + pubKeyContent, err := os.ReadFile("tests/integration/ssh-signing-key.pub") + require.NoError(t, err) + + pubKey, _, _, _, err := ssh.ParseAuthorizedKey(pubKeyContent) + require.NoError(t, err) + signingKeyPath, err := filepath.Abs("tests/integration/ssh-signing-key") + require.NoError(t, err) + require.NoError(t, os.Chmod(signingKeyPath, 0o600)) + defer test.MockVariableValue(&setting.SSHInstanceKey, pubKey)() + defer test.MockVariableValue(&setting.Repository.Signing.Format, "ssh")() + defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, signingKeyPath)() + + // Ensure the git config is updated with the new signing format. + require.NoError(t, git.InitFull(t.Context())) + + forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) { + u2 := *u + testCRUD(t, &u2, "ssh", objectFormat) + }) + }) + + t.Run("PGP", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + // Use a new GNUPGPHOME to avoid messing with the existing GPG keyring. + tmpDir := t.TempDir() + require.NoError(t, os.Chmod(tmpDir, 0o700)) + t.Setenv("GNUPGHOME", tmpDir) + + rootKeyPair, err := importTestingKey() + require.NoError(t, err) + defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())() + defer test.MockVariableValue(&setting.Repository.Signing.Format, "openpgp")() + + // Ensure the git config is updated with the new signing format. + require.NoError(t, git.InitFull(t.Context())) + + forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) { + u2 := *u + testCRUD(t, &u2, "pgp", objectFormat) + }) + }) + }) +} + +func testCRUD(t *testing.T, u *url.URL, signingFormat string, objectFormat git.ObjectFormat) { + t.Helper() + setting.Repository.Signing.CRUDActions = []string{"never"} + setting.Repository.Signing.InitialCommit = []string{"never"} + + username := "user2" + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: username}) + baseAPITestContext := NewAPITestContext(t, username, "repo1") + u.Path = baseAPITestContext.GitPath() + + suffix := "-" + signingFormat + "-" + objectFormat.Name() + + t.Run("Unsigned-Initial", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateRepository", doAPICreateRepository(testCtx, false, objectFormat)) + t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { + assert.NotNil(t, branch.Commit) + assert.NotNil(t, branch.Commit.Verification) + assert.False(t, branch.Commit.Verification.Verified) + assert.Empty(t, branch.Commit.Verification.Signature) + })) + t.Run("CreateCRUDFile-Never", crudActionCreateFile( + t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) { + assert.False(t, response.Verification.Verified) + })) + t.Run("CreateCRUDFile-Never", crudActionCreateFile( + t, testCtx, user, "never", "never2", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) { + assert.False(t, response.Verification.Verified) + })) + }) + + t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.CRUDActions = []string{"parentsigned"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile( + t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) { + assert.False(t, response.Verification.Verified) + })) + t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile( + t, testCtx, user, "parentsigned", "parentsigned2", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) { + assert.False(t, response.Verification.Verified) + })) + }) + + t.Run("Unsigned-Initial-CRUD-Never", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.InitialCommit = []string{"never"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateCRUDFile-Never", crudActionCreateFile( + t, testCtx, user, "parentsigned", "parentsigned-never", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) { + assert.False(t, response.Verification.Verified) + })) + }) + + t.Run("Unsigned-Initial-CRUD-Always", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.CRUDActions = []string{"always"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateCRUDFile-Always", crudActionCreateFile( + t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) { + require.NotNil(t, response.Verification) + assert.True(t, response.Verification.Verified) + assert.Equal(t, "fox@example.com", response.Verification.Signer.Email) + })) + t.Run("CreateCRUDFile-ParentSigned-always", crudActionCreateFile( + t, testCtx, user, "parentsigned", "parentsigned-always", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) { + require.NotNil(t, response.Verification) + assert.True(t, response.Verification.Verified) + assert.Equal(t, "fox@example.com", response.Verification.Signer.Email) + })) + }) + + t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.CRUDActions = []string{"parentsigned"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateCRUDFile-Always-ParentSigned", crudActionCreateFile( + t, testCtx, user, "always", "always-parentsigned", "signed-always-parentsigned.txt", func(t *testing.T, response api.FileResponse) { + require.NotNil(t, response.Verification) + assert.True(t, response.Verification.Verified) + assert.Equal(t, "fox@example.com", response.Verification.Signer.Email) + })) + }) + + t.Run("AlwaysSign-Initial", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.InitialCommit = []string{"always"} + + testCtx := NewAPITestContext(t, username, "initial-always"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateRepository", doAPICreateRepository(testCtx, false, objectFormat)) + t.Run("CheckMasterBranchSigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { + require.NotNil(t, branch.Commit) + require.NotNil(t, branch.Commit.Verification) + assert.True(t, branch.Commit.Verification.Verified) + assert.Equal(t, "fox@example.com", branch.Commit.Verification.Signer.Email) + })) + }) + + t.Run("AlwaysSign-Initial-CRUD-Never", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.CRUDActions = []string{"never"} + + testCtx := NewAPITestContext(t, username, "initial-always-never"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateRepository", doAPICreateRepository(testCtx, false, objectFormat)) + t.Run("CreateCRUDFile-Never", crudActionCreateFile( + t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) { + assert.False(t, response.Verification.Verified) + })) + }) + + t.Run("AlwaysSign-Initial-CRUD-ParentSigned-On-Always", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.CRUDActions = []string{"parentsigned"} + + testCtx := NewAPITestContext(t, username, "initial-always-parent"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateRepository", doAPICreateRepository(testCtx, false, objectFormat)) + t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile( + t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) { + assert.True(t, response.Verification.Verified) + assert.Equal(t, "fox@example.com", response.Verification.Signer.Email) + })) + }) + + t.Run("AlwaysSign-Initial-CRUD-Always", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.CRUDActions = []string{"always"} + + testCtx := NewAPITestContext(t, username, "initial-always-always"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreateRepository", doAPICreateRepository(testCtx, false, objectFormat)) + t.Run("CreateCRUDFile-Always", crudActionCreateFile( + t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) { + assert.True(t, response.Verification.Verified) + assert.Equal(t, "fox@example.com", response.Verification.Signer.Email) + })) + }) + + t.Run("UnsignedMerging", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.Merges = []string{"commitssigned"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreatePullRequest", func(t *testing.T) { + pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "never2")(t) + require.NoError(t, err) + t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) + }) + t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { + require.NotNil(t, branch.Commit) + require.NotNil(t, branch.Commit.Verification) + assert.False(t, branch.Commit.Verification.Verified) + assert.Empty(t, branch.Commit.Verification.Signature) + })) + }) + + t.Run("BaseSignedMerging", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.Merges = []string{"basesigned"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreatePullRequest", func(t *testing.T) { + pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "parentsigned2")(t) + require.NoError(t, err) + t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) + }) + t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { + require.NotNil(t, branch.Commit) + require.NotNil(t, branch.Commit.Verification) + assert.False(t, branch.Commit.Verification.Verified) + assert.Empty(t, branch.Commit.Verification.Signature) + })) + }) + + t.Run("CommitsSignedMerging", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + setting.Repository.Signing.Merges = []string{"commitssigned"} + + testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + t.Run("CreatePullRequest", func(t *testing.T) { + pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "always-parentsigned")(t) + require.NoError(t, err) + t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index)) + }) + t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { + require.NotNil(t, branch.Commit) + require.NotNil(t, branch.Commit.Verification) + assert.True(t, branch.Commit.Verification.Verified) + })) + }) +} + +func crudActionCreateFile(_ *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { + return doAPICreateFile(ctx, path, &api.CreateFileOptions{ + FileOptions: api.FileOptions{ + BranchName: from, + NewBranchName: to, + Message: fmt.Sprintf("from:%s to:%s path:%s", from, to, path), + Author: api.Identity{ + Name: user.FullName, + Email: user.Email, + }, + Committer: api.Identity{ + Name: user.FullName, + Email: user.Email, + }, + }, + ContentBase64: base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("This is new text for %s", path))), + }, callback...) +} + +func importTestingKey() (*openpgp.Entity, error) { + if _, _, err := process.GetManager().Exec("gpg --import tests/integration/private-testing.key", "gpg", "--import", "tests/integration/private-testing.key"); err != nil { + return nil, err + } + keyringFile, err := os.Open("tests/integration/private-testing.key") + if err != nil { + return nil, err + } + defer keyringFile.Close() + + block, err := armor.Decode(keyringFile) + if err != nil { + return nil, err + } + + keyring, err := openpgp.ReadKeyRing(block.Body) + if err != nil { + return nil, fmt.Errorf("Keyring access failed: '%w'", err) + } + + // There should only be one entity in this file. + return keyring[0], nil +} diff --git a/tests/integration/ssh-signing-key b/tests/integration/ssh-signing-key new file mode 100644 index 0000000000..e67df477c5 --- /dev/null +++ b/tests/integration/ssh-signing-key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBXkQvBnxcl7YstH9RO4S7++wV1u3uvLRbyHLPP9vWKhwAAAJhlmhmkZZoZ +pAAAAAtzc2gtZWQyNTUxOQAAACBXkQvBnxcl7YstH9RO4S7++wV1u3uvLRbyHLPP9vWKhw +AAAEDnOTuE2rDECN+2OsuUbQgGrMSY22tn+IF5JG5nuyJinVeRC8GfFyXtiy0f1E7hLv77 +BXW7e68tFvIcs8/29YqHAAAAE2d1c3RlZEBndXN0ZWQtYmVhc3QBAg== +-----END OPENSSH PRIVATE KEY----- diff --git a/tests/integration/ssh-signing-key.pub b/tests/integration/ssh-signing-key.pub new file mode 100644 index 0000000000..3d1ab60b47 --- /dev/null +++ b/tests/integration/ssh-signing-key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeRC8GfFyXtiy0f1E7hLv77BXW7e68tFvIcs8/29YqH From b86aefc03886e6b25f5871fefe18967ad8242bd3 Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 11 Apr 2025 15:12:50 +0000 Subject: [PATCH 130/568] chore: use `sharp` to generate images (#7512) - `tools/generate-images.js` is used to convert SVGs to resized optimized SVGs and resized optimized PNG. Although it would be best to drop generating images from SVG, the usage of these images do not accept a SVG. - The script relied on two dependencies being installed on-the-fly, this is suboptimal as it means its integrity was not saved in package-lock.json and no specific version was specified which makes reproducible builds harder. `imagemin-zopfli` was not updated in 4 years and seems to use dependency that generate funny message about memory leaks and using no longer maintained dependencies. - Use [`sharp`](https://sharp.pixelplumbing.com/) to do the image conversion, this installs two binaries on Linux (glibc/musl) and are responsible for 5% of the `node_modules` directory size. Add this to package.json as a dev dependencies to ensure the integrity can be verified and help reproducible builds. - Drop the `gitea` conversion, I cannot find this being used within Forgejo (my best guess is that e20cd83bc5479bd76ff1a248f0e28ef0bea6742b dropped the usage of it). - Resolves forgejo/forgejo#7232 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7512 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Reviewed-by: Michael Kriese Co-authored-by: Gusted Co-committed-by: Gusted --- Makefile | 3 +- package-lock.json | 491 +++++++++++++++++++++++++ package.json | 1 + public/assets/img/apple-touch-icon.png | Bin 2709 -> 1571 bytes public/assets/img/avatar_default.png | Bin 3189 -> 1568 bytes public/assets/img/favicon.png | Bin 2968 -> 1500 bytes public/assets/img/gitea.svg | 1 - public/assets/img/logo.png | Bin 6747 -> 3776 bytes routers/install/routes_test.go | 2 +- tools/generate-images.js | 36 +- 10 files changed, 500 insertions(+), 34 deletions(-) delete mode 100644 public/assets/img/gitea.svg diff --git a/Makefile b/Makefile index 942605aa19..13ddc369b7 100644 --- a/Makefile +++ b/Makefile @@ -1017,8 +1017,7 @@ generate-gomock: .PHONY: generate-images generate-images: | node_modules - npm install --no-save fabric@6 imagemin-zopfli@7 - node tools/generate-images.js $(TAGS) + node tools/generate-images.js .PHONY: generate-manpage generate-manpage: diff --git a/package-lock.json b/package-lock.json index 0250d2a364..0a67ed0b43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,6 +92,7 @@ "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.44.0", "postcss-html": "1.8.0", + "sharp": "0.34.1", "stylelint": "16.17.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.11", @@ -1338,6 +1339,403 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@img/sharp-darwin-arm64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.1.tgz", + "integrity": "sha512-pn44xgBtgpEbZsu+lWf2KNb6OAf70X68k+yk69Ic2Xz11zHR/w24/U49XT7AeRwJ0Px+mhALhU5LPci1Aymk7A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-arm64": "1.1.0" + } + }, + "node_modules/@img/sharp-darwin-x64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.1.tgz", + "integrity": "sha512-VfuYgG2r8BpYiOUN+BfYeFo69nP/MIwAtSJ7/Zpxc5QF3KS22z8Pvg3FkrSFJBPNQ7mmcUcYQFBmEQp7eu1F8Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.1.0" + } + }, + "node_modules/@img/sharp-libvips-darwin-arm64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.1.0.tgz", + "integrity": "sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.1.0.tgz", + "integrity": "sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.1.0.tgz", + "integrity": "sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.1.0.tgz", + "integrity": "sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-ppc64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.1.0.tgz", + "integrity": "sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-s390x": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.1.0.tgz", + "integrity": "sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-x64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.1.0.tgz", + "integrity": "sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.1.0.tgz", + "integrity": "sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-x64": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.1.0.tgz", + "integrity": "sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-linux-arm": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.1.tgz", + "integrity": "sha512-anKiszvACti2sGy9CirTlNyk7BjjZPiML1jt2ZkTdcvpLU1YH6CXwRAZCA2UmRXnhiIftXQ7+Oh62Ji25W72jA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm": "1.1.0" + } + }, + "node_modules/@img/sharp-linux-arm64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.1.tgz", + "integrity": "sha512-kX2c+vbvaXC6vly1RDf/IWNXxrlxLNpBVWkdpRq5Ka7OOKj6nr66etKy2IENf6FtOgklkg9ZdGpEu9kwdlcwOQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.1.0" + } + }, + "node_modules/@img/sharp-linux-s390x": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.1.tgz", + "integrity": "sha512-7s0KX2tI9mZI2buRipKIw2X1ufdTeaRgwmRabt5bi9chYfhur+/C1OXg3TKg/eag1W+6CCWLVmSauV1owmRPxA==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-s390x": "1.1.0" + } + }, + "node_modules/@img/sharp-linux-x64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.1.tgz", + "integrity": "sha512-wExv7SH9nmoBW3Wr2gvQopX1k8q2g5V5Iag8Zk6AVENsjwd+3adjwxtp3Dcu2QhOXr8W9NusBU6XcQUohBZ5MA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-x64": "1.1.0" + } + }, + "node_modules/@img/sharp-linuxmusl-arm64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.1.tgz", + "integrity": "sha512-DfvyxzHxw4WGdPiTF0SOHnm11Xv4aQexvqhRDAoD00MzHekAj9a/jADXeXYCDFH/DzYruwHbXU7uz+H+nWmSOQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-arm64": "1.1.0" + } + }, + "node_modules/@img/sharp-linuxmusl-x64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.1.tgz", + "integrity": "sha512-pax/kTR407vNb9qaSIiWVnQplPcGU8LRIJpDT5o8PdAx5aAA7AS3X9PS8Isw1/WfqgQorPotjrZL3Pqh6C5EBg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-x64": "1.1.0" + } + }, + "node_modules/@img/sharp-wasm32": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.1.tgz", + "integrity": "sha512-YDybQnYrLQfEpzGOQe7OKcyLUCML4YOXl428gOOzBgN6Gw0rv8dpsJ7PqTHxBnXnwXr8S1mYFSLSa727tpz0xg==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", + "optional": true, + "dependencies": { + "@emnapi/runtime": "^1.4.0" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-ia32": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.1.tgz", + "integrity": "sha512-WKf/NAZITnonBf3U1LfdjoMgNO5JYRSlhovhRhMxXVdvWYveM4kM3L8m35onYIdh75cOMCo1BexgVQcCDzyoWw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-x64": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.1.tgz", + "integrity": "sha512-hw1iIAHpNE8q3uMIRCgGOeDoz9KtFNarFLQclLxr/LK1VBkj8nby18RjFvr6aP7USRYAjTZW6yisnBWMX571Tw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -5016,6 +5414,20 @@ "typo-js": "*" } }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -5034,6 +5446,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "node_modules/colord": { "version": "2.9.3", "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", @@ -6018,6 +6441,16 @@ "node": ">=6" } }, + "node_modules/detect-libc": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/devlop": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", @@ -12476,6 +12909,47 @@ "node": ">=8" } }, + "node_modules/sharp": { + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.1.tgz", + "integrity": "sha512-1j0w61+eVxu7DawFJtnfYcvSv6qPFvfTaqzTQ2BLknVhHTwGS8sc63ZBF4rzkWMBVKybo4S5OBtDdZahh2A1xg==", + "dev": true, + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "color": "^4.2.3", + "detect-libc": "^2.0.3", + "semver": "^7.7.1" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.34.1", + "@img/sharp-darwin-x64": "0.34.1", + "@img/sharp-libvips-darwin-arm64": "1.1.0", + "@img/sharp-libvips-darwin-x64": "1.1.0", + "@img/sharp-libvips-linux-arm": "1.1.0", + "@img/sharp-libvips-linux-arm64": "1.1.0", + "@img/sharp-libvips-linux-ppc64": "1.1.0", + "@img/sharp-libvips-linux-s390x": "1.1.0", + "@img/sharp-libvips-linux-x64": "1.1.0", + "@img/sharp-libvips-linuxmusl-arm64": "1.1.0", + "@img/sharp-libvips-linuxmusl-x64": "1.1.0", + "@img/sharp-linux-arm": "0.34.1", + "@img/sharp-linux-arm64": "0.34.1", + "@img/sharp-linux-s390x": "0.34.1", + "@img/sharp-linux-x64": "0.34.1", + "@img/sharp-linuxmusl-arm64": "0.34.1", + "@img/sharp-linuxmusl-x64": "0.34.1", + "@img/sharp-wasm32": "0.34.1", + "@img/sharp-win32-ia32": "0.34.1", + "@img/sharp-win32-x64": "0.34.1" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -12605,6 +13079,23 @@ "node": ">=12" } }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true, + "license": "MIT" + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", diff --git a/package.json b/package.json index 44591d8286..0109a52de5 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.44.0", "postcss-html": "1.8.0", + "sharp": "0.34.1", "stylelint": "16.17.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.11", diff --git a/public/assets/img/apple-touch-icon.png b/public/assets/img/apple-touch-icon.png index 1f6c1544f80bcd94adfa05ef4683537266de020c..2b1413bd6cf02a49c06976761ae39c207d8bdbda 100644 GIT binary patch delta 1555 zcmV+u2JHEj6{8H0BYyxtP)t-s)Bph485I9=74^u-{`B$v<=*a|Cv?hYir_JS>8ZE@k9WS!T-?!000SaNLh0L01FcU01FcV z0GgZ_000GwNklJIW_&SS;O%|bMr#{&nAH!dXN0Hfg^?%wm-H;qJOHPuQhTjnt!H%2$C3D42`Ep?az`E6Ij(Lp}9BlmPcMxV4wknBy=)Bx%Rz;0_r0b zw3uR6+jRa9<%8w}EJS=dQ@s7O476;3acx)fTjx(RK*N-A93TeJN+jjoe56`a7J3NC zdX=GhP`0is4-r^l@QMpjG=Wu-sTcBOD09W+BKvTg9Djc)XBrRI#*R!DE12S#Um9WD zfOi3;Xsmm8_SP@ua@QowxCxm0Tqd$X8_y_V?euFlr~pg{?GZTaAVt8pG+Mdyz8Rpe1y$I33}NX|qvKe5g0Vr~Z69s?lJS(>Tg6>&Pbx_PIh>qd2EQS0c|2`vue;5fjFShJZ?N(2U??fjv zZcsQH1}(xT!}Xvgf*1{kHaOG)gC6{v&A6Z~ihtMvgl-Z_nzi#fj^ny$#j`?3ZtY%( zXG&gd1#*+&!!IZo)A zxNH=Kph1;~CT{cebx~+Vu53XE&B(R2*q~PrXd-Gt3)bp+S)Qr-$9$N*0$&bjuI7)CgaTX`w~yNxaE`pT!hj6k4ss+g_stdsm4n2(3ncWTG9h za481eQUEfcuIx?=L9>;B>@$T3n5a`g^O*pRJM#`J0IevLd30A&`JsDFz_z-}Y?U3F zlCOh)kPxHp%|T{)gfSmrjiBly3ObZ|SAWXAXP2yTI+%Iq%+VcN5<*8XlaZfq9d$^(P zF^D4(^xR>FexPtP5Spe5(Pg0{c7GeypdaDeI&9GT8=)C)XzJG?{{rX*IW!VUCxBMp z2+eRq8x%P_2{gwIecY?}&?hIAoz&iX>*40-R#Wpx#R8fzMF z9gklyv;|XpdQzTZs;56n(|<*rbev{P(7WB%q8MZCig^>@x34X_vn7!aK2LNn-1UleVz7FC1Ew*fgPxsq49KfNGg_HU}UF?ZvtjW15$9vKDVK@mS}MAEkF zaKF{Nkhtq@bzb@wuO$ckdRwK}>;K+v(|Xpe5?w9(1HF70|3{yS-3$N#002ovPDHLk FV1l<|^~eAK delta 2702 zcmV;93UT$L43!m-BYy(`P)t-s|NsC0{{8>w*8k0{|GJF-uX+Ega{sM&|F(ty$D#k; z$p88E|N8g;%&GsFQvY!h|7HOHY6ky|KmYLN|Fwhva1j4!1OJ>_|LflWb{hX_1^=UF z|MBSm@8kc4H2>7M|KZL5cO3t?i2ur_|7!^Upke?0{QuRt|9_`!|LEEOz?T2@@Be)z z|J%aHm;M|AR39(X;<} z9{++a|LNQRlYdM9*S!CVJO9(R|K-&G`1JpNDF1B>|DrT+N%_RGuJ9UbnOnSc4+-QrbM)Byn35D@2XZq)+= z{P6JRXJ^|hEBoo`>Vt#cIXUvLuhaqp`6!_TK^~A*JbadDj7XSVI@1ddk;^OOvhyC*M)(HvmtE=8U zJ?)m3_kYsT@1mmds;b*3C+K%~?wp+3AtBl#BIavr_s-7!_4WMk@AI~{*cTV*czEf4 ze(aBr^0c)2SpeS|0o^z_>xqf=O#s*l0QJVk@<#yH1OWQr;O{^H)dB$YzP{@<0Npn? z?K}Y7Ffi~#0N+19{Os)XOaR#*AMmHA_t4PyQ-1*Ga&qg6iv3{#+YkWR8XDsx0PKy8 z@1LLUJplMs0O@;s{`&gzv9bJL0O)mf<|zRA+uQJ?qv1|Y^t-$E$jIC;FZ*5q`{m{A zIRO3k_T3Z!=r91}U|`k;0P2B({?4=e#H#tYp!?|P_pX=qqK)&KhTJP9^uWO5SXk$8 zZ-4BOk>p`v`QF~+TU*lAEZhJ92T(~wK~#7F)Y$``h8h!;PLwW{8u2@8iMqC!VzjkV{u5WsVl)> zB~xk0E0d+ZNDi{f7ic6}gq%ucny6GEp?}^eP4z)O{SjIifNTbbXeBue$&Aq2=olKQ z8Xs?&7$|o9XHuaJKhPk9Kihm$0Xh;Hg!??X>1>pC%*+nYbQfmor%P+6cp4Bz{ zEmWb#dKGR8ZH&^cO%MLF6{T7Z?%7^0)3)FkRCcJ=4!87IlC*Dk4;uSaIe*G})M|D0`lxOwblz$G`{M#) z?VZzsQPgUu$}oi59-HxU-IyXzj->NREu~Z%F{K!sC;`7st$ICkEk^Q zQSKioNI3&hT4_ggbTxST{I40>u>?`plC+>4w7>MfLSvKGR^A}U;1SKe4?N*lkL$Fe zcp=Ip%>*jV(6<(#g%60*ty= z?eMXp+EuCHdx$iapuX!T)Mf9bn0ns#EiBD9Lo_e-`L`jjQ|eNFLSB1O>S~9?eo)uZ z6(qJwU5AiZTA`kO$gD(N!+(%jih6>O+7R`;KxP^0@sB}fht$&tskKti8NS~+40s^5 zAa%?@ZtK+10Vh6xZ|5$y+se`?j_-bhet{nMyysm^FHo#vG^4g+h-GGl!OYC;Ff*e$ z%v{V6PR>;wU+FsQC|}mnZz%k)%ly^X5s^{RF|l#+35hW1(|_yy4}Z=jCA;~UCvsj2 zO!-I~{W6?NjitY|^ePHFWeGKSpY0(Q9m~Y|J zjLu)Qcu7Ru(q&OG4}UFZFe08(^opXam6;4eS-Fq?JQbmjc2!oz6f+pr@ufAu!rCZW z#f3V$u6{X#l+}RyT=RTXH8zAYx~8ew%V4$OvDR{`+Cmpy)84`0bwahsLq$obqHDUk z=|E2kEP5?(hA6tPkdAc0YN0x)i~BMS|hz^&2<`)$o@~#YVHyn>KS!O5tZY6IGe}Wl$`@iMX%n* z*+lL`Kn>@q*V6}M(KZ7*?gWByA%_3tu1|rnXqy3j#D(D0oa>-f=I{Uv`LFGO&V>UP zk6iNdfw8#u6u@Nk<;~Q~sDU#LsqN`UTiUi?fdSU&tJI6W21%^Z*Qw>JfZXV5>eWJU z^bKk?yMH7{Z=jB+6oR9tsTBdq(YvVQ*&;f6oH{olI(h?jE{cwxrcMV$NAICdf$ZoV z)ajEQJx&dGjqK>_)L07H(YL7a4Mh8vItL-zcjD(mjqj=R14R3gI{gssCu(eSLA0N# zaSO7Aqr=hR=x}s6TC#9-I6531jt)m}hG>1iP=Dw23doi2q25?3ggVhnyEE}3H8j(P zw*UgwoTt6Tkf)OYcz%U6=NQmX9b_3OXJEgHpExwU7a_@&Mh0UqB*~@Kf%w!M*TTWv zGFn}L9M^nQdDf-izPhDyr|Nd9eB1GeYnZCWM2L}0MR5^SB~&FqjO8}B-8EEGu>?}2 zWPhszdJC*3s5lQPN^Nhty5bdil6(;rRq%Jfa(9yygH(*dUm+iBlo>toj6^3|JA8n?Uw@?0lt@J(H2?oJ)7NVr|Ft98L zljLC_9XXI@k^#8SLY`jQ${vJ3CvMV4*+B?o|IE0ti;!y2O}(90AlJUmGTmTK{}Q78 z^>;R{-1XNW-j#{HWqhbSqbUW?hW?9f^_@p%CWaX|78Hz3INmq z0RLqG|6~CFWdQ$X0RLtH)BphgW&rU+0OBD4dxbIq0000GbW%=J0P0PQ6i{$3X{pVf zf$qE3b-C1C00009a7bBm000XU000XU0RWnu7ytkTZb?KzRDXEd?Vam(t11wHgARAR z5a0h@kKL>7NfQM`1cv4OZd1Pub06&EQHStO7-K}oABY9SIM`nq4N{nHwC^$rgcy_E zk^vbCXuBsPrUS+&yDx~8(hb%r1__6-KG8VzVf}(ZC)|ce{dNLV5Qwebcj+(=J5{Fv z;Jo`^gbkHi4u2Q$&gf~d(K0{{25rXhC!R(?20&d&%A zH_#PK1rOSUc1HYC@ty0V_B_6Qf~mm+AII46OH=Wn2s*;SYF`@GRhO3sXCXsT2h7K~ zh_~@kV@Yclk>PvX_$*TnB+5D}1mTly0;IDivcigNM1R;bQjga%r#LpAvrrt-=Qyf~ z>}NT=xz>Qk(6=9_efvDP19Qn@%RJ^;oE8hsj&R^iMJO$yd|^RuR|29EBe zI{aOiOn*~dX9$_#e5F6}@)N)j@N7Pe2fGQi?xOH?93S(bDd%>OPGBD&6FQ^67PhiZ z+Mx20Uy7jKVd8LPSq2pc$1~oKZJgjbSofG@_9GXoziJcS@FfxAYh603pIj$v1 z1p)yam!7UvAS#4oCQv&_KZl8|5ajC$$&b)ERA?!-DXmi(+>u4{Vj#fOF*{J;a%g=a5MW0QTfGGfndNMGK%hVF zpSUOJLje#L;bx_;N}<_7xQdAspU(+79PmEKPSqL{@ni;T-vyzO!CQGVF_{&lkIg}( zx0KHcvcz)KrIF_xFE!c78IH{qgp>g}$A7WmU1^y(a*|`CoK-opMvl@O{gE z{l% z{Q`3O%j}~{mE<6vgB3EA_37l=!LA5W2um>rN|AWnq@PnI41BXaFb_ZMVNG$G&X z==G3i$8U`Ui5Pi(50uvk8T)AWIVpSwV`FK{-Jf zGLUEPPFijdT&BK)ENz^ueGqK-M?~(Gz1$!Q8;EJd)^|aAY#@CjPOBXd*+5NogWMoD z$PIFX+#ol|4RV9rAUDVja)aC;ErO^v+Ch%JB#CLP;M{p56n#$%TW`z1bbrj6&<7UZ z6|$#`Vcf$@@3LPVKd{Y7*gVHyE38O>oVv1Fx5rYl-?~avx91{zR}nVWc5Aj0>PQhk z@8biWm`I7C9XB37U!x3|Dn#;q>v8KH;1>gH+=F&x+wDQYdxy!H1>`3eigLQjYo0kxRv=x2nlUr7K&=t?tK4;;`f}rBBdyF z|7&Qq6t(w`adg68-=v=F^&gkPP{!7mvC&$N)PFZ%WG?NK>^cAd00{s|MNUMnLSTX< Cnc8Cj literal 3189 zcmZu!c{r5o8-Bxx!Gy+sBBW+4rLtttnys>p^$?C_jGTm|)Uhv3#W}8i{JO65o9mh9yYJ_@pZk5@Z~mGqRws_}!NuVK06sHQBOB;R zUjK5jLpeL%?JfZ9z{=9j_*kGN^AuqE0;bRZ3oKxIY<9gj1rT82Edb3z7&7tN)Ib1$ zb?5)uvSwK$tc?39gGM3%Qw=cvep<22p$yfxFw|m=Y*ir25d02ufg5TO2~{Xa7cLq%4wD3qW5Qi14} z?7x6z*te-?(XA0Cc4KyH5IPsaL%*E9C1%Y+d$ItODVrE7LYSq5^2^QRAiO1pz_7qN zU2y|r5*s)AY6V_#fkjI&$N?7g!2lazXsx&A)Hd8c9otZTcU%W=MZi0yjS56R8g1+k zVOFeqfFT~RgjuJPdp1mL*PS1Y;wkA1MgDoMtF*uEZ7_7=rT0nwa@pphBu!s0WYHa?W%**t~ z>k2OU+9U8YGXp#4r?4N1J=c;hF_|%iOx8z<`9~1DoeoY*%XaJj%24K|%p)ins>=u03W(`gUR4Xs=>C6d&No)cV9}r|Lx3DLS$?H7@_yR`nW*K{d=YKOvg2a{kqZu z8EI)Z4b;p0w%yNO>a-B1Wsec+}ImaQ#2D%qgIaOW%4_TxQ!CTEk?w1#)7BM zNk3DvyHiuqEUOwPX)xxJ>pB9nV+3G#tl5dZu~5Ifx{w>S(k6{l){c%aPU=4{c&Qk7 z`ewFeTKf~?bvE0D>vxWlf9C@c8lV-Z0KpHgdmp;$H_bT2z~`r2))YK{7wl2$fK zZN1ShnX&!(eI>B^i`f@deA*3jI&NeYqB0sg+HIv>rym>1J*A<=^6cq2{+Y5oIX_x5 zsa=H!Mhj4tkkq8(czwF@MIwUf<@TbMf(Dg$+eV^K{xD^VHt&>x6?{4eKi$eZl(T3b zq{s0d-Mig(Pj7gRP+*F8(GI-5(kVlieQQGexT0QROMcyUhd$BT>w3mMHT};FNNr%qfGo zOdeYq`7s0CRjUS!d6d#rowrRE52K0>O5upUHqLFjl-}cFa~P|4?gX1df*zdPy?>L` zuOT|&ohld!=ulLEFA%p=?4Y{(JM5vPV2g;e+pweuo>CJnr|0}1Dj#Q;D^}A_AWt?C z9ydHrUtN^Vq`N2DWSF>1x1}9QxG z^-YaUj~e2f5U6_+jUyv^+PXSS#&q+yO5I2?wo}WfrSW4@dOVju&H5_8J^19D{*4zc zOP`!N96q>{cH&)P5x%D)J}b^o4}WmKyBlv29XiTfP-JwSSGJRU!Z4`Lxs^Aqy~-=g zu>M_!^kaI^_rigex?mA{fC3M)>xFp}=ZD7+t$RXlF2;59o78#uoamuYC~4=jJ}3p> z5pX=zeR#BF6tU)+nU!&A#qo?W{&n_jscRGgIG`M~8w`(x^w@?JY;iCWy>4cH#w zca5r~_ZR0@#fAjX=VuuTrxTTRzU1uTx}q*D)L*d{)mHILMWQFz6dUH1b}z0gzH1xD zFkV(gl6>=(GR zJ~+AK%hit3YE1RtEEC51582kT70JQX!X>K;lKoH#eVtrioV5{I$?;k7GyIls&G6fI35uiE)YaVReO%D+(;|q;LGUJ;c5uX9O~~KzVJXz(>zsaVfU0^ z@I94zeX@6>9p;Er$n^V~4~YJX5%Oj7xkl@t$%*c>q9a7DYS)Gx4S{J%8Aa3jj%DGo?dS^I_4n?$o@_UZL5c*r`ye*_R_wH_L3~ zT6>@B-t)fVkXOV_v(x_Et#O^(Ng{76+F}R^mJ@x*H(6npTFGkclCf`m1><0W3baQ@ z6^8M3?Wu$W(zhjUn_kRvqDhK^P~<-8lgZSV^qoYL;ikefetFu1urTDOYqi1(gvQqH zbKCKM?&(C#OJ?_jFrlDtD2DbC?gnn@F6`WIcJQH-TIp8kDKtYd6fG2l4}ES}MtDa` ziL{Yk#>zJ7R}kh%XSd_xw2Q8bKQYLoI!n>u7tAF@gm^S8{8tYkc{GguQ>_%I#42h^ zg@dlVw8!vhSXw;QFP&zRzOo}f%T}y%JXx{y56{m$g=ILPX4IXRcj3Rsyj+X*Tq~?; zDaee#GEV7r?D%N7!Y}q+`maQ(iG~ z<+6av{Ma%0uGky-(Vm)cb%Vc@LJC^=s{H3lB)%LZ2T;Mt6@x#+XKm^^4_#HIRtyrH zb{v-(=u3%-!Kk1Unn;}D6xF23qJ1@TDxxt>f7&AF`xXYSsw2O=Fmz6jPdeAjon#dv zUIo`K%omQfGDt7D4MXzA@5bxpzm+B9lwfrpq_}7i+#5a#17&B7m*tqy`;kbq{Md{B z(q%EUaGvTxS~$!s-MUiPhg;P|{Za56*~_$t#hn_5I8(=>#SN$Y%LWVDO0P$wP2X$p z+HWq4>_9eDzwqN*aTT45ywA6tUsAlr!fQQYCO%0|?_0EH2B{L~2(dM8%I zOWi2yad6UTe_yQ!YPa&ls|N^NeJ4>SrvU%?DM`H%ehx|NGdc1amd^2ffZ8*MF7=__ z=~5}p{+(SeS9{^2L<{Z_RWhNm)8TyW;G^cykD*bV=%($|*d(og(xL*OzZ1aB_=M3t I1NZ2E0VOn}g8%>k diff --git a/public/assets/img/favicon.png b/public/assets/img/favicon.png index eda0347effabb1b681c3816cfd3580b82227c063..209a01fa1fa3fdfd59d82142835181644ea80489 100644 GIT binary patch delta 1483 zcmV;+1vL7Y7u*YwBYyxwP)t-sOlfh{007hg0Mq~g)BphgWdPIw0RLtH<}(24Hvs=; z0RLqG)BphgWdPIw0Mq~g|7HOGV*utW0Mq~g|7HN}H~{;@5tRS{026dlPE!Ctjq%5S zUPKWlq4VCvsCM95cwgKs4FCWD32;bRa{vGf6951U69E94oPQVq00kjQL_t(|+U=d` zmYg6Eg=G;zK{VL!|Eh6j(n+^1izra!Sbt~x#7k`yJxx=}#N2+_-0`LooBLsT+MwDB zxOw}J_>c7h`YKP$j`fgNTc~B6K_wH$zeA8lr2&{NmIY}OV=7_%GXBdmqa#*(s6K7 zO7%}ug$vs*qyn5p#M?<%*Lnr5W*)hB=R$%WtQ~T{XD=lVS5tp3*ML+Zoq?DQtauU6 z(Vl5gCx2XLZvV4WcP5gyMM{-PoT%JY$}HNx(7}q_>5-_eOig%X7m2qf<f{Flg>wXfSGw^=a#N*IDsA`Q1yw!rViDBo_eTop)H9t?1i>O zmKij&*pDl)7rLuxO2gx&VQ<6zeK-K0Pg528j(>gU5t()%jYqoLs8QNib(zCMBQY;F zvfM%Z_&!9`Y)!JfZu)5UFGjOx6y=0Is7OSN#c;;ha_o07W4Dp#f<6|+v2mH?5TUhk z8wCi>jL$}J(1LiOjfMtI{mh2&lF%G6jK}Xt{l}yUF4>#vPtznO0lW^{&rI=WuN+53_{*TZY88=< z4Zb^+e21XvacJ@9PzIg%FnTB!A#s zE1!?H2NnsBFCJ%`%ZTna$(oes`4{v%Kbj;2^Q1!vk4t*AuWd@1^6c{m`m%$EwSmpn z7@zo%`5XEXl+`z|W>m6;-we>K0Sx`fcK&xEbZ8%=0%+VohJIAH&{pWN0S%oib59Q~ z8_>{?Y^i&4Xi*_FX<$Rw=R0iBx_?G!1{->=a35Nrflng;`hTFC8~TR6p>OCL`i8!t zZ|EEPhQ6V1XgFp$A;ysFEf#+uUd$Y0F$8GqgVWq|8W-4@d0Z;7Ho%?+FjHV+>a3tc z2I|J@!~stroJ0=#Lt1G0^+5m}VFGxmw+pRpx7J6nu7e=!J0KjYI+!Eo0DsblbV%S` zI)H`|oCho#rl^I}t#O!#SjLl=;TtYjk!pxKAh$2?hNbE{CVNr- zyN@|qOd#(B;Obg=-nJ>!21K<>A%KqptXBysS$fYJ?HMu4ZQNuKmA{nhPw@vEM;!t!# zP9cotGS^TIiL#Dz+wZHDbNPIJ`@DPiywCeQ&))C;+GQ7KgqZLSVE_Qc?Coq^!B5)e zTaXv*!qR_%ooC&}(H)KmbL1EToB)6m^rHd+4p>{`$!}XOv(^6tK=G*`7H|cofi4hm zW!xz42=+7Il-w2Q0zt?>m_Xn$@FVJ|8GhxCM?}9vpkV9mCaZk^gjoc*_m~t`Y?OKk!!OmJB=wB)P_|EeJXRp!?se^?<*_ zSG<8y+3y#Ab_50mflmmaf7@ox!Xe-l&!%$DcvJAweeKY_FIM~}*xu5@u!N5frI{@1zGD%Ul zaD%nj;abx2{f4&pLAjJ6L(a0WSS!*e{xI4#0*UdC%dUok=d`~;}sOaewD`;3?$uj{{(nk3< zJYSHOf2MF7ZcBSy{-PD;eCQNj{ z)}W34zPAxG&u+yEZ%>|sBv)bM+<3B`gwGZF&FEQBlf5+f3|&Ic=K9UIyjSg6ttgly zpTg@qluQU>s#JRM;(20jJ^ZCe@0mZtx9?ir-fCT%ja=!IAWKyTz#UvzMtDmSsiiRQ zl89E0rPa8H8q&0ELTdKb^rFD^d&zyb3M&-abNrSNp`jn^IvM-~VZ);KQNF~Ax1Y40 zJlMIuk#9Ti@@6)bz{oj#gSUa+V_@-V@yq?)4F*Ce=a#6RIz@aw2FZ94@AkJ3?i6h?Tp$Li0XNc~ zyM(+9PT~W|G0PNqs=A@4i?*RneY*Mi8q1?Hu_Mp@NQ&urj8{&FS8|iGR`dbEgensk zsQiw(a>i#fqy0{ly}^6p9ErZHyZNq$JzmNCGa(l539olY--fwnkoGm6gRsQ2<9bqxX0=+PD)STA38(q$a}!0eyl;&hJN0a1=1x-b zh{SwCHIYb^f7$6MLlocXZqA4)Jj<83&&I|(&Nj&7oO7t(1uHetI94KTLF2KEPJj>k zlJ^*(Rq}3H6ciR(xL^99j3N~v! zB)SCMxX8js)32&-tIYSqU_Rcd?1LZ7fXvQRsp;))sJ?8O{|sJ7>-B7)vG%W=#wKRb zA1alSHujz;^g{80Dc)?n_g(+C) z>o;@YfAQgi3vj z%H#70mi0KHA?uXIngytI<=}Do^rpAf1p=?hcT+F3Wqv9vzP}KtPPAA=MdRY!LiDBQ z8_7$`2#87Km$ROTDSf%d*uB!GC)D!n=%yre`UCxvu1LiAVZpj1Cp{PUmM^tUCcR)~ zKdSIlwlYOM3n(4#zdIZwAZ$pFq1;r$@4>JwFc1BbM_3{Zh13a_M8!k;b;WhHXmOw9 z36N_~nr7h`)iLRr8)>kY5T!;OtPYOwFYGe4L8z210KQou0U^lZED!xe;dma;HcZI*DK%_Vps+jGd&#A$b14 zB|=2nH7EEk#Sb)L5_(Akbs0M_ zlkQDdJxVw;UX~F>wae!C>a2JCrO5kRVv^R?BXs|r$zI_}7uqUSU&gMai5*cP<3_0Bcs!w=a*ZOUhs?NOz|6u_3aA%u)hmT+SAL8p<4gdfE diff --git a/public/assets/img/gitea.svg b/public/assets/img/gitea.svg deleted file mode 100644 index 804b05e284..0000000000 --- a/public/assets/img/gitea.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/img/logo.png b/public/assets/img/logo.png index 1b2d9b4023427395448912e39a9883c279dc1618..30b06350f6a21cac1cd937aa31ec57f6a075c642 100644 GIT binary patch literal 3776 zcmb_f`9GB1`@imcRt$zL6*5ZYkrqPgsphuR6Ack684{JHu@oLLH$H_@sVFJUNQ*>N z%F<#AsZ@ldB4eq96onDy{*2G}U-_9c)|y zP??GXog|y8uj)UOO^Z1j-E24R3F}=7#4h+W4_W|PkQqq?%y_!y&B*^VBcA#TWJ?qx zU7a_>Ul&|EOOt{h5B4UzE0)UKay$pG2w8O2%s?Rf!fXH~14kQ6x9AVwbKalou~4#g z40~fWO^hGk-r;@Peb3*v=PuK`+f!1%T|2_)p_jv|olL7t|F1FGS3l?W5MSSqobHpG zE)AZH3aKYkIey2{9-7u*Pv_X$kjn`t4f&xGOYY^L znE>6_t<3~KTe3RyD$%(M z_i@`lb;1N!;pp(`%!OqhOmg2Hf-i@v@rhnoJ<9LY1A>OsR2|Nu{l2-Ycu7Fw8ZFSE zz1709Eg7OJyYx=4B1A+r$N?9!|L!0%JQU7}r_pmTpD(YsjyFzidDY#3mAJHZOj$gx z`aUhE>$z^k`>Bp@TkqImZ`=Vft1S1j8FWPUJO3!#G*OqcqV6-MEVy+N9depnb#S6y z*W>Ya$*h#~?VAXT-$8;4^EWf=(Z7K@i|VNNs_tHqS~i@U z+t_i;J0!XMYnfWfa_mDLe<+`bLGzK2;^4h^QzEiqFJAIf;9Ya)H*$9a@hWeJM|6;} zin_WqEn{6KMLx5h|n|; z$8(mV*>8!x)n5Sn(|2t>6w<~zCi!HXg1a=a!C(^+4YfnW8i+*lGKixxa533a6Tzy_ zSi3Vu_{MHpz)&L&R)u;o=GI8PFHjl=X)D(4X#Vh$Y&58#TP^h|M9!>B7`et5Tpmcx zvrMXG7YCMUGj*3rWB%fH`#1828?Lt<|J6l$%HA1#C(ODAA7%?~YYwH%F_8vFjMePQ zO?pbS_Xd2)E(!a>*Gx2za1o1!iF0`B4Xb1?qJp=1`)ix?@+=eSzMJx|w>K`5{#xd? zocZkjb9|oYd-&+|Bgx>=dYvDp^{wWsCyC@E=JQUN=B#h_I-6)+-A`0Whk{pL5C~Q8`bl+O&rb~2J4SdlzyD^AfAiKAu{^^`# z@FE%uVyNYwE{6|Aa7W@B6VL4GVe#H;@FFe^Ez_UYbcUnqqxPqz3X5^u7RptHZ&f@r zOMl&tM`1d=Z{!vK%=Jm1KDrp!ig%4wPe>i~S&Ov)a`d*se|k7TnR`q7q^|iX{xLmq zQC0thDX(3}@}<+EI93_o{nu@k=}A>g)9dY{L*o8(`qd`F%LxTJU-wMJGvBIAWiPog zt=Lj@_x1Fe80X&3Bh#k8aie@cBYV!xT+Rw z7M``$0L89BTZ^3r{2{YUQ5Illp{8Yn5)6Up(b*skzG4oh3EGzHj{is&$MtVifdcd= z{b1j+{sLD~2&}DosCN=ogP$pJs`Hg$7b5BUa(t^VLpjD(^a^_0J2=b6e3m8Mn)q6` z4l)o?<=;)x(@C8b{A3c2Lc8j;NAjazN~dTbQNv>|5urhWt-gK=AOP;p{#ywOZK6d` z{&8!ZN3i8%lE@a?<2t0NIn&4Iax@|8>xG6h?OSFeEL}W$AnToahv!_7)$}pVCtx6c ztbvRh!H^RFsixKn^z8{5rEupD?DIp437FciNAH5t7mE+Q^y zB||piu!jx?NY6oOmgoRP&gFj)*}-Mgmof2F%LTOp7v3yr!Zg>E%r@OP5xBZs5#s6u zih6euPul&Kt3`|pm1bmg`2l@6N%>)3(2y7tw#!NIDgt8oqJ8+S)X zE5er5aAC^7f;FE8j>GJ6$#RdHUSJtYx2w8qgYPiAi=_RoW*4xQOW6yDp4pyU4f?6w z1#NzypWA)A&jj=>` zt$pNKqCbTc3|R4-eePsaH9QJRy)S($rbp*#;r~)tXAFvzNSrzN-ioS5-FYj(9m!Xd zCLY@_0yi@E`=5d0edM<_ggU66Dj1zD+6tu~1@9IjpHMtS(4s1P#ZqpyxQF8f5;leV zojvKH&zha511>uIS<)+r=lzgrEhbYD943YH|Hh7>tRG2+0p!T{RaB5{(RC9}X_Bx2 zw!3)L@CO6bC@fQ_e3fwzGE_{r*e}nb27%BBRvmOXJAm1U z%dinXRYd<~sulNCL;Z7CFlW-Clw1u*uwlEYN05Fup5N(k0QB~Y;#uhPTJ1nurfU7Q3 zJTVZVhE#4Xih>5`f3{GTs}9hIxS=Jk2#6~slv)x-0mz=o1<=42!jjFhjsB-Efk6ra zYgr&h5PUTY8p*Ol8Z=vJ=5I?_CcCNtX3vn|{1$nr{EWynT$SgzgslrKz_zZNiK9RU zIxuG(fCC`^-;Trfd5x5c6Bij9F4iU4*2n+eEoReyM(2wg*qKa6(e8sQe;-91G5t{0;0>-`dI+<8()MFpuaOgI6%s9&;~Qu>EYXGxjD2x+y=v%VbS z5wi$)B{?j?Wt?>PDrke1L()ybK*8s;9*`W0YNX67I*G6xSA$jGQyV3;F?*2^NRMK09mb7YZ!(tp z+P%Jrc_4;gFuT_`xjtR_2>apXB)yx_s8Ei%-}I#>ThnS5Yv5m;*Xe8BQmgKA^Jm-ncZz;+hzl}t?8=aViDDx)4xHjR0t!E?UF-&xHnWGZ3(=P_@jXYsi5d1|}z zT@lUxcU`jho9tI}$e8S-PCfB4A(1VOn$pa*&%Y?8r3UsimHI`8%9;g^w$3&;t+@~ literal 6747 zcmb_=XEa=G*!3Bsj6Q0#ks(6#HcE7cgs4%1Bzn|DGP;N`>JXhogkTW8MhOyK^g4QU zB8U=1j1uMbJlj|64D>IrD#!e+?IsJ#cou&dI<01-_^k(%+B^ zkM*C-zs?8$XZvH|?61e+k8~e61O5#9+xXw)bMo&=E(Tqw=k>zx|LqWvvzSEzhUa0>L!U4d@f7b9Hd=4(wgx{9n)i%luV` z{4@pc@c8%KL;1< zJhKr1#{O(CY!^8fz2}At=YPp_<}ZKIa$b)ufN6RFuM2!31AfQ?qXfXI4e<2}aAXQh z(*g&Ez^_}tI1#Xh_$P3I9hhSQW-kHrY``+_KM%5v{D+^S0=|m?KW_rt%K!V44~&6d z+W)AVGQf%uuzU@efB;KZfJtg#@iH*S27Dn0B%<`+000PZ*Vi!sXs=uOhbQM&H1vEb zdl%+wilF3nNd3Hiwwz=R=KT8fZ;WbCG_lmq2*nU_ zs~TB2dWVGFzpZ=)EM)uQ{lwAP!AP-P=F&<5Tq0qLm*oj=l(F`-P`tB^z_?kYjymob zkA_f@&h+n6(6G#J!g>;~Z_$%fKFU=mlnQKg_tgGwjTKllHD`L0y{@MaY-*VYo zn7B%20wu(mZCHwMP(F*oS(dJxDn8mO6l?8mI!@j90*^R834yk78jVU+d6XQ58b@jO z36_jWR(FsuP&DATWMmF4PL0pj*FwE7^uHP#6resAY zC$@!x8Sq0XTdZ`IjnctiTGnwna0VJ*601zq>Ip$lvD@6J4+=GLWXpYHW)0pe=C5~p zltH7r9(hdRHGY!Sl;+1=mK9NYKSGpatrhciLAh~wgc&w*5 zG<50C{j4JN%R(~UFV0xcIpoWdvw1;&PDZi940rNO)!Mxbt2;O51k(0%5?B~qq1j2& zFq`bR+L=ri0W8@W=}A#MCZf+1?#?cVR)wnw$FX;pxgO69TFYo^<2l?l(xl4c#rOx? zwY38cpfW{L<>ixDBVmbJv>j*t0NE!BrNROoCmdNu?|`n5$|sN$4y3K>CCpz+Dzo%E zPnm)xEZ-qkvW!5UIIoRMRkW+bX0lm@)<@NvmP{-pHx7@2Ja5nsq71WFyDMH9Zo2BG zMmYvgOEAZp(PM}AL?RxBdf%ORmFfITrId=%3%v90o6Te==`Yv!HR54Bs*9Dc#s}Af z+XUxbS}K&DnFgA#2=vEvge}>{N)ChTg-q@<#z3p3DpUPdjrtb#uZNwfUmo^*oMD{Y z22(!nXcBSmB&j#AsJR{HUt5wZXoM^kVw57@(QSyS%oSR#YFiZIIJLTZBjt#=KJ=Zu zR&@z{vw+lx!DJft*&-fC@61nwR;Z8>r{Emal)Z;h_f z;B2}1>VoF&pr>JTzx?0Lz>?A^mgm_&mwNtoc-BGVFb*5JZO7$nW2i(wIcgB$9A?pb z*?_3o)S-&gEz^A)Wwf+~ge4t?sN8amUGkIv`w= zkIOB3Q8FI~sCr{=U0+iX%^kVsM&2>Cj{=p{{{q8vZ1@2s)Y( z&G*82d8bAlq25EJClx|Pfr|+&hL?7d#s?DZPt#| zq&aR`|L!_tkekZ&R&cuG5*&Xxn{Laig8Hx|33KKku`kR{=n|jz361tl$7F3r4}FpA*r6UZdKJo79-vsMR(9St5%kz9^3pVkF*)B|Po`3;AW!VV$+0=R#3u6pqUv42 z4omhZ8F>p{zi0cTW>|LM8_V*ULad0L*V!XuS-vw2iUQ~23jA@!tQ4A0`{`+zBCv% z6Kn}Nh8P>5KAbZ38P%XAT7Dxe+z6@mLvn7l(F^#edV zaRd8?h1)WJNj-E~!@XIH7To)m%c@FEv9Ej^=;#q1luKQ|78I_FxVa^vO4;W&7FFI^ z1;f=mqJ$IdBl>uRyW7T9vsgSqVV=p{X~qsu4^J5Uxbf`{@gv;b{Kv@9Y_c2saIL;_ zdr3V{`5m}sT-4m6G3WN1Wog$eTFI_U~sC>zU4$gfc~#7AsQEU;fOKY|ZxS^*)>2E>EW<%sc+zl4!b* z>0xD4rR-h*#BXzLc0Sa|-KSwUeY2TEUCUk%dBRbF+^Z8oC=_({ zfU%`{0Nv_%?Uvy%;ilfJgXs1>6{D7vY%3z+;2?5PbU}uI3$is+FL8BXFfRrKAt3>Y zvFB;J59UdnSLz|G3gH?p4`PjtjLr?QN=!ya7lg1I1TQRw4sKz^a4I%|@_I>~#WFqx z$=*ntz!|+a(%GUe5FSNBJ0Gl=sD~;t6pMJTVpEWTz}-OFVI^H|BAu{^xCmU>1pP~H zb}k6lH!QI?{OvT|BuQJiILmvYs&L=f8v@GCi$V86w|Ls%XPCv$QYK^G92B~|pow2Scd1`qy+lW4IJ<<|poR|awWuN_y|qUM@v*1Kv*!u+mQ$*DqI zveYRSKhr_>B=2~Q510vCPV@0T3#pQd__6Or+Li9y^FXYL$5t8D_1lvJbPUPX@!jXO zpt--ici6+vS6EQU$M2N(g(fd#&`a+aVk)ct zC=2=$JSNxa+Tf+Ek2Tan_*W_f2UJ?|t6R%>ii0KO{0CnKV&+J<-=TG=d|mmgbb*)z zUPkK&?pn*i{J%jI3;B+A8Tg|I{?bP2LCo!~BN>haKXwyT+6k;eSGo3*$eKJ9Oq2i% z3=K=r$kiEP0~H2eQsSh?SRLmo)axgV<%)7Io^b2bf#iT zwjwEnB9cn75>G7=q?Y0MwZJYeK+*Y5HHDi75J0gh`8p(@3;l|BQg|gGgA2`-T6Wnk z9?0aC;g}(%(*VMmQe6PXOl-ON z38|c%P3svC$WXK2>)wkTG}#?43n3I4`^f*)J*{1qYV+JXipzj&woVedpWDWzCcjr& z4&d%fOAV&Qmny4KVkKohGG(-mC3n|X9lS2@dw~jd(s`*&LJI#>$f2F9#&U;xL79#x zMqfjbj2qPZwtE!k5|=|I*T0~^*O?(g+q9j3KUQt9KC-x|A6Gu&NUuZ?md0!)sv2)Q zG5O1sXPH<75Rcjui2lWwR>Y|m!T4T~7Tr-T+{t;}i|Oz!^-v~NUINg493hb0tFz=) z*8kxdnowlcBe0FG4&Zm<#MhCi1LR$Z2**oBU$ixcFjysm)ncmhy#AKVa%sWq6g^z% zM|+TnhYI9{b;|V>1YGDhIEn~o*qG7q3k4HS&`VfP*(#pfa>hH9G1xMMaDF`l z6f@m4r$tNMq$_%*toGyuqiP(6P-HqWlSW8ITc^WFjlhHw2QAifi)UnOPEZGO_i^;Q zqk zJKLNJDiPE?jlhfVap)1$JjdAmL>gt+5f^-V78ClB!ie=Jhx(TjR)i7Q(4!~U(r7^8 zrVTGOvF(*!VFA#p|FQTIuU=@7k-To!W@xg!7>8;fEV=j)YWN_CuR@CpJ>})_F+p#K zpqMEUIQ@o?K$zG zi_*m10i7tI36PEZgI~5L^WBXXI{#5lm6kn-6lf*$4}M9>N#T7u{-gnXxCt3bwm}o3 zFjs8_U-(kxIO4du(8i|LVxzFk}xZRzFFZ6zJPOCzW&f_U3*tpUy{lbm5comm#y#wP=4$!m$)F zL%O>z&w$dhrR?0J7VU+MAMjC+=5L@nHRF_Y&!@nX;TfUU8PN3e=#oTcPcOiDtBa^< z6f~U?w8o7|7BVl{EGa5~_K8Po*h$okE1OL)0MY6~P}=^MaFnFY8c{sY+EI_vT{Igd!ng&XXfxlQkvt z#FgEP*zydjw6xmAK;NE{F{5HyBZD?}OmI)R6tbS%r*Ayp0&FybilX|JBBUHjzoI;V z>Ma~q#tShAF`C>|D(`7n({5#RZ8zzv__X$KHnV_2aE*V&WK^V%Qepq~$?RuL=SQ$z zW4!(en5lbM+3`U5ykmW&*pFFK`fUbGr?Tn%=^K>m*9wd+Bl@6w>!#=)uy>kIn~de_ z#QG7z#E>5Fpd2KrKq%;Wx#-%c6lFCD3M12JhAz%=8~NVLQ6rCDAIZ03liYP5z5P1Q z480Ea4nKN#gRabCoojFPOEBTKz}}nvW|}W-9uCO>7y5O6-@8jxJ4NX>8QjJob>N9X ziZ^5b8;u;3u#Za!Kpoi6>j_|x=41Jahiw8}K=CECIH`0Ie#HE-?y;E?!QeBHy3c&w z=QYmJHe(Q}(k{Oe!;97m8KtZF(_(PY>MS`te9<)TQLd4Emf*o<(s_kF@75sepZBl3 zMIZLnSJN%7NcIxWs$*9Pq82EsJ%y$j+K^o6!s zW14%^9H8lMa}%;8OCqg6*la<^cbLz;Yt%A0pergdEg+XN!po+$`Z;}KS{>cBy!Dlv5G+&EvhHS zXgm*uHpSk_b8Z4fVooSm0ZHZCJdc||0s$Gh=F@1f34nb45kw+F8G31vfUQZIY0^BL z90jmiuIgQy2ke?+u|nsa0q|mdvvV`~Gx#7V5{<`mMd zKU1tPAU;dSw*e$7ZMPA811FIv*AjJ;l!dMy_mnFg0y#9PY`+s$Bq67h>2k8C5J-xd zE`&NoK86U>*U(7Nx(pBsZwhY!a`f*8I5Ky)5>JR=O>ukQ-8KL=B}1Je-E;#Is0dZl zTMilUm{-3L408T8695hyB~^kzEZF}KYiQOiTcX^Xgz#h+kuXL7T-oRkMfM7gn3p5 zN647l-LR+3adGkM>yrX?HzE=2<~CX+W-z2-TEoEGer7f`_hY9(wV9!C2W`oUeB{v_ zr&G09?^h?96q z0{#-7a`sEm`Z*Qx9cHt*vuuvU*@i=5gE8|<9OH`*cuPQDzx$JR?c(^AdE|pfy86UP zijCwUwsadMZE+;brHnF#GZ?+pg{sxCpSSEwsoy*f9k-SlirHkR=H#a+Rn3INIWE)< za4hnFp~?Y;J;s5c6ev+{x2aV)%Q1K+#Bar=A|%CR$Txd>M86|JWtfil(GiHPpf z6ZnZwJ&fIfqpT4X70sSOhp@qQaoPKw%Gl2bES1WZt*BKlLUz#xVk6d${Vn7?(w=2U zs3~q?F!i?a55hsl7TaR2`j!KhBKWlI*ZdjC{>vSSq?I;a>23^?4N)Dg=J$n236c{@EfjY`J6}} zGX7A`gN}fC%y|CAtIG!h9B&5>ST;DP!(W|UrxR%)W`$HceG6V_dZk)NBk6SPDBmV) zRdT>aur)P7!eZ}B$^D3J#+YNU?SSPa2b9T=n2TdOc}Kz<9Il-8rZ~1{;DC=1+BqBH zV+-1NUr)v#>&%7M{1`Ml0oTpP|&SCB%^;Cy6@NVHv+jK>` zZ;3`>ONna3cKXma*4~02;RY}3?8r4bwZ!TeZ6UDA;4Qull|0Nsm5D4`PxR4N&QR4jqtjoF384&@wugC@&>*my;7v7&SOh@Oh(_3bE4U=6KyR2noqNw&BnHZZ{_ z_`58+5!#cDoxBR)+-PaYeZq9NIFaqq?%g-0?>#2&*gP0j2sWekumEFwMIUtwiM)3W z;o9K+AX4Td&N~sm%p6N@PFQBM^t|0eJ&z+%HvmW_JmSV@kEv;(--&l68S{+zs6%q9T4iSz;bC zdtQwa?Rd?EbJnFo`898_kbe}ikpFzRq#!I}aiw!Wr}_R5V&OB1$kZtk5rZO^?{j)% zYfs!_e^#5@ClxI`n0$N)P1;(jFTG*pJ@kBIfg=Aq>5n6+nyj>hV%}pjm#?kO3d@Hv yox+U;9_d=qPhd|d8=p;?J#1|3xTc!uOU err !== null && console.error(err) && exit(1)); } async function main() { - const gitea = argv.slice(2).includes('gitea'); const logoSvg = await readFile(new URL('../assets/logo.svg', import.meta.url), 'utf8'); const faviconSvg = await readFile(new URL('../assets/favicon.svg', import.meta.url), 'utf8'); @@ -68,7 +45,6 @@ async function main() { generate(faviconSvg, '../public/assets/img/favicon.png', {size: 180}), generate(logoSvg, '../public/assets/img/avatar_default.png', {size: 200}), generate(logoSvg, '../public/assets/img/apple-touch-icon.png', {size: 180, bg: true}), - gitea && generate(logoSvg, '../public/assets/img/gitea.svg', {size: 32}), ]); } From 7861d2ffcf718ee626c98fa4760a4ba05c9961fb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 13 Apr 2025 07:47:07 +0000 Subject: [PATCH 131/568] Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.1.1 (forgejo) (#7528) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [github.com/golangci/golangci-lint/v2/cmd/golangci-lint](https://github.com/golangci/golangci-lint) | minor | `v2.0.2` -> `v2.1.1` | --- ### Release Notes
golangci/golangci-lint (github.com/golangci/golangci-lint/v2/cmd/golangci-lint) ### [`v2.1.1`](https://github.com/golangci/golangci-lint/blob/HEAD/CHANGELOG.md#v211) [Compare Source](https://github.com/golangci/golangci-lint/compare/v2.1.0...v2.1.1) The release process of v2.1.0 failed due to a regression inside goreleaser. The binaries of v2.1.0 have been published, but not the other artifacts (AUR, Docker, etc.). ### [`v2.1.0`](https://github.com/golangci/golangci-lint/blob/HEAD/CHANGELOG.md#v210) [Compare Source](https://github.com/golangci/golangci-lint/compare/v2.0.2...v2.1.0) 1. Enhancements - Add an option to display absolute paths (`--path-mode=abs`) - Add configuration path placeholder (`${config-path}`) - Add `warn-unused` option for `fmt` command - Colored diff for `fmt` command (`golangci-lint fmt --diff-colored`) 2. New linters - Add `funcorder` linter https://github.com/manuelarte/funcorder 3. Linters new features or changes - `go-errorlint`: from 1.7.1 to 1.8.0 (automatic error comparison and type assertion fixes) - ⚠️ `goconst`: `ignore-strings` is deprecated and replaced by `ignore-string-values` - `goconst`: from 1.7.1 to 1.8.1 (new options: `find-duplicates`, `eval-const-expressions`) - `govet`: add `httpmux` analyzer - `nilnesserr`: from 0.1.2 to 0.2.0 (detect more cases) - `paralleltest`: from 1.0.10 to 1.0.14 (checks only `_test.go` files) - `revive`: from 1.7.0 to 1.9.0 (support kebab case for setting names) - `sloglint`: from 0.9.0 to 0.11.0 (autofix, new option `msg-style`, suggest `slog.DiscardHandler`) - `wrapcheck`: from 2.10.0 to 2.11.0 (new option `report-internal-errors`) - `wsl`: from 4.6.0 to 4.7.0 (cgo files are always excluded) 4. Linters bug fixes - `fatcontext`: from 0.7.1 to 0.7.2 - `gocritic`: fix `importshadow` checker - `gosec`: from 2.22.2 to 2.22.3 - `ireturn`: from 0.3.1 to 0.4.0 - `loggercheck`: from 0.10.1 to 0.11.0 - `nakedret`: from 2.0.5 to 2.0.6 - `nonamedreturns`: from 1.0.5 to 1.0.6 - `protogetter`: from 0.3.12 to 0.3.13 - `testifylint`: from 1.6.0 to 1.6.1 - `unconvert`: update to HEAD 5. Misc. - Fixes memory leaks when using go1.(N) with golangci-lint built with go1.(N-X) - Adds `golangci-lint-fmt` pre-commit hook 6. Documentation - Improvements - Updates section about vscode integration
--- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7528 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 13ddc369b7..d5ec1e72fe 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.2.1 # renovate: datasource=go GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0 # renovate: datasource=go -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.1 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.6.0 # renovate: datasource=go SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renovate: datasource=go From fdf641ddce44112b1e669c46465608d32e78efc6 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 13 Apr 2025 13:37:28 +0500 Subject: [PATCH 132/568] [v11.0/forgejo] i18n: update of translations from Codeberg Translate Translation updates that are applicable to v11 strings were picked from this commit: 372a3dad83dbea80660a6aa702cad860927acb59 Changes to strings that are only present in the v12 branch were not picked. Below is a list of co-authors of the ported commit. It may contain co-authors who's changes were not picked due to being v12-only. Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate Co-authored-by: Edgarsons Co-authored-by: Juno Takano Co-authored-by: blaahaj Co-authored-by: earl-warren Co-authored-by: tacaly Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/pt_BR/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fr/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/ru/ Translation: Forgejo/forgejo Translation: Forgejo/forgejo-next --- options/locale/locale_da.ini | 579 +++++++++++++++++++++++++- options/locale/locale_fr-FR.ini | 16 +- options/locale/locale_lv-LV.ini | 4 +- options/locale/locale_ru-RU.ini | 2 +- options/locale_next/locale_pt-BR.json | 7 +- 5 files changed, 585 insertions(+), 23 deletions(-) diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index 87bd4dae2b..ce54704270 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -1,6 +1,3 @@ - - - [common] home = Hjem dashboard = Instrumentpanel @@ -158,7 +155,7 @@ exact_tooltip = Medtag kun resultater, der matcher den nøjagtige søgeterm regexp = RegExp regexp_tooltip = Fortolk søgetermen som et regulært udtryk org_kind = Søg i organisationer… -team_kind = Søg efter hold… +team_kind = Søg efter teams… code_kind = Søg kode… code_search_by_git_grep = Aktuelle kodesøgeresultater leveres af "git grep". Der kan være bedre resultater, hvis webstedsadministratoren aktiverer kodeindeksering. package_kind = Søg pakker… @@ -186,7 +183,7 @@ number_of_contributions_in_the_last_12_months = %s bidrag inden for de sidste 12 contributions_zero = Ingen bidrag contributions_format = {contributions} på {month} {day}, {year} contributions_one = bidrag -contributions_few = bidragene +contributions_few = bidrag less = Mindre more = Mere @@ -200,7 +197,7 @@ buttons.link.tooltip = Tilføj et link buttons.list.unordered.tooltip = Tilføj en punktliste buttons.list.task.tooltip = Tilføj en liste over opgaver buttons.list.ordered.tooltip = Tilføj en nummereret liste -buttons.mention.tooltip = Nævn en bruger eller et hold +buttons.mention.tooltip = Nævn en bruger eller et team buttons.ref.tooltip = Henvis til et problem eller pull-anmodning buttons.enable_monospace_font = Aktiver monospace-skrifttype buttons.disable_monospace_font = Deaktiver monospace-skrifttype @@ -363,7 +360,7 @@ my_repos = Depoter my_orgs = Organisationer view_home = Se %s filter = Andre filtre -filter_by_team_repositories = Filtrer efter holddepoter +filter_by_team_repositories = Filtrer efter team depoter feed_of = Feed af "%s" show_archived = Arkiveret show_both_archived_unarchived = Viser både arkiveret og ikke-arkiveret @@ -530,7 +527,7 @@ repo.collaborator.added.subject = %s føjede dig til %s som samarbejdspartner repo.collaborator.added.text = Du er blevet tilføjet som samarbejdspartner til depotet: team_invite.subject = %[1]s har inviteret dig til at deltage i %[2]s organisationen team_invite.text_1 = %[1]s har inviteret dig til at deltage i teamet %[2]s i organisationen %[3]s. -team_invite.text_2 = Klik venligst på følgende link for at blive medlem af holdet: +team_invite.text_2 = Klik venligst på følgende link for at blive medlem af teamet: team_invite.text_3 = Note: Denne invitation var beregnet til %[1]s. Hvis du ikke forventede denne invitation, kan du ignorere denne e-mail. [modal] @@ -553,7 +550,7 @@ Email = E-mailadresse Password = Adgangskode Retype = Bekræft adgangskode PayloadUrl = Payload URL -TeamName = Holdnavn +TeamName = Team navn AuthName = Autorisationsnavn AdminEmail = Admin email To = Gren navn @@ -2526,10 +2523,218 @@ settings.require_signed_commits = Kræv underskrevne commits settings.remove_protected_branch_success = Grenbeskyttelse for reglen "%s" er blevet fjernet. settings.enforce_on_admins = Håndhæv denne regel for depotadministratorer +settings.tags.protection.allowed.teams = Tilladte hold +settings.tags.protection.allowed.noone = Ingen +settings.tags.protection.create = Tilføj regel +settings.tags.protection.none = Der er ingen beskyttede tags. +settings.tags.protection.pattern.description = Du kan bruge et enkelt navn eller et globmønster eller regulært udtryk til at matche flere tags. Læs mere i guiden til beskyttede tags. +settings.bot_token = Bot token +settings.chat_id = Chat ID +settings.thread_id = Thread ID +settings.matrix.homeserver_url = Hjemmeserver URL +settings.matrix.room_id = Rum ID +settings.matrix.message_type = Meddelelsestype +settings.matrix.access_token_helper = Det anbefales at opsætte en dedikeret Matrix-konto til dette. Adgangstokenet kan hentes fra Element-webklienten (i en privat/inkognito-fane) > Brugermenu (øverst til venstre) > Alle indstillinger > Hjælp og om > Avanceret > Adgangstoken (lige under hjemmeserverens URL). Luk privat-/inkognitofanen (logging ud ville ugyldiggøre tokenet). +settings.matrix.room_id_helper = Rum-id'et kan hentes fra Element-webklienten > Rumindstillinger > Avanceret > Internt rum-id. Eksempel: %s. +settings.archive.button = Arkivere depot +settings.archive.header = Arkivere dette depot +settings.archive.text = Arkivering af depotet vil gøre den fuldstændig skrivebeskyttet. Det vil blive skjult fra dashboardet. Ingen (ikke engang dig!) vil være i stand til at foretage nye commits eller åbne nogen problemer eller pull-anmodninger. +settings.archive.success = Depotet blev arkiveret. +settings.archive.error = Der opstod en fejl under forsøg på at arkivere depotet. Se loggen for flere detaljer. +settings.archive.error_ismirror = Du kan ikke arkivere et spejlet depot. +settings.archive.branchsettings_unavailable = Indstillinger for gren er ikke tilgængelige i arkiverede depoter. +settings.archive.tagsettings_unavailable = Tag-indstillinger er ikke tilgængelige i arkiverede depoter. +settings.archive.mirrors_unavailable = Spejle er ikke tilgængelige i arkiverede depoter. +settings.unarchive.button = Fjern arkivering af depot +settings.unarchive.header = Fjern arkivering af dette depot +settings.unarchive.text = Fjernelse af arkivering af depotet vil genoprette dens evne til at modtage commits og push, såvel som nye problemer og pull-anmodninger. +settings.unarchive.success = Depotet blev fjernet fra arkivet. +settings.unarchive.error = Der opstod en fejl under forsøg på at fjerne depotet fra arkivet. Se loggen for flere detaljer. +settings.update_avatar_success = Depot avataren er blevet opdateret. +settings.lfs = LFS +settings.lfs_filelist = LFS-filer gemt i dette depot +settings.lfs_no_lfs_files = Ingen LFS-filer gemt i dette depot +settings.lfs_findcommits = Find commits +settings.lfs_lfs_file_no_commits = Ingen commits fundet for denne LFS-fil +settings.lfs_noattribute = Denne sti har ikke den låsbare attribut i standardgrenen +settings.lfs_delete = Slet LFS-fil med OID %s +settings.lfs_delete_warning = Sletning af en LFS-fil kan forårsage "objekt findes ikke"-fejl ved checkout. Er du sikker? +settings.lfs_findpointerfiles = Find pointer-filer +settings.lfs_locks = Låse +settings.lfs_invalid_locking_path = Ugyldig sti: %s +settings.lfs_invalid_lock_directory = Kan ikke låse mappe: %s +settings.lfs_lock_already_exists = Låsen findes allerede: %s +settings.lfs_pointers.associateAccessible = Tilknyt tilgængelige %d OID'er +settings.rename_branch_failed_protected = Kan ikke omdøbe grenen %s, fordi den er en beskyttet gren. +settings.rename_branch_failed_exist = Kan ikke omdøbe grenen, fordi målgrenen %s eksisterer. +settings.rename_branch_failed_not_exist = Kan ikke omdøbe grenen %s, fordi den ikke eksisterer. +settings.rename_branch_success = Grenen %s blev omdøbt til %s. +settings.rename_branch = Omdøb gren +diff.browse_source = Gennemse kilde +diff.parent = forælder +diff.commit = commit +diff.git-notes = Noter +diff.git-notes.add = Tilføj note +diff.git-notes.remove-header = Fjern note +diff.git-notes.remove-body = Denne note vil blive fjernet. +diff.data_not_available = Diff-indhold er ikke tilgængeligt +diff.options_button = Diff muligheder +diff.download_patch = Download patch-fil +diff.download_diff = Download diff fil +diff.show_split_view = Opdelt visning +diff.show_unified_view = Samlet visning +diff.whitespace_button = Blanke mellemrum +diff.whitespace_show_everything = Vis alle ændringer +diff.whitespace_ignore_all_whitespace = Ignorer blanke mellemrum, når du sammenligner linjer +diff.whitespace_ignore_amount_changes = Ignorer ændringer i mængden af blanke mellemrum +diff.whitespace_ignore_at_eol = Ignorer ændringer i blanke mellemrum på EOL +diff.stats_desc = %d ændrede filer med %d tilføjelser og %d sletninger +diff.stats_desc_file = %d ændringer: %d tilføjelser og %d sletninger +diff.bin = BIN +diff.bin_not_shown = Binær fil vises ikke. +diff.view_file = Se fil +diff.file_before = Før +diff.file_after = Efter +diff.file_image_width = Bredde +diff.file_image_height = Højde +diff.file_byte_size = Størrelse +diff.file_suppressed = Filforskellen er undertrykt, fordi den er for stor +diff.file_suppressed_line_too_long = Filforskellen er undertrykt, fordi en eller flere linjer er for lange +diff.too_many_files = Nogle filer blev ikke vist, fordi der er ændret for mange filer i denne diff +diff.show_more = Vis mere +diff.load = Load diff +diff.generated = genereret +diff.vendored = forhandlet +diff.comment.add_line_comment = Tilføj linjekommentar +diff.comment.placeholder = Efterlad en kommentar +diff.comment.markdown_info = Styling med Markdown understøttes. +diff.comment.add_single_comment = Tilføj en enkelt kommentar +diff.comment.add_review_comment = Tilføj kommentar +diff.comment.start_review = Start anmeldelse +diff.comment.reply = Svar +diff.review = Afslut gennemgangen +diff.review.header = Send anmeldelse +diff.review.placeholder = Gennemgå kommentar +diff.review.comment = Kommentar +diff.review.approve = Godkend +diff.review.self_reject = Forfattere af pull-anmodninger kan ikke anmode om ændringer på deres egen pull-anmodning +diff.review.reject = Anmod om ændringer +diff.review.self_approve = Forfattere af pull-anmodninger kan ikke godkende deres egen pull-anmodning +diff.committed_by = committed af +diff.protected = Beskyttet +diff.image.side_by_side = Side om side +diff.image.swipe = Swipe +diff.image.overlay = Overlejring +diff.has_escaped = Denne linje har skjulte Unicode-tegn +diff.show_file_tree = Vis filtræ +diff.hide_file_tree = Skjul filtræ +releases.desc = Spor projektversioner og downloads. +release.releases = Udgivelser +release.detail = Udgivelsesdetaljer +release.tags = Tags +release.new_release = Ny udgivelse +release.draft = Udkast +release.prerelease = Forhåndsudgivelse +release.stable = Stabil +release.compare = Sammenlign +release.ahead.commits = %d commits +release.ahead.target = til %s siden denne udgivelse +tag.ahead.target = til %s siden dette tag +release.source_code = Kildekode +release.new_subheader = Udgivelser organiserer projektversioner. +release.edit_subheader = Udgivelser organiserer projektversioner. +release.tag_name = Tag navn +release.target = Mål +release.tag_helper = Vælg et eksisterende tag, eller opret et nyt tag. +release.tag_helper_new = Nyt tag. Dette tag vil blive oprettet fra målet. +release.tag_helper_existing = Eksisterende tag. +release.title = Udgivelsestitel +release.title_empty = Titel må ikke være tom. +release.message = Beskriv denne udgivelse +release.prerelease_desc = Markér som pre-release +release.prerelease_helper = Marker denne udgivelse uegnet til produktionsbrug. +release.deletion_desc = Sletning af en udgivelse fjerner den kun fra Forgejo. Det vil ikke påvirke Git-tagget, indholdet af dit depot eller dets historie. Vil du fortsætte? +release.deletion_success = Udgivelsen er blevet slettet. +release.deletion_tag_desc = Vil slette dette tag fra depotet. Depotindhold og -historik forbliver uændret. Vil du fortsætte? +release.deletion_tag_success = Tagget er blevet slettet. +release.tag_name_already_exist = Der findes allerede en udgivelse med dette tagnavn. +release.tag_name_invalid = Tagnavnet er ikke gyldigt. +release.tag_name_protected = Tagnavnet er beskyttet. +release.tag_already_exist = Dette tagnavn findes allerede. +release.downloads = Downloads +release.download_count_one = %s download +release.download_count_few = %s downloads +release.add_tag_msg = Brug udgivelsens titel og indhold som tagmeddelelse. +release.hide_archive_links = Skjul automatisk genererede arkiver +release.hide_archive_links_helper = Skjul automatisk genererede kildekodearkiver for denne udgivelse. For eksempel hvis du uploader din egen. +release.add_tag = Opret tag +release.releases_for = Udgivelser for %s +release.tags_for = Tags for %s +release.system_generated = Denne vedhæftede fil genereres automatisk. +release.type_attachment = Vedhæftning +release.type_external_asset = Eksternt aktiv +release.asset_name = Aktivets navn +release.asset_external_url = Ekstern URL +release.add_external_asset = Tilføj eksternt aktiv +release.invalid_external_url = Ugyldig ekstern URL: "%s" +release.summary_card_alt = Oversigtskort for en udgivelse med titlen "%s" i depots %s +branch.name = Gren navn +branch.already_exists = En gren med navnet "%s" eksisterer allerede. +branch.delete_branch_has_new_commits = Gren "%s" kan ikke slettes, fordi nye commits er blevet tilføjet efter fletning. +branch.create_branch = Opret gren %s +branch.create_from = fra "%s" +branch.create_success = Gren "%s" er blevet oprettet. +branch.branch_already_exists = Gren "%s" findes allerede i dette depot. +branch.branch_name_conflict = Gren navn "%s" er i konflikt med den allerede eksisterende gren "%s". +branch.tag_collision = Gren "%s" kan ikke oprettes, da et tag med samme navn allerede eksisterer i depotet. +branch.deleted_by = Slettet af %s +branch.restore_success = Gren "%s" er blevet gendannet. +branch.restore_failed = Kunne ikke gendanne grenen "%s". +branch.protected_deletion_failed = Gren "%s" er beskyttet. Det kan ikke slettes. +branch.default_deletion_failed = Gren "%s" er standardgrenen. Det kan ikke slettes. +branch.restore = Gendan grenen "%s" +branch.download = Download gren "%s" +branch.rename = Omdøb grenen "%s" +branch.included_desc = Denne gren er en del af standardgrenen +branch.included = Inkluderet +branch.create_new_branch = Opret en gren fra gren: +branch.confirm_create_branch = Opret gren +branch.warning_rename_default_branch = Du omdøber standardgrenen. +branch.rename_branch_to = Omdøb "%s" til: +branch.create_branch_operation = Opret gren +branch.new_branch = Opret ny gren +branch.new_branch_from = Opret ny gren fra "%s" +branch.renamed = Gren %s blev omdøbt til %s. +tag.create_tag = Opret tag %s +tag.create_tag_operation = Opret tag +tag.confirm_create_tag = Opret tag +tag.create_tag_from = Opret nyt tag fra "%s" +tag.create_success = Tag "%s" er blevet oprettet. +topic.manage_topics = Administrer emner +topic.done = Færdig +topic.count_prompt = Du kan ikke vælge mere end 25 emner +topic.format_prompt = Emner skal starte med et bogstav eller tal, kan indeholde bindestreger ("-") og prikker ("."), kan være op til 35 tegn lange. Bogstaver skal være små. +find_file.go_to_file = Find en fil +find_file.no_matching = Ingen matchende fil fundet +error.csv.too_large = Denne fil kan ikke gengives, fordi den er for stor. +error.csv.unexpected = Denne fil kan ikke gengives, fordi den indeholder et uventet tegn i linje %d og kolonne %d. +error.csv.invalid_field_count = Denne fil kan ikke gengives, fordi den har et forkert antal felter i linje %d. +error.broken_git_hook = Git hooks af dette depot ser ud til at være brudt. Følg venligst dokumentationen for at rette dem, og push derefter på nogle commits for at opdatere statussen. + [notification] watching = Overvåger read = Læs +notifications = Notifikationer +unread = Ulæst +no_unread = Ingen ulæste notifikationer. +no_read = Ingen læste notifikationer. +mark_as_read = Markér som læst +mark_as_unread = Markér som ulæst +mark_all_as_read = Markér alle som læste +subscriptions = Abonnementer +no_subscriptions = Ingen abonnementer + [action] watched_repo = begyndte at overvåge %[2]s @@ -2562,6 +2767,94 @@ settings.permission = Tilladelser settings.visibility = Synlighed members.remove = Slet +org_name_holder = Organisationens navn +org_full_name_holder = Organisationens fulde navn +org_name_helper = Organisationsnavne skal være korte og mindeværdige. +create_org = Opret organisation +open_dashboard = Åbn dashboard +code = Kode +lower_repositories = depoter +create_new_team = Nyt team +create_team = Opret team +team_name = Team navn +team_name_helper = Team navne skal være korte og mindeværdige. +team_desc_helper = Beskriv teamets formål eller rolle. +team_access_desc = Depot adgang +team_permission_desc = Tilladelse +team_unit_desc = Tillad adgang til depotsektioner +team_unit_disabled = (Deaktiveret) +follow_blocked_user = Du kan ikke følge denne organisation, fordi denne organisation har blokeret dig. +form.name_reserved = Organisationsnavnet "%s" er reserveret. +form.name_pattern_not_allowed = Mønsteret "%s" er ikke tilladt i et organisationsnavn. +form.create_org_not_allowed = Du har ikke tilladelse til at oprette en organisation. +settings.email = Kontakt email +settings.update_settings = Opdater indstillinger +settings.update_setting_success = Organisationsindstillingerne er blevet opdateret. +settings.change_orgname_prompt = Bemærk: Ændring af organisationens navn vil også ændre din organisations URL og frigøre det gamle navn. +settings.change_orgname_redirect_prompt = Det gamle navn vil omdirigere, indtil det gøres krav på. +settings.change_orgname_redirect_prompt.with_cooldown.one = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dag, du kan stadig kræve det gamle navn tilbage i nedkølingsperioden. +settings.change_orgname_redirect_prompt.with_cooldown.few = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dage, du kan stadig kræve det gamle navn tilbage i . +settings.update_avatar_success = Organisationens avatar er blevet opdateret. +settings.delete = Slet organisation +settings.delete_account = Slet denne organisation +settings.delete_prompt = Organisationen fjernes permanent. Dette KAN IKKE fortrydes! +settings.confirm_delete_account = Bekræft sletning +settings.delete_org_title = Slet organisation +settings.delete_org_desc = Denne organisation vil blive slettet permanent. Vil du fortsætte? +settings.hooks_desc = Tilføj webhooks, som vil blive udløst for alle lagre under denne organisation. +settings.labels_desc = Tilføj etiketter, som kan bruges til problemer for alle lagre under denne organisation. +members.membership_visibility = Medlemskabs synlighed: +members.public = Synlig +members.public_helper = Gør skjult +members.private = Skjult +members.private_helper = Gør synlig +members.member_role = Medlemsrolle: +members.member = Medlem +members.remove.detail = Vil du fjerne %[1]s fra %[2]s? +members.leave = Forlad +members.leave.detail = Er du sikker på, at du vil forlade organisationen "%s"? +members.invite_desc = Tilføj et nyt medlem til %s: +members.invite_now = Inviter nu +teams.join = Deltag +teams.leave = Forlad +teams.leave.detail = Er du sikker på, at du vil forlade teamet "%s"? +teams.can_create_org_repo = Opret depoter +teams.can_create_org_repo_helper = Medlemmer kan oprette nye arkiver i organisationen. Skaberen får administratoradgang til det nye lager. +teams.none_access = Ingen adgang +teams.none_access_helper = Muligheden "ingen adgang" har kun effekt på private arkiver. +teams.general_access = Brugerdefineret adgang +teams.general_access_helper = Medlemmers tilladelser bestemmes af nedenstående tilladelsestabell. +teams.owners_permission_desc = Ejere har fuld adgang til alle depoter og har administratoradgang til organisationen. +teams.members = Team medlemmer +teams.update_settings = Opdater indstillinger +teams.delete_team = Slet team +teams.add_team_member = Slet team +teams.invite_team_member = Inviter til %s +teams.invite_team_member.list = Afventende invitationer +teams.delete_team_title = Slet team +teams.delete_team_desc = Sletning af et team tilbagekalder depotadgang fra dets medlemmer. Vil du fortsætte? +teams.delete_team_success = Teamet er blevet slettet. +teams.read_permission_desc = Dette team giver læse adgang: medlemmer kan se og klone teamdepoter. +teams.write_permission_desc = Dette team giver Skrive adgang: medlemmer kan læse fra og skubbe til teamdepoter. +teams.admin_permission_desc = Dette team giver Administrator adgang: medlemmer kan læse fra, skubbe til og tilføje samarbejdspartnere til teamdepoter. +teams.create_repo_permission_desc = Derudover giver dette team tilladelse til Opret depot: medlemmer kan oprette nye lagre i organisationen. +teams.repositories = Team depoter +teams.remove_all_repos_title = Slet alle team depoter +teams.remove_all_repos_desc = Dette vil slette alle depoter fra teamet +teams.add_all_repos_title = Tilføj alle depoter +teams.add_all_repos_desc = Dette vil tilføje alle organisationens depoter til teamet. +teams.add_nonexistent_repo = Depotet, du forsøger at tilføje, eksisterer ikke, opret det først. +teams.add_duplicate_users = Brugeren er allerede et teammedlem. +teams.repos.none = Ingen depoter kunne tilgås af dette team. +teams.members.none = Ingen medlemmer på dette team. +teams.specific_repositories = Specifikke depoter +teams.specific_repositories_helper = Medlemmer vil kun have adgang til depoter, der udtrykkeligt er føjet til teamet. Hvis du vælger dette vil det ikke automatisk fjerne depoter, der allerede er tilføjet med Alle depoter. +teams.all_repositories = Alle depoter +teams.all_repositories_helper = Teamet har adgang til alle depoter. Hvis du vælger dette, føjes alle eksisterende depoter til teamet. +teams.invite.title = Du er blevet inviteret til at deltage i teamet %s i organisationen %s. +teams.invite.by = Inviteret af %s +teams.invite.description = Klik venligst på knappen nedenfor for at blive medlem af teamet. + [admin] orgs.members = Medlemmer orgs.teams = Teams @@ -2602,6 +2895,208 @@ auths.oauth2_icon_url = Icon URL users.edit = Redigere users.auth_source = Godkendelseskilde +dashboard = Dashboard +self_check = Selvtjek +identity_access = Identitet og adgang +users = Brugerkonti +organizations = Organisationer +assets = Kode aktiver +repositories = Depoter +hooks = Webhooks +integrations = Integrationer +authentication = Godkendelseskilder +emails = Bruger e-mails +config = Konfiguration +notices = Systemmeddelelser +config_summary = Oversigt +monitor = Overvågning +first_page = Først +last_page = Sidst +total = Total: %d +settings = Admin indstillinger +dashboard.new_version_hint = Forgejo %s er nu tilgængelig, du kører %s. Tjek bloggen for flere detaljer. +dashboard.statistic = Oversigt +dashboard.operations = Vedligeholdelses operationer +dashboard.system_status = System status +dashboard.operation_name = Operations navn +dashboard.operation_switch = Skift +dashboard.operation_run = Kør +dashboard.clean_unbind_oauth = Rens ubundne OAuth-forbindelser +dashboard.clean_unbind_oauth_success = Alle ubundne OAuth-forbindelser er blevet slettet. +dashboard.task.started = Startet opgave: %[1]s +dashboard.task.process = Opgave: %[1]s +dashboard.task.cancelled = Opgave: %[1]s annulleret: %[3]s +dashboard.task.error = Fejl i Opgave: %[1]s: %[3]s +dashboard.task.finished = Opgave: %[1]s startet af %[2]s er afsluttet +dashboard.task.unknown = Ukendt opgave: %[1]s +dashboard.cron.started = Startede Cron: %[1]s +dashboard.cron.process = Cron: %[1]s +dashboard.cron.cancelled = Cron: %[1]s annulleret: %[3]s +dashboard.cron.error = Fejl i Cron: %s: %[3]s +dashboard.cron.finished = Cron: %[1]s er færdig +dashboard.delete_inactive_accounts = Slet alle uaktiverede konti +dashboard.delete_inactive_accounts.started = Slet alle uaktiverede konti opgave startet. +dashboard.delete_repo_archives = Slet alle depoters arkiver (ZIP, TAR.GZ osv..) +dashboard.delete_repo_archives.started = Slet alle repository arkiver opgave startet. +dashboard.delete_missing_repos = Slet alle depoter, der mangler deres Git-filer +dashboard.delete_missing_repos.started = Slet alle depoter, der mangler deres Git-filopgave startet. +dashboard.delete_generated_repository_avatars = Slet genererede depot avatarer +dashboard.sync_repo_branches = Synkroniser mistede grene fra Git-data til databasen +dashboard.sync_repo_tags = Synkroniser tags fra Git-data til database +dashboard.update_mirrors = Opdater spejle +dashboard.repo_health_check = Sundhedstjek alle depoter +dashboard.check_repo_stats = Tjek alle depotstatistikker +dashboard.archive_cleanup = Slet gamle depotarkiver +dashboard.deleted_branches_cleanup = Ryd op i slettede grene +dashboard.update_migration_poster_id = Opdater migrationsplakat-id'er +dashboard.git_gc_repos = Samle alt affald fra alle depoter +dashboard.resync_all_sshkeys = Opdater filen ".ssh/authorized_keys" med Forgejo SSH-nøgler. +dashboard.resync_all_sshprincipals = Opdater ".ssh/authorized_principals" filen med Forgejo SSH principals. +dashboard.resync_all_hooks = Gensynkroniser pre-receive, update og post-receive hooks for alle depoter +dashboard.reinit_missing_repos = Geninitialiser alle manglende Git-depoter, som der findes poster for +dashboard.sync_external_users = Synkroniser eksterne brugerdata +dashboard.cleanup_hook_task_table = Oprydning hook_task tabel +dashboard.cleanup_packages = Ryd udløbne pakker +dashboard.cleanup_actions = Oprydning af udløbne logfiler og artefakter fra handlinger +dashboard.server_uptime = Server oppetid +dashboard.current_goroutine = Nuværende goroutiner +dashboard.current_memory_usage = Aktuel hukommelsesbrug +dashboard.total_memory_allocated = Samlet hukommelse tildelt +dashboard.memory_obtained = Hukommelse opnået +dashboard.pointer_lookup_times = Pointer-opslagstider +dashboard.memory_allocate_times = Hukommelsestildelinger +dashboard.memory_free_times = Hukommelses frigørelse +dashboard.current_heap_usage = Nuværende heap-brug +dashboard.heap_memory_obtained = Heap-hukommelse opnået +dashboard.heap_memory_idle = Heap hukommelse inaktiv +dashboard.heap_memory_in_use = Heap hukommelse i brug +dashboard.heap_memory_released = Heap-hukommelse frigivet +dashboard.heap_objects = Heap genstande +dashboard.bootstrap_stack_usage = Brug af bootstrap-stak +dashboard.stack_memory_obtained = Stakhukommelse opnået +dashboard.mspan_structures_usage = MSpan strukturer brug +dashboard.mspan_structures_obtained = Mspan strukturer opnået +dashboard.mcache_structures_usage = MCache strukturer brug +dashboard.mcache_structures_obtained = MCache-strukturer opnået +dashboard.profiling_bucket_hash_table_obtained = Profilering bucket hash tabel opnået +dashboard.gc_metadata_obtained = GC-metadata opnået +dashboard.other_system_allocation_obtained = Anden systemallokering opnået +dashboard.next_gc_recycle = Næste GC genbrug +dashboard.last_gc_time = Tid siden sidste GC +dashboard.total_gc_pause = Total GC-pause +dashboard.last_gc_pause = Sidste GC-pause +dashboard.gc_times = GC times +dashboard.delete_old_actions = Slet alle gamle aktiviteter fra databasen +dashboard.delete_old_actions.started = Slet alle gamle aktiviteter fra den påbegyndte database. +dashboard.update_checker = Opdateringskontrol +dashboard.delete_old_system_notices = Slet alle gamle systemmeddelelser fra databasen +dashboard.gc_lfs = Affaldssamler LFS-metaobjekter +dashboard.stop_zombie_tasks = Stop zombiehandlingsopgaver +dashboard.stop_endless_tasks = Stop endeløse handlingsopgaver +dashboard.cancel_abandoned_jobs = Annuller forladte handlingsjob +dashboard.start_schedule_tasks = Start planlæg handlingsopgaver +dashboard.sync_branch.started = Gren synkronisering startede +dashboard.sync_tag.started = Tag-synkronisering er startet +dashboard.rebuild_issue_indexer = Genopbyg problemindekser +users.user_manage_panel = Administrer brugerkonti +users.new_account = Opret brugerkonto +users.admin = Admin +users.restricted = Begrænset +users.reserved = Reserveret +users.bot = Bot +users.remote = Remote +users.2fa = 2FA +users.repos = Depoter +users.created = Oprettet +users.last_login = Sidst logget ind +users.never_login = Aldrig logget ind +users.send_register_notify = Giv besked om tilmelding via e-mail +users.new_success = Brugerkontoen "%s" er blevet oprettet. +users.local = Lokal +users.auth_login_name = Godkendelses-loginnavn +users.password_helper = Lad adgangskoden være tom for at bevare den uændret. +users.update_profile_success = Brugerkontoen er blevet opdateret. +users.edit_account = Rediger brugerkonto +users.max_repo_creation = Maksimalt antal depoter +users.max_repo_creation_desc = (Indtast -1 for at bruge den globale standardgrænse.) +users.is_activated = Aktiveret konto +users.activated.description = Afslutning af e-mailbekræftelse. Ejeren af en uaktiveret konto vil ikke være i stand til at logge ind, før e-mailbekræftelsen er gennemført. +users.prohibit_login = Suspenderet konto +users.block.description = Bloker denne bruger i at interagere med denne tjeneste via deres konto, og forbyd at logge ind. +users.is_admin = Administrator konto +users.admin.description = Giv denne bruger fuld adgang til alle administrative funktioner, der er tilgængelige via web-UI og API. +users.is_restricted = Begrænset konto +users.restricted.description = Tillad kun interaktion med de depoter og organisationer, hvor denne bruger er tilføjet som en samarbejdspartner. Dette forhindrer adgang til offentlige arkiver i denne instans. +users.allow_git_hook = Kan skabe Git hooks +users.allow_git_hook_tooltip = Git hooks udføres som OS-brugeren, der kører Forgejo og vil have samme niveau af værtsadgang. Som et resultat kan brugere med dette specielle Git hook-privilegium få adgang til og ændre alle Forgejo-depoter såvel som databasen, der bruges af Forgejo. Derfor er de også i stand til at opnå Forgejo-administratorrettigheder. +users.allow_import_local = Kan importere lokale depoter +users.local_import.description = Tillad import af depoter fra serverens lokale filsystem. Dette kan være et sikkerhedsproblem. +users.allow_create_organization = Kan skabe organisationer +users.organization_creation.description = Tillad oprettelse af nye organisationer. +users.update_profile = Opdater brugerkonto +users.delete_account = Slet brugerkonto +users.cannot_delete_self = Du kan ikke slette dig selv +users.still_own_repo = Denne bruger ejer stadig et eller flere arkiver. Slet eller overfør disse depoter først. +users.still_has_org = Denne bruger er medlem af en organisation. Fjern først brugeren fra enhver organisation. +users.purge = Udrens bruger +users.purge_help = Tvangsslet brugeren og eventuelle depoter, organisationer og pakker, der ejes af brugeren. Alle kommentarer og problemer indsendt af denne bruger vil også blive slettet. +users.still_own_packages = Denne bruger ejer stadig en eller flere pakker, slet disse pakker først. +users.deletion_success = Brugerkontoen er blevet slettet. +users.reset_2fa = Nulstil 2FA +users.list_status_filter.menu_text = Filter +users.list_status_filter.reset = Nulstil +users.list_status_filter.is_active = Aktiv +users.list_status_filter.not_active = Inaktiv +users.list_status_filter.is_admin = Admin +users.list_status_filter.not_admin = Ikke admin +users.list_status_filter.is_restricted = Begrænset +users.list_status_filter.not_restricted = Ikke begrænset +users.list_status_filter.is_prohibit_login = Forbyd login +users.list_status_filter.not_prohibit_login = Tillad login +users.list_status_filter.is_2fa_enabled = 2FA aktiveret +users.list_status_filter.not_2fa_enabled = 2FA deaktiveret +users.details = Brugeroplysninger +emails.email_manage_panel = Administrer bruger-e-mails +emails.primary = Primær +emails.filter_sort.email_reverse = E-mail (omvendt) +emails.filter_sort.name_reverse = Brugernavn (omvendt) +emails.updated = E-mail opdateret +emails.not_updated = Kunne ikke opdatere den anmodede e-mailadresse: %v +emails.duplicate_active = Denne e-mailadresse er allerede aktiv for en anden bruger. +emails.change_email_header = Opdater e-mail-egenskaber +emails.change_email_text = Er du sikker på, at du vil opdatere denne e-mailadresse? +emails.delete = Slet e-mail +emails.delete_desc = Er du sikker på, at du vil slette denne e-mailadresse? +emails.deletion_success = E-mailadressen er blevet slettet. +emails.delete_primary_email_error = Du kan ikke slette den primære e-mail. +orgs.org_manage_panel = Administrer organisationer +repos.repo_manage_panel = Administrer depoter +repos.unadopted = Ikke-adopterede depoter +repos.unadopted.no_more = Ingen ikke-adopterede depoter fundet. +repos.issues = Problemer +repos.size = Størrelse +repos.lfs_size = LFS størrelse +packages.package_manage_panel = Administrer pakker +packages.total_size = Samlet størrelse: %s +packages.unreferenced_size = Ikke-referencestørrelse: %s +packages.version = Version +packages.type = Type +packages.size = Størrelse +packages.published = Offentliggjort +auths.type = Type +auths.syncenabled = Slå brugersynkronisering til +auths.updated = Opdateret +auths.security_protocol = Sikkerhedsprotokol +auths.domain = Domæne +auths.host = Host +auths.port = Port +monitor.queue.settings.maxnumberworkers.placeholder = I øjeblikket %[1]d +monitor.queue.settings.submit = Opdater indstillinger +monitor.queue.settings.changed = Indstillinger opdateret +monitor.queue.settings.remove_all_items = Slet alle +monitor.queue.settings.remove_all_items_done = Alle varer i køen er blevet fjernet. +notices.system_notice_list = Systemmeddelelser + [packages] arch.version.description = Beskrivelse container.labels = Etiketter @@ -2647,14 +3142,78 @@ rpm.repository.architectures = Arkitekturer alt.registry = Konfigurer dette register fra kommandolinjen: alt.repository = Depot info +dependency.version = Version +search_in_external_registry = Søg i %s +alpine.registry = Konfigurer dette register ved at tilføje url'en i din /etc/apk/repositories fil: +alpine.registry.key = Download den offentlige RSA-nøgle til registreringsdatabasen i mappen /etc/apk/keys/ for at bekræfte indekssignaturen: +alpine.registry.info = Vælg $branch og $repository fra listen nedenfor. +alpine.repository.repositories = Depoter + [actions] runners.description = Beskrivelse runners.labels = Etiketter runners.name = Navn runners.task_list.repository = Depot +runners.status.active = Aktiv +runners.status.offline = Offline +runners.version = Version + [tool] 1d = 1 dag 1w = 1 uge 1mon = 1 måned -1y = 1 år \ No newline at end of file +1y = 1 år +future = fremtid +1s = 1 sekund +1m = 1 minut +1h = 1 time +seconds = %d sekunder +minutes = %d minutter +hours = %d timer +days = %d dage +weeks = %d uger +months = %d måneder +years = %d år +raw_seconds = sekunder +raw_minutes = minutter + +[repo.permissions] +code.read = Læs: Få adgang til og klon koden for depotet. +code.write = Skriv: Skub til depotet, opret filialer og tags. +issues.read = Læs: Læs og opret problemer og kommentarer. +issues.write = Skriv: Luk problemer og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder. +pulls.read = Læs: Læsning og oprettelse af pull-anmodninger. +pulls.write = Skriv: Luk pull-anmodninger og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder. +releases.read = Læs: Se og download udgivelser. +releases.write = Skriv: Udgiv, rediger og slet udgivelser og deres aktiver. +wiki.read = Læs: Læs den integrerede wiki og dens historie. +wiki.write = Skriv: Opret, opdater og slet sider i den integrerede wiki. +projects.read = Læs: Få adgang til depot-projekttavler. +projects.write = Skriv: Opret projekter og kolonner, og rediger dem. +packages.read = Læs: Se og download pakker, der er tildelt depotet. +packages.write = Skriv: Udgiv og slet pakker, der er tildelt depotet. +actions.read = Læs: Se integrerede CI/CD-pipelines og deres logfiler. +actions.write = Skriv: Udløs, genstart, annuller eller godkend afventende CI/CD-pipelines manuelt. +ext_issues = Få adgang til linket til en ekstern problemsporing. Tilladelserne administreres eksternt. +ext_wiki = Få adgang til linket til en ekstern wiki. Tilladelserne administreres eksternt. + +[graphs] +component_loading = Indlæser %s… +component_loading_failed = Kunne ikke indlæse %s +component_loading_info = Dette kan tage lidt tid… +component_failed_to_load = Der skete en uventet fejl. +code_frequency.what = kode frekvens +contributors.what = bidrag +recent_commits.what = nylige commits + +[dropzone] +invalid_input_type = Filer af denne type må ikke uploades. +remove_file = Fjern fil + +[gpg] +default_key = Underskrevet med standardnøglen + +[secrets] +creation.name_placeholder = uafhængig af store og små bogstaver, alfanumeriske tegn eller understregninger, kan ikke starte med GITEA_ eller GITHUB_ +creation.value_placeholder = Indtast ethvert indhold. Mellemrum i starten og slutningen vil blive udeladt. \ No newline at end of file diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 42f05bb0c7..1e78443b89 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -3978,7 +3978,7 @@ submodule=Sous-module [search] -search = Rechercher... +search = Rechercher… type_tooltip = Type de recherche fuzzy = Approximatif code_search_by_git_grep = Les résultats de recherche dans le code sont fournis par "git grep". Les résultats pourraient être plus pertinents si l'administrateur du site active les indexeurs de code source. @@ -3988,14 +3988,14 @@ keyword_search_unavailable = La recherche par mot-clé n'est pas disponible actu fuzzy_tooltip = Inclure les résultats proches des termes recherchés match = Correspondance match_tooltip = Uniquement inclure les résultats correspondant exactement aux termes recherchés -repo_kind = Chercher dans les dépôts... -user_kind = Chercher les utilisateurs... -org_kind = Chercher les organisations... -team_kind = Chercher les équipes... -code_kind = Chercher le code... +repo_kind = Chercher dans les dépôts… +user_kind = Chercher les utilisateurs… +org_kind = Chercher les organisations… +team_kind = Chercher les équipes… +code_kind = Chercher le code… code_search_unavailable = La recherche dans le code n'est pas disponible. Veuillez contacter l'administrateur du site. -package_kind = Chercher les paquets... -project_kind = Chercher les projets... +package_kind = Chercher les paquets… +project_kind = Chercher les projets… branch_kind = Chercher les branches... commit_kind = Chercher les commits... exact = Exact diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 2e2a165f1f..7f4ae4262b 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1571,7 +1571,7 @@ issues.self_assign_at=`piešķīra sev %s` issues.add_assignee_at=`%s piešķīra %s` issues.remove_assignee_at=`%s noņēma %s` issues.remove_self_assignment=`noņēma sev %s` -issues.change_title_at=`nomainīts nosaukums no %s uz %s %s` +issues.change_title_at=`nomainīja nosaukumu no %s uz %s %s` issues.change_ref_at=`nomainīta atsauce no %s uz %s %s` issues.remove_ref_at=`noņēma atsauci no %s %s` issues.add_ref_at=`pievienoja atsauci uz %s %s` @@ -3658,7 +3658,7 @@ raw_seconds=sekundes raw_minutes=minūtes [dropzone] -default_message=Jāievelk datnes vai jāklikšķina šeit, lai augšupielādētu. +default_message=Ievilkt datnes vai klikšķināt šeit, lai augšupielādētu. invalid_input_type=Šī veida datnes nevar augšupielādēt. file_too_big=Datnes izmērs ({{filesize}} MB) pārsniedz pieļaujamo izmēru ({{maxFilesize}} MB). remove_file=Noņemt datni diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 5830a32285..e0f8065063 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -4060,7 +4060,7 @@ filepreview.lines = Строки с %[1]d по %[2]d в %[3]s filepreview.truncated = Предпросмотр был обрезан [translation_meta] -test = Forgejo! +test = Forgejo [repo.permissions] code.write = Запись: отправка изменений в репозиторий, создание веток и тегов. diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json index a66d679e96..218669787d 100644 --- a/options/locale_next/locale_pt-BR.json +++ b/options/locale_next/locale_pt-BR.json @@ -9,11 +9,14 @@ "many": "quer mesclar %[1]d commits de %[2]s em %[3]s", "other": "" }, - "search.milestone_kind": "Pesquisar marcos...", + "search.milestone_kind": "Pesquisar marcos…", "home.welcome.no_activity": "Sem atividade", "home.welcome.activity_hint": "Ainda não tem nada no seu feed. Suas ações e atividade dos seus repositórios vigiados aparecerão aqui.", "home.explore_repos": "Explorar repositórios", "home.explore_users": "Explorar usuários", "home.explore_orgs": "Explorar organizações", - "incorrect_root_url": "Esta instância do Forgejo está configurada para o endereço \"%s\". Você está atualmente vendo o Forgejo através de uma URL diferente, o que pode causar erros em algumas partes da aplicação. A URL oficial é controlada pela administração do Forgejo através da configuração ROOT_URL no arquivo app.ini." + "incorrect_root_url": "Esta instância do Forgejo está configurada para o endereço \"%s\". Você está atualmente vendo o Forgejo através de uma URL diferente, o que pode causar erros em algumas partes da aplicação. A URL oficial é controlada pela administração do Forgejo através da configuração ROOT_URL no arquivo app.ini.", + "themes.names.forgejo-auto": "Forgejo (usar o tema do sistema)", + "themes.names.forgejo-light": "Forgejo claro", + "themes.names.forgejo-dark": "Forgejo escuro" } From 50104993d27999c64518656a17572d68538b64ce Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 13 Apr 2025 13:38:42 +0500 Subject: [PATCH 133/568] [v11.0/forgejo] i18n: update of translations from Codeberg Translate Translation updates that are applicable to v11 strings were picked from this commit: 275d8250ea4588fe1b3b4a3d00d9a9b753a59075 Changes to strings that are only present in the v12 branch were not picked. Below is a list of co-authors of the ported commit. It may contain co-authors who's changes were not picked due to being v12-only. Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Adolfo Jayme Barrientos Co-authored-by: Atalanttore Co-authored-by: Benedikt Straub Co-authored-by: Codeberg Translate Co-authored-by: Dirk Co-authored-by: Edgarsons Co-authored-by: EkaterinePapava Co-authored-by: Fjuro Co-authored-by: GewoonLeon Co-authored-by: Gusted Co-authored-by: Juno Takano Co-authored-by: Kita Ikuyo Co-authored-by: Miguel P.L Co-authored-by: Outbreak2096 Co-authored-by: SomeTr Co-authored-by: Zughy Co-authored-by: darkswordreams Co-authored-by: earl-warren Co-authored-by: justbispo Co-authored-by: kwoot Co-authored-by: tacaly Co-authored-by: xtex Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/cs/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/de/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/es/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/fil/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/it/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/nds/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/nl/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/pt_BR/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/pt_PT/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/ru/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/uk/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/cs/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/de/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/el/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/es/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fil/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fr/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/hi/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/it/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/ja/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/ka/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/nds/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/nl/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/pt_BR/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/pt_PT/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/ru/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/tr/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/uk/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/zh_Hant/ Translation: Forgejo/forgejo Translation: Forgejo/forgejo-next --- options/locale/locale_cs-CZ.ini | 4 +- options/locale/locale_da.ini | 593 +++++++++++++++++- options/locale/locale_de-DE.ini | 4 +- options/locale/locale_el-GR.ini | 4 +- options/locale/locale_es-ES.ini | 76 ++- options/locale/locale_fr-FR.ini | 13 +- options/locale/locale_hi.ini | 20 +- options/locale/locale_it-IT.ini | 2 +- options/locale/locale_ja-JP.ini | 4 +- options/locale/locale_ka.ini | 836 ++++++++++++++++++++++++++ options/locale/locale_lv-LV.ini | 6 +- options/locale/locale_nds.ini | 2 +- options/locale/locale_nl-NL.ini | 6 +- options/locale/locale_pt-BR.ini | 4 +- options/locale/locale_ru-RU.ini | 2 +- options/locale/locale_tr-TR.ini | 4 +- options/locale/locale_uk-UA.ini | 47 +- options/locale/locale_zh-CN.ini | 18 +- options/locale/locale_zh-TW.ini | 4 +- options/locale_next/locale_da.json | 5 +- options/locale_next/locale_es-ES.json | 6 +- options/locale_next/locale_it-IT.json | 8 +- options/locale_next/locale_nds.json | 5 +- options/locale_next/locale_nl-NL.json | 17 +- options/locale_next/locale_uk-UA.json | 5 +- options/locale_next/locale_zh-CN.json | 4 +- 26 files changed, 1616 insertions(+), 83 deletions(-) create mode 100644 options/locale/locale_ka.ini diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index ae878acc15..382e31c431 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1652,7 +1652,7 @@ issues.comment_manually_pull_merged_at=ručně sloučena revize %[1]s do %[2]s % issues.close_comment_issue=Zavřít s komentářem issues.reopen_issue=Znovu otevřít issues.reopen_comment_issue=Znovu otevřít s komentářem -issues.create_comment=Okomentovat +issues.create_comment=Komentovat issues.closed_at=`uzavřel/a tento problém %[2]s` issues.reopened_at=`znovu otevřel/a tento problém %[2]s` issues.commit_ref_at=`odkázal/a na tento problém z revize %[2]s` @@ -2607,7 +2607,7 @@ diff.comment.reply=Odpovědět diff.review=Dokončit posouzení diff.review.header=Odeslat posouzení diff.review.placeholder=Posoudit komentář -diff.review.comment=Okomentovat +diff.review.comment=Komentovat diff.review.approve=Schválit diff.review.self_reject=Autoři požadavků na natažení nemohou požadovat změny na svém vlastním požadavku na natažení diff.review.reject=Požadovat změny diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index ce54704270..5d8e6d8791 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -1448,7 +1448,7 @@ issues.filter_sort.leastcomment = Mindst kommenteret issues.filter_sort.nearduedate = Nærmeste forfaldsdato issues.filter_sort.farduedate = Længste forfaldsdato issues.filter_sort.moststars = Flest stjerner -editor.file_changed_while_editing = Filens indhold er ændret, siden du begyndte at redigere. Klik her for at se dem eller Bekræft ændringer igen for at overskrive dem. +editor.file_changed_while_editing = Filens indhold er ændret, siden du begyndte at åbne den. Klik her for at se dem eller Bekræft ændringer igen for at overskrive dem. editor.file_already_exists = En fil med navnet "%s" findes allerede i dette depot. editor.commit_id_not_matching = Filen blev ændret, mens du redigerede den. Forpligt dig til en ny gren og merge derefter. editor.push_out_of_date = Pushet ser ud til at være forældet. @@ -2735,9 +2735,42 @@ mark_all_as_read = Markér alle som læste subscriptions = Abonnementer no_subscriptions = Ingen abonnementer +pin = Fastgør notifikation + [action] watched_repo = begyndte at overvåge %[2]s +create_repo = oprettede depot %s +rename_repo = omdøbt depot fra %[1]s til %[3]s +commit_repo = pushed til %[3]s at %[4]s +create_issue = `åbnet problem %[3]s#%[2]s` +close_issue = `lukket problem %[3]s#%[2]s` +reopen_issue = `genåbnet problem %[3]s#%[2]s` +create_pull_request = `oprettet pull-anmodning %[3]s#%[2]s` +close_pull_request = `lukket pull request %[3]s#%[2]s` +reopen_pull_request = `genåbnet pull request %[3]s#%[2]s` +comment_issue = `kommenterede problem %[3]s#%[2]s` +comment_pull = `kommenterede pull request %[3]s#%[2]s` +merge_pull_request = `sammenflettet pull request %[3]s#%[2]s` +auto_merge_pull_request = `automatisk flettet pull-anmodning %[3]s#%[2]s` +transfer_repo = overførte lager %s til %s +push_tag = skubbet tag %[3]s til %[4]s +delete_tag = slettede tag %[2]s fra %[3]s +delete_branch = slettede gren %[2]s fra %[3]s +compare_branch = Sammenlign +compare_commits = Sammenlign %d commits +compare_commits_general = Sammenlign commits +mirror_sync_push = synkroniserede commits til %[3]s ved %[4]s fra spejl +mirror_sync_create = synkroniseret ny reference %[3]s til %[4]s fra spejl +mirror_sync_delete = synkroniseret og slettet reference %[2]s ved %[3]s fra spejl +approve_pull_request = `godkendt %[3]s#%[2]s` +reject_pull_request = `foreslået ændringer for %[3]s#%[2]s` +publish_release = `udgivet %[4]s på %[3]s` +review_dismissed = `afvist anmeldelse fra %[4]s for %[3]s#%[2]s` +review_dismissed_reason = Årsag: +create_branch = oprettede gren %[3]s i %[4]s +starred_repo = stjernemarkerede %[2]s + [org] repo_updated = Opdateret %s lower_members = medlemmer @@ -2895,7 +2928,7 @@ auths.oauth2_icon_url = Icon URL users.edit = Redigere users.auth_source = Godkendelseskilde -dashboard = Dashboard +dashboard = Instrumentpanel self_check = Selvtjek identity_access = Identitet og adgang users = Brugerkonti @@ -3097,6 +3130,281 @@ monitor.queue.settings.remove_all_items = Slet alle monitor.queue.settings.remove_all_items_done = Alle varer i køen er blevet fjernet. notices.system_notice_list = Systemmeddelelser +packages.cleanup = Ryd op i udløbne data +packages.cleanup.success = Der er ryddet op i udløbne data +packages.creator = Skaber +defaulthooks = Default webhooks +defaulthooks.desc = Webhooks foretager automatisk HTTP POST-anmodninger til en server, når visse Forgejo-hændelser udløses. Webhooks defineret her er standarder og vil blive kopieret til alle nye repositories. Læs mere i webhooks-guiden. +defaulthooks.add_webhook = Tilføj standard webhook +defaulthooks.update_webhook = Opdater standardwebhook +systemhooks = System webhooks +systemhooks.desc = Webhooks foretager automatisk HTTP POST-anmodninger til en server, når visse Forgejo-hændelser udløses. Webhooks, der er defineret her, vil virke på alle repositories på systemet, så overvej venligst eventuelle præstationsimplikationer, dette kan have. Læs mere i webhooks-guiden. +systemhooks.add_webhook = Tilføj System Webhook +systemhooks.update_webhook = Opdater System Webhook +auths.auth_manage_panel = Administrer godkendelseskilder +auths.new = Tilføj godkendelseskilde +auths.auth_type = Godkendelsestype +auths.auth_name = Godkendelsesnavn +auths.bind_dn = Bind DN +auths.bind_password = Bind adgangskode +auths.user_base = Bruger søgebase +auths.user_dn = Bruger DN +auths.attribute_username = Brugernavn attribut +auths.attribute_username_placeholder = Lad stå tomt for at bruge brugernavnet indtastet i Forgejo. +auths.attribute_name = Fornavn attribut +auths.attribute_surname = Efternavn attribut +auths.attribute_mail = E-mail attribut +auths.attribute_ssh_public_key = Offentlig SSH-nøgleattribut +auths.attribute_avatar = Avatar attribut +auths.attributes_in_bind = Hent attributter i bind DN-kontekst +auths.default_domain_name = Standard domænenavn, der bruges til e-mailadressen +auths.allow_deactivate_all = Tillad et tomt søgeresultat for at deaktivere alle brugere +auths.use_paged_search = Brug sidesøgning +auths.search_page_size = Sidestørrelse +auths.filter = Bruger filter +auths.admin_filter = Admin filter +auths.restricted_filter = Begrænset filter +auths.restricted_filter_helper = Lad være tom for ikke at angive nogen brugere som begrænset. Brug en stjerne ("*") for at indstille alle brugere, der ikke matcher Admin-filteret, som begrænset. +auths.verify_group_membership = Bekræft gruppemedlemskab i LDAP (lad filteret stå tomt for at springe over) +auths.group_search_base = Gruppesøgningsbase DN +auths.group_attribute_list_users = Gruppeattribut, der indeholder en liste over brugere +auths.user_attribute_in_group = Brugerattribut angivet i gruppen +auths.map_group_to_team = Tilknyt LDAP-grupper til organisationsteams (lad feltet stå tomt for at springe over) +auths.map_group_to_team_removal = Fjern brugere fra synkroniserede teams, hvis brugeren ikke tilhører den tilsvarende LDAP-gruppe +auths.enable_ldap_groups = Aktiver LDAP-grupper +auths.ms_ad_sa = MS AD søgeattributter +auths.smtp_auth = SMTP-godkendelsestype +auths.smtphost = SMTP vært +auths.smtpport = SMTP port +auths.allowed_domains = Tilladte domæner +auths.allowed_domains_helper = Lad være tomt for at tillade alle domæner. Adskil flere domæner med et komma (","). +auths.skip_tls_verify = Spring over TLS-bekræftelse +auths.force_smtps = Tving SMTPS +auths.force_smtps_helper = SMTPS bruges altid på port 465. Indstil denne til at tvinge SMTPS på andre porte. (Ellers vil STARTTLS blive brugt på andre porte, hvis det understøttes af værten.) +auths.helo_hostname = HELO værtsnavn +auths.helo_hostname_helper = Værtsnavn sendt med HELO. Lad stå tomt for at sende det nuværende værtsnavn. +auths.disable_helo = Deaktiver HELO +auths.pam_service_name = PAM-tjenestenavn +auths.pam_email_domain = PAM e-mail domæne (valgfrit) +auths.oauth2_provider = OAuth2-udbyder +auths.oauth2_clientID = Klient-id (nøgle) +auths.oauth2_clientSecret = Klientens hemmelighed +auths.openIdConnectAutoDiscoveryURL = OpenID Connect Auto Discovery URL +auths.oauth2_use_custom_url = Brug tilpassede webadresser i stedet for standardwebadresser +auths.oauth2_tokenURL = Token URL +auths.oauth2_authURL = Godkend URL +auths.oauth2_profileURL = Profil-URL +auths.oauth2_emailURL = E-mail URL +auths.skip_local_two_fa = Spring over lokal 2FA +auths.skip_local_two_fa_helper = Hvis du ikke er indstillet, betyder det, at lokale brugere med 2FA indstillet stadig skal bestå 2FA for at logge på +auths.oauth2_tenant = Lejer +auths.oauth2_scopes = Yderligere omfang +auths.oauth2_required_claim_name = Påkrævet kravnavn +auths.oauth2_required_claim_name_helper = Indstil dette navn for at begrænse login fra denne kilde til brugere med et krav med dette navn +auths.oauth2_required_claim_value = Påkrævet kravværdi +auths.oauth2_required_claim_value_helper = Indstil denne værdi for at begrænse login fra denne kilde til brugere med et krav med dette navn og denne værdi +auths.oauth2_group_claim_name = Gør krav på navn med gruppenavne for denne kilde. (Valgfri) +auths.oauth2_admin_group = Gruppekravværdi for administratorbrugere. (Valgfrit – kræver kravnavn ovenfor) +auths.oauth2_restricted_group = Gruppekravsværdi for begrænsede brugere. (Valgfrit – kræver kravnavn ovenfor) +auths.oauth2_map_group_to_team = Kortlæg hævdede grupper til organisationsteams. (Valgfrit – kræver kravnavn ovenfor) +auths.oauth2_map_group_to_team_removal = Fjern brugere fra synkroniserede teams, hvis brugeren ikke tilhører den tilsvarende gruppe. +auths.tips = Tips +auths.tips.gmail_settings = Gmail-indstillinger: +auths.tips.oauth2.general = OAuth2-godkendelse +auths.tips.oauth2.general.tip = Når du registrerer en ny OAuth2-godkendelse, skal URL-adressen til tilbagekald/omdirigering være: +auths.tip.oauth2_provider = OAuth2-udbyder +auths.tip.bitbucket = Registrer en ny OAuth-bruger på %s og tilføj tilladelsen "Konto" - "Læs" +auths.tip.nextcloud = Registrer en ny OAuth-bruger på din instans ved hjælp af følgende menu "Indstillinger -> Sikkerhed -> OAuth 2.0-klient" +auths.tip.dropbox = Opret en ny applikation på %s +auths.tip.facebook = Registrer en ny applikation på %s og tilføj produktet "Facebook Login" +auths.tip.github = Registrer en ny OAuth-applikation på %s +auths.tip.gitlab_new = Registrer en ny applikation på %s +auths.tip.google_plus = Hent OAuth2-klientlegitimationsoplysninger fra Google API-konsollen på %s +auths.tip.openid_connect = Brug OpenID Connect Discovery URL (/.well-known/openid-configuration) til at angive slutpunkterne +auths.tip.twitter = Gå til %s, opret en applikation og sørg for, at "Tillad, at denne applikation bruges til at logge på med Twitter" er aktiveret +auths.tip.discord = Registrer en ny applikation på %s +auths.tip.gitea = Registrer en ny OAuth2-applikation. Guide kan findes på %s +auths.tip.yandex = Opret en ny applikation på %s. Vælg følgende tilladelser fra afsnittet "Yandex.Passport API": "Adgang til e-mailadresse", "Adgang til brugeravatar" og "Adgang til brugernavn, fornavn og efternavn, køn" +auths.tip.mastodon = Indtast en brugerdefineret instans-URL for den mastodon-instans, du vil godkende med (eller brug standarden) +auths.edit = Rediger godkendelseskilden +auths.activated = Denne godkendelseskilde er aktiveret +auths.new_success = Godkendelsen "%s" er blevet tilføjet. +auths.update_success = Godkendelseskilden er blevet opdateret. +auths.update = Opdater godkendelseskilden +auths.delete = Slet godkendelseskilden +auths.delete_auth_title = Slet godkendelseskilden +auths.delete_auth_desc = Sletning af en godkendelseskilde forhindrer brugere i at bruge den til at logge ind. Vil du fortsætte? +auths.still_in_used = Godkendelseskilden er stadig i brug. Konverter eller slet alle brugere, der bruger denne godkendelseskilde først. +auths.deletion_success = Godkendelseskilden er blevet slettet. +auths.login_source_exist = Godkendelseskilden "%s" findes allerede. +auths.login_source_of_type_exist = Der findes allerede en godkendelseskilde af denne type. +auths.unable_to_initialize_openid = Kan ikke initialisere OpenID Connect Provider: %s +auths.invalid_openIdConnectAutoDiscoveryURL = Ugyldig Auto Discovery URL (dette skal være en gyldig URL, der starter med http:// eller https://) +config.server_config = Server konfiguration +config.app_name = Instans titel +config.app_slogan = instans slogan +config.app_ver = Forgejo version +config.app_url = Base URL +config.custom_conf = Konfigurationsfilstien +config.custom_file_root_path = Brugerdefineret fil rodsti +config.domain = Server domæne +config.offline_mode = Lokal tilstand +config.disable_router_log = Deaktiver routerlog +config.run_user = Bruger at køre som +config.run_mode = Kør tilstand +config.git_version = Git version +config.app_data_path = Appens datasti +config.repo_root_path = Depotets rodsti +config.lfs_root_path = LFS rodsti +config.log_file_root_path = Logsti +config.script_type = Script type +config.reverse_auth_user = Omvendt proxy-godkendelsesbruger +config.ssh_config = SSH konfiguration +config.ssh_start_builtin_server = Brug indbygget server +config.ssh_domain = SSH server domæne +config.ssh_port = Port +config.ssh_listen_port = Lyt port +config.ssh_root_path = Rodsti +config.ssh_key_test_path = Nøgleteststi +config.ssh_keygen_path = Keygen ("ssh-keygen") sti +config.ssh_minimum_key_size_check = Minimum nøglestørrelse kontrol +config.ssh_minimum_key_sizes = Minimum nøglestørrelser +config.lfs_config = LFS-konfiguration +config.lfs_content_path = LFS indholdssti +config.lfs_http_auth_expiry = LFS HTTP-godkendelsesudløbstid +config.db_config = Database konfiguration +config.db_type = Type +config.db_host = Vært +config.db_schema = Skematisk +config.db_ssl_mode = SSL +config.db_path = Sti +config.service_config = Tjenestekonfiguration +config.register_email_confirm = Kræv e-mail-bekræftelse for at tilmelde dig +config.disable_register = Deaktiver selvregistrering +config.allow_only_internal_registration = Tillad kun registrering gennem Forgejo selv +config.allow_only_external_registration = Tillad kun registrering via eksterne tjenester +config.enable_openid_signup = Aktiver OpenID-selvregistrering +config.enable_openid_signin = Aktiver OpenID-logon +config.show_registration_button = Vis registreringsknap +config.require_sign_in_view = Kræv at logge ind for at se indhold +config.mail_notify = Aktiver e-mailmeddelelser +config.enable_captcha = Aktiver CAPTCHA +config.active_code_lives = Aktiveringskodens udløbstid +config.reset_password_code_lives = Gendannelseskodens udløbstid +config.default_keep_email_private = Skjul e-mailadresser som standard +config.default_allow_create_organization = Tillad oprettelse af organisationer som standard +config.no_reply_address = Skjult e-mail-domæne +config.default_visibility_organization = Standardsynlighed for nye organisationer +config.default_enable_dependencies = Aktiver problemafhængigheder som standard +config.webhook_config = Webhook-konfiguration +config.queue_length = Kø længde +config.deliver_timeout = Lever timeout +config.skip_tls_verify = Spring over TLS-bekræftelse +config.mailer_config = Mailer konfiguration +config.mailer_enable_helo = Aktiver HELO +config.mailer_protocol = Protokol +config.mailer_smtp_addr = SMTP vært +config.mailer_smtp_port = SMTP-port +config.mailer_user = Bruger +config.mailer_use_sendmail = Brug Sendmail +config.mailer_sendmail_path = Sendmail sti +config.mailer_sendmail_args = Ekstra argumenter til Sendmail +config.mailer_sendmail_timeout = Sendmail timeout +config.mailer_use_dummy = Attrapp +config.test_email_placeholder = E-mail (f.eks. test@example.com) +config.send_test_mail = Send test-e-mail +config.send_test_mail_submit = Send +config.test_mail_failed = Kunne ikke sende en test-e-mail til "%s": %v +config.test_mail_sent = En test-e-mail er blevet sendt til "%s". +config.oauth_config = OAuth-konfiguration +config.cache_config = Cache konfiguration +config.cache_adapter = Cache adapter +config.cache_interval = Cache interval +config.cache_conn = Cacheforbindelse +config.cache_item_ttl = Cache element TTL +config.cache_test = Test cache +config.cache_test_failed = Kunne ikke undersøge cachen: %v. +config.cache_test_slow = Cachetest lykkedes, men svaret er langsomt: %s. +config.cache_test_succeeded = Cachetest gennemført, fik et svar i %s. +config.session_config = Sessionskonfiguration +config.session_provider = Session udbyder +config.provider_config = Udbyder konfig +config.cookie_name = Cookie navn +config.gc_interval_time = GC interval tid +config.session_life_time = Session levetid +config.https_only = Kun HTTPS +config.cookie_life_time = Cookie levetid +config.picture_config = Billede og avatar konfiguration +config.picture_service = Billedservice +config.disable_gravatar = Deaktiver Gravatar +config.enable_federated_avatar = Aktiver fødererede avatarer +config.open_with_editor_app_help = "Åbn med"-editorerne til klonmenuen. Hvis den efterlades tom, vil standarden blive brugt. Udvid for at se standarden. +config.git_config = Git konfiguration +config.git_disable_diff_highlight = Deaktiver diff-syntaksfremhævning +config.git_max_diff_lines = Max diff-linjer pr. fil +config.git_max_diff_line_characters = Maks. diff-tegn pr. linje +config.git_max_diff_files = Max diff filer vist +config.git_gc_args = GC argumenter +config.git_migrate_timeout = Migration timeout +config.git_mirror_timeout = Spejlopdateringstimeout +config.git_clone_timeout = Klone Operation timeout +config.git_pull_timeout = Pull Operation timeout +config.git_gc_timeout = GC Operation timeout +config.log_config = Log konfiguration +config.logger_name_fmt = Logger: %s +config.disabled_logger = Deaktiveret +config.access_log_mode = Adgang til logtilstand +config.access_log_template = Skabelon til adgangslog +config.xorm_log_sql = Log SQL +config.set_setting_failed = Indstilling af %s mislykkedes +monitor.stats = Statistik +monitor.cron = Cron opgaver +monitor.schedule = Tidsplan +monitor.next = Næste gang +monitor.previous = Tidligere tid +monitor.execute_times = Udførelser +monitor.process = Kørende processer +monitor.stacktrace = Stakspor +monitor.processes_count = %d Processer +monitor.download_diagnosis_report = Hent diagnoserapport +monitor.duration = Varighed (r) +monitor.start = Starttid +monitor.execute_time = Udførelsestid +monitor.last_execution_result = Resultat +monitor.process.cancel = Annuller processen +monitor.process.cancel_desc = Annullering af en proces kan medføre tab af data +monitor.process.cancel_notices = Annuller: %s? +monitor.process.children = Børn +monitor.queues = Køer +monitor.queue = Kø: %s +monitor.queue.type = Type +monitor.queue.exemplar = Eksempler type +monitor.queue.numberworkers = Antal arbejdere +monitor.queue.activeworkers = Aktive arbejdere +monitor.queue.maxnumberworkers = Max antal arbejdere +monitor.queue.numberinqueue = Nummer i kø +monitor.queue.review_add = Gennemgå / tilføj arbejdere +monitor.queue.settings.title = Pool indstillinger +monitor.queue.settings.desc = Puljer vokser dynamisk som reaktion på deres blokering af arbejderkø. +monitor.queue.settings.maxnumberworkers = Max antal arbejdere +monitor.queue.settings.maxnumberworkers.error = Max antal arbejdere skal være et tal +notices.view_detail_header = Bemærk detaljer +notices.operations = Operationer +notices.select_all = Vælg alle +notices.deselect_all = Fravælg alle +notices.inverse_selection = Omvendt valg +notices.delete_selected = Slet valgte +notices.delete_all = Slet alle meddelelser +notices.type = Type +notices.type_2 = Opgave +notices.op = Op. +notices.delete_success = Systemmeddelelserne er blevet slettet. +self_check.no_problem_found = Intet problem fundet endnu. +self_check.database_collation_mismatch = Forvent, at databasen bruger sortering: %s +self_check.database_collation_case_insensitive = Databasen bruger en sortering %s, som er en ufølsom sortering. Selvom Forgejo kunne arbejde med det, kan der være nogle sjældne tilfælde, som ikke fungerer som forventet. +self_check.database_inconsistent_collation_columns = Databasen bruger sortering %s, men disse kolonner bruger uoverensstemmende sorteringer. Det kan forårsage nogle uventede problemer. +self_check.database_fix_mysql = For MySQL/MariaDB-brugere kan du bruge kommandoen "forgejo doctor convert" til at løse sorteringsproblemerne, eller du kan også løse problemet ved at "ALTER ... COLLATE ..." SQLs manuelt. + [packages] arch.version.description = Beskrivelse container.labels = Etiketter @@ -3149,6 +3457,135 @@ alpine.registry.key = Download den offentlige RSA-nøgle til registreringsdataba alpine.registry.info = Vælg $branch og $repository fra listen nedenfor. alpine.repository.repositories = Depoter +title = Pakker +desc = Administrer depotpakker. +empty = Der er ingen pakker endnu. +empty.documentation = For mere information om pakkeregistret, se dokumentationen. +empty.repo = Har du uploadet en pakke, men den vises ikke her? Gå til pakkeindstillinger og link den til denne repo. +registry.documentation = For mere information om %s registreringsdatabasen, se dokumentationen. +filter.type = Type +filter.type.all = Alle +filter.no_result = Dit filter gav ingen resultater. +filter.container.tagged = Tagget +filter.container.untagged = Umærket +published_by = Udgivet %[1]s af %[3]s +published_by_in = Udgivet %[1]s af %[3]s i %[5]s +installation = Installation +about = Om denne pakke +requirements = Krav +dependencies = Afhængigheder +keywords = Keywords +details = Detaljer +details.author = Forfatter +details.project_site = Projektets hjemmeside +details.repository_site = Depots hjemmeside +details.documentation_site = Dokumentations hjemmeside +details.license = Licens +assets = Aktiver +versions = Versioner +versions.view_all = Se alle +dependency.id = ID +alpine.repository.branches = Grene +arch.pacman.helper.gpg = Tilføj tillidscertifikat til pacman: +arch.pacman.repo.multi = %s har den samme version i forskellige distributioner. +arch.pacman.repo.multi.item = Konfiguration for %s +arch.pacman.conf = Tilføj server med relateret distribution og arkitektur til /etc/pacman.conf: +arch.pacman.sync = Synkroniser pakke med pacman: +arch.version.properties = Versionsegenskaber +arch.version.provides = Forsyner +arch.version.groups = Gruppe +arch.version.depends = Afhænger +arch.version.optdepends = Valgfri afhænger +arch.version.makedepends = Gør afhænger +arch.version.checkdepends = Check afhænger +arch.version.conflicts = Konflikter +arch.version.replaces = Erstatter +arch.version.backup = Backup +cargo.registry = Konfigurer dette register i Cargo-konfigurationsfilen (for eksempel ~/.cargo/config.toml): +cargo.install = For at installere pakken ved hjælp af Cargo skal du køre følgende kommando: +chef.registry = Konfigurer dette register i din ~/.chef/config.rb fil: +composer.registry = Konfigurer dette register i din ~/.composer/config.json fil: +composer.install = For at installere pakken ved hjælp af Composer skal du køre følgende kommando: +composer.dependencies = Afhængigheder +conan.install = For at installere pakken ved hjælp af Conan skal du køre følgende kommando: +conda.registry = Konfigurer dette register som et Conda-depot i din .condarc-fil: +conda.install = For at installere pakken ved hjælp af Conda skal du køre følgende kommando: +container.images.title = Billeder +container.details.type = Billedtype +container.details.platform = Platform +container.pull = Træk billedet fra kommandolinjen: +container.digest = Fordøje +container.multi_arch = OS / Arch +container.layers = Billedlag +container.labels.key = Nøgle +container.labels.value = Værdi +cran.registry = Konfigurer dette register i din Rprofile.site fil: +debian.registry.info = Vælg $distribution og $component fra listen nedenfor. +generic.download = Download pakken fra kommandolinjen: +go.install = Installer pakken fra kommandolinjen: +maven.registry = Konfigurer denne registreringsdatabasen i din projekt pom.xml fil: +maven.install = For at bruge pakken skal du inkludere følgende i blokken afhængigheder i filen pom.xml: +maven.install2 = Kør via kommandolinje: +maven.download = For at downloade afhængigheden skal du køre via kommandolinjen: +nuget.install = For at installere pakken ved hjælp af NuGet skal du køre følgende kommando: +nuget.dependency.framework = Mål Framework +npm.registry = Konfigurer denne registreringsdatabase i din projekt-.npmrc-fil: +npm.install = For at installere pakken ved hjælp af npm skal du køre følgende kommando: +npm.install2 = eller føj det til filen package.json: +npm.dependencies = Afhængigheder +rpm.distros.redhat = på RedHat-baserede distributioner +rpm.distros.suse = på SUSE-baserede distributioner +alt.install = Installer pakken +alt.setup = Tilføj et depot til listen over tilsluttede arkiver (vælg den nødvendige arkitektur i stedet for "_arch_"): +rubygems.required.ruby = Kræver Ruby version +rubygems.required.rubygems = Kræver RubyGem version +swift.install = Tilføj pakken i din Package.swift-fil: +swift.install2 = og kør følgende kommando: +vagrant.install = For at tilføje en Vagrant-boks skal du køre følgende kommando: +settings.link = Link denne pakke til et depot +settings.link.description = Hvis du forbinder en pakke med et depot, vises pakken i depotets pakkeliste. +settings.link.select = Vælg Depot +settings.link.button = Opdater Depot Link +settings.link.success = Depotlinket blev opdateret. +settings.link.error = Kunne ikke opdatere depotlinket. +settings.delete = Slet pakke +settings.delete.description = Sletning af en pakke er permanent og kan ikke fortrydes. +settings.delete.notice = Du er ved at slette %s (%s). Denne operation er uigenkaldeligt, er du sikker? +settings.delete.success = Pakken er blevet slettet. +settings.delete.error = Kunne ikke slette pakken. +owner.settings.cargo.title = Lastregisterindeks +owner.settings.cargo.initialize = Initialiser indeks +owner.settings.cargo.initialize.description = Et særligt indeks Git-depot er nødvendigt for at bruge Cargo-registret. Brug af denne mulighed vil (gen-)oprette depotet og konfigurere det automatisk. +owner.settings.cargo.initialize.error = Kunne ikke initialisere Cargo index: %v +owner.settings.cargo.initialize.success = Cargo-indekset blev oprettet. +owner.settings.cargo.rebuild = Genopbyg indeks +owner.settings.cargo.rebuild.description = Genopbygning kan være nyttig, hvis indekset ikke er synkroniseret med de lagrede Cargo-pakker. +owner.settings.cargo.rebuild.error = Kunne ikke genopbygge Cargo-indeks: %v +owner.settings.cargo.rebuild.success = Cargo-indekset blev genopbygget med succes. +owner.settings.cargo.rebuild.no_index = Kan ikke genopbygge, intet indeks er initialiseret. +owner.settings.cleanuprules.title = Oprydningsregler +owner.settings.cleanuprules.add = Tilføj oprydningsregel +owner.settings.cleanuprules.edit = Rediger oprydningsregel +owner.settings.cleanuprules.none = Der er endnu ingen oprydningsregler. +owner.settings.cleanuprules.preview = Forhåndsvisning af oprydningsregel +owner.settings.cleanuprules.preview.overview = %d pakker er planlagt til at blive fjernet. +owner.settings.cleanuprules.preview.none = Oprydningsreglen matcher ikke nogen pakker. +owner.settings.cleanuprules.pattern_full_match = Anvend mønster på det fulde pakkenavn +owner.settings.cleanuprules.keep.title = Versioner, der matcher disse regler, bevares, selvom de matcher en fjernelsesregel nedenfor. +owner.settings.cleanuprules.keep.count = Behold den nyeste +owner.settings.cleanuprules.keep.count.1 = 1 version pr. pakke +owner.settings.cleanuprules.keep.count.n = %d versioner pr. pakke +owner.settings.cleanuprules.keep.pattern = Hold versionerne matchende +owner.settings.cleanuprules.keep.pattern.container = Den seneste version bevares altid for containerpakker. +owner.settings.cleanuprules.remove.title = Versioner, der matcher disse regler, fjernes, medmindre en regel ovenfor siger, at de skal beholdes. +owner.settings.cleanuprules.remove.days = Fjern versioner ældre end +owner.settings.cleanuprules.remove.pattern = Fjern matchende versioner +owner.settings.cleanuprules.success.update = Oprydningsreglen er blevet opdateret. +owner.settings.cleanuprules.success.delete = Oprydningsregel er blevet slettet. +owner.settings.chef.title = Kokkeregister +owner.settings.chef.keypair = Generer nøglepar +owner.settings.chef.keypair.description = Et nøglepar er nødvendigt for at autentificere til Chef-registret. Hvis du har genereret et nøglepar før, vil generering af et nyt nøglepar kassere det gamle nøglepar. + [actions] runners.description = Beskrivelse runners.labels = Etiketter @@ -3159,6 +3596,95 @@ runners.status.active = Aktiv runners.status.offline = Offline runners.version = Version +actions = Handlinger +unit.desc = Administrer integrerede CI/CD-pipelines med Forgejo Actions. +status.unknown = Ukendt +status.waiting = Venter +status.running = Kører +status.success = Succes +status.failure = Fiasko +status.cancelled = Annulleret +status.skipped = Oversprunget +status.blocked = Blokeret +runners = Runners +runners.runner_manage_panel = Administrer runners +runners.new = Opret ny runner +runners.new_notice = Hvordan man starter en runner +runners.status = Status +runners.id = ID +runners.owner_type = Type +runners.last_online = Sidste online tid +runners.runner_title = Runner +runners.task_list = Seneste opgaver på denne løber +runners.task_list.no_tasks = Der er ingen opgave endnu. +runners.task_list.run = Kør +runners.task_list.status = Status +runners.task_list.commit = Commit +runners.task_list.done_at = Udført kl +runners.edit_runner = Rediger Runner +runners.update_runner = Opdater ændringer +runners.update_runner_success = Runner blev opdateret +runners.update_runner_failed = Løberen kunne ikke opdateres +runners.delete_runner = Slet denne runner +runners.delete_runner_success = Runner blev slettet +runners.delete_runner_failed = Runner kunne ikke slettes +runners.delete_runner_header = Bekræft for at slette denne runner +runners.delete_runner_notice = Hvis en opgave kører på denne runner, vil den blive afsluttet og markeret som mislykket. Det kan bryde bygningens arbejdsgang. +runners.none = Ingen runners tilgængelige +runners.status.unspecified = Ukendt +runners.status.idle = Tomgang +runners.reset_registration_token = Nulstil registreringstoken +runners.reset_registration_token_success = Runner registreringstoken blev nulstillet +runs.all_workflows = Alle arbejdsgange +runs.commit = Commit +runs.scheduled = Planlagt +runs.pushed_by = pushed af +runs.workflow = Arbejdsgang +runs.invalid_workflow_helper = Workflow-konfigurationsfilen er ugyldig. Tjek venligst din konfigurationsfil: %s +runs.no_matching_online_runner_helper = Ingen matchende online-runner med etiket: %s +runs.no_job_without_needs = Arbejdsgangen skal indeholde mindst ét job uden afhængigheder. +runs.no_job = Arbejdsgangen skal indeholde mindst ét job +runs.actor = Aktør +runs.status = Status +runs.actors_no_select = Alle aktører +runs.status_no_select = Alle status +runs.no_results = Ingen resultater matchede. +runs.no_workflows = Der er endnu ingen arbejdsgange. +runs.no_workflows.help_write_access = Ved du ikke, hvordan du starter med Forgejo Actions? Tjek hurtigstarten i brugerdokumentationen for at skrive dit første workflow, og opsæt en Forgejo-løber til at udføre dine opgaver. +runs.no_workflows.help_no_write_access = For at lære om Forgejo Actions, se dokumentationen. +runs.no_runs = Workflowet har ingen kørsler endnu. +runs.empty_commit_message = (tom commit besked) +runs.expire_log_message = Logfiler er blevet renset, fordi de var for gamle. +workflow.disable = Deaktiver arbejdsgang +workflow.disable_success = Arbejdsgangen "%s" blev deaktiveret. +workflow.enable = Aktiver arbejdsgang +workflow.enable_success = Arbejdsgangen "%s" blev aktiveret. +workflow.disabled = Arbejdsgangen er deaktiveret. +workflow.dispatch.trigger_found = Denne arbejdsgang har en workflow_dispatch-hændelsestrigger. +workflow.dispatch.use_from = Brug arbejdsgangen fra +workflow.dispatch.run = Kør arbejdsgang +workflow.dispatch.success = Kørsel af arbejdsgang blev anmodet om. +workflow.dispatch.input_required = Kræv værdi for input "%s". +workflow.dispatch.invalid_input_type = Ugyldig inputtype "%s". +workflow.dispatch.warn_input_limit = Viser kun de første %d input. +need_approval_desc = Har brug for godkendelse for at køre arbejdsgange for fork pull-anmodning. +variables = Variabler +variables.management = Administrer variabler +variables.creation = Tilføj variabel +variables.none = Der er ingen variabler endnu. +variables.deletion = Fjern variabel +variables.deletion.description = Fjernelse af en variabel er permanent og kan ikke fortrydes. Vil du fortsætte? +variables.description = Variabler vil blive videregivet til visse handlinger og kan ikke læses på anden vis. +variables.id_not_exist = Variabel med ID %d findes ikke. +variables.edit = Rediger variabel +variables.not_found = Variablen kunne ikke findes. +variables.deletion.failed = Variablen kunne ikke fjernes. +variables.deletion.success = Variablen er blevet fjernet. +variables.creation.failed = Kunne ikke tilføje variabel. +variables.creation.success = Variablen "%s" er blevet tilføjet. +variables.update.failed = Variablen kunne ikke redigeres. +variables.update.success = Variablen er blevet redigeret. + [tool] 1d = 1 dag 1w = 1 uge @@ -3178,6 +3704,8 @@ years = %d år raw_seconds = sekunder raw_minutes = minutter +now = nu + [repo.permissions] code.read = Læs: Få adgang til og klon koden for depotet. code.write = Skriv: Skub til depotet, opret filialer og tags. @@ -3211,9 +3739,68 @@ recent_commits.what = nylige commits invalid_input_type = Filer af denne type må ikke uploades. remove_file = Fjern fil +default_message = Slip filer eller klik her for at uploade. +file_too_big = Filstørrelsen ({{filesize}} MB) overstiger den maksimale størrelse på ({{maxFilesize}} MB). + [gpg] default_key = Underskrevet med standardnøglen +error.extract_sign = Kunne ikke udtrække signatur +error.generate_hash = Kunne ikke generere hash af commit +error.no_committer_account = Ingen konto knyttet til committers e-mailadresse +error.no_gpg_keys_found = Ingen kendt nøgle fundet for denne signatur i databasen +error.not_signed_commit = Ikke en underskrevet commit +error.failed_retrieval_gpg_keys = Kunne ikke hente nogen nøgle knyttet til committerens konto +error.probable_bad_signature = ADVARSEL! Selvom der er en nøgle med dette ID i databasen, bekræfter den ikke denne commit! Denne commit er MISTÆNLIG. +error.probable_bad_default_signature = ADVARSEL! Selvom standardnøglen har dette ID, bekræfter den ikke denne commit! Denne commit er MISTÆNLIG. + [secrets] creation.name_placeholder = uafhængig af store og små bogstaver, alfanumeriske tegn eller understregninger, kan ikke starte med GITEA_ eller GITHUB_ -creation.value_placeholder = Indtast ethvert indhold. Mellemrum i starten og slutningen vil blive udeladt. \ No newline at end of file +creation.value_placeholder = Indtast ethvert indhold. Mellemrum i starten og slutningen vil blive udeladt. +secrets = Hemmeligheder +description = Hemmeligheder vil blive videregivet til visse handlinger og kan ikke læses på anden vis. +none = Der er ingen hemmeligheder endnu. +creation = Tilføj hemmelighed +creation.success = Hemmeligheden "%s" er blevet tilføjet. +creation.failed = Kunne ikke tilføje hemmelighed. +deletion = Fjern hemmelighed +deletion.description = Fjernelse af en hemmelighed er permanent og kan ikke fortrydes. Vil du fortsætte? +deletion.success = Hemmeligheden er blevet fjernet. +deletion.failed = Hemmeligheden kunne ikke fjernes. +management = Håndter hemmeligheder + +[munits.data] +b = B +kib = KiB +mib = MiB +gib = GiB +tib = TiB +pib = PiB +eib = EiB + +[units] +unit = Enhed +error.no_unit_allowed_repo = Du har ikke tilladelse til at få adgang til nogen sektion af dette depot. +error.unit_not_allowed = Du har ikke tilladelse til at få adgang til denne depotsektion. + +[projects] +deleted.display_name = Slettet projekt +type-1.display_name = Individuelt projekt +type-2.display_name = Depotprojekt +type-3.display_name = Organisationsprojekt + +[git.filemode] +changed_filemode = %[1]s → %[2]s +directory = Directory +normal_file = Normal fil +executable_file = Eksekverbar fil +symbolic_link = Symbolsk link +submodule = Submodule + +[markup] +filepreview.line = Linje %[1]d i %[2]s +filepreview.lines = Linjer %[1]d til %[2]d i %[3]s +filepreview.truncated = Forhåndsvisningen er blevet afkortet + +[translation_meta] +test = (OK) DA was translated by Tacaly \ No newline at end of file diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index f4eca32202..a5e24e3257 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -110,7 +110,7 @@ preview=Vorschau loading=Laden … error=Fehler -error404=Die Seite, die du versuchst aufzurufen, existiert nicht oder du bist nicht berechtigt, diese anzusehen. +error404=Die Seite, die du versuchst aufzurufen, existiert nicht, wurde entfernt oder du bist nicht berechtigt, diese anzusehen. go_back=Zurück never=Niemals @@ -1073,7 +1073,7 @@ quota.applies_to_user = Die folgenden Quota-Regeln greifen für deinen Account quota.sizes.assets.attachments.issues = Issue-Anhänge quota.rule.exceeded.helper = Die Gesamtgröße der Objekte für diese Regel hat die Quota überschritten. storage_overview = Speicherübersicht -quota = Quota +quota = Kontingent quota.sizes.assets.attachments.releases = Release-Anhänge quota.applies_to_org = Die folgenden Quota-Regeln greifen für diese Organisation quota.rule.exceeded = Überschritten diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index ead54967c0..c20a2f3172 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -2460,9 +2460,9 @@ settings.protect_branch_name_pattern=Μοτίβο προστατευμένου settings.protect_branch_name_pattern_desc=Μοτίβα ονόματος προστατευμένων κλάδων. Συμβολευτείτε την τεκμηρίωση για την σύνταξη ενός μοτίβου. Παραδείγματα: main, release/** settings.protect_patterns=Μοτίβα settings.protect_protected_file_patterns=Μοτίβα προστατευμένων αρχείων (διαχωρισμός με semicolon «;» και ΟΧΙ το ελληνικό ερωτηματικό): -settings.protect_protected_file_patterns_desc=Τα προστατευόμενα αρχεία δεν επιτρέπεται να αλλάξουν άμεσα, ακόμη και αν ο χρήστης έχει δικαιώματα να προσθέσει, να επεξεργαστεί ή να διαγράψει αρχεία σε αυτόν τον κλάδο. Επιπλέων μοτίβα μπορούν να διαχωριστούν με semicolon («;») (ΟΧΙ ερωτηματικό). Για να συντάξετε μοτίβα, συμβουλευτείται την τεκμηρίωση %s. Παράδειγμα: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Τα προστατευόμενα αρχεία δεν επιτρέπεται να αλλάξουν άμεσα, ακόμη και αν ο χρήστης έχει δικαιώματα να προσθέσει, να επεξεργαστεί ή να διαγράψει αρχεία σε αυτόν τον κλάδο. Επιπλέων μοτίβα μπορούν να διαχωριστούν με semicolon («;») (ΟΧΙ ερωτηματικό). Για να συντάξετε μοτίβα, συμβουλευτείται την τεκμηρίωση %[2]s. Παράδειγμα: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Μοτίβα μη προστατευμένων αρχείων (διαχωρισμένα με semicolon «;» και ΟΧΙ το ελληνικό ερωτηματικό): -settings.protect_unprotected_file_patterns_desc=Μη προστατευμένα αρχεία που επιτρέπεται να αλλάξουν απευθείας εάν ο χρήστης έχει πρόσβαση εγγραφής, παρακάμπτοντας τον περιορισμό ώθησης. Επιπλέων μοτίβα μπορούν να διαχωριστούν με ερωτηματικό (';'). Δείτε την τεκμηρίωση %[2]s για τη σύνταξη του μοτίβου. Πχ: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc=Μη προστατευμένα αρχεία που επιτρέπεται να αλλάξουν απευθείας εάν ο χρήστης έχει πρόσβαση εγγραφής, παρακάμπτοντας τον περιορισμό ώθησης. Επιπλέων μοτίβα μπορούν να διαχωριστούν με ερωτηματικό (';'). Δείτε την τεκμηρίωση %[2]s για τη σύνταξη του μοτίβου. Πχ: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Ενεργοποίηση προστασίας settings.delete_protected_branch=Απενεργοποίηση προστασίας settings.update_protect_branch_success=Η προστασία κλάδου για τον κανόνα «%s» ενημερώθηκε. diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 797f4ac5bb..0c2c49a9c9 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -210,6 +210,8 @@ link_modal.header = Añadir enlace link_modal.description = Descripción link_modal.paste_reminder = Pista: Con una URL en tu portapapeles, puedes pegar directamente en el editor para crear un enlace. +link_modal.url = URL + [filter] string.asc=A - Z string.desc=Z - A @@ -1063,6 +1065,19 @@ user_block_yourself = No puede bloquearse a sí mismo. quota = Cuota quota.sizes.assets.attachments.all = Archivos adjuntos +storage_overview = Resumen del almacenamiento +keep_pronouns_private = Mostrar pronombres solo a personas autenticadas +regenerate_token = Regenerar +quota.sizes.all = Todo +quota.sizes.repos.all = Repositorios +quota.sizes.repos.public = Repositorios públicos +quota.sizes.repos.private = Repositorios privados +quota.sizes.git.all = Contenido de Git +quota.sizes.assets.attachments.releases = Archivos adjuntos del lanzamiento +quota.sizes.assets.artifacts = Artefactos +quota.sizes.assets.packages.all = Paquetes +quota.sizes.wiki = Wiki + [repo] owner=Propietario owner_helper=Algunas organizaciones pueden no aparecer en el menú desplegable debido a un límite máximo de recuento de repositorios. @@ -1141,7 +1156,7 @@ forks=Forks reactions_more=y %d más unit_disabled=El administrador del sitio ha deshabilitado esta sección del repositorio. language_other=Otros -adopt_search=Introduzca el nombre de usuario para buscar repositorios no adoptados... (déjelo en blanco para encontrar todos) +adopt_search=Introduzca el nombre de usuario para buscar repositorios no adoptados… (déjelo en blanco para encontrar todos) adopt_preexisting_label=Adoptar archivos adopt_preexisting=Adoptar archivos preexistentes adopt_preexisting_content=Crear repositorio desde %s @@ -2348,7 +2363,7 @@ settings.event_pull_request_comment_desc=Comentario de pull request creado, edit settings.event_pull_request_review=Revisiones settings.event_pull_request_review_desc=Pull request aprobada, rechazada o comentarios de revisión añadidos. settings.event_pull_request_sync=Sincronizado -settings.event_pull_request_sync_desc=Pull request sincronizado. +settings.event_pull_request_sync_desc=La rama se actualizó automáticamente con la rama de destino. settings.event_pull_request_review_request=Solicitudes de revisión settings.event_pull_request_review_request_desc=La solicitud de Pull Request ha sido eliminada. settings.event_pull_request_approvals=Aprobaciones de pull request @@ -2450,9 +2465,9 @@ settings.require_signed_commits_desc=Rechazar push en esta rama si los commits n settings.protect_branch_name_pattern=Patrón de nombre de ramas protegidas settings.protect_patterns=Patrones settings.protect_protected_file_patterns=Patrones de archivos protegidos (separados con punto y coma ';') -settings.protect_protected_file_patterns_desc=No está permitido cambiar archivos directamente incluso si el usuario tiene permiso para agregar, editar o borrar archivos en esta rama. Múltiples patrones pueden separarse usando punto y coma (';'). Refvisa la documentación de %s para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=No está permitido cambiar archivos directamente incluso si el usuario tiene permiso para agregar, editar o borrar archivos en esta rama. Múltiples patrones pueden separarse usando punto y coma (';'). Refvisa la documentación de %[2]s para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Patrones de archivos sin protección (separados con punto y coma ";") -settings.protect_unprotected_file_patterns_desc=Los archivos sin protección se pueden cambiar directamente si el usuario tiene acceso de escritura, evitando la restricción push. Múltiples patrones pueden separarse usando punto y coma (';'). Vea la documentación de %[2]s para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc=Los archivos sin protección se pueden cambiar directamente si el usuario tiene acceso de escritura, evitando la restricción push. Múltiples patrones pueden separarse usando punto y coma (';'). Vea la documentación de %[2]s para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Activar protección settings.delete_protected_branch=Desactivar protección settings.update_protect_branch_success=Se ha actualizado la protección de la rama para la regla "%s". @@ -2542,10 +2557,10 @@ diff.parent=padre diff.commit=commit diff.git-notes=Notas diff.data_not_available=El contenido del diff no está disponible -diff.options_button=Opciones de diff +diff.options_button=Opciones de diferencias diff.show_diff_stats=Mostrar estadísticas diff.download_patch=Descargar archivo de parche -diff.download_diff=Descargar archivo de diff +diff.download_diff=Descargar archivo de diferencias diff.show_split_view=Dividir vista diff.show_unified_view=Vista unificada diff.whitespace_button=Espacio blanco @@ -2849,6 +2864,8 @@ release.add_external_asset = Añadir un recurso externo settings.enforce_on_admins_desc = Los administradores del repositorio no pueden saltarse esta regla. pulls.editable = Editable +issues.filter_no_results = No hay resultados + [graphs] component_loading = Cargando %s... component_loading_failed = No se pudo cargar %s @@ -3152,7 +3169,7 @@ emails.primary=Principal emails.activated=Activado emails.filter_sort.email=Correo electrónico emails.filter_sort.email_reverse=Email (invertir) -emails.filter_sort.name=Nombre de Usuario +emails.filter_sort.name=Nombre de usuario emails.filter_sort.name_reverse=Nombre de usuario (invertir) emails.updated=Email actualizado emails.not_updated=Error al actualizar la dirección de correo electrónico solicitada: %v @@ -3808,11 +3825,11 @@ unit.desc=Gestione procesos CI/CD integrados con Forgejo Actions. status.unknown=Desconocido status.waiting=Esperando -status.running=Ejecutando +status.running=Corriendo status.success=Éxito status.failure=Fallo status.cancelled=Cancelado -status.skipped=Omitido +status.skipped=Saltado status.blocked=Bloqueado runners=Nodos @@ -3864,8 +3881,8 @@ runs.status_no_select=Todo el estado runs.no_results=No hay resultados coincidentes. runs.no_runs=El flujo de trabajo no tiene ejecuciones todavía. -workflow.disable=Desactivar fllujo de trabajo -workflow.disable_success=Flujo de trabajo '%s' deshabilitado correctamente. +workflow.disable=Desactivar flujo de trabajo +workflow.disable_success=Flujo de trabajo "%s" desactivado exitosamente. workflow.enable=Activar flujo de trabajo workflow.enable_success=Flujo de trabajo '%s' habilitado con éxito. workflow.disabled=El flujo de trabajo está deshabilitado. @@ -3890,9 +3907,11 @@ variables.id_not_exist = Variable con id %d no existe. runs.empty_commit_message = (mensaje de commit vacío) runs.expire_log_message = Los registros han sido eliminados porque eran demasiado antiguos. +runs.workflow = Flujo de trabajo + [projects] type-1.display_name=Proyecto individual -type-2.display_name=Proyecto repositorio +type-2.display_name=Proyecto de repositorio type-3.display_name=Proyecto de organización deleted.display_name = Proyecto borrado @@ -3907,24 +3926,24 @@ submodule=Submódulo [search] -search = Buscar... +search = Buscar… type_tooltip = Tipo de búsqueda -project_kind = Buscar proyectos... -branch_kind = Buscar ramas... -commit_kind = Buscar confirmaciones... -repo_kind = Buscar repositorios... -user_kind = Buscar usuarios... -org_kind = Buscar organizaciones... -team_kind = Buscar equipos... -code_kind = Buscar código... -package_kind = Buscar paquetes... +project_kind = Buscar proyectos… +branch_kind = Buscar ramas… +commit_kind = Buscar confirmaciones… +repo_kind = Buscar repositorios… +user_kind = Buscar usuarios… +org_kind = Buscar organizaciones… +team_kind = Buscar equipos… +code_kind = Buscar código… +package_kind = Buscar paquetes… code_search_unavailable = La búsqueda de código no está disponible actualmente. Por favor contacta al administrador del sitio. code_search_by_git_grep = Los resultados actuales de la búsqueda de código son proporcionados por "git grep". Es posible que se obtengan mejores resultados si el administrador del sitio habilita el indexador de código. no_results = No se encontraron resultados coincidentes. keyword_search_unavailable = La búsqueda por palabra clave no está disponible actualmente. Por favor contacta al administrador del sitio. fuzzy_tooltip = Incluir resultados que también coincidan estrechamente con el término de búsqueda milestone_kind = Buscar hitos… -pull_kind = Buscar pulls… +pull_kind = Buscar extracciones… union = Unión union_tooltip = Incluir resultados correspondientes a cualquiera de las palabras clave separadas por espacios en blanco exact = Exacto @@ -3939,6 +3958,8 @@ regexp = Expresión Regular filepreview.lines = Líneas %[1]d a %[2]d en %[3]s filepreview.line = Línea %[1]d en %[2]s +filepreview.truncated = La vista previa se ha truncado + [repo.permissions] pulls.read = Lectura: Leer y crear pull requests. releases.write = Write: Publicar, editar y eliminar lanzamientos y sus archivos. @@ -3956,3 +3977,12 @@ ext_wiki = Acceder al enlace de la wiki externa. Los permisos se gestionan de fo code.write = Escritura: Push al repositorio, crear ramas y tags. issues.write = Escritura: Cerrar incidencias y gestion de metadatos como etiquetas, hitos, asignaciones, fechas de vencimiento y dependencias. packages.write = Escritura: Publicar y eliminar paquetes asignados al repositorio. + +[munits.data] +b = B +kib = KiB +mib = MiB +gib = GiB +tib = TiB +pib = PiB +eib = EiB diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 1e78443b89..48c7d81d56 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -208,6 +208,9 @@ table_modal.label.columns = Colonnes link_modal.header = Ajouter un lien link_modal.url = Url +link_modal.description = Description +link_modal.paste_reminder = Indice : avec une URL dans votre clipboard, vous pouvez copier directement dans l'éditeur pour créer un lien. + [filter] string.asc=A - Z string.desc=Z - A @@ -3982,7 +3985,7 @@ search = Rechercher… type_tooltip = Type de recherche fuzzy = Approximatif code_search_by_git_grep = Les résultats de recherche dans le code sont fournis par "git grep". Les résultats pourraient être plus pertinents si l'administrateur du site active les indexeurs de code source. -runner_kind = Chercher les runners... +runner_kind = Chercher les runners… no_results = Aucun résultat n'a été trouvé. keyword_search_unavailable = La recherche par mot-clé n'est pas disponible actuellement. Veuillez contacter l'administrateur du site. fuzzy_tooltip = Inclure les résultats proches des termes recherchés @@ -3996,14 +3999,14 @@ code_kind = Chercher le code… code_search_unavailable = La recherche dans le code n'est pas disponible. Veuillez contacter l'administrateur du site. package_kind = Chercher les paquets… project_kind = Chercher les projets… -branch_kind = Chercher les branches... -commit_kind = Chercher les commits... +branch_kind = Chercher les branches… +commit_kind = Chercher les commits… exact = Exact exact_tooltip = Inclure uniquement les résultats qui correspondent exactement au terme recherché -issue_kind = Rechercher dans les tickets... +issue_kind = Rechercher dans les tickets… union = Union union_tooltip = Inclus les résultats contenant au moins un des mots clé séparés par des espaces -pull_kind = Rechercher dans les demande d'ajout... +pull_kind = Rechercher dans les demande d'ajout milestone_kind = Recherche dans les jalons... regexp_tooltip = Interpréter le terme de recherche comme une expression régulière regexp = RegExp diff --git a/options/locale/locale_hi.ini b/options/locale/locale_hi.ini index 8baaad5224..59f66b4d0f 100644 --- a/options/locale/locale_hi.ini +++ b/options/locale/locale_hi.ini @@ -21,4 +21,22 @@ signed_in_as = साइन इन किया गया है link_account = खाता लिंक करें notifications = सूचनाएँ tracked_time_summary = समस्याओं की सूची के फ़िल्टर के आधार पर ट्रैक किए गए समय का सारांश -user_profile_and_more = प्रोफ़ाइल और सेटिंग्स… \ No newline at end of file +user_profile_and_more = प्रोफ़ाइल और सेटिंग्स… +enable_javascript = इस पन्ने के लिये जावा चाहिए +toc = विषय सूची +licenses = लाइसेंस +return_to_forgejo = फ़ोर्जेगो पे वापस जाएं +more_items = और वस्तुएं +username = यूजरनाम +email = ईमेल पता +password = पासवर्ड +re_type = पासवर्ड पक्का करें +captcha = कैप्चा +twofa = टू-फैक्टर ऑथेंटिकेशन +twofa_scratch = टू-फैक्टर स्क्रैच कोड +passcode = पास कोड +repository = भंडार +organization = संगठन +mirror = छवि +settings = सेटिंग्स +your_settings = आपकी सेटिंग्स \ No newline at end of file diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index ace0decdbb..c4083f0ce8 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -1418,7 +1418,7 @@ issues.new.assignees=Assegnatari issues.new.clear_assignees=Cancella assegnatari issues.new.no_assignees=Nessun assegnatario issues.new.no_reviewers=Nessun revisore -issues.choose.get_started=Cominciare +issues.choose.get_started=Comincia issues.choose.open_external_link=Apri issues.choose.blank=Default issues.choose.blank_about=Crea una segnalazione dal modello predefinito. diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 67e96cdc0c..d4d7024f5d 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -2448,9 +2448,9 @@ settings.protect_branch_name_pattern=保護ブランチ名のパターン settings.protect_branch_name_pattern_desc=保護ブランチ名のパターン。書き方については ドキュメント を参照してください。例: main, release/** settings.protect_patterns=パターン settings.protect_protected_file_patterns=保護されるファイルのパターン (セミコロン';'で区切る): -settings.protect_protected_file_patterns_desc=保護されたファイルは、このブランチにファイルを追加・編集・削除する権限を持つユーザーであっても、直接変更することができなくなります。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については %s を参照してください。 例: .drone.yml, /docs/**/*.txt +settings.protect_protected_file_patterns_desc=保護されたファイルは、このブランチにファイルを追加・編集・削除する権限を持つユーザーであっても、直接変更することができなくなります。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については %[2]s を参照してください。 例: .drone.yml, /docs/**/*.txt settings.protect_unprotected_file_patterns=保護しないファイルのパターン (セミコロン';'で区切る): -settings.protect_unprotected_file_patterns_desc=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については %[2]s を参照してください。 例: .drone.yml, /docs/**/*.txt +settings.protect_unprotected_file_patterns_desc=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については %[2]s を参照してください。 例: .drone.yml, /docs/**/*.txt settings.add_protected_branch=保護を有効にする settings.delete_protected_branch=保護を無効にする settings.update_protect_branch_success=ルール "%s" に対するブランチ保護を更新しました。 diff --git a/options/locale/locale_ka.ini b/options/locale/locale_ka.ini new file mode 100644 index 0000000000..b1e1df74b3 --- /dev/null +++ b/options/locale/locale_ka.ini @@ -0,0 +1,836 @@ +[common] +home = საწყისი +dashboard = სამუშაო მაგიდა +explore = დათვალიერება +help = დახმარება +logo = ლოგო +sign_in = შესვლა +sign_in_or = ან +sign_out = გასვლა +sign_up = რეგისტრაცია +link_account = ანგარიშის მიბმა +register = რეგისტრაცია +version = ვერსია +page = გვერდი +template = ნიმუში +language = ენა +notifications = გაფრთხილებები +create_new = შექმნა… +licenses = ლიცენზიები +toggle_menu = მენიუს გადართვა +more_items = მეტი ელემენტი +username = მომხმარებლის სახელი +email = ელფოსტის მისამართი +password = პაროლი +access_token = წვდომის ტოკენი +re_type = დაადასტურეთ პაროლი +captcha = კაპჩა +twofa = 2FA +passcode = საკვანძო კოდი +repository = რეპოზიტორია +organization = ორგანიზაცია +mirror = სარკე +new_mirror = ახალი სარკე +new_project = ახალი პროექტი +new_project_column = ახალი სვეტი +admin_panel = საიტის ადმინისტრირება +settings = მორგება +your_profile = პროფილი +your_starred = ვარსკვლავიანი +your_settings = მორგება +new_repo.title = ახალი რეპოზიტორია +new_migrate.title = ახალი მიგრაცია +new_org.title = ახალი ორგანიზაცია +new_repo.link = ახალი რეპოზიტორია +new_migrate.link = ახალი მიგრაცია +new_org.link = ახალი ორგანიზაცია +all = ყველა +sources = წყაროები +mirrors = სარკეები +collaborative = საერთო +forks = ფორკები +activities = აქტივობები +pull_requests = შერწყმის მოთხოვნები +issues = პრობლემები +milestones = მისაღწევი გეგმები +ok = დიახ +cancel = გაუქმება +retry = თავიდან ცდა +rerun = თავიდან გაშვება +save = შენახვა +add = დამატება +add_all = ყველას დამატება +remove = წაშლა +remove_all = ყველას წაშლა +edit = ჩასწორება +view = ხედი +test = შემოწმება +enabled = ჩართულია +disabled = გამორთულია +locked = ჩაკეტილია +copy = კოპირება +copy_url = ბმულის კოპირება +copy_hash = ჰეშის კოპირება +copy_path = ბილიკის კოპირება +copy_content = შემცველობის კოპირება +copy_success = დაკოპირებულია! +copy_error = კოპირება ჩავარდა +write = ჩაწერა +preview = მინიატურა +loading = ჩატვირთვა… +error = შეცდომა +never = არასდროს +unknown = უცნობი +pin = ამაგრება +unpin = ჩამოხსნა +artifacts = არტეფაქტები +archived = დაარქივებული +concept_system_global = გლობალური +concept_user_individual = ინდივიდუალური +concept_code_repository = რეპოზიტორია +concept_user_organization = ორგანიზაცია +name = სახელი +value = მნიშვნელობა +filter = ფილტრი +filter.is_archived = დაარქივებული +filter.is_fork = ფორკები +filter.is_mirror = სარკეები +filter.is_template = ნიმუშები +filter.public = საჯარო +filter.private = პირადი + +[search] +search = ძებნა… +fuzzy = გაურკვეველი +union = გაერთიანება +exact = ზუსტი +regexp = რეგგამოსი + +[aria] +footer = ქვედა კოლონტიტული +footer.links = ბმულები + +[heatmap] +contributions_one = შეწირულობა +contributions_few = შეწირულობები +less = ნაკლები +more = მეტი + +[editor] +table_modal.placeholder.header = ზედა კოლონტიტული +table_modal.placeholder.content = შემცველობა +table_modal.label.rows = მწკრივი +table_modal.label.columns = სვეტი +link_modal.url = Url +link_modal.description = აღწერა + +[startpage] +platform = პლატფორმათაშორისი +lightweight = მსუბუქი + +[install] +install = დაყენება +host = ჰოსტი +user = მომხმარებლის სახელი +password = პაროლი +db_schema = სქემა +ssl_mode = SSL +path = ბილიკი +admin_password = პაროლი + +[home] +my_repos = რეპოზიტორიები +my_orgs = ორგანიზაციები +show_archived = დაარქივებული +show_private = პირადი + +[explore] +repos = რეპოზიტორიები +users = მომხმარებლები +organizations = ორგანიზაციები +code = კოდი + +[auth] +verify = გადამოწმება +openid_connect_submit = მიერთება + +[mail] +release.note = შენიშვნა: +release.downloads = გადმოწერები: +repo.transfer.to_you = თქვენ + +[modal] +yes = დიახ +no = არა +confirm = დადასტურება +cancel = გაუქმება +modify = განახლება + +[form] +UserName = მომხმარებლის სახელი +Description = აღწერა +Pronouns = ნაცვალსახელები +Biography = ბიოგრაფია +Website = ვებგვერდი +Location = მდებარეობა +Password = პაროლი +Content = შემცველობა + +[user] +repositories = რეპოზიტორიები +followers.title.one = მომყოლი +followers.title.few = მომყოლები +following.title.one = მიჰყვებით +following.title.few = მიჰყვებით +follow = მიყოლა +unfollow = მიყოლის გაუქმება +code = კოდი +projects = პროექტები +overview = გადახედვა +block = დაბლოკვა +unblock = განბლოკვა +user_bio = ბიოგრაფია + +[settings] +profile = პროფილი +account = ანგარიში +appearance = გარეგნობა +password = პაროლი +security = უსაფრთხოება +avatar = ავატარი +applications = აპები +orgs = ორგანიზაციები +repos = რეპოზიტორიები +organization = ორგანიზაციები +uid = UID +quota = კვოტა +website = ვებგვერდი +location = მდებარეობა +pronouns = ნაცვალსახელები +pronouns_unspecified = მითითებული არაა +continue = გაგრძელება +cancel = გაუქმება +language = ენა +ui = თემა +hints = მინიშნებები +comment_type_group_reference = მიმართვა +comment_type_group_label = ჭდე +comment_type_group_milestone = მისაღწევი მიზანი +comment_type_group_assignee = მიმნიჭებელი +comment_type_group_title = სათაური +comment_type_group_branch = ბრენჩი +comment_type_group_deadline = პროექტის ვადა +comment_type_group_dependency = დამოკიდებულება +comment_type_group_project = პროექტი +privacy = კონფიდენციალობა +primary = ძირითადი +activated = გააქტიურებულია +delete_email = წაშლა +gpg_key_verify = გადამოწმება +gpg_token = ტოკენი +ssh_key_verify = გადამოწმება +ssh_token = ტოკენი +subkeys = ქვეგასაღებები +key_content = შემცველობა +principal_content = შემცველობა +delete_key = წაშლა +can_read_info = წაკითხვა +can_write_info = ჩაწერა +delete_token = წაშლა +regenerate_token = რეგენერაცია +permission_read = წაკითხვა +permissions_list = წვდომები: +save_application = შენახვა +oauth2_application_edit = ჩასწორება +revoke_key = გაუქმება +webauthn_nickname = მეტსახელი +visibility.public = საჯარო +visibility.limited = შეზღუდული +visibility.private = პირადი +quota.rule.exceeded = გადაცილებულია +quota.rule.no_limit = შეუზღუდავი +quota.sizes.all = ყველა +quota.sizes.repos.all = რეპოზიტორიები +quota.sizes.assets.all = ობიექტები +quota.sizes.assets.attachments.all = მიმაგრებული ფაილები +quota.sizes.assets.artifacts = არტეფაქტები +quota.sizes.assets.packages.all = პაკეტები +quota.sizes.wiki = ვიკი + +[repo] +owner = მფლობელი +template = ნიმუში +visibility = ხილვადობა +repo_desc = აღწერა +repo_lang = ენა +issue_labels = ჭდეები +license = ლიცენზია +readme = README +default_branch_label = ნაგულისხმევი +mirror_prune = გასუფთავება +mirror_sync = სინქრონიზებულია +mirror_password_placeholder = (არ შეცვლილა) +mirror_password_blank_placeholder = (დაყენება გაუქმებულია) +watchers = მაყურებლები +stargazers = ვარსკვლავთმრიცხველები +forks = ფორკები +stars = ვარსკვლავები +language_other = სხვა +delete_preexisting_label = წაშლა +desc.private = პირადი +desc.public = საჯარო +desc.template = ნიმუში +desc.internal = შიდა +desc.archived = დაარქივებული +desc.sha256 = SHA256 +template.webhooks = ვებჰუკები +template.topics = თემები +template.avatar = ავატარი +need_auth = ავტორიზაცია +migrate_items_wiki = ვიკი +migrate_items_milestones = მისაღწევი გეგმები +migrate_items_labels = ჭდეები +migrate_items_issues = პრობლემები +migrate_items_releases = რელიზები +watch = თვალყურის დევნება +unwatch = თვალყურის დევნების გაუქმება +star = ვარსკვლავი +unstar = ვარსკვლავის მოხსნა +fork = ფორკი +code = კოდი +branch = ბრენჩი +tree = ხე +branches = ბრენჩები +tag = ჭდე +tags = ჭდეები +issues = პრობლემები +project = პროექტები +packages = პაკეტები +actions = ქმედებები +release = რელიზი +releases = რელიზები +labels = ჭდეები +milestones = მისაღწევი გეგმები +org_labels_desc_manage = მართვა +commits = კომიტები +commit = კომიტი +file_raw = დაუმუშავებელი +file_history = ისტორია +file_permalink = მუდმივი ბმული +escape_control_characters = დაეკრანება +unescape_control_characters = დაეკრანების მოხსნა +vendored = გარედან მოწოდებული +generated = დაგენერირებული +commit_graph.monochrome = მონო +commit_graph.color = ფერი +blame = საავტორო უფლებები +line = ხაზი +lines = ხაზები +from_comment = (კომენტარი) +editor.or = ან +editor.cancel_lower = გაუქმება +editor.add_tmpl.filename = ფაილის სახელი +editor.patching = პაჩები: +editor.cancel = გაუქმება +commits.commits = კომიტები +commits.author = ავტორი +commits.message = შეტყობინება +commits.date = თარიღი +commits.older = უფრო ძველი +commits.newer = უფრო ახალი +commit.operations = ოპერაციები +commit.revert = დაბრუნება +commit.cherry-pick = ზუსტი არჩევა +commitstatus.error = შეცდომა +commitstatus.failure = ჩავარდნა +commitstatus.pending = რიგშია +commitstatus.success = წარმატება +projects = პროექტები +projects.description_placeholder = აღწერა +projects.title = სათაური +projects.type.none = არცერთი +projects.template.desc = ნიმუში +projects.column.edit_title = სახელი +projects.column.new_title = სახელი +projects.column.color = ფერი +projects.open = გახსნა +projects.close = დახურვა +issues.new.labels = ჭდეები +issues.new.projects = პროექტები +issues.new.milestone = მისაღწევი მიზანი +issues.new.assignees = მიმნიჭებლები +issues.choose.open_external_link = გახსნა +issues.choose.blank = ნაგულისხმევი +issues.new_label_desc_placeholder = აღწერა +issues.deleted_milestone = `(წაშლილია)` +issues.deleted_project = `(წაშლილია)` +issues.filter_label = ჭდე +issues.filter_milestone = მისაღწევი მიზანი +issues.filter_project = პროექტი +issues.filter_assignee = მიმნიჭებელი +issues.filter_poster = ავტორი +issues.filter_type = ტიპი +issues.filter_sort = დალაგება +issues.filter_sort.relevance = შესაბამისობა +issues.filter_sort.latest = უახლესი +issues.filter_sort.oldest = უძველესი +issues.action_open = გახსნა +issues.action_close = დახურვა +issues.action_label = ჭდე +issues.action_milestone = მისაღწევი მიზანი +issues.action_assignee = მიმნიჭებელი +issues.action_check = ჩართვა/გამორთვა +issues.previous = წინა +issues.next = შემდეგი +issues.open_title = გახსნა +issues.closed_title = დახურული +issues.all_title = ყველა +issues.draft_title = მონახაზი +issues.context.edit = ჩასწორება +issues.context.delete = წაშლა +issues.reopen_issue = თავიდან გახსნა +issues.create_comment = კომენტარი +issues.author = ავტორი +issues.role.owner = მფლობელი +issues.role.member = წევრი +issues.role.collaborator = თანამონაწილე +issues.role.contributor = მოხალისე +issues.edit = ჩასწორება +issues.cancel = გაუქმება +issues.save = შენახვა +issues.label_title = სახელი +issues.label_description = აღწერა +issues.label_color = ფერი +issues.label_exclusive = ექსკლუზიური +issues.label_edit = ჩასწორება +issues.label_delete = წაშლა +issues.label.filter_sort.alphabetically = ანბანის მიხედვით +issues.subscribe = გამოწერა +issues.unsubscribe = გამოწერის გაუქმება +issues.lock_confirm = ჩაკეტვა +issues.unlock_confirm = ჩაკეტვის გაუქმება +issues.delete = წაშლა +issues.cancel_tracking = მოცილება +issues.add_time_cancel = გაუქმება +issues.add_time_hours = საათი +issues.add_time_minutes = წუთი +issues.force_push_compare = შედარება +issues.due_date_form = წწწწ-თთ-დდ +issues.due_date_form_edit = ჩასწორება +issues.due_date_form_remove = წაშლა +issues.due_date_overdue = გადაცილებული +issues.dependency.title = დამოკიდებულებები +issues.dependency.cancel = გაუქმება +issues.dependency.remove = წაშლა +issues.dependency.blocks_short = ბლოკები +issues.review.dismissed_label = მოცილებულია +issues.review.pending = რიგშია +issues.review.reviewers = გადამხედავები +issues.review.outdated = ვადაგადაცილებული +issues.reference_issue.body = სხეული +issues.content_history.deleted = წაშლილია +issues.content_history.edited = ჩასწორებულია +issues.content_history.created = შეიქმნა +issues.content_history.options = მორგება +compare.compare_base = ბაზა +compare.compare_head = შედარება +pulls.has_viewed_file = ნანახია +pulls.tab_conversation = საუბარი +pulls.tab_commits = კომიტები +pulls.merged = შერწყმულია +pulls.status_checks_requested = აუცილებელია +pulls.status_checks_details = დეტალები +pulls.cmd_instruction_checkout_title = გამოთხოვა +pulls.cmd_instruction_merge_title = შერწყმა +pulls.made_using_agit = AGit +pulls.editable = ჩასწორებადი +pull.deleted_branch = (წაშლილია):%s +milestones.open = გახსნა +milestones.close = დახურვა +milestones.title = სათაური +milestones.desc = აღწერა +milestones.clear = გასუფთავება +milestones.cancel = გაუქმება +milestones.filter_sort.name = სახელი +wiki = ვიკი +wiki.page = გვერდი +wiki.new_page = გვერდი +wiki.cancel = გაუქმება +wiki.edit_page_button = ჩასწორება +wiki.pages = გვერდები +activity = აქტივობა +activity.navbar.pulse = უახლესი აქტივობები +activity.navbar.contributors = მოხალისეები +activity.period.filter_label = პერიოდი: +activity.overview = გადახედვა +activity.merged_prs_label = შერწყმულია +activity.opened_prs_label = შეთავაზებულია +activity.closed_issue_label = დახურულია +activity.new_issue_label = ღიაა +activity.unresolved_conv_label = გახსნა +activity.published_release_label = რელიზი +activity.published_prerelease_label = პრე-რელიზი +activity.published_tag_label = ჭდე +activity.git_stats_and_deletions = და +contributors.contribution_type.commits = კომიტები +contributors.contribution_type.additions = დამატებები +contributors.contribution_type.deletions = წაშლები +settings = მორგება +settings.options = რეპოზიტორია +settings.collaboration = თანამონაწილეები +settings.collaboration.admin = ადმინისტრატორი +settings.collaboration.write = ჩაწერა +settings.collaboration.read = წაკითხვა +settings.collaboration.owner = მფლობელი +settings.collaboration.undefined = აღუწერელი +settings.hooks = ვებჰუკები +settings.mirror_settings.direction = მიმართულება +settings.mirror_settings.direction.pull = მიღება +settings.mirror_settings.direction.push = გაგზავნა +settings.mirror_settings.push_mirror.none_ssh = არცერთი +settings.units.units = ერთეულები +settings.units.overview = გადახედვა +settings.site = ვებგვერდი +settings.tracker_issue_style.numeric = რიცხვითი +settings.tracker_issue_style.alphanumeric = ალფარიცხვითი +settings.admin_indexer_unindexed = არადაინდექსებული +settings.trust_model.collaborator = თანამონაწილე +settings.trust_model.committer = გადამცემი +settings.trust_model.collaboratorcommitter = თანამონაწილე+გადამცემი +settings.delete_collaborator = წაშლა +settings.teams = გუნდები +settings.webhook.request = მოთხოვნა +settings.webhook.response = გამოხმაურება +settings.webhook.headers = თავსართები +settings.webhook.payload = შემცველობა +settings.webhook.body = სხეული +settings.secret = საიდუმლო +settings.slack_username = მომხმარებლის სახელი +settings.slack_color = ფერი +settings.discord_username = მომხმარებლის სახელი +settings.event_create = შექმნა +settings.event_delete = წაშლა +settings.event_fork = ფორკი +settings.event_wiki = ვიკი +settings.event_release = რელიზი +settings.event_push = გაგზავნა +settings.event_repository = რეპოზიტორია +settings.event_issues = ცვლილება +settings.event_issue_assign = მინიჭება +settings.event_issue_label = ჭდეები +settings.event_issue_milestone = მისაღწევი გეგმები +settings.event_issue_comment = კომენტარები +settings.event_pull_request = ცვლილება +settings.event_pull_request_assign = მინიჭება +settings.event_pull_request_label = ჭდეები +settings.event_pull_request_milestone = მისაღწევი გეგმები +settings.event_pull_request_comment = კომენტარები +settings.event_pull_request_review = გადახედვები +settings.event_pull_request_sync = სინქრონიზებულია +settings.event_pull_request_enforcement = ფორსირება +settings.event_package = პაკეტი +settings.active = აქტიურია +settings.slack_token = ტოკენი +settings.slack_domain = დომენი +settings.slack_channel = არხი +settings.web_hook_name_gitea = Gitea +settings.web_hook_name_forgejo = Forgejo +settings.web_hook_name_gogs = Gogs +settings.web_hook_name_slack = Slack +settings.web_hook_name_discord = Discord +settings.web_hook_name_dingtalk = DingTalk +settings.web_hook_name_telegram = Telegram +settings.web_hook_name_matrix = Matrix +settings.web_hook_name_feishu_only = Feishu +settings.web_hook_name_packagist = Packagist +settings.sourcehut_builds.secrets = საიდუმლოები +settings.title = სათაური +settings.deploy_key_content = შემცველობა +settings.branches = ბრენჩები +settings.protect_status_check_matched = დამთხვეული +settings.protect_patterns = ნიმუშები +settings.edit_protected_branch = ჩასწორება +settings.tags = ჭდეები +settings.tags.protection.allowed = დაშვებულია +settings.lfs = LFS +settings.lfs_locks = დაბლოკვა +settings.lfs_lock = ჩაკეტვა +settings.lfs_pointers.oid = OID +diff.parent = მშობელი +diff.commit = კომიტი +diff.git-notes = შენიშვნები +diff.whitespace_button = ჰარე +diff.bin = BIN +diff.file_before = მანამდე +diff.file_after = შემდეგ +diff.file_image_width = სიგანე +diff.file_image_height = სიმაღლე +diff.file_byte_size = ზომა +diff.generated = გენერირებულია +diff.vendored = გარედან შემოტანილია +diff.comment.reply = პასუხი +diff.review.comment = კომენტარი +diff.review.approve = დადასტურება +diff.protected = დაცულია +diff.image.swipe = გაუსვით +diff.image.overlay = ზემოდან დადება +release.releases = რელიზები +release.tags = ჭდეები +release.draft = მონახაზი +release.prerelease = პრე-რელიზი +release.stable = სტაბილური +release.compare = შედარება +release.edit = ჩასწორება +release.target = სამიზნე +release.cancel = გაუქმება +release.downloads = გადმოწერები +release.type_attachment = მიმაგრებული ფაილი +branch.delete_head = წაშლა +branch.included = ჩასმულია +topic.done = დასრულება + +[graphs] +contributors.what = მოხალისეები + +[org] +members = წევრები +teams = გუნდები +code = კოდი +lower_members = წევრები +lower_repositories = რეპოზიტორიები +org_desc = აღწერა +team_desc = აღწერა +team_permission_desc = წვდომა +team_unit_disabled = (გათიშულია) +settings = მორგება +settings.options = ორგანიზაცია +settings.website = ვებგვერდი +settings.location = მდებარეობა +settings.permission = წვდომები +settings.visibility = ხილვადობა +settings.visibility.public = საჯარო +settings.visibility.limited_shortname = შეზღუდული +settings.visibility.private_shortname = პირადი +members.public = ხილული +members.private = დამალული +members.owner = მფლობელი +members.member = წევრი +members.remove = წაშლა +members.leave = გასვლა +teams.join = შეერთება +teams.leave = გასვლა +teams.read_access = წაკითხვა +teams.write_access = ჩაწერა +teams.settings = მორგება + +[admin] +dashboard = სამუშაო მაგიდა +organizations = ორგანიზაციები +repositories = რეპოზიტორიები +hooks = ვებჰუკები +integrations = ინტეგრაციები +config = მორგება +config_summary = შეჯამება +config_settings = მორგება +monitor = მონიტორინგი +first_page = პირველი +last_page = ბოლო +dashboard.statistic = შეჯამება +dashboard.operation_switch = გადართვა +dashboard.operation_run = გაშვება +users.name = მომხმარებლის სახელი +users.activated = გააქტიურებულია +users.admin = ადმინი +users.restricted = შეზღუდული +users.reserved = დაცული +users.bot = ბოტი +users.remote = დაშორებული +users.2fa = 2FA +users.repos = რეპოები +users.created = შეიქმნა +users.edit = ჩასწორება +users.local = ლოკალური +users.list_status_filter.menu_text = ფილტრი +users.list_status_filter.reset = ჩამოყრა +users.list_status_filter.is_active = აქტიურია +users.list_status_filter.not_active = არააქტიურია +users.list_status_filter.is_admin = ადმინი +users.list_status_filter.is_restricted = შეზღუდული +emails.primary = ძირითადი +emails.activated = გააქტიურებულია +emails.filter_sort.email = ელფოსტა +emails.filter_sort.name = მომხმარებლის სახელი +orgs.name = სახელი +orgs.teams = გუნდები +orgs.members = წევრები +repos.owner = მფლობელი +repos.name = სახელი +repos.private = პირადი +repos.issues = პრობლემები +repos.size = ზომა +packages.owner = მფლობელი +packages.creator = შემქმნელი +packages.name = სახელი +packages.version = ვერსია +packages.type = ტიპი +packages.repository = რეპოზიტორია +packages.size = ზომა +packages.published = გამოქვეყნებულია +auths.name = სახელი +auths.type = ტიპი +auths.enabled = ჩართულია +auths.updated = განახლებულია +auths.domain = დომენი +auths.host = ჰოსტი +auths.port = პორტი +auths.oauth2_tenant = ტენანტი +auths.tips = რჩევები +config.ssh_enabled = ჩართულია +config.ssh_port = პორტი +config.lfs_enabled = ჩართულია +config.db_type = ტიპი +config.db_host = ჰოსტი +config.db_name = სახელი +config.db_user = მომხმარებლის სახელი +config.db_schema = სქემა +config.db_ssl_mode = SSL +config.db_path = ბილიკი +config.mailer_enabled = ჩართულია +config.mailer_name = სახელი +config.mailer_protocol = პროტოკოლი +config.mailer_user = მომხმარებელი +config.mailer_use_dummy = სულელი +config.send_test_mail_submit = გაგზავნა +config.oauth_enabled = ჩართულია +config.disabled_logger = გამორთულია +monitor.stats = სტატისტიკა +monitor.name = სახელი +monitor.schedule = გეგმა +monitor.execute_times = შესრულებები +monitor.stacktrace = სტეკის დატრეისება +monitor.desc = აღწერა +monitor.last_execution_result = შედეგი +monitor.process.children = შვილები +monitor.queues = რიგები +monitor.queue.name = სახელი +monitor.queue.type = ტიპი +notices.operations = ოპერაციები +notices.type = ტიპი +notices.type_1 = რეპოზიტორია +notices.type_2 = ამოცანა +notices.desc = აღწერა +notices.op = ოპ. + +[action] +compare_branch = შედარება +review_dismissed_reason = მიზეზი: + +[tool] +now = ახლა +future = მომავალში +raw_seconds = წამი +raw_minutes = წუთი + +[munits.data] +b = ბ +kib = კიბ +mib = მიბ +gib = გიბ +tib = ტიბ +pib = პიბ +eib = ეიბ + +[notification] +notifications = გაფრთხილებები +unread = წაკითხულობის გაუქმება +read = წაკითხვა +subscriptions = გამოწერები +watching = უყურებთ + +[units] +unit = ერთეული + +[packages] +title = პაკეტები +filter.type = ტიპი +filter.type.all = ყველა +filter.container.tagged = ჭდით +filter.container.untagged = ჭდემოხსნილი +installation = დაყენება +requirements = მოთხოვნები +dependencies = დამოკიდებულებები +keywords = საკვანძო სიტყვები +details = დეტალები +details.author = ავტორი +details.license = ლიცენზია +assets = ობიექტები +versions = ვერსიები +dependency.id = ID +dependency.version = ვერსია +alpine.repository.branches = ბრენჩები +alpine.repository.repositories = რეპოზიტორიები +alpine.repository.architectures = არქიტექტურები +arch.version.description = აღწერა +arch.version.provides = მოგაწვდით +arch.version.groups = ჯგუფი +arch.version.depends = დამოკიდებულია +arch.version.conflicts = კონფლიქტშია +arch.version.replaces = ანაცვლებს +arch.version.backup = მარქაფი +composer.dependencies = დამოკიდებულებები +conan.details.repository = რეპოზიტორია +container.images.title = ასლის ფაილები +container.details.platform = პლატფორმა +container.digest = დაიჯესტი +container.labels = ჭდეები +container.labels.key = გასაღები +container.labels.value = მნიშვნელობა +debian.repository.distributions = დისტრიბუტივები +debian.repository.components = კომპონენტები +debian.repository.architectures = არქიტექტურები +npm.dependencies = დამოკიდებულებები +npm.details.tag = ჭდე +rpm.repository.architectures = არქიტექტურები +alt.repository.architectures = არქიტექტურები +owner.settings.cleanuprules.enabled = ჩართულია + +[secrets] +secrets = საიდუმლოები + +[actions] +actions = ქმედებები +status.unknown = უცნობი +status.waiting = ველოდები +status.running = მიმდინარეობს შესრულება +status.success = წარმატება +status.failure = ჩავარდნა +status.cancelled = გაუქმებულია +status.skipped = გამოტოვებულია +status.blocked = დაბლოკილია +runners = გამსვებები +runners.status = სტატუსი +runners.id = ID +runners.name = სახელი +runners.owner_type = ტიპი +runners.description = აღწერა +runners.labels = ჭდეები +runners.runner_title = გამშვები +runners.task_list.run = გაშვება +runners.task_list.status = სტატუსი +runners.task_list.repository = რეპოზიტორია +runners.task_list.commit = კომიტი +runners.status.unspecified = უცნობი +runners.status.idle = უქმე +runners.status.active = აქტიურია +runners.status.offline = ქსელგარეშე +runners.version = ვერსია +runs.commit = კომიტი +runs.scheduled = დაგეგმილია +runs.workflow = შრომის პროცესი +runs.actor = ავტორი +runs.status = სტატუსი +variables = ცვლადები + +[git.filemode] +directory = საქაღალდე +submodule = ქვემოდული diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 7f4ae4262b..3d578c6e15 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -2488,9 +2488,9 @@ settings.protect_branch_name_pattern=Aizsargātā zara nosaukuma paraugs settings.protect_branch_name_pattern_desc=Aizsargāto zaru nosaukumu paraugi. Paraugu pierakstu skatīt dokumentācijā. Piemēri: main, release/** settings.protect_patterns=Paraugi settings.protect_protected_file_patterns=Aizsargāto datņu paraugs (vairākus atdala ar semikolu ";") -settings.protect_protected_file_patterns_desc=Aizsargātās datnes nav ļauts tiešā veidā mainīt, pat ja lietotājam šajā zarā ir tiesības pievienot, labot vai izdzēst datnes. Vairākus paraugus var atdalīt ar semikolu (";"). Paraugu pieraksts ir skatāms %[2]s dokumentācijā. Piemēri: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Aizsargātās datnes nav ļauts tiešā veidā mainīt, pat ja lietotājam šajā zarā ir tiesības pievienot, labot vai izdzēst datnes. Vairākus paraugus var atdalīt ar semikolu (";"). Paraugu pieraksts ir skatāms %[2]s dokumentācijā. Piemēri: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Neaizsargāto datņu paraugs (vairākus atdala ar semikolu ";") -settings.protect_unprotected_file_patterns_desc=Neaizsargātās datnes, kuras ir ļauts izmainīt tiešā veidā, apejot aizgādāšanas ierobežojumu, ja lietotājam ir rakstīšanas piekļuve. Vairāki paraugi ir atdalāmi ar semikolu (";"). Paraugu pierakstu skatīt %[2]s dokumentācijā. Piemēri: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc=Neaizsargātās datnes, kuras ir ļauts izmainīt tiešā veidā, apejot aizgādāšanas ierobežojumu, ja lietotājam ir rakstīšanas piekļuve. Vairāki paraugi ir atdalāmi ar semikolu (";"). Paraugu pierakstu skatīt %[2]s dokumentācijā. Piemēri: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Iespējot aizsargāšanu settings.delete_protected_branch=Atspējot aizsargāšanu settings.update_protect_branch_success=Zara aizsargāšanas kārtula "%s" tika atjaunināta. @@ -3896,7 +3896,7 @@ status.unknown=Nezināms status.waiting=Gaida status.running=Izpildās status.success=Sekmīgi -status.failure=Atteice +status.failure=Nesekmīgi status.cancelled=Atcelts status.skipped=Izlaists status.blocked=Aizturēts diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini index 2be67a97da..698f1330d6 100644 --- a/options/locale/locale_nds.ini +++ b/options/locale/locale_nds.ini @@ -1305,7 +1305,7 @@ issues.new.clear_assignees = Towiesens leegmaken editor.file_editing_no_longer_exists = De Datei, wat bewarkt word, »%s«, gifft dat in deesem Repositorium nich mehr. editor.user_no_push_to_branch = Bruker kann nich to Twieg schuven editor.directory_is_a_file = Verteeknisnaam »%s« word in deesem Repositorium al as Dateinaam bruukt. -editor.file_changed_while_editing = De Datei-Inhollens hebben sik ännert, siet du mit de Bewarken begunnen hest. Klick hier, um se to sehn, of kommitteer de Änners weer, um se to överschrieven. +editor.file_changed_while_editing = De Datei-Inhollens hebben sik ännert, siet du de Datei opmaakt hest. Klick hier, um se to sehn, of kommitteer de Änners weer, um se to överschrieven. editor.push_rejected_no_message = De Ännern is vun de Server sünner Naricht oflehnt worden. Bidde överprüüf de Git-Hakens. commits.signed_by = Unnerschrieven vun commit.revert-content = Twieg utkören, up wat du dat torüggnehmen willst: diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 6bc3dcecdc..bfd6c6878e 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -559,7 +559,7 @@ team_invite.text_2 = Klik alstublieft op de volgende link om aan het team deel t admin.new_user.text = Klik hier om deze gebruiker te beheren vanuit het beheerderspaneel. password_change.subject = Uw wachtwoord is gewijzigd password_change.text_1 = Het wachtwoord voor je account is zojuist gewijzigd. -reset_password.text_1 = +reset_password.text_1 = totp_disabled.subject = TOTP is uitgeschakeld primary_mail_change.subject = Uw primaire e-mail is gewijzigd totp_disabled.no_2fa = Er zijn geen andere 2FA methodes meer geconfigureerd, wat betekent dat het niet langer nodig is om in te loggen op uw account met 2FA. @@ -1361,7 +1361,7 @@ editor.propose_file_change=Stel bestandswijziging voor editor.new_branch_name_desc=Nieuwe branch naam… editor.cancel=Annuleer editor.filename_cannot_be_empty=Bestandsnaam mag niet leeg zijn. -editor.file_changed_while_editing=De bestandsinhoud is veranderd sinds je bent begonnen met bewerken. Klik hier om ze te zien, of commit de veranderingen opnieuw om ze te overschrijven. +editor.file_changed_while_editing=De inhoud van het bestand is gewijzigd sinds u het bestand hebt geopend. Klik hier om ze te zien, of commit de veranderingen opnieuw om ze te overschrijven. editor.commit_empty_file_header=Commit een leeg bestand editor.commit_empty_file_text=Het bestand dat u wilt committen is leeg. Doorgaan? editor.no_changes_to_show=Er zijn geen wijzigingen om weer te geven. @@ -2924,7 +2924,7 @@ org_name_holder=Organisatienaam org_full_name_holder=Volledige naam organisatie org_name_helper=Organisatienamen horen kort en memorabel zijn. create_org=Nieuwe organisatie aanmaken -repo_updated=Geupdate %s +repo_updated=Geüpdatet %s members=Leden teams=Teams lower_members=leden diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 0ae55b98e1..92fa50d618 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -2432,9 +2432,9 @@ settings.require_signed_commits_desc=Rejeitar pushes para este branch se não es settings.protect_branch_name_pattern=Padrão de nome de branch protegido settings.protect_patterns=Padrões settings.protect_protected_file_patterns=Padrões de arquivo protegidos (separados usando ponto e vírgula ";") -settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação %s para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação %[2]s para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Padrões de arquivo desprotegidos (separados usando ponto e vírgula ";") -settings.protect_unprotected_file_patterns_desc=Arquivos não protegidos que podem ser alterados diretamente se o usuário tiver acesso de gravação, ignorando as restrições de push. Vários padrões podem ser separados usando ponto e vírgula (\;'). Veja %[2]s documentação para sintaxe de padrões. Exemplos: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc=Arquivos não protegidos que podem ser alterados diretamente se o usuário tiver acesso de gravação, ignorando as restrições de push. Vários padrões podem ser separados usando ponto e vírgula (\;'). Veja %[2]s documentação para sintaxe de padrões. Exemplos: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Habilitar proteção settings.delete_protected_branch=Desabilitar proteção settings.update_protect_branch_success=Proteção do branch "%s" foi atualizada. diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index e0f8065063..8bf2b15f89 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1042,7 +1042,7 @@ user_block_success = Пользователь заблокирован. oauth2_application_locked = Forgejo предварительно регистрирует некоторые приложения OAuth2 при запуске, если это включено в конфигурации. Для избежания неожиданного поведения их нельзя удалять или редактировать. Ознакомиться с подробностями можно в документации OAuth2. hooks.desc = Добавьте веб-хуки, которые будут срабатывать во всех ваших репозиториях. webauthn_alternative_tip = Возможно, стоит настроить дополнительный метод аутентификации. -blocked_since = Заблокирован с %s +blocked_since = Заблокирован %s user_unblock_success = Пользователь разблокирован. twofa_scratch_token_regenerated = Ваш одноразовый ключ восстановления: %s. Сохраните его в надёжном месте. Больше он показан не будет. blocked_users = Заблокированные пользователи diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 186f8b3b50..2743f63a41 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -2429,9 +2429,9 @@ settings.protect_branch_name_pattern=Korunmuş Dal Adı Deseni settings.protect_branch_name_pattern_desc=Korunmuş dal isim desenleri. Desen sözdizimi için belgelere bakabilirsiniz. Örnekler: main, release/** settings.protect_patterns=Desenler settings.protect_protected_file_patterns=Korumalı dosya kalıpları (noktalı virgülle ayrılmış ';'): -settings.protect_protected_file_patterns_desc=Kullanıcının bu dalda dosya ekleme, düzenleme veya silme hakları olsa bile doğrudan değiştirilmesine izin verilmeyen korumalı dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen sözdizimi için %s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Kullanıcının bu dalda dosya ekleme, düzenleme veya silme hakları olsa bile doğrudan değiştirilmesine izin verilmeyen korumalı dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen sözdizimi için %[2]s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Korunmasız dosya desenleri (noktalı virgülle ayrılmış ';'): -settings.protect_unprotected_file_patterns_desc=Kullanıcının yazma erişimi, itme kısıtlamasını atlama hakkı olduğunda doğrudan değiştirmesine izin verilen korunmasız dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen söz dizimi için %[2]s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc=Kullanıcının yazma erişimi, itme kısıtlamasını atlama hakkı olduğunda doğrudan değiştirmesine izin verilen korunmasız dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen söz dizimi için %[2]s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Korumayı etkinleştir settings.delete_protected_branch=Korumayı devre dışı bırak settings.update_protect_branch_success=Dal koruma kuralı "%s" güncellendi. diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 9e10c3f6ec..02e157d62b 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -1076,6 +1076,8 @@ quota.rule.exceeded = Перевищено regenerate_token = Згенерувати знову access_token_regeneration = Згенерувати новий токен доступу +quota.sizes.assets.all = Ресурси + [repo] owner=Власник owner_helper=Деякі організації можуть не відображатися у випадаючому списку через максимальну кількість репозиторііїв. @@ -1323,7 +1325,7 @@ editor.propose_file_change=Запропонувати зміну файлу editor.new_branch_name_desc=Ім'я нової гілки… editor.cancel=Відмінити editor.filename_cannot_be_empty=Ім'я файлу не може бути порожнім. -editor.file_changed_while_editing=Зміст файлу змінився з моменту початку редагування. Натисніть тут , щоб переглянути що було змінено, або закомітьте зміни ще раз, щоб переписати їх. +editor.file_changed_while_editing=Вміст файлу змінився відтоді, як ви його відкрили. Натисніть тут, щоб переглянути, що було змінено, або закомітьте зміни ще раз, щоб переписати їх. editor.commit_empty_file_header=Закомітити порожній файл editor.commit_empty_file_text=Файл, в комміті порожній. Продовжити? editor.no_changes_to_show=Нема змін для показу. @@ -1585,8 +1587,8 @@ issues.due_date=Дата завершення issues.invalid_due_date_format=Дата закінчення має бути в форматі 'ррр-мм-дд'. issues.error_modifying_due_date=Не вдалося змінити дату завершення. issues.error_removing_due_date=Не вдалося видалити дату завершення. -issues.push_commit_1=додав %d коміт %s -issues.push_commits_n=додав %d коміти(-ів) %s +issues.push_commit_1=додає %d коміт %s +issues.push_commits_n=додає %d коміти(-ів) %s issues.force_push_codes=`примусово залито %[1]s з %[2]s до %[4]s %[6]s` issues.force_push_compare=Порівняти issues.due_date_form=рррр-мм-дд @@ -2651,6 +2653,12 @@ branch.download = Завантажити гілку «%s» pulls.delete_after_merge.head_branch.insufficient_branch = У вас немає дозволу видаляти головну гілку. activity.published_tag_label = Тег +commits.search.tooltip = До ключових слів можна додавати префікси «author:», «committer:», «after:» або «before:», наприклад, «revert author:Alice before:2019-01-13». +release.type_external_asset = Зовнішній ресурс +release.asset_name = Назва ресурсу +release.add_external_asset = Додати зовнішній ресурс +find_file.no_matching = Не знайдено відповідного файлу + [graphs] contributors.what = внески component_loading_info = Це може зайняти деякий час… @@ -2778,6 +2786,9 @@ teams.none_access = Немає доступу teams.invite_team_member = Запросити до %s teams.write_access = Запис +teams.invite_team_member.list = Запрошення в очікуванні +teams.invite.by = Вас запрошує %s + [admin] dashboard=Панель управління users=Облікові записи користувачів @@ -3284,6 +3295,8 @@ dashboard.cron.cancelled = Cron: %[1]s скасовано: %[3]s defaulthooks.desc = Вебхуки автоматично сповіщають HTTP-сервер POST-запитами, коли в Forgejo відбуваються певні події. Вказані тут вебхуки є типовими і будуть скопійовані до всіх нових репозиторіїв. Докладніше — в посібнику з вебхуків. +assets = Ресурси коду + [action] create_repo=створив(ла) репозиторій %s rename_repo=репозиторій перейменовано з %[1]s на %[3]s @@ -3364,7 +3377,7 @@ error.generate_hash=Не вдалося згенерувати хеш коміт error.no_committer_account=Аккаунт користувача з таким Email не знайдено error.no_gpg_keys_found=Не вдалося знайти GPG-ключ, що відповідає даному підпису error.not_signed_commit=Непідписаний коміт -error.failed_retrieval_gpg_keys=Не вдалося отримати відповідний GPG-ключ користувача +error.failed_retrieval_gpg_keys=Не вдалося отримати ключ, пов'язаний з обліковим записом комітера error.probable_bad_signature=УВАГА! Хоча ключ із таким ID і є в базі, коміт неможливо ним перевірити! Цей коміт ПІДОЗРІЛИЙ. error.probable_bad_default_signature=УВАГА! Хоча типовий ключ має цей ID, коміт неможливо ним перевірити! Цей коміт ПІДОЗРІЛИЙ. @@ -3492,6 +3505,17 @@ swift.install = Додайте пакунок у свій файл Package settings.link.select = Виберіть репозиторій alpine.registry.info = Виберіть $branch і $repository зі списку нижче. +alpine.registry = Налаштуйте цей реєстр, додавши URL у файл /etc/apk/repositories: +arch.pacman.repo.multi.item = Конфігурація %s +cargo.registry = Налаштуйте цей реєстр у файлі конфігурації Cargo (наприклад, ~/.cargo/config.toml): +chef.registry = Налаштуйте цей реєстр у файлі ~/.chef/config.rb: +composer.registry = Налаштуйте цей реєстр у файлі ~/.composer/config.json: +conda.registry = Встановіть цей реєстр як репозиторій Conda у своєму файлі .condarc: +cran.registry = Налаштуйте цей реєстр у файлі Rprofile.site: +maven.registry = Налаштуйте цей реєстр у файлі pom.xml свого проєкту: +npm.registry = Налаштуйте цей реєстр у файлі .npmrc свого проєкту: +owner.settings.chef.title = Реєстр Chef + [secrets] deletion = Видалити секрет creation.success = Секрет «%s» додано. @@ -3506,6 +3530,8 @@ creation.name_placeholder = без урахування регістру, тіл secrets = Секрети creation.value_placeholder = Уведіть довільний вміст. Пробіли на початку та в кінці будуть пропущені. +description = Секрети передаються певним діям і не можуть бути прочитані інакше. + [actions] runners.name=Назва runners.owner_type=Тип @@ -3649,8 +3675,17 @@ filepreview.lines = Рядки з %[1]d по %[2]d в %[3]s test = Це тестовий текст. Він не відображається в інтерфейсі користувача Forgejo, а використовується з метою тестування [repo.permissions] -packages.read = Читати: Дивитись та завантажити пакунки призначені до репозиторію. -packages.write = Писати: Публікувати та видаляти пакунки призначені до репозиторію. +packages.read = Читати: дивитись та завантажити пакунки, призначені до репозиторію. +packages.write = Писати: публікувати та видаляти пакунки, призначені до репозиторію. + +issues.read = Читати: дивитись і створювати задачі та коментарі. +pulls.read = Читати: дивитись і створювати запити на злиття. +releases.read = Читати: дивитись і завантажувати випуски. +releases.write = Писати: публікувати, змінювати і видаляти випуски та їхні ресурси. +wiki.read = Читати: переглядати вбудовану вікі та її історію. +wiki.write = Писати: створювати, оновлювати та видаляти сторінки вбудованої вікі. +actions.read = Читати: дивитися вбудовані конвеєри CI/CD та їхні журнали. +actions.write = Писати: вручну запускати, перезапускати, скасовувати або схвалювати конвеєри CI/CD в очікуванні. [munits.data] pib = ПіБ diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 53e25afb95..7ce0baa07f 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1076,7 +1076,7 @@ quota.sizes.repos.all = 仓库 quota.sizes.repos.private = 私有仓库 quota.sizes.git.all = Git 内容 quota.sizes.git.lfs = Git LFS -quota.sizes.assets.all = 资产 +quota.sizes.assets.all = 资源 quota.sizes.assets.attachments.all = 附件 quota.sizes.assets.attachments.issues = 工单附件 quota.sizes.assets.attachments.releases = 版本发布附件 @@ -1416,7 +1416,7 @@ editor.file_is_a_symlink=`"%s" 是一个符号链接，无法在 web 编辑器 editor.filename_is_a_directory=此仓库中已存在名为“%s” 的目录。 editor.file_editing_no_longer_exists=正在编辑的文件 %s 已不存在。 editor.file_deleting_no_longer_exists=正在删除的文件 %s 已不存在。 -editor.file_changed_while_editing=文件内容在您进行编辑时被更改。单击此处 查看具体被更改的内容，或者 再次提交 覆盖其它在编辑时产生的更改。 +editor.file_changed_while_editing=文件内容在您打开文件后被更改。单击此处 查看具体被更改的内容，或者 再次提交 覆盖其它在编辑时产生的更改。 editor.file_already_exists=此仓库已经存在名为 %s 的文件。 editor.commit_empty_file_header=提交一个空文件 editor.commit_empty_file_text=您要提交的文件是空的，继续吗？ @@ -2500,7 +2500,7 @@ settings.protect_branch_name_pattern=受保护的分支名称正则 settings.protect_branch_name_pattern_desc=受保护的分支名称正则。语法请参阅文档 。如：main, release/** settings.protect_patterns=规则 settings.protect_protected_file_patterns=受保护的文件模式（使用半角分号“;”分隔） -settings.protect_protected_file_patterns_desc=即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用半角分号（“;”）分隔多个模式。 见%s文档了解模式语法。例如： .drone.yml, /docs/**/*.txt。 +settings.protect_protected_file_patterns_desc=即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用半角分号（“;”）分隔多个模式。 见%[2]s文档了解模式语法。例如： .drone.yml, /docs/**/*.txt。 settings.protect_unprotected_file_patterns=不受保护的文件模式（使用半角分号“;”分隔） settings.protect_unprotected_file_patterns_desc=在用户有写权限的情况下允许绕过限制，直接修改设为不保护的文件。如有多个匹配模式，则可用半角分号（“;”）分隔开。见 %[2]s 的文档以了解匹配模式的格式。例子： .drone.yml、/docs/**/*.txt。 settings.add_protected_branch=启用保护 @@ -2846,10 +2846,10 @@ settings.federation_not_enabled = 当前实例未启用邦联功能。 issues.author.tooltip.issue = 此用户是本工单的作者。 issues.author.tooltip.pr = 此用户是此合并请求的作者。 release.type_attachment = 附件 -release.type_external_asset = 外部资产 -release.asset_name = 资产名称 +release.type_external_asset = 外部资源 +release.asset_name = 资源名称 release.asset_external_url = 外部 URL -release.add_external_asset = 添加外部资产 +release.add_external_asset = 添加外部资源 release.invalid_external_url = 无效的外部 URL：“%s” milestones.filter_sort.name = 名称 settings.pull_mirror_sync_quota_exceeded = 超出配额，未拉取更改。 @@ -3053,7 +3053,7 @@ self_check = 自检 identity_access=身份及认证 users=用户帐户 organizations=组织管理 -assets=代码资产 +assets=代码资源 repositories=仓库管理 hooks=Web 钩子 integrations=集成 @@ -3660,7 +3660,7 @@ raw_minutes=分钟 [dropzone] default_message=拖放文件或点击此处上传。 -invalid_input_type=您不能上传该类型的文件 +invalid_input_type=您不能上传该类型的文件。 file_too_big=文件体积（{{filesize}} MB）超过了最大允许体积（{{maxFilesize}} MB） remove_file=移除文件 @@ -4064,7 +4064,7 @@ code.write = 写入：推送到仓库，创建分支和标签。 code.read = 读取：访问并克隆仓库的代码。 actions.read = 读取：查看集成的 CI/CD 管道及其日志。 issues.write = 写入：关闭工单并管理元数据，如标签、里程碑、指派成员、截止日期和依赖。 -releases.write = 写入：发布、编辑和删除版本发布及其资产。 +releases.write = 写入：发布、编辑和删除版本发布及其资源。 issues.read = 读取：阅读并创建工单和评论。 pulls.read = 读取：阅读并创建合并请求。 releases.read = 读取：查看并下载版本发布。 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index d0d3b15427..ea8c1bc2b1 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -2317,9 +2317,9 @@ settings.require_signed_commits=僅接受經簽署的提交 settings.require_signed_commits_desc=拒絕未經簽署或未經驗證的提交推送到此分支。 settings.protect_branch_name_pattern=受保護的分支名稱式樣 settings.protect_protected_file_patterns=受保護檔案的式樣（以半形分號區隔「;」） -settings.protect_protected_file_patterns_desc=即便使用者有權限新增、修改、刪除此分支的檔案，仍不允許直接修改受保護的檔案。可以用半形分號「;」分隔多個式樣。請於 %s 文件查看模式格式。範例: .drone.yml, /docs/**/*.txt。 +settings.protect_protected_file_patterns_desc=即便使用者有權限新增、修改、刪除此分支的檔案，仍不允許直接修改受保護的檔案。可以用半形分號「;」分隔多個式樣。請於 %[2]s 文件查看模式格式。範例: .drone.yml, /docs/**/*.txt。 settings.protect_unprotected_file_patterns=未受保護檔案的式樣（以半形分號區隔「;」） -settings.protect_unprotected_file_patterns_desc=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「;」分隔多個模式。請於 %[2]s 文件查看模式格式。範例: .drone.yml, /docs/**/*.txt。 +settings.protect_unprotected_file_patterns_desc=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「;」分隔多個模式。請於 %[2]s 文件查看模式格式。範例: .drone.yml, /docs/**/*.txt。 settings.add_protected_branch=啟用保護 settings.delete_protected_branch=停用保護 settings.protected_branch_deletion=刪除分支保護 diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json index 96b829770c..2a9381e290 100644 --- a/options/locale_next/locale_da.json +++ b/options/locale_next/locale_da.json @@ -16,5 +16,8 @@ "home.explore_orgs": "Udforsk organisationer", "themes.names.forgejo-light": "Forgejo lys", "themes.names.forgejo-dark": "Forgejo mørk", - "themes.names.forgejo-auto": "Forgejo (følg systemtema)" + "themes.names.forgejo-auto": "Forgejo (følg systemtema)", + "settings.adopt": "Adoptere", + "install.invalid_lfs_path": "Kan ikke oprette LFS-roden på den angivne sti: %[1]s", + "install.lfs_jwt_secret_failed": "Kan ikke generere en LFS JWT-hemmelighed: %[1]s" } diff --git a/options/locale_next/locale_es-ES.json b/options/locale_next/locale_es-ES.json index 8261f05240..57753089ca 100644 --- a/options/locale_next/locale_es-ES.json +++ b/options/locale_next/locale_es-ES.json @@ -9,5 +9,9 @@ "many": "quiere fusionar %[1]d commits de %[2]s en %[3]s", "other": "" }, - "search.milestone_kind": "Buscar hitos…" + "search.milestone_kind": "Buscar hitos…", + "home.welcome.no_activity": "Sin actividad", + "themes.names.forgejo-auto": "Forgejo (seguir el tema del sistema)", + "themes.names.forgejo-light": "Forgejo claro", + "themes.names.forgejo-dark": "Forgejo oscuro" } diff --git a/options/locale_next/locale_it-IT.json b/options/locale_next/locale_it-IT.json index b19d948cea..50cc736634 100644 --- a/options/locale_next/locale_it-IT.json +++ b/options/locale_next/locale_it-IT.json @@ -9,5 +9,11 @@ "many": "vuole unire %[1]d commit da %[2]s a %[3]s", "other": "" }, - "search.milestone_kind": "Ricerca tappe..." + "search.milestone_kind": "Ricerca traguardi…", + "home.welcome.no_activity": "Nessun'attività", + "home.explore_repos": "Esplora i repositori", + "home.explore_users": "Esplora l'utenza", + "home.explore_orgs": "Esplora le organizzazioni", + "themes.names.forgejo-light": "Forgejo chiaro", + "themes.names.forgejo-dark": "Forgejo scuro" } diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json index c9e30df345..7d3b5bcd82 100644 --- a/options/locale_next/locale_nds.json +++ b/options/locale_next/locale_nds.json @@ -16,5 +16,8 @@ "incorrect_root_url": "Deese Forgejo-Instanz is inricht, unner »%s« besöcht to worden. Du bekiekst Forgejo jüüst dör een anner URL, wat daarto föhren kann, dat ’t deelwies nich richtig warkt. De kanonisk URL word vun de Forgejo-Chefs över de ROOT_URL-Instellen in de app.ini kuntrolleert.", "themes.names.forgejo-light": "Forgejo Hell", "themes.names.forgejo-dark": "Forgejo Dunker", - "themes.names.forgejo-auto": "Forgejo (Systeem-Thema nagahn)" + "themes.names.forgejo-auto": "Forgejo (Systeem-Thema nagahn)", + "settings.adopt": "Övernehmen", + "install.invalid_lfs_path": "Kunn de LFS-Ruut an de angeven Padd nich maken: %[1]s", + "install.lfs_jwt_secret_failed": "Kunn dat LFS-JWT-Geheemst nich maken: %[1]s" } diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json index dcd0b6625e..49de90b0eb 100644 --- a/options/locale_next/locale_nl-NL.json +++ b/options/locale_next/locale_nl-NL.json @@ -4,17 +4,20 @@ "other": "heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s" }, "repo.pulls.title_desc": { - "one": "wilt %[1]d commit van %[2]s samenvoegen in %[3]s", - "other": "wilt %[1]d commits van %[2]s samenvoegen met %[3]s" + "one": "wil %[1]d commit van %[2]s samenvoegen in %[3]s", + "other": "wil %[1]d commits van %[2]s samenvoegen met %[3]s" }, "search.milestone_kind": "Zoek mijlpalen…", "home.welcome.no_activity": "Geen activiteit", - "home.welcome.activity_hint": "Er staat nog niets in uw feed. Uw acties en activiteiten van repositories die u bekijkt zullen hier verschijnen.", - "home.explore_repos": "Ontdek repositories", - "home.explore_users": "Ontdek gebruikers", - "home.explore_orgs": "Ontdek organisaties", + "home.welcome.activity_hint": "Er staat nog niets in uw feed. Uw acties en activiteiten van repositories die u monitort zullen hier verschijnen.", + "home.explore_repos": "Verken repositories", + "home.explore_users": "Verken gebruikers", + "home.explore_orgs": "Verken organisaties", "incorrect_root_url": "Deze Forgejo-instantie is geconfigureerd om geserveerd te worden op \"%s\". U bekijkt Forgejo momenteel via een andere URL, waardoor onderdelen van de applicatie kunnen breken. De canonieke URL kan worden gewijzigd door Forgejo admins via de ROOT_URL instelling in de app.ini.", "themes.names.forgejo-auto": "Forgejo (volg het systeemthema)", "themes.names.forgejo-light": "Forgejo licht", - "themes.names.forgejo-dark": "Forgejo donker" + "themes.names.forgejo-dark": "Forgejo donker", + "settings.adopt": "Adopteer", + "install.invalid_lfs_path": "Kan de LFS-root niet aanmaken op het opgegeven pad: %[1]s", + "install.lfs_jwt_secret_failed": "Kan geen LFS JWT-geheim genereren: %[1]s" } diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json index f9481c79dc..8e45bfd5c7 100644 --- a/options/locale_next/locale_uk-UA.json +++ b/options/locale_next/locale_uk-UA.json @@ -18,5 +18,8 @@ "incorrect_root_url": "Цей екземпляр Forgejo налаштовано на відвідування з «%s». Зараз ви переглядаєте Forgejo за іншою URL-адресою, що може призвести до збоїв деяких частин програми. Канонічна URL-адреса встановлюється адміністраторами Forgejo за допомогою параметра ROOT_URL у файлі app.ini.", "themes.names.forgejo-light": "Forgejo світла", "themes.names.forgejo-dark": "Forgejo темна", - "themes.names.forgejo-auto": "Forgejo (як у системі)" + "themes.names.forgejo-auto": "Forgejo (як у системі)", + "settings.adopt": "Прийняти", + "install.invalid_lfs_path": "Не вдалося створити корінь LFS за вказаним шляхом: %[1]s", + "install.lfs_jwt_secret_failed": "Не вдалося створити секрет LFS JWT: %[1]s" } diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json index 90faba85d2..fd7a9b357e 100644 --- a/options/locale_next/locale_zh-CN.json +++ b/options/locale_next/locale_zh-CN.json @@ -10,5 +10,7 @@ "incorrect_root_url": "此 Forgejo 实例配置为在“%s”上提供服务。您当前正在通过不同的网址查看 Forgejo，这可能会导致应用程序的某些部分损坏。Forgejo 管理员可以通过 app.ini 中的 ROOT_URL 设置控制规范网址。", "themes.names.forgejo-auto": "Forgejo（遵循系统主题）", "themes.names.forgejo-light": "Forgejo 浅色", - "themes.names.forgejo-dark": "Forgejo 深色" + "themes.names.forgejo-dark": "Forgejo 深色", + "install.invalid_lfs_path": "无法在指定路径创建 LFS 根目录：%[1]s", + "install.lfs_jwt_secret_failed": "无法生成 LFS JWT 密钥：%[1]s" } From 43c35fb3d341c312a9a2e46cf9ebaa62d1f102f5 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 13 Apr 2025 13:40:10 +0500 Subject: [PATCH 134/568] [v11.0/forgejo] i18n: update of translations from Codeberg Translate Translation updates that are applicable to v11 strings were picked from this commit: 0bfb3751fb33153fcc5cfde1a2ae101389bf06b8 Changes to strings that are only present in the v12 branch were not picked. Below is a list of co-authors of the ported commit. It may contain co-authors who's changes were not picked due to being v12-only. Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Benedikt Straub Co-authored-by: Codeberg Translate Co-authored-by: Edgarsons Co-authored-by: Fjuro Co-authored-by: Gusted Co-authored-by: Kita Ikuyo Co-authored-by: Miguel P.L Co-authored-by: Outbreak2096 Co-authored-by: Porrumentzio Co-authored-by: SomeTr Co-authored-by: Wuzzy Co-authored-by: artnay Co-authored-by: earl-warren Co-authored-by: nekoedges Co-authored-by: tacaly Co-authored-by: xtex Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/cs/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/de/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/fil/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/nds/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/nl/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/ru/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/uk/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo-next/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/cs/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/da/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/de/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/es/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fi/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fil/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/fr/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/lv/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/nds/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/ru/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/uk/ Translate-URL: https://translate.codeberg.org/projects/forgejo/forgejo/zh_Hans/ Translation: Forgejo/forgejo Translation: Forgejo/forgejo-next --- options/locale/locale_cs-CZ.ini | 2 +- options/locale/locale_de-DE.ini | 2 +- options/locale/locale_es-ES.ini | 19 +++++-- options/locale/locale_fi-FI.ini | 82 +++++++++++++++++++++++---- options/locale/locale_fil.ini | 2 +- options/locale/locale_fr-FR.ini | 51 ++++++++++++++--- options/locale/locale_lv-LV.ini | 2 +- options/locale/locale_ru-RU.ini | 14 ++--- options/locale/locale_uk-UA.ini | 2 +- options/locale/locale_zh-CN.ini | 16 +++--- options/locale_next/locale_cs-CZ.json | 3 +- options/locale_next/locale_de-DE.json | 3 +- options/locale_next/locale_fil.json | 3 +- options/locale_next/locale_lv-LV.json | 3 +- options/locale_next/locale_ru-RU.json | 3 +- 15 files changed, 159 insertions(+), 48 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 382e31c431..e61c3fa90d 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1414,7 +1414,7 @@ editor.file_is_a_symlink=`„%s“ je symbolický odkaz. Symbolické odkazy nemo editor.filename_is_a_directory=Jméno souboru „%s“ je již použito jako jméno adresáře v tomto repozitáři. editor.file_editing_no_longer_exists=Upravovaný soubor „%s“ již není součástí tohoto repozitáře. editor.file_deleting_no_longer_exists=Odstraňovaný soubor „%s“ již není součástí tohoto repozitáře. -editor.file_changed_while_editing=Obsah souboru se od zahájení úprav změnil. Klikněte sem pro jeho zobrazení nebo odešlete změny ještě jednou pro jeho přepsání. +editor.file_changed_while_editing=Obsah souboru se od doby, kdy jste ho otevřeli, změnil. Klikněte sem pro jeho zobrazení nebo odešlete změny ještě jednou pro jeho přepsání. editor.file_already_exists=Soubor „%s“ již existuje v tomto repozitáři. editor.commit_empty_file_header=Odeslat prázdný soubor editor.commit_empty_file_text=Soubor, který se chystáte odeslat, je prázdný. Pokračovat? diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index a5e24e3257..c4801a2fef 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1412,7 +1412,7 @@ editor.file_is_a_symlink=`„%s“ ist ein symbolischer Link. Symbolische Links editor.filename_is_a_directory=Der Dateiname „%s“ wird bereits als Verzeichnisname in diesem Repository verwendet. editor.file_editing_no_longer_exists=Die bearbeitete Datei „%s“ existiert nicht mehr in diesem Repository. editor.file_deleting_no_longer_exists=Die zu löschende Datei „%s“ existiert nicht mehr in diesem Repository. -editor.file_changed_while_editing=Der Inhalt der Datei hat sich seit dem Beginn der Bearbeitung geändert. Hier klicken, um die Änderungen anzusehen, oder Änderungen erneut comitten, um sie zu überschreiben. +editor.file_changed_while_editing=Der Inhalt der Datei hat sich nach dem Öffnen geändert. Hier klicken, um die Änderungen anzusehen, oder Änderungen erneut committen, um sie zu überschreiben. editor.file_already_exists=Eine Datei mit dem Namen „%s“ existiert bereits in diesem Repository. editor.commit_empty_file_header=Leere Datei committen editor.commit_empty_file_text=Die Datei, die du commiten willst, ist leer. Fortfahren? diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 0c2c49a9c9..3ff6c565b7 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -1078,6 +1078,12 @@ quota.sizes.assets.artifacts = Artefactos quota.sizes.assets.packages.all = Paquetes quota.sizes.wiki = Wiki +change_username_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d día, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +change_username_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +quota.rule.exceeded = Excedido +quota.rule.no_limit = Ilimitado +quota.sizes.assets.all = Activos + [repo] owner=Propietario owner_helper=Algunas organizaciones pueden no aparecer en el menú desplegable debido a un límite máximo de recuento de repositorios. @@ -1239,7 +1245,7 @@ migrate.migrate_items_options=Se necesita un token de acceso para migrar element migrated_from=Migrado desde %[2]s migrated_from_fake=Migrado desde %[1]s migrate.migrate=Migrar desde %s -migrate.migrating=Migrando desde %s... +migrate.migrating=Migrando desde %s… migrate.migrating_failed=La migración desde %s ha fallado. migrate.migrating_failed.error=Error al migrar: %s migrate.migrating_failed_no_addr=Migración fallida. @@ -2534,7 +2540,7 @@ settings.lfs_invalid_locking_path=Ruta no válida: %s settings.lfs_invalid_lock_directory=No se puede bloquear el directorio: %s settings.lfs_lock_already_exists=El bloqueo ya existe: %s settings.lfs_lock=Bloquear -settings.lfs_lock_path=Ruta del archivo a bloquear... +settings.lfs_lock_path=Ruta del archivo a bloquear… settings.lfs_locks_no_locks=Sin bloqueos settings.lfs_lock_file_no_exist=El archivo bloqueado no existe en la rama por defecto settings.lfs_force_unlock=Forzar desbloqueo @@ -2866,8 +2872,10 @@ pulls.editable = Editable issues.filter_no_results = No hay resultados +release.type_attachment = Archivo adjunto + [graphs] -component_loading = Cargando %s... +component_loading = Cargando %s… component_loading_failed = No se pudo cargar %s contributors.what = contribuciones recent_commits.what = commits recientes @@ -3000,7 +3008,7 @@ teams.invite.by=Invitado por %s teams.invite.description=Por favor, haga clic en el botón de abajo para unirse al equipo. follow_blocked_user = No puedes seguir a esta organización porque esta organización te ha bloqueado. open_dashboard = Abrir panel de control -settings.change_orgname_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estará disponible para cualquiera después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +settings.change_orgname_redirect_prompt.with_cooldown.few = El antiguo nombre de la organización estará disponible para todos después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre durante el periodo de tiempo de espera. settings.change_orgname_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estará disponible para cualquiera después un periodo de tiempo de espera de %[1]d día, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. [admin] @@ -3803,6 +3811,9 @@ alt.repository = Información del repositorio alt.repository.architectures = Arquitecturas alt.repository.multiple_groups = Este paquete está disponible en múltiples grupos. +arch.version.description = Descripción +arch.version.provides = Proveedores + [secrets] secrets=Secretos description=Los secretos pasarán a ciertas acciones y no se podrán leer de otro modo. diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 11b2b3eb0c..4c7bec39b5 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -548,6 +548,8 @@ totp_disabled.no_2fa = Muita kaksivaiheisen tunnistautumisen menetelmiä ei ole +totp_enrolled.subject = Olet aktivoinut TOTP:in kaksivaiheisen todennuksen menetelmäksi + [modal] yes=Kyllä no=Ei @@ -668,6 +670,9 @@ form.name_reserved = Käyttäjätunnus "%s" on varattu. form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu käyttäjätunnuksessa. +public_activity.visibility_hint.admin_private = Aktiivisuus on näkyvissä sinulle, koska olet ylläpitäjä, mutta käyttäjä haluaa pitää aktiivisuutensa yksityisenä. +public_activity.visibility_hint.self_private_profile = Aktiivisuutesi on näkyvissä vain sinulle ja instanssin ylläpitäjille, koska profiilisi on yksityinen. Määritä. + [settings] profile=Profiili account=Tili @@ -994,12 +999,12 @@ download_tar=Lataa TAR.GZ repo_desc=Kuvaus repo_lang=Kieli repo_gitignore_helper=Valitse .gitignore-mallit -issue_labels=Ongelmien tunnisteet +issue_labels=Tunnisteet issue_labels_helper=Valitse nimiöjoukko license=Lisenssi license_helper=Valitse lisenssitiedosto readme=README -auto_init=Alusta repo (Luo .gitignore, License ja README) +auto_init=Alusta repo create_repo=Luo repo default_branch=Oletushaara mirror_prune=Karsi @@ -1168,7 +1173,7 @@ issues.new_label=Uusi tunniste issues.new_label_placeholder=Tunnisteen nimi issues.new_label_desc_placeholder=Kuvaus issues.create_label=Luo tunniste -issues.label_templates.helper=Valitse tunnistejoukko +issues.label_templates.helper=Valitse tunnisteen esiasetus issues.add_milestone_at=`lisäsi tämän merkkipaaluun %s %s` issues.change_milestone_at=`vaihtoi merkkipaalun %s merkkipaaluun %s %s` issues.remove_milestone_at=`poisti tämän %s merkkipaalusta %s` @@ -1244,7 +1249,7 @@ issues.label_count=%d tunnistetta issues.label_open_issues=%d avointa ongelmaa issues.label_edit=Muokkaa issues.label_delete=Poista -issues.label_modify=Muokkaa tunniste +issues.label_modify=Muokkaa tunnistetta issues.label_deletion=Poista tunniste issues.label.filter_sort.alphabetically=Aakkosjärjestyksessä issues.label.filter_sort.reverse_alphabetically=Käänteisessä aakkosjärjestyksessä @@ -1272,7 +1277,7 @@ issues.start_tracking_history=`aloitti työskentelyn %s` issues.tracker_auto_close=Ajan seuranta pysähtyy automaattisesti kun tämä ongelma on suljettu issues.stop_tracking=Pysäytä ajanotto issues.stop_tracking_history=`lopetti työskentelyn %s` -issues.add_time=Lisää aika käsin +issues.add_time=Lisää aika manuaalisesti issues.add_time_short=Lisää aika issues.add_time_cancel=Peruuta issues.add_time_history=`lisäsi käytetyn ajan %s` @@ -2132,10 +2137,60 @@ settings.web_hook_name_feishu = Feishu / Lark Suite +delete_preexisting = Poista olemassa olevat tiedostot +projects.edit_subheader = Projektit organisoivat ongelmia ja seuraavat edistymistä. +issues.filter_no_results = Ei tuloksia +issues.filter_no_results_placeholder = Kokeile määrittää eri hakusuodattimet. +issues.new.no_reviewers = Ei katselmoijia +issues.choose.get_started = Aloitetaan +issues.label_templates.title = Lataa tunnisteen esiasetus +issues.label_templates.use = Käytä tunnisteen esiasetusta +issues.add_label = lisäsi tunnisteen %s %s +issues.add_labels = lisäsi tunnisteet %s %s +issues.num_reviews_one = %d katselmointi +issues.num_reviews_few = %d katselmointia +issues.reaction.add = Lisää reaktio +issues.ref_pull_from = `viittasi tähän vetopyyntöön %[4]s %[2]s` +issues.author.tooltip.issue = Tämä käyttäjä on tämän ongelman tekijä. +issues.author.tooltip.pr = Tämä käyttäjä on tämän vetopyynnön tekijä. +issues.role.contributor_helper = Tämä käyttäjä on aiemmin kommitoinut tähän repoon. +issues.label_deletion_desc = Tunnisteen poistaminen poistaa sen kaikista ongelmista. Jatketaanko? +issues.label_deletion_success = Tunniste on poistettu. +issues.attachment.open_tab = `Napsauta nähdäksesi "%s" uudessa välilehdessä` +issues.attachment.download = `Napsauta ladataksesi "%s"` +issues.unpin_issue = Poista ongelman kiinnitys +issues.max_pinned = Et voi kiinnittää enempää ongelmia +issues.cancel_tracking = Hylkää +issues.due_date_added = lisäsi määräpäivän %s %s +issues.due_date_remove = poisti määräpäivän %s %s +issues.review.comment = katselmoi %s +issues.review.add_review_request = pyysi katselmointia käyttäjältä %[1]s %[2]s +issues.review.add_review_requests = pyysi katselmointeja käyttäjiltä %[1]s %[2]s +issues.review.reviewers = Katselmoijat +issues.review.outdated = Vanhentunut +issues.review.outdated_description = Sisältö on muuttunut siitä ajanhetkestä, kun tämä kommentti luotiin +issues.review.option.show_outdated_comments = Näytä vanhentuneet kommentit +issues.review.option.hide_outdated_comments = Piilota vanhentuneet kommentit +issues.review.show_outdated = Näytä vanhentuneet +issues.review.hide_outdated = Piilota vanhentuneet +pulls.sign_in_require = Kirjaudu sisään luodaksesi uuden vetopyynnön. +pulls.blocked_by_official_review_requests = Tämä vetopyyntö on estetty, koska siltä puuttuu hyväksyntä yhdeltä tai useammalta viralliselta katselmoijalta. +pulls.no_merge_access = Sinulla ei ole valtuutta yhdistää tätä vetopyyntöä. +pulls.commit_ref_at = `viittasi tähän vetopyyntöön kommitista %[2]s` +settings.external_wiki_url_error = Ulkoisen wikin URL-osoite ei ole kelvollinen. +settings.external_tracker_url_error = Ulkoisen ongelmienseurannan URL-osoite ei ole kelvollinen. +settings.event_fork = Forkkaus +settings.event_issue_label = Tunnisteet +settings.event_pull_request_label = Tunnisteet +settings.event_pull_request_review = Katselmoinnit +settings.event_pull_request_review_request = Katselmointipyynnöt +settings.authorization_header = Authorization-otsake +diff.has_escaped = Tällä rivillä on piilotettuja Unicode-merkkejä + [graphs] component_loading_info = Tämä saattaa kestää hetken… component_failed_to_load = Odottamaton virhe. -component_loading = Ladataan %s... +component_loading = Ladataan %s… contributors.what = kontribuutiot recent_commits.what = viimeisimmät kommitit code_frequency.what = koodifrekvenssi @@ -2319,7 +2374,7 @@ users.password_helper=Jätä salasanakenttä tyhjäksi jos haluat pitää sen mu users.update_profile_success=Käyttäjän tili on päivitetty. users.edit_account=Muokkaa käyttäjätiliä users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa.) -users.is_activated=Käyttäjätili on aktivoitu +users.is_activated=Aktivoitu tili users.prohibit_login=Ota sisäänkirjautuminen pois käytöstä users.is_admin=Ylläpitäjätili users.is_restricted=Rajoitettu tili @@ -2406,7 +2461,7 @@ auths.edit=Muokkaa todennuslähdettä auths.update_success=Todennuslähde on päivitetty. auths.update=Päivitä todennuslähde auths.delete=Poista todennuslähde -auths.delete_auth_title=Todennuslähteen poisto +auths.delete_auth_title=Poista todennuslähde auths.delete_auth_desc=Todennuslähteen poisto estää käyttäjiä käyttämästä sitä kirjautumiseen. Jatketaanko? auths.deletion_success=Todennuslähde on poistettu. @@ -2445,7 +2500,7 @@ config.show_registration_button=Näytä rekisteröitymispainike config.enable_captcha=Ota CAPTCHA käyttöön config.active_code_lives=Aktivointikoodin vanhenemisaika config.default_keep_email_private=Piilota sähköpostiosoitteet oletuksena -config.default_visibility_organization=Uuden organisaation oletusnäkyvyys +config.default_visibility_organization=Uusien organisaatioiden oletusnäkyvyys config.webhook_config=Webkoukkujen asetukset config.queue_length=Jonon pituus @@ -2468,7 +2523,7 @@ config.cache_conn=Välimuistin yhteys merkkijono config.session_config=Istunnon asetukset config.session_provider=Istunnon toimittaja config.provider_config=Toimittajan asetukset -config.cookie_name=Evästenimi +config.cookie_name=Evästeen nimi config.gc_interval_time=GC aikaväli aika config.session_life_time=Istunnon elinikä config.https_only=Vain HTTPS @@ -2604,6 +2659,13 @@ monitor.duration = Kesto (s) monitor.last_execution_result = Tulos +dashboard.sync_branch.started = Haarasynkronointi aloitettu +dashboard.sync_tag.started = Tagisynkronointi aloitettu +users.bot = Botti +auths.syncenabled = Käytä käyttäjäsynkronointia +auths.enable_ldap_groups = Käytä LDAP-ryhmiä +auths.login_source_exist = Todennuslähde "%s" on jo olemassa. + [action] create_repo=luotu repo %s rename_repo=uudelleennimetty repo %[1]s nimelle %[3]s diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini index ec7a6405e1..b88e76956c 100644 --- a/options/locale/locale_fil.ini +++ b/options/locale/locale_fil.ini @@ -1536,7 +1536,7 @@ pulls.merged_by =ni/ng %[3]s ay naisama %[1]s commitstatus.pending = Nakabinbin issues.review.pending = Nakabinbin pulls.status_checking = Nakabinbin ang ilang mga pagsusuri -editor.file_changed_while_editing = Ang nilalaman ng file ay nagbago mula noong nagsimula kang mag-edit. Mag-click dito upang makita ang mga pagbabago o Mag-commit ng mga pagbabago muli para i-overwrite sila. +editor.file_changed_while_editing = Ang nilalaman ng file ay nagbago mula noong binuksan mo ang file. Mag-click dito upang makita ang mga pagbabago o Mag-commit ng mga pagbabago muli para i-overwrite sila. editor.file_already_exists = Umiiral na ang file na may pangalang "%s" sa repositoryong ito. issues.review.review = Suriin activity.git_stats_push_to_branch = sa %s at diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 48c7d81d56..ef4b7bad5d 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1066,6 +1066,33 @@ pronouns_custom_label = Pronoms personnalisés change_username_redirect_prompt.with_cooldown.one = L'ancien pseudonyme sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. change_username_redirect_prompt.with_cooldown.few = L'ancien pseudonyme sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. +storage_overview = Vue d'ensemble du stockage +quota = Quota +keep_pronouns_private = Ne montrer les pronoms qu'aux utilisateurs authentifiés +keep_pronouns_private.description = Cela masquera votre pronoms aux visiteurs qui ne sont pas authentifiés. +regenerate_token = Régénérer +access_token_regeneration = Régénérer le token d'accès +access_token_regeneration_desc = La régénération d'un token révoquera l'accès à votre compte pour les applications qui l'utilisaient. Cela n'est pas reversible. Continuer ? +regenerate_token_success = Le token a été régénéré. Les applications qui l'utilisent n'ont plus accès à votre compte et doivent être mises à jour avec le nouveau token. +quota.applies_to_user = Les quotas suivants s'appliquent à votre compte +quota.applies_to_org = Les quotas suivants s'applique à cette organisation +quota.rule.exceeded = Dépassé +quota.rule.exceeded.helper = La taille totale des objets pour cette règle ont dépassé le quota. +quota.rule.no_limit = Sans limite +quota.sizes.all = Tout +quota.sizes.repos.all = Dépôts +quota.sizes.repos.public = Dépôts publics +quota.sizes.repos.private = Dépôts privés +quota.sizes.git.all = Contenu dans Git +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Contenus +quota.sizes.assets.attachments.all = Attachements +quota.sizes.assets.attachments.issues = Attachements de tickets +quota.sizes.assets.attachments.releases = Attachements de version +quota.sizes.assets.artifacts = Artefacts +quota.sizes.assets.packages.all = Paquets +quota.sizes.wiki = Wiki + [repo] new_repo_helper=Un dépôt contient tous les fichiers d’un projet, ainsi que l’historique de leurs modifications. Vous avez déjà ça ailleurs ? Migrez-le ici.. owner=Propriétaire @@ -1229,7 +1256,7 @@ migrate.migrate_items_options=Un jeton d'accès est requis pour migrer des élé migrated_from=Migré de %[2]s migrated_from_fake=Migré de %[1]s migrate.migrate=Migrer depuis %s -migrate.migrating=Migration de %s ... +migrate.migrating=Migration de %s … migrate.migrating_failed=La migration de %s a échoué. migrate.migrating_failed.error=Échec de la migration : %s migrate.migrating_failed_no_addr=Échec de la migration. @@ -1389,7 +1416,7 @@ editor.file_is_a_symlink=`« %s » est un lien symbolique. Ce type de fichiers editor.filename_is_a_directory=« %s » est déjà utilisé comme nom de dossier dans ce dépôt. editor.file_editing_no_longer_exists=Impossible de modifier le fichier « %s » car il n’existe plus dans ce dépôt. editor.file_deleting_no_longer_exists=Impossible de supprimer le fichier « %s » car il n’existe plus dans ce dépôt. -editor.file_changed_while_editing=Le contenu du fichier a changé depuis que vous avez commencé à éditer. Cliquez ici pour voir les changements ou soumettez de nouveau pour les écraser. +editor.file_changed_while_editing=Le contenu du fichier a changé depuis que vous avez ouvert le fichier. Cliquez ici pour voir les changements ou soumettez de nouveau pour les écraser. editor.file_already_exists=Un fichier nommé "%s" existe déjà dans ce dépôt. editor.commit_empty_file_header=Réviser un fichier vide editor.commit_empty_file_text=Le fichier que vous allez réviser est vide. Continuer ? @@ -2541,7 +2568,7 @@ settings.lfs_invalid_locking_path=Chemin invalide : %s settings.lfs_invalid_lock_directory=Impossible de verrouiller le répertoire : %s settings.lfs_lock_already_exists=Verrou déjà existant : %s settings.lfs_lock=Verrou -settings.lfs_lock_path=Chemin de fichier à verrouiller... +settings.lfs_lock_path=Chemin de fichier à verrouiller… settings.lfs_locks_no_locks=Pas de verrous settings.lfs_lock_file_no_exist=Le fichier verrouillé n'existe pas dans la branche par défaut settings.lfs_force_unlock=Forcer le déverrouillage @@ -2733,7 +2760,7 @@ editor.invalid_commit_mail = Courriel invalide pour la création d'un commit. commits.browse_further = Continuer la navigation commits.renamed_from = Renommé depuis %s pulls.nothing_to_compare_have_tag = La branche ou le tag sélectionné sont identiques. -issues.blocked_by_user = Vous ne pouvez pas créer un ticket sur ce dépôt car vous avez été bloqué par son propriétaire. +issues.blocked_by_user = Vous ne pouvez pas créer de tickets sur ce dépôt car vous avez été bloqué par son propriétaire. pulls.blocked_by_user = Vous ne pouvez pas créer une pull request sur ce dépôt car vous êtes bloqué par son propriétaire. wiki.cancel = Annuler settings.wiki_globally_editable = Permettre l'édition du wiki a tout le monde @@ -2878,8 +2905,14 @@ archive.pull.noreview = Ce dépôt est archivé. Vous ne pouvez pas faire de rev editor.commit_email = Courriel de commit commits.view_single_diff = Voir les changements dans ce fichier introduit par ce commit +issues.filter_no_results = Pas de résultats +issues.filter_no_results_placeholder = Essayez d'ajuster vos critères de recherche. +issues.reopen.blocked_by_user = Vous ne pouvez pas ré-ouvrir ce ticket care vous êtes bloqués par le propriétaire du dépôt ou le créateur de ce ticket. +pulls.editable = Editable +pulls.editable_explanation = Cette pull request peut être éditée par les mainteneurs. Vous pouvez y contribuer directement. + [graphs] -component_loading = Chargement %s... +component_loading = Chargement %s… component_loading_failed = Échec de chargement de %s component_loading_info = Cela peut prendre du temps… @@ -3014,8 +3047,8 @@ teams.invite.by=Invité par %s teams.invite.description=Veuillez cliquer sur le bouton ci-dessous pour rejoindre l’équipe. follow_blocked_user = Vous ne pouvez pas suivre cette organisation car elle vous a bloqué. open_dashboard = Ouvrir le tableau de bord -settings.change_orgname_redirect_prompt.with_cooldown.few = L'ancien pseudonyme sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. -settings.change_orgname_redirect_prompt.with_cooldown.one = L'ancien pseudonyme sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période. +settings.change_orgname_redirect_prompt.with_cooldown.few = L'ancien nom d'organisation sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période. +settings.change_orgname_redirect_prompt.with_cooldown.one = L'ancien nom d'organisation sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période. [admin] dashboard=Tableau de bord @@ -3841,7 +3874,7 @@ alt.registry = Configurez ce registre à partir d'un terminal : alt.registry.install = Pour installer le paquet, exécutez la commande suivante : alt.install = Installer le paquet alt.repository.multiple_groups = Ce paquet est disponible dans plusieurs groupes. -alt.setup = Ajouter un dépôt à la liste des dépôts connecté (choisissez l'architecture nécessaire à la place de '_arch') : +alt.setup = Ajouter un dépôt à la liste des dépôts connecté (choisissez l'architecture nécessaire à la place de "_arch") : [secrets] secrets=Secrets @@ -4006,7 +4039,7 @@ exact_tooltip = Inclure uniquement les résultats qui correspondent exactement a issue_kind = Rechercher dans les tickets… union = Union union_tooltip = Inclus les résultats contenant au moins un des mots clé séparés par des espaces -pull_kind = Rechercher dans les demande d'ajout +pull_kind = Rechercher dans les demande d'ajout… milestone_kind = Recherche dans les jalons... regexp_tooltip = Interpréter le terme de recherche comme une expression régulière regexp = RegExp diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 3d578c6e15..70ce31ec4f 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1412,7 +1412,7 @@ editor.file_is_a_symlink=`"%s" ir simboliska saite. Simboliskās saites tīmekļ editor.filename_is_a_directory=Datnes nosaukums "%s" šajā glabātavā jau tiek izmantos kā mapes nosaukums. editor.file_editing_no_longer_exists=Datne, kas tiek labota ("%s"), šajā glabātavā vairs nepastāv. editor.file_deleting_no_longer_exists=Datne, kas tiek izdzēsta ("%s"), šajā glabātavā vairs nepastāv. -editor.file_changed_while_editing=Datnes saturs ir mainījies kopš labošanas uzsākšanas. Klikšķināt šeit, lai apskatītu vai atkārtoti iesūtītu izmaiņas, lai tās pārrakstītu. +editor.file_changed_while_editing=Datnes saturs ir mainījies kopš tās atvēršanas. Klikšķināt šeit, lai apskatītu vai atkārtoti iesūtītu izmaiņas, lai tās pārrakstītu. editor.file_already_exists=Datne ar nosaukumu "%s" jau pastāv šajā glabātavā. editor.commit_empty_file_header=Iesūtīt tukšu datni editor.commit_empty_file_text=Iesūtāmā datne ir tukša. Turpināt? diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 8bf2b15f89..38d1d885cc 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1399,7 +1399,7 @@ editor.file_is_a_symlink=`«%s» является символической с editor.filename_is_a_directory=Имя файла «%s» уже используется в качестве каталога в этом репозитории. editor.file_editing_no_longer_exists=Редактируемый файл «%s» больше не существует в этом репозитории. editor.file_deleting_no_longer_exists=Удаляемый файл «%s» больше не существует в этом репозитории. -editor.file_changed_while_editing=Содержимое файла изменилось с момента начала редактирования. Нажмите здесь, чтобы увидеть, что было изменено, или Зафиксировать изменения снова, чтобы заменить их. +editor.file_changed_while_editing=Содержимое файла изменилось после того, как он был открыт. Ознакомьтесь с произошедшими изменениями или сохраните ещё раз, чтобы перезаписать их. editor.file_already_exists=Файл с названием «%s» уже существует в этом репозитории. editor.commit_empty_file_header=Закоммитить пустой файл editor.commit_empty_file_text=Файл, который вы собираетесь зафиксировать, пуст. Продолжить? @@ -2237,11 +2237,11 @@ settings.trust_model.default.desc=Использовать фактор дове settings.trust_model.collaborator=Соучастник settings.trust_model.collaborator.long=Соучастник: доверять подписям соучастников settings.trust_model.collaborator.desc=Действительные подписи соучастников этого репозитория будут помечены как «доверенные» (независимо от того, соответствуют ли они автору коммита). В остальных случаях действительные подписи будут помечены как «недоверенные», если подпись соответствует автору коммита, и «не совпадающие», если нет. -settings.trust_model.committer=Коммитер -settings.trust_model.committer.long=Коммитер: доверять подписям, соответствующим коммитерам (соответствует GitHub и требует коммиты, подписанные Forgejo, иметь Forgejo в качестве коммитера) +settings.trust_model.committer=Автор коммита +settings.trust_model.committer.long=Автор коммита: доверять подписям, соответствующим авторам коммитов. Это поведение соответствует GitHub и требует, чтобы коммиты, подписанные Forgejo, имели Forgejo в качестве автора settings.trust_model.committer.desc=Действительные подписи будут помечены «доверенными», только если они соответствуют автору коммита, в противном случае они будут помечены «не совпадающими». Это заставит Forgejo быть автором подписанных коммитов, а фактический автор будет обозначен в трейлерах Co-Authored-By: и Co-Committed-By: коммита. Ключ Forgejo по умолчанию должен соответствовать пользователю в базе данных. -settings.trust_model.collaboratorcommitter=Соучастник+Коммитер -settings.trust_model.collaboratorcommitter.long=Соучастник+Коммитер: доверять подписям соучастников, которые соответствуют автору коммита +settings.trust_model.collaboratorcommitter=Соучастник и автор коммита +settings.trust_model.collaboratorcommitter.long=Соучастник и автор коммита: доверять подписям соучастников, которые соответствуют автору коммита settings.trust_model.collaboratorcommitter.desc=Действительные подписи соучастников этого репозитория будут помечены «доверенными», если они соответствуют автору коммита. Действительные подписи будут помечены как «недоверенные», если подпись соответствует автору коммита, и «не совпадающие» впротивном случае. Это заставит Forgejo быть отмеченным в качестве автора подписанного коммита, а фактический автор будет указан в трейлерах Co-Authored-By: и Co-Committed-By: коммита. Ключ Forgejo по умолчанию должен соответствовать пользователю в базе данных. settings.wiki_delete=Стереть данные вики settings.wiki_delete_desc=Будьте внимательны! Как только вы удалите вики — пути назад не будет. @@ -3694,7 +3694,7 @@ no_subscriptions=Нет подписок default_key=Подписано ключом по умолчанию error.extract_sign=Не удалось извлечь подпись error.generate_hash=Не удалось создать хеш коммита -error.no_committer_account=Учётная запись с эл. почтой этого коммитера не найдена +error.no_committer_account=Учётная запись с эл. почтой автора этого коммита не найдена error.no_gpg_keys_found=Не найден ключ, соответствующий данной подписи error.not_signed_commit=Неподписанный коммит error.failed_retrieval_gpg_keys=Не удалось получить ни одного ключа GPG автора коммита @@ -4051,7 +4051,7 @@ union_tooltip = Включает результаты с совпавшими к union = Обычный milestone_kind = Найти этапы... regexp = Регулярное выражение -regexp_tooltip = Интерпретировать поисковый запрос как регулярное выражение +regexp_tooltip = Поисковый запрос будет воспринят как регулярное выражение [markup] diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 02e157d62b..7d3d6f4c8b 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -299,7 +299,7 @@ disable_gravatar.description=Вимкнути Gravatar або інші стор federated_avatar_lookup=Увімкнути федеровані аватари federated_avatar_lookup.description=Увімкнути зовнішні аватари за допомогою Libravatar. disable_registration=Вимкнути самостійну реєстрацію -disable_registration.description=Тільки адміністратор може створювати нові облікові записи. Наполегливо рекомендуємо залишити реєстрацію вимкненою, якщо ви не збираєтеся розміщувати загальнодоступний екземпляр та сприяти появі величезної кількості спам-акаунтів. +disable_registration.description=Тільки адміністратор може створювати нові облікові записи. Настійно рекомендуємо залишити реєстрацію вимкненою, якщо ви не збираєтеся розміщувати загальнодоступний екземпляр та сприяти появі величезної кількості спам-акаунтів. allow_only_external_registration.description=Користувачам буде дозволено реєструватись лише через налаштовані сторонні сервіси. openid_signin=Увімкнути реєстрацію за допомогою OpenID openid_signin.description=Увімкнути вхід за допомогою OpenID. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 7ce0baa07f..2e062d80b4 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -285,7 +285,7 @@ log_root_path=日志路径 log_root_path_helper=日志文件将写入此目录。 optional_title=可选设置 -email_title=电子邮箱设置 +email_title=电子邮件设置 smtp_addr=SMTP 主机地址 smtp_port=SMTP 端口 smtp_from=电子邮件发件人 @@ -354,7 +354,7 @@ app_slogan = 实例标语 app_slogan_helper = 在此处输入您的实例标语。留空则禁用。 [home] -uname_holder=用户名或电子邮箱 +uname_holder=用户名或电子邮件地址 password_holder=密码 switch_dashboard_context=切换控制面板用户 my_repos=仓库列表 @@ -685,7 +685,7 @@ Description = 描述 Pronouns = 代称 Biography = 简历 username_claiming_cooldown = 用户名不能被认领，因为其仍处于保护期。其可以在%[1]s后被认领。 -email_domain_is_not_allowed = 用户电子邮箱的域名%s与EMAIL_DOMAIN_ALLOWLIST或EMAIL_DOMAIN_BLOCKLIST冲突。请确保您正确设置了电子邮件地址。 +email_domain_is_not_allowed = 用户电子邮件地址的域名%s与EMAIL_DOMAIN_ALLOWLIST或EMAIL_DOMAIN_BLOCKLIST冲突。请确保您正确设置了电子邮件地址。 [user] change_avatar=修改头像… @@ -794,7 +794,7 @@ privacy=隐私设置 keep_activity_private=隐藏个人资料页面中的活动 keep_activity_private_popup=您的活动将只对您自己和本实例的管理员可见 -lookup_avatar_by_mail=使用电子邮箱地址查找头像 +lookup_avatar_by_mail=使用电子邮件地址查找头像 federated_avatar_lookup=查找联合头像 enable_custom_avatar=使用自定义头像 choose_new_avatar=选择新的头像 @@ -828,8 +828,8 @@ activations_pending=等待激活 can_not_add_email_activations_pending=有一个待处理的激活请求，请稍等几分钟后再尝试添加新的电子邮件地址。 delete_email=移除 email_deletion=移除电子邮件地址 -email_deletion_desc=电子邮箱地址和相关信息将会被删除。使用此电子邮箱地址发送的Git提交将会保留，继续？ -email_deletion_success=您的电子邮箱地址已被移除。 +email_deletion_desc=电子邮件地址和相关信息将会被删除。使用此电子邮件地址发送的Git提交将会保留，继续？ +email_deletion_success=您的电子邮件地址已被移除。 theme_update_success=您的主题已更新。 theme_update_error=所选主题不存在。 openid_deletion=移除 OpenID 地址 @@ -3288,7 +3288,7 @@ auths.attribute_username=用户名属性 auths.attribute_username_placeholder=置空将使用Forgejo的用户名。 auths.attribute_name=名字属性 auths.attribute_surname=姓氏属性 -auths.attribute_mail=电子邮箱属性 +auths.attribute_mail=电子邮件地址属性 auths.attribute_ssh_public_key=SSH公钥属性 auths.attribute_avatar=头像属性 auths.attributes_in_bind=从 bind DN 中拉取属性信息 @@ -3719,7 +3719,7 @@ details.project_site=项目站点 details.repository_site=仓库网站 details.documentation_site=文档站点 details.license=许可协议 -assets=文件 +assets=资源 versions=版本 versions.view_all=查看全部 dependency.id=ID diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json index 4e9600a460..6e1f48b82f 100644 --- a/options/locale_next/locale_cs-CZ.json +++ b/options/locale_next/locale_cs-CZ.json @@ -18,5 +18,6 @@ "incorrect_root_url": "Tato instance Forgejo je nastavena tak, aby běžela na adrese „%s“. Vy si momentálně prohlížíte Forgejo na jiné adrese, což může způsobit rozbití některých částí aplikace. Správná adresa je ovládána správci Forgejo pomocí nastavení ROOT_URL v souboru app.ini.", "themes.names.forgejo-auto": "Forgejo (podle motivu systému)", "themes.names.forgejo-light": "Forgejo – světlé", - "themes.names.forgejo-dark": "Forgejo – tmavé" + "themes.names.forgejo-dark": "Forgejo – tmavé", + "install.invalid_lfs_path": "Nepodařilo se vytvořit kořen LFS na zvolené cestě: %[1]s" } diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json index e77315c7be..82e0b309e2 100644 --- a/options/locale_next/locale_de-DE.json +++ b/options/locale_next/locale_de-DE.json @@ -16,5 +16,6 @@ "incorrect_root_url": "Diese Forgejo-Instanz ist konfiguriert, auf „%s“ bereitgestellt zu werden. Du rufst Forgejo über einen anderen URL auf, was dazu führen könnte, dass einige Bereiche nicht funktionieren. Der anerkannte URL wird durch die Forgejo-Admins mittels der Einstellung ROOT_URL in der app.ini kontrolliert.", "themes.names.forgejo-auto": "Forgejo (folge Systemthema)", "themes.names.forgejo-light": "Forgejo hell", - "themes.names.forgejo-dark": "Forgejo dunkel" + "themes.names.forgejo-dark": "Forgejo dunkel", + "install.invalid_lfs_path": "Der LFS-Root konnte nicht am angegebenen Pfad erstellt werden: %[1]s" } diff --git a/options/locale_next/locale_fil.json b/options/locale_next/locale_fil.json index f4cc2bb24a..578c0f480b 100644 --- a/options/locale_next/locale_fil.json +++ b/options/locale_next/locale_fil.json @@ -16,5 +16,6 @@ "home.welcome.activity_hint": "Wala pang laman ang iyong feed. Makikita dito ang iyong mga aksyon at aktibidad mula sa mga repositoryo na pinapanood mo.", "home.explore_repos": "Tuklasin ang mga repositoryo", "home.explore_users": "Tuklasin ang mga user", - "home.explore_orgs": "Tuklasin ang mga organisasyon" + "home.explore_orgs": "Tuklasin ang mga organisasyon", + "install.invalid_lfs_path": "Nabigong gawin ang LFS root sa tinakdang path: %[1]s" } diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json index 4482b9993a..1287ddbf49 100644 --- a/options/locale_next/locale_lv-LV.json +++ b/options/locale_next/locale_lv-LV.json @@ -18,5 +18,6 @@ "incorrect_root_url": "Šis Forgejo serveris ir konfigurēts darboties \"%s\". Pašlaik Forgejo tiek apmeklēta ar atšķirīgu URL, kas var radīt atsevišķu lietotnes daļu salūšanu. Kanonisko URL pārrauga Forgejo pārvaldītāji ar app.ini iestatījumu ROOT_URL.", "themes.names.forgejo-auto": "Forgejo (ievērot sistēmas izskatu)", "themes.names.forgejo-light": "Forgejo gaišais", - "themes.names.forgejo-dark": "Forgejo tumšais" + "themes.names.forgejo-dark": "Forgejo tumšais", + "install.invalid_lfs_path": "Nav iespējams izveidot LFS pamatmapi norādītajā ceļā: %[1]s" } diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json index cf46cb1300..88bbe18b09 100644 --- a/options/locale_next/locale_ru-RU.json +++ b/options/locale_next/locale_ru-RU.json @@ -18,5 +18,6 @@ "incorrect_root_url": "Этот сервер Forgejo расположен по адресу «%s», но вы просматриваете страницу с другого адреса. Это может приводить к поломкам частей приложения. Канонический адрес указывается администратором сервера в файле конфигурации app.ini - ROOT_URL.", "themes.names.forgejo-light": "Forgejo – светлая", "themes.names.forgejo-auto": "Forgejo – как в системе", - "themes.names.forgejo-dark": "Forgejo – тёмная" + "themes.names.forgejo-dark": "Forgejo – тёмная", + "install.invalid_lfs_path": "Не удалось расположить корень LFS по указанному пути: %[1]s" } From bc02a823388f559f0c1932b403d7c32f12df38aa Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Apr 2025 08:53:00 +0000 Subject: [PATCH 135/568] Lock file maintenance (forgejo) (#7534) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7534 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 574 +++++++++++++++-------------- poetry.lock | 14 +- web_src/fomantic/package-lock.json | 134 +++---- 3 files changed, 375 insertions(+), 347 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a67ed0b43..3451613c97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -529,9 +529,9 @@ } }, "node_modules/@emnapi/core": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.0.tgz", - "integrity": "sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.1.tgz", + "integrity": "sha512-4JFstCTaToCFrPqrGzgkF8N2NHjtsaY4uRh6brZQ5L9e4wbMieX8oDT8N7qfVFTQecHFEtkj4ve49VIZ3mKVqw==", "dev": true, "license": "MIT", "optional": true, @@ -541,9 +541,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.0.tgz", - "integrity": "sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.1.tgz", + "integrity": "sha512-LMshMVP0ZhACNjQNYXiU1iZJ6QCcv0lUdPDPugqGvCGXt5xtRVBPdtA0qU12pEXZzpWAhWlZYptfdAFq10DOVQ==", "dev": true, "license": "MIT", "optional": true, @@ -983,9 +983,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", - "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.0.tgz", + "integrity": "sha512-WhCn7Z7TauhBtmzhvKpoQs0Wwb/kBcy4CwpuI0/eEIr2Lx2auxmulAzLr91wVZJaz47iUZdkXOK7WlAfxGKCnA==", "dev": true, "license": "MIT", "dependencies": { @@ -1064,9 +1064,9 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.0.tgz", - "integrity": "sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz", + "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1192,19 +1192,32 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz", - "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", + "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.12.0", + "@eslint/core": "^0.13.0", "levn": "^0.4.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@github/combobox-nav": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@github/combobox-nav/-/combobox-nav-2.3.1.tgz", @@ -2041,15 +2054,15 @@ } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.7.tgz", - "integrity": "sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.8.tgz", + "integrity": "sha512-OBlgKdX7gin7OIq4fadsjpg+cp2ZphvAIKucHsNfTdJiqdOmOEwQd/bHi0VwNrcw5xpBJyUw6cK/QilCqy1BSg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "^1.3.1", - "@emnapi/runtime": "^1.3.1", + "@emnapi/core": "^1.4.0", + "@emnapi/runtime": "^1.4.0", "@tybys/wasm-util": "^0.9.0" } }, @@ -2201,9 +2214,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.38.0.tgz", - "integrity": "sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz", + "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==", "cpu": [ "arm" ], @@ -2215,9 +2228,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.38.0.tgz", - "integrity": "sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz", + "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==", "cpu": [ "arm64" ], @@ -2229,9 +2242,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.38.0.tgz", - "integrity": "sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz", + "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==", "cpu": [ "arm64" ], @@ -2243,9 +2256,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.38.0.tgz", - "integrity": "sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz", + "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==", "cpu": [ "x64" ], @@ -2257,9 +2270,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.38.0.tgz", - "integrity": "sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz", + "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==", "cpu": [ "arm64" ], @@ -2271,9 +2284,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.38.0.tgz", - "integrity": "sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz", + "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==", "cpu": [ "x64" ], @@ -2285,9 +2298,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.38.0.tgz", - "integrity": "sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz", + "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==", "cpu": [ "arm" ], @@ -2299,9 +2312,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.38.0.tgz", - "integrity": "sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz", + "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==", "cpu": [ "arm" ], @@ -2313,9 +2326,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.38.0.tgz", - "integrity": "sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz", + "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==", "cpu": [ "arm64" ], @@ -2327,9 +2340,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.38.0.tgz", - "integrity": "sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz", + "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==", "cpu": [ "arm64" ], @@ -2341,9 +2354,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.38.0.tgz", - "integrity": "sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz", + "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==", "cpu": [ "loong64" ], @@ -2355,9 +2368,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.38.0.tgz", - "integrity": "sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz", + "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==", "cpu": [ "ppc64" ], @@ -2369,9 +2382,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.38.0.tgz", - "integrity": "sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz", + "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==", "cpu": [ "riscv64" ], @@ -2383,9 +2396,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz", - "integrity": "sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz", + "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==", "cpu": [ "riscv64" ], @@ -2397,9 +2410,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.38.0.tgz", - "integrity": "sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz", + "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==", "cpu": [ "s390x" ], @@ -2411,9 +2424,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.38.0.tgz", - "integrity": "sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz", + "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==", "cpu": [ "x64" ], @@ -2425,9 +2438,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.38.0.tgz", - "integrity": "sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz", + "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==", "cpu": [ "x64" ], @@ -2439,9 +2452,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.38.0.tgz", - "integrity": "sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz", + "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==", "cpu": [ "arm64" ], @@ -2453,9 +2466,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.38.0.tgz", - "integrity": "sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz", + "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==", "cpu": [ "ia32" ], @@ -2467,9 +2480,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.38.0.tgz", - "integrity": "sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz", + "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==", "cpu": [ "x64" ], @@ -3426,12 +3439,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.13.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz", - "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==", + "version": "22.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", + "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "license": "MIT", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~6.21.0" } }, "node_modules/@types/normalize-package-data": { @@ -3675,9 +3688,9 @@ } }, "node_modules/@unrs/resolver-binding-darwin-arm64": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.3.3.tgz", - "integrity": "sha512-EpRILdWr3/xDa/7MoyfO7JuBIJqpBMphtu4+80BK1bRfFcniVT74h3Z7q1+WOc92FuIAYatB1vn9TJR67sORGw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.5.0.tgz", + "integrity": "sha512-YmocNlEcX/AgJv8gI41bhjMOTcKcea4D2nRIbZj+MhRtSH5+vEU8r/pFuTuoF+JjVplLsBueU+CILfBPVISyGQ==", "cpu": [ "arm64" ], @@ -3689,9 +3702,9 @@ ] }, "node_modules/@unrs/resolver-binding-darwin-x64": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.3.3.tgz", - "integrity": "sha512-ntj/g7lPyqwinMJWZ+DKHBse8HhVxswGTmNgFKJtdgGub3M3zp5BSZ3bvMP+kBT6dnYJLSVlDqdwOq1P8i0+/g==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.5.0.tgz", + "integrity": "sha512-qpUrXgH4e/0xu1LOhPEdfgSY3vIXOxDQv370NEL8npN8h40HcQDA+Pl2r4HBW6tTXezWIjxUFcP7tj529RZtDw==", "cpu": [ "x64" ], @@ -3703,9 +3716,9 @@ ] }, "node_modules/@unrs/resolver-binding-freebsd-x64": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.3.3.tgz", - "integrity": "sha512-l6BT8f2CU821EW7U8hSUK8XPq4bmyTlt9Mn4ERrfjJNoCw0/JoHAh9amZZtV3cwC3bwwIat+GUnrcHTG9+qixw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.5.0.tgz", + "integrity": "sha512-3tX8r8vgjvZzaJZB4jvxUaaFCDCb3aWDCpZN3EjhGnnwhztslI05KSG5NY/jNjlcZ5QWZ7dEZZ/rNBFsmTaSPw==", "cpu": [ "x64" ], @@ -3717,9 +3730,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.3.3.tgz", - "integrity": "sha512-8ScEc5a4y7oE2BonRvzJ+2GSkBaYWyh0/Ko4Q25e/ix6ANpJNhwEPZvCR6GVRmsQAYMIfQvYLdM6YEN+qRjnAQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.5.0.tgz", + "integrity": "sha512-FH+ixzBKaUU9fWOj3TYO+Yn/eO6kYvMLV9eNJlJlkU7OgrxkCmiMS6wUbyT0KA3FOZGxnEQ2z3/BHgYm2jqeLA==", "cpu": [ "arm" ], @@ -3731,9 +3744,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.3.3.tgz", - "integrity": "sha512-8qQ6l1VTzLNd3xb2IEXISOKwMGXDCzY/UNy/7SovFW2Sp0K3YbL7Ao7R18v6SQkLqQlhhqSBIFRk+u6+qu5R5A==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.5.0.tgz", + "integrity": "sha512-pxCgXMgwB/4PfqFQg73lMhmWwcC0j5L+dNXhZoz/0ek0iS/oAWl65fxZeT/OnU7fVs52MgdP2q02EipqJJXHSg==", "cpu": [ "arm" ], @@ -3745,9 +3758,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.3.3.tgz", - "integrity": "sha512-v81R2wjqcWXJlQY23byqYHt9221h4anQ6wwN64oMD/WAE+FmxPHFZee5bhRkNVtzqO/q7wki33VFWlhiADwUeQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.5.0.tgz", + "integrity": "sha512-FX2FV7vpLE/+Z0NZX9/1pwWud5Wocm/2PgpUXbT5aSV3QEB10kBPJAzssOQylvdj8mOHoKl5pVkXpbCwww/T2g==", "cpu": [ "arm64" ], @@ -3759,9 +3772,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm64-musl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.3.3.tgz", - "integrity": "sha512-cAOx/j0u5coMg4oct/BwMzvWJdVciVauUvsd+GQB/1FZYKQZmqPy0EjJzJGbVzFc6gbnfEcSqvQE6gvbGf2N8Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.5.0.tgz", + "integrity": "sha512-+gF97xst1BZb28T3nwwzEtq2ewCoMDGKsenYsZuvpmNrW0019G1iUAunZN+FG55L21y+uP7zsGX06OXDQ/viKw==", "cpu": [ "arm64" ], @@ -3773,9 +3786,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.3.3.tgz", - "integrity": "sha512-mq2blqwErgDJD4gtFDlTX/HZ7lNP8YCHYFij2gkXPtMzrXxPW1hOtxL6xg4NWxvnj4bppppb0W3s/buvM55yfg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.5.0.tgz", + "integrity": "sha512-5bEmVcQw9js8JYM2LkUBw5SeELSIxX+qKf9bFrfFINKAp4noZ//hUxLpbF7u/3gTBN1GsER6xOzIZlw/VTdXtA==", "cpu": [ "ppc64" ], @@ -3786,10 +3799,24 @@ "linux" ] }, + "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.5.0.tgz", + "integrity": "sha512-GGk/8TPUsf1Q99F+lzMdjE6sGL26uJCwQ9TlvBs8zR3cLQNw/MIumPN7zrs3GFGySjnwXc8gA6J3HKbejywmqA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.3.3.tgz", - "integrity": "sha512-u0VRzfFYysarYHnztj2k2xr+eu9rmgoTUUgCCIT37Nr+j0A05Xk2c3RY8Mh5+DhCl2aYibihnaAEJHeR0UOFIQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.5.0.tgz", + "integrity": "sha512-5uRkFYYVNAeVaA4W/CwugjFN3iDOHCPqsBLCCOoJiMfFMMz4evBRsg+498OFa9w6VcTn2bD5aI+RRayaIgk2Sw==", "cpu": [ "s390x" ], @@ -3801,9 +3828,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-x64-gnu": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.3.3.tgz", - "integrity": "sha512-OrVo5ZsG29kBF0Ug95a2KidS16PqAMmQNozM6InbquOfW/udouk063e25JVLqIBhHLB2WyBnixOQ19tmeC/hIg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.5.0.tgz", + "integrity": "sha512-j905CZH3nehYy6NimNqC2B14pxn4Ltd7guKMyPTzKehbFXTUgihQS/ZfHQTdojkMzbSwBOSgq1dOrY+IpgxDsA==", "cpu": [ "x64" ], @@ -3815,9 +3842,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-x64-musl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.3.3.tgz", - "integrity": "sha512-PYnmrwZ4HMp9SkrOhqPghY/aoL+Rtd4CQbr93GlrRTjK6kDzfMfgz3UH3jt6elrQAfupa1qyr1uXzeVmoEAxUA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.5.0.tgz", + "integrity": "sha512-dmLevQTuzQRwu5A+mvj54R5aye5I4PVKiWqGxg8tTaYP2k2oTs/3Mo8mgnhPk28VoYCi0fdFYpgzCd4AJndQvQ==", "cpu": [ "x64" ], @@ -3829,9 +3856,9 @@ ] }, "node_modules/@unrs/resolver-binding-wasm32-wasi": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.3.3.tgz", - "integrity": "sha512-81AnQY6fShmktQw4hWDUIilsKSdvr/acdJ5azAreu2IWNlaJOKphJSsUVWE+yCk6kBMoQyG9ZHCb/krb5K0PEA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.5.0.tgz", + "integrity": "sha512-LtJMhwu7avhoi+kKfAZOKN773RtzLBVVF90YJbB0wyMpUj9yQPeA+mteVUI9P70OG/opH47FeV5AWeaNWWgqJg==", "cpu": [ "wasm32" ], @@ -3839,16 +3866,16 @@ "license": "MIT", "optional": true, "dependencies": { - "@napi-rs/wasm-runtime": "^0.2.7" + "@napi-rs/wasm-runtime": "^0.2.8" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.3.3.tgz", - "integrity": "sha512-X/42BMNw7cW6xrB9syuP5RusRnWGoq+IqvJO8IDpp/BZg64J1uuIW6qA/1Cl13Y4LyLXbJVYbYNSKwR/FiHEng==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.5.0.tgz", + "integrity": "sha512-FTZBxLL4SO1mgIM86KykzJmPeTPisBDHQV6xtfDXbTMrentuZ6SdQKJUV5BWaoUK3p8kIULlrCcucqdCnk8Npg==", "cpu": [ "arm64" ], @@ -3860,9 +3887,9 @@ ] }, "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.3.3.tgz", - "integrity": "sha512-EGNnNGQxMU5aTN7js3ETYvuw882zcO+dsVjs+DwO2j/fRVKth87C8e2GzxW1L3+iWAXMyJhvFBKRavk9Og1Z6A==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.5.0.tgz", + "integrity": "sha512-i5bB7vJ1waUsFciU/FKLd4Zw0VnAkvhiJ4//jYQXyDUuiLKodmtQZVTcOPU7pp97RrNgCFtXfC1gnvj/DHPJTw==", "cpu": [ "ia32" ], @@ -3874,9 +3901,9 @@ ] }, "node_modules/@unrs/resolver-binding-win32-x64-msvc": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.3.3.tgz", - "integrity": "sha512-GraLbYqOJcmW1qY3osB+2YIiD62nVf2/bVLHZmrb4t/YSUwE03l7TwcDJl08T/Tm3SVhepX8RQkpzWbag/Sb4w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.5.0.tgz", + "integrity": "sha512-wAvXp4k7jhioi4SebXW/yfzzYwsUCr9kIX4gCsUFKpCTUf8Mi7vScJXI3S+kupSUf0LbVHudR8qBbe2wFMSNUw==", "cpu": [ "x64" ], @@ -5005,14 +5032,14 @@ } }, "node_modules/cacheable": { - "version": "1.8.9", - "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.8.9.tgz", - "integrity": "sha512-FicwAUyWnrtnd4QqYAoRlNs44/a1jTL7XDKqm5gJ90wz1DQPlC7U2Rd1Tydpv+E7WAr4sQHuw8Q8M3nZMAyecQ==", + "version": "1.8.10", + "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.8.10.tgz", + "integrity": "sha512-0ZnbicB/N2R6uziva8l6O6BieBklArWyiGx4GkwAhLKhSHyQtRfM9T1nx7HHuHDKkYB/efJQhz3QJ6x/YqoZzA==", "dev": true, "license": "MIT", "dependencies": { - "hookified": "^1.7.1", - "keyv": "^5.3.1" + "hookified": "^1.8.1", + "keyv": "^5.3.2" } }, "node_modules/cacheable/node_modules/keyv": { @@ -5094,9 +5121,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001713", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz", + "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==", "funding": [ { "type": "opencollective", @@ -5505,9 +5532,9 @@ "license": "MIT" }, "node_modules/confbox": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.1.tgz", - "integrity": "sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz", + "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==", "license": "MIT" }, "node_modules/config-chain": { @@ -5740,9 +5767,9 @@ "license": "MIT" }, "node_modules/cytoscape": { - "version": "3.31.1", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.31.1.tgz", - "integrity": "sha512-Hx5Mtb1+hnmAKaZZ/7zL1Y5HTFYOjdDswZy/jD+1WINRU8KVi1B7+vlHdsTwY+VCFucTreoyu1RDzQJ9u0d2Hw==", + "version": "3.31.2", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.31.2.tgz", + "integrity": "sha512-/eOXg2uGdMdpGlEes5Sf6zE+jUG+05f3htFNQIxLxduOH/SsaUZiPBfAwP1btVIVzsnhiNOdi+hvDRLYfMZjGw==", "license": "MIT", "engines": { "node": ">=0.10" @@ -6557,9 +6584,9 @@ } }, "node_modules/dompurify": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", - "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz", + "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" @@ -6660,9 +6687,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.128", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz", - "integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==", + "version": "1.5.136", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.136.tgz", + "integrity": "sha512-kL4+wUTD7RSA5FHx5YwWtjDnEEkIIikFgWHR4P6fqjw1PPLlqYkxeOb++wAauAssat0YClCy8Y3C5SxgSkjibQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -7064,9 +7091,9 @@ } }, "node_modules/eslint-compat-utils": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz", - "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.5.tgz", + "integrity": "sha512-vAUHYzue4YAa2hNACjB8HvUQj5yehAZgiClyFVVom9cP8z5NSFq3PwB/TtJslN2zAMgRX6FCFCjYBbQh71g5RQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7611,9 +7638,9 @@ } }, "node_modules/expect-type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.0.tgz", - "integrity": "sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz", + "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -8380,9 +8407,9 @@ } }, "node_modules/hookified": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.8.1.tgz", - "integrity": "sha512-GrO2l93P8xCWBSTBX9l2BxI78VU/MAAYag+pG8curS3aBGy0++ZlxrQ7PdUOUVMbn5BwkGb6+eRrnf43ipnFEA==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.8.2.tgz", + "integrity": "sha512-5nZbBNP44sFCDjSoB//0N7m508APCgbQ4mGGo1KJGBYyCKNHfry1Pvd0JVHZIxjdnqn8nFRBAN/eFB6Rk/4w5w==", "dev": true, "license": "MIT" }, @@ -8585,9 +8612,9 @@ } }, "node_modules/index-to-position": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.0.0.tgz", - "integrity": "sha512-sCO7uaLVhRJ25vz1o8s9IFM3nVS4DkuQnyjMwiQPKvQuBYBDmb8H7zx8ki7nVh4HJQOdVWebyvLE0qt+clruxA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.1.0.tgz", + "integrity": "sha512-XPdx9Dq4t9Qk1mTMbWONJqU7boCoumEH7fRET37HX5+khDUl3J2W6PdALxhILYlIYx2amlwYcRPp28p0tSiojg==", "dev": true, "license": "MIT", "engines": { @@ -10201,9 +10228,9 @@ "license": "MIT" }, "node_modules/mermaid/node_modules/marked": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", - "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==", + "version": "15.0.8", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.8.tgz", + "integrity": "sha512-rli4l2LyZqpQuRve5C0rkn6pj3hT8EWPC+zkAxFTAJLxRbENfTAhEQq9itrmf1Y81QtAX5D/MYlGlIomNgj9lA==", "license": "MIT", "bin": { "marked": "bin/marked.js" @@ -11703,41 +11730,6 @@ "postcss": "^8.4.21" } }, - "node_modules/postcss-load-config": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", - "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "lilconfig": "^3.0.0", - "yaml": "^2.3.4" - }, - "engines": { - "node": ">= 14" - }, - "peerDependencies": { - "postcss": ">=8.0.9", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, "node_modules/postcss-loader": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz", @@ -12337,15 +12329,15 @@ } }, "node_modules/read-pkg/node_modules/parse-json": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.2.0.tgz", - "integrity": "sha512-eONBZy4hm2AgxjNFd8a4nyDJnzUAH0g34xSQAwWEVGCjdZ4ZL7dKZBfq267GWP/JaS9zW62Xs2FeAdDvpHHJGQ==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.3.0.tgz", + "integrity": "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "index-to-position": "^1.0.0", - "type-fest": "^4.37.0" + "index-to-position": "^1.1.0", + "type-fest": "^4.39.1" }, "engines": { "node": ">=18" @@ -13311,9 +13303,9 @@ } }, "node_modules/std-env": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.1.tgz", - "integrity": "sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz", + "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==", "dev": true, "license": "MIT" }, @@ -13627,25 +13619,25 @@ "license": "MIT" }, "node_modules/stylelint/node_modules/file-entry-cache": { - "version": "10.0.7", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.0.7.tgz", - "integrity": "sha512-txsf5fu3anp2ff3+gOJJzRImtrtm/oa9tYLN0iTuINZ++EyVR/nRrg2fKYwvG/pXDofcrvvb0scEbX3NyW/COw==", + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.0.8.tgz", + "integrity": "sha512-FGXHpfmI4XyzbLd3HQ8cbUcsFGohJpZtmQRHr8z8FxxtCe2PcpgIlVLwIgunqjvRmXypBETvwhV4ptJizA+Y1Q==", "dev": true, "license": "MIT", "dependencies": { - "flat-cache": "^6.1.7" + "flat-cache": "^6.1.8" } }, "node_modules/stylelint/node_modules/flat-cache": { - "version": "6.1.7", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.7.tgz", - "integrity": "sha512-qwZ4xf1v1m7Rc9XiORly31YaChvKt6oNVHuqqZcoED/7O+ToyNVGobKsIAopY9ODcWpEDKEBAbrSOCBHtNQvew==", + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.8.tgz", + "integrity": "sha512-R6MaD3nrJAtO7C3QOuS79ficm2pEAy++TgEUD8ii1LVlbcgZ9DtASLkt9B+RZSFCzm7QHDMlXPsqqB6W2Pfr1Q==", "dev": true, "license": "MIT", "dependencies": { "cacheable": "^1.8.9", "flatted": "^3.3.3", - "hookified": "^1.7.1" + "hookified": "^1.8.1" } }, "node_modules/stylelint/node_modules/ignore": { @@ -14018,6 +14010,41 @@ "node": ">=14.0.0" } }, + "node_modules/tailwindcss/node_modules/postcss-load-config": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", + "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "lilconfig": "^3.0.0", + "yaml": "^2.3.4" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "postcss": ">=8.0.9", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -14395,9 +14422,9 @@ } }, "node_modules/type-fest": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz", - "integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==", + "version": "4.39.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.39.1.tgz", + "integrity": "sha512-uW9qzd66uyHYxwyVBYiwS4Oi0qZyUqwjU+Oevr6ZogYiXt99EOYtwvzMSLw1c3lYo2HzJsep/NB23iEVEgjG/w==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -14536,9 +14563,9 @@ "license": "MIT" }, "node_modules/ufo": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", - "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz", + "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==", "license": "MIT" }, "node_modules/uint8-to-base64": { @@ -14567,9 +14594,9 @@ } }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "license": "MIT" }, "node_modules/unicorn-magic": { @@ -14596,30 +14623,31 @@ } }, "node_modules/unrs-resolver": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.3.3.tgz", - "integrity": "sha512-PFLAGQzYlyjniXdbmQ3dnGMZJXX5yrl2YS4DLRfR3BhgUsE1zpRIrccp9XMOGRfIHpdFvCn/nr5N1KMVda4x3A==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.5.0.tgz", + "integrity": "sha512-6aia3Oy7SEe0MuUGQm2nsyob0L2+g57w178K5SE/3pvSGAIp28BB2O921fKx424Ahc/gQ6v0DXFbhcpyhGZdOA==", "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/JounQin" }, "optionalDependencies": { - "@unrs/resolver-binding-darwin-arm64": "1.3.3", - "@unrs/resolver-binding-darwin-x64": "1.3.3", - "@unrs/resolver-binding-freebsd-x64": "1.3.3", - "@unrs/resolver-binding-linux-arm-gnueabihf": "1.3.3", - "@unrs/resolver-binding-linux-arm-musleabihf": "1.3.3", - "@unrs/resolver-binding-linux-arm64-gnu": "1.3.3", - "@unrs/resolver-binding-linux-arm64-musl": "1.3.3", - "@unrs/resolver-binding-linux-ppc64-gnu": "1.3.3", - "@unrs/resolver-binding-linux-s390x-gnu": "1.3.3", - "@unrs/resolver-binding-linux-x64-gnu": "1.3.3", - "@unrs/resolver-binding-linux-x64-musl": "1.3.3", - "@unrs/resolver-binding-wasm32-wasi": "1.3.3", - "@unrs/resolver-binding-win32-arm64-msvc": "1.3.3", - "@unrs/resolver-binding-win32-ia32-msvc": "1.3.3", - "@unrs/resolver-binding-win32-x64-msvc": "1.3.3" + "@unrs/resolver-binding-darwin-arm64": "1.5.0", + "@unrs/resolver-binding-darwin-x64": "1.5.0", + "@unrs/resolver-binding-freebsd-x64": "1.5.0", + "@unrs/resolver-binding-linux-arm-gnueabihf": "1.5.0", + "@unrs/resolver-binding-linux-arm-musleabihf": "1.5.0", + "@unrs/resolver-binding-linux-arm64-gnu": "1.5.0", + "@unrs/resolver-binding-linux-arm64-musl": "1.5.0", + "@unrs/resolver-binding-linux-ppc64-gnu": "1.5.0", + "@unrs/resolver-binding-linux-riscv64-gnu": "1.5.0", + "@unrs/resolver-binding-linux-s390x-gnu": "1.5.0", + "@unrs/resolver-binding-linux-x64-gnu": "1.5.0", + "@unrs/resolver-binding-linux-x64-musl": "1.5.0", + "@unrs/resolver-binding-wasm32-wasi": "1.5.0", + "@unrs/resolver-binding-win32-arm64-msvc": "1.5.0", + "@unrs/resolver-binding-win32-ia32-msvc": "1.5.0", + "@unrs/resolver-binding-win32-x64-msvc": "1.5.0" } }, "node_modules/update-browserslist-db": { @@ -14726,9 +14754,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.3.tgz", - "integrity": "sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==", + "version": "6.2.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz", + "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==", "dev": true, "license": "MIT", "dependencies": { @@ -14879,9 +14907,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.38.0.tgz", - "integrity": "sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz", + "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==", "dev": true, "license": "MIT", "dependencies": { @@ -14895,26 +14923,26 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.38.0", - "@rollup/rollup-android-arm64": "4.38.0", - "@rollup/rollup-darwin-arm64": "4.38.0", - "@rollup/rollup-darwin-x64": "4.38.0", - "@rollup/rollup-freebsd-arm64": "4.38.0", - "@rollup/rollup-freebsd-x64": "4.38.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.38.0", - "@rollup/rollup-linux-arm-musleabihf": "4.38.0", - "@rollup/rollup-linux-arm64-gnu": "4.38.0", - "@rollup/rollup-linux-arm64-musl": "4.38.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.38.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.38.0", - "@rollup/rollup-linux-riscv64-gnu": "4.38.0", - "@rollup/rollup-linux-riscv64-musl": "4.38.0", - "@rollup/rollup-linux-s390x-gnu": "4.38.0", - "@rollup/rollup-linux-x64-gnu": "4.38.0", - "@rollup/rollup-linux-x64-musl": "4.38.0", - "@rollup/rollup-win32-arm64-msvc": "4.38.0", - "@rollup/rollup-win32-ia32-msvc": "4.38.0", - "@rollup/rollup-win32-x64-msvc": "4.38.0", + "@rollup/rollup-android-arm-eabi": "4.40.0", + "@rollup/rollup-android-arm64": "4.40.0", + "@rollup/rollup-darwin-arm64": "4.40.0", + "@rollup/rollup-darwin-x64": "4.40.0", + "@rollup/rollup-freebsd-arm64": "4.40.0", + "@rollup/rollup-freebsd-x64": "4.40.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.40.0", + "@rollup/rollup-linux-arm-musleabihf": "4.40.0", + "@rollup/rollup-linux-arm64-gnu": "4.40.0", + "@rollup/rollup-linux-arm64-musl": "4.40.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.40.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0", + "@rollup/rollup-linux-riscv64-gnu": "4.40.0", + "@rollup/rollup-linux-riscv64-musl": "4.40.0", + "@rollup/rollup-linux-s390x-gnu": "4.40.0", + "@rollup/rollup-linux-x64-gnu": "4.40.0", + "@rollup/rollup-linux-x64-musl": "4.40.0", + "@rollup/rollup-win32-arm64-msvc": "4.40.0", + "@rollup/rollup-win32-ia32-msvc": "4.40.0", + "@rollup/rollup-win32-x64-msvc": "4.40.0", "fsevents": "~2.3.2" } }, @@ -15086,9 +15114,9 @@ "license": "MIT" }, "node_modules/vue-eslint-parser": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.1.1.tgz", - "integrity": "sha512-bh2Z/Au5slro9QJ3neFYLanZtb1jH+W2bKqGHXAoYD4vZgNG3KeotL7JpPv5xzY4UXUXJl7TrIsnzECH63kd3Q==", + "version": "10.1.3", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.1.3.tgz", + "integrity": "sha512-dbCBnd2e02dYWsXoqX5yKUZlOt+ExIpq7hmHKPb5ZqKcjf++Eo0hMseFTZMLKThrUk61m+Uv6A2YSBve6ZvuDQ==", "dev": true, "license": "MIT", "peer": true, diff --git a/poetry.lock b/poetry.lock index 4f0a372ef5..c7bb49a92d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -130,17 +130,17 @@ six = ">=1.13.0" [[package]] name = "json5" -version = "0.10.0" +version = "0.12.0" description = "A Python implementation of the JSON5 data format." optional = false python-versions = ">=3.8.0" files = [ - {file = "json5-0.10.0-py3-none-any.whl", hash = "sha256:19b23410220a7271e8377f81ba8aacba2fdd56947fbb137ee5977cbe1f5e8dfa"}, - {file = "json5-0.10.0.tar.gz", hash = "sha256:e66941c8f0a02026943c52c2eb34ebeb2a6f819a0be05920a6f5243cd30fd559"}, + {file = "json5-0.12.0-py3-none-any.whl", hash = "sha256:6d37aa6c08b0609f16e1ec5ff94697e2cbbfbad5ac112afa05794da9ab7810db"}, + {file = "json5-0.12.0.tar.gz", hash = "sha256:0b4b6ff56801a1c7dc817b0241bca4ce474a0e6a163bfef3fc594d3fd263ff3a"}, ] [package.extras] -dev = ["build (==1.2.2.post1)", "coverage (==7.5.3)", "mypy (==1.13.0)", "pip (==24.3.1)", "pylint (==3.2.3)", "ruff (==0.7.3)", "twine (==5.1.1)", "uv (==0.5.1)"] +dev = ["build (==1.2.2.post1)", "coverage (==7.5.4)", "coverage (==7.8.0)", "mypy (==1.14.1)", "mypy (==1.15.0)", "pip (==25.0.1)", "pylint (==3.2.7)", "pylint (==3.3.6)", "ruff (==0.11.2)", "twine (==6.1.0)", "uv (==0.6.11)"] [[package]] name = "pathspec" @@ -393,13 +393,13 @@ telegram = ["requests"] [[package]] name = "typing-extensions" -version = "4.13.0" +version = "4.13.2" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.13.0-py3-none-any.whl", hash = "sha256:c8dd92cc0d6425a97c18fbb9d1954e5ff92c1ca881a309c45f06ebc0b79058e5"}, - {file = "typing_extensions-4.13.0.tar.gz", hash = "sha256:0a4ac55a5820789d87e297727d229866c9650f6521b64206413c4fbada24d95b"}, + {file = "typing_extensions-4.13.2-py3-none-any.whl", hash = "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c"}, + {file = "typing_extensions-4.13.2.tar.gz", hash = "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"}, ] [[package]] diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index 9d5ec0ca2a..72b04caf36 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -132,17 +132,17 @@ } }, "node_modules/@octokit/core": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.4.tgz", - "integrity": "sha512-lAS9k7d6I0MPN+gb9bKDt7X8SdxknYqAMh44S5L+lNqIN2NuV8nvv3g8rPp7MuRxcOpxpUIATWprO0C34a8Qmg==", + "version": "6.1.5", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.5.tgz", + "integrity": "sha512-vvmsN0r7rguA+FySiCsbaTTobSftpIDIpPW81trAmsv9TGxg3YCujAxRYp/Uy8xmDgYCzzgulG62H7KYUFmeIg==", "license": "MIT", "peer": true, "dependencies": { "@octokit/auth-token": "^5.0.0", - "@octokit/graphql": "^8.1.2", - "@octokit/request": "^9.2.1", - "@octokit/request-error": "^6.1.7", - "@octokit/types": "^13.6.2", + "@octokit/graphql": "^8.2.2", + "@octokit/request": "^9.2.3", + "@octokit/request-error": "^6.1.8", + "@octokit/types": "^14.0.0", "before-after-hook": "^3.0.2", "universal-user-agent": "^7.0.0" }, @@ -161,13 +161,13 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/endpoint": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz", - "integrity": "sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==", + "version": "10.1.4", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz", + "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2", + "@octokit/types": "^14.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -175,22 +175,22 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/openapi-types": { - "version": "24.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz", - "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==", + "version": "25.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.0.0.tgz", + "integrity": "sha512-FZvktFu7HfOIJf2BScLKIEYjDsw6RKc7rBJCdvCTfKsVnx2GEB/Nbzjr29DUdb7vQhlzS/j8qDzdditP0OC6aw==", "license": "MIT", "peer": true }, "node_modules/@octokit/core/node_modules/@octokit/request": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.2.tgz", - "integrity": "sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==", + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.3.tgz", + "integrity": "sha512-Ma+pZU8PXLOEYzsWf0cn/gY+ME57Wq8f49WTXA8FMHp2Ps9djKw//xYJ1je8Hm0pR2lU9FUGeJRWOtxq6olt4w==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/endpoint": "^10.1.3", - "@octokit/request-error": "^6.1.7", - "@octokit/types": "^13.6.2", + "@octokit/endpoint": "^10.1.4", + "@octokit/request-error": "^6.1.8", + "@octokit/types": "^14.0.0", "fast-content-type-parse": "^2.0.0", "universal-user-agent": "^7.0.2" }, @@ -199,26 +199,26 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/request-error": { - "version": "6.1.7", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.7.tgz", - "integrity": "sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==", + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.8.tgz", + "integrity": "sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2" + "@octokit/types": "^14.0.0" }, "engines": { "node": ">= 18" } }, "node_modules/@octokit/core/node_modules/@octokit/types": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz", - "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.0.0.tgz", + "integrity": "sha512-VVmZP0lEhbo2O1pdq63gZFiGCKkm8PPp8AUOijlwPO6hojEVjspA0MWKP7E4hbvGxzFKNqKr6p0IYtOH/Wf/zA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/openapi-types": "^24.2.0" + "@octokit/openapi-types": "^25.0.0" } }, "node_modules/@octokit/core/node_modules/before-after-hook": { @@ -253,14 +253,14 @@ "license": "ISC" }, "node_modules/@octokit/graphql": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.1.tgz", - "integrity": "sha512-n57hXtOoHrhwTWdvhVkdJHdhTv0JstjDbDRhJfwIRNfFqmSo1DaK/mD2syoNUoLCyqSjBpGAKOG0BuwF392slw==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.2.tgz", + "integrity": "sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/request": "^9.2.2", - "@octokit/types": "^13.8.0", + "@octokit/request": "^9.2.3", + "@octokit/types": "^14.0.0", "universal-user-agent": "^7.0.0" }, "engines": { @@ -268,13 +268,13 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/endpoint": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz", - "integrity": "sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==", + "version": "10.1.4", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz", + "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2", + "@octokit/types": "^14.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -282,22 +282,22 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": { - "version": "24.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz", - "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==", + "version": "25.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.0.0.tgz", + "integrity": "sha512-FZvktFu7HfOIJf2BScLKIEYjDsw6RKc7rBJCdvCTfKsVnx2GEB/Nbzjr29DUdb7vQhlzS/j8qDzdditP0OC6aw==", "license": "MIT", "peer": true }, "node_modules/@octokit/graphql/node_modules/@octokit/request": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.2.tgz", - "integrity": "sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==", + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.3.tgz", + "integrity": "sha512-Ma+pZU8PXLOEYzsWf0cn/gY+ME57Wq8f49WTXA8FMHp2Ps9djKw//xYJ1je8Hm0pR2lU9FUGeJRWOtxq6olt4w==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/endpoint": "^10.1.3", - "@octokit/request-error": "^6.1.7", - "@octokit/types": "^13.6.2", + "@octokit/endpoint": "^10.1.4", + "@octokit/request-error": "^6.1.8", + "@octokit/types": "^14.0.0", "fast-content-type-parse": "^2.0.0", "universal-user-agent": "^7.0.2" }, @@ -306,26 +306,26 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/request-error": { - "version": "6.1.7", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.7.tgz", - "integrity": "sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==", + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.8.tgz", + "integrity": "sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2" + "@octokit/types": "^14.0.0" }, "engines": { "node": ">= 18" } }, "node_modules/@octokit/graphql/node_modules/@octokit/types": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz", - "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.0.0.tgz", + "integrity": "sha512-VVmZP0lEhbo2O1pdq63gZFiGCKkm8PPp8AUOijlwPO6hojEVjspA0MWKP7E4hbvGxzFKNqKr6p0IYtOH/Wf/zA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/openapi-types": "^24.2.0" + "@octokit/openapi-types": "^25.0.0" } }, "node_modules/@octokit/graphql/node_modules/universal-user-agent": { @@ -494,12 +494,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.13.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz", - "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==", + "version": "22.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", + "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "license": "MIT", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~6.21.0" } }, "node_modules/@types/vinyl": { @@ -1249,9 +1249,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001713", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz", + "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==", "funding": [ { "type": "opencollective", @@ -2005,9 +2005,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.128", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz", - "integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==", + "version": "1.5.136", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.136.tgz", + "integrity": "sha512-kL4+wUTD7RSA5FHx5YwWtjDnEEkIIikFgWHR4P6fqjw1PPLlqYkxeOb++wAauAssat0YClCy8Y3C5SxgSkjibQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -8226,9 +8226,9 @@ } }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "license": "MIT" }, "node_modules/union-value": { From 8665bbc08516eda423e1382681447b07e60b1c1f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Apr 2025 10:39:25 +0000 Subject: [PATCH 136/568] Update renovate to v39.240.1 (forgejo) (#7532) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [data.forgejo.org/renovate/renovate](https://renovatebot.com) ([source](https://github.com/renovatebot/renovate)) | container | minor | `39.233.5` -> `39.240.1` | | [renovate](https://renovatebot.com) ([source](https://github.com/renovatebot/renovate)) | | minor | `39.233.5` -> `39.240.1` | --- ### Release Notes
renovatebot/renovate (data.forgejo.org/renovate/renovate) ### [`v39.240.1`](https://github.com/renovatebot/renovate/releases/tag/39.240.1) [Compare Source](https://github.com/renovatebot/renovate/compare/39.240.0...39.240.1) ##### Build System - **deps:** update dependency cronstrue to v2.58.0 (main) ([#​35346](https://github.com/renovatebot/renovate/issues/35346)) ([7da63b4](https://github.com/renovatebot/renovate/commit/7da63b485ac03549d3dd04d0ecd25c24e2d767d6)) ### [`v39.240.0`](https://github.com/renovatebot/renovate/releases/tag/39.240.0) [Compare Source](https://github.com/renovatebot/renovate/compare/39.238.2...39.240.0) ##### Features - **datasource/azure-pipelines-tasks:** add built-in tasks changelog url ([#​35325](https://github.com/renovatebot/renovate/issues/35325)) ([5091b14](https://github.com/renovatebot/renovate/commit/5091b14184a38d239de2619b7acd02dc0eade3da)) ##### Miscellaneous Chores - **deps:** update dependency [@​types/better-sqlite3](https://github.com/types/better-sqlite3) to v7.6.13 (main) ([#​35333](https://github.com/renovatebot/renovate/issues/35333)) ([05b3fc0](https://github.com/renovatebot/renovate/commit/05b3fc0e25927d299bf3c046b533d9dde7af67aa)) - **deps:** update dependency renovatebot/github-action to v41.0.19 (main) ([#​35337](https://github.com/renovatebot/renovate/issues/35337)) ([479886f](https://github.com/renovatebot/renovate/commit/479886f676e38e2530771baba728ee92201e189a)) - **deps:** update dependency typescript to v5.8.3 (main) ([#​35336](https://github.com/renovatebot/renovate/issues/35336)) ([abe1f18](https://github.com/renovatebot/renovate/commit/abe1f185cb2a69679738c126776a57ef25949bf3)) - **deps:** update dependency vitest-mock-extended to v3.1.0 (main) ([#​35334](https://github.com/renovatebot/renovate/issues/35334)) ([680e161](https://github.com/renovatebot/renovate/commit/680e1610309dd9f6047ec6fcc1018a4e2d7bb02a)) ### [`v39.238.2`](https://github.com/renovatebot/renovate/releases/tag/39.238.2) [Compare Source](https://github.com/renovatebot/renovate/compare/39.238.1...39.238.2) ##### Bug Fixes - **workers/auto-replace:** correctly handle prefix replacements ([#​35265](https://github.com/renovatebot/renovate/issues/35265)) ([afd6415](https://github.com/renovatebot/renovate/commit/afd6415ad88de9c28dd95a9bbea7b85f6ed2b425)) ##### Miscellaneous Chores - **deps:** update dependency [@​types/luxon](https://github.com/types/luxon) to v3.6.1 (main) ([#​35313](https://github.com/renovatebot/renovate/issues/35313)) ([05ebbf3](https://github.com/renovatebot/renovate/commit/05ebbf3b79b238b856f80ccdd1741ed5d875496e)) - **deps:** update dependency [@​types/luxon](https://github.com/types/luxon) to v3.6.2 (main) ([#​35319](https://github.com/renovatebot/renovate/issues/35319)) ([790d0ea](https://github.com/renovatebot/renovate/commit/790d0ea50d7999135c19f511e359856833a480e0)) - **deps:** update dependency [@​types/node](https://github.com/types/node) to v22.14.0 (main) ([#​35295](https://github.com/renovatebot/renovate/issues/35295)) ([2188ebb](https://github.com/renovatebot/renovate/commit/2188ebb98f61e80c4cb10410e4f2549ba056783a)) - **deps:** update dependency [@​vitest/eslint-plugin](https://github.com/vitest/eslint-plugin) to v1.1.39 (main) ([#​35293](https://github.com/renovatebot/renovate/issues/35293)) ([043d665](https://github.com/renovatebot/renovate/commit/043d665677af9bb15883e9b6a5a5950ce8f85f08)) - **deps:** update dependency type-fest to v4.39.1 (main) ([#​35302](https://github.com/renovatebot/renovate/issues/35302)) ([21e1e6f](https://github.com/renovatebot/renovate/commit/21e1e6f9cd5807c388eae86968a230c9e952f18e)) ##### Code Refactoring - **gerrit:** remove deprecated source branch as hashtags support ([#​33329](https://github.com/renovatebot/renovate/issues/33329)) ([e64ca6b](https://github.com/renovatebot/renovate/commit/e64ca6b8521722216f6f50a44c5a6fb46dd52b4b)) ### [`v39.238.1`](https://github.com/renovatebot/renovate/releases/tag/39.238.1) [Compare Source](https://github.com/renovatebot/renovate/compare/39.238.0...39.238.1) ##### Bug Fixes - **deps:** update ghcr.io/containerbase/sidecar docker tag to v13.8.13 (main) ([#​35289](https://github.com/renovatebot/renovate/issues/35289)) ([25eafdb](https://github.com/renovatebot/renovate/commit/25eafdb3796901eceb50e3810e3226f277a1be96)) ##### Miscellaneous Chores - **deps:** update ghcr.io/containerbase/devcontainer docker tag to v13.8.13 (main) ([#​35288](https://github.com/renovatebot/renovate/issues/35288)) ([e0b85f3](https://github.com/renovatebot/renovate/commit/e0b85f3b38bd3ed29925c6afd4d6fb5c237e1d11)) ### [`v39.238.0`](https://github.com/renovatebot/renovate/releases/tag/39.238.0) [Compare Source](https://github.com/renovatebot/renovate/compare/39.237.0...39.238.0) ##### Features - **datasource/github-runners:** mark Windows Server 2025 as stable ([#​35284](https://github.com/renovatebot/renovate/issues/35284)) ([ad5c45f](https://github.com/renovatebot/renovate/commit/ad5c45f43770e8d422c3e93b1c7e805848aa8dc9)) ### [`v39.237.0`](https://github.com/renovatebot/renovate/releases/tag/39.237.0) [Compare Source](https://github.com/renovatebot/renovate/compare/39.236.2...39.237.0) ##### Features - **bitbucket-server:** add support for changelogs ([#​34569](https://github.com/renovatebot/renovate/issues/34569)) ([68a66a0](https://github.com/renovatebot/renovate/commit/68a66a05a98ae2ed77ec2f1e203fac553383b081)) ### [`v39.236.2`](https://github.com/renovatebot/renovate/releases/tag/39.236.2) [Compare Source](https://github.com/renovatebot/renovate/compare/39.236.1...39.236.2) ##### Bug Fixes - **deps:** update ghcr.io/containerbase/sidecar docker tag to v13.8.12 (main) ([#​35279](https://github.com/renovatebot/renovate/issues/35279)) ([702f18f](https://github.com/renovatebot/renovate/commit/702f18f6a58de64966eaebbb6c816097bcc19e5c)) ### [`v39.236.1`](https://github.com/renovatebot/renovate/releases/tag/39.236.1) [Compare Source](https://github.com/renovatebot/renovate/compare/39.236.0...39.236.1) ##### Bug Fixes - **tool/pixi:** remove `v` prefix from raw version ([#​35277](https://github.com/renovatebot/renovate/issues/35277)) ([e938454](https://github.com/renovatebot/renovate/commit/e9384549037e2937a7a8ce4a0f736c9990b9702f)) ##### Miscellaneous Chores - **deps:** update dependency pdm to v2.23.1 (main) ([#​35275](https://github.com/renovatebot/renovate/issues/35275)) ([78ecd13](https://github.com/renovatebot/renovate/commit/78ecd13a8c65623a6b52caecfe1e13e14cb58014)) - **deps:** update ghcr.io/containerbase/devcontainer docker tag to v13.8.12 (main) ([#​35278](https://github.com/renovatebot/renovate/issues/35278)) ([84454cf](https://github.com/renovatebot/renovate/commit/84454cfd62fa1f6955f45ca5954af8e2cbe060d7)) ### [`v39.236.0`](https://github.com/renovatebot/renovate/releases/tag/39.236.0) [Compare Source](https://github.com/renovatebot/renovate/compare/39.235.4...39.236.0) ##### Features - **conan:** Add support for lockfile maintenance ([#​28174](https://github.com/renovatebot/renovate/issues/28174)) ([564ee83](https://github.com/renovatebot/renovate/commit/564ee83fb7c690ed2b0e5bbe4ee2b513fdf2415d)) ### [`v39.235.4`](https://github.com/renovatebot/renovate/releases/tag/39.235.4) [Compare Source](https://github.com/renovatebot/renovate/compare/39.235.3...39.235.4) ##### Bug Fixes - **changelogs:** support massaging self-hosted gitlab URLs ([#​35258](https://github.com/renovatebot/renovate/issues/35258)) ([8a93407](https://github.com/renovatebot/renovate/commit/8a93407a7864761fe34a4fcec76c559bfd16a9a0)) ##### Miscellaneous Chores - **deps:** update dependency [@​types/node](https://github.com/types/node) to v22.13.17 (main) ([#​35263](https://github.com/renovatebot/renovate/issues/35263)) ([12ea7e1](https://github.com/renovatebot/renovate/commit/12ea7e1474d54351e4a4e636c18d27d6d1030076)) ### [`v39.235.3`](https://github.com/renovatebot/renovate/releases/tag/39.235.3) [Compare Source](https://github.com/renovatebot/renovate/compare/39.235.2...39.235.3) ##### Bug Fixes - **deps:** update ghcr.io/containerbase/sidecar docker tag to v13.8.11 (main) ([#​35260](https://github.com/renovatebot/renovate/issues/35260)) ([e4eefde](https://github.com/renovatebot/renovate/commit/e4eefde273d0da10271d3401e5b23d9dc6aecc31)) ##### Miscellaneous Chores - **deps:** update dependency [@​types/luxon](https://github.com/types/luxon) to v3.6.0 (main) ([#​35236](https://github.com/renovatebot/renovate/issues/35236)) ([3619702](https://github.com/renovatebot/renovate/commit/361970298b21221fda2ae7fe316462416697a63b)) - **deps:** update dependency [@​types/node](https://github.com/types/node) to v22.13.15 (main) ([#​35237](https://github.com/renovatebot/renovate/issues/35237)) ([6fbcdb3](https://github.com/renovatebot/renovate/commit/6fbcdb3c093fc6778d84a4c5111fc91da52fdf85)) - **deps:** update dependency [@​types/node](https://github.com/types/node) to v22.13.16 (main) ([#​35246](https://github.com/renovatebot/renovate/issues/35246)) ([781a9cf](https://github.com/renovatebot/renovate/commit/781a9cf33133354372c177bb4dbde691d9ef7311)) - **deps:** update dependency pnpm to v10.7.1 (main) ([#​35249](https://github.com/renovatebot/renovate/issues/35249)) ([b88a306](https://github.com/renovatebot/renovate/commit/b88a3068a342037b33c7285e8517bad79d0dac71)) - **deps:** update dependency type-fest to v4.39.0 (main) ([#​35250](https://github.com/renovatebot/renovate/issues/35250)) ([d4da4a1](https://github.com/renovatebot/renovate/commit/d4da4a10554ad5d2a4dc91980eb71176276de3b1)) - **deps:** update ghcr.io/containerbase/devcontainer docker tag to v13.8.11 (main) ([#​35259](https://github.com/renovatebot/renovate/issues/35259)) ([f6f5f4e](https://github.com/renovatebot/renovate/commit/f6f5f4e912f152e5ffd4e3048c6439c5e2c16f09)) - **deps:** update github/codeql-action action to v3.28.15 (main) ([#​35235](https://github.com/renovatebot/renovate/issues/35235)) ([1de6ec9](https://github.com/renovatebot/renovate/commit/1de6ec9a39948a0c00742ef9745fee0d46070e3c)) - **deps:** update python:3.13 docker digest to [`18ecbd0`](https://github.com/renovatebot/renovate/commit/18ecbd0) (main) ([#​35243](https://github.com/renovatebot/renovate/issues/35243)) ([1b6f9df](https://github.com/renovatebot/renovate/commit/1b6f9dfa5aacc464f02d0d097d864d12db3ef07d)) - **deps:** update python:3.13 docker digest to [`aaf6d3c`](https://github.com/renovatebot/renovate/commit/aaf6d3c) (main) ([#​35247](https://github.com/renovatebot/renovate/issues/35247)) ([e9ba9fc](https://github.com/renovatebot/renovate/commit/e9ba9fc2e30c64ae80ce9d3d526546d647abc0f3)) - **deps:** update vitest monorepo to v3.1.1 (main) ([#​35221](https://github.com/renovatebot/renovate/issues/35221)) ([558809f](https://github.com/renovatebot/renovate/commit/558809f1aababdd55a200fa746fe77c0c760fc16)) ##### Code Refactoring - **circleci:** Simplify CircleCI extraction ([#​35233](https://github.com/renovatebot/renovate/issues/35233)) ([8c00b15](https://github.com/renovatebot/renovate/commit/8c00b15ffcccafd52de4075f88cb1a7215636373)) ### [`v39.235.2`](https://github.com/renovatebot/renovate/releases/tag/39.235.2) [Compare Source](https://github.com/renovatebot/renovate/compare/39.235.1...39.235.2) ##### Build System - **deps:** update dependency [@​renovatebot/osv-offline](https://github.com/renovatebot/osv-offline) to v1.6.5 (main) ([#​35232](https://github.com/renovatebot/renovate/issues/35232)) ([fcc9b47](https://github.com/renovatebot/renovate/commit/fcc9b47101d6f1805fd63c1867d07827b0e99edd)) ### [`v39.235.1`](https://github.com/renovatebot/renovate/releases/tag/39.235.1) [Compare Source](https://github.com/renovatebot/renovate/compare/39.235.0...39.235.1) ##### Build System - **deps:** update dependency luxon to v3.6.1 (main) ([#​35230](https://github.com/renovatebot/renovate/issues/35230)) ([c91c875](https://github.com/renovatebot/renovate/commit/c91c87594b57af006d1a3f32f0048f24b1127a05)) ### [`v39.235.0`](https://github.com/renovatebot/renovate/releases/tag/39.235.0) [Compare Source](https://github.com/renovatebot/renovate/compare/39.234.0...39.235.0) ##### Features - **schema:** Add utility for detecting circular data ([#​35223](https://github.com/renovatebot/renovate/issues/35223)) ([5ad8030](https://github.com/renovatebot/renovate/commit/5ad8030a8e5f8c05eabef27c895f1e02177764cf)) ##### Miscellaneous Chores - **deps:** update github/codeql-action action to v3.28.14 (main) ([#​35220](https://github.com/renovatebot/renovate/issues/35220)) ([a13f5da](https://github.com/renovatebot/renovate/commit/a13f5daca93faaf213047ea26c36135b74c2c732)) - **label-actions:** capitalize Renovate brandname ([#​35222](https://github.com/renovatebot/renovate/issues/35222)) ([b53f2a9](https://github.com/renovatebot/renovate/commit/b53f2a9ffecf5127814cf39db2ffd8ff65bffeba)) ### [`v39.234.0`](https://github.com/renovatebot/renovate/releases/tag/39.234.0) [Compare Source](https://github.com/renovatebot/renovate/compare/39.233.6...39.234.0) ##### Features - add Azure Pipelines preset ([#​35207](https://github.com/renovatebot/renovate/issues/35207)) ([4cb2bb2](https://github.com/renovatebot/renovate/commit/4cb2bb2d7753052b4e765ac5df664866ae91f0aa)) - **manager/nuget:** extract msbuild sdk from `Import` ([#​35206](https://github.com/renovatebot/renovate/issues/35206)) ([727792a](https://github.com/renovatebot/renovate/commit/727792a3cecda539b05a6062bc306e065290854d)) ##### Documentation - **upgrade best practices:** update preset code plus small rewrite ([#​34837](https://github.com/renovatebot/renovate/issues/34837)) ([0be280b](https://github.com/renovatebot/renovate/commit/0be280ba8ac07baf143d2fc9ca7df93fe86747e4)) ### [`v39.233.6`](https://github.com/renovatebot/renovate/releases/tag/39.233.6) [Compare Source](https://github.com/renovatebot/renovate/compare/39.233.5...39.233.6) ##### Bug Fixes - **circleci:** Ignore non-image alias items ([#​35212](https://github.com/renovatebot/renovate/issues/35212)) ([e746331](https://github.com/renovatebot/renovate/commit/e7463311b8acf2a94175067e65548c75881292ec)) ##### Documentation - update references to renovate/renovate (main) ([#​35213](https://github.com/renovatebot/renovate/issues/35213)) ([73c9fac](https://github.com/renovatebot/renovate/commit/73c9faca22c480e1ea843f0b27b347ad930d0932)) ##### Miscellaneous Chores - **deps:** lock file maintenance (main) ([#​35214](https://github.com/renovatebot/renovate/issues/35214)) ([3598dfb](https://github.com/renovatebot/renovate/commit/3598dfb8f9d1c153e5ef7bf3b1e8d87b35dd4451)) - **deps:** lock file maintenance (main) ([#​35217](https://github.com/renovatebot/renovate/issues/35217)) ([57972f6](https://github.com/renovatebot/renovate/commit/57972f613a729385f99329e39653254eefad275b)) - **deps:** update containerbase/internal-tools action to v3.10.19 (main) ([#​35215](https://github.com/renovatebot/renovate/issues/35215)) ([60ef7bf](https://github.com/renovatebot/renovate/commit/60ef7bfcf14338681e172306816a265bbddf3d90)) - **deps:** update containerbase/internal-tools action to v3.10.20 (main) ([#​35218](https://github.com/renovatebot/renovate/issues/35218)) ([7cc1fb2](https://github.com/renovatebot/renovate/commit/7cc1fb2d68785e8ae4a42e2f6b92734c1389a1f9)) - **deps:** update dependency esbuild to v0.25.2 (main) ([#​35210](https://github.com/renovatebot/renovate/issues/35210)) ([1107833](https://github.com/renovatebot/renovate/commit/1107833bcd5172e889d6c6a89973aaeb71799a71)) ##### Tests - **yaml:** Fix code block indents ([#​35211](https://github.com/renovatebot/renovate/issues/35211)) ([5d48319](https://github.com/renovatebot/renovate/commit/5d4831961baaa9bc6a363cf378aa6bb035856404))
--- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * 1" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7532 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/workflows/renovate.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml index 900330e388..c3c732e992 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -28,7 +28,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/renovate/renovate:39.233.5 + image: data.forgejo.org/renovate/renovate:39.240.1 steps: - name: Load renovate repo cache diff --git a/Makefile b/Makefile index d5ec1e72fe..862274639e 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.32.0 # renovate: datasource=go GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.5.1 # renovate: datasource=go GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.18.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.233.5 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.240.1 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From 89e414485585c65a04ffd61a83eebbaf4897559c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 9 Apr 2025 15:52:01 +0800 Subject: [PATCH 137/568] Set MERMAID_MAX_SOURCE_CHARACTERS to 50000 (#34152) Fix #32015 (cherry picked from commit f8edc29f5dd1a99e3be1a2ff764d1d7315862345) --- custom/conf/app.example.ini | 2 +- modules/setting/markup.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 11c5d5eb0a..5069c7ec95 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2444,7 +2444,7 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Set the maximum number of characters in a mermaid source. (Set to -1 to disable limits) -;MERMAID_MAX_SOURCE_CHARACTERS = 5000 +;MERMAID_MAX_SOURCE_CHARACTERS = 50000 ;; Set the maximum number of lines allowed for a filepreview. (Set to -1 to disable limits; set to 0 to disable the feature) ;FILEPREVIEW_MAX_LINES = 50 diff --git a/modules/setting/markup.go b/modules/setting/markup.go index 90fc86b131..4ab9e7b2d1 100644 --- a/modules/setting/markup.go +++ b/modules/setting/markup.go @@ -62,7 +62,7 @@ type MarkupSanitizerRule struct { func loadMarkupFrom(rootCfg ConfigProvider) { mustMapSetting(rootCfg, "markdown", &Markdown) - MermaidMaxSourceCharacters = rootCfg.Section("markup").Key("MERMAID_MAX_SOURCE_CHARACTERS").MustInt(5000) + MermaidMaxSourceCharacters = rootCfg.Section("markup").Key("MERMAID_MAX_SOURCE_CHARACTERS").MustInt(50000) FilePreviewMaxLines = rootCfg.Section("markup").Key("FILEPREVIEW_MAX_LINES").MustInt(50) ExternalMarkupRenderers = make([]*MarkupRenderer, 0, 10) ExternalSanitizerRules = make([]MarkupSanitizerRule, 0, 10) From 23b713464cfd13d5fc5902bac8b8ee3c3967ea29 Mon Sep 17 00:00:00 2001 From: ManInDark <61268856+ManInDark@users.noreply.github.com> Date: Wed, 9 Apr 2025 21:21:54 +0200 Subject: [PATCH 138/568] bugfix check for alternate ssh host certificate location (#34146) fixes #34145 Edited all locations to actually be correct. --------- Co-authored-by: wxiaoguang Co-authored-by: Giteabot (cherry picked from commit fac6b87dd24be5021d9c656edc2072397cfd6bed) --- docker/root/etc/s6/openssh/setup | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docker/root/etc/s6/openssh/setup b/docker/root/etc/s6/openssh/setup index 6fbc599cc5..48e7d4b211 100755 --- a/docker/root/etc/s6/openssh/setup +++ b/docker/root/etc/s6/openssh/setup @@ -31,16 +31,19 @@ if [ -e /data/ssh/ssh_host_ecdsa_cert ]; then SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_cert"} fi -if [ -e /data/ssh/ssh_host_ed25519-cert.pub ]; then - SSH_ED25519_CERT=${SSH_ED25519_CERT:-"/data/ssh/ssh_host_ed25519-cert.pub"} +# In case someone wants to sign the `{keyname}.pub` key by `ssh-keygen -s ca -I identity ...` to +# make use of the ssh-key certificate authority feature (see ssh-keygen CERTIFICATES section), +# the generated key file name is `{keyname}-cert.pub` +if [ -e /data/ssh/ssh_host_ed25519_key-cert.pub ]; then + SSH_ED25519_CERT=${SSH_ED25519_CERT:-"/data/ssh/ssh_host_ed25519_key-cert.pub"} fi -if [ -e /data/ssh/ssh_host_rsa-cert.pub ]; then - SSH_RSA_CERT=${SSH_RSA_CERT:-"/data/ssh/ssh_host_rsa-cert.pub"} +if [ -e /data/ssh/ssh_host_rsa_key-cert.pub ]; then + SSH_RSA_CERT=${SSH_RSA_CERT:-"/data/ssh/ssh_host_rsa_key-cert.pub"} fi -if [ -e /data/ssh/ssh_host_ecdsa-cert.pub ]; then - SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa-cert.pub"} +if [ -e /data/ssh/ssh_host_ecdsa_key-cert.pub ]; then + SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_key-cert.pub"} fi if [ -d /etc/ssh ]; then From 9144726e4f816525a47024f135958c5234547836 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Sat, 12 Apr 2025 11:34:42 +0800 Subject: [PATCH 139/568] Update milestones.tmpl (#34184) (cherry picked from commit 5015992db578659a47b9a0949f1773ebac2b2b4b) --- templates/user/dashboard/milestones.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index b269c63b37..01dcbec1c9 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -114,7 +114,7 @@ {{ctx.Locale.Tr "repo.milestones.closed" $closedDate}} {{else}} {{if .DeadlineString}} - + {{svg "octicon-calendar" 14}} {{DateUtils.AbsoluteShort (.DeadlineString|DateUtils.ParseLegacy)}} From 82dd00873d3c20ac875eb4ec120a8c58721c6760 Mon Sep 17 00:00:00 2001 From: hiifong Date: Sun, 13 Apr 2025 10:24:32 +0800 Subject: [PATCH 140/568] fix webhook url (#34186) Co-authored-by: wxiaoguang (cherry picked from commit aada0370e7d72a591d58788f6db76bdbc3dddbb7) --- models/webhook/webhook_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index 7f0abbd8bb..e70c3b2557 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -91,7 +91,7 @@ func TestWebhook_EventsArray(t *testing.T) { func TestCreateWebhook(t *testing.T) { hook := &Webhook{ RepoID: 3, - URL: "www.example.com/unit_test", + URL: "https://www.example.com/unit_test", ContentType: ContentTypeJSON, Events: `{"push_only":false,"send_everything":false,"choose_events":false,"events":{"create":false,"push":true,"pull_request":true}}`, } From 504bb09319eaa30bee6e2416737c6c75225897a0 Mon Sep 17 00:00:00 2001 From: TheFox0x7 Date: Mon, 14 Apr 2025 01:20:14 +0200 Subject: [PATCH 141/568] fix github migration error when using multiple tokens (#34144) Git authorization was not taking into account multiple token feature, leading to auth failures Closes: https://github.com/go-gitea/gitea/issues/34141 --------- Co-authored-by: wxiaoguang (cherry picked from commit 8a6df00c532becd4d10efb70827ccf80b2bf74e2) --- services/migrations/github.go | 17 ++++++++++++++- services/migrations/github_test.go | 33 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/services/migrations/github.go b/services/migrations/github.go index 5052a68114..9721c86180 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -140,7 +140,7 @@ func (g *GithubDownloaderV3) LogString() string { func (g *GithubDownloaderV3) addClient(client *http.Client, baseURL string) { githubClient := github.NewClient(client) if baseURL != "https://github.com" { - githubClient, _ = github.NewClient(client).WithEnterpriseURLs(baseURL, baseURL) + githubClient, _ = githubClient.WithEnterpriseURLs(baseURL, baseURL) } g.clients = append(g.clients, githubClient) g.rates = append(g.rates, nil) @@ -885,3 +885,18 @@ func (g *GithubDownloaderV3) GetReviews(reviewable base.Reviewable) ([]*base.Rev } return allReviews, nil } + +// FormatCloneURL add authentication into remote URLs +func (g *GithubDownloaderV3) FormatCloneURL(opts MigrateOptions, remoteAddr string) (string, error) { + u, err := url.Parse(remoteAddr) + if err != nil { + return "", err + } + if len(opts.AuthToken) > 0 { + // "multiple tokens" are used to benefit more "API rate limit quota" + // git clone doesn't count for rate limits, so only use the first token. + // source: https://github.com/orgs/community/discussions/44515 + u.User = url.UserPassword("oauth2", strings.Split(opts.AuthToken, ",")[0]) + } + return u.String(), nil +} diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go index b1f20c4716..c5e24ebbcd 100644 --- a/services/migrations/github_test.go +++ b/services/migrations/github_test.go @@ -433,3 +433,36 @@ func TestGitHubDownloadRepo(t *testing.T) { }, }, reviews) } + +func TestGithubMultiToken(t *testing.T) { + testCases := []struct { + desc string + token string + expectedCloneURL string + }{ + { + desc: "Single Token", + token: "single_token", + expectedCloneURL: "https://oauth2:single_token@github.com", + }, + { + desc: "Multi Token", + token: "token1,token2", + expectedCloneURL: "https://oauth2:token1@github.com", + }, + } + factory := GithubDownloaderV3Factory{} + + for _, tC := range testCases { + t.Run(tC.desc, func(t *testing.T) { + opts := base.MigrateOptions{CloneAddr: "https://github.com/go-gitea/gitea", AuthToken: tC.token} + client, err := factory.New(t.Context(), opts) + require.NoError(t, err) + + cloneURL, err := client.FormatCloneURL(opts, "https://github.com") + require.NoError(t, err) + + assert.Equal(t, tC.expectedCloneURL, cloneURL) + }) + } +} From 6d703bb6e32a87803b28206a02e881c4509c70a8 Mon Sep 17 00:00:00 2001 From: tacaly Date: Tue, 15 Apr 2025 05:48:19 +0000 Subject: [PATCH 142/568] fix(UI): i18n: improve naming (#7539) ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). - [x] I will test the UI with a screenshot. And attach it in a comment when test has passed. ### Documentation - [x] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. https://codeberg.org/forgejo/docs/pulls/1145 - [ ] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/.md` to be be used for the release notes instead of the title. ### Reason for the PR? The reason is to correct the naming of the lang in the UI. It was discussed in the matrix chat and requested by @0ko. https://matrix.to/#/!UJgSZwuZLRYXEOyjPb:matrix.org/$TbMlNm9L1P9gHFwJYZ3vTIPBKtUHyaoQVEDdzfTQIxI?via=matrix.org&via=envs.net&via=mozilla.org Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7539 Reviewed-by: Earl Warren Co-authored-by: tacaly Co-committed-by: tacaly --- custom/conf/app.example.ini | 2 +- modules/setting/i18n.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 11c5d5eb0a..5d290fb9d0 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2412,7 +2412,7 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The first locale will be used as the default if user browser's language doesn't match any locale in the list. ;LANGS = en-US,zh-CN,zh-HK,zh-TW,da,de-DE,nds,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pt-PT,pl-PL,bg,it-IT,fi-FI,fil,eo,tr-TR,cs-CZ,sl,sv-SE,ko-KR,el-GR,fa-IR,hu-HU,id-ID -;NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Danish,Deutsch,Plattdüütsch,Français,Nederlands,Latviešu,Русский,Українська,日本語,Español,Português do Brasil,Português de Portugal,Polski,Български,Italiano,Suomi,Filipino,Esperanto,Türkçe,Čeština,Slovenščina,Svenska,한국어,Ελληνικά,فارسی,Magyar nyelv,Bahasa Indonesia +;NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Dansk,Deutsch,Plattdüütsch,Français,Nederlands,Latviešu,Русский,Українська,日本語,Español,Português do Brasil,Português de Portugal,Polski,Български,Italiano,Suomi,Filipino,Esperanto,Türkçe,Čeština,Slovenščina,Svenska,한국어,Ελληνικά,فارسی,Magyar nyelv,Bahasa Indonesia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/setting/i18n.go b/modules/setting/i18n.go index c2e5822cf0..a400cf844c 100644 --- a/modules/setting/i18n.go +++ b/modules/setting/i18n.go @@ -9,7 +9,7 @@ var defaultI18nLangNames = []string{ "zh-CN", "简体中文", "zh-HK", "繁體中文（香港）", "zh-TW", "繁體中文（台灣）", - "da", "Danish", + "da", "Dansk", "de-DE", "Deutsch", "nds", "Plattdüütsch", "fr-FR", "Français", From a4e8594643ade4fb728a363e81ec0d276c7e39ea Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Tue, 15 Apr 2025 06:24:49 +0000 Subject: [PATCH 143/568] [v11.0/forgejo] fix(UI): i18n: improve naming (#7542) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7539 ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). - [x] I will test the UI with a screenshot. And attach it in a comment when test has passed. ### Documentation - [x] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. https://codeberg.org/forgejo/docs/pulls/1145 - [ ] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/.md` to be be used for the release notes instead of the title. ### Reason for the PR? The reason is to correct the naming of the lang in the UI. It was discussed in the matrix chat and requested by @0ko. https://matrix.to/#/!UJgSZwuZLRYXEOyjPb:matrix.org/$TbMlNm9L1P9gHFwJYZ3vTIPBKtUHyaoQVEDdzfTQIxI?via=matrix.org&via=envs.net&via=mozilla.org Co-authored-by: tacaly Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7542 Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- custom/conf/app.example.ini | 2 +- modules/setting/i18n.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 79793ad47f..f8fa95bbab 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2408,7 +2408,7 @@ LEVEL = Info ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The first locale will be used as the default if user browser's language doesn't match any locale in the list. ;LANGS = en-US,zh-CN,zh-HK,zh-TW,da,de-DE,nds,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pt-PT,pl-PL,bg,it-IT,fi-FI,fil,eo,tr-TR,cs-CZ,sl,sv-SE,ko-KR,el-GR,fa-IR,hu-HU,id-ID -;NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Danish,Deutsch,Plattdüütsch,Français,Nederlands,Latviešu,Русский,Українська,日本語,Español,Português do Brasil,Português de Portugal,Polski,Български,Italiano,Suomi,Filipino,Esperanto,Türkçe,Čeština,Slovenščina,Svenska,한국어,Ελληνικά,فارسی,Magyar nyelv,Bahasa Indonesia +;NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Dansk,Deutsch,Plattdüütsch,Français,Nederlands,Latviešu,Русский,Українська,日本語,Español,Português do Brasil,Português de Portugal,Polski,Български,Italiano,Suomi,Filipino,Esperanto,Türkçe,Čeština,Slovenščina,Svenska,한국어,Ελληνικά,فارسی,Magyar nyelv,Bahasa Indonesia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/setting/i18n.go b/modules/setting/i18n.go index c2e5822cf0..a400cf844c 100644 --- a/modules/setting/i18n.go +++ b/modules/setting/i18n.go @@ -9,7 +9,7 @@ var defaultI18nLangNames = []string{ "zh-CN", "简体中文", "zh-HK", "繁體中文（香港）", "zh-TW", "繁體中文（台灣）", - "da", "Danish", + "da", "Dansk", "de-DE", "Deutsch", "nds", "Plattdüütsch", "fr-FR", "Français", From 1b11ca6f3666f5d29845daf65b6f065763751e3d Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 15 Apr 2025 07:05:21 +0000 Subject: [PATCH 144/568] fix: match PackageBlob.HashBlake2b definition and migration (#7543) If not a migration will show a warning: `[W] Table public.package_blob column hash_blake2b db type is VARCHAR(255), struct type is CHAR(128)` Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7543 Reviewed-by: Michael Kriese Reviewed-by: Beowulf Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- models/forgejo_migrations/v26.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/forgejo_migrations/v26.go b/models/forgejo_migrations/v26.go index 5efe48a302..3292d93ffd 100644 --- a/models/forgejo_migrations/v26.go +++ b/models/forgejo_migrations/v26.go @@ -7,8 +7,8 @@ import "xorm.io/xorm" func AddHashBlake2bToPackageBlob(x *xorm.Engine) error { type PackageBlob struct { - ID int64 `xorm:"pk autoincr"` - HashBlake2b string + ID int64 `xorm:"pk autoincr"` + HashBlake2b string `xorm:"hash_blake2b char(128) UNIQUE(blake2b) INDEX"` } return x.Sync(&PackageBlob{}) } From 64d885422217b9499476d713e963c61f932c4815 Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Tue, 15 Apr 2025 07:40:53 +0000 Subject: [PATCH 145/568] [v11.0/forgejo] fix: match PackageBlob.HashBlake2b definition and migration (#7544) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/7543 If not a migration will show a warning: `[W] Table public.package_blob column hash_blake2b db type is VARCHAR(255), struct type is CHAR(128)` Co-authored-by: Earl Warren Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7544 Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- models/forgejo_migrations/v26.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/forgejo_migrations/v26.go b/models/forgejo_migrations/v26.go index 5efe48a302..3292d93ffd 100644 --- a/models/forgejo_migrations/v26.go +++ b/models/forgejo_migrations/v26.go @@ -7,8 +7,8 @@ import "xorm.io/xorm" func AddHashBlake2bToPackageBlob(x *xorm.Engine) error { type PackageBlob struct { - ID int64 `xorm:"pk autoincr"` - HashBlake2b string + ID int64 `xorm:"pk autoincr"` + HashBlake2b string `xorm:"hash_blake2b char(128) UNIQUE(blake2b) INDEX"` } return x.Sync(&PackageBlob{}) } From 2570be93a60c6a413a002ac0b5f2149be336d0fe Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 15 Apr 2025 08:36:10 +0000 Subject: [PATCH 146/568] Update Node.js to v22 (forgejo) (#7545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [node](https://nodejs.org) ([source](https://github.com/nodejs/node)) | major | `20` -> `22` | --- ### Release Notes
nodejs/node (node) ### [`v22.14.0`](https://github.com/nodejs/node/releases/tag/v22.14.0): 2025-02-11, Version 22.14.0 'Jod' (LTS), @​aduh95 [Compare Source](https://github.com/nodejs/node/compare/v22.13.1...v22.14.0) ##### Notable Changes - \[[`82a9000e9e`](https://github.com/nodejs/node/commit/82a9000e9e)] - **crypto**: update root certificates to NSS 3.107 (Node.js GitHub Bot) [#​56566](https://github.com/nodejs/node/pull/56566) - \[[`b7fe54fc88`](https://github.com/nodejs/node/commit/b7fe54fc88)] - **(SEMVER-MINOR)** **fs**: allow `exclude` option in globs to accept glob patterns (Daeyeon Jeong) [#​56489](https://github.com/nodejs/node/pull/56489) - \[[`3ac92ef607`](https://github.com/nodejs/node/commit/3ac92ef607)] - **(SEMVER-MINOR)** **lib**: add typescript support to STDIN eval (Marco Ippolito) [#​56359](https://github.com/nodejs/node/pull/56359) - \[[`1614e8e7bc`](https://github.com/nodejs/node/commit/1614e8e7bc)] - **(SEMVER-MINOR)** **module**: add ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX (Marco Ippolito) [#​56610](https://github.com/nodejs/node/pull/56610) - \[[`6d6cffa9cc`](https://github.com/nodejs/node/commit/6d6cffa9cc)] - **(SEMVER-MINOR)** **module**: add `findPackageJSON` util (Jacob Smith) [#​55412](https://github.com/nodejs/node/pull/55412) - \[[`d35333ae18`](https://github.com/nodejs/node/commit/d35333ae18)] - **(SEMVER-MINOR)** **process**: add process.ref() and process.unref() methods (James M Snell) [#​56400](https://github.com/nodejs/node/pull/56400) - \[[`07ff3ddcb5`](https://github.com/nodejs/node/commit/07ff3ddcb5)] - **(SEMVER-MINOR)** **sqlite**: support TypedArray and DataView in `StatementSync` (Alex Yang) [#​56385](https://github.com/nodejs/node/pull/56385) - \[[`94d3fe1b62`](https://github.com/nodejs/node/commit/94d3fe1b62)] - **(SEMVER-MINOR)** **src**: add --disable-sigusr1 to prevent signal i/o thread (Rafael Gonzaga) [#​56441](https://github.com/nodejs/node/pull/56441) - \[[`5afffb4415`](https://github.com/nodejs/node/commit/5afffb4415)] - **(SEMVER-MINOR)** **src,worker**: add isInternalWorker (Carlos Espa) [#​56469](https://github.com/nodejs/node/pull/56469) - \[[`697a851fb3`](https://github.com/nodejs/node/commit/697a851fb3)] - **(SEMVER-MINOR)** **test_runner**: add TestContext.prototype.waitFor() (Colin Ihrig) [#​56595](https://github.com/nodejs/node/pull/56595) - \[[`047537b48c`](https://github.com/nodejs/node/commit/047537b48c)] - **(SEMVER-MINOR)** **test_runner**: add t.assert.fileSnapshot() (Colin Ihrig) [#​56459](https://github.com/nodejs/node/pull/56459) - \[[`926cf84e95`](https://github.com/nodejs/node/commit/926cf84e95)] - **(SEMVER-MINOR)** **test_runner**: add assert.register() API (Colin Ihrig) [#​56434](https://github.com/nodejs/node/pull/56434) - \[[`c658a8afdf`](https://github.com/nodejs/node/commit/c658a8afdf)] - **(SEMVER-MINOR)** **worker**: add eval ts input (Marco Ippolito) [#​56394](https://github.com/nodejs/node/pull/56394) ##### Commits - \[[`bad1ad8650`](https://github.com/nodejs/node/commit/bad1ad8650)] - **assert**: make myers_diff function more performant (Giovanni Bucci) [#​56303](https://github.com/nodejs/node/pull/56303) - \[[`e222e36f3b`](https://github.com/nodejs/node/commit/e222e36f3b)] - **assert**: make partialDeepStrictEqual work with urls and File prototypes (Giovanni Bucci) [#​56231](https://github.com/nodejs/node/pull/56231) - \[[`e232789fe2`](https://github.com/nodejs/node/commit/e232789fe2)] - **assert**: show diff when doing partial comparisons (Giovanni Bucci) [#​56211](https://github.com/nodejs/node/pull/56211) - \[[`c99de1fdcf`](https://github.com/nodejs/node/commit/c99de1fdcf)] - **assert**: make partialDeepStrictEqual throw when comparing \[0] with \[-0] (Giovanni) [#​56237](https://github.com/nodejs/node/pull/56237) - \[[`2386fd5840`](https://github.com/nodejs/node/commit/2386fd5840)] - **benchmark**: add validateStream to styleText bench (Rafael Gonzaga) [#​56556](https://github.com/nodejs/node/pull/56556) - \[[`b197dfa7ec`](https://github.com/nodejs/node/commit/b197dfa7ec)] - **build**: fix GN build for ngtcp2 (Cheng) [#​56300](https://github.com/nodejs/node/pull/56300) - \[[`2a3cdd34ff`](https://github.com/nodejs/node/commit/2a3cdd34ff)] - **build**: test macos-13 on GitHub actions (Michaël Zasso) [#​56307](https://github.com/nodejs/node/pull/56307) - \[[`12f716be0a`](https://github.com/nodejs/node/commit/12f716be0a)] - **build**: build v8 with -fvisibility=hidden on macOS (Joyee Cheung) [#​56275](https://github.com/nodejs/node/pull/56275) - \[[`c5ca15bd34`](https://github.com/nodejs/node/commit/c5ca15bd34)] - **child_process**: fix parsing messages with splitted length field (Maksim Gorkov) [#​56106](https://github.com/nodejs/node/pull/56106) - \[[`8346b8fc2c`](https://github.com/nodejs/node/commit/8346b8fc2c)] - **crypto**: add missing return value check (Michael Dawson) [#​56615](https://github.com/nodejs/node/pull/56615) - \[[`82a9000e9e`](https://github.com/nodejs/node/commit/82a9000e9e)] - **crypto**: update root certificates to NSS 3.107 (Node.js GitHub Bot) [#​56566](https://github.com/nodejs/node/pull/56566) - \[[`890eef20a1`](https://github.com/nodejs/node/commit/890eef20a1)] - **crypto**: fix checkPrime crash with large buffers (Santiago Gimeno) [#​56559](https://github.com/nodejs/node/pull/56559) - \[[`5edb7b5e87`](https://github.com/nodejs/node/commit/5edb7b5e87)] - **crypto**: fix warning of ignoring return value (Cheng) [#​56527](https://github.com/nodejs/node/pull/56527) - \[[`b89f123a0b`](https://github.com/nodejs/node/commit/b89f123a0b)] - **crypto**: make generatePrime/checkPrime interruptible (James M Snell) [#​56460](https://github.com/nodejs/node/pull/56460) - \[[`63c1859e01`](https://github.com/nodejs/node/commit/63c1859e01)] - **deps**: update corepack to 0.31.0 (Node.js GitHub Bot) [#​56795](https://github.com/nodejs/node/pull/56795) - \[[`a48430d4d3`](https://github.com/nodejs/node/commit/a48430d4d3)] - **deps**: move inspector_protocol to deps (Chengzhong Wu) [#​56649](https://github.com/nodejs/node/pull/56649) - \[[`74cccc824f`](https://github.com/nodejs/node/commit/74cccc824f)] - **deps**: macro ENODATA is deprecated in libc++ (Cheng) [#​56698](https://github.com/nodejs/node/pull/56698) - \[[`fa869ea0f2`](https://github.com/nodejs/node/commit/fa869ea0f2)] - **deps**: fixup some minor coverity warnings (James M Snell) [#​56612](https://github.com/nodejs/node/pull/56612) - \[[`1a4fa2b015`](https://github.com/nodejs/node/commit/1a4fa2b015)] - **deps**: update amaro to 0.3.0 (Node.js GitHub Bot) [#​56568](https://github.com/nodejs/node/pull/56568) - \[[`b47076fd82`](https://github.com/nodejs/node/commit/b47076fd82)] - **deps**: update amaro to 0.2.2 (Node.js GitHub Bot) [#​56568](https://github.com/nodejs/node/pull/56568) - \[[`46bd4b8731`](https://github.com/nodejs/node/commit/46bd4b8731)] - **deps**: update simdutf to 6.0.3 (Node.js GitHub Bot) [#​56567](https://github.com/nodejs/node/pull/56567) - \[[`8ead9c693b`](https://github.com/nodejs/node/commit/8ead9c693b)] - **deps**: update simdutf to 5.7.2 (Node.js GitHub Bot) [#​56388](https://github.com/nodejs/node/pull/56388) - \[[`18d4b502af`](https://github.com/nodejs/node/commit/18d4b502af)] - **deps**: update amaro to 0.2.1 (Node.js GitHub Bot) [#​56390](https://github.com/nodejs/node/pull/56390) - \[[`d938d7cc86`](https://github.com/nodejs/node/commit/d938d7cc86)] - **deps**: update googletest to [`7d76a23`](https://github.com/nodejs/node/commit/7d76a23) (Node.js GitHub Bot) [#​56387](https://github.com/nodejs/node/pull/56387) - \[[`9761e7dccb`](https://github.com/nodejs/node/commit/9761e7dccb)] - **deps**: update googletest to [`e54519b`](https://github.com/nodejs/node/commit/e54519b) (Node.js GitHub Bot) [#​56370](https://github.com/nodejs/node/pull/56370) - \[[`8319dc6bc5`](https://github.com/nodejs/node/commit/8319dc6bc5)] - **deps**: update ngtcp2 to 1.10.0 (Node.js GitHub Bot) [#​56334](https://github.com/nodejs/node/pull/56334) - \[[`6eacd19d6a`](https://github.com/nodejs/node/commit/6eacd19d6a)] - **deps**: update simdutf to 5.7.0 (Node.js GitHub Bot) [#​56332](https://github.com/nodejs/node/pull/56332) - \[[`28bec2dda3`](https://github.com/nodejs/node/commit/28bec2dda3)] - **diagnostics_channel**: capture console messages (Stephen Belanger) [#​56292](https://github.com/nodejs/node/pull/56292) - \[[`d519d33502`](https://github.com/nodejs/node/commit/d519d33502)] - **doc**: update macOS and Xcode versions for releases (Michaël Zasso) [#​56337](https://github.com/nodejs/node/pull/56337) - \[[`fcfe650507`](https://github.com/nodejs/node/commit/fcfe650507)] - **doc**: add note for features using `InternalWorker` with permission model (Antoine du Hamel) [#​56706](https://github.com/nodejs/node/pull/56706) - \[[`efbba182b5`](https://github.com/nodejs/node/commit/efbba182b5)] - **doc**: add entry to changelog about SQLite Session Extension (Bart Louwers) [#​56318](https://github.com/nodejs/node/pull/56318) - \[[`31bf9c7dd9`](https://github.com/nodejs/node/commit/31bf9c7dd9)] - **doc**: move anatoli to emeritus (Michael Dawson) [#​56592](https://github.com/nodejs/node/pull/56592) - \[[`6096e38c7c`](https://github.com/nodejs/node/commit/6096e38c7c)] - **doc**: fix styles of the expandable TOC (Antoine du Hamel) [#​56755](https://github.com/nodejs/node/pull/56755) - \[[`d423638281`](https://github.com/nodejs/node/commit/d423638281)] - **doc**: add "Skip to content" button (Antoine du Hamel) [#​56750](https://github.com/nodejs/node/pull/56750) - \[[`edeb157d75`](https://github.com/nodejs/node/commit/edeb157d75)] - **doc**: improve accessibility of expandable lists (Antoine du Hamel) [#​56749](https://github.com/nodejs/node/pull/56749) - \[[`1a79e87687`](https://github.com/nodejs/node/commit/1a79e87687)] - **doc**: add note regarding commit message trailers (Dario Piotrowicz) [#​56736](https://github.com/nodejs/node/pull/56736) - \[[`927c7e47e4`](https://github.com/nodejs/node/commit/927c7e47e4)] - **doc**: fix typo in example code for util.styleText (Robin Mehner) [#​56720](https://github.com/nodejs/node/pull/56720) - \[[`fade522538`](https://github.com/nodejs/node/commit/fade522538)] - **doc**: fix inconsistencies in `WeakSet` and `WeakMap` comparison details (Shreyans Pathak) [#​56683](https://github.com/nodejs/node/pull/56683) - \[[`55533bf147`](https://github.com/nodejs/node/commit/55533bf147)] - **doc**: add RafaelGSS as latest sec release stewards (Rafael Gonzaga) [#​56682](https://github.com/nodejs/node/pull/56682) - \[[`8e978bdee1`](https://github.com/nodejs/node/commit/8e978bdee1)] - **doc**: clarify cjs/esm diff in `queueMicrotask()` vs `process.nextTick()` (Dario Piotrowicz) [#​56659](https://github.com/nodejs/node/pull/56659) - \[[`ae360c30dc`](https://github.com/nodejs/node/commit/ae360c30dc)] - **doc**: `WeakSet` and `WeakMap` comparison details (Shreyans Pathak) [#​56648](https://github.com/nodejs/node/pull/56648) - \[[`acd2a2fda5`](https://github.com/nodejs/node/commit/acd2a2fda5)] - **doc**: mention prepare --security (Rafael Gonzaga) [#​56617](https://github.com/nodejs/node/pull/56617) - \[[`d3c0a2831d`](https://github.com/nodejs/node/commit/d3c0a2831d)] - **doc**: tweak info on reposts in ambassador program (Michael Dawson) [#​56589](https://github.com/nodejs/node/pull/56589) - \[[`3299505b49`](https://github.com/nodejs/node/commit/3299505b49)] - **doc**: add type stripping to ambassadors program (Marco Ippolito) [#​56598](https://github.com/nodejs/node/pull/56598) - \[[`b1a6ffa4e4`](https://github.com/nodejs/node/commit/b1a6ffa4e4)] - **doc**: improve internal documentation on built-in snapshot (Joyee Cheung) [#​56505](https://github.com/nodejs/node/pull/56505) - \[[`1641a28930`](https://github.com/nodejs/node/commit/1641a28930)] - **doc**: document CLI way to open the nodejs/bluesky PR (Antoine du Hamel) [#​56506](https://github.com/nodejs/node/pull/56506) - \[[`2042628fda`](https://github.com/nodejs/node/commit/2042628fda)] - **doc**: add section about using npx with permission model (Rafael Gonzaga) [#​56539](https://github.com/nodejs/node/pull/56539) - \[[`ace19a0263`](https://github.com/nodejs/node/commit/ace19a0263)] - **doc**: update gcc-version for ubuntu-lts (Kunal Kumar) [#​56553](https://github.com/nodejs/node/pull/56553) - \[[`4aa57b50f8`](https://github.com/nodejs/node/commit/4aa57b50f8)] - **doc**: fix parentheses in options (Tobias Nießen) [#​56563](https://github.com/nodejs/node/pull/56563) - \[[`b40b01b4d3`](https://github.com/nodejs/node/commit/b40b01b4d3)] - **doc**: include CVE to EOL lines as sec release process (Rafael Gonzaga) [#​56520](https://github.com/nodejs/node/pull/56520) - \[[`6701360113`](https://github.com/nodejs/node/commit/6701360113)] - **doc**: add esm examples to node:trace_events (Alfredo González) [#​56514](https://github.com/nodejs/node/pull/56514) - \[[`d3207cca3e`](https://github.com/nodejs/node/commit/d3207cca3e)] - **doc**: add message for Ambassadors to promote (Michael Dawson) [#​56235](https://github.com/nodejs/node/pull/56235) - \[[`97ece4ae06`](https://github.com/nodejs/node/commit/97ece4ae06)] - **doc**: allow request for TSC reviews via the GitHub UI (Antoine du Hamel) [#​56493](https://github.com/nodejs/node/pull/56493) - \[[`03f25055ab`](https://github.com/nodejs/node/commit/03f25055ab)] - **doc**: add example for piping ReadableStream (Gabriel Schulhof) [#​56415](https://github.com/nodejs/node/pull/56415) - \[[`516d07482c`](https://github.com/nodejs/node/commit/516d07482c)] - **doc**: expand description of `parseArg`'s `default` (Kevin Gibbons) [#​54431](https://github.com/nodejs/node/pull/54431) - \[[`a6491effcb`](https://github.com/nodejs/node/commit/a6491effcb)] - **doc**: use `