Skip to content

Commit 2aebffc

Browse files
authored
Merge branch 'main' into fix-21250
2 parents 3069ff1 + 8765f13 commit 2aebffc

File tree

91 files changed

+1828
-1018
lines changed

Some content is hidden

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

91 files changed

+1828
-1018
lines changed

cmd/web.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func setPort(port string) error {
203203
defaultLocalURL += ":" + setting.HTTPPort + "/"
204204

205205
// Save LOCAL_ROOT_URL if port changed
206-
setting.CreateOrAppendToCustomConf(func(cfg *ini.File) {
206+
setting.CreateOrAppendToCustomConf("server.LOCAL_ROOT_URL", func(cfg *ini.File) {
207207
cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
208208
})
209209
}

custom/conf/app.example.ini

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,14 +379,19 @@ LOG_SQL = false ; if unset defaults to true
379379
;; Whether the installer is disabled (set to true to disable the installer)
380380
INSTALL_LOCK = false
381381
;;
382-
;; Global secret key that will be used - if blank will be regenerated.
382+
;; Global secret key that will be used
383+
;; This key is VERY IMPORTANT. If you lose it, the data encrypted by it (like 2FA secret) can't be decrypted anymore.
383384
SECRET_KEY =
384385
;;
386+
;; Alternative location to specify secret key, instead of this file; you cannot specify both this and SECRET_KEY, and must pick one
387+
;; This key is VERY IMPORTANT. If you lose it, the data encrypted by it (like 2FA secret) can't be decrypted anymore.
388+
;SECRET_KEY_URI = file:/etc/gitea/secret_key
389+
;;
385390
;; Secret used to validate communication within Gitea binary.
386391
INTERNAL_TOKEN=
387392
;;
388-
;; Instead of defining internal token in the configuration, this configuration option can be used to give Gitea a path to a file that contains the internal token (example value: file:/etc/gitea/internal_token)
389-
;INTERNAL_TOKEN_URI = ;e.g. /etc/gitea/internal_token
393+
;; Alternative location to specify internal token, instead of this file; you cannot specify both this and INTERNAL_TOKEN, and must pick one
394+
;INTERNAL_TOKEN_URI = file:/etc/gitea/internal_token
390395
;;
391396
;; How long to remember that a user is logged in before requiring relogin (in days)
392397
;LOGIN_REMEMBER_DAYS = 7
@@ -882,7 +887,7 @@ ROUTER = console
882887
;USE_COMPAT_SSH_URI = false
883888
;;
884889
;; Close issues as long as a commit on any branch marks it as fixed
885-
;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki
890+
;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects
886891
;DISABLED_REPO_UNITS =
887892
;;
888893
;; Comma separated list of default repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects.

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,8 @@ Certain queues have defaults that override the defaults set in `[queue]` (this o
494494
## Security (`security`)
495495

496496
- `INSTALL_LOCK`: **false**: Controls access to the installation page. When set to "true", the installation page is not accessible.
497-
- `SECRET_KEY`: **\<random at every install\>**: Global secret key. This should be changed.
497+
- `SECRET_KEY`: **\<random at every install\>**: Global secret key. This key is VERY IMPORTANT, if you lost it, the data encrypted by it (like 2FA secret) can't be decrypted anymore.
498+
- `SECRET_KEY_URI`: **<empty>**: Instead of defining SECRET_KEY, this option can be used to use the key stored in a file (example value: `file:/etc/gitea/secret_key`). It shouldn't be lost like SECRET_KEY.
498499
- `LOGIN_REMEMBER_DAYS`: **7**: Cookie lifetime, in days.
499500
- `COOKIE_USERNAME`: **gitea\_awesome**: Name of the cookie used to store the current username.
500501
- `COOKIE_REMEMBER_NAME`: **gitea\_incredible**: Name of cookie used to store authentication
@@ -520,7 +521,7 @@ Certain queues have defaults that override the defaults set in `[queue]` (this o
520521
- `ONLY_ALLOW_PUSH_IF_GITEA_ENVIRONMENT_SET`: **true**: Set to `false` to allow local users to push to gitea-repositories without setting up the Gitea environment. This is not recommended and if you want local users to push to Gitea repositories you should set the environment appropriately.
521522
- `IMPORT_LOCAL_PATHS`: **false**: Set to `false` to prevent all users (including admin) from importing local path on server.
522523
- `INTERNAL_TOKEN`: **\<random at every install if no uri set\>**: Secret used to validate communication within Gitea binary.
523-
- `INTERNAL_TOKEN_URI`: **<empty>**: Instead of defining internal token in the configuration, this configuration option can be used to give Gitea a path to a file that contains the internal token (example value: `file:/etc/gitea/internal_token`)
524+
- `INTERNAL_TOKEN_URI`: **<empty>**: Instead of defining INTERNAL_TOKEN in the configuration, this configuration option can be used to give Gitea a path to a file that contains the internal token (example value: `file:/etc/gitea/internal_token`)
524525
- `PASSWORD_HASH_ALGO`: **pbkdf2**: The hash algorithm to use \[argon2, pbkdf2, scrypt, bcrypt\], argon2 will spend more memory than others.
525526
- `CSRF_COOKIE_HTTP_ONLY`: **true**: Set false to allow JavaScript to read CSRF cookie.
526527
- `MIN_PASSWORD_LENGTH`: **6**: Minimum password length for new users.

docs/content/doc/developers/guidelines-frontend.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ menu:
2121

2222
## Background
2323

24-
Gitea uses [Less CSS](https://lesscss.org), [Fomantic-UI](https://fomantic-ui.com/introduction/getting-started.html) (based on [jQuery](https://api.jquery.com)) and [Vue2](https://vuejs.org/v2/guide/) for its frontend.
24+
Gitea uses [Less CSS](https://lesscss.org), [Fomantic-UI](https://fomantic-ui.com/introduction/getting-started.html) (based on [jQuery](https://api.jquery.com)) and [Vue3](https://vuejs.org/) for its frontend.
2525

2626
The HTML pages are rendered by [Go HTML Template](https://pkg.go.dev/html/template).
2727

@@ -44,7 +44,7 @@ We recommend [Google HTML/CSS Style Guide](https://google.github.io/styleguide/h
4444
4. jQuery events across different features could use their own namespaces if there are potential conflicts.
4545
5. CSS styling for classes provided by frameworks should not be overwritten. Always use new class-names with 2-3 feature related keywords to overwrite framework styles.
4646
6. The backend can pass complex data to the frontend by using `ctx.PageData["myModuleData"] = map[]{}`
47-
7. Simple pages and SEO-related pages use Go HTML Template render to generate static Fomantic-UI HTML output. Complex pages can use Vue2 (or Vue3 in future).
47+
7. Simple pages and SEO-related pages use Go HTML Template render to generate static Fomantic-UI HTML output. Complex pages can use Vue3.
4848

4949
### Framework Usage
5050

@@ -97,6 +97,6 @@ However, there are still some special cases, so the current guideline is:
9797

9898
A lot of legacy code already existed before this document's written. It's recommended to refactor legacy code to follow the guidelines.
9999

100-
### Vue2/Vue3 and JSX
100+
### Vue3 and JSX
101101

102-
Gitea is using Vue2 now, we plan to upgrade to Vue3. We decided not to introduce JSX to keep the HTML and the JavaScript code separated.
102+
Gitea is using Vue3 now. We decided not to introduce JSX to keep the HTML and the JavaScript code separated.

docs/content/doc/help/faq.en-us.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ Our translations are currently crowd-sourced on our [Crowdin project](https://cr
214214

215215
Whether you want to change a translation or add a new one, it will need to be there as all translations are overwritten in our CI via the Crowdin integration.
216216

217-
## Hooks aren't running
217+
## Push Hook / Webhook aren't running
218218

219-
If Gitea is not running hooks, a common cause is incorrect setup of SSH keys.
219+
If you can push but can't see push activities on the home dashboard, or the push doesn't trigger webhook, there are a few possibilities:
220220

221-
See [SSH Issues](#ssh-issues) for more information.
222-
223-
You can also try logging into the administration panel and running the `Resynchronize pre-receive, update and post-receive hooks of all repositories.` option.
221+
1. The git hooks are out of sync: run "Resynchronize pre-receive, update and post-receive hooks of all repositories" on the site admin panel
222+
2. The git repositories (and hooks) are stored on some filesystems (ex: mounted by NAS) which don't support script execution, make sure the filesystem supports `chmod a+x any-script`
223+
3. If you are using docker, make sure Docker Server (not the client) >= 20.10.6
224224

225225
## SSH issues
226226

docs/content/doc/installation/from-binary.en-us.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ chown root:git /etc/gitea
9797
chmod 770 /etc/gitea
9898
```
9999

100-
**NOTE:** `/etc/gitea` is temporarily set with write permissions for user `git` so that the web installer can write the configuration file. After the installation is finished, it is recommended to set permissions to read-only using:
101-
102-
```sh
103-
chmod 750 /etc/gitea
104-
chmod 640 /etc/gitea/app.ini
105-
```
100+
> **NOTE:** `/etc/gitea` is temporarily set with write permissions for user `git` so that the web installer can write the configuration file. After the installation is finished, it is recommended to set permissions to read-only using:
101+
>
102+
> ```sh
103+
> chmod 750 /etc/gitea
104+
> chmod 640 /etc/gitea/app.ini
105+
> ```
106106
107107
If you don't want the web installer to be able to write to the config file, it is possible to make the config file read-only for the Gitea user (owner/group `root:git`, mode `0640`) however you will need to edit your config file manually to:
108108

docs/content/page/index.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ You can try it out using [the online demo](https://try.gitea.io/).
287287
- UI frameworks:
288288
- [jQuery](https://jquery.com)
289289
- [Fomantic UI](https://fomantic-ui.com)
290-
- [Vue2](https://vuejs.org)
290+
- [Vue3](https://vuejs.org)
291291
- and various components (see package.json)
292292
- Editors:
293293
- [CodeMirror](https://codemirror.net)

docs/content/page/index.fr-fr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ Le but de ce projet est de fournir de la manière la plus simple, la plus rapide
258258
- Interface graphique :
259259
- [jQuery](https://jquery.com)
260260
- [Fomantic UI](https://fomantic-ui.com)
261-
- [Vue2](https://vuejs.org)
261+
- [Vue3](https://vuejs.org)
262262
- [CodeMirror](https://codemirror.net)
263263
- [EasyMDE](https://github.com/Ionaru/easy-markdown-editor)
264264
- [Monaco Editor](https://microsoft.github.io/monaco-editor)

docs/content/page/index.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Gitea的首要目标是创建一个极易安装,运行非常快速,安装和
5252
- UI 框架:
5353
- [jQuery](https://jquery.com)
5454
- [Fomantic UI](https://fomantic-ui.com)
55-
- [Vue2](https://vuejs.org)
55+
- [Vue3](https://vuejs.org)
5656
- 更多组件参见 package.json
5757
- 编辑器:
5858
- [CodeMirror](https://codemirror.net)

docs/content/page/index.zh-tw.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ Gitea 是從 [Gogs](http://gogs.io) Fork 出來的,請閱讀部落格文章 [G
271271
- UI 元件:
272272
- [jQuery](https://jquery.com)
273273
- [Fomantic UI](https://fomantic-ui.com)
274-
- [Vue2](https://vuejs.org)
274+
- [Vue3](https://vuejs.org)
275275
- [CodeMirror](https://codemirror.net)
276276
- [EasyMDE](https://github.com/Ionaru/easy-markdown-editor)
277277
- [Monaco Editor](https://microsoft.github.io/monaco-editor)

go.mod

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ require (
1616
github.com/NYTimes/gziphandler v1.1.1
1717
github.com/PuerkitoBio/goquery v1.8.0
1818
github.com/alecthomas/chroma/v2 v2.3.0
19-
github.com/blevesearch/bleve/v2 v2.3.2
19+
github.com/blevesearch/bleve/v2 v2.3.4
2020
github.com/buildkite/terminal-to-html/v3 v3.7.0
21-
github.com/caddyserver/certmagic v0.17.0
21+
github.com/caddyserver/certmagic v0.17.2
2222
github.com/chi-middleware/proxy v1.1.1
2323
github.com/denisenkom/go-mssqldb v0.12.2
2424
github.com/djherbis/buffer v1.2.0
@@ -31,8 +31,8 @@ require (
3131
github.com/felixge/fgprof v0.9.3
3232
github.com/fsnotify/fsnotify v1.5.4
3333
github.com/gliderlabs/ssh v0.3.5
34-
github.com/go-ap/activitypub v0.0.0-20220706134811-0c84d76ce535
35-
github.com/go-ap/jsonld v0.0.0-20220615144122-1d862b15410d
34+
github.com/go-ap/activitypub v0.0.0-20220917143152-e4e7018838c0
35+
github.com/go-ap/jsonld v0.0.0-20220917142617-76bf51585778
3636
github.com/go-chi/chi/v5 v5.0.7
3737
github.com/go-chi/cors v1.2.1
3838
github.com/go-enry/go-enry/v2 v2.8.2
@@ -42,35 +42,35 @@ require (
4242
github.com/go-ldap/ldap/v3 v3.4.4
4343
github.com/go-redis/redis/v8 v8.11.5
4444
github.com/go-sql-driver/mysql v1.6.0
45-
github.com/go-swagger/go-swagger v0.30.0
45+
github.com/go-swagger/go-swagger v0.30.3
4646
github.com/go-testfixtures/testfixtures/v3 v3.8.1
4747
github.com/gobwas/glob v0.2.3
4848
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
4949
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
5050
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
5151
github.com/golang-jwt/jwt/v4 v4.4.2
52-
github.com/google/go-github/v45 v45.0.0
52+
github.com/google/go-github/v45 v45.2.0
5353
github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40
5454
github.com/google/uuid v1.3.0
5555
github.com/gorilla/feeds v1.1.1
5656
github.com/gorilla/sessions v1.2.1
57-
github.com/hashicorp/go-version v1.4.0
57+
github.com/hashicorp/go-version v1.6.0
5858
github.com/hashicorp/golang-lru v0.5.4
5959
github.com/huandu/xstrings v1.3.2
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.9
64+
github.com/klauspost/compress v1.15.11
6565
github.com/klauspost/cpuid/v2 v2.1.1
66-
github.com/lib/pq v1.10.6
66+
github.com/lib/pq v1.10.7
6767
github.com/markbates/goth v1.73.0
6868
github.com/mattn/go-isatty v0.0.16
69-
github.com/mattn/go-sqlite3 v1.14.13
69+
github.com/mattn/go-sqlite3 v1.14.15
7070
github.com/mholt/archiver/v3 v3.5.1
71-
github.com/microcosm-cc/bluemonday v1.0.19
72-
github.com/minio/minio-go/v7 v7.0.35
73-
github.com/msteinert/pam v1.0.0
71+
github.com/microcosm-cc/bluemonday v1.0.20
72+
github.com/minio/minio-go/v7 v7.0.39
73+
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
@@ -79,25 +79,25 @@ require (
7979
github.com/pquerna/otp v1.3.0
8080
github.com/prometheus/client_golang v1.13.0
8181
github.com/quasoft/websspi v1.1.2
82-
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0
82+
github.com/santhosh-tekuri/jsonschema/v5 v5.0.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.0
8686
github.com/syndtr/goleveldb v1.0.0
8787
github.com/tstranex/u2f v1.0.0
8888
github.com/unrolled/render v1.5.0
89-
github.com/urfave/cli v1.22.9
89+
github.com/urfave/cli v1.22.10
9090
github.com/xanzy/go-gitlab v0.73.1
9191
github.com/yohcop/openid-go v1.0.0
92-
github.com/yuin/goldmark v1.4.15
92+
github.com/yuin/goldmark v1.5.2
9393
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87
9494
github.com/yuin/goldmark-meta v1.1.0
9595
go.jolheiser.com/hcaptcha v0.0.4
9696
go.jolheiser.com/pwn v0.0.3
97-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
98-
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
99-
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
100-
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
97+
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
98+
golang.org/x/net v0.0.0-20220927171203-f486391704dc
99+
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
100+
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec
101101
golang.org/x/text v0.3.7
102102
golang.org/x/tools v0.1.12
103103
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -117,9 +117,9 @@ require (
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
120-
github.com/Microsoft/go-winio v0.5.2 // indirect
121-
github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 // indirect
122-
github.com/RoaringBitmap/roaring v0.9.4 // indirect
120+
github.com/Microsoft/go-winio v0.6.0 // indirect
121+
github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad // indirect
122+
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
125125
github.com/andybalholm/cascadia v1.3.1 // indirect
@@ -128,21 +128,22 @@ require (
128128
github.com/aymerick/douceur v0.2.0 // indirect
129129
github.com/beorn7/perks v1.0.1 // indirect
130130
github.com/bgentry/speakeasy v0.1.0 // indirect
131-
github.com/bits-and-blooms/bitset v1.2.2 // indirect
132-
github.com/blevesearch/bleve_index_api v1.0.1 // indirect
131+
github.com/bits-and-blooms/bitset v1.3.3 // indirect
132+
github.com/blevesearch/bleve_index_api v1.0.3 // indirect
133+
github.com/blevesearch/geo v0.1.14 // indirect
133134
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
134135
github.com/blevesearch/gtreap v0.1.1 // indirect
135-
github.com/blevesearch/mmap-go v1.0.3 // indirect
136-
github.com/blevesearch/scorch_segment_api/v2 v2.1.0 // indirect
136+
github.com/blevesearch/mmap-go v1.0.4 // indirect
137+
github.com/blevesearch/scorch_segment_api/v2 v2.1.2 // indirect
137138
github.com/blevesearch/segment v0.9.0 // indirect
138139
github.com/blevesearch/snowballstem v0.9.0 // indirect
139140
github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect
140-
github.com/blevesearch/vellum v1.0.7 // indirect
141-
github.com/blevesearch/zapx/v11 v11.3.3 // indirect
142-
github.com/blevesearch/zapx/v12 v12.3.3 // indirect
143-
github.com/blevesearch/zapx/v13 v13.3.3 // indirect
144-
github.com/blevesearch/zapx/v14 v14.3.3 // indirect
145-
github.com/blevesearch/zapx/v15 v15.3.3 // indirect
141+
github.com/blevesearch/vellum v1.0.8 // indirect
142+
github.com/blevesearch/zapx/v11 v11.3.5 // indirect
143+
github.com/blevesearch/zapx/v12 v12.3.5 // indirect
144+
github.com/blevesearch/zapx/v13 v13.3.5 // indirect
145+
github.com/blevesearch/zapx/v14 v14.3.5 // indirect
146+
github.com/blevesearch/zapx/v15 v15.3.5 // indirect
146147
github.com/boombuler/barcode v1.0.1 // indirect
147148
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
148149
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
@@ -167,7 +168,7 @@ require (
167168
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
168169
github.com/fullstorydev/grpcurl v1.8.1 // indirect
169170
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
170-
github.com/go-ap/errors v0.0.0-20220618122732-319f41ac54e1 // indirect
171+
github.com/go-ap/errors v0.0.0-20220917143055-4283ea5dae18 // indirect
171172
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
172173
github.com/go-enry/go-oniguruma v1.2.1 // indirect
173174
github.com/go-git/gcfg v1.5.0 // indirect
@@ -186,6 +187,7 @@ require (
186187
github.com/gogo/protobuf v1.3.2 // indirect
187188
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
188189
github.com/golang-sql/sqlexp v0.1.0 // indirect
190+
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
189191
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
190192
github.com/golang/mock v1.6.0 // indirect
191193
github.com/golang/protobuf v1.5.2 // indirect
@@ -219,7 +221,7 @@ require (
219221
github.com/magiconair/properties v1.8.6 // indirect
220222
github.com/mailru/easyjson v0.7.7 // indirect
221223
github.com/markbates/going v1.0.0 // indirect
222-
github.com/mattn/go-runewidth v0.0.13 // indirect
224+
github.com/mattn/go-runewidth v0.0.14 // indirect
223225
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
224226
github.com/mholt/acmez v1.0.4 // indirect
225227
github.com/miekg/dns v1.1.50 // indirect
@@ -237,12 +239,12 @@ require (
237239
github.com/olekukonko/tablewriter v0.0.5 // indirect
238240
github.com/pelletier/go-toml v1.9.5 // indirect
239241
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
240-
github.com/pierrec/lz4/v4 v4.1.15 // indirect
242+
github.com/pierrec/lz4/v4 v4.1.17 // indirect
241243
github.com/pmezard/go-difflib v1.0.0 // indirect
242244
github.com/prometheus/client_model v0.2.0 // indirect
243245
github.com/prometheus/common v0.37.0 // indirect
244246
github.com/prometheus/procfs v0.8.0 // indirect
245-
github.com/rivo/uniseg v0.3.4 // indirect
247+
github.com/rivo/uniseg v0.4.2 // indirect
246248
github.com/rogpeppe/go-internal v1.9.0 // indirect
247249
github.com/rs/xid v1.4.0 // indirect
248250
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -283,7 +285,7 @@ require (
283285
go.uber.org/multierr v1.8.0 // indirect
284286
go.uber.org/zap v1.23.0 // indirect
285287
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
286-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
288+
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
287289
google.golang.org/appengine v1.6.7 // indirect
288290
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
289291
google.golang.org/grpc v1.47.0 // indirect

0 commit comments

Comments
 (0)