forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated translations via Crowdin Mock queue backoff duration (go-gitea#30553) Improve "Reference in new issue" modal (go-gitea#30547) Add a few root files to lint-spell (go-gitea#30530) Refactor and fix archive link bug (go-gitea#30535) Fixup app.example.ini for task section, which is now queue.task (go-gitea#30555) Some following up changes for routes (go-gitea#30550) Add form field id generation, remove duplicated ids (go-gitea#30546) Fix border-radius on view, blame and code search (go-gitea#30545) Disable enter key for accepting code completion in Monaco (go-gitea#30548)
- Loading branch information
Showing
26 changed files
with
314 additions
and
155 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1198,14 +1198,6 @@ in this mapping or the filetype using heuristics. | |
|
||
- `DEFAULT_UI_LOCATION`: Default location of time on the UI, so that we can display correct user's time on UI. i.e. Asia/Shanghai | ||
|
||
## Task (`task`) | ||
|
||
Task queue configuration has been moved to `queue.task`. However, the below configuration values are kept for backwards compatibility: | ||
|
||
- `QUEUE_TYPE`: **channel**: Task queue type, could be `channel` or `redis`. | ||
- `QUEUE_LENGTH`: **1000**: Task queue length, available only when `QUEUE_TYPE` is `channel`. | ||
- `QUEUE_CONN_STR`: **redis://127.0.0.1:6379/0**: Task queue connection string, available only when `QUEUE_TYPE` is `redis`. If redis needs a password, use `redis://[email protected]:6379/0` or `redis+cluster://[email protected]:6379/0`. | ||
|
||
## Migrations (`migrations`) | ||
|
||
- `MAX_ATTEMPTS`: **3**: Max attempts per http/https request on migrations. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1128,15 +1128,6 @@ ALLOW_DATA_URI_IMAGES = true | |
|
||
- `DEFAULT_UI_LOCATION`:在 UI 上的默认时间位置,以便我们可以在 UI 上显示正确的用户时间。例如:Asia/Shanghai | ||
|
||
## 任务 (`task`) | ||
|
||
任务队列配置已移动到 `queue.task`。然而,以下配置值仍保留以确保向后兼容: | ||
|
||
- `QUEUE_TYPE`:**channel**:任务队列类型,可以是 `channel` 或 `redis`。 | ||
- `QUEUE_LENGTH`:**1000**:任务队列长度,仅在 `QUEUE_TYPE` 为 `channel` 时可用。 | ||
- `QUEUE_CONN_STR`:**redis://127.0.0.1:6379/0**:任务队列连接字符串,仅在 `QUEUE_TYPE` 为 `redis` 时可用。 | ||
如果 redis 需要密码,使用 `redis://[email protected]:6379/0` 或 `redis+cluster://[email protected]:6379/0`。 | ||
|
||
## 迁移 (`migrations`) | ||
|
||
- `MAX_ATTEMPTS`:**3**:每次 http/https 请求的最大尝试次数(用于迁移)。 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.