Skip to content

Commit 0369dc4

Browse files
Merge branch 'main' into feature-support-multi-rpm-dist
2 parents 3a27fe3 + 778d604 commit 0369dc4

File tree

359 files changed

+923
-673
lines changed

Some content is hidden

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

359 files changed

+923
-673
lines changed

.eslintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ rules:
128128
"@stylistic/js/computed-property-spacing": [2, never]
129129
"@stylistic/js/dot-location": [2, property]
130130
"@stylistic/js/eol-last": [2]
131-
"@stylistic/js/func-call-spacing": [2, never]
131+
"@stylistic/js/function-call-spacing": [2, never]
132132
"@stylistic/js/function-call-argument-newline": [0]
133133
"@stylistic/js/function-paren-newline": [0]
134134
"@stylistic/js/generator-star-spacing": [0]

CONTRIBUTING.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,20 @@ Some of the key points:
203203

204204
In the PR title, describe the problem you are fixing, not how you are fixing it. \
205205
Use the first comment as a summary of your PR. \
206-
In the PR summary, you can describe exactly how you are fixing this problem. \
206+
In the PR summary, you can describe exactly how you are fixing this problem.
207+
207208
Keep this summary up-to-date as the PR evolves. \
208209
If your PR changes the UI, you must add **after** screenshots in the PR summary. \
209-
If you are not implementing a new feature, you should also post **before** screenshots for comparison. \
210+
If you are not implementing a new feature, you should also post **before** screenshots for comparison.
211+
212+
If you are implementing a new feature, your PR will only be merged if your screenshots are up to date.\
213+
Furthermore, feature PRs will only be merged if their summary contains a clear usage description (understandable for users) and testing description (understandable for reviewers).
214+
You should strive to combine both into a single description.
215+
216+
Another requirement for merging PRs is that the PR is labeled correctly.\
217+
However, this is not your job as a contributor, but the job of the person merging your PR.\
218+
If you think that your PR was labeled incorrectly, or notice that it was merged without labels, please let us know.
219+
210220
If your PR closes some issues, you must note that in a way that both GitHub and Gitea understand, i.e. by appending a paragraph like
211221

212222
```text
@@ -255,13 +265,16 @@ Changing the default value of a setting or replacing the setting with another on
255265

256266
#### How to handle breaking PRs?
257267

258-
If your PR has a breaking change, you must add a `BREAKING` section to your PR summary, e.g.
268+
If your PR has a breaking change, you must add two things to the summary of your PR:
259269

260-
```
270+
1. A reasoning why this breaking change is necessary
271+
2. A `BREAKING` section explaining in simple terms (understandable for a typical user) how this PR affects users and how to mitigate these changes. This section can look for example like
272+
273+
```md
261274
## :warning: BREAKING :warning:
262275
```
263276

264-
To explain how this will affect users and how to mitigate these changes.
277+
Breaking PRs will not be merged as long as not both of these requirements are met.
265278

266279
### Maintaining open PRs
267280

custom/conf/app.example.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ LEVEL = Info
10171017
;ALLOWED_TYPES =
10181018
;;
10191019
;; Max size of each file in megabytes. Defaults to 50MB
1020-
;FILE_MAX_SIZE = 50
1020+
;FILE_MAX_SIZE = 50
10211021
;;
10221022
;; Max number of files per upload. Defaults to 5
10231023
;MAX_FILES = 5
@@ -2583,6 +2583,8 @@ LEVEL = Info
25832583
;ENDLESS_TASK_TIMEOUT = 3h
25842584
;; Timeout to cancel the jobs which have waiting status, but haven't been picked by a runner for a long time
25852585
;ABANDONED_JOB_TIMEOUT = 24h
2586+
;; Strings committers can place inside a commit message to skip executing the corresponding actions workflow
2587+
;SKIP_WORKFLOW_STRINGS = [skip ci],[ci skip],[no ci],[skip actions],[actions skip]
25862588

