Skip to content

Commit 80cade2

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated translations via Crowdin Fix attachment download bug (go-gitea#27486) Make actions default enabled for newly created repository if global configuraion enabled (go-gitea#27482) Fix the wrong HTTP response status code for duplicate packages (go-gitea#27480) Increase queue length (go-gitea#27555)
2 parents 087dfb1 + 50166d1 commit 80cade2

Some content is hidden

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

41 files changed

+265
-53
lines changed

custom/conf/app.example.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ LEVEL = Info
951951
;; Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility.
952952
;; External wiki and issue tracker can't be enabled by default as it requires additional settings.
953953
;; Disabled repo units will not be added to new repositories regardless if it is in the default list.
954-
;DEFAULT_REPO_UNITS = repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages
954+
;DEFAULT_REPO_UNITS = repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages,repo.actions
955955
;;
956956
;; Comma separated list of default forked repo units.
957957
;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
@@ -1421,7 +1421,7 @@ LEVEL = Info
14211421
;DATADIR = queues/ ; Relative paths will be made absolute against `%(APP_DATA_PATH)s`.
14221422
;;
14231423
;; Default queue length before a channel queue will block
1424-
;LENGTH = 100
1424+
;LENGTH = 100000
14251425
;;
14261426
;; Batch size to send for batched queues
14271427
;BATCH_LENGTH = 20

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ In addition, there is _`StaticRootPath`_ which can be set as a built-in at build
102102
- `ENABLE_PUSH_CREATE_USER`: **false**: Allow users to push local repositories to Gitea and have them automatically created for a user.
103103
- `ENABLE_PUSH_CREATE_ORG`: **false**: Allow users to push local repositories to Gitea and have them automatically created for an org.
104104
- `DISABLED_REPO_UNITS`: **_empty_**: Comma separated list of globally disabled repo units. Allowed values: \[repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages, repo.actions\]
105-
- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages**: Comma separated list of default new repo units. Allowed values: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions\]. Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. External wiki and issue tracker can't be enabled by default as it requires additional settings. Disabled repo units will not be added to new repositories regardless if it is in the default list.
105+
- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages,repo.actions**: Comma separated list of default new repo units. Allowed values: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions\]. Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. External wiki and issue tracker can't be enabled by default as it requires additional settings. Disabled repo units will not be added to new repositories regardless if it is in the default list.
106106
- `DEFAULT_FORK_REPO_UNITS`: **repo.code,repo.pulls**: Comma separated list of default forked repo units. The set of allowed values and rules is the same as `DEFAULT_REPO_UNITS`.
107107
- `PREFIX_ARCHIVE_FILES`: **true**: Prefix archive files by placing them in a directory named after the repository.
108108
- `DISABLE_MIGRATIONS`: **false**: Disable migrating feature.
@@ -483,7 +483,7 @@ Configuration at `[queue]` will set defaults for queues with overrides for indiv
483483

