Skip to content

Commit 319a1c2

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix panic when comment is nil (go-gitea#34257) Fix various trivial frontend problems (go-gitea#34263) update go&js dependencies (go-gitea#34262) Fix runner list tmpl (go-gitea#34270) Improve "not found" error messages for API (go-gitea#34267) Add fullscreen mode as a more efficient operation way to view projects (go-gitea#34081)
2 parents b505557 + e73c113 commit 319a1c2

File tree

45 files changed

+690
-616
lines changed

Some content is hidden

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

45 files changed

+690
-616
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ jobs:
1212
uses: ./.github/workflows/files-changed.yml
1313

1414
test-e2e:
15-
if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true'
15+
# the "test-e2e" won't pass, and it seems that there is no useful test, so skip
16+
# if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true'
17+
if: false
1618
needs: files-changed
1719
runs-on: ubuntu-latest
1820
steps:

‎assets/go-licenses.json‎

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ godebug x509negativeserial=1
1010
require (
1111
code.gitea.io/actions-proto-go v0.4.1
1212
code.gitea.io/gitea-vet v0.2.3
13-
code.gitea.io/sdk/gitea v0.20.0
13+
code.gitea.io/sdk/gitea v0.21.0
1414
codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
1515
connectrpc.com/connect v1.18.1
1616
gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed
@@ -21,20 +21,20 @@ 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.1
24+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
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
27-
github.com/ProtonMail/go-crypto v1.1.6
28-
github.com/PuerkitoBio/goquery v1.10.2
27+
github.com/ProtonMail/go-crypto v1.2.0
28+
github.com/PuerkitoBio/goquery v1.10.3
2929
github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
30-
github.com/alecthomas/chroma/v2 v2.15.0
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
30+
github.com/alecthomas/chroma/v2 v2.17.0
31+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
32+
github.com/aws/aws-sdk-go-v2/service/codecommit v1.28.2
3333
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
34-
github.com/blevesearch/bleve/v2 v2.4.2
34+
github.com/blevesearch/bleve/v2 v2.5.0
3535
github.com/bohde/codel v0.2.0
3636
github.com/buildkite/terminal-to-html/v3 v3.16.8
37-
github.com/caddyserver/certmagic v0.22.0
37+
github.com/caddyserver/certmagic v0.23.0
3838
github.com/charmbracelet/git-lfs-transfer v0.2.0
3939
github.com/chi-middleware/proxy v1.1.1
4040
github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21
@@ -47,28 +47,28 @@ require (
4747
github.com/emirpasic/gods v1.18.1
4848
github.com/ethantkoenig/rupture v1.0.1
4949
github.com/felixge/fgprof v0.9.5
50-
github.com/fsnotify/fsnotify v1.8.0
50+
github.com/fsnotify/fsnotify v1.9.0
5151
github.com/gliderlabs/ssh v0.3.8
52-
github.com/go-ap/activitypub v0.0.0-20250212090640-aeb6499ba581
52+
github.com/go-ap/activitypub v0.0.0-20250409143848-7113328b1f3d
5353
github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73
5454
github.com/go-chi/chi/v5 v5.2.1
5555
github.com/go-chi/cors v1.2.1
5656
github.com/go-co-op/gocron v1.37.0
5757
github.com/go-enry/go-enry/v2 v2.9.2
5858
github.com/go-git/go-billy/v5 v5.6.2
59-
github.com/go-git/go-git/v5 v5.14.0
60-
github.com/go-ldap/ldap/v3 v3.4.10
59+
github.com/go-git/go-git/v5 v5.16.0
60+
github.com/go-ldap/ldap/v3 v3.4.11
6161
github.com/go-redsync/redsync/v4 v4.13.0
62-
github.com/go-sql-driver/mysql v1.9.1
62+
github.com/go-sql-driver/mysql v1.9.2
6363
github.com/go-swagger/go-swagger v0.31.0
64-
github.com/go-webauthn/webauthn v0.12.2
64+
github.com/go-webauthn/webauthn v0.12.3
6565
github.com/gobwas/glob v0.2.3
6666
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
6767
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
6868
github.com/golang-jwt/jwt/v5 v5.2.2
6969
github.com/google/go-github/v61 v61.0.0
7070
github.com/google/licenseclassifier/v2 v2.0.0
71-
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e
71+
github.com/google/pprof v0.0.0-20250422154841-e1f9c1950416
7272
github.com/google/uuid v1.6.0
7373
github.com/gorilla/feeds v1.2.0
7474
github.com/gorilla/sessions v1.4.0
@@ -82,14 +82,14 @@ require (
8282
github.com/klauspost/compress v1.18.0
8383
github.com/klauspost/cpuid/v2 v2.2.10
8484
github.com/lib/pq v1.10.9
85-
github.com/markbates/goth v1.80.0
85+
github.com/markbates/goth v1.81.0
8686
github.com/mattn/go-isatty v0.0.20
87-
github.com/mattn/go-sqlite3 v1.14.24
87+
github.com/mattn/go-sqlite3 v1.14.28
8888
github.com/meilisearch/meilisearch-go v0.31.0
8989
github.com/mholt/archiver/v3 v3.5.1
9090
github.com/microcosm-cc/bluemonday v1.0.27
9191
github.com/microsoft/go-mssqldb v1.8.0
92-
github.com/minio/minio-go/v7 v7.0.88
92+
github.com/minio/minio-go/v7 v7.0.91
9393
github.com/msteinert/pam v1.2.0
9494
github.com/nektos/act v0.2.63
9595
github.com/niklasfasching/go-org v1.7.0
@@ -98,7 +98,7 @@ require (
9898
github.com/opencontainers/image-spec v1.1.1
9999
github.com/pkg/errors v0.9.1
100100
github.com/pquerna/otp v1.4.0
101-
github.com/prometheus/client_golang v1.21.1
101+
github.com/prometheus/client_golang v1.22.0
102102
github.com/quasoft/websspi v1.1.2
103103
github.com/redis/go-redis/v9 v9.7.3
104104
github.com/robfig/cron/v3 v3.0.1
@@ -114,20 +114,20 @@ require (
114114
github.com/wneessen/go-mail v0.6.2
115115
github.com/xeipuuv/gojsonschema v1.2.0
116116
github.com/yohcop/openid-go v1.0.1
117-
github.com/yuin/goldmark v1.7.8
117+
github.com/yuin/goldmark v1.7.10
118118
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
119119
github.com/yuin/goldmark-meta v1.1.0
120-
gitlab.com/gitlab-org/api/client-go v0.126.0
121-
golang.org/x/crypto v0.36.0
122-
golang.org/x/image v0.25.0
123-
golang.org/x/net v0.38.0
124-
golang.org/x/oauth2 v0.28.0
125-
golang.org/x/sync v0.12.0
126-
golang.org/x/sys v0.31.0
127-
golang.org/x/text v0.23.0
128-
golang.org/x/tools v0.31.0
129-
google.golang.org/grpc v1.71.0
130-
google.golang.org/protobuf v1.36.5
120+
gitlab.com/gitlab-org/api/client-go v0.127.0
121+
golang.org/x/crypto v0.37.0
122+
golang.org/x/image v0.26.0
123+
golang.org/x/net v0.39.0
124+
golang.org/x/oauth2 v0.29.0
125+
golang.org/x/sync v0.13.0
126+
golang.org/x/sys v0.32.0
127+
golang.org/x/text v0.24.0
128+
golang.org/x/tools v0.32.0
129+
google.golang.org/grpc v1.72.0
130+
google.golang.org/protobuf v1.36.6
131131
gopkg.in/ini.v1 v1.67.0
132132
gopkg.in/yaml.v3 v3.0.1
133133
mvdan.cc/xurls/v2 v2.6.0
@@ -141,13 +141,13 @@ require (
141141
dario.cat/mergo v1.0.1 // indirect
142142
filippo.io/edwards25519 v1.1.0 // indirect
143143
git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
144-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
145-
github.com/DataDog/zstd v1.5.6 // indirect
144+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
145+
github.com/DataDog/zstd v1.5.7 // indirect
146146
github.com/Masterminds/goutils v1.1.1 // indirect
147147
github.com/Masterminds/semver/v3 v3.3.1 // indirect
148148
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
149149
github.com/Microsoft/go-winio v0.6.2 // indirect
150-
github.com/RoaringBitmap/roaring v1.9.4 // indirect
150+
github.com/RoaringBitmap/roaring/v2 v2.4.5 // indirect
151151
github.com/andybalholm/brotli v1.1.1 // indirect
152152
github.com/andybalholm/cascadia v1.3.3 // indirect
153153
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
@@ -159,30 +159,30 @@ require (
159159
github.com/aymerick/douceur v0.2.0 // indirect
160160
github.com/beorn7/perks v1.0.1 // indirect
161161
github.com/bits-and-blooms/bitset v1.22.0 // indirect
162-
github.com/blevesearch/bleve_index_api v1.1.12 // indirect
163-
github.com/blevesearch/geo v0.1.20 // indirect
164-
github.com/blevesearch/go-faiss v1.0.20 // indirect
162+
github.com/blevesearch/bleve_index_api v1.2.8 // indirect
163+
github.com/blevesearch/geo v0.2.0 // indirect
164+
github.com/blevesearch/go-faiss v1.0.25 // indirect
165165
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
166166
github.com/blevesearch/gtreap v0.1.1 // indirect
167167
github.com/blevesearch/mmap-go v1.0.4 // indirect
168-
github.com/blevesearch/scorch_segment_api/v2 v2.2.15 // indirect
168+
github.com/blevesearch/scorch_segment_api/v2 v2.3.10 // indirect
169169
github.com/blevesearch/segment v0.9.1 // indirect
170170
github.com/blevesearch/snowballstem v0.9.0 // indirect
171171
github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
172-
github.com/blevesearch/vellum v1.0.10 // indirect
173-
github.com/blevesearch/zapx/v11 v11.3.10 // indirect
174-
github.com/blevesearch/zapx/v12 v12.3.10 // indirect
175-
github.com/blevesearch/zapx/v13 v13.3.10 // indirect
176-
github.com/blevesearch/zapx/v14 v14.3.10 // indirect
177-
github.com/blevesearch/zapx/v15 v15.3.13 // indirect
178-
github.com/blevesearch/zapx/v16 v16.1.5 // indirect
172+
github.com/blevesearch/vellum v1.1.0 // indirect
173+
github.com/blevesearch/zapx/v11 v11.4.1 // indirect
174+
github.com/blevesearch/zapx/v12 v12.4.1 // indirect
175+
github.com/blevesearch/zapx/v13 v13.4.1 // indirect
176+
github.com/blevesearch/zapx/v14 v14.4.1 // indirect
177+
github.com/blevesearch/zapx/v15 v15.4.1 // indirect
178+
github.com/blevesearch/zapx/v16 v16.2.3 // indirect
179179
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
180180
github.com/boombuler/barcode v1.0.2 // indirect
181-
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
181+
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
182182
github.com/caddyserver/zerossl v0.1.3 // indirect
183183
github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a // indirect
184184
github.com/cespare/xxhash/v2 v2.3.0 // indirect
185-
github.com/cloudflare/circl v1.6.0 // indirect
185+
github.com/cloudflare/circl v1.6.1 // indirect
186186
github.com/couchbase/go-couchbase v0.1.1 // indirect
187187
github.com/couchbase/gomemcached v0.3.3 // indirect
188188
github.com/couchbase/goutils v0.1.2 // indirect
@@ -195,10 +195,10 @@ require (
195195
github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 // indirect
196196
github.com/fatih/color v1.18.0 // indirect
197197
github.com/felixge/httpsnoop v1.0.4 // indirect
198-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
198+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
199199
github.com/git-lfs/pktline v0.0.0-20230103162542-ca444d533ef1 // indirect
200-
github.com/go-ap/errors v0.0.0-20250124135319-3da8adefd4a9 // indirect
201-
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
200+
github.com/go-ap/errors v0.0.0-20250409143711-5686c11ae650 // indirect
201+
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
202202
github.com/go-enry/go-oniguruma v1.2.1 // indirect
203203
github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e // indirect
204204
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -215,12 +215,11 @@ require (
215215
github.com/go-openapi/swag v0.23.1 // indirect
216216
github.com/go-openapi/validate v0.24.0 // indirect
217217
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
218-
github.com/go-webauthn/x v0.1.19 // indirect
218+
github.com/go-webauthn/x v0.1.20 // indirect
219219
github.com/goccy/go-json v0.10.5 // indirect
220220
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
221221
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
222222
github.com/golang-sql/sqlexp v0.1.0 // indirect
223-
github.com/golang/geo v0.0.0-20250321002858-2bb09a976f49 // indirect
224223
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
225224
github.com/golang/protobuf v1.5.4 // indirect
226225
github.com/golang/snappy v1.0.0 // indirect
@@ -243,14 +242,14 @@ require (
243242
github.com/klauspost/pgzip v1.2.6 // indirect
244243
github.com/kr/pretty v0.3.1 // indirect
245244
github.com/kr/text v0.2.0 // indirect
246-
github.com/libdns/libdns v0.2.3 // indirect
245+
github.com/libdns/libdns v1.0.0-beta.1 // indirect
247246
github.com/mailru/easyjson v0.9.0 // indirect
248247
github.com/markbates/going v1.0.3 // indirect
249248
github.com/mattn/go-colorable v0.1.14 // indirect
250249
github.com/mattn/go-runewidth v0.0.16 // indirect
251250
github.com/mattn/go-shellwords v1.0.12 // indirect
252-
github.com/mholt/acmez/v3 v3.1.0 // indirect
253-
github.com/miekg/dns v1.1.64 // indirect
251+
github.com/mholt/acmez/v3 v3.1.2 // indirect
252+
github.com/miekg/dns v1.1.65 // indirect
254253
github.com/minio/crc64nvme v1.0.1 // indirect
255254
github.com/minio/md5-simd v1.1.2 // indirect
256255
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -265,19 +264,19 @@ require (
265264
github.com/oklog/ulid v1.3.1 // indirect
266265
github.com/olekukonko/tablewriter v0.0.5 // indirect
267266
github.com/onsi/ginkgo v1.16.5 // indirect
268-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
267+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
269268
github.com/pierrec/lz4/v4 v4.1.22 // indirect
270269
github.com/pjbgf/sha1cd v0.3.2 // indirect
271270
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
272-
github.com/prometheus/client_model v0.6.1 // indirect
271+
github.com/prometheus/client_model v0.6.2 // indirect
273272
github.com/prometheus/common v0.63.0 // indirect
274-
github.com/prometheus/procfs v0.16.0 // indirect
273+
github.com/prometheus/procfs v0.16.1 // indirect
275274
github.com/rhysd/actionlint v1.7.7 // indirect
276275
github.com/rivo/uniseg v0.4.7 // indirect
277276
github.com/rogpeppe/go-internal v1.14.1 // indirect
278277
github.com/rs/xid v1.6.0 // indirect
279278
github.com/russross/blackfriday/v2 v2.1.0 // indirect
280-
github.com/sagikazarmark/locafero v0.8.0 // indirect
279+
github.com/sagikazarmark/locafero v0.9.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
@@ -286,7 +285,7 @@ require (
286285
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.20.0 // indirect
288+
github.com/spf13/viper v1.20.1 // 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
@@ -309,7 +308,7 @@ require (
309308
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
310309
golang.org/x/mod v0.24.0 // indirect
311310
golang.org/x/time v0.11.0 // indirect
312-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
311+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // 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)