\\S+)",
],
},
],
diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go
index ac2d8bba06..bdca030b76 100644
--- a/routers/api/v1/repo/mirror.go
+++ b/routers/api/v1/repo/mirror.go
@@ -6,6 +6,7 @@ package repo
import (
"errors"
"net/http"
+ "strings"
"time"
"code.gitea.io/gitea/models/db"
@@ -101,6 +102,8 @@ func PushMirrorSync(ctx *context.APIContext) {
// "$ref": "#/responses/forbidden"
// "404":
// "$ref": "#/responses/notFound"
+ // "422":
+ // "$ref": "#/responses/validationError"
if !setting.Mirror.Enabled {
ctx.APIError(http.StatusBadRequest, "Mirror feature is disabled")
@@ -112,14 +115,18 @@ func PushMirrorSync(ctx *context.APIContext) {
ctx.APIError(http.StatusNotFound, err)
return
}
+
+ failedPushMirrors := make([]string, 0)
for _, mirror := range pushMirrors {
ok := mirror_service.SyncPushMirror(ctx, mirror.ID)
if !ok {
- ctx.APIErrorInternal(errors.New("error occurred when syncing push mirror " + mirror.RemoteName))
- return
+ failedPushMirrors = append(failedPushMirrors, mirror.RemoteName)
}
}
-
+ if len(failedPushMirrors) != 0 {
+ ctx.APIError(http.StatusUnprocessableEntity, "error occurred when syncing push mirrors: "+strings.Join(failedPushMirrors, ", "))
+ return
+ }
ctx.Status(http.StatusOK)
}
diff --git a/routers/api/v1/repo/mirror_test.go b/routers/api/v1/repo/mirror_test.go
new file mode 100644
index 0000000000..6cbed49d89
--- /dev/null
+++ b/routers/api/v1/repo/mirror_test.go
@@ -0,0 +1,40 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+ "net/http"
+ "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"
+ "code.gitea.io/gitea/modules/test"
+ "code.gitea.io/gitea/services/contexttest"
+
+ "github.com/stretchr/testify/assert"
+)
+
+// TestPushMirrorSync verifies the endpoint attempts every push mirror instead
+// of aborting on the first failure, reporting all failed remotes with a 422.
+// Each remote name is not a configured git remote, so SyncPushMirror fails fast
+// without any network access.
+func TestPushMirrorSync(t *testing.T) {
+ unittest.PrepareTestEnv(t)
+ defer test.MockVariableValue(&setting.Mirror.Enabled, true)()
+
+ for _, remoteName := range []string{"broken_remote_1", "broken_remote_2"} {
+ assert.NoError(t, db.Insert(t.Context(), &repo_model.PushMirror{RepoID: 1, RemoteName: remoteName}))
+ }
+
+ ctx, resp := contexttest.MockAPIContext(t, "user2/repo1")
+ contexttest.LoadRepo(t, ctx, 1)
+
+ PushMirrorSync(ctx)
+
+ assert.Equal(t, http.StatusUnprocessableEntity, ctx.Resp.WrittenStatus())
+ assert.Contains(t, resp.Body.String(), "broken_remote_1")
+ assert.Contains(t, resp.Body.String(), "broken_remote_2")
+}
diff --git a/services/actions/notifier.go b/services/actions/notifier.go
index 4b2e87afad..0069da8c6b 100644
--- a/services/actions/notifier.go
+++ b/services/actions/notifier.go
@@ -687,7 +687,7 @@ func (n *actionsNotifier) AutoMergePullRequest(ctx context.Context, doer *user_m
n.MergePullRequest(ctx, doer, pr)
}
-func (n *actionsNotifier) PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
+func (n *actionsNotifier) PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, before, after string) {
ctx = withMethod(ctx, "PullRequestSynchronized")
if err := pr.LoadIssue(ctx); err != nil {
@@ -703,6 +703,8 @@ func (n *actionsNotifier) PullRequestSynchronized(ctx context.Context, doer *use
newNotifyInput(pr.Issue.Repo, doer, webhook_module.HookEventPullRequestSync).
WithPayload(&api.PullRequestPayload{
Action: api.HookIssueSynchronized,
+ Before: before,
+ After: after,
Index: pr.Issue.Index,
PullRequest: convert.ToAPIPullRequest(ctx, pr, nil),
Repository: convert.ToRepo(ctx, pr.Issue.Repo, access_model.Permission{AccessMode: perm_model.AccessModeNone}),
diff --git a/services/agit/agit.go b/services/agit/agit.go
index c7c46651c0..66f0d1c0db 100644
--- a/services/agit/agit.go
+++ b/services/agit/agit.go
@@ -286,7 +286,7 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
} else if commentCreated {
notify_service.PullRequestPushCommits(ctx, pusher, pr, comment)
}
- notify_service.PullRequestSynchronized(ctx, pusher, pr)
+ notify_service.PullRequestSynchronized(ctx, pusher, pr, oldCommitID, opts.NewCommitIDs[i])
results = append(results, private.HookProcReceiveRefResult{
OldOID: oldCommitID,
diff --git a/services/notify/notifier.go b/services/notify/notifier.go
index 875a70e564..bc990e9cb6 100644
--- a/services/notify/notifier.go
+++ b/services/notify/notifier.go
@@ -45,7 +45,7 @@ type Notifier interface {
NewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User)
MergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest)
AutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest)
- PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest)
+ PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, before, after string)
PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User)
PullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, comment *issues_model.Comment, mentions []*user_model.User)
PullRequestChangeTargetBranch(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, oldBranch string)
diff --git a/services/notify/notify.go b/services/notify/notify.go
index 152d53b01c..aee2047e1c 100644
--- a/services/notify/notify.go
+++ b/services/notify/notify.go
@@ -120,9 +120,9 @@ func NewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions
}
// PullRequestSynchronized notifies Synchronized pull request
-func PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
+func PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, before, after string) {
for _, notifier := range notifiers {
- notifier.PullRequestSynchronized(ctx, doer, pr)
+ notifier.PullRequestSynchronized(ctx, doer, pr, before, after)
}
}
diff --git a/services/notify/null.go b/services/notify/null.go
index c3085d7c9e..f10a132da7 100644
--- a/services/notify/null.go
+++ b/services/notify/null.go
@@ -63,7 +63,7 @@ func (*NullNotifier) AutoMergePullRequest(ctx context.Context, doer *user_model.
}
// PullRequestSynchronized places a place holder function
-func (*NullNotifier) PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
+func (*NullNotifier) PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, before, after string) {
}
// PullRequestChangeTargetBranch places a place holder function
diff --git a/services/pull/pull.go b/services/pull/pull.go
index 4f76df31da..64d9f60dae 100644
--- a/services/pull/pull.go
+++ b/services/pull/pull.go
@@ -479,7 +479,7 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
}
}
- notify_service.PullRequestSynchronized(ctx, opts.Doer, pr)
+ notify_service.PullRequestSynchronized(ctx, opts.Doer, pr, opts.OldCommitID, opts.NewCommitID)
}
}
}
diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go
index 7627935a32..d53dfaaa6a 100644
--- a/services/webhook/notifier.go
+++ b/services/webhook/notifier.go
@@ -818,7 +818,7 @@ func (m *webhookNotifier) CreateRef(ctx context.Context, pusher *user_model.User
}
}
-func (m *webhookNotifier) PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
+func (m *webhookNotifier) PullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, before, after string) {
if err := pr.LoadIssue(ctx); err != nil {
log.Error("LoadIssue: %v", err)
return
@@ -830,6 +830,8 @@ func (m *webhookNotifier) PullRequestSynchronized(ctx context.Context, doer *use
if err := PrepareWebhooks(ctx, EventSource{Repository: pr.Issue.Repo}, webhook_module.HookEventPullRequestSync, &api.PullRequestPayload{
Action: api.HookIssueSynchronized,
+ Before: before,
+ After: after,
Index: pr.Issue.Index,
PullRequest: convert.ToAPIPullRequest(ctx, pr, doer),
Repository: convert.ToRepo(ctx, pr.Issue.Repo, access_model.Permission{AccessMode: perm.AccessModeOwner}),
diff --git a/snap/part-gitea-build.sh b/snap/part-gitea-build.sh
index 8388c16e06..005162488f 100755
--- a/snap/part-gitea-build.sh
+++ b/snap/part-gitea-build.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-if [ ! -f go.mod -o ! -d snap ]; then
+if [ ! -f go.mod ] || [ ! -d snap ]; then
echo "This script should be run from the root of the gitea repository"
exit 1
fi
diff --git a/snap/part-gitea-pull.sh b/snap/part-gitea-pull.sh
index 0d117bb4d1..83fde11a12 100755
--- a/snap/part-gitea-pull.sh
+++ b/snap/part-gitea-pull.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-if [ ! -f go.mod -o ! -d snap ]; then
+if [ ! -f go.mod ] || [ ! -d snap ]; then
echo "This script should be run from the root of the gitea repository"
exit 1
fi
diff --git a/templates/package/content/cargo.tmpl b/templates/package/content/cargo.tmpl
index ebb23e8659..5c04ab8aae 100644
--- a/templates/package/content/cargo.tmpl
+++ b/templates/package/content/cargo.tmpl
@@ -27,7 +27,7 @@ git-fetch-with-cli = true
{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}}
{{if .PackageDescriptor.Metadata.Description}}{{.PackageDescriptor.Metadata.Description}}
{{end}}
- {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Readme}}
{{end}}
+ {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Readme .PackageDescriptor.Repository}}
{{end}}
{{end}}
{{if .PackageDescriptor.Metadata.Dependencies}}
diff --git a/templates/package/content/chef.tmpl b/templates/package/content/chef.tmpl
index d1c17d36a4..0912aff792 100644
--- a/templates/package/content/chef.tmpl
+++ b/templates/package/content/chef.tmpl
@@ -20,7 +20,7 @@
{{if .PackageDescriptor.Metadata.Description}}
{{.PackageDescriptor.Metadata.Description}}
{{end}}
- {{if .PackageDescriptor.Metadata.LongDescription}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.LongDescription}}{{end}}
+ {{if .PackageDescriptor.Metadata.LongDescription}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.LongDescription .PackageDescriptor.Repository}}{{end}}
{{.PackageDescriptor.Metadata.Description}}
{{end}}
- {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Readme}}
{{end}}
+ {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Readme .PackageDescriptor.Repository}}
{{end}}
{{if .PackageDescriptor.Metadata.Comments}}{{StringUtils.Join .PackageDescriptor.Metadata.Comments " "}}
{{end}}
{{end}}
diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl
index 28bcf45ee8..89f4c94008 100644
--- a/templates/package/content/npm.tmpl
+++ b/templates/package/content/npm.tmpl
@@ -22,15 +22,8 @@
{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}}
-
- {{if .PackageDescriptor.Metadata.Readme}}
-
- {{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Readme}}
-
- {{else if .PackageDescriptor.Metadata.Description}}
- {{.PackageDescriptor.Metadata.Description}}
- {{end}}
-
{{.PackageDescriptor.Metadata.Description}}
{{end}}
+ {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Readme .PackageDescriptor.Repository .PackageDescriptor.Metadata.Repository.Directory}}
{{end}}
{{end}}
{{if or .PackageDescriptor.Metadata.Dependencies .PackageDescriptor.Metadata.DevelopmentDependencies .PackageDescriptor.Metadata.PeerDependencies .PackageDescriptor.Metadata.OptionalDependencies}}
diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl
index 7f874044cc..fc9a715a28 100644
--- a/templates/package/content/nuget.tmpl
+++ b/templates/package/content/nuget.tmpl
@@ -18,9 +18,9 @@
{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.ReleaseNotes .PackageDescriptor.Metadata.Readme}}
- {{if .PackageDescriptor.Metadata.Description}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Description}}
{{end}}
- {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Readme}}
{{end}}
- {{if .PackageDescriptor.Metadata.ReleaseNotes}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.ReleaseNotes}}
{{end}}
+ {{if .PackageDescriptor.Metadata.Description}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Description .PackageDescriptor.Repository}}
{{end}}
+ {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Readme .PackageDescriptor.Repository}}
{{end}}
+ {{if .PackageDescriptor.Metadata.ReleaseNotes}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.ReleaseNotes .PackageDescriptor.Repository}}
{{end}}
{{end}}
{{if .PackageDescriptor.Metadata.Dependencies}}
diff --git a/templates/package/content/pub.tmpl b/templates/package/content/pub.tmpl
index 9eefcf7162..5dafa2db47 100644
--- a/templates/package/content/pub.tmpl
+++ b/templates/package/content/pub.tmpl
@@ -14,6 +14,6 @@
{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}}
{{if .PackageDescriptor.Metadata.Description}}{{.PackageDescriptor.Metadata.Description}}
{{end}}
- {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Readme}}
{{end}}
+ {{if .PackageDescriptor.Metadata.Readme}}{{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Readme .PackageDescriptor.Repository}}
{{end}}
{{end}}
{{end}}
diff --git a/templates/package/content/pypi.tmpl b/templates/package/content/pypi.tmpl
index 4afdc1b72a..c570e60e6b 100644
--- a/templates/package/content/pypi.tmpl
+++ b/templates/package/content/pypi.tmpl
@@ -16,9 +16,9 @@
{{if .PackageDescriptor.Metadata.Summary}}{{.PackageDescriptor.Metadata.Summary}}{{end}}
{{if .PackageDescriptor.Metadata.LongDescription}}
- {{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.LongDescription}}
+ {{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.LongDescription .PackageDescriptor.Repository}}
{{else if .PackageDescriptor.Metadata.Description}}
- {{ctx.RenderUtils.MarkdownToHtml .PackageDescriptor.Metadata.Description}}
+ {{ctx.RenderUtils.RenderPackageMarkdown .PackageDescriptor.Metadata.Description .PackageDescriptor.Repository}}
{{end}}
{{end}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 6ecc6cfd53..bc2681c3e5 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -15729,6 +15729,9 @@
},
"404": {
"$ref": "#/responses/notFound"
+ },
+ "422": {
+ "$ref": "#/responses/validationError"
}
}
}
diff --git a/templates/swagger/v1_openapi3_json.tmpl b/templates/swagger/v1_openapi3_json.tmpl
index f3ed072bc0..9dd147f0e5 100644
--- a/templates/swagger/v1_openapi3_json.tmpl
+++ b/templates/swagger/v1_openapi3_json.tmpl
@@ -27535,6 +27535,9 @@
},
"404": {
"$ref": "#/components/responses/notFound"
+ },
+ "422": {
+ "$ref": "#/components/responses/validationError"
}
},
"summary": "Sync all push mirrored repository",
diff --git a/tests/e2e/events.test.ts b/tests/e2e/events.test.ts
index c7cfef6e9c..54b4774a5c 100644
--- a/tests/e2e/events.test.ts
+++ b/tests/e2e/events.test.ts
@@ -12,7 +12,7 @@ test.describe('events', () => {
// Create repo and login in parallel — repo is needed for the issue, login for the event stream
await Promise.all([
- apiCreateRepo(request, {name: repoName, headers: apiUserHeaders(owner)}),
+ apiCreateRepo(request, {name: repoName, autoInit: false, headers: apiUserHeaders(owner)}),
loginUser(page, owner),
]);
await page.goto('/');
@@ -36,7 +36,7 @@ test.describe('events', () => {
await Promise.all([
loginUser(page, name),
(async () => {
- await apiCreateRepo(request, {name, headers});
+ await apiCreateRepo(request, {name, autoInit: false, headers});
await apiCreateIssue(request, {owner: name, repo: name, title: 'events stopwatch test', headers});
await apiStartStopwatch(request, name, name, 1, {headers});
})(),
diff --git a/tests/e2e/fork.test.ts b/tests/e2e/fork.test.ts
new file mode 100644
index 0000000000..77ccda1242
--- /dev/null
+++ b/tests/e2e/fork.test.ts
@@ -0,0 +1,18 @@
+import {env} from 'node:process';
+import {test, expect} from '@playwright/test';
+import {login, apiCreateRepo, apiCreateUser, apiUserHeaders, randomString} from './utils.ts';
+
+test('fork a repository', async ({page, request}) => {
+ const upstream = `fork-owner-${randomString(8)}`;
+ const repoName = `e2e-fork-${randomString(8)}`;
+ await apiCreateUser(request, upstream);
+ await Promise.all([
+ apiCreateRepo(request, {name: repoName, headers: apiUserHeaders(upstream)}),
+ login(page),
+ ]);
+ await page.goto(`/${upstream}/${repoName}/fork`);
+
+ await page.getByRole('button', {name: 'Fork Repository'}).click();
+ await page.waitForURL(new RegExp(`/${env.GITEA_TEST_E2E_USER}/${repoName}$`));
+ await expect(page.getByRole('link', {name: `${upstream}/${repoName}`})).toBeVisible();
+});
diff --git a/tests/e2e/issue-comment.test.ts b/tests/e2e/issue-comment.test.ts
new file mode 100644
index 0000000000..d3de59ba5f
--- /dev/null
+++ b/tests/e2e/issue-comment.test.ts
@@ -0,0 +1,24 @@
+import {env} from 'node:process';
+import {test, expect} from '@playwright/test';
+import {login, apiCreateRepo, apiCreateIssue, randomString} from './utils.ts';
+
+test('comment on and close an issue', async ({page, request}) => {
+ const repoName = `e2e-issue-comment-${randomString(8)}`;
+ const owner = env.GITEA_TEST_E2E_USER;
+ await apiCreateRepo(request, {name: repoName, autoInit: false});
+ await Promise.all([
+ apiCreateIssue(request, {owner, repo: repoName, title: 'Comment test'}),
+ login(page),
+ ]);
+ await page.goto(`/${owner}/${repoName}/issues/1`);
+
+ const body = `e2e-comment-${randomString(8)}`;
+ await page.getByPlaceholder('Leave a comment').fill(body);
+ // exact match: the status button reads "Close with Comment" while the box has content, which substring-matches "Comment"
+ await page.getByRole('button', {name: 'Comment', exact: true}).click();
+ await expect(page.locator('.comment-body').filter({hasText: body})).toBeVisible();
+
+ // posting reloaded the page with an empty box, so the status button now reads "Close Issue"
+ await page.getByRole('button', {name: 'Close Issue'}).click();
+ await expect(page.getByRole('button', {name: 'Reopen Issue'})).toBeVisible();
+});
diff --git a/tests/e2e/issue-project.test.ts b/tests/e2e/issue-project.test.ts
index b1fed72a6f..1595cfadc5 100644
--- a/tests/e2e/issue-project.test.ts
+++ b/tests/e2e/issue-project.test.ts
@@ -5,7 +5,7 @@ import {login, apiCreateRepo, apiCreateIssue, apiDeleteRepo, createProject, crea
test('assign issue to project and change column', async ({page}) => {
const repoName = `e2e-issue-project-${randomString(8)}`;
const user = env.GITEA_TEST_E2E_USER;
- await Promise.all([login(page), apiCreateRepo(page.request, {name: repoName})]);
+ await Promise.all([login(page), apiCreateRepo(page.request, {name: repoName, autoInit: false})]);
await page.goto(`/${user}/${repoName}/projects/new`);
await page.locator('input[name="title"]').fill('Kanban Board');
await page.getByRole('button', {name: 'Create Project'}).click();
@@ -33,7 +33,7 @@ test('create a project', async ({page}) => {
const projectTitle = 'Test Project';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Navigate to new project page
@@ -62,7 +62,7 @@ test('assign issue to multiple projects via sidebar', async ({page}) => {
const issueTitle = 'Test issue for multiple projects';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create two projects via UI
@@ -112,7 +112,7 @@ test('create issue with multiple projects pre-selected', async ({page}) => {
const issueTitle = 'Issue with multiple projects';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create two projects via UI
@@ -163,7 +163,7 @@ test('filter issues by multiple projects in issue list', async ({page}) => {
const project2Title = 'Filter Project B';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create two projects via UI
@@ -229,7 +229,7 @@ test('remove issue from one project keeping others', async ({page}) => {
const issueTitle = 'Issue to modify projects';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create two projects via UI
@@ -288,7 +288,7 @@ test('filter issues with no project using project=-1', async ({page}) => {
const projectTitle = 'Some Project';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create a project via UI
@@ -349,7 +349,7 @@ test('close project and view in closed projects list', async ({page}) => {
const closedProjectTitle = 'Project To Close';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create two projects via UI
@@ -404,7 +404,7 @@ test('select projects on new issue page shows in sidebar', async ({page}) => {
const project2Title = 'Project Two';
await login(page);
- await apiCreateRepo(page.request, {name: repoName});
+ await apiCreateRepo(page.request, {name: repoName, autoInit: false});
try {
// Create two projects
diff --git a/tests/e2e/mermaid.test.ts b/tests/e2e/mermaid.test.ts
index b2e066e551..1523577eaa 100644
--- a/tests/e2e/mermaid.test.ts
+++ b/tests/e2e/mermaid.test.ts
@@ -5,7 +5,7 @@ import {apiCreateRepo, apiCreateIssue, assertNoJsError, randomString} from './ut
test('mermaid diagram in issue', async ({page, request}) => {
const repoName = `e2e-mermaid-${randomString(8)}`;
const owner = env.GITEA_TEST_E2E_USER;
- await apiCreateRepo(request, {name: repoName});
+ await apiCreateRepo(request, {name: repoName, autoInit: false});
const body = '```mermaid\nflowchart LR\n Alpha --> Beta\n Beta --> Gamma\n```\n';
const {index} = await apiCreateIssue(request, {owner, repo: repoName, title: 'mermaid test', body});
await page.goto(`/${owner}/${repoName}/issues/${index}`);
diff --git a/tests/e2e/milestone.test.ts b/tests/e2e/milestone.test.ts
index 5a688fb128..106381e64f 100644
--- a/tests/e2e/milestone.test.ts
+++ b/tests/e2e/milestone.test.ts
@@ -4,7 +4,7 @@ import {login, apiCreateRepo, randomString} from './utils.ts';
test('create a milestone', async ({page}) => {
const repoName = `e2e-milestone-${randomString(8)}`;
- await Promise.all([login(page), apiCreateRepo(page.request, {name: repoName})]);
+ await Promise.all([login(page), apiCreateRepo(page.request, {name: repoName, autoInit: false})]);
await page.goto(`/${env.GITEA_TEST_E2E_USER}/${repoName}/milestones/new`);
await page.getByPlaceholder('Title').fill('Test Milestone');
await page.getByRole('button', {name: 'Create Milestone'}).click();
diff --git a/tests/e2e/pr-create.test.ts b/tests/e2e/pr-create.test.ts
new file mode 100644
index 0000000000..592512683f
--- /dev/null
+++ b/tests/e2e/pr-create.test.ts
@@ -0,0 +1,23 @@
+import {env} from 'node:process';
+import {test, expect} from '@playwright/test';
+import {login, apiCreateRepo, apiCreateFile, randomString} from './utils.ts';
+
+test('create a pull request from the compare page', async ({page, request}) => {
+ const repoName = `e2e-pr-create-${randomString(8)}`;
+ const owner = env.GITEA_TEST_E2E_USER;
+ await apiCreateRepo(request, {name: repoName});
+ await Promise.all([
+ apiCreateFile(request, owner, repoName, 'feat.txt', 'feature content\n', {branch: 'main', newBranch: 'feat'}),
+ login(page),
+ ]);
+ // expand=1 renders the PR form directly, skipping the "New Pull Request" toggle click
+ await page.goto(`/${owner}/${repoName}/compare/main...feat?expand=1`);
+
+ const title = `e2e-pr-${randomString(8)}`;
+ await page.getByPlaceholder('Title').fill(title);
+ await page.getByRole('button', {name: 'Create Pull Request'}).click();
+
+ // commit, not full load: the PR title heading is server-rendered, so the assertion can resolve before the heavy diff/timeline finishes
+ await page.waitForURL(new RegExp(`/${owner}/${repoName}/pulls/\\d+$`), {waitUntil: 'commit'});
+ await expect(page.getByRole('heading', {name: title})).toBeVisible();
+});
diff --git a/tests/e2e/reactions.test.ts b/tests/e2e/reactions.test.ts
index 2048b938cf..a6b6183741 100644
--- a/tests/e2e/reactions.test.ts
+++ b/tests/e2e/reactions.test.ts
@@ -5,7 +5,7 @@ import {login, apiCreateRepo, apiCreateIssue, randomString} from './utils.ts';
test('toggle issue reactions', async ({page, request}) => {
const repoName = `e2e-reactions-${randomString(8)}`;
const owner = env.GITEA_TEST_E2E_USER;
- await apiCreateRepo(request, {name: repoName});
+ await apiCreateRepo(request, {name: repoName, autoInit: false});
await Promise.all([
apiCreateIssue(request, {owner, repo: repoName, title: 'Reaction test'}),
login(page),
diff --git a/tests/e2e/release.test.ts b/tests/e2e/release.test.ts
new file mode 100644
index 0000000000..219a16d2c5
--- /dev/null
+++ b/tests/e2e/release.test.ts
@@ -0,0 +1,19 @@
+import {env} from 'node:process';
+import {test, expect} from '@playwright/test';
+import {login, apiCreateRepo, randomString} from './utils.ts';
+
+test('create a release', async ({page, request}) => {
+ const repoName = `e2e-release-${randomString(8)}`;
+ const owner = env.GITEA_TEST_E2E_USER;
+ await Promise.all([apiCreateRepo(request, {name: repoName}), login(page)]);
+ await page.goto(`/${owner}/${repoName}/releases/new`);
+
+ const tag = `v1.0.0-${randomString(8)}`;
+ const title = `e2e-release-${randomString(8)}`;
+ await page.getByLabel('Tag name').fill(tag);
+ await page.getByLabel('Release title').fill(title);
+ await page.getByRole('button', {name: 'Publish Release'}).click();
+
+ await page.waitForURL(new RegExp(`/${owner}/${repoName}/releases$`));
+ await expect(page.locator('.release-list-title')).toContainText(title);
+});
diff --git a/tests/e2e/repo-star-watch.test.ts b/tests/e2e/repo-star-watch.test.ts
new file mode 100644
index 0000000000..d5f8449165
--- /dev/null
+++ b/tests/e2e/repo-star-watch.test.ts
@@ -0,0 +1,20 @@
+import {test, expect} from '@playwright/test';
+import {login, apiCreateRepo, apiCreateUser, apiUserHeaders, randomString} from './utils.ts';
+
+test('star and watch a repository', async ({page, request}) => {
+ const owner = `sw-owner-${randomString(8)}`;
+ const repoName = `e2e-star-watch-${randomString(8)}`;
+ await apiCreateUser(request, owner);
+ await Promise.all([
+ apiCreateRepo(request, {name: repoName, autoInit: false, headers: apiUserHeaders(owner)}),
+ login(page),
+ ]);
+ await page.goto(`/${owner}/${repoName}`);
+
+ // exact match so "Star"/"Watch" don't also match "Unstar"/"Unwatch"
+ await page.getByRole('button', {name: 'Star', exact: true}).click();
+ await expect(page.getByRole('button', {name: 'Unstar'})).toBeVisible();
+
+ await page.getByRole('button', {name: 'Watch', exact: true}).click();
+ await expect(page.getByRole('button', {name: 'Unwatch'})).toBeVisible();
+});
diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go
index 92f9b61081..8fb892cc86 100644
--- a/tests/integration/api_packages_npm_test.go
+++ b/tests/integration/api_packages_npm_test.go
@@ -13,6 +13,7 @@ import (
auth_model "code.gitea.io/gitea/models/auth"
"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/packages/npm"
@@ -20,6 +21,7 @@ import (
"code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func TestPackageNpm(t *testing.T) {
@@ -39,6 +41,7 @@ func TestPackageNpm(t *testing.T) {
packageBinPath := "./cli.sh"
repoType := "gitea"
repoURL := "http://localhost:3000/gitea/test.git"
+ repoDirectory := "package-subdir"
data := "H4sIAAAAAAAA/ytITM5OTE/VL4DQelnF+XkMVAYGBgZmJiYK2MRBwNDcSIHB2NTMwNDQzMwAqA7IMDUxA9LUdgg2UFpcklgEdAql5kD8ogCnhwio5lJQUMpLzE1VslJQcihOzi9I1S9JLS7RhSYIJR2QgrLUouLM/DyQGkM9Az1D3YIiqExKanFyUWZBCVQ2BKhVwQVJDKwosbQkI78IJO/tZ+LsbRykxFXLNdA+HwWjYBSMgpENACgAbtAACAAA"
@@ -67,8 +70,10 @@ func TestPackageNpm(t *testing.T) {
},
"repository": {
"type": "` + repoType + `",
- "url": "` + repoURL + `"
+ "url": "` + repoURL + `",
+ "directory": "` + repoDirectory + `"
},
+ "readme": "[docs](docs/usage.md)\n",
"peerDependencies": {
"tea": "2.x",
"soy-milk": "1.2"
@@ -282,6 +287,28 @@ func TestPackageNpm(t *testing.T) {
}
})
+ t.Run("WebViewReadmeRepoLinks", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ pvs, err := packages.GetVersionsByPackageType(t.Context(), user.ID, packages.TypeNpm)
+ assert.NoError(t, err)
+ require.Len(t, pvs, 1)
+
+ // link the package to a repository so README relative links resolve against
+ // repository files instead of the site root
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+ assert.NoError(t, packages.SetRepositoryLink(t.Context(), pvs[0].PackageID, repo.ID))
+
+ req := NewRequest(t, "GET", fmt.Sprintf("/%s/-/packages/npm/%s/%s", user.Name, url.PathEscape(packageName), packageVersion)).
+ AddBasicAuth(user.Name)
+ resp := MakeRequest(t, req, http.StatusOK)
+ doc := NewHTMLParser(t, resp.Body)
+ rendered, _ := doc.Find(".markup.markdown").Html()
+ assert.Equal(t, `docs
+
+`, rendered)
+ })
+
t.Run("Delete", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go
index 2b19c3452d..406c82e475 100644
--- a/tests/integration/api_repo_test.go
+++ b/tests/integration/api_repo_test.go
@@ -351,48 +351,52 @@ func TestAPIGetRepoByIDUnauthorized(t *testing.T) {
}
func TestAPIRepoMigrate(t *testing.T) {
- testCases := []struct {
- ctxUserID, userID int64
- cloneURL, repoName string
- expectedStatus int
- }{
- {ctxUserID: 1, userID: 2, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-admin", expectedStatus: http.StatusCreated},
- {ctxUserID: 2, userID: 2, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-own", expectedStatus: http.StatusCreated},
- {ctxUserID: 2, userID: 1, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-bad", expectedStatus: http.StatusForbidden},
- {ctxUserID: 2, userID: 3, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-org", expectedStatus: http.StatusCreated},
- {ctxUserID: 2, userID: 6, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-bad-org", expectedStatus: http.StatusForbidden},
- {ctxUserID: 2, userID: 3, cloneURL: "https://localhost:3000/user/test_repo.git", repoName: "private-ip", expectedStatus: http.StatusUnprocessableEntity},
- {ctxUserID: 2, userID: 3, cloneURL: "https://10.0.0.1/user/test_repo.git", repoName: "private-ip", expectedStatus: http.StatusUnprocessableEntity},
- }
+ onGiteaRun(t, func(t *testing.T, u *url.URL) {
+ // migrate from a local fixture repo (user2/repo1) via the live listener so the test runs offline
+ repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+ cloneAddr := fmt.Sprintf("%s%s/%s.git", u.String(), repo1.OwnerName, repo1.Name)
- defer tests.PrepareTestEnv(t)()
- defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, false)()
- require.NoError(t, migrations.Init())
-
- for _, testCase := range testCases {
- user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: testCase.ctxUserID})
- session := loginUser(t, user.Name)
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate", &api.MigrateRepoOptions{
- CloneAddr: testCase.cloneURL,
- RepoOwnerID: testCase.userID,
- RepoName: testCase.repoName,
- }).AddTokenAuth(token)
- resp := MakeRequest(t, req, NoExpectedStatus)
- if resp.Code == http.StatusUnprocessableEntity {
- respJSON := DecodeJSON(t, resp, map[string]string{})
- switch respJSON["message"] {
- case "Remote visit addressed rate limitation.":
- t.Log("test hit github rate limitation")
- case "You can not import from disallowed hosts.":
- assert.Equal(t, "private-ip", testCase.repoName)
- default:
- assert.FailNow(t, "unexpected error", "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)
+ t.Run("Permitted", func(t *testing.T) {
+ // migrations.Init builds the host allowlist from AllowLocalNetworks, so set it first
+ defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
+ require.NoError(t, migrations.Init())
+ for _, testCase := range []struct {
+ ctxUserID, ownerID int64
+ repoName string
+ expectedStatus int
+ }{
+ {ctxUserID: 1, ownerID: 2, repoName: "git-admin", expectedStatus: http.StatusCreated},
+ {ctxUserID: 2, ownerID: 2, repoName: "git-own", expectedStatus: http.StatusCreated},
+ {ctxUserID: 2, ownerID: 1, repoName: "git-bad", expectedStatus: http.StatusForbidden},
+ {ctxUserID: 2, ownerID: 3, repoName: "git-org", expectedStatus: http.StatusCreated},
+ {ctxUserID: 2, ownerID: 6, repoName: "git-bad-org", expectedStatus: http.StatusForbidden},
+ } {
+ user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: testCase.ctxUserID})
+ token := getTokenForLoggedInUser(t, loginUser(t, user.Name), auth_model.AccessTokenScopeWriteRepository)
+ req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate", &api.MigrateRepoOptions{
+ CloneAddr: cloneAddr,
+ RepoOwnerID: testCase.ownerID,
+ RepoName: testCase.repoName,
+ }).AddTokenAuth(token)
+ MakeRequest(t, req, testCase.expectedStatus)
}
- } else {
- assert.Equal(t, testCase.expectedStatus, resp.Code)
- }
- }
+ })
+
+ t.Run("DisallowedHost", func(t *testing.T) {
+ defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, false)()
+ require.NoError(t, migrations.Init())
+ token := getTokenForLoggedInUser(t, loginUser(t, "user2"), auth_model.AccessTokenScopeWriteRepository)
+ for _, cloneURL := range []string{"https://localhost:3000/user/test_repo.git", "https://10.0.0.1/user/test_repo.git"} {
+ req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate", &api.MigrateRepoOptions{
+ CloneAddr: cloneURL,
+ RepoOwnerID: 3,
+ RepoName: "private-ip",
+ }).AddTokenAuth(token)
+ resp := MakeRequest(t, req, http.StatusUnprocessableEntity)
+ assert.Equal(t, "You can not import from disallowed hosts.", DecodeJSON(t, resp, map[string]string{})["message"])
+ }
+ })
+ })
}
func TestAPIRepoMigrateConflict(t *testing.T) {
diff --git a/tools/ci-tools.ts b/tools/ci-tools.ts
new file mode 100644
index 0000000000..4562643247
--- /dev/null
+++ b/tools/ci-tools.ts
@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+import {argv, env, exit} from 'node:process';
+
+const allowedTypes = [
+ 'build',
+ 'chore',
+ 'ci',
+ 'docs',
+ 'enhance',
+ 'feat',
+ 'fix',
+ 'perf',
+ 'refactor',
+ 'revert',
+ 'style',
+ 'test',
+] as const;
+type CommitType = typeof allowedTypes[number];
+
+const allowedTypesList = allowedTypes.join(', ');
+const titlePattern = new RegExp(`^(${allowedTypes.join('|')})(\\([\\w/.-]+\\))?(!)?: .+$`);
+
+function parsePrTitle(title: string): {type: CommitType; breaking: boolean} | null {
+ const match = titlePattern.exec(title);
+ return match ? {type: match[1] as CommitType, breaking: Boolean(match[3])} : null;
+}
+
+const breakingLabel = 'pr/breaking';
+
+// Mutually exclusive type labels, fully synced with the title type (added and removed).
+const typeLabels: Partial> = {
+ feat: 'type/feature',
+ enhance: 'type/enhancement',
+ fix: 'type/bug',
+ docs: 'type/docs',
+ test: 'type/testing',
+};
+
+// Non-type labels, only added, never auto-removed, so manual labeling is not clobbered.
+const extraLabels: Partial> = {
+ chore: 'skip-changelog',
+ ci: 'skip-changelog',
+ build: 'topic/build',
+};
+
+// Labels this tool may remove when the title no longer implies them.
+const removableLabels = [...Object.values(typeLabels), breakingLabel];
+
+function labelsForPrTitle(title: string): string[] {
+ const parsed = parsePrTitle(title);
+ if (!parsed) return [];
+ return [typeLabels[parsed.type], extraLabels[parsed.type], parsed.breaking ? breakingLabel : undefined]
+ .filter((label): label is string => label !== undefined);
+}
+
+// Command: validate PR_TITLE against the allowed Conventional Commits format.
+function lintPrTitle(): void {
+ if (!env.PR_TITLE) {
+ console.error('Missing PR_TITLE');
+ exit(1);
+ }
+ if (!parsePrTitle(env.PR_TITLE)) {
+ console.error(`Invalid PR title: ${env.PR_TITLE}`);
+ console.error('Expected format: type(scope): subject (scope optional, append "!" for breaking changes)');
+ console.error(`Allowed types: ${allowedTypesList}`);
+ exit(1);
+ }
+}
+
+// Command: sync the title-derived labels onto the PR via the GitHub API.
+async function setPrLabels(): Promise {
+ if (!env.PR_TITLE || !env.GITHUB_TOKEN || !env.GITHUB_REPOSITORY || !env.PR_NUMBER) {
+ console.error('set-pr-labels requires PR_TITLE, GITHUB_TOKEN, GITHUB_REPOSITORY and PR_NUMBER');
+ exit(1);
+ }
+
+ const labelsUrl = `https://api.github.com/repos/${env.GITHUB_REPOSITORY}/issues/${env.PR_NUMBER}/labels`;
+
+ async function request(url: string, method = 'GET', body?: unknown): Promise {
+ const response = await fetch(url, {
+ method,
+ headers: {
+ Accept: 'application/vnd.github+json',
+ Authorization: `Bearer ${env.GITHUB_TOKEN}`,
+ 'X-GitHub-Api-Version': '2022-11-28',
+ ...(body ? {'Content-Type': 'application/json'} : {}),
+ },
+ body: body ? JSON.stringify(body) : undefined,
+ });
+ if (!response.ok) {
+ throw new Error(`GitHub API ${method} ${url} failed (${response.status}): ${await response.text()}`);
+ }
+ return response;
+ }
+
+ const desired = labelsForPrTitle(env.PR_TITLE);
+ const response = await request(`${labelsUrl}?per_page=100`);
+ const current = ((await response.json()) as Array<{name: string}>).map((label) => label.name);
+
+ const toAdd = desired.filter((name) => !current.includes(name));
+ const toRemove = removableLabels.filter((name) => current.includes(name) && !desired.includes(name));
+
+ if (toAdd.length) {
+ await request(labelsUrl, 'POST', {labels: toAdd});
+ console.info(`Added labels: ${toAdd.join(', ')}`);
+ }
+ for (const name of toRemove) {
+ await request(`${labelsUrl}/${encodeURIComponent(name)}`, 'DELETE');
+ console.info(`Removed label: ${name}`);
+ }
+ if (!toAdd.length && !toRemove.length) {
+ console.info('PR labels already in sync');
+ }
+}
+
+const commands: Record void | Promise> = {
+ 'lint-pr-title': lintPrTitle,
+ 'set-pr-labels': setPrLabels,
+};
+
+const command = argv[2];
+const handler = commands[command];
+if (!handler) {
+ console.error(`Usage: ci-tools.ts <${Object.keys(commands).join('|')}>`);
+ exit(1);
+}
+
+try {
+ await handler();
+} catch (error) {
+ console.error(error instanceof Error ? error.message : error);
+ exit(1);
+}
diff --git a/tools/lint-pr-title.ts b/tools/lint-pr-title.ts
deleted file mode 100644
index a63defe972..0000000000
--- a/tools/lint-pr-title.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env node
-import {env, exit} from 'node:process';
-
-const allowedTypes = 'build, chore, ci, docs, enhance, feat, fix, perf, refactor, revert, style, test';
-const title = env.PR_TITLE;
-
-if (!title) {
- console.error('Missing PR_TITLE');
- exit(1);
-}
-
-const validTitlePattern = new RegExp(`^(${allowedTypes.replaceAll(', ', '|')})(\\([\\w.-]+\\))?(!)?: .+$`);
-
-if (!validTitlePattern.test(title)) {
- console.error(`Invalid PR title: ${title}`);
- console.error('Expected format: type(scope): subject');
- console.error(`Allowed types: ${allowedTypes}`);
- exit(1);
-}
diff --git a/tools/lint-shell.sh b/tools/lint-shell.sh
new file mode 100755
index 0000000000..dac838e833
--- /dev/null
+++ b/tools/lint-shell.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+CONTAINER_RUNTIME="${CONTAINER_RUNTIME:-docker}"
+VERSION=$(echo "$SHELLCHECK_IMAGE" | sed -E 's/.*:v([0-9.]+)@.*/\1/')
+
+if hash shellcheck 2>/dev/null && shellcheck --version | grep -qx "version: $VERSION"; then
+ exec shellcheck --color=always "$@"
+else
+ exec "$CONTAINER_RUNTIME" run --rm -v "$PWD":/mnt -w /mnt "$SHELLCHECK_IMAGE" --color=always "$@"
+fi
diff --git a/tools/test-e2e.sh b/tools/test-e2e.sh
index d6c053ff1f..be3e848ee1 100755
--- a/tools/test-e2e.sh
+++ b/tools/test-e2e.sh
@@ -71,8 +71,10 @@ if [ "$CMD" = "install" ]; then
if [ "$PLAYWRIGHT_MODE" = "local" ]; then
# on GitHub Actions VMs, playwright's system deps are pre-installed
if [ -z "${GITHUB_ACTIONS:-}" ]; then
+ # shellcheck disable=SC2086 # flag string
pnpm exec playwright install --with-deps chromium firefox ${PLAYWRIGHT_FLAGS:-}
else
+ # shellcheck disable=SC2086 # flag string
pnpm exec playwright install chromium firefox ${PLAYWRIGHT_FLAGS:-}
fi
else
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index f3b169aeb9..b47e03b8ce 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -1578,6 +1578,7 @@ tbody.commit-list {
#diff-container {
display: flex;
+ gap: var(--page-spacing);
}
#diff-file-boxes {