25872589
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
25882590
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
343343
- `SSH_AUTHORIZED_PRINCIPALS_ALLOW`: **off** or **username, email**: \[off, username, email, anything\]: Specify the principals values that users are allowed to use as principal. When set to `anything` no checks are done on the principal string. When set to `off` authorized principal are not allowed to be set.
344344
- `SSH_CREATE_AUTHORIZED_PRINCIPALS_FILE`: **false/true**: Gitea will create a authorized_principals file by default when it is not using the internal ssh server and `SSH_AUTHORIZED_PRINCIPALS_ALLOW` is not `off`.
345345
- `SSH_AUTHORIZED_PRINCIPALS_BACKUP`: **false/true**: Enable SSH Authorized Principals Backup when rewriting all keys, default is true if `SSH_AUTHORIZED_PRINCIPALS_ALLOW` is not `off`.
346-
- `SSH_AUTHORIZED_KEYS_COMMAND_TEMPLATE`: **{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}**: Set the template for the command to passed on authorized keys. Possible keys are: AppPath, AppWorkPath, CustomConf, CustomPath, Key - where Key is a `models/asymkey.PublicKey` and the others are strings which are shellquoted.
346+
- `SSH_AUTHORIZED_KEYS_COMMAND_TEMPLATE`: **`{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}`**: Set the template for the command to passed on authorized keys. Possible keys are: AppPath, AppWorkPath, CustomConf, CustomPath, Key - where Key is a `models/asymkey.PublicKey` and the others are strings which are shellquoted.
347347
- `SSH_SERVER_CIPHERS`: **[email protected], aes128-ctr, aes192-ctr, aes256-ctr, [email protected], [email protected]**: For the built-in SSH server, choose the ciphers to support for SSH connections, for system SSH this setting has no effect.
348348
- `SSH_SERVER_KEY_EXCHANGES`: **curve25519-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1**: For the built-in SSH server, choose the key exchange algorithms to support for SSH connections, for system SSH this setting has no effect.
349349
- `SSH_SERVER_MACS`: **[email protected], hmac-sha2-256, hmac-sha1**: For the built-in SSH server, choose the MACs to support for SSH connections, for system SSH this setting has no effect
@@ -1396,6 +1396,7 @@ PROXY_HOSTS = *.github.com
13961396
- `ZOMBIE_TASK_TIMEOUT`: **10m**: Timeout to stop the task which have running status, but haven't been updated for a long time
13971397
- `ENDLESS_TASK_TIMEOUT`: **3h**: Timeout to stop the tasks which have running status and continuous updates, but don't end for a long time
13981398
- `ABANDONED_JOB_TIMEOUT`: **24h**: Timeout to cancel the jobs which have waiting status, but haven't been picked by a runner for a long time
1399+
- `SKIP_WORKFLOW_STRINGS`: **[skip ci],[ci skip],[no ci],[skip actions],[actions skip]**: Strings committers can place inside a commit message to skip executing the corresponding actions workflow
13991400

14001401
`DEFAULT_ACTIONS_URL` indicates where the Gitea Actions runners should find the actions with relative path.
14011402
For example, `uses: actions/checkout@v3` means `https://github.com/actions/checkout@v3` since the value of `DEFAULT_ACTIONS_URL` is `github`.
@@ -1405,7 +1406,7 @@ Please note that using `self` is not recommended for most cases, as it could mak
14051406
Additionally, it requires you to mirror all the actions you need to your Gitea instance, which may not be worth it.
14061407
Therefore, please use `self` only if you understand what you are doing.
14071408

1408-
In earlier versions (<= 1.19), `DEFAULT_ACTIONS_URL` could be set to any custom URLs like `https://gitea.com` or `http://your-git-server,https://gitea.com`, and the default value was `https://gitea.com`.
1409+
In earlier versions (`<= 1.19`), `DEFAULT_ACTIONS_URL` could be set to any custom URLs like `https://gitea.com` or `http://your-git-server,https://gitea.com`, and the default value was `https://gitea.com`.
14091410
However, later updates removed those options, and now the only options are `github` and `self`, with the default value being `github`.
14101411
However, if you want to use actions from other git server, you can use a complete URL in `uses` field, it's supported by Gitea (but not GitHub).
14111412
Like `uses: https://gitea.com/actions/checkout@v3` or `uses: http://your-git-server/actions/checkout@v3`.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ menu:
335335
- `SSH_AUTHORIZED_PRINCIPALS_ALLOW`: **off****username, email**\[off, username, email, anything\]:指定允许用户用作 principal 的值。当设置为 `anything` 时,对 principal 字符串不执行任何检查。当设置为 `off` 时,不允许设置授权的 principal。
336336
- `SSH_CREATE_AUTHORIZED_PRINCIPALS_FILE`: **false/true**:当 Gitea 不使用内置 SSH 服务器且 `SSH_AUTHORIZED_PRINCIPALS_ALLOW` 不为 `off` 时,默认情况下 Gitea 会创建一个 authorized_principals 文件。
337337
- `SSH_AUTHORIZED_PRINCIPALS_BACKUP`: **false/true**:在重写所有密钥时启用 SSH 授权 principal 备份,默认值为 true(如果 `SSH_AUTHORIZED_PRINCIPALS_ALLOW` 不为 `off`)。
338-
- `SSH_AUTHORIZED_KEYS_COMMAND_TEMPLATE`: **{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}**:设置用于传递授权密钥的命令模板。可能的密钥是:AppPath、AppWorkPath、CustomConf、CustomPath、Key,其中 Key 是 `models/asymkey.PublicKey`,其他是 shellquoted 字符串。
338+
- `SSH_AUTHORIZED_KEYS_COMMAND_TEMPLATE`: **`{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}`**:设置用于传递授权密钥的命令模板。可能的密钥是:AppPath、AppWorkPath、CustomConf、CustomPath、Key,其中 Key 是 `models/asymkey.PublicKey`,其他是 shellquoted 字符串。
339339
- `SSH_SERVER_CIPHERS`: **[email protected], aes128-ctr, aes192-ctr, aes256-ctr, [email protected], [email protected]**:对于内置的 SSH 服务器,选择支持的 SSH 连接的加密方法,对于系统 SSH,此设置无效。
340340
- `SSH_SERVER_KEY_EXCHANGES`: **curve25519-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1**:对于内置 SSH 服务器,选择支持的 SSH 连接的密钥交换算法,对于系统 SSH,此设置无效。
341341
- `SSH_SERVER_MACS`: **[email protected], hmac-sha2-256, hmac-sha1**:对于内置 SSH 服务器,选择支持的 SSH 连接的 MAC 算法,对于系统 SSH,此设置无效。
@@ -1343,7 +1343,7 @@ PROXY_HOSTS = *.github.com
13431343
此外,它要求您将所有所需的操作镜像到您的 Gitea 实例,这可能不值得。
13441344
因此,请仅在您了解自己在做什么的情况下使用 `self`
13451345

