Skip to content

Commit b5c792f

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix actions when tagging (go-gitea#28061) Fix comment permissions (go-gitea#28213) Docs: Replace deprecated IS_TLS_ENABLED mailer setting in email setup (go-gitea#28205) Fix delete-orphaned-repos (go-gitea#28200) Refactor graceful manager to use shared code (go-gitea#28073) Fix some incorrect links in docs (go-gitea#28191) Remove workaround in disk-clean.yml (go-gitea#28195)
2 parents b32754c + 763938e commit b5c792f

Some content is hidden

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

49 files changed

+554
-306
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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:

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+
有关所有选项的完整列表,请查看[配置速查表](doc/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/help/faq.en-us.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ If a bug fix is targeted on 1.20.1 but 1.20.1 is not released yet, you can get t
3939

4040
To migrate from Gogs to Gitea:
4141

42-
- [Gogs version 0.9.146 or less](installation/upgrade-from-gogs.md)
4342
- [Gogs version 0.11.46.0418](https://github.com/go-gitea/gitea/issues/4286)
4443

4544
To migrate from GitHub to Gitea, you can use Gitea's built-in migration form.

docs/content/help/faq.zh-cn.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ menu:
4141

4242
要从Gogs迁移到Gitea:
4343

44-
- [Gogs版本0.9.146或更低](installation/upgrade-from-gogs.md)
4544
- [Gogs版本0.11.46.0418](https://github.com/go-gitea/gitea/issues/4286)
4645

4746
要从GitHub迁移到Gitea,您可以使用Gitea内置的迁移表单。

docs/content/usage/actions/act-runner.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ If you cannot see the settings page, please make sure that you have the right pe
114114

115115
The format of the registration token is a random string `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`.
116116

117-
A registration token can also be obtained from the gitea [command-line interface](../../administration/command-line.en-us.md#actions-generate-runner-token):
117+
A registration token can also be obtained from the gitea [command-line interface](../../administration/command-line.md#actions-generate-runner-token):
118118

119119
```
120120
gitea --config /etc/gitea/app.ini actions generate-runner-token

docs/content/usage/actions/act-runner.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Runner级别决定了从哪里获取注册令牌。
113113

114114
注册令牌的格式是一个随机字符串 `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`
115115

116-
注册令牌也可以通过 Gitea 的 [命令行](../../administration/command-line.en-us.md#actions-generate-runner-token) 获得:
116+
注册令牌也可以通过 Gitea 的 [命令行](../../administration/command-line.md#actions-generate-runner-token) 获得:
117117

118118
### 注册Runner
119119

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ administrative user.
198198
field is set to `mail.com`, then Gitea will expect the `user email` field
199199
for an authenticated GIT instance to be `[email protected]`.[^2]
200200

201-
**Note**: PAM support is added via [build-time flags](installation/install-from-source.md#build),
201+
**Note**: PAM support is added via [build-time flags](installation/from-source.md#build),
202202
and the official binaries provided do not have this enabled. PAM requires that
203203
the necessary libpam dynamic library be available and the necessary PAM
204204
development headers be accessible to the compiler.

0 commit comments

Comments
 (0)