From 7e77e7fb39a1acba54d7cc99bb4f051c9dd098a7 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 15 Jun 2024 03:10:51 +0000 Subject: [PATCH] Add missing doc from main repository (#4) Copy from https://github.com/go-gitea/gitea/pull/31211/files Author: @MaxWipfli Add missing documentation for https://github.com/go-gitea/gitea/pull/30268 Reviewed-on: https://gitea.com/gitea/docs/pulls/4 --- .gitea/workflows/build-and-publish.yaml | 2 -- docs/administration/config-cheat-sheet.md | 1 + docs/usage/merge-message-templates.md | 2 ++ .../current/administration/config-cheat-sheet.md | 1 + .../current/usage/merge-message-templates.md | 3 ++- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-and-publish.yaml b/.gitea/workflows/build-and-publish.yaml index b2547c12..01ddbd77 100644 --- a/.gitea/workflows/build-and-publish.yaml +++ b/.gitea/workflows/build-and-publish.yaml @@ -5,8 +5,6 @@ on: push: branches: - main - schedule: - - cron: '0 */6 * * *' # every six hours on the hour jobs: build-docs: diff --git a/docs/administration/config-cheat-sheet.md b/docs/administration/config-cheat-sheet.md index cb316ece..1570b4de 100644 --- a/docs/administration/config-cheat-sheet.md +++ b/docs/administration/config-cheat-sheet.md @@ -270,6 +270,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a ### UI - CSV Files (`ui.csv`) - `MAX_FILE_SIZE`: **524288** (512kb): Maximum allowed file size in bytes to render CSV files as table. (Set to 0 for no limit). +- `MAX_ROWS`: **2500** : Maximum allowed rows to render CSV files. (Set to 0 for no limit) ## Markdown (`markdown`) diff --git a/docs/usage/merge-message-templates.md b/docs/usage/merge-message-templates.md index fbdbd136..5116be33 100644 --- a/docs/usage/merge-message-templates.md +++ b/docs/usage/merge-message-templates.md @@ -44,6 +44,8 @@ You can use the following variables enclosed in `${}` inside these templates whi - PullRequestIndex: Pull request's index number - PullRequestReference: Pull request's reference char with index number. i.e. #1, !2 - ClosingIssues: return a string contains all issues which will be closed by this pull request i.e. `close #1, close #2` +- ReviewedOn: Which pull request this commit belongs to. For example `Reviewed-on: https://gitea.com/foo/bar/pulls/1` +- ReviewedBy: Who approved the pull request before the merge. For example `Reviewed-by: Jane Doe ` ## Rebase diff --git a/i18n/zh-cn/docusaurus-plugin-content-docs/current/administration/config-cheat-sheet.md b/i18n/zh-cn/docusaurus-plugin-content-docs/current/administration/config-cheat-sheet.md index 7b1cf42f..5cf634e3 100644 --- a/i18n/zh-cn/docusaurus-plugin-content-docs/current/administration/config-cheat-sheet.md +++ b/i18n/zh-cn/docusaurus-plugin-content-docs/current/administration/config-cheat-sheet.md @@ -258,6 +258,7 @@ menu: ### 界面 - CSV Files (`ui.csv`) - `MAX_FILE_SIZE`: **524288** (512kb): 以字节为单位允许将CSV文件呈现为表格的最大文件大小（将其设置为0表示没有限制）。 +- `MAX_ROWS`: **2500** : 最大允许的 CSV 文件行数。 (设置为 0 不限制) ## Markdown (`markdown`) diff --git a/i18n/zh-cn/docusaurus-plugin-content-docs/current/usage/merge-message-templates.md b/i18n/zh-cn/docusaurus-plugin-content-docs/current/usage/merge-message-templates.md index 0923e637..a7a07f30 100644 --- a/i18n/zh-cn/docusaurus-plugin-content-docs/current/usage/merge-message-templates.md +++ b/i18n/zh-cn/docusaurus-plugin-content-docs/current/usage/merge-message-templates.md @@ -1,6 +1,5 @@ --- date: "2023-05-23T09:00:00+08:00" -title: "合并消息模板" slug: "merge-message-templates" sidebar_position: 15 toc: false @@ -44,6 +43,8 @@ PR 默认合并消息模板可能的文件名： - PullRequestIndex：合并请求的索引号 - PullRequestReference：合并请求的引用字符与索引号。例如，#1、!2 - ClosingIssues：返回一个包含将由此合并请求关闭的所有工单的字符串。例如 `close #1, close #2` +- ReviewedOn: 该提交所属的合并请求。例如： `Reviewed-on: https://gitea.com/foo/bar/pulls/1` +- ReviewedBy: 谁同意的此合并请求。例如： `Reviewed-by: Jane Doe ` ## 变基（Rebase）