484484
- `TYPE`: **level**: General queue type, currently support: `level` (uses a LevelDB internally), `channel`, `redis`, `dummy`. Invalid types are treated as `level`.
485485
- `DATADIR`: **queues/common**: Base DataDir for storing level queues. `DATADIR` for individual queues can be set in `queue.name` sections. Relative paths will be made absolute against `%(APP_DATA_PATH)s`.
486-
- `LENGTH`: **100**: Maximal queue size before channel queues block
486+
- `LENGTH`: **100000**: Maximal queue size before channel queues block
487487
- `BATCH_LENGTH`: **20**: Batch data before passing to the handler
488488
- `CONN_STR`: **redis://127.0.0.1:6379/0**: Connection string for the redis queue type. For `redis-cluster` use `redis+cluster://127.0.0.1:6379/0`. Options can be set using query params. Similarly, LevelDB options can also be set using: **leveldb://relative/path?option=value** or **leveldb:///absolute/path?option=value**, and will override `DATADIR`
489489
- `QUEUE_NAME`: **_queue**: The suffix for default redis and disk queue name. Individual queues will default to **`name`**`QUEUE_NAME` but can be overridden in the specific `queue.name` section.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ menu:
102102
- `ENABLE_PUSH_CREATE_USER`: **false**: 允许用户将本地存储库推送到Gitea,并为用户自动创建它们。
103103
- `ENABLE_PUSH_CREATE_ORG`: **false**: 允许用户将本地存储库推送到Gitea,并为组织自动创建它们。
104104
- `DISABLED_REPO_UNITS`: **_empty_**: 逗号分隔的全局禁用的仓库单元列表。允许的值是:: \[repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages, repo.actions\]
105-
- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages**: 逗号分隔的默认新仓库单元列表。允许的值是:: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions\]. 注意:目前无法停用代码和发布。如果您指定了默认的仓库单元,您仍应将它们列出以保持未来的兼容性。外部wiki和问题跟踪器不能默认启用,因为它需要额外的设置。禁用的仓库单元将不会添加到新的仓库中,无论它是否在默认列表中。
105+
- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages,repo.actions**: 逗号分隔的默认新仓库单元列表。允许的值是:: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions\]. 注意:目前无法停用代码和发布。如果您指定了默认的仓库单元,您仍应将它们列出以保持未来的兼容性。外部wiki和问题跟踪器不能默认启用,因为它需要额外的设置。禁用的仓库单元将不会添加到新的仓库中,无论它是否在默认列表中。
106106
- `DEFAULT_FORK_REPO_UNITS`: **repo.code,repo.pulls**: 逗号分隔的默认分叉仓库单元列表。允许的值和规则与`DEFAULT_REPO_UNITS`相同。
107107
- `PREFIX_ARCHIVE_FILES`: **true**: 通过将存档文件放置在以仓库命名的目录中来添加前缀。
108108
- `DISABLE_MIGRATIONS`: **false**: 禁用迁移功能。
@@ -472,7 +472,7 @@ menu:
472472

473473
- `TYPE`**level**:通用队列类型,当前支持:`level`(在内部使用 LevelDB)、`channel``redis``dummy`。无效的类型将视为 `level`
474474
- `DATADIR`**queues/common**:用于存储 level 队列的基本 DataDir。单独的队列的 `DATADIR` 可以在 `queue.name` 部分进行设置。相对路径将根据 `%(APP_DATA_PATH)s` 变为绝对路径。
475-
- `LENGTH`**100**:通道队列阻塞之前的最大队列大小
475+
- `LENGTH`**100000**:通道队列阻塞之前的最大队列大小
476476
- `BATCH_LENGTH`**20**:在传递给处理程序之前批处理数据
477477
- `CONN_STR`**redis://127.0.0.1:6379/0**:redis 队列类型的连接字符串。对于 `redis-cluster`,使用 `redis+cluster://127.0.0.1:6379/0`。可以使用查询参数来设置选项。类似地,LevelDB 选项也可以使用:**leveldb://relative/path?option=value****leveldb:///absolute/path?option=value** 进行设置,并将覆盖 `DATADIR`
478478
- `QUEUE_NAME`**_queue**:默认的 redis 和磁盘队列名称的后缀。单独的队列将默认为 **`name`**`QUEUE_NAME`,但可以在特定的 `queue.name` 部分中进行覆盖。

docs/content/usage/packages/alpine.en-us.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ curl --user your_username:your_password_or_token \
7777
```
7878

7979
If you are using 2FA or OAuth use a [personal access token](development/api-usage.md#authentication) instead of the password.
80+
8081
You cannot publish a file with the same name twice to a package. You must delete the existing package file first.
8182

8283
The server responds with the following HTTP Status codes.

docs/content/usage/packages/composer.en-us.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ To work with the Composer package registry, you can use [Composer](https://getco
2525

2626
To publish a Composer package perform a HTTP PUT operation with the package content in the request body.
2727
The package content must be the zipped PHP project with the `composer.json` file.
28+
2829
You cannot publish a package if a package of the same name and version already exists. You must delete the existing package first.
2930

3031
```
@@ -64,7 +65,8 @@ The server responds with the following HTTP Status codes.
6465
| HTTP Status Code | Meaning |
6566
| ----------------- | ------- |
6667
| `201 Created` | The package has been published. |
67-
| `400 Bad Request` | The package name and/or version are invalid or a package with the same name and version already exist. |
68+
| `400 Bad Request` | The package is invalid. |
69+
| `409 Conflict` | A package file with the same combination of parameters exists already. |
6870

