Skip to content

Commit 6d8eaa4

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Enable color output in govulncheck (go-gitea#34012) Update Makefile test comments (go-gitea#34013) Move duplicated functions (go-gitea#33977) Git client will follow 301 but 307 (go-gitea#34005) Prepare common tmpl functions in a middleware (go-gitea#33957) Update go mod dependencies (go-gitea#33988) Fix some migration and repo name problems (go-gitea#33986) [skip ci] Updated translations via Crowdin Use filepath.Join instead of path.Join for file system file operations (go-gitea#33978) Add changelog for 1.23.6 (go-gitea#33975) Fix incorrect code search indexer options (go-gitea#33992) Auto expand "New PR" form (go-gitea#33971) Move ParseBool to optional (go-gitea#33979)
2 parents fde02d1 + 2089401 commit 6d8eaa4

Some content is hidden

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

56 files changed

+575
-449
lines changed

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

Lines changed: 1 addition & 1 deletion
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:

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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 $@

‎assets/go-licenses.json

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@ require (
2121
gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4
2222
github.com/42wim/httpsig v1.2.2
2323
github.com/42wim/sshsig v0.0.0-20240818000253-e3a6333df815
24-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
24+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.1
2525
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
2626
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
2727
github.com/ProtonMail/go-crypto v1.1.6
2828
github.com/PuerkitoBio/goquery v1.10.2
2929
github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
3030
github.com/alecthomas/chroma/v2 v2.15.0
31-
github.com/aws/aws-sdk-go-v2/credentials v1.17.60
32-
github.com/aws/aws-sdk-go-v2/service/codecommit v1.27.16
31+
github.com/aws/aws-sdk-go-v2/credentials v1.17.62
32+
github.com/aws/aws-sdk-go-v2/service/codecommit v1.28.1
3333
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
3434
github.com/blevesearch/bleve/v2 v2.4.2
35-
github.com/buildkite/terminal-to-html/v3 v3.16.6
36-
github.com/caddyserver/certmagic v0.21.7
35+
github.com/buildkite/terminal-to-html/v3 v3.16.8
36+
github.com/caddyserver/certmagic v0.22.0
3737
github.com/charmbracelet/git-lfs-transfer v0.2.0
3838
github.com/chi-middleware/proxy v1.1.1
3939
github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21
4040
github.com/djherbis/buffer v1.2.0
4141
github.com/djherbis/nio/v3 v3.0.1
4242
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5
4343
github.com/dustin/go-humanize v1.0.1
44-
github.com/editorconfig/editorconfig-core-go/v2 v2.6.2
44+
github.com/editorconfig/editorconfig-core-go/v2 v2.6.3
4545
github.com/emersion/go-imap v1.2.1
4646
github.com/emirpasic/gods v1.18.1
4747
github.com/ethantkoenig/rupture v1.0.1
@@ -55,19 +55,19 @@ require (
5555
github.com/go-co-op/gocron v1.37.0
5656
github.com/go-enry/go-enry/v2 v2.9.2
5757
github.com/go-git/go-billy/v5 v5.6.2
58-
github.com/go-git/go-git/v5 v5.13.2
58+
github.com/go-git/go-git/v5 v5.14.0
5959
github.com/go-ldap/ldap/v3 v3.4.10
6060
github.com/go-redsync/redsync/v4 v4.13.0
61-
github.com/go-sql-driver/mysql v1.9.0
61+
github.com/go-sql-driver/mysql v1.9.1
6262
github.com/go-swagger/go-swagger v0.31.0
63-
github.com/go-webauthn/webauthn v0.11.2
63+
github.com/go-webauthn/webauthn v0.12.2
6464
github.com/gobwas/glob v0.2.3
6565
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
6666
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
6767
github.com/golang-jwt/jwt/v5 v5.2.2
6868
github.com/google/go-github/v61 v61.0.0
6969
github.com/google/licenseclassifier/v2 v2.0.0
70-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941
70+
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e
7171
github.com/google/uuid v1.6.0
7272
github.com/gorilla/feeds v1.2.0
7373
github.com/gorilla/sessions v1.4.0
@@ -79,25 +79,25 @@ require (
7979
github.com/json-iterator/go v1.1.12
8080
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
8181
github.com/klauspost/compress v1.18.0
82-
github.com/klauspost/cpuid/v2 v2.2.9
82+
github.com/klauspost/cpuid/v2 v2.2.10
8383
github.com/lib/pq v1.10.9
8484
github.com/markbates/goth v1.80.0
8585
github.com/mattn/go-isatty v0.0.20
8686
github.com/mattn/go-sqlite3 v1.14.24
87-
github.com/meilisearch/meilisearch-go v0.29.1-0.20241106140435-0bf60fad690a
87+
github.com/meilisearch/meilisearch-go v0.31.0
8888
github.com/mholt/archiver/v3 v3.5.1
8989
github.com/microcosm-cc/bluemonday v1.0.27
9090
github.com/microsoft/go-mssqldb v1.8.0
91-
github.com/minio/minio-go/v7 v7.0.87
91+
github.com/minio/minio-go/v7 v7.0.88
9292
github.com/msteinert/pam v1.2.0
9393
github.com/nektos/act v0.2.63
9494
github.com/niklasfasching/go-org v1.7.0
9595
github.com/olivere/elastic/v7 v7.0.32
9696
github.com/opencontainers/go-digest v1.0.0
97-
github.com/opencontainers/image-spec v1.1.0
97+
github.com/opencontainers/image-spec v1.1.1
9898
github.com/pkg/errors v0.9.1
9999
github.com/pquerna/otp v1.4.0
100-
github.com/prometheus/client_golang v1.21.0
100+
github.com/prometheus/client_golang v1.21.1
101101
github.com/quasoft/websspi v1.1.2
102102
github.com/redis/go-redis/v9 v9.7.3
103103
github.com/robfig/cron/v3 v3.0.1
@@ -109,23 +109,23 @@ require (
109109
github.com/syndtr/goleveldb v1.0.0
110110
github.com/tstranex/u2f v1.0.0
111111
github.com/ulikunitz/xz v0.5.12
112-
github.com/urfave/cli/v2 v2.27.5
112+
github.com/urfave/cli/v2 v2.27.6
113113
github.com/wneessen/go-mail v0.6.2
114114
github.com/xeipuuv/gojsonschema v1.2.0
115115
github.com/yohcop/openid-go v1.0.1
116116
github.com/yuin/goldmark v1.7.8
117117
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
118118
github.com/yuin/goldmark-meta v1.1.0
119-
gitlab.com/gitlab-org/api/client-go v0.123.0
120-
golang.org/x/crypto v0.35.0
121-
golang.org/x/image v0.24.0
122-
golang.org/x/net v0.36.0
123-
golang.org/x/oauth2 v0.27.0
124-
golang.org/x/sync v0.11.0
125-
golang.org/x/sys v0.30.0
126-
golang.org/x/text v0.22.0
127-
golang.org/x/tools v0.30.0
128-
google.golang.org/grpc v1.70.0
119+
gitlab.com/gitlab-org/api/client-go v0.126.0
120+
golang.org/x/crypto v0.36.0
121+
golang.org/x/image v0.25.0
122+
golang.org/x/net v0.37.0
123+
golang.org/x/oauth2 v0.28.0
124+
golang.org/x/sync v0.12.0
125+
golang.org/x/sys v0.31.0
126+
golang.org/x/text v0.23.0
127+
golang.org/x/tools v0.31.0
128+
google.golang.org/grpc v1.71.0
129129
google.golang.org/protobuf v1.36.5
130130
gopkg.in/ini.v1 v1.67.0
131131
gopkg.in/yaml.v3 v3.0.1
@@ -151,13 +151,13 @@ require (
151151
github.com/andybalholm/cascadia v1.3.3 // indirect
152152
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
153153
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
154-
github.com/aws/aws-sdk-go-v2 v1.36.2 // indirect
155-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33 // indirect
156-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33 // indirect
154+
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
155+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
156+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
157157
github.com/aws/smithy-go v1.22.3 // indirect
158158
github.com/aymerick/douceur v0.2.0 // indirect
159159
github.com/beorn7/perks v1.0.1 // indirect
160-
github.com/bits-and-blooms/bitset v1.20.0 // indirect
160+
github.com/bits-and-blooms/bitset v1.22.0 // indirect
161161
github.com/blevesearch/bleve_index_api v1.1.12 // indirect
162162
github.com/blevesearch/geo v0.1.20 // indirect
163163
github.com/blevesearch/go-faiss v1.0.20 // indirect
@@ -183,7 +183,7 @@ require (
183183
github.com/cespare/xxhash/v2 v2.3.0 // indirect
184184
github.com/cloudflare/circl v1.6.0 // indirect
185185
github.com/couchbase/go-couchbase v0.1.1 // indirect
186-
github.com/couchbase/gomemcached v0.3.2 // indirect
186+
github.com/couchbase/gomemcached v0.3.3 // indirect
187187
github.com/couchbase/goutils v0.1.2 // indirect
188188
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
189189
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
@@ -203,26 +203,28 @@ require (
203203
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
204204
github.com/go-ini/ini v1.67.0 // indirect
205205
github.com/go-openapi/analysis v0.23.0 // indirect
206-
github.com/go-openapi/errors v0.22.0 // indirect
207-
github.com/go-openapi/inflect v0.21.0 // indirect
208-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
206+
github.com/go-openapi/errors v0.22.1 // indirect
207+
github.com/go-openapi/inflect v0.21.2 // indirect
208+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
209209
github.com/go-openapi/jsonreference v0.21.0 // indirect
210210
github.com/go-openapi/loads v0.22.0 // indirect
211211
github.com/go-openapi/runtime v0.28.0 // indirect
212212
github.com/go-openapi/spec v0.21.0 // indirect
213213
github.com/go-openapi/strfmt v0.23.0 // indirect
214-
github.com/go-openapi/swag v0.23.0 // indirect
214+
github.com/go-openapi/swag v0.23.1 // indirect
215215
github.com/go-openapi/validate v0.24.0 // indirect
216-
github.com/go-webauthn/x v0.1.16 // indirect
216+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
217+
github.com/go-webauthn/x v0.1.19 // indirect
217218
github.com/goccy/go-json v0.10.5 // indirect
218219
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
219220
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
220221
github.com/golang-sql/sqlexp v0.1.0 // indirect
221-
github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
222+
github.com/golang/geo v0.0.0-20250321002858-2bb09a976f49 // indirect
222223
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
223224
github.com/golang/protobuf v1.5.4 // indirect
224-
github.com/golang/snappy v0.0.4 // indirect
225+
github.com/golang/snappy v1.0.0 // indirect
225226
github.com/google/btree v1.1.3 // indirect
227+
github.com/google/flatbuffers v25.2.10+incompatible // indirect
226228
github.com/google/go-querystring v1.1.0 // indirect
227229
github.com/google/go-tpm v0.9.3 // indirect
228230
github.com/gorilla/css v1.0.1 // indirect
@@ -233,7 +235,6 @@ require (
233235
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
234236
github.com/hashicorp/go-multierror v1.1.1 // indirect
235237
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
236-
github.com/hashicorp/hcl v1.0.0 // indirect
237238
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
238239
github.com/jessevdk/go-flags v1.6.1 // indirect
239240
github.com/josharian/intern v1.0.0 // indirect
@@ -242,14 +243,13 @@ require (
242243
github.com/kr/pretty v0.3.1 // indirect
243244
github.com/kr/text v0.2.0 // indirect
244245
github.com/libdns/libdns v0.2.3 // indirect
245-
github.com/magiconair/properties v1.8.9 // indirect
246246
github.com/mailru/easyjson v0.9.0 // indirect
247247
github.com/markbates/going v1.0.3 // indirect
248248
github.com/mattn/go-colorable v0.1.14 // indirect
249249
github.com/mattn/go-runewidth v0.0.16 // indirect
250250
github.com/mattn/go-shellwords v1.0.12 // indirect
251-
github.com/mholt/acmez/v3 v3.0.1 // indirect
252-
github.com/miekg/dns v1.1.63 // indirect
251+
github.com/mholt/acmez/v3 v3.1.0 // indirect
252+
github.com/miekg/dns v1.1.64 // indirect
253253
github.com/minio/crc64nvme v1.0.1 // indirect
254254
github.com/minio/md5-simd v1.1.2 // indirect
255255
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -269,24 +269,23 @@ require (
269269
github.com/pjbgf/sha1cd v0.3.2 // indirect
270270
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
271271
github.com/prometheus/client_model v0.6.1 // indirect
272-
github.com/prometheus/common v0.62.0 // indirect
273-
github.com/prometheus/procfs v0.15.1 // indirect
272+
github.com/prometheus/common v0.63.0 // indirect
273+
github.com/prometheus/procfs v0.16.0 // indirect
274274
github.com/rhysd/actionlint v1.7.7 // indirect
275275
github.com/rivo/uniseg v0.4.7 // indirect
276-
github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a // indirect
276+
github.com/rogpeppe/go-internal v1.14.1 // indirect
277277
github.com/rs/xid v1.6.0 // indirect
278278
github.com/russross/blackfriday/v2 v2.1.0 // indirect
279-
github.com/sagikazarmark/locafero v0.7.0 // indirect
280-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
279+
github.com/sagikazarmark/locafero v0.8.0 // indirect
281280
github.com/shopspring/decimal v1.4.0 // indirect
282281
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
283282
github.com/sirupsen/logrus v1.9.3 // indirect
284283
github.com/skeema/knownhosts v1.3.1 // indirect
285284
github.com/sourcegraph/conc v0.3.0 // indirect
286-
github.com/spf13/afero v1.12.0 // indirect
285+
github.com/spf13/afero v1.14.0 // indirect
287286
github.com/spf13/cast v1.7.1 // indirect
288287
github.com/spf13/pflag v1.0.6 // indirect
289-
github.com/spf13/viper v1.19.0 // indirect
288+
github.com/spf13/viper v1.20.0 // indirect
290289
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
291290
github.com/subosito/gotenv v1.6.0 // indirect
292291
github.com/toqueteos/webbrowser v1.2.0 // indirect
@@ -301,15 +300,15 @@ require (
301300
github.com/zeebo/assert v1.3.0 // indirect
302301
github.com/zeebo/blake3 v0.2.4 // indirect
303302
go.etcd.io/bbolt v1.4.0 // indirect
304-
go.mongodb.org/mongo-driver v1.17.2 // indirect
303+
go.mongodb.org/mongo-driver v1.17.3 // indirect
305304
go.uber.org/atomic v1.11.0 // indirect
306305
go.uber.org/multierr v1.11.0 // indirect
307306
go.uber.org/zap v1.27.0 // indirect
308307
go.uber.org/zap/exp v0.3.0 // indirect
309-
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
310-
golang.org/x/mod v0.23.0 // indirect
311-
golang.org/x/time v0.10.0 // indirect
312-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
308+
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
309+
golang.org/x/mod v0.24.0 // indirect
310+
golang.org/x/time v0.11.0 // indirect
311+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
313312
gopkg.in/warnings.v0 v0.1.2 // indirect
314313
gopkg.in/yaml.v2 v2.4.0 // indirect
315314
)

0 commit comments

Comments
 (0)