Skip to content

Commit 4d4ddf7

Browse files
committed
Merge remote-tracking branch 'origin/main' into ux-package-deb-explain-better
* origin/main: (645 commits) When the requested arch rpm is missing fall back to noarch (go-gitea#37236) Fix `relative-time` error and improve global error handler (go-gitea#37241) Enhance styling in actions page (go-gitea#37323) fix(oauth): Error on auth sources with spaces (go-gitea#37327) Fix actions concurrency groups cross-branch leak (go-gitea#37311) Fix bug when accessing user badges (go-gitea#37321) Fix AppFullLink (go-gitea#37325) Update go js dependencies (go-gitea#37312) Update GitHub Actions to latest major versions (go-gitea#37313) Revert "Add WebKit to e2e test matrix (go-gitea#37298)" (go-gitea#37315) Add `form-fetch-action` to some forms, fix "fetch action" resp bug (go-gitea#37305) Move heatmap to first-party code (go-gitea#37262) Use updated yaml fields for snapcraft (go-gitea#37318) Remove dead code identified by `deadcode` tool (go-gitea#37271) Enable strict TypeScript, add `errorMessage` helper (go-gitea#37292) Fix vite manifest update masking build errors (go-gitea#37279) bump snapcraft base (go-gitea#37301) Add WebKit to e2e test matrix (go-gitea#37298) Don't add useless labels which will bother changelog generation (go-gitea#37267) Fix Repository transferring page (go-gitea#37277) ... # Conflicts: # options/locale/locale_en-US.ini # templates/package/content/debian.tmpl
2 parents 63025c8 + 5495b5d commit 4d4ddf7

2,245 files changed

Lines changed: 156914 additions & 126651 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.

.air.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ tmp_dir = ".air"
44
[build]
55
pre_cmd = ["killall -9 gitea 2>/dev/null || true"] # kill off potential zombie processes from previous runs
66
cmd = "make --no-print-directory backend"
7-
bin = "gitea"
7+
entrypoint = ["./gitea"]
88
delay = 2000
99
include_ext = ["go", "tmpl"]
1010
include_file = ["main.go"]

.changelog.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ groups:
3737
name: BUGFIXES
3838
labels:
3939
- type/bug
40-
-
41-
name: API
42-
labels:
43-
- modifies/api
40+
4441
-
4542
name: TESTING
4643
labels:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
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
},
2020
"customizations": {
2121
"vscode": {
2222
"settings": {},
23-
// same extensions as Gitpod, should match /.gitpod.yml
2423
"extensions": [
2524
"editorconfig.editorconfig",
2625
"dbaeumer.vscode-eslint",

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ cpu.out
7474
/VERSION
7575
/.air
7676
/.go-licenses
77+
/Dockerfile
78+
/Dockerfile.rootless
79+
/.venv
7780

7881
# Files and folders that were previously generated
7982
/public/assets/img/webpack

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ insert_final_newline = false
2525
[templates/user/auth/oidc_wellknown.tmpl]
2626
indent_style = space
2727

28+
[templates/shared/actions/runner_badge_*.tmpl]
29+
# editconfig lint requires these XML-like files to have charset defined, but the files don't have.
30+
charset = unset
31+
2832
[Makefile]
2933
indent_style = tab
3034

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
/vendor/** -text -eol linguist-vendored
99
/web_src/js/vendor/** -text -eol linguist-vendored
1010
Dockerfile.* linguist-language=Dockerfile
11+
Makefile.* linguist-language=Makefile

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: github-actions
5+
labels: [modifies/dependencies]
6+
directory: /
7+
schedule:
8+
interval: daily
9+
cooldown:
10+
default-days: 5

.github/labeler.yml

Lines changed: 2 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,3 @@
1-
modifies/docs:
2-
- changed-files:
3-
- any-glob-to-any-file:
4-
- "**/*.md"
5-
- "docs/**"
6-
7-
modifies/templates:
8-
- changed-files:
9-
- all-globs-to-any-file:
10-
- "templates/**"
11-
- "!templates/swagger/v1_json.tmpl"
12-
13-
modifies/api:
14-
- changed-files:
15-
- any-glob-to-any-file:
16-
- "routers/api/**"
17-
- "templates/swagger/v1_json.tmpl"
18-
19-
modifies/cli:
20-
- changed-files:
21-
- any-glob-to-any-file:
22-
- "cmd/**"
23-
24-
modifies/translation:
25-
- changed-files:
26-
- any-glob-to-any-file:
27-
- "options/locale/*.ini"
28-
29-
modifies/migrations:
30-
- changed-files:
31-
- any-glob-to-any-file:
32-
- "models/migrations/**"
33-
34-
modifies/internal:
35-
- changed-files:
36-
- any-glob-to-any-file:
37-
- ".air.toml"
38-
- "Makefile"
39-
- "Dockerfile"
40-
- "Dockerfile.rootless"
41-
- ".dockerignore"
42-
- "docker/**"
43-
- ".editorconfig"
44-
- ".eslintrc.cjs"
45-
- ".golangci.yml"
46-
- ".gitpod.yml"
47-
- ".markdownlint.yaml"
48-
- ".spectral.yaml"
49-
- "stylelint.config.js"
50-
- ".yamllint.yaml"
51-
- ".github/**"
52-
- ".gitea/**"
53-
- ".devcontainer/**"
54-
- "build.go"
55-
- "build/**"
56-
- "contrib/**"
57-
58-
modifies/dependencies:
59-
- changed-files:
60-
- any-glob-to-any-file:
61-
- "package.json"
62-
- "pnpm-lock.yaml"
63-
- "pyproject.toml"
64-
- "uv.lock"
65-
- "go.mod"
66-
- "go.sum"
67-
68-
modifies/go:
69-
- changed-files:
70-
- any-glob-to-any-file:
71-
- "**/*.go"
72-
73-
modifies/frontend:
74-
- changed-files:
75-
- any-glob-to-any-file:
76-
- "*.js"
77-
- "*.ts"
78-
- "web_src/**"
79-
801
docs-update-needed:
812
- changed-files:
823
- any-glob-to-any-file:
@@ -85,9 +6,9 @@ docs-update-needed:
856
topic/code-linting:
867
- changed-files:
878
- any-glob-to-any-file:
88-
- ".eslintrc.cjs"
899
- ".golangci.yml"
9010
- ".markdownlint.yaml"
9111
- ".spectral.yaml"
9212
- ".yamllint.yaml"
93-
- "stylelint.config.js"
13+
- "eslint*.config.*"
14+
- "stylelint.config.*"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: cron-flake-updater
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
7+
8+
jobs:
9+
nix-flake-update:
10+
permissions:
11+
contents: write
12+
issues: write
13+
pull-requests: write
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v6
17+
- uses: DeterminateSystems/determinate-nix-action@v3
18+
- uses: DeterminateSystems/update-flake-lock@main
19+
with:
20+
pr-title: "Update Nix flake"
21+
pr-labels: |
22+
dependencies

.github/workflows/cron-licenses.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ jobs:
99
cron-licenses:
1010
runs-on: ubuntu-latest
1111
if: github.repository == 'go-gitea/gitea'
12+
permissions:
13+
contents: write
1214
steps:
13-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1416
- uses: actions/setup-go@v6
1517
with:
1618
go-version-file: go.mod
1719
check-latest: true
1820
- run: make generate-gitignore
1921
timeout-minutes: 40
2022
- name: push translations to repo
21-
uses: appleboy/git-push-action@v0.0.3
23+
uses: appleboy/git-push-action@v1.2.0
2224
with:
2325
author_email: "teabot@gitea.io"
2426
author_name: GiteaBot

0 commit comments

Comments
 (0)