Skip to content

Commit 5cad8d5

Browse files
lunnylunny
committed
Merge branch 'main' into lunny/move_initrepository
2 parents 0d941b5 + 2a9c5c9 commit 5cad8d5

File tree

236 files changed

+4097
-2451
lines changed

Some content is hidden

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

236 files changed

+4097
-2451
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ insert_final_newline = true
1212
[*.{go,tmpl,html}]
1313
indent_style = tab
1414

15+
[go.*]
16+
indent_style = tab
17+
1518
[templates/custom/*.tmpl]
1619
insert_final_newline = false
1720

‎.github/workflows/pull-db-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
ports:
9999
- "9200:9200"
100100
meilisearch:
101-
image: getmeili/meilisearch:v1.2.0
101+
image: getmeili/meilisearch:v1
102102
env:
103103
MEILI_ENV: development # disable auth
104104
ports:

‎.golangci.yml

+150-126
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,173 @@
1+
version: "2"
2+
output:
3+
sort-order:
4+
- file
15
linters:
2-
enable-all: false
3-
disable-all: true
4-
fast: false
6+
default: none
57
enable:
68
- bidichk
79
- depguard
810
- dupl
911
- errcheck
1012
- forbidigo
1113
- gocritic
12-
- gofmt
13-
- gofumpt
14-
- gosimple
1514
- govet
1615
- ineffassign
1716
- nakedret
1817
- nolintlint
1918
- revive
2019
- staticcheck
21-
- stylecheck
2220
- testifylint
23-
- typecheck
2421
- unconvert
25-
- unused
2622
- unparam
23+
- unused
2724
- usetesting
2825
- wastedassign
29-
30-
run:
31-
timeout: 10m
32-
33-
output:
34-
sort-results: true
35-
sort-order: [file]
36-
show-stats: true
37-
38-
linters-settings:
39-
testifylint:
40-
disable:
41-
- go-require
42-
- require-error
43-
stylecheck:
44-
checks: ["all", "-ST1005", "-ST1003"]
45-
nakedret:
46-
max-func-lines: 0
47-
gocritic:
48-
disabled-checks:
49-
- ifElseChain
50-
- singleCaseSwitch # Every time this occurred in the code, there was no other way.
51-
revive:
52-
severity: error
53-
rules:
54-
- name: atomic
55-
- name: bare-return
56-
- name: blank-imports
57-
- name: constant-logical-expr
58-
- name: context-as-argument
59-
- name: context-keys-type
60-
- name: dot-imports
61-
- name: duplicated-imports
62-
- name: empty-lines
63-
- name: error-naming
64-
- name: error-return
65-
- name: error-strings
66-
- name: errorf
67-
- name: exported
68-
- name: identical-branches
69-
- name: if-return
70-
- name: increment-decrement
71-
- name: indent-error-flow
72-
- name: modifies-value-receiver
73-
- name: package-comments
74-
- name: range
75-
- name: receiver-naming
76-
- name: redefines-builtin-id
77-
- name: string-of-int
78-
- name: superfluous-else
79-
- name: time-naming
80-
- name: unconditional-recursion
81-
- name: unexported-return
82-
- name: unreachable-code
83-
- name: var-declaration
84-
- name: var-naming
85-
gofumpt:
86-
extra-rules: true
87-
depguard:
26+
settings:
27+
depguard:
28+
rules:
29+
main:
30+
deny:
31+
- pkg: encoding/json
32+
desc: use gitea's modules/json instead of encoding/json
33+
- pkg: github.com/unknwon/com
34+
desc: use gitea's util and replacements
35+
- pkg: io/ioutil
36+
desc: use os or io instead
37+
- pkg: golang.org/x/exp
38+
desc: it's experimental and unreliable
39+
- pkg: code.gitea.io/gitea/modules/git/internal
40+
desc: do not use the internal package, use AddXxx function instead
41+
- pkg: gopkg.in/ini.v1
42+
desc: do not use the ini package, use gitea's config system instead
43+
- pkg: gitea.com/go-chi/cache
44+
desc: do not use the go-chi cache package, use gitea's cache system
45+
gocritic:
46+
disabled-checks:
47+
- ifElseChain
48+
- singleCaseSwitch # Every time this occurred in the code, there was no other way.
49+
revive:
50+
severity: error
51+
rules:
52+
- name: atomic
53+
- name: bare-return
54+
- name: blank-imports
55+
- name: constant-logical-expr
56+
- name: context-as-argument
57+
- name: context-keys-type
58+
- name: dot-imports
59+
- name: duplicated-imports
60+
- name: empty-lines
61+
- name: error-naming
62+
- name: error-return
63+
- name: error-strings
64+
- name: errorf
65+
- name: exported
66+
- name: identical-branches
67+
- name: if-return
68+
- name: increment-decrement
69+
- name: indent-error-flow
70+
- name: modifies-value-receiver
71+
- name: package-comments
72+
- name: range
73+
- name: receiver-naming
74+
- name: redefines-builtin-id
75+
- name: string-of-int
76+
- name: superfluous-else
77+
- name: time-naming
78+
- name: unconditional-recursion
79+
- name: unexported-return
80+
- name: unreachable-code
81+
- name: var-declaration
82+
- name: var-naming
83+
staticcheck:
84+
checks:
85+
- all
86+
- -ST1003
87+
- -ST1005
88+
- -QF1001
89+
- -QF1006
90+
- -QF1008
91+
testifylint:
92+
disable:
93+
- go-require
94+
- require-error
95+
- equal-values
96+
- empty
97+
- formatter
98+
- len
99+
usetesting:
100+
os-temp-dir: true
101+
exclusions:
102+
generated: lax
103+
presets:
104+
- comments
105+
- common-false-positives
106+
- legacy
107+
- std-error-handling
88108
rules:
89-
main:
90-
deny:
91-
- pkg: encoding/json
92-
desc: use gitea's modules/json instead of encoding/json
93-
- pkg: github.com/unknwon/com
94-
desc: use gitea's util and replacements
95-
- pkg: io/ioutil
96-
desc: use os or io instead
97-
- pkg: golang.org/x/exp
98-
desc: it's experimental and unreliable
99-
- pkg: code.gitea.io/gitea/modules/git/internal
100-
desc: do not use the internal package, use AddXxx function instead
101-
- pkg: gopkg.in/ini.v1
102-
desc: do not use the ini package, use gitea's config system instead
103-
- pkg: gitea.com/go-chi/cache
104-
desc: do not use the go-chi cache package, use gitea's cache system
105-
usetesting:
106-
os-temp-dir: true
107-
109+
- linters:
110+
- dupl
111+
- errcheck
112+
- gocyclo
113+
- gosec
114+
- staticcheck
115+
- unparam
116+
path: _test\.go
117+
- linters:
118+
- dupl
119+
- errcheck
120+
- gocyclo
121+
- gosec
122+
path: models/migrations/v
123+
- linters:
124+
- forbidigo
125+
path: cmd
126+
- linters:
127+
- dupl
128+
text: (?i)webhook
129+
- linters:
130+
- gocritic
131+
text: (?i)`ID' should not be capitalized
132+
- linters:
133+
- deadcode
134+
- unused
135+
text: (?i)swagger
136+
- linters:
137+
- staticcheck
138+
text: (?i)argument x is overwritten before first use
139+
- linters:
140+
- gocritic
141+
text: '(?i)commentFormatting: put a space between `//` and comment text'
142+
- linters:
143+
- gocritic
144+
text: '(?i)exitAfterDefer:'
145+
paths:
146+
- node_modules
147+
- public
148+
- web_src
149+
- third_party$
150+
- builtin$
151+
- examples$
108152
issues:
109153
max-issues-per-linter: 0
110154
max-same-issues: 0
111-
exclude-dirs: [node_modules, public, web_src]
112-
exclude-case-sensitive: true
113-
exclude-rules:
114-
- path: _test\.go
115-
linters:
116-
- gocyclo
117-
- errcheck
118-
- dupl
119-
- gosec
120-
- unparam
121-
- staticcheck
122-
- path: models/migrations/v
123-
linters:
124-
- gocyclo
125-
- errcheck
126-
- dupl
127-
- gosec
128-
- path: cmd
129-
linters:
130-
- forbidigo
131-
- text: "webhook"
132-
linters:
133-
- dupl
134-
- text: "`ID' should not be capitalized"
135-
linters:
136-
- gocritic
137-
- text: "swagger"
138-
linters:
139-
- unused
140-
- deadcode
141-
- text: "argument x is overwritten before first use"
142-
linters:
143-
- staticcheck
144-
- text: "commentFormatting: put a space between `//` and comment text"
145-
linters:
146-
- gocritic
147-
- text: "exitAfterDefer:"
148-
linters:
149-
- gocritic
155+
formatters:
156+
enable:
157+
- gofmt
158+
- gofumpt
159+
settings:
160+
gofumpt:
161+
extra-rules: true
162+
exclusions:
163+
generated: lax
164+
paths:
165+
- node_modules
166+
- public
167+
- web_src
168+
- third_party$
169+
- builtin$
170+
- examples$
171+
172+
run:
173+
timeout: 10m

‎CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@ This changelog goes through the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.com).
66

7+
## [1.23.6](https://github.com/go-gitea/gitea/releases/tag/v1.23.6) - 2025-03-24
8+
9+
* SECURITY
10+
* Fix LFS URL (#33840) (#33843)
11+
* Update jwt and redis packages (#33984) (#33987)
12+
* Update golang crypto and net (#33989)
13+
* BUGFIXES
14+
* Drop timeout for requests made to the internal hook api (#33947) (#33970)
15+
* Fix maven panic when no package exists (#33888) (#33889)
16+
* Fix markdown render (#33870) (#33875)
17+
* Fix auto concurrency cancellation skips commit status updates (#33764) (#33849)
18+
* Fix oauth2 auth (#33961) (#33962)
19+
* Fix incorrect 1.23 translations (#33932)
20+
* Try to figure out attribute checker problem (#33901) (#33902)
21+
* Ignore trivial errors when updating push data (#33864) (#33887)
22+
* Fix some UI problems for 1.23 (#33856)
23+
* Removing unwanted ui container (#33833) (#33835)
24+
* Support disable passkey auth (#33348) (#33819)
25+
* Do not call "git diff" when listing PRs (#33817)
26+
* Try to fix ACME (3rd) (#33807) (#33808)
27+
* Fix incorrect code search indexer options (#33992) #33999
28+
729
## [1.23.5](https://github.com/go-gitea/gitea/releases/tag/v1.23.5) - 2025-03-04
830

931
* SECURITY

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ XGO_VERSION := go-1.24.x
2828
AIR_PACKAGE ?= github.com/air-verse/air@v1
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/[email protected]
3030
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
31-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7
31+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2
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]
@@ -410,12 +410,12 @@ watch-backend: go-check ## watch backend files and continuously rebuild
410410
test: test-frontend test-backend ## test everything
411411

412412
.PHONY: test-backend
413-
test-backend: ## test frontend files
413+
test-backend: ## test backend files
414414
@echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
415415
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES)
416416

417417
.PHONY: test-frontend
418-
test-frontend: node_modules ## test backend files
418+
test-frontend: node_modules ## test frontend files
419419
npx vitest
420420

421421
.PHONY: test-check
@@ -737,7 +737,7 @@ generate-go: $(TAGS_PREREQ)
737737

738738
.PHONY: security-check
739739
security-check:
740-
go run $(GOVULNCHECK_PACKAGE) ./...
740+
go run $(GOVULNCHECK_PACKAGE) -show color ./...
741741

742742
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
743743
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

0 commit comments

Comments
 (0)