Skip to content

Commit fbb876f

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Continue GCing other repos on error in one repo (go-gitea#22422) improve explore relevancy note (go-gitea#22421) fix: don't replace err variable in nested check (go-gitea#22416) Add more packages to denylist (go-gitea#22412) fix wrong theme class when logged out if default theme is changed (go-gitea#22408) Update golang deps (go-gitea#22410)
2 parents c27d8aa + 99cf0d3 commit fbb876f

File tree

9 files changed

+206
-177
lines changed

9 files changed

+206
-177
lines changed

‎.golangci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,14 @@ linters-settings:
7676
extra-rules: true
7777
lang-version: "1.19"
7878
depguard:
79-
# TODO: use depguard to replace import checks in gitea-vet
8079
list-type: denylist
8180
# Check the list against standard lib.
8281
include-go-root: true
8382
packages-with-error-message:
8483
- encoding/json: "use gitea's modules/json instead of encoding/json"
8584
- github.com/unknwon/com: "use gitea's util and replacements"
85+
- io/ioutil: "use os or io instead"
86+
- golang.org/x/exp: "it's experimental and unreliable."
8687

8788
issues:
8889
max-issues-per-linter: 0

‎assets/go-licenses.json

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

‎go.mod

Lines changed: 55 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,38 @@ require (
99
gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681
1010
gitea.com/go-chi/cache v0.2.0
1111
gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5
12-
gitea.com/go-chi/session v0.0.0-20211218221615-e3605d8b28b8
12+
gitea.com/go-chi/session v0.0.0-20221220005550-e056dc379164
1313
gitea.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
1414
gitea.com/lunny/levelqueue v0.4.2-0.20220729054728-f020868cc2f7
1515
github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
1616
github.com/NYTimes/gziphandler v1.1.1
1717
github.com/PuerkitoBio/goquery v1.8.0
1818
github.com/alecthomas/chroma/v2 v2.4.0
19-
github.com/blevesearch/bleve/v2 v2.3.5
19+
github.com/blevesearch/bleve/v2 v2.3.6
2020
github.com/buildkite/terminal-to-html/v3 v3.7.0
2121
github.com/caddyserver/certmagic v0.17.2
2222
github.com/chi-middleware/proxy v1.1.1
23-
github.com/denisenkom/go-mssqldb v0.12.2
23+
github.com/denisenkom/go-mssqldb v0.12.3
2424
github.com/djherbis/buffer v1.2.0
2525
github.com/djherbis/nio/v3 v3.0.1
2626
github.com/dustin/go-humanize v1.0.0
27-
github.com/editorconfig/editorconfig-core-go/v2 v2.4.5
27+
github.com/editorconfig/editorconfig-core-go/v2 v2.5.1
2828
github.com/emirpasic/gods v1.18.1
2929
github.com/ethantkoenig/rupture v1.0.1
3030
github.com/felixge/fgprof v0.9.3
31-
github.com/fsnotify/fsnotify v1.5.4
31+
github.com/fsnotify/fsnotify v1.6.0
3232
github.com/gliderlabs/ssh v0.3.5
33-
github.com/go-ap/activitypub v0.0.0-20220917143152-e4e7018838c0
34-
github.com/go-ap/jsonld v0.0.0-20220917142617-76bf51585778
33+
github.com/go-ap/activitypub v0.0.0-20221209114049-1ceafda50f9f
34+
github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73
3535
github.com/go-chi/chi/v5 v5.0.8
3636
github.com/go-chi/cors v1.2.1
3737
github.com/go-enry/go-enry/v2 v2.8.3
3838
github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e
39-
github.com/go-git/go-billy/v5 v5.3.1
40-
github.com/go-git/go-git/v5 v5.4.3-0.20220529141257-bc1f419cebcf
39+
github.com/go-git/go-billy/v5 v5.4.0
40+
github.com/go-git/go-git/v5 v5.5.2
4141
github.com/go-ldap/ldap/v3 v3.4.4
4242
github.com/go-redis/redis/v8 v8.11.5
43-
github.com/go-sql-driver/mysql v1.6.0
43+
github.com/go-sql-driver/mysql v1.7.0
4444
github.com/go-swagger/go-swagger v0.30.3
4545
github.com/go-testfixtures/testfixtures/v3 v3.8.1
4646
github.com/go-webauthn/webauthn v0.6.0
@@ -50,54 +50,54 @@ require (
5050
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
5151
github.com/golang-jwt/jwt/v4 v4.4.3
5252
github.com/google/go-github/v45 v45.2.0
53-
github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40
53+
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b
5454
github.com/google/uuid v1.3.0
5555
github.com/gorilla/feeds v1.1.1
5656
github.com/gorilla/sessions v1.2.1
5757
github.com/hashicorp/go-version v1.6.0
58-
github.com/hashicorp/golang-lru v0.5.4
59-
github.com/huandu/xstrings v1.3.2
58+
github.com/hashicorp/golang-lru v0.6.0
59+
github.com/huandu/xstrings v1.4.0
6060
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba
6161
github.com/json-iterator/go v1.1.12
6262
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
6363
github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
64-
github.com/klauspost/compress v1.15.11
65-
github.com/klauspost/cpuid/v2 v2.1.1
64+
github.com/klauspost/compress v1.15.14
65+
github.com/klauspost/cpuid/v2 v2.2.3
6666
github.com/lib/pq v1.10.7
67-
github.com/markbates/goth v1.73.0
68-
github.com/mattn/go-isatty v0.0.16
69-
github.com/mattn/go-sqlite3 v1.14.15
67+
github.com/markbates/goth v1.76.0
68+
github.com/mattn/go-isatty v0.0.17
69+
github.com/mattn/go-sqlite3 v1.14.16
7070
github.com/mholt/archiver/v3 v3.5.1
71-
github.com/microcosm-cc/bluemonday v1.0.20
72-
github.com/minio/minio-go/v7 v7.0.39
71+
github.com/microcosm-cc/bluemonday v1.0.21
72+
github.com/minio/minio-go/v7 v7.0.46
7373
github.com/msteinert/pam v1.1.0
7474
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
7575
github.com/niklasfasching/go-org v1.6.5
7676
github.com/oliamb/cutter v0.2.2
7777
github.com/olivere/elastic/v7 v7.0.32
7878
github.com/pkg/errors v0.9.1
79-
github.com/pquerna/otp v1.3.0
80-
github.com/prometheus/client_golang v1.13.0
79+
github.com/pquerna/otp v1.4.0
80+
github.com/prometheus/client_golang v1.14.0
8181
github.com/quasoft/websspi v1.1.2
82-
github.com/santhosh-tekuri/jsonschema/v5 v5.0.1
82+
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1
8383
github.com/sergi/go-diff v1.2.0
8484
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
8585
github.com/stretchr/testify v1.8.1
8686
github.com/syndtr/goleveldb v1.0.0
8787
github.com/tstranex/u2f v1.0.0
8888
github.com/unrolled/render v1.5.0
8989
github.com/urfave/cli v1.22.10
90-
github.com/xanzy/go-gitlab v0.73.1
90+
github.com/xanzy/go-gitlab v0.78.0
9191
github.com/xeipuuv/gojsonschema v1.2.0
9292
github.com/yohcop/openid-go v1.0.0
93-
github.com/yuin/goldmark v1.5.2
93+
github.com/yuin/goldmark v1.5.3
9494
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87
9595
github.com/yuin/goldmark-meta v1.1.0
9696
go.jolheiser.com/hcaptcha v0.0.4
9797
go.jolheiser.com/pwn v0.0.3
9898
golang.org/x/crypto v0.4.0
99-
golang.org/x/net v0.3.0
100-
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
99+
golang.org/x/net v0.4.0
100+
golang.org/x/oauth2 v0.3.0
101101
golang.org/x/sys v0.3.0
102102
golang.org/x/text v0.5.0
103103
golang.org/x/tools v0.1.12
@@ -113,12 +113,12 @@ require (
113113
require (
114114
cloud.google.com/go/compute v1.7.0 // indirect
115115
git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
116-
github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
116+
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
117117
github.com/Masterminds/goutils v1.1.1 // indirect
118118
github.com/Masterminds/semver/v3 v3.1.1 // indirect
119119
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
120120
github.com/Microsoft/go-winio v0.6.0 // indirect
121-
github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad // indirect
121+
github.com/ProtonMail/go-crypto v0.0.0-20230109192245-7efeeb08f296 // indirect
122122
github.com/RoaringBitmap/roaring v1.2.1 // indirect
123123
github.com/acomagu/bufpipe v1.0.3 // indirect
124124
github.com/andybalholm/brotli v1.0.4 // indirect
@@ -128,21 +128,21 @@ require (
128128
github.com/aymerick/douceur v0.2.0 // indirect
129129
github.com/beorn7/perks v1.0.1 // indirect
130130
github.com/bits-and-blooms/bitset v1.3.3 // indirect
131-
github.com/blevesearch/bleve_index_api v1.0.4 // indirect
132-
github.com/blevesearch/geo v0.1.15 // indirect
131+
github.com/blevesearch/bleve_index_api v1.0.5 // indirect
132+
github.com/blevesearch/geo v0.1.16 // indirect
133133
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
134134
github.com/blevesearch/gtreap v0.1.1 // indirect
135135
github.com/blevesearch/mmap-go v1.0.4 // indirect
136-
github.com/blevesearch/scorch_segment_api/v2 v2.1.3 // indirect
137-
github.com/blevesearch/segment v0.9.0 // indirect
136+
github.com/blevesearch/scorch_segment_api/v2 v2.1.4 // indirect
137+
github.com/blevesearch/segment v0.9.1 // indirect
138138
github.com/blevesearch/snowballstem v0.9.0 // indirect
139-
github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect
139+
github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
140140
github.com/blevesearch/vellum v1.0.9 // indirect
141-
github.com/blevesearch/zapx/v11 v11.3.6 // indirect
142-
github.com/blevesearch/zapx/v12 v12.3.6 // indirect
143-
github.com/blevesearch/zapx/v13 v13.3.6 // indirect
144-
github.com/blevesearch/zapx/v14 v14.3.6 // indirect
145-
github.com/blevesearch/zapx/v15 v15.3.6 // indirect
141+
github.com/blevesearch/zapx/v11 v11.3.7 // indirect
142+
github.com/blevesearch/zapx/v12 v12.3.7 // indirect
143+
github.com/blevesearch/zapx/v13 v13.3.7 // indirect
144+
github.com/blevesearch/zapx/v14 v14.3.7 // indirect
145+
github.com/blevesearch/zapx/v15 v15.3.8 // indirect
146146
github.com/boombuler/barcode v1.0.1 // indirect
147147
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
148148
github.com/cespare/xxhash/v2 v2.1.2 // indirect
@@ -157,7 +157,7 @@ require (
157157
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
158158
github.com/felixge/httpsnoop v1.0.3 // indirect
159159
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
160-
github.com/go-ap/errors v0.0.0-20220917143055-4283ea5dae18 // indirect
160+
github.com/go-ap/errors v0.0.0-20221205040414-01c1adfc98ea // indirect
161161
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
162162
github.com/go-enry/go-oniguruma v1.2.1 // indirect
163163
github.com/go-git/gcfg v1.5.0 // indirect
@@ -185,8 +185,10 @@ require (
185185
github.com/gorilla/handlers v1.5.1 // indirect
186186
github.com/gorilla/mux v1.8.0 // indirect
187187
github.com/gorilla/securecookie v1.1.1 // indirect
188+
github.com/hashicorp/errwrap v1.0.0 // indirect
188189
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
189-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
190+
github.com/hashicorp/go-multierror v1.1.1 // indirect
191+
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
190192
github.com/hashicorp/hcl v1.0.0 // indirect
191193
github.com/imdario/mergo v0.3.13 // indirect
192194
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -219,17 +221,19 @@ require (
219221
github.com/pelletier/go-toml v1.9.5 // indirect
220222
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
221223
github.com/pierrec/lz4/v4 v4.1.17 // indirect
224+
github.com/pjbgf/sha1cd v0.2.3 // indirect
222225
github.com/pmezard/go-difflib v1.0.0 // indirect
223-
github.com/prometheus/client_model v0.2.0 // indirect
226+
github.com/prometheus/client_model v0.3.0 // indirect
224227
github.com/prometheus/common v0.37.0 // indirect
225228
github.com/prometheus/procfs v0.8.0 // indirect
226-
github.com/rivo/uniseg v0.4.2 // indirect
229+
github.com/rivo/uniseg v0.4.3 // indirect
227230
github.com/rogpeppe/go-internal v1.9.0 // indirect
228231
github.com/rs/xid v1.4.0 // indirect
229232
github.com/russross/blackfriday/v2 v2.1.0 // indirect
230233
github.com/shopspring/decimal v1.2.0 // indirect
231234
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
232235
github.com/sirupsen/logrus v1.9.0 // indirect
236+
github.com/skeema/knownhosts v1.1.0 // indirect
233237
github.com/spf13/afero v1.8.2 // indirect
234238
github.com/spf13/cast v1.5.0 // indirect
235239
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -238,21 +242,21 @@ require (
238242
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
239243
github.com/subosito/gotenv v1.3.0 // indirect
240244
github.com/toqueteos/webbrowser v1.2.0 // indirect
241-
github.com/ulikunitz/xz v0.5.10 // indirect
245+
github.com/ulikunitz/xz v0.5.11 // indirect
242246
github.com/unknwon/com v1.0.1 // indirect
243-
github.com/valyala/fastjson v1.6.3 // indirect
247+
github.com/valyala/fastjson v1.6.4 // indirect
244248
github.com/x448/float16 v0.8.4 // indirect
245-
github.com/xanzy/ssh-agent v0.3.2 // indirect
246-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
249+
github.com/xanzy/ssh-agent v0.3.3 // indirect
250+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
247251
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
248252
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
249253
go.etcd.io/bbolt v1.3.6 // indirect
250254
go.mongodb.org/mongo-driver v1.10.1 // indirect
251255
go.uber.org/atomic v1.10.0 // indirect
252-
go.uber.org/multierr v1.8.0 // indirect
253-
go.uber.org/zap v1.23.0 // indirect
254-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
255-
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
256+
go.uber.org/multierr v1.9.0 // indirect
257+
go.uber.org/zap v1.24.0 // indirect
258+
golang.org/x/mod v0.7.0 // indirect
259+
golang.org/x/time v0.3.0 // indirect
256260
google.golang.org/appengine v1.6.7 // indirect
257261
google.golang.org/protobuf v1.28.1 // indirect
258262
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect

0 commit comments

Comments
 (0)