Skip to content

Commit 9108450

Browse files
committed
Merge remote-tracking branch 'origin/main' into reltime
* origin/main: (152 commits) Fine tune diff highlighting (go-gitea#36592) Add code editor setting dropdowns (go-gitea#36534) Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588) Improve diff highlighting (go-gitea#36583) Fix markup code block layout (go-gitea#36578) Remove striped tables in UI (go-gitea#36509) Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570) Fix mirror sync parser and fix mirror messages (go-gitea#36504) Update JS and PY deps (go-gitea#36576) Add viewer controller for mermaid (zoom, drag) (go-gitea#36557) Misc typescript tweaks (go-gitea#36523) Use full-file highlighting for diff sections (go-gitea#36561) fix(diff): reprocess htmx content after loading more files (go-gitea#36568) [skip ci] Updated translations via Crowdin Add wrap to runner label list (go-gitea#36565) fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527) Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549) Refactor merge conan and container auth preserve actions taskID (go-gitea#36560) Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559) Fix various version parsing problems (go-gitea#36553) ...
2 parents f4e39a5 + 2876800 commit 9108450

912 files changed

Lines changed: 84660 additions & 208126 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"ghcr.io/devcontainers/features/git-lfs:1.2.5": {},
1414
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
1515
"ghcr.io/devcontainers/features/python:1": {
16-
"version": "3.13"
16+
"version": "3.14"
1717
},
1818
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1919
},

.github/labeler.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ modifies/internal:
4646
- ".gitpod.yml"
4747
- ".markdownlint.yaml"
4848
- ".spectral.yaml"
49-
- "stylelint.config.ts"
49+
- "stylelint.config.*"
5050
- ".yamllint.yaml"
5151
- ".github/**"
5252
- ".gitea/**"
@@ -84,9 +84,9 @@ docs-update-needed:
8484
topic/code-linting:
8585
- changed-files:
8686
- any-glob-to-any-file:
87-
- ".eslintrc.cjs"
8887
- ".golangci.yml"
8988
- ".markdownlint.yaml"
9089
- ".spectral.yaml"
9190
- ".yamllint.yaml"
92-
- "stylelint.config.ts"
91+
- "eslint*.config.*"
92+
- "stylelint.config.*"

.github/workflows/cron-licenses.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- run: make generate-gitignore
2121
timeout-minutes: 40
2222
- name: push translations to repo
23-
uses: appleboy/git-push-action@v1.0.0
23+
uses: appleboy/git-push-action@v1.2.0
2424
with:
2525
author_email: "teabot@gitea.io"
2626
author_name: GiteaBot

.github/workflows/cron-translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: update locales
3030
run: ./build/update-locales.sh
3131
- name: push translations to repo
32-
uses: appleboy/git-push-action@v1.0.0
32+
uses: appleboy/git-push-action@v1.2.0
3333
with:
3434
author_email: "teabot@gitea.io"
3535
author_name: GiteaBot

.github/workflows/files-changed.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
- "uv.lock"
8686
8787
docker:
88+
- ".github/workflows/pull-docker-dryrun.yml"
8889
- "Dockerfile"
8990
- "Dockerfile.rootless"
9091
- "docker/**"

.github/workflows/pull-compliance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
steps:
4040
- uses: actions/checkout@v6
4141
- uses: astral-sh/setup-uv@v7
42-
- run: uv python install 3.12
42+
- run: uv python install 3.14
4343
- uses: pnpm/action-setup@v4
4444
- uses: actions/setup-node@v6
4545
with:
@@ -59,7 +59,7 @@ jobs:
5959
steps:
6060
- uses: actions/checkout@v6
6161
- uses: astral-sh/setup-uv@v7
62-
- run: uv python install 3.12
62+
- run: uv python install 3.14
6363
- run: make deps-py
6464
- run: make lint-yaml
6565

.github/workflows/pull-docker-dryrun.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,25 @@ jobs:
1414
contents: read
1515

1616
container:
17-
if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true'
17+
if: needs.files-changed.outputs.docker == 'true'
1818
needs: files-changed
1919
runs-on: ubuntu-latest
2020
permissions:
2121
contents: read
2222
steps:
2323
- uses: actions/checkout@v6
24+
- uses: docker/setup-qemu-action@v3
2425
- uses: docker/setup-buildx-action@v3
2526
- name: Build regular container image
2627
uses: docker/build-push-action@v6
2728
with:
2829
context: .
30+
platforms: linux/amd64,linux/arm64,linux/riscv64
2931
push: false
30-
tags: gitea/gitea:linux-amd64
3132
- name: Build rootless container image
3233
uses: docker/build-push-action@v6
3334
with:
3435
context: .
3536
push: false
37+
platforms: linux/amd64,linux/arm64,linux/riscv64
3638
file: Dockerfile.rootless
37-
tags: gitea/gitea:linux-amd64

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ prime/
121121
/.goosehints
122122
/.windsurfrules
123123
/.github/copilot-instructions.md
124-
/AGENT.md
125-
/CLAUDE.md
126124
/llms.txt
127125

128126
# Ignore worktrees when working on multiple branches

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ linters:
4848
desc: do not use the ini package, use gitea's config system instead
4949
- pkg: gitea.com/go-chi/cache
5050
desc: do not use the go-chi cache package, use gitea's cache system
51+
- pkg: github.com/pkg/errors
52+
desc: use builtin errors package instead
53+
- pkg: github.com/go-ap/errors
54+
desc: use builtin errors package instead
5155
nolintlint:
5256
allow-unused: false
5357
require-explanation: true

AGENTS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Instructions for agents
2+
3+
- Use `make help` to find available development targets
4+
- Before committing `.go` changes, run `make fmt` to format, and run `make lint-go` to lint
5+
- Before committing `.ts` changes, run `make lint-js` to lint
6+
- Before committing `go.mod` changes, run `make tidy`
7+
- Before committing new `.go` files, add the current year into the copyright header
8+
- Before committing any files, remove all trailing whitespace from source code lines

0 commit comments

Comments
 (0)