1346-
在早期版本(<= 1.19)中,`DEFAULT_ACTIONS_URL` 可以设置为任何自定义 URL,例如 `https://gitea.com``http://your-git-server,https://gitea.com`,默认值为 `https://gitea.com`
1346+
在早期版本(`<= 1.19`)中,`DEFAULT_ACTIONS_URL` 可以设置为任何自定义 URL,例如 `https://gitea.com``http://your-git-server,https://gitea.com`,默认值为 `https://gitea.com`
13471347
然而,后来的更新删除了这些选项,现在唯一的选项是 `github``self`,默认值为 `github`
13481348
但是,如果您想要使用其他 Git 服务器中的操作,您可以在 `uses` 字段中使用完整的 URL,Gitea 支持此功能(GitHub 不支持)。
13491349
例如 `uses: https://gitea.com/actions/checkout@v3``uses: http://your-git-server/actions/checkout@v3`

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ All Gitea instances have the built-in API and there is no way to disable it comp
138138
You can, however, disable showing its documentation by setting `ENABLE_SWAGGER` to `false` in the `api` section of your `app.ini`.
139139
For more information, refer to Gitea's [API docs](development/api-usage.md).
140140

141-
You can see the latest API (for example) on <https://try.gitea.io/api/swagger>.
141+
You can see the latest API (for example) on https://try.gitea.io/api/swagger
142142

143-
You can also see an example of the `swagger.json` file at <https://try.gitea.io/swagger.v1.json>.
143+
You can also see an example of the `swagger.json` file at https://try.gitea.io/swagger.v1.json
144144

145145
## Adjusting your server for public/private use
146146

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ Gitea不提供内置的Pages服务器。您需要一个专用的域名来提供
142142
但是,您可以在app.ini的api部分将ENABLE_SWAGGER设置为false,以禁用其文档显示。
143143
有关更多信息,请参阅Gitea的[API文档](development/api-usage.md)
144144

145-
您可以在上查看最新的API(例如)<https://try.gitea.io/api/swagger>
145+
您可以在上查看最新的API(例如)https://try.gitea.io/api/swagger
146146

147-
您还可以在上查看`swagger.json`文件的示例 <https://try.gitea.io/swagger.v1.json>
147+
您还可以在上查看`swagger.json`文件的示例 https://try.gitea.io/swagger.v1.json
148148

149149
## 调整服务器用于公共/私有使用
150150

docs/content/usage/actions/comparison.en-us.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ Pre and Post steps don't have their own section in the job log user interface.
116116

117117
Previously (Pre 1.21.0), `[actions].DEFAULT_ACTIONS_URL` defaulted to `https://gitea.com`.
118118
We have since restricted this option to only allow two values (`github` and `self`).
119-
When set to `github`, the new default, Gitea will download non-fully-qualified actions from <https://github.com>.
120-
For example, if you use `uses: actions/checkout@v3`, it will download the checkout repository from <https://github.com/actions/checkout.git>.
119+
When set to `github`, the new default, Gitea will download non-fully-qualified actions from `https://github.com`.
120+
For example, if you use `uses: actions/checkout@v3`, it will download the checkout repository from `https://github.com/actions/checkout.git`.
121121

122122
If you want to download an action from another git hoster, you can use an absolute URL, e.g. `uses: https://gitea.com/actions/checkout@v3`.
123123

docs/content/usage/actions/quickstart.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ First of all, you need a Gitea instance.
2323
You can follow the [documentation](installation/from-package.md) to set up a new instance or upgrade your existing one.
2424
It doesn't matter how you install or run Gitea, as long as its version is 1.19.0 or higher.
2525

26-
Actions are disabled by default, so you need to add the following to the configuration file to enable it:
26+
Since 1.21.0, Actions are enabled by default. If you are using versions before 1.21.0, you need to add the following to the configuration file to enable it:
2727

2828
```ini
2929
[actions]

docs/content/usage/actions/quickstart.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ menu:
2323
您可以按照[文档](installation/from-package.md) 来设置一个新实例或升级现有实例。
2424
无论您如何安装或运行Gitea,只要版本号是1.19.0或更高即可。
2525

26-
默认情况下,Actions是禁用的,因此您需要将以下内容添加到配置文件中以启用它
26+
从1.21.0开始,默认情况下,Actions是启用的。如果您正在使用1.21.0之前的版本,您需要将以下内容添加到配置文件中以启用它
2727

2828
```ini
2929
[actions]

0 commit comments

Comments
 (0)