Skip to content

Commit 4a0796a

Browse files
hiifonghiifong
committed
Merge branch 'main' into squash-merge-msg
* main: (34 commits) when sorting issues by nearest due date, issues without due date should be sorted ascending (go-gitea#35267) [skip ci] Updated translations via Crowdin Upgrade xz to v0.5.15 (go-gitea#35377) Refactor db package (go-gitea#35380) Remove the duplicated function GetTags (go-gitea#35375) [skip ci] Updated translations via Crowdin Allow foreachref parser to grow its buffer (go-gitea#35365) Remove global context from db package (go-gitea#35371) Use gitrepo.SetDefaultBranch when set default branch of wiki repository (go-gitea#33911) Deleting branch could delete broken branch which has database record but git branch is missing (go-gitea#35360) Remove incorrect "db.DefaultContext" usages (go-gitea#35366) Refactor to use reflect.TypeFor (go-gitea#35370) [skip ci] Updated translations via Crowdin Remove wrong "git.DefaultContext" (go-gitea#35364) Fix context usages (go-gitea#35348) Instance signing rule `pubkey` should allow all public keys, not just GPG (go-gitea#35357) Allow deleting comment with content via API like web did (go-gitea#35346) Prevent duplicate actions email (go-gitea#35215) rename nightly docker tag for main branch (go-gitea#35344) Fix atom/rss mixed error (go-gitea#35345) ... # Conflicts: # tests/integration/pull_merge_test.go
2 parents b0456cf + dca375a commit 4a0796a

File tree

402 files changed

+4134
-3407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

402 files changed

+4134
-3407
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "Gitea DevContainer",
33
"image": "mcr.microsoft.com/devcontainers/go:1.24-bookworm",
4+
"containerEnv": {
5+
// override "local" from packaged version
6+
"GOTOOLCHAIN": "auto"
7+
},
48
"features": {
59
// installs nodejs into container
610
"ghcr.io/devcontainers/features/node:1": {

‎.github/workflows/release-nightly.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ jobs:
7575
- name: Get cleaned branch name
7676
id: clean_name
7777
run: |
78-
# if main then say nightly otherwise cleanup name
79-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
80-
echo "branch=nightly" >> "$GITHUB_OUTPUT"
81-
exit 0
82-
fi
8378
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
8479
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
8580
- name: Login to Docker Hub
@@ -122,11 +117,6 @@ jobs:
122117
- name: Get cleaned branch name
123118
id: clean_name
124119
run: |
125-
# if main then say nightly otherwise cleanup name
126-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
127-
echo "branch=nightly" >> "$GITHUB_OUTPUT"
128-
exit 0
129-
fi
130120
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
131121
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
132122
- name: Login to Docker Hub

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ XGO_VERSION := go-1.25.x
2828
AIR_PACKAGE ?= github.com/air-verse/air@v1
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
3030
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.8.0
31-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6
31+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
3232
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.12
3333
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.7.0
3434
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.32.3

‎cmd/admin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func runRepoSyncReleases(ctx context.Context, _ *cli.Command) error {
100100
return err
101101
}
102102

103-
if err := git.InitSimple(ctx); err != nil {
103+
if err := git.InitSimple(); err != nil {
104104
return err
105105
}
106106

‎cmd/admin_user_change_password_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ func TestChangePasswordCommand(t *testing.T) {
1818
ctx := t.Context()
1919

2020
defer func() {
21-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
21+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
2222
}()
2323

2424
t.Run("change password successfully", func(t *testing.T) {
2525
// defer func() {
26-
// require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
26+
// require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
2727
// }()
2828
// Prepare test user
2929
unittest.AssertNotExistsBean(t, &user_model.User{LowerName: "testuser"})

‎cmd/admin_user_create_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919

2020
func TestAdminUserCreate(t *testing.T) {
2121
reset := func() {
22-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
23-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.EmailAddress{}))
24-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &auth_model.AccessToken{}))
22+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
23+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.EmailAddress{}))
24+
require.NoError(t, db.TruncateBeans(t.Context(), &auth_model.AccessToken{}))
2525
}
2626

2727
t.Run("MustChangePassword", func(t *testing.T) {

‎cmd/admin_user_delete_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
func TestAdminUserDelete(t *testing.T) {
2020
ctx := t.Context()
2121
defer func() {
22-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
23-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.EmailAddress{}))
24-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &auth_model.AccessToken{}))
22+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
23+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.EmailAddress{}))
24+
require.NoError(t, db.TruncateBeans(t.Context(), &auth_model.AccessToken{}))
2525
}()
2626

2727
setupTestUser := func(t *testing.T) {
@@ -104,8 +104,8 @@ func TestAdminUserDeleteFailure(t *testing.T) {
104104
require.Contains(t, err.Error(), tc.expectedErr)
105105
})
106106

107-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
108-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.EmailAddress{}))
109-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &auth_model.AccessToken{}))
107+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
108+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.EmailAddress{}))
109+
require.NoError(t, db.TruncateBeans(t.Context(), &auth_model.AccessToken{}))
110110
}
111111
}

‎cmd/admin_user_must_change_password_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
func TestMustChangePassword(t *testing.T) {
1818
defer func() {
19-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
19+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
2020
}()
2121
err := microcmdUserCreate().Run(t.Context(), []string{"create", "--username", "testuser", "--email", "testuser@gitea.local", "--random-password"})
2222
require.NoError(t, err)

‎cmd/doctor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func runRecreateTable(ctx context.Context, cmd *cli.Command) error {
128128
}
129129
recreateTables := migrate_base.RecreateTables(beans...)
130130

131-
return db.InitEngineWithMigration(ctx, func(ctx context.Context, x *xorm.Engine) error {
131+
return db.InitEngineWithMigration(context.Background(), func(ctx context.Context, x *xorm.Engine) error {
132132
if err := migrations.EnsureUpToDate(ctx, x); err != nil {
133133
return err
134134
}

‎cmd/dump_repo.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func runDumpRepository(ctx context.Context, cmd *cli.Command) error {
9090
}
9191

9292
// migrations.GiteaLocalUploader depends on git module
93-
if err := git.InitSimple(context.Background()); err != nil {
93+
if err := git.InitSimple(); err != nil {
9494
return err
9595
}
9696

@@ -179,7 +179,7 @@ func runDumpRepository(ctx context.Context, cmd *cli.Command) error {
179179
}
180180

181181
if err := migrations.DumpRepository(
182-
context.Background(),
182+
ctx,
183183
repoDir,
184184
cmd.String("owner_name"),
185185
opts,

0 commit comments

Comments
 (0)