6971
## Configuring the package registry
7072

docs/content/usage/packages/conan.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ For example:
6363
conan upload --remote=gitea ConanPackage/1.2@gitea/final
6464
```
6565

66+
You cannot publish a file with the same name twice to a package. You must delete the existing package or file first.
67+
6668
The Gitea Conan package registry has full [revision](https://docs.conan.io/en/latest/versioning/revisions.html) support.
6769

6870
## Install a package

docs/content/usage/packages/conda.en-us.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,18 @@ curl --user your_username:your_password_or_token \
6363
https://gitea.example.com/api/packages/testuser/conda/package-1.0.conda
6464
```
6565

66+
If you are using 2FA or OAuth use a [personal access token](development/api-usage.md#authentication) instead of the password.
67+
6668
You cannot publish a package if a package of the same name and version already exists. You must delete the existing package first.
6769

70+
The server responds with the following HTTP Status codes.
71+
72+
| HTTP Status Code | Meaning |
73+
| ----------------- | ------- |
74+
| `201 Created` | The package has been published. |
75+
| `400 Bad Request` | The package is invalid. |
76+
| `409 Conflict` | A package file with the same combination of parameters exists already. |
77+
6878
## Install a package
6979

7080
To install a package from the package registry, execute one of the following commands:

docs/content/usage/packages/cran.en-us.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,18 @@ curl --user your_username:your_password_or_token \
6868
https://gitea.example.com/api/packages/testuser/cran/bin?platform=windows&rversion=4.2
6969
```
7070

71+
If you are using 2FA or OAuth use a [personal access token](development/api-usage.md#authentication) instead of the password.
72+
7173
You cannot publish a package if a package of the same name and version already exists. You must delete the existing package first.
7274

75+
The server responds with the following HTTP Status codes.
76+
77+
| HTTP Status Code | Meaning |
78+
| ----------------- | ------- |
79+
| `201 Created` | The package has been published. |
80+
| `400 Bad Request` | The package is invalid. |
81+
| `409 Conflict` | A package file with the same combination of parameters exists already. |
82+
7383
## Install a package
7484

7585
To install a R package from the package registry, execute the following command:

docs/content/usage/packages/debian.en-us.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,15 @@ curl --user your_username:your_password_or_token \
7777
```
7878

7979
If you are using 2FA or OAuth use a [personal access token](development/api-usage.md#authentication) instead of the password.
80-
You cannot publish a file with the same name twice to a package. You must delete the existing package version first.
80+
81+
You cannot publish a package if a package of the same name, version, distribution, component and architecture already exists. You must delete the existing package first.
8182

8283
The server responds with the following HTTP Status codes.
8384

8485
| HTTP Status Code | Meaning |
8586
| ----------------- | ------- |
8687
| `201 Created` | The package has been published. |
87-
| `400 Bad Request` | The package name, version, distribution, component or architecture are invalid. |
88+
| `400 Bad Request` | The package is invalid. |
8889
| `409 Conflict` | A package file with the same combination of parameters exists already. |
8990

9091
## Delete a package

docs/content/usage/packages/go.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ curl --user your_username:your_password_or_token \
4141

4242
If you are using 2FA or OAuth use a [personal access token](development/api-usage.md#authentication) instead of the password.
4343

44+
You cannot publish a package if a package of the same name and version already exists. You must delete the existing package first.
45+
4446
The server responds with the following HTTP Status codes.
4547

4648
| HTTP Status Code | Meaning |

0 commit comments

Comments
 (0)