Hello World
`, `Hello World
`, `Hello World`, `Hello World`,
+ // Org mode status of list items.
+ ``, ``,
+ ``, ``,
+ ``, ``,
+
// URLs
`my custom URL scheme`, `my custom URL scheme`,
`my custom URL scheme`, `my custom URL scheme`,
diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go
index 1fd29f813f8a..9a5b616b1a57 100644
--- a/modules/queue/manager_test.go
+++ b/modules/queue/manager_test.go
@@ -51,7 +51,7 @@ CONN_STR = redis://
assert.Equal(t, "", q.baseConfig.ConnStr)
assert.Equal(t, "default_queue", q.baseConfig.QueueFullName)
assert.Equal(t, "default_queue_unique", q.baseConfig.SetFullName)
- assert.Equal(t, 10, q.GetWorkerMaxNumber())
+ assert.NotZero(t, q.GetWorkerMaxNumber())
assert.Equal(t, 0, q.GetWorkerNumber())
assert.Equal(t, 0, q.GetWorkerActiveNumber())
assert.Equal(t, 0, q.GetQueueItemNumber())
@@ -75,7 +75,7 @@ BATCH_LENGTH = 22
CONN_STR =
QUEUE_NAME = _q2
SET_NAME = _u2
-MAX_WORKERS = 2
+MAX_WORKERS = 123
`)
assert.NoError(t, err)
@@ -89,7 +89,7 @@ MAX_WORKERS = 2
assert.Equal(t, "addrs=127.0.0.1:6379 db=0", q1.baseConfig.ConnStr)
assert.Equal(t, "no-such_queue1", q1.baseConfig.QueueFullName)
assert.Equal(t, "no-such_queue1_unique", q1.baseConfig.SetFullName)
- assert.Equal(t, 10, q1.GetWorkerMaxNumber())
+ assert.NotZero(t, q1.GetWorkerMaxNumber())
assert.Equal(t, 0, q1.GetWorkerNumber())
assert.Equal(t, 0, q1.GetWorkerActiveNumber())
assert.Equal(t, 0, q1.GetQueueItemNumber())
@@ -105,7 +105,7 @@ MAX_WORKERS = 2
assert.Equal(t, "", q2.baseConfig.ConnStr)
assert.Equal(t, "sub_q2", q2.baseConfig.QueueFullName)
assert.Equal(t, "sub_q2_u2", q2.baseConfig.SetFullName)
- assert.Equal(t, 2, q2.GetWorkerMaxNumber())
+ assert.Equal(t, 123, q2.GetWorkerMaxNumber())
assert.Equal(t, 0, q2.GetWorkerNumber())
assert.Equal(t, 0, q2.GetWorkerActiveNumber())
assert.Equal(t, 0, q2.GetQueueItemNumber())
diff --git a/modules/setting/queue.go b/modules/setting/queue.go
index 8673537b5256..fc15bd07ed68 100644
--- a/modules/setting/queue.go
+++ b/modules/setting/queue.go
@@ -5,6 +5,7 @@ package setting
import (
"path/filepath"
+ "runtime"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
@@ -25,18 +26,24 @@ type QueueSettings struct {
MaxWorkers int
}
-var queueSettingsDefault = QueueSettings{
- Type: "level", // dummy, channel, level, redis
- Datadir: "queues/common", // relative to AppDataPath
- Length: 100, // queue length before a channel queue will block
-
- QueueName: "_queue",
- SetName: "_unique",
- BatchLength: 20,
- MaxWorkers: 10,
-}
-
func GetQueueSettings(rootCfg ConfigProvider, name string) (QueueSettings, error) {
+ queueSettingsDefault := QueueSettings{
+ Type: "level", // dummy, channel, level, redis
+ Datadir: "queues/common", // relative to AppDataPath
+ Length: 100, // queue length before a channel queue will block
+
+ QueueName: "_queue",
+ SetName: "_unique",
+ BatchLength: 20,
+ MaxWorkers: runtime.NumCPU() / 2,
+ }
+ if queueSettingsDefault.MaxWorkers < 1 {
+ queueSettingsDefault.MaxWorkers = 1
+ }
+ if queueSettingsDefault.MaxWorkers > 10 {
+ queueSettingsDefault.MaxWorkers = 10
+ }
+
// deep copy default settings
cfg := QueueSettings{}
if cfgBs, err := json.Marshal(queueSettingsDefault); err != nil {
diff --git a/modules/structs/commit_status.go b/modules/structs/commit_status.go
index ff31f2d2ac3d..de1d8fa566cd 100644
--- a/modules/structs/commit_status.go
+++ b/modules/structs/commit_status.go
@@ -4,7 +4,7 @@
package structs
// CommitStatusState holds the state of a CommitStatus
-// It can be "pending", "success", "error", "failure", and "warning"
+// It can be "pending", "success", "error" and "failure"
type CommitStatusState string
const (
@@ -18,14 +18,25 @@ const (
CommitStatusFailure CommitStatusState = "failure"
)
+var commitStatusPriorities = map[CommitStatusState]int{
+ CommitStatusError: 0,
+ CommitStatusFailure: 1,
+ CommitStatusPending: 2,
+ CommitStatusSuccess: 3,
+}
+
// NoBetterThan returns true if this State is no better than the given State
+// This function only handles the states defined in CommitStatusPriorities
func (css CommitStatusState) NoBetterThan(css2 CommitStatusState) bool {
- commitStatusPriorities := map[CommitStatusState]int{
- CommitStatusError: 0,
- CommitStatusFailure: 1,
- CommitStatusPending: 2,
- CommitStatusSuccess: 3,
+ // NoBetterThan only handles the 4 states above
+ if _, exist := commitStatusPriorities[css]; !exist {
+ return false
}
+
+ if _, exist := commitStatusPriorities[css2]; !exist {
+ return false
+ }
+
return commitStatusPriorities[css] <= commitStatusPriorities[css2]
}
diff --git a/modules/structs/commit_status_test.go b/modules/structs/commit_status_test.go
new file mode 100644
index 000000000000..f06808534c40
--- /dev/null
+++ b/modules/structs/commit_status_test.go
@@ -0,0 +1,174 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package structs
+
+import (
+ "testing"
+)
+
+func TestNoBetterThan(t *testing.T) {
+ type args struct {
+ css CommitStatusState
+ css2 CommitStatusState
+ }
+ var unExpectedState CommitStatusState
+ tests := []struct {
+ name string
+ args args
+ want bool
+ }{
+ {
+ name: "success is no better than success",
+ args: args{
+ css: CommitStatusSuccess,
+ css2: CommitStatusSuccess,
+ },
+ want: true,
+ },
+ {
+ name: "success is no better than pending",
+ args: args{
+ css: CommitStatusSuccess,
+ css2: CommitStatusPending,
+ },
+ want: false,
+ },
+ {
+ name: "success is no better than failure",
+ args: args{
+ css: CommitStatusSuccess,
+ css2: CommitStatusFailure,
+ },
+ want: false,
+ },
+ {
+ name: "success is no better than error",
+ args: args{
+ css: CommitStatusSuccess,
+ css2: CommitStatusError,
+ },
+ want: false,
+ },
+ {
+ name: "pending is no better than success",
+ args: args{
+ css: CommitStatusPending,
+ css2: CommitStatusSuccess,
+ },
+ want: true,
+ },
+ {
+ name: "pending is no better than pending",
+ args: args{
+ css: CommitStatusPending,
+ css2: CommitStatusPending,
+ },
+ want: true,
+ },
+ {
+ name: "pending is no better than failure",
+ args: args{
+ css: CommitStatusPending,
+ css2: CommitStatusFailure,
+ },
+ want: false,
+ },
+ {
+ name: "pending is no better than error",
+ args: args{
+ css: CommitStatusPending,
+ css2: CommitStatusError,
+ },
+ want: false,
+ },
+ {
+ name: "failure is no better than success",
+ args: args{
+ css: CommitStatusFailure,
+ css2: CommitStatusSuccess,
+ },
+ want: true,
+ },
+ {
+ name: "failure is no better than pending",
+ args: args{
+ css: CommitStatusFailure,
+ css2: CommitStatusPending,
+ },
+ want: true,
+ },
+ {
+ name: "failure is no better than failure",
+ args: args{
+ css: CommitStatusFailure,
+ css2: CommitStatusFailure,
+ },
+ want: true,
+ },
+ {
+ name: "failure is no better than error",
+ args: args{
+ css: CommitStatusFailure,
+ css2: CommitStatusError,
+ },
+ want: false,
+ },
+ {
+ name: "error is no better than success",
+ args: args{
+ css: CommitStatusError,
+ css2: CommitStatusSuccess,
+ },
+ want: true,
+ },
+ {
+ name: "error is no better than pending",
+ args: args{
+ css: CommitStatusError,
+ css2: CommitStatusPending,
+ },
+ want: true,
+ },
+ {
+ name: "error is no better than failure",
+ args: args{
+ css: CommitStatusError,
+ css2: CommitStatusFailure,
+ },
+ want: true,
+ },
+ {
+ name: "error is no better than error",
+ args: args{
+ css: CommitStatusError,
+ css2: CommitStatusError,
+ },
+ want: true,
+ },
+ {
+ name: "unExpectedState is no better than success",
+ args: args{
+ css: unExpectedState,
+ css2: CommitStatusSuccess,
+ },
+ want: false,
+ },
+ {
+ name: "unExpectedState is no better than unExpectedState",
+ args: args{
+ css: unExpectedState,
+ css2: unExpectedState,
+ },
+ want: false,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ result := tt.args.css.NoBetterThan(tt.args.css2)
+ if result != tt.want {
+ t.Errorf("NoBetterThan() = %v, want %v", result, tt.want)
+ }
+ })
+ }
+}
diff --git a/modules/structs/org_team.go b/modules/structs/org_team.go
index 95db0debadca..78dc4abaefd3 100644
--- a/modules/structs/org_team.go
+++ b/modules/structs/org_team.go
@@ -29,10 +29,10 @@ type CreateTeamOption struct {
IncludesAllRepositories bool `json:"includes_all_repositories"`
// enum: read,write,admin
Permission string `json:"permission"`
- // example: ["repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.pulls","repo.releases","repo.projects","repo.ext_wiki"]
+ // example: ["repo.actions","repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.ext_wiki","repo.pulls","repo.releases","repo.projects","repo.ext_wiki"]
// Deprecated: This variable should be replaced by UnitsMap and will be dropped in later versions.
Units []string `json:"units"`
- // example: {"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"}
+ // 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"}
UnitsMap map[string]string `json:"units_map"`
CanCreateOrgRepo bool `json:"can_create_org_repo"`
}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a76750e44fbd..dc88c422b5ea 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1170,6 +1170,9 @@ commit_graph.select = Select branches
commit_graph.hide_pr_refs = Hide Pull Requests
commit_graph.monochrome = Mono
commit_graph.color = Color
+commit.contained_in = This commit is contained in:
+commit.contained_in_default_branch = This commit is part of the default branch
+commit.load_referencing_branches_and_tags = Load branches and tags referencing this commit
blame = Blame
download_file = Download file
normal_view = Normal View
@@ -1384,7 +1387,7 @@ issues.delete_branch_at = `deleted branch %s %s`
issues.filter_label = Label
issues.filter_label_exclude = `Use alt + click/enter to exclude labels`
issues.filter_label_no_select = All labels
-issues.filter_label_select_no_label = No Label
+issues.filter_label_select_no_label = No label
issues.filter_milestone = Milestone
issues.filter_milestone_all = All milestones
issues.filter_milestone_none = No milestones
diff --git a/routers/api/packages/nuget/api_v2.go b/routers/api/packages/nuget/api_v2.go
index 7d0ac64a8adc..a726065ad087 100644
--- a/routers/api/packages/nuget/api_v2.go
+++ b/routers/api/packages/nuget/api_v2.go
@@ -289,7 +289,7 @@ type FeedResponse struct {
ID string `xml:"id"`
Title TypedValue[string] `xml:"title"`
Updated time.Time `xml:"updated"`
- Link FeedEntryLink `xml:"link"`
+ Links []FeedEntryLink `xml:"link"`
Entries []*FeedEntry `xml:"entry"`
Count int64 `xml:"m:count"`
}
@@ -300,6 +300,16 @@ func createFeedResponse(l *linkBuilder, totalEntries int64, pds []*packages_mode
entries = append(entries, createEntry(l, pd, false))
}
+ links := []FeedEntryLink{
+ {Rel: "self", Href: l.Base},
+ }
+ if l.Next != nil {
+ links = append(links, FeedEntryLink{
+ Rel: "next",
+ Href: l.GetNextURL(),
+ })
+ }
+
return &FeedResponse{
Xmlns: "http://www.w3.org/2005/Atom",
Base: l.Base,
@@ -307,7 +317,7 @@ func createFeedResponse(l *linkBuilder, totalEntries int64, pds []*packages_mode
XmlnsM: "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata",
ID: "http://schemas.datacontract.org/2004/07/",
Updated: time.Now(),
- Link: FeedEntryLink{Rel: "self", Href: l.Base},
+ Links: links,
Count: totalEntries,
Entries: entries,
}
diff --git a/routers/api/packages/nuget/api_v3.go b/routers/api/packages/nuget/api_v3.go
index 28626f9294c3..af52125e2e4d 100644
--- a/routers/api/packages/nuget/api_v3.go
+++ b/routers/api/packages/nuget/api_v3.go
@@ -166,10 +166,10 @@ type PackageVersionsResponse struct {
Versions []string `json:"versions"`
}
-func createPackageVersionsResponse(pds []*packages_model.PackageDescriptor) *PackageVersionsResponse {
- versions := make([]string, 0, len(pds))
- for _, pd := range pds {
- versions = append(versions, pd.Version.Version)
+func createPackageVersionsResponse(pvs []*packages_model.PackageVersion) *PackageVersionsResponse {
+ versions := make([]string, 0, len(pvs))
+ for _, pv := range pvs {
+ versions = append(versions, pv.Version)
}
return &PackageVersionsResponse{
diff --git a/routers/api/packages/nuget/links.go b/routers/api/packages/nuget/links.go
index 1b02e4618467..4c573fe3161c 100644
--- a/routers/api/packages/nuget/links.go
+++ b/routers/api/packages/nuget/links.go
@@ -5,10 +5,17 @@ package nuget
import (
"fmt"
+ "net/url"
)
+type nextOptions struct {
+ Path string
+ Query url.Values
+}
+
type linkBuilder struct {
Base string
+ Next *nextOptions
}
// GetRegistrationIndexURL builds the registration index url
@@ -30,3 +37,16 @@ func (l *linkBuilder) GetPackageDownloadURL(id, version string) string {
func (l *linkBuilder) GetPackageMetadataURL(id, version string) string {
return fmt.Sprintf("%s/Packages(Id='%s',Version='%s')", l.Base, id, version)
}
+
+func (l *linkBuilder) GetNextURL() string {
+ u, _ := url.Parse(l.Base)
+ u = u.JoinPath(l.Next.Path)
+ q := u.Query()
+ for k, vs := range l.Next.Query {
+ for _, v := range vs {
+ q.Add(k, v)
+ }
+ }
+ u.RawQuery = q.Encode()
+ return u.String()
+}
diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go
index edeba19b3bbd..9c97ba8e776f 100644
--- a/routers/api/packages/nuget/nuget.go
+++ b/routers/api/packages/nuget/nuget.go
@@ -9,6 +9,7 @@ import (
"fmt"
"io"
"net/http"
+ "net/url"
"regexp"
"strconv"
"strings"
@@ -111,13 +112,8 @@ func getSearchTerm(ctx *context.Context) string {
// https://github.com/NuGet/NuGet.Client/blob/dev/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedQueryBuilder.cs
func SearchServiceV2(ctx *context.Context) {
- skip, take := ctx.FormInt("skip"), ctx.FormInt("take")
- if skip == 0 {
- skip = ctx.FormInt("$skip")
- }
- if take == 0 {
- take = ctx.FormInt("$top")
- }
+ skip, take := ctx.FormInt("$skip"), ctx.FormInt("$top")
+ paginator := db.NewAbsoluteListOptions(skip, take)
pvs, total, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
OwnerID: ctx.Package.Owner.ID,
@@ -126,10 +122,7 @@ func SearchServiceV2(ctx *context.Context) {
Value: getSearchTerm(ctx),
},
IsInternal: util.OptionalBoolFalse,
- Paginator: db.NewAbsoluteListOptions(
- skip,
- take,
- ),
+ Paginator: paginator,
})
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
@@ -142,8 +135,28 @@ func SearchServiceV2(ctx *context.Context) {
return
}
+ skip, take = paginator.GetSkipTake()
+
+ var next *nextOptions
+ if len(pvs) == take {
+ next = &nextOptions{
+ Path: "Search()",
+ Query: url.Values{},
+ }
+ searchTerm := ctx.FormTrim("searchTerm")
+ if searchTerm != "" {
+ next.Query.Set("searchTerm", searchTerm)
+ }
+ filter := ctx.FormTrim("$filter")
+ if filter != "" {
+ next.Query.Set("$filter", filter)
+ }
+ next.Query.Set("$skip", strconv.Itoa(skip+take))
+ next.Query.Set("$top", strconv.Itoa(take))
+ }
+
resp := createFeedResponse(
- &linkBuilder{setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
+ &linkBuilder{Base: setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget", Next: next},
total,
pds,
)
@@ -193,7 +206,7 @@ func SearchServiceV3(ctx *context.Context) {
}
resp := createSearchResultResponse(
- &linkBuilder{setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
+ &linkBuilder{Base: setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
count,
pds,
)
@@ -222,7 +235,7 @@ func RegistrationIndex(ctx *context.Context) {
}
resp := createRegistrationIndexResponse(
- &linkBuilder{setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
+ &linkBuilder{Base: setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
pds,
)
@@ -251,7 +264,7 @@ func RegistrationLeafV2(ctx *context.Context) {
}
resp := createEntryResponse(
- &linkBuilder{setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
+ &linkBuilder{Base: setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
pd,
)
@@ -280,7 +293,7 @@ func RegistrationLeafV3(ctx *context.Context) {
}
resp := createRegistrationLeafResponse(
- &linkBuilder{setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
+ &linkBuilder{Base: setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
pd,
)
@@ -291,7 +304,19 @@ func RegistrationLeafV3(ctx *context.Context) {
func EnumeratePackageVersionsV2(ctx *context.Context) {
packageName := strings.Trim(ctx.FormTrim("id"), "'")
- pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeNuGet, packageName)
+ skip, take := ctx.FormInt("$skip"), ctx.FormInt("$top")
+ paginator := db.NewAbsoluteListOptions(skip, take)
+
+ pvs, total, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
+ OwnerID: ctx.Package.Owner.ID,
+ Type: packages_model.TypeNuGet,
+ Name: packages_model.SearchValue{
+ ExactMatch: true,
+ Value: packageName,
+ },
+ IsInternal: util.OptionalBoolFalse,
+ Paginator: paginator,
+ })
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
return
@@ -303,9 +328,22 @@ func EnumeratePackageVersionsV2(ctx *context.Context) {
return
}
+ skip, take = paginator.GetSkipTake()
+
+ var next *nextOptions
+ if len(pvs) == take {
+ next = &nextOptions{
+ Path: "FindPackagesById()",
+ Query: url.Values{},
+ }
+ next.Query.Set("id", packageName)
+ next.Query.Set("$skip", strconv.Itoa(skip+take))
+ next.Query.Set("$top", strconv.Itoa(take))
+ }
+
resp := createFeedResponse(
- &linkBuilder{setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget"},
- int64(len(pds)),
+ &linkBuilder{Base: setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/nuget", Next: next},
+ total,
pds,
)
@@ -345,13 +383,7 @@ func EnumeratePackageVersionsV3(ctx *context.Context) {
return
}
- pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
- if err != nil {
- apiError(ctx, http.StatusInternalServerError, err)
- return
- }
-
- resp := createPackageVersionsResponse(pds)
+ resp := createPackageVersionsResponse(pvs)
ctx.JSON(http.StatusOK, resp)
}
diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go
index adde26f0b56e..b743d1b0a55b 100644
--- a/routers/web/admin/auths.go
+++ b/routers/web/admin/auths.go
@@ -454,15 +454,11 @@ func DeleteAuthSource(ctx *context.Context) {
} else {
ctx.Flash.Error(fmt.Sprintf("auth_service.DeleteSource: %v", err))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/admin/auths/" + url.PathEscape(ctx.Params(":authid")),
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/admin/auths/" + url.PathEscape(ctx.Params(":authid")))
return
}
log.Trace("Authentication deleted by admin(%s): %d", ctx.Doer.Name, source.ID)
ctx.Flash.Success(ctx.Tr("admin.auths.deletion_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/admin/auths",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/admin/auths")
}
diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go
index ba0d86264519..c70a2d1c9512 100644
--- a/routers/web/admin/config.go
+++ b/routers/web/admin/config.go
@@ -179,9 +179,7 @@ func Config(ctx *context.Context) {
func ChangeConfig(ctx *context.Context) {
key := strings.TrimSpace(ctx.FormString("key"))
if key == "" {
- ctx.JSON(http.StatusOK, map[string]string{
- "redirect": ctx.Req.URL.String(),
- })
+ ctx.JSONRedirect(ctx.Req.URL.String())
return
}
value := ctx.FormString("value")
diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go
index 2e4122c9048b..cd8cc29cdfbc 100644
--- a/routers/web/admin/hooks.go
+++ b/routers/web/admin/hooks.go
@@ -67,7 +67,5 @@ func DeleteDefaultOrSystemWebhook(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/admin/hooks",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/admin/hooks")
}
diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go
index 731a1d6ac2f2..8e4b8a373ef5 100644
--- a/routers/web/admin/packages.go
+++ b/routers/web/admin/packages.go
@@ -97,7 +97,5 @@ func DeletePackageVersion(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("packages.settings.delete.success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/admin/packages?page=" + url.QueryEscape(ctx.FormString("page")) + "&q=" + url.QueryEscape(ctx.FormString("q")) + "&type=" + url.QueryEscape(ctx.FormString("type")),
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/admin/packages?page=" + url.QueryEscape(ctx.FormString("page")) + "&q=" + url.QueryEscape(ctx.FormString("q")) + "&type=" + url.QueryEscape(ctx.FormString("type")))
}
diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go
index 2ea8a2ad3581..d1d0abca0254 100644
--- a/routers/web/admin/repos.go
+++ b/routers/web/admin/repos.go
@@ -58,9 +58,7 @@ func DeleteRepo(ctx *context.Context) {
log.Trace("Repository deleted: %s", repo.FullName())
ctx.Flash.Success(ctx.Tr("repo.settings.deletion_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/admin/repos?page=" + url.QueryEscape(ctx.FormString("page")) + "&sort=" + url.QueryEscape(ctx.FormString("sort")),
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/admin/repos?page=" + url.QueryEscape(ctx.FormString("page")) + "&sort=" + url.QueryEscape(ctx.FormString("sort")))
}
// UnadoptedRepos lists the unadopted repositories
diff --git a/routers/web/admin/stacktrace.go b/routers/web/admin/stacktrace.go
index f2d2be481a6a..b603fb59a26d 100644
--- a/routers/web/admin/stacktrace.go
+++ b/routers/web/admin/stacktrace.go
@@ -42,7 +42,5 @@ func Stacktrace(ctx *context.Context) {
func StacktraceCancel(ctx *context.Context) {
pid := ctx.Params("pid")
process.GetManager().Cancel(process.IDType(pid))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/admin/monitor/stacktrace",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/admin/monitor/stacktrace")
}
diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go
index e369f860811f..013e11eacce0 100644
--- a/routers/web/auth/webauthn.go
+++ b/routers/web/auth/webauthn.go
@@ -154,5 +154,5 @@ func WebAuthnLoginAssertionPost(ctx *context.Context) {
}
_ = ctx.Session.Delete("twofaUid")
- ctx.JSON(http.StatusOK, map[string]string{"redirect": redirect})
+ ctx.JSONRedirect(redirect)
}
diff --git a/routers/web/org/members.go b/routers/web/org/members.go
index 8da0f0b9fd01..fae8b48128be 100644
--- a/routers/web/org/members.go
+++ b/routers/web/org/members.go
@@ -101,9 +101,7 @@ func MembersAction(ctx *context.Context) {
err = models.RemoveOrgUser(org.ID, uid)
if organization.IsErrLastOrgOwner(err) {
ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Org.OrgLink + "/members",
- })
+ ctx.JSONRedirect(ctx.Org.OrgLink + "/members")
return
}
case "leave":
@@ -115,9 +113,7 @@ func MembersAction(ctx *context.Context) {
})
} else if organization.IsErrLastOrgOwner(err) {
ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Org.OrgLink + "/members",
- })
+ ctx.JSONRedirect(ctx.Org.OrgLink + "/members")
} else {
log.Error("RemoveOrgUser(%d,%d): %v", org.ID, ctx.Doer.ID, err)
}
@@ -138,7 +134,5 @@ func MembersAction(ctx *context.Context) {
redirect = setting.AppSubURL + "/"
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": redirect,
- })
+ ctx.JSONRedirect(redirect)
}
diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go
index 08566637a878..a9f9e963d497 100644
--- a/routers/web/org/org_labels.go
+++ b/routers/web/org/org_labels.go
@@ -90,9 +90,7 @@ func DeleteLabel(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.issues.label_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Org.OrgLink + "/settings/labels",
- })
+ ctx.JSONRedirect(ctx.Org.OrgLink + "/settings/labels")
}
// InitializeLabels init labels for an organization
diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index 50bb5591e57a..ea6e7dff48ff 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -219,9 +219,7 @@ func DeleteProject(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.projects.deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.ContextUser.HomeLink() + "/-/projects",
- })
+ ctx.JSONRedirect(ctx.ContextUser.HomeLink() + "/-/projects")
}
// RenderEditProject allows a project to be edited
@@ -449,9 +447,7 @@ func UpdateIssueProject(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// DeleteProjectBoard allows for the deletion of a project board
@@ -497,9 +493,7 @@ func DeleteProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// AddBoardToProjectPost allows a new board to be added to a project.
@@ -526,9 +520,7 @@ func AddBoardToProjectPost(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// CheckProjectBoardChangePermissions check permission
@@ -594,9 +586,7 @@ func EditProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// SetDefaultProjectBoard set default board for uncategorized issues/pulls
@@ -611,9 +601,7 @@ func SetDefaultProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// UnsetDefaultProjectBoard unset default board for uncategorized issues/pulls
@@ -628,9 +616,7 @@ func UnsetDefaultProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// MoveIssues moves or keeps issues in a column and sorts them inside that column
@@ -730,7 +716,5 @@ func MoveIssues(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index f63b2e9f064e..5ae61c79befe 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -219,9 +219,7 @@ func DeleteWebhook(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Org.OrgLink + "/settings/hooks",
- })
+ ctx.JSONRedirect(ctx.Org.OrgLink + "/settings/hooks")
}
// Labels render organization labels page
diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index aefadaf809e8..196d3e9bf040 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -256,9 +256,7 @@ func TeamsRepoAction(ctx *context.Context) {
}
if action == "addall" || action == "removeall" {
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName) + "/repositories",
- })
+ ctx.JSONRedirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName) + "/repositories")
return
}
ctx.Redirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName) + "/repositories")
@@ -530,9 +528,7 @@ func DeleteTeam(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("org.teams.delete_team_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Org.OrgLink + "/teams",
- })
+ ctx.JSONRedirect(ctx.Org.OrgLink + "/teams")
}
// TeamInvite renders the team invite page
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
index 999104d7872d..d71d555bc2b5 100644
--- a/routers/web/repo/branch.go
+++ b/routers/web/repo/branch.go
@@ -162,9 +162,7 @@ func RestoreBranchPost(ctx *context.Context) {
}
func redirect(ctx *context.Context) {
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/branches?page=" + url.QueryEscape(ctx.FormString("page")),
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/branches?page=" + url.QueryEscape(ctx.FormString("page")))
}
// CreateBranch creates new branch in repository
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index e88f1139f8b7..5b32591b8914 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -23,6 +23,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/gitdiff"
+ git_service "code.gitea.io/gitea/services/repository"
)
const (
@@ -255,6 +256,15 @@ func FileHistory(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplCommits)
}
+func LoadBranchesAndTags(ctx *context.Context) {
+ response, err := git_service.LoadBranchesAndTags(ctx, ctx.Repo, ctx.Params("sha"))
+ if err == nil {
+ ctx.JSON(http.StatusOK, response)
+ return
+ }
+ ctx.NotFoundOrServerError(fmt.Sprintf("could not load branches and tags the commit %s belongs to", ctx.Params("sha")), git.IsErrNotExist, err)
+}
+
// Diff show different from current commit to previous commit
func Diff(ctx *context.Context) {
ctx.Data["PageIsDiff"] = true
@@ -374,11 +384,6 @@ func Diff(ctx *context.Context) {
return
}
- ctx.Data["TagName"], err = commit.GetTagName()
- if err != nil {
- ctx.ServerError("commit.GetTagName", err)
- return
- }
ctx.HTML(http.StatusOK, tplCommitPage)
}
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index b7d159d15808..f243507c3347 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -174,7 +174,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
// 0 means issues with no label
// blank means labels will not be filtered for issues
selectLabels := ctx.FormString("labels")
- if len(selectLabels) > 0 {
+ if selectLabels == "" {
+ ctx.Data["AllLabels"] = true
+ } else if selectLabels == "0" {
+ ctx.Data["NoLabel"] = true
+ } else if len(selectLabels) > 0 {
labelIDs, err = base.StringsToInt64s(strings.Split(selectLabels, ","))
if err != nil {
ctx.ServerError("StringsToInt64s", err)
@@ -2221,9 +2225,7 @@ func UpdateIssueMilestone(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// UpdateIssueAssignee change issue's or pull's assignee
@@ -2267,9 +2269,7 @@ func UpdateIssueAssignee(ctx *context.Context) {
}
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// UpdatePullReviewRequest add or remove review request
@@ -2392,9 +2392,7 @@ func UpdatePullReviewRequest(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// SearchIssues searches for issues across the repositories that the user has access to
diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go
index af5db83bd5d2..5d326bab5808 100644
--- a/routers/web/repo/issue_label.go
+++ b/routers/web/repo/issue_label.go
@@ -157,9 +157,7 @@ func DeleteLabel(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.issues.label_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/labels",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/labels")
}
// UpdateIssueLabel change issue's labels
@@ -226,7 +224,5 @@ func UpdateIssueLabel(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go
index 7b20cd98482b..ad355ce5d7d9 100644
--- a/routers/web/repo/milestone.go
+++ b/routers/web/repo/milestone.go
@@ -255,9 +255,7 @@ func DeleteMilestone(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.milestones.deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/milestones",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/milestones")
}
// MilestoneIssuesAndPulls lists all the issues and pull requests of the milestone
diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go
index 1574c90c02ed..b8662e060556 100644
--- a/routers/web/repo/projects.go
+++ b/routers/web/repo/projects.go
@@ -203,9 +203,7 @@ func DeleteProject(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.projects.deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/projects",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/projects")
}
// RenderEditProject allows a project to be edited
@@ -397,9 +395,7 @@ func UpdateIssueProject(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// DeleteProjectBoard allows for the deletion of a project board
@@ -452,9 +448,7 @@ func DeleteProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// AddBoardToProjectPost allows a new board to be added to a project.
@@ -487,9 +481,7 @@ func AddBoardToProjectPost(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
func checkProjectBoardChangePermissions(ctx *context.Context) (*project_model.Project, *project_model.Board) {
@@ -561,9 +553,7 @@ func EditProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// SetDefaultProjectBoard set default board for uncategorized issues/pulls
@@ -578,9 +568,7 @@ func SetDefaultProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// UnSetDefaultProjectBoard unset default board for uncategorized issues/pulls
@@ -595,9 +583,7 @@ func UnSetDefaultProjectBoard(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
// MoveIssues moves or keeps issues in a column and sorts them inside that column
@@ -699,7 +685,5 @@ func MoveIssues(ctx *context.Context) {
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 5290e25d463f..237e53413f76 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1423,9 +1423,7 @@ func CleanUpPullRequest(ctx *context.Context) {
}
defer func() {
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": issue.Link(),
- })
+ ctx.JSONRedirect(issue.Link())
}()
// Check if branch has no new commits
diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go
index f7c962d1ae8f..c2271750c4d1 100644
--- a/routers/web/repo/pull_review.go
+++ b/routers/web/repo/pull_review.go
@@ -156,9 +156,7 @@ func UpdateResolveConversation(ctx *context.Context) {
renderConversation(ctx, comment)
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "ok": true,
- })
+ ctx.JSONOK()
}
func renderConversation(ctx *context.Context, comment *issues_model.Comment) {
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 3d991384e56a..957cf56972ce 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -628,13 +628,9 @@ func deleteReleaseOrTag(ctx *context.Context, isDelTag bool) {
}
if isDelTag {
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/tags",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/tags")
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/releases",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/releases")
}
diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go
index 8f2d30686207..b708422cbd26 100644
--- a/routers/web/repo/setting/collaboration.go
+++ b/routers/web/repo/setting/collaboration.go
@@ -133,9 +133,7 @@ func DeleteCollaboration(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.remove_collaborator_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/settings/collaboration",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/settings/collaboration")
}
// AddTeamPost response for adding a team to a repository
@@ -204,7 +202,5 @@ func DeleteTeam(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("repo.settings.remove_team_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/settings/collaboration",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/settings/collaboration")
}
diff --git a/routers/web/repo/setting/deploy_key.go b/routers/web/repo/setting/deploy_key.go
index d08c51f5e5c3..577706d45441 100644
--- a/routers/web/repo/setting/deploy_key.go
+++ b/routers/web/repo/setting/deploy_key.go
@@ -105,7 +105,5 @@ func DeleteDeployKey(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/settings/keys",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/settings/keys")
}
diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go
index cf59e747d84f..5bfdb8f515ba 100644
--- a/routers/web/repo/setting/protected_branch.go
+++ b/routers/web/repo/setting/protected_branch.go
@@ -318,41 +318,31 @@ func DeleteProtectedBranchRulePost(ctx *context.Context) {
ruleID := ctx.ParamsInt64("id")
if ruleID <= 0 {
ctx.Flash.Error(ctx.Tr("repo.settings.remove_protected_branch_failed", fmt.Sprintf("%d", ruleID)))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink),
- })
+ ctx.JSONRedirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
return
}
rule, err := git_model.GetProtectedBranchRuleByID(ctx, ctx.Repo.Repository.ID, ruleID)
if err != nil {
ctx.Flash.Error(ctx.Tr("repo.settings.remove_protected_branch_failed", fmt.Sprintf("%d", ruleID)))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink),
- })
+ ctx.JSONRedirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
return
}
if rule == nil {
ctx.Flash.Error(ctx.Tr("repo.settings.remove_protected_branch_failed", fmt.Sprintf("%d", ruleID)))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink),
- })
+ ctx.JSONRedirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
return
}
if err := git_model.DeleteProtectedBranch(ctx, ctx.Repo.Repository.ID, ruleID); err != nil {
ctx.Flash.Error(ctx.Tr("repo.settings.remove_protected_branch_failed", rule.RuleName))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink),
- })
+ ctx.JSONRedirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
return
}
ctx.Flash.Success(ctx.Tr("repo.settings.remove_protected_branch_success", rule.RuleName))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink),
- })
+ ctx.JSONRedirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
}
// RenameBranchPost responses for rename a branch
diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go
index d85d5c8b07ff..5c4e1d47d09a 100644
--- a/routers/web/repo/setting/webhook.go
+++ b/routers/web/repo/setting/webhook.go
@@ -729,7 +729,5 @@ func DeleteWebhook(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/settings/hooks",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/settings/hooks")
}
diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go
index 4773e25c7066..e3c187c33bfd 100644
--- a/routers/web/repo/wiki.go
+++ b/routers/web/repo/wiki.go
@@ -790,7 +790,5 @@ func DeleteWikiPagePost(ctx *context.Context) {
notification.NotifyDeleteWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, string(wikiName))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": ctx.Repo.RepoLink + "/wiki/",
- })
+ ctx.JSONRedirect(ctx.Repo.RepoLink + "/wiki/")
}
diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go
index 21e5a90d8f20..eb84cc4a2ef4 100644
--- a/routers/web/shared/actions/runners.go
+++ b/routers/web/shared/actions/runners.go
@@ -5,7 +5,6 @@ package actions
import (
"errors"
- "net/http"
actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/models/db"
@@ -160,9 +159,7 @@ func RunnerDeletePost(ctx *context.Context, runnerID int64,
log.Warn("DeleteRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL)
ctx.Flash.Warning(ctx.Tr("actions.runners.delete_runner_failed"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": failedRedirectTo,
- })
+ ctx.JSONRedirect(failedRedirectTo)
return
}
@@ -170,7 +167,5 @@ func RunnerDeletePost(ctx *context.Context, runnerID int64,
ctx.Flash.Success(ctx.Tr("actions.runners.delete_runner_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": successRedirectTo,
- })
+ ctx.JSONRedirect(successRedirectTo)
}
diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
index 532f0d8e3912..ecb846e91bb3 100644
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -227,9 +227,7 @@ func DeleteEmail(ctx *context.Context) {
log.Trace("Email address deleted: %s", ctx.Doer.Name)
ctx.Flash.Success(ctx.Tr("settings.email_deletion_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/account",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/account")
}
// DeleteAccount render user suicide page and response for delete user himself
diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go
index 81209376960d..088aba38b692 100644
--- a/routers/web/user/setting/applications.go
+++ b/routers/web/user/setting/applications.go
@@ -83,9 +83,7 @@ func DeleteApplication(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("settings.delete_token_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/applications",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/applications")
}
func loadApplicationsData(ctx *context.Context) {
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go
index d9412cae7cae..2336c04bbed2 100644
--- a/routers/web/user/setting/keys.go
+++ b/routers/web/user/setting/keys.go
@@ -256,9 +256,7 @@ func DeleteKey(ctx *context.Context) {
ctx.Flash.Warning("Function not implemented")
ctx.Redirect(setting.AppSubURL + "/user/settings/keys")
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/keys",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/keys")
}
func loadKeysData(ctx *context.Context) {
diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go
index 923ce4b4367b..641cc1fd9ffa 100644
--- a/routers/web/user/setting/oauth2_common.go
+++ b/routers/web/user/setting/oauth2_common.go
@@ -138,7 +138,7 @@ func (oa *OAuth2CommonHandlers) DeleteApp(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("settings.remove_oauth2_application_success"))
- ctx.JSON(http.StatusOK, map[string]any{"redirect": oa.BasePathList})
+ ctx.JSONRedirect(oa.BasePathList)
}
// RevokeGrant revokes the grant
@@ -149,5 +149,5 @@ func (oa *OAuth2CommonHandlers) RevokeGrant(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("settings.revoke_oauth2_grant_success"))
- ctx.JSON(http.StatusOK, map[string]any{"redirect": oa.BasePathList})
+ ctx.JSONRedirect(oa.BasePathList)
}
diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go
index f4133f391602..b5509f570fd6 100644
--- a/routers/web/user/setting/security/openid.go
+++ b/routers/web/user/setting/security/openid.go
@@ -112,9 +112,7 @@ func DeleteOpenID(ctx *context.Context) {
log.Trace("OpenID address deleted: %s", ctx.Doer.Name)
ctx.Flash.Success(ctx.Tr("settings.openid_deletion_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/security",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/security")
}
// ToggleOpenIDVisibility response for toggle visibility of user's openid
diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go
index cc5f817a9d42..dae9bf950dce 100644
--- a/routers/web/user/setting/security/security.go
+++ b/routers/web/user/setting/security/security.go
@@ -48,9 +48,7 @@ func DeleteAccountLink(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/security",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/security")
}
func loadSecurityData(ctx *context.Context) {
diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go
index 89ac184a47e7..990e506d6fdf 100644
--- a/routers/web/user/setting/security/webauthn.go
+++ b/routers/web/user/setting/security/webauthn.go
@@ -116,7 +116,5 @@ func WebauthnDelete(ctx *context.Context) {
ctx.ServerError("GetWebAuthnCredentialByID", err)
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/security",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/security")
}
diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go
index db03d7b1ed20..04092461fde3 100644
--- a/routers/web/user/setting/webhooks.go
+++ b/routers/web/user/setting/webhooks.go
@@ -42,7 +42,5 @@ func DeleteWebhook(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/hooks",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/hooks")
}
diff --git a/routers/web/web.go b/routers/web/web.go
index 6d5ccad484fa..0b519614453a 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -374,8 +374,9 @@ func registerRoutes(m *web.Route) {
m.Get("/milestones", reqSignIn, reqMilestonesDashboardPageEnabled, user.Milestones)
// ***** START: User *****
+ // "user/login" doesn't need signOut, then logged-in users can still access this route for redirection purposes by "/user/login?redirec_to=..."
+ m.Get("/user/login", auth.SignIn)
m.Group("/user", func() {
- m.Get("/login", auth.SignIn)
m.Post("/login", web.Bind(forms.SignInForm{}), auth.SignInPost)
m.Group("", func() {
m.Combo("/login/openid").
@@ -1336,6 +1337,7 @@ func registerRoutes(m *web.Route) {
m.Group("", func() {
m.Get("/graph", repo.Graph)
m.Get("/commit/{sha:([a-f0-9]{7,40})$}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.Diff)
+ m.Get("/commit/{sha:([a-f0-9]{7,40})$}/load-branches-and-tags", repo.LoadBranchesAndTags)
m.Get("/cherry-pick/{sha:([a-f0-9]{7,40})$}", repo.SetEditorconfigIfExists, repo.CherryPick)
}, repo.MustBeNotEmpty, context.RepoRef(), reqRepoCodeReader)
diff --git a/services/convert/status.go b/services/convert/status.go
index c7b6450e272d..6cef63c1cdad 100644
--- a/services/convert/status.go
+++ b/services/convert/status.go
@@ -48,7 +48,7 @@ func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, r
retStatus.Statuses = make([]*api.CommitStatus, 0, len(statuses))
for _, status := range statuses {
retStatus.Statuses = append(retStatus.Statuses, ToCommitStatus(ctx, status))
- if status.State.NoBetterThan(retStatus.State) {
+ if retStatus.State == "" || status.State.NoBetterThan(retStatus.State) {
retStatus.State = status.State
}
}
diff --git a/services/repository/commit.go b/services/repository/commit.go
new file mode 100644
index 000000000000..2497910a838d
--- /dev/null
+++ b/services/repository/commit.go
@@ -0,0 +1,55 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repository
+
+import (
+ "context"
+ "fmt"
+
+ gitea_ctx "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/util"
+)
+
+type ContainedLinks struct { // TODO: better name?
+ Branches []*namedLink `json:"branches"`
+ Tags []*namedLink `json:"tags"`
+ DefaultBranch string `json:"default_branch"`
+}
+
+type namedLink struct { // TODO: better name?
+ Name string `json:"name"`
+ WebLink string `json:"web_link"`
+}
+
+// LoadBranchesAndTags creates a new repository branch
+func LoadBranchesAndTags(ctx context.Context, baseRepo *gitea_ctx.Repository, commitSHA string) (*ContainedLinks, error) {
+ containedTags, err := baseRepo.GitRepo.ListOccurrences(ctx, "tag", commitSHA)
+ if err != nil {
+ return nil, fmt.Errorf("encountered a problem while querying %s: %w", "tags", err)
+ }
+ containedBranches, err := baseRepo.GitRepo.ListOccurrences(ctx, "branch", commitSHA)
+ if err != nil {
+ return nil, fmt.Errorf("encountered a problem while querying %s: %w", "branches", err)
+ }
+
+ result := &ContainedLinks{
+ DefaultBranch: baseRepo.Repository.DefaultBranch,
+ Branches: make([]*namedLink, 0, len(containedBranches)),
+ Tags: make([]*namedLink, 0, len(containedTags)),
+ }
+ for _, tag := range containedTags {
+ // TODO: Use a common method to get the link to a branch/tag instead of hard-coding it here
+ result.Tags = append(result.Tags, &namedLink{
+ Name: tag,
+ WebLink: fmt.Sprintf("%s/src/tag/%s", baseRepo.RepoLink, util.PathEscapeSegments(tag)),
+ })
+ }
+ for _, branch := range containedBranches {
+ result.Branches = append(result.Branches, &namedLink{
+ Name: branch,
+ WebLink: fmt.Sprintf("%s/src/branch/%s", baseRepo.RepoLink, util.PathEscapeSegments(branch)),
+ })
+ }
+ return result, nil
+}
diff --git a/services/repository/lfs.go b/services/repository/lfs.go
index 0bd4d53a5c4d..8e654b6f13bc 100644
--- a/services/repository/lfs.go
+++ b/services/repository/lfs.go
@@ -15,6 +15,7 @@ import (
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/timeutil"
)
// GarbageCollectLFSMetaObjectsOptions provides options for GarbageCollectLFSMetaObjects function
@@ -120,8 +121,8 @@ func GarbageCollectLFSMetaObjectsForRepo(ctx context.Context, repo *repo_model.R
//
// It is likely that a week is potentially excessive but it should definitely be enough that any
// unassociated LFS object is genuinely unassociated.
- OlderThan: opts.OlderThan,
- UpdatedLessRecentlyThan: opts.UpdatedLessRecentlyThan,
+ OlderThan: timeutil.TimeStamp(opts.OlderThan.Unix()),
+ UpdatedLessRecentlyThan: timeutil.TimeStamp(opts.UpdatedLessRecentlyThan.Unix()),
OrderByUpdated: true,
LoopFunctionAlwaysUpdates: true,
})
diff --git a/services/repository/lfs_test.go b/services/repository/lfs_test.go
new file mode 100644
index 000000000000..e88befdfefe9
--- /dev/null
+++ b/services/repository/lfs_test.go
@@ -0,0 +1,64 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repository
+
+import (
+ "bytes"
+ "context"
+ "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"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestGarbageCollectLFSMetaObjects(t *testing.T) {
+ assert.NoError(t, unittest.PrepareTestDatabase())
+
+ setting.LFS.StartServer = true
+ err := storage.Init()
+ assert.NoError(t, err)
+
+ repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "repo1")
+ assert.NoError(t, err)
+
+ // add lfs object
+ lfsContent := []byte("gitea1")
+ lfsOid := storeObjectInRepo(t, repo.ID, &lfsContent)
+
+ // gc
+ err = GarbageCollectLFSMetaObjects(context.Background(), GarbageCollectLFSMetaObjectsOptions{
+ AutoFix: true,
+ OlderThan: time.Now().Add(7 * 24 * time.Hour).Add(5 * 24 * time.Hour),
+ UpdatedLessRecentlyThan: time.Now().Add(7 * 24 * time.Hour).Add(3 * 24 * time.Hour),
+ })
+ assert.NoError(t, err)
+
+ // lfs meta has been deleted
+ _, err = git_model.GetLFSMetaObjectByOid(db.DefaultContext, repo.ID, lfsOid)
+ assert.ErrorIs(t, err, git_model.ErrLFSObjectNotExist)
+}
+
+func storeObjectInRepo(t *testing.T, repositoryID int64, content *[]byte) string {
+ pointer, err := lfs.GeneratePointer(bytes.NewReader(*content))
+ assert.NoError(t, err)
+
+ _, err = git_model.NewLFSMetaObject(db.DefaultContext, &git_model.LFSMetaObject{Pointer: pointer, RepositoryID: repositoryID})
+ assert.NoError(t, err)
+ contentStore := lfs.NewContentStore()
+ exist, err := contentStore.Exists(pointer)
+ assert.NoError(t, err)
+ if !exist {
+ err := contentStore.Put(pointer, bytes.NewReader(*content))
+ assert.NoError(t, err)
+ }
+ return pointer.Oid
+}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 297427eeebd5..b32e8cace774 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -56,7 +56,7 @@