Skip to content

Commit 3cf416d

Browse files
2 parents 0369dc4 + 49b98e4 commit 3cf416d

File tree

180 files changed

+1526
-1186
lines changed

Some content is hidden

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

180 files changed

+1526
-1186
lines changed

.github/workflows/disk-clean.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
# FIXME: https://github.com/jlumbroso/free-disk-space/issues/17
12-
- name: same as 'large-packages' but without 'google-cloud-sdk'
13-
shell: bash
14-
run: |
15-
sudo apt-get update
16-
sudo apt-get remove -y '^dotnet-.*' || true
17-
sudo apt-get remove -y '^llvm-.*' || true
18-
sudo apt-get remove -y 'php.*' || true
19-
sudo apt-get remove -y '^mongodb-.*' || true
20-
sudo apt-get remove -y '^mysql-.*' || true
21-
sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri || true
22-
sudo apt-get autoremove -y
23-
sudo apt-get clean
24-
env:
25-
DEBIAN_FRONTEND: noninteractive
2611
- name: Free Disk Space (Ubuntu)
2712
uses: jlumbroso/free-disk-space@main
2813
with:

.github/workflows/release-tag-rc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Get cleaned branch name
4545
id: clean_name
4646
run: |
47-
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
47+
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\/v//' -e 's/release\/v//')
4848
echo "Cleaned name is ${REF_NAME}"
4949
echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
5050
- name: configure aws
@@ -56,6 +56,10 @@ jobs:
5656
- name: upload binaries to s3
5757
run: |
5858
aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
59+
- name: Install GH CLI
60+
uses: dev-hanz-ops/[email protected]
61+
with:
62+
gh-cli-version: 2.39.1
5963
- name: create github release
6064
run: |
6165
gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/*

.github/workflows/release-tag-version.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Get cleaned branch name
4747
id: clean_name
4848
run: |
49-
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
49+
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\/v//' -e 's/release\/v//')
5050
echo "Cleaned name is ${REF_NAME}"
5151
echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
5252
- name: configure aws
@@ -58,9 +58,13 @@ jobs:
5858
- name: upload binaries to s3
5959
run: |
6060
aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
61+
- name: Install GH CLI
62+
uses: dev-hanz-ops/[email protected]
63+
with:
64+
gh-cli-version: 2.39.1
6165
- name: create github release
6266
run: |
63-
gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/*
67+
gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-from-tag dist/release/*
6468
env:
6569
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
6670
docker-rootful:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<img src="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main">
1111
</a>
1212
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
13-
<img src="https://img.shields.io/discord/322538954119184384.svg">
13+
<img src="https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2">
1414
</a>
1515
<a href="https://app.codecov.io/gh/go-gitea/gitea" title="Codecov">
1616
<img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">

cmd/admin_auth.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"text/tabwriter"
1010

1111
auth_model "code.gitea.io/gitea/models/auth"
12+
"code.gitea.io/gitea/models/db"
1213
auth_service "code.gitea.io/gitea/services/auth"
1314

1415
"github.com/urfave/cli/v2"
@@ -62,7 +63,7 @@ func runListAuth(c *cli.Context) error {
6263
return err
6364
}
6465

65-
authSources, err := auth_model.FindSources(ctx, auth_model.FindSourcesOptions{})
66+
authSources, err := db.Find[auth_model.Source](ctx, auth_model.FindSourcesOptions{})
6667
if err != nil {
6768
return err
6869
}

docs/content/administration/email-setup.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Please note: authentication is only supported when the SMTP server communication
6161

6262
- STARTTLS (also known as Opportunistic TLS) via port 587. Initial connection is done over cleartext, but then be upgraded over TLS if the server supports it.
6363
- SMTPS connection (SMTP over TLS) via the default port 465. Connection to the server use TLS from the beginning.
64-
- Forced SMTPS connection with `IS_TLS_ENABLED=true`. (These are both known as Implicit TLS.)
64+
- Forced SMTPS connection with `PROTOCOL=smtps`. (These are both known as Implicit TLS.)
6565
This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.
6666

6767
Note that Implicit TLS is recommended by [RFC8314](https://tools.ietf.org/html/rfc8314#section-3) since 2018.

docs/content/administration/email-setup.zh-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ PASSWD = `password`
5555

5656
要发送测试邮件以验证设置,请转到 Gitea > 站点管理 > 配置 > SMTP 邮件配置。
5757

58-
有关所有选项的完整列表,请查看[配置速查表](doc/administration/config-cheat-sheet.zh-cn.md)
58+
有关所有选项的完整列表,请查看[配置速查表](administration/config-cheat-sheet.md)
5959

6060
请注意:只有在使用 TLS 或 `HOST=localhost` 加密 SMTP 服务器通信时才支持身份验证。TLS 加密可以通过以下方式进行:
6161

6262
- 通过端口 587 的 STARTTLS(也称为 Opportunistic TLS)。初始连接是明文的,但如果服务器支持,则可以升级为 TLS。
6363
- 通过默认端口 465 的 SMTPS 连接。连接到服务器从一开始就使用 TLS。
64-
- 使用 `IS_TLS_ENABLED=true` 进行强制的 SMTPS 连接。(这两种方式都被称为 Implicit TLS)
64+
- 使用 `PROTOCOL=smtps` 进行强制的 SMTPS 连接。(这两种方式都被称为 Implicit TLS)
6565
这是由于 Go 内部库对 STRIPTLS 攻击的保护机制。
6666

6767
请注意,自2018年起,[RFC8314](https://tools.ietf.org/html/rfc8314#section-3) 推荐使用 Implicit TLS。

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CERT_FILE = cert.pem
3333
KEY_FILE = key.pem
3434
```
3535

36-
请注意,如果您的证书由第三方证书颁发机构签名(即不是自签名的),则 cert.pem 应包含证书链。服务器证书必须是 cert.pem 中的第一个条目,后跟中介(如果有)。不必包含根证书,因为连接客户端必须已经拥有根证书才能建立信任关系。要了解有关配置值的更多信息,请查看 [配置备忘单](../config-cheat-sheet#server-server)
36+
请注意,如果您的证书由第三方证书颁发机构签名(即不是自签名的),则 cert.pem 应包含证书链。服务器证书必须是 cert.pem 中的第一个条目,后跟中介(如果有)。不必包含根证书,因为连接客户端必须已经拥有根证书才能建立信任关系。要了解有关配置值的更多信息,请查看 [配置备忘单](administration/config-cheat-sheet#server-server)
3737

3838
对于“CERT_FILE”或“KEY_FILE”字段,当文件路径是相对路径时,文件路径相对于“GITEA_CUSTOM”环境变量。它也可以是绝对路径。
3939

docs/content/development/api-usage.en-us.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ menu:
1919

2020
## Enabling/configuring API access
2121

22-
By default, `ENABLE_SWAGGER` is true, and
23-
`MAX_RESPONSE_ITEMS` is set to 50. See [Config Cheat
24-
Sheet](administration/config-cheat-sheet.md) for more
25-
information.
22+
By default, `ENABLE_SWAGGER` is true, and `MAX_RESPONSE_ITEMS` is set to 50. See [Config Cheat Sheet](administration/config-cheat-sheet.md) for more information.
2623

2724
## Authentication
2825

docs/content/development/api-usage.zh-cn.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ menu:
1919

2020
## 开启/配置 API 访问
2121

22-
通常情况下, `ENABLE_SWAGGER` 默认开启并且参数 `MAX_RESPONSE_ITEMS` 默认为 50。您可以从 [Config Cheat
23-
Sheet](administration/config-cheat-sheet.md) 中获取更多配置相关信息。
22+
通常情况下, `ENABLE_SWAGGER` 默认开启并且参数 `MAX_RESPONSE_ITEMS` 默认为 50。您可以从 [Config Cheat Sheet](administration/config-cheat-sheet.md) 中获取更多配置相关信息。
2423

2524
## 通过 API 认证
2625

0 commit comments

Comments
 (0)