Skip to content

Commit 258382e

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated licenses and gitignores Update documents to fix some links (go-gitea#26885) clarify aspects of the dump command (go-gitea#26887) Relocate the `RSS user feed` button (go-gitea#26882) Use Go 1.21 and update dependencies (go-gitea#26878) Update docs about attachment path (go-gitea#26883) Refactor "shortsha" (go-gitea#26877) Fix wrong review requested number (go-gitea#26784) Refactor `og:description` to limit the max length (go-gitea#26876) Reorder blocks in vue SFCs (go-gitea#26874) Make it posible to customize nav text color via css var (go-gitea#26807) Enable djlint H008 and fix issues (go-gitea#26869) Improve opengraph previews (go-gitea#26851) Add more descriptive error on forgot password page (go-gitea#26848) Allow users with write permissions for issues to add attachments with API (go-gitea#26837) Move licenses.txt to /assets directory (go-gitea#26866) # Conflicts: # templates/base/footer_content.tmpl
2 parents 92a4a33 + a38cf86 commit 258382e

Some content is hidden

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

60 files changed

+917
-943
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ cpu.out
7575
/public/assets/js
7676
/public/assets/css
7777
/public/assets/fonts
78+
/public/assets/licenses.txt
7879
/public/assets/img/webpack
7980
/vendor
8081
/web_src/fomantic/node_modules

cmd/dump.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ It can be used for backup and capture Gitea server image to send to maintainer`,
128128
&cli.StringFlag{
129129
Name: "database",
130130
Aliases: []string{"d"},
131-
Usage: "Specify the database SQL syntax",
131+
Usage: "Specify the database SQL syntax: sqlite3, mysql, mssql, postgres",
132132
},
133133
&cli.BoolFlag{
134134
Name: "skip-repository",

custom/conf/app.example.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,8 +1824,9 @@ LEVEL = Info
18241824
;; Currently, only `minio` is supported.
18251825
;SERVE_DIRECT = false
18261826
;;
1827-
;; Path for attachments. Defaults to `data/attachments` only available when STORAGE_TYPE is `local`
1828-
;PATH = data/attachments
1827+
;; Path for attachments. Defaults to `attachments`. Only available when STORAGE_TYPE is `local`
1828+
;; Relative paths will be resolved to `${AppDataPath}/${attachment.PATH}`
1829+
;PATH = attachments
18291830
;;
18301831
;; Minio endpoint to connect only available when STORAGE_TYPE is `minio`
18311832
;MINIO_ENDPOINT = localhost:9000

docs/content/administration/command-line.en-us.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ in the current directory.
334334
- `--skip-attachment-data`: Skip dumping of attachment data. Optional.
335335
- `--skip-package-data`: Skip dumping of package data. Optional.
336336
- `--skip-log`: Skip dumping of log data. Optional.
337-
- `--database`, `-d`: Specify the database SQL syntax. Optional.
337+
- `--database`, `-d`: Specify the database SQL syntax. Optional (supported arguments: sqlite3, mysql, mssql, postgres).
338338
- `--verbose`, `-V`: If provided, shows additional details. Optional.
339-
- `--type`: Set the dump output format. Optional. (default: zip)
339+
- `--type`: Set the dump output format. Optional. (formats: zip, tar, tar.sz, tar.gz, tar.xz, tar.bz2, tar.br, tar.lz4, tar.zst default: zip).
340340
- Examples:
341341
- `gitea dump`
342342
- `gitea dump --verbose`

docs/content/administration/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ Default templates for project boards:
822822
- `MAX_FILES`: **5**: Maximum number of attachments that can be uploaded at once.
823823
- `STORAGE_TYPE`: **local**: Storage type for attachments, `local` for local disk or `minio` for s3 compatible object storage service, default is `local` or other name defined with `[storage.xxx]`
824824
- `SERVE_DIRECT`: **false**: Allows the storage driver to redirect to authenticated URLs to serve files directly. Currently, only Minio/S3 is supported via signed URLs, local does nothing.
825-
- `PATH`: **data/attachments**: Path to store attachments only available when STORAGE_TYPE is `local`
825+
- `PATH`: **attachments**: Path to store attachments only available when STORAGE_TYPE is `local`, relative paths will be resolved to `${AppDataPath}/${attachment.PATH}`.
826826
- `MINIO_ENDPOINT`: **localhost:9000**: Minio endpoint to connect only available when STORAGE_TYPE is `minio`
827827
- `MINIO_ACCESS_KEY_ID`: Minio accessKeyID to connect only available when STORAGE_TYPE is `minio`
828828
- `MINIO_SECRET_ACCESS_KEY`: Minio secretAccessKey to connect only available when STORAGE_TYPE is `minio`

docs/content/administration/config-cheat-sheet.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ Gitea 创建以下非唯一队列:
788788
- `MAX_FILES`: **5**: 一次最多上传的附件数量。
789789
- `STORAGE_TYPE`: **local**: 附件的存储类型,`local` 表示本地磁盘,`minio` 表示兼容 S3 的对象存储服务,如果未设置将使用默认值 `local` 或其他在 `[storage.xxx]` 中定义的名称。
790790
- `SERVE_DIRECT`: **false**: 允许存储驱动器重定向到经过身份验证的 URL 以直接提供文件。目前,只支持 Minio/S3 通过签名 URL 提供支持,local 不会执行任何操作。
791-
- `PATH`: **data/attachments**: 存储附件的路径,仅当 STORAGE_TYPE 为 `local` 时可用。
791+
- `PATH`: **attachments**: 存储附件的路径,仅当 STORAGE_TYPE 为 `local` 时可用。如果是相对路径,将会被解析为 `${AppDataPath}/${attachment.PATH}`.
792792
- `MINIO_ENDPOINT`: **localhost:9000**: Minio 端点以连接,仅当 STORAGE_TYPE 为 `minio` 时可用。
793793
- `MINIO_ACCESS_KEY_ID`: Minio accessKeyID 以连接,仅当 STORAGE_TYPE 为 `minio` 时可用。
794794
- `MINIO_SECRET_ACCESS_KEY`: Minio secretAccessKey 以连接,仅当 STORAGE_TYPE 为 `minio` 时可用。

docs/content/administration/external-renderers.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ it is just a matter of:
2424
- add some configuration to your `app.ini` file
2525
- restart your Gitea instance
2626

27-
This supports rendering of whole files. If you want to render code blocks in markdown you would need to do something with javascript. See some examples on the [Customizing Gitea](../customizing-gitea) page.
27+
This supports rendering of whole files. If you want to render code blocks in markdown you would need to do something with javascript. See some examples on the [Customizing Gitea](administration/customizing-gitea.md) page.
2828

2929
## Installing external binaries
3030

docs/content/administration/https-support.en-us.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ KEY_FILE = key.pem
3636
```
3737

3838
Note that if your certificate is signed by a third party certificate authority (i.e. not self-signed), then cert.pem should contain the certificate chain. The server certificate must be the first entry in cert.pem, followed by the intermediaries in order (if any). The root certificate does not have to be included because the connecting client must already have it in order to estalbish the trust relationship.
39-
To learn more about the config values, please checkout the [Config Cheat Sheet](../config-cheat-sheet#server-server).
39+
To learn more about the config values, please checkout the [Config Cheat Sheet](administration/config-cheat-sheet.md#server-server).
4040

4141
For the `CERT_FILE` or `KEY_FILE` field, the file path is relative to the `GITEA_CUSTOM` environment variable when it is a relative path. It can be an absolute path as well.
4242

@@ -85,11 +85,11 @@ ACME_DIRECTORY=https
8585
8686
```
8787

88-
To learn more about the config values, please checkout the [Config Cheat Sheet](../config-cheat-sheet#server-server).
88+
To learn more about the config values, please checkout the [Config Cheat Sheet](administration/config-cheat-sheet.md#server-server).
8989

9090
## Using a reverse proxy
9191

92-
Setup up your reverse proxy as shown in the [reverse proxy guide](../reverse-proxies).
92+
Setup up your reverse proxy as shown in the [reverse proxy guide](administration/reverse-proxies.md).
9393

9494
After that, enable HTTPS by following one of these guides:
9595

docs/content/administration/https-support.zh-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ ACME_DIRECTORY=https
8282
8383
```
8484

85-
要了解关于配置, 请访问 [配置备忘单](../config-cheat-sheet#server-server)获取更多信息
85+
要了解关于配置, 请访问 [配置备忘单](administration/config-cheat-sheet.md#server-server)获取更多信息
8686

8787
## 使用反向代理服务器
8888

89-
按照 [reverse proxy guide](../reverse-proxies) 的规则设置你的反向代理服务器
89+
按照 [reverse proxy guide](administration/reverse-proxies.md) 的规则设置你的反向代理服务器
9090

9191
然后,按照下面的向导启用 HTTPS:
9292

docs/content/usage/labels.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ menu:
2727

2828
标签具有必填的名称和颜色,可选的描述,以及必须是独占的或非独占的(见下面的“作用域标签”)。
2929

30-
当您创建一个仓库时,可以通过使用 `工单标签(Issue Labels)` 选项来选择标签集。该选项列出了一些在您的实例上 [全局配置的可用标签集](../administration/customizing-gitea/#labels)。在创建仓库时,这些标签也将被创建。
30+
当您创建一个仓库时,可以通过使用 `工单标签(Issue Labels)` 选项来选择标签集。该选项列出了一些在您的实例上 [全局配置的可用标签集](administration/customizing-gitea.md#labels)。在创建仓库时,这些标签也将被创建。
3131

3232
## 作用域标签
3333

docs/content/usage/linked-references.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Sometimes a commit or pull request may fix or bring back a problem documented
9494
in a particular issue. Gitea supports closing and reopening the referenced
9595
issues by preceding the reference with a particular _keyword_. Common keywords
9696
include "closes", "fixes", "reopens", etc. This list can be
97-
[customized]({{< ref "doc/administration/config-cheat-sheet.en-us.md" >}}) by the
97+
[customized](administration/config-cheat-sheet.md) by the
9898
site administrator.
9999

100100
Example:

docs/content/usage/linked-references.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ menu:
6666

6767
## 可操作的引用在合并请求和提交消息中
6868

69-
有时,一个提交或合并请求可能会修复或重新出现在某个特定工单中。Gitea 支持在引用之前加上特定的“关键字”来关闭和重新打开被引用的工单。常见的关键字包括“closes”、“fixes”、“reopens”等。这个列表可以由站点管理员进行 [自定义]({{< ref "doc/administration/config-cheat-sheet.zh-cn.md" >}})。
69+
有时,一个提交或合并请求可能会修复或重新出现在某个特定工单中。Gitea 支持在引用之前加上特定的“关键字”来关闭和重新打开被引用的工单。常见的关键字包括“closes”、“fixes”、“reopens”等。这个列表可以由站点管理员进行 [自定义](administration/config-cheat-sheet.md)
7070

7171
示例:
7272

docs/content/usage/multi-factor-authentication.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2023-08-22T14:21:00+08:00"
3-
title: "Usage: Multi-factor Authentication (MFA)"
3+
title: "Multi-factor Authentication (MFA)"
44
slug: "multi-factor-authentication"
55
weight: 15
66
toc: false

docs/content/usage/pull-request.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ The first value of the list will be used in helpers.
6666

6767
## Pull Request Templates
6868

69-
You can find more information about pull request templates at the page [Issue and Pull Request templates](issue-pull-request-templates).
69+
You can find more information about pull request templates at the page [Issue and Pull Request templates](usage/issue-pull-request-templates.md).

docs/content/usage/pull-request.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
6666

6767
## 合并请求模板
6868

69-
有关合并请求模板的更多信息请您移步 : [工单与合并请求模板](issue-pull-request-templates)
69+
有关合并请求模板的更多信息请您移步 : [工单与合并请求模板](usage/issue-pull-request-templates.md)

docs/content/usage/pull-request.zh-tw.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
3131

3232
## 合併請求範本
3333

34-
您可以在[問題與合併請求範本](issue-pull-request-templates)找到更多關於合併請求範本的資訊。
34+
您可以在[問題與合併請求範本](usage/issue-pull-request-templates.md)找到更多關於合併請求範本的資訊。

go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module code.gitea.io/gitea
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
code.gitea.io/actions-proto-go v0.3.1
@@ -22,7 +22,7 @@ require (
2222
github.com/blevesearch/bleve/v2 v2.3.9
2323
github.com/bufbuild/connect-go v1.10.0
2424
github.com/buildkite/terminal-to-html/v3 v3.9.1
25-
github.com/caddyserver/certmagic v0.19.1
25+
github.com/caddyserver/certmagic v0.19.2
2626
github.com/chi-middleware/proxy v1.1.1
2727
github.com/denisenkom/go-mssqldb v0.12.3
2828
github.com/dimiro1/reply v0.0.0-20200315094148-d0136a4c9e21
@@ -56,12 +56,12 @@ require (
5656
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
5757
github.com/golang-jwt/jwt/v5 v5.0.0
5858
github.com/google/go-github/v53 v53.2.0
59-
github.com/google/pprof v0.0.0-20230811205829-9131a7e9cc17
60-
github.com/google/uuid v1.3.0
59+
github.com/google/pprof v0.0.0-20230901174712-0191c66da455
60+
github.com/google/uuid v1.3.1
6161
github.com/gorilla/feeds v1.1.1
6262
github.com/gorilla/sessions v1.2.1
6363
github.com/hashicorp/go-version v1.6.0
64-
github.com/hashicorp/golang-lru/v2 v2.0.5
64+
github.com/hashicorp/golang-lru/v2 v2.0.6
6565
github.com/huandu/xstrings v1.4.0
6666
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
6767
github.com/jhillyerd/enmime v1.0.0
@@ -77,7 +77,7 @@ require (
7777
github.com/meilisearch/meilisearch-go v0.25.0
7878
github.com/mholt/archiver/v3 v3.5.1
7979
github.com/microcosm-cc/bluemonday v1.0.25
80-
github.com/minio/minio-go/v7 v7.0.61
80+
github.com/minio/minio-go/v7 v7.0.63
8181
github.com/minio/sha256-simd v1.0.1
8282
github.com/msteinert/pam v1.1.0
8383
github.com/nektos/act v0.2.48
@@ -89,7 +89,7 @@ require (
8989
github.com/pquerna/otp v1.4.0
9090
github.com/prometheus/client_golang v1.16.0
9191
github.com/quasoft/websspi v1.1.2
92-
github.com/redis/go-redis/v9 v9.0.5
92+
github.com/redis/go-redis/v9 v9.1.0
9393
github.com/robfig/cron/v3 v3.0.1
9494
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
9595
github.com/sassoftware/go-rpmutils v0.2.0
@@ -100,18 +100,18 @@ require (
100100
github.com/tstranex/u2f v1.0.0
101101
github.com/ulikunitz/xz v0.5.11
102102
github.com/urfave/cli/v2 v2.25.7
103-
github.com/xanzy/go-gitlab v0.90.0
103+
github.com/xanzy/go-gitlab v0.91.0
104104
github.com/xeipuuv/gojsonschema v1.2.0
105105
github.com/yohcop/openid-go v1.0.1
106-
github.com/yuin/goldmark v1.5.5
106+
github.com/yuin/goldmark v1.5.6
107107
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
108108
github.com/yuin/goldmark-meta v1.1.0
109109
golang.org/x/crypto v0.12.0
110110
golang.org/x/image v0.11.0
111111
golang.org/x/net v0.14.0
112112
golang.org/x/oauth2 v0.11.0
113-
golang.org/x/sys v0.11.0
114-
golang.org/x/text v0.12.0
113+
golang.org/x/sys v0.12.0
114+
golang.org/x/text v0.13.0
115115
golang.org/x/tools v0.12.0
116116
google.golang.org/grpc v1.57.0
117117
google.golang.org/protobuf v1.31.0
@@ -129,15 +129,15 @@ require (
129129
cloud.google.com/go/compute/metadata v0.2.3 // indirect
130130
dario.cat/mergo v1.0.0 // indirect
131131
git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
132-
github.com/ClickHouse/ch-go v0.58.0 // indirect
133-
github.com/ClickHouse/clickhouse-go/v2 v2.13.0 // indirect
132+
github.com/ClickHouse/ch-go v0.58.2 // indirect
133+
github.com/ClickHouse/clickhouse-go/v2 v2.13.4 // indirect
134134
github.com/DataDog/zstd v1.5.5 // indirect
135135
github.com/Masterminds/goutils v1.1.1 // indirect
136136
github.com/Masterminds/semver/v3 v3.2.1 // indirect
137137
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
138138
github.com/Microsoft/go-winio v0.6.1 // indirect
139-
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
140-
github.com/RoaringBitmap/roaring v1.3.0 // indirect
139+
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
140+
github.com/RoaringBitmap/roaring v1.5.0 // indirect
141141
github.com/acomagu/bufpipe v1.0.4 // indirect
142142
github.com/andybalholm/brotli v1.0.5 // indirect
143143
github.com/andybalholm/cascadia v1.3.2 // indirect
@@ -245,7 +245,7 @@ require (
245245
github.com/onsi/ginkgo v1.16.5 // indirect
246246
github.com/onsi/gomega v1.27.8 // indirect
247247
github.com/paulmach/orb v0.10.0 // indirect
248-
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
248+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
249249
github.com/pierrec/lz4/v4 v4.1.18 // indirect
250250
github.com/pjbgf/sha1cd v0.3.0 // indirect
251251
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -273,7 +273,7 @@ require (
273273
github.com/toqueteos/webbrowser v1.2.0 // indirect
274274
github.com/unknwon/com v1.0.1 // indirect
275275
github.com/valyala/bytebufferpool v1.0.0 // indirect
276-
github.com/valyala/fasthttp v1.48.0 // indirect
276+
github.com/valyala/fasthttp v1.49.0 // indirect
277277
github.com/valyala/fastjson v1.6.4 // indirect
278278
github.com/x448/float16 v0.8.4 // indirect
279279
github.com/xanzy/ssh-agent v0.3.3 // indirect
@@ -284,16 +284,16 @@ require (
284284
github.com/zeebo/blake3 v0.2.3 // indirect
285285
go.etcd.io/bbolt v1.3.7 // indirect
286286
go.mongodb.org/mongo-driver v1.12.1 // indirect
287-
go.opentelemetry.io/otel v1.16.0 // indirect
288-
go.opentelemetry.io/otel/trace v1.16.0 // indirect
287+
go.opentelemetry.io/otel v1.17.0 // indirect
288+
go.opentelemetry.io/otel/trace v1.17.0 // indirect
289289
go.uber.org/atomic v1.11.0 // indirect
290290
go.uber.org/multierr v1.11.0 // indirect
291291
go.uber.org/zap v1.25.0 // indirect
292292
golang.org/x/mod v0.12.0 // indirect
293293
golang.org/x/sync v0.3.0 // indirect
294294
golang.org/x/time v0.3.0 // indirect
295295
google.golang.org/appengine v1.6.7 // indirect
296-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
296+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
297297
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
298298
gopkg.in/warnings.v0 v0.1.2 // indirect
299299
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)