Skip to content

Commit d705bd2

Browse files
committed
Merge remote-tracking branch 'giteaoffical/main'
* giteaoffical/main: Update JS dependencies (go-gitea#28537) Improve document for ARTIFACT_RETENTION_DAYS (go-gitea#28646) fix empty ref for cron workflow runs (go-gitea#28640) Improve 1.22 document for Database Preparation (go-gitea#28643)
2 parents adc078e + ce55a74 commit d705bd2

File tree

164 files changed

+896
-1030
lines changed

Some content is hidden

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

164 files changed

+896
-1030
lines changed

.markdownlint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
commands-show-output: false
22
fenced-code-language: false
33
first-line-h1: false
4-
header-increment: false
4+
heading-increment: false
55
line-length: {code_blocks: false, tables: false, stern: true, line_length: -1}
66
no-alt-text: false
77
no-bare-urls: false
88
no-blanks-blockquote: false
9-
no-emphasis-as-header: false
9+
no-emphasis-as-heading: false
1010
no-empty-links: false
1111
no-hard-tabs: {code_blocks: false}
1212
no-inline-html: false

.stylelintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ rules:
7474
keyframe-declaration-no-important: true
7575
keyframe-selector-notation: null
7676
keyframes-name-pattern: null
77-
length-zero-no-unit: true
77+
length-zero-no-unit: [true, ignore: [custom-properties], ignoreFunctions: [var]]
7878
max-nesting-depth: null
7979
media-feature-name-allowed-list: null
8080
media-feature-name-disallowed-list: null

custom/conf/app.example.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2572,7 +2572,7 @@ LEVEL = Info
25722572
;;
25732573
;; Default platform to get action plugins, `github` for `https://github.com`, `self` for the current Gitea instance.
25742574
;DEFAULT_ACTIONS_URL = github
2575-
;; Default artifact retention time in days, default is 90 days
2575+
;; Default artifact retention time in days. Artifacts could have their own retention periods by setting the `retention-days` option in `actions/upload-artifact` step.
25762576
;ARTIFACT_RETENTION_DAYS = 90
25772577
;; Timeout to stop the task which have running status, but haven't been updated for a long time
25782578
;ZOMBIE_TASK_TIMEOUT = 10m

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@ PROXY_HOSTS = *.github.com
13901390
- `DEFAULT_ACTIONS_URL`: **github**: Default platform to get action plugins, `github` for `https://github.com`, `self` for the current Gitea instance.
13911391
- `STORAGE_TYPE`: **local**: Storage type for actions logs, `local` for local disk or `minio` for s3 compatible object storage service, default is `local` or other name defined with `[storage.xxx]`
13921392
- `MINIO_BASE_PATH`: **actions_log/**: Minio base path on the bucket only available when STORAGE_TYPE is `minio`
1393-
- `ARTIFACT_RETENTION_DAYS`: **90**: Default number of days to keep artifacts. This can be overridden in `actions/upload_artifact`. Set to 0 to disable artifact retention. Default is 90 days if not set. Each artifact can have it's own number of retention days.
1393+
- `ARTIFACT_RETENTION_DAYS`: **90**: Default number of days to keep artifacts. Artifacts could have their own retention periods by setting the `retention-days` option in `actions/upload-artifact` step.
13941394
- `ZOMBIE_TASK_TIMEOUT`: **10m**: Timeout to stop the task which have running status, but haven't been updated for a long time
13951395
- `ENDLESS_TASK_TIMEOUT`: **3h**: Timeout to stop the tasks which have running status and continuous updates, but don't end for a long time
13961396
- `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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ Gitea 创建以下非唯一队列:
987987
- `LAST_UPDATED_MORE_THAN_AGO`: **72h**: 只会尝试回收超过此时间(默认3天)没有尝试过回收的 LFSMetaObject。
988988
- `NUMBER_TO_CHECK_PER_REPO`: **100**: 每个仓库要检查的过期 LFSMetaObject 的最小数量。设置为 `0` 以始终检查所有。
989989

990-
# Git (`git`)
990+
## Git (`git`)
991991

992992
- `PATH`: **""**: Git可执行文件的路径。如果为空,Gitea将在PATH环境中搜索。
993993
- `HOME_PATH`: **%(APP_DATA_PATH)s/home**: Git的HOME目录。

docs/content/installation/database-preparation.en-us.md

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

1818
# Database Preparation
1919

20-
You need a database to use Gitea. Gitea supports PostgreSQL (>= 12), MySQL (>= 8.0), MariaDB, SQLite, and MSSQL (>= 2012 SP4). This page will guide into preparing database. Only PostgreSQL and MySQL will be covered here since those database engines are widely-used in production. If you plan to use SQLite, you can ignore this chapter.
20+
You need a database to use Gitea. Gitea supports PostgreSQL (>= 12), MySQL (>= 8.0), MariaDB (>= 10.4), SQLite (builtin), and MSSQL (>= 2012 SP4). This page will guide into preparing database. Only PostgreSQL and MySQL will be covered here since those database engines are widely-used in production. If you plan to use SQLite, you can ignore this chapter.
2121

2222
If you use an unsupported database version, please [get in touch](/help/support) with us for information on our Extended Support Contracts. We can provide testing and support for older databases and integrate those fixes into the Gitea codebase.
2323

0 commit comments

Comments
 (0)