Skip to content

Commit e97d2d3

Browse files
authored
Merge branch 'main' into kfoc
2 parents 4535317 + 1fede04 commit e97d2d3

File tree

388 files changed

+16312
-9655
lines changed

Some content is hidden

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

388 files changed

+16312
-9655
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "Gitea DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.22-bullseye",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
44
"features": {
55
// installs nodejs into container
66
"ghcr.io/devcontainers/features/node:1": {
77
"version": "20"
88
},
9-
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {},
9+
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
1010
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version": "3.12"

.eslintrc.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ rules:
224224
"@typescript-eslint/await-thenable": [2]
225225
"@typescript-eslint/ban-ts-comment": [2, {'ts-expect-error': false, 'ts-ignore': true, 'ts-nocheck': false, 'ts-check': false}]
226226
"@typescript-eslint/ban-tslint-comment": [0]
227-
"@typescript-eslint/ban-types": [2, {extendDefaults: true, types: {Function: false}}]
228227
"@typescript-eslint/class-literal-property-style": [0]
229228
"@typescript-eslint/class-methods-use-this": [0]
230229
"@typescript-eslint/consistent-generic-constructors": [0]
@@ -255,6 +254,7 @@ rules:
255254
"@typescript-eslint/no-dynamic-delete": [0]
256255
"@typescript-eslint/no-empty-function": [0]
257256
"@typescript-eslint/no-empty-interface": [0]
257+
"@typescript-eslint/no-empty-object-type": [2]
258258
"@typescript-eslint/no-explicit-any": [0]
259259
"@typescript-eslint/no-extra-non-null-assertion": [2]
260260
"@typescript-eslint/no-extraneous-class": [0]
@@ -266,7 +266,7 @@ rules:
266266
"@typescript-eslint/no-invalid-this": [0]
267267
"@typescript-eslint/no-invalid-void-type": [0]
268268
"@typescript-eslint/no-loop-func": [0]
269-
"@typescript-eslint/no-loss-of-precision": [2]
269+
"@typescript-eslint/no-loss-of-precision": [0]
270270
"@typescript-eslint/no-magic-numbers": [0]
271271
"@typescript-eslint/no-meaningless-void-operator": [0]
272272
"@typescript-eslint/no-misused-new": [2]
@@ -278,8 +278,9 @@ rules:
278278
"@typescript-eslint/no-non-null-assertion": [0]
279279
"@typescript-eslint/no-redeclare": [0]
280280
"@typescript-eslint/no-redundant-type-constituents": [2]
281-
"@typescript-eslint/no-require-imports": [0]
281+
"@typescript-eslint/no-require-imports": [2]
282282
"@typescript-eslint/no-restricted-imports": [0]
283+
"@typescript-eslint/no-restricted-types": [0]
283284
"@typescript-eslint/no-shadow": [0]
284285
"@typescript-eslint/no-this-alias": [0] # handled by unicorn/no-this-assignment
285286
"@typescript-eslint/no-unnecessary-boolean-literal-compare": [0]
@@ -294,6 +295,7 @@ rules:
294295
"@typescript-eslint/no-unsafe-call": [0]
295296
"@typescript-eslint/no-unsafe-declaration-merging": [2]
296297
"@typescript-eslint/no-unsafe-enum-comparison": [2]
298+
"@typescript-eslint/no-unsafe-function-type": [2]
297299
"@typescript-eslint/no-unsafe-member-access": [0]
298300
"@typescript-eslint/no-unsafe-return": [0]
299301
"@typescript-eslint/no-unsafe-unary-minus": [2]
@@ -302,7 +304,7 @@ rules:
302304
"@typescript-eslint/no-use-before-define": [0]
303305
"@typescript-eslint/no-useless-constructor": [0]
304306
"@typescript-eslint/no-useless-empty-export": [0]
305-
"@typescript-eslint/no-var-requires": [2]
307+
"@typescript-eslint/no-wrapper-object-types": [2]
306308
"@typescript-eslint/non-nullable-type-assertion-style": [0]
307309
"@typescript-eslint/only-throw-error": [2]
308310
"@typescript-eslint/parameter-properties": [0]
@@ -334,7 +336,7 @@ rules:
334336
"@typescript-eslint/switch-exhaustiveness-check": [0]
335337
"@typescript-eslint/triple-slash-reference": [2]
336338
"@typescript-eslint/typedef": [0]
337-
"@typescript-eslint/unbound-method": [2]
339+
"@typescript-eslint/unbound-method": [0] # too many false-positives
338340
"@typescript-eslint/unified-signatures": [2]
339341
accessor-pairs: [2]
340342
array-callback-return: [2, {checkForEach: true}]
@@ -568,7 +570,7 @@ rules:
568570
no-jquery/no-param: [2]
569571
no-jquery/no-parent: [0]
570572
no-jquery/no-parents: [2]
571-
no-jquery/no-parse-html-literal: [0]
573+
no-jquery/no-parse-html-literal: [2]
572574
no-jquery/no-parse-html: [2]
573575
no-jquery/no-parse-json: [2]
574576
no-jquery/no-parse-xml: [2]
@@ -599,7 +601,7 @@ rules:
599601
no-lone-blocks: [2]
600602
no-lonely-if: [0]
601603
no-loop-func: [0]
602-
no-loss-of-precision: [0] # handled by @typescript-eslint/no-loss-of-precision
604+
no-loss-of-precision: [2]
603605
no-magic-numbers: [0]
604606
no-misleading-character-class: [2]
605607
no-multi-assign: [0]
@@ -843,6 +845,7 @@ rules:
843845
unicorn/no-invalid-fetch-options: [2]
844846
unicorn/no-invalid-remove-event-listener: [2]
845847
unicorn/no-keyword-prefix: [0]
848+
unicorn/no-length-as-slice-end: [2]
846849
unicorn/no-lonely-if: [2]
847850
unicorn/no-magic-array-flat-depth: [0]
848851
unicorn/no-negated-condition: [0]

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
value: |
1212
1. Please speak English, this is the language all maintainers can speak and write.
1313
2. Please ask questions or configuration/deploy problems on our Discord
14-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
14+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
1515
3. Make sure you are using the latest release and
1616
take a moment to check that your issue hasn't been reported before.
1717
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ contact_links:
77
url: https://discord.gg/Gitea
88
about: Please ask questions and discuss configuration or deployment problems here.
99
- name: Discourse Forum
10-
url: https://discourse.gitea.io
10+
url: https://forum.gitea.com
1111
about: Questions and configuration or deployment problems can also be discussed on our forum.
1212
- name: Frequently Asked Questions
1313
url: https://docs.gitea.com/help/faq

.github/ISSUE_TEMPLATE/feature-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
value: |
88
1. Please speak English, this is the language all maintainers can speak and write.
99
2. Please ask questions or configuration/deploy problems on our Discord
10-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
10+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
1111
3. Please take a moment to check that your feature hasn't already been suggested.
1212
- type: textarea
1313
id: description

.github/ISSUE_TEMPLATE/ui.bug-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
value: |
1212
1. Please speak English, this is the language all maintainers can speak and write.
1313
2. Please ask questions or configuration/deploy problems on our Discord
14-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
14+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
1515
3. Please take a moment to check that your issue doesn't already exist.
1616
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
1717
5. Please give all relevant information below for bug reports, because

.github/labeler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,8 @@ modifies/js:
7575
- any-glob-to-any-file:
7676
- "**/*.js"
7777
- "**/*.vue"
78+
79+
docs-update-needed:
80+
- changed-files:
81+
- any-glob-to-any-file:
82+
- "custom/conf/app.example.ini"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
2+
FROM docker.io/library/golang:1.23-alpine3.20 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY=${GOPROXY:-direct}

Dockerfile.rootless

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
2+
FROM docker.io/library/golang:1.23-alpine3.20 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY=${GOPROXY:-direct}

Makefile

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ SHASUM ?= shasum -a 256
2323
HAS_GO := $(shell hash $(GO) > /dev/null 2>&1 && echo yes)
2424
COMMA := ,
2525

26-
XGO_VERSION := go-1.22.x
26+
XGO_VERSION := go-1.23.x
2727

2828
AIR_PACKAGE ?= github.com/air-verse/air@v1
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/[email protected]
30-
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0
31-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.0
30+
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0
31+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.3
3232
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3333
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
3434
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
@@ -137,7 +137,7 @@ TAGS ?=
137137
TAGS_SPLIT := $(subst $(COMMA), ,$(TAGS))
138138
TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags
139139

140-
TEST_TAGS ?= sqlite sqlite_unlock_notify
140+
TEST_TAGS ?= $(TAGS_SPLIT) sqlite sqlite_unlock_notify
141141

142142
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
143143

@@ -858,18 +858,19 @@ deps-backend:
858858

859859
.PHONY: deps-tools
860860
deps-tools:
861-
$(GO) install $(AIR_PACKAGE)
862-
$(GO) install $(EDITORCONFIG_CHECKER_PACKAGE)
863-
$(GO) install $(GOFUMPT_PACKAGE)
864-
$(GO) install $(GOLANGCI_LINT_PACKAGE)
865-
$(GO) install $(GXZ_PACKAGE)
866-
$(GO) install $(MISSPELL_PACKAGE)
867-
$(GO) install $(SWAGGER_PACKAGE)
868-
$(GO) install $(XGO_PACKAGE)
869-
$(GO) install $(GO_LICENSES_PACKAGE)
870-
$(GO) install $(GOVULNCHECK_PACKAGE)
871-
$(GO) install $(ACTIONLINT_PACKAGE)
872-
$(GO) install $(GOPLS_PACKAGE)
861+
$(GO) install $(AIR_PACKAGE) & \
862+
$(GO) install $(EDITORCONFIG_CHECKER_PACKAGE) & \
863+
$(GO) install $(GOFUMPT_PACKAGE) & \
864+
$(GO) install $(GOLANGCI_LINT_PACKAGE) & \
865+
$(GO) install $(GXZ_PACKAGE) & \
866+
$(GO) install $(MISSPELL_PACKAGE) & \
867+
$(GO) install $(SWAGGER_PACKAGE) & \
868+
$(GO) install $(XGO_PACKAGE) & \
869+
$(GO) install $(GO_LICENSES_PACKAGE) & \
870+
$(GO) install $(GOVULNCHECK_PACKAGE) & \
871+
$(GO) install $(ACTIONLINT_PACKAGE) & \
872+
$(GO) install $(GOPLS_PACKAGE) & \
873+
wait
873874

874875
node_modules: package-lock.json
875876
npm install --no-save
@@ -887,6 +888,8 @@ update-js: node-check | node_modules
887888
npx updates -u -f package.json
888889
rm -rf node_modules package-lock.json
889890
npm install --package-lock
891+
npx nolyfill install
892+
npm install --package-lock
890893
@touch node_modules
891894

892895
.PHONY: update-py

0 commit comments

Comments
 (0)