Skip to content

Commit f3b81c7

Browse files
zjjhotzjjhot
committed
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)
2 parents 119dd5e + ba9b124 commit f3b81c7

26 files changed

+314
-155
lines changed

‎CHANGELOG.md

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMAN
143143
GO_DIRS := build cmd models modules routers services tests
144144
WEB_DIRS := web_src/js web_src/css
145145

146-
ESLINT_FILES := web_src/js tools *.config.js tests/e2e
146+
ESLINT_FILES := web_src/js tools *.js tests/e2e
147147
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
148-
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github
148+
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
149149
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
150150

151151
GO_SOURCES := $(wildcard *.go)

‎custom/conf/app.example.ini

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,22 +2377,6 @@ LEVEL = Info
23772377
;; Enable issue by repository metrics; default is false
23782378
;ENABLED_ISSUE_BY_REPOSITORY = false
23792379

2380-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2381-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2382-
;[task]
2383-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2384-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2385-
;;
2386-
;; Task queue type, could be `channel` or `redis`.
2387-
;QUEUE_TYPE = channel
2388-
;;
2389-
;; Task queue length, available only when `QUEUE_TYPE` is `channel`.
2390-
;QUEUE_LENGTH = 1000
2391-
;;
2392-
;; Task queue connection string, available only when `QUEUE_TYPE` is `redis`.
2393-
;; If there is a password of redis, use `redis://127.0.0.1:6379/0?pool_size=100&idle_timeout=180s` or `redis+cluster://127.0.0.1:6379/0?pool_size=100&idle_timeout=180s` for `redis-clsuter`.
2394-
;QUEUE_CONN_STR = "redis://127.0.0.1:6379/0?pool_size=100&idle_timeout=180s"
2395-
23962380
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
23972381
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
23982382
;[migrations]

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,14 +1198,6 @@ in this mapping or the filetype using heuristics.
11981198

11991199
- `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
12001200

1201-
## Task (`task`)
1202-
1203-
Task queue configuration has been moved to `queue.task`. However, the below configuration values are kept for backwards compatibility:
1204-
1205-
- `QUEUE_TYPE`: **channel**: Task queue type, could be `channel` or `redis`.
1206-
- `QUEUE_LENGTH`: **1000**: Task queue length, available only when `QUEUE_TYPE` is `channel`.
1207-
- `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`.
1208-
12091201
## Migrations (`migrations`)
12101202

12111203
- `MAX_ATTEMPTS`: **3**: Max attempts per http/https request on migrations.

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,15 +1128,6 @@ ALLOW_DATA_URI_IMAGES = true
11281128

11291129
- `DEFAULT_UI_LOCATION`：在 UI 上的默认时间位置，以便我们可以在 UI 上显示正确的用户时间。例如：Asia/Shanghai
11301130

1131-
## 任务 (`task`)
1132-
1133-
任务队列配置已移动到 `queue.task`。然而，以下配置值仍保留以确保向后兼容：
1134-
1135-
- `QUEUE_TYPE`：**channel**：任务队列类型，可以是 `channel` 或 `redis`。
1136-
- `QUEUE_LENGTH`：**1000**：任务队列长度，仅在 `QUEUE_TYPE` 为 `channel` 时可用。
1137-
- `QUEUE_CONN_STR`：**redis://127.0.0.1:6379/0**：任务队列连接字符串，仅在 `QUEUE_TYPE` 为 `redis` 时可用。
1138-
如果 redis 需要密码，使用 `redis://[email protected]:6379/0` 或 `redis+cluster://[email protected]:6379/0`。
1139-
11401131
## 迁移 (`migrations`)
11411132

11421133
- `MAX_ATTEMPTS`：**3**：每次 http/https 请求的最大尝试次数（用于迁移）。

‎modules/queue/backoff.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99
)
1010

11-
const (
11+
var (
1212
backoffBegin = 50 * time.Millisecond
1313
backoffUpper = 2 * time.Second
1414
)
@@ -18,6 +18,14 @@ type (
1818
backoffFuncErr func() (retry bool, err error)
1919
)
2020

21+
func mockBackoffDuration(d time.Duration) func() {
22+
oldBegin, oldUpper := backoffBegin, backoffUpper
23+
backoffBegin, backoffUpper = d, d
24+
return func() {
25+
backoffBegin, backoffUpper = oldBegin, oldUpper
26+
}
27+
}
28+
2129
func backoffRetErr[T any](ctx context.Context, begin, upper time.Duration, end <-chan time.Time, fn backoffFuncRetErr[T]) (ret T, err error) {
2230
d := begin
2331
for {

‎modules/queue/workerqueue_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ func TestWorkerPoolQueueShutdown(t *testing.T) {
250250

251251
func TestWorkerPoolQueueWorkerIdleReset(t *testing.T) {
252252
defer test.MockVariableValue(&workerIdleDuration, 10*time.Millisecond)()
253+
defer mockBackoffDuration(10 * time.Millisecond)()
253254

254255
handler := func(items ...int) (unhandled []int) {
255256
time.Sleep(50 * time.Millisecond)

‎options/locale/locale_fr-FR.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ filter.private=Privé
150150

151151

152152
[search]
153+
exact=Exact
154+
exact_tooltip=Inclure uniquement les résultats qui correspondent exactement au terme de recherche
155+
issue_kind=Recherche de tickets…
156+
pull_kind=Recherche de demandes d’ajouts…
153157

154158
[aria]
155159
navbar=Barre de navigation
@@ -824,6 +828,7 @@ repo_and_org_access=Accès aux Organisations et Dépôts
824828
permissions_public_only=Publique uniquement
825829
permissions_access_all=Tout (public, privé et limité)
826830
select_permissions=Sélectionner les autorisations
831+
permission_not_set=Non défini
827832
permission_no_access=Aucun accès
828833
permission_read=Lecture
829834
permission_write=Lecture et écriture
@@ -2016,6 +2021,7 @@ settings.branches.add_new_rule=Ajouter une nouvelle règle
20162021
settings.advanced_settings=Paramètres avancés
20172022
settings.wiki_desc=Activer le wiki du dépôt
20182023
settings.use_internal_wiki=Utiliser le wiki interne
2024+
settings.default_wiki_everyone_access=Autorisation d’accès par défaut pour les utilisateurs connectés :
20192025
settings.use_external_wiki=Utiliser un wiki externe
20202026
settings.external_wiki_url=URL Wiki externe
20212027
settings.external_wiki_url_error=L’URL du wiki externe n’est pas une URL valide.

‎options/locale/locale_pt-PT.ini

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ search=Pesquisar...
164164
type_tooltip=Tipo de pesquisa
165165
fuzzy=Aproximada
166166
fuzzy_tooltip=Incluir também os resultados que estejam próximos do termo de pesquisa
167+
exact=Fiel
168+
exact_tooltip=Incluir somente os resultados que correspondam rigorosamente ao termo de pesquisa
167169
repo_kind=Pesquisar repositórios...
168170
user_kind=Pesquisar utilizadores...
169171
org_kind=Pesquisar organizações...
@@ -177,6 +179,8 @@ branch_kind=Pesquisar ramos...
177179
commit_kind=Pesquisar cometimentos...
178180
runner_kind=Pesquisar executores...
179181
no_results=Não foram encontrados resultados correspondentes.
182+
issue_kind=Pesquisar questões...
183+
pull_kind=Pesquisar puxadas...
180184
keyword_search_unavailable=Pesquisar por palavra-chave não está disponível, neste momento. Entre em contacto com o administrador.
181185

182186
[aria]
@@ -712,6 +716,7 @@ cancel=Cancelar
712716
language=Idioma
713717
ui=Tema
714718
hidden_comment_types=Tipos de comentários ocultos
719+
hidden_comment_types_description=Os tipos de comentário marcados aqui não serão mostrados dentro das páginas das questões. Marcar "Rótulo", por exemplo, remove todos os comentários "{user} adicionou/removeu {label}".
715720
hidden_comment_types.ref_tooltip=Comentários onde esta questão foi referenciada a partir de outra questão/cometimento/…
716721
hidden_comment_types.issue_ref_tooltip=Comentários onde o utilizador altera o ramo/etiqueta associado à questão
717722
comment_type_group_reference=Referência
@@ -882,6 +887,7 @@ repo_and_org_access=Acesso aos repositórios e às organizações
882887
permissions_public_only=Apenas público
883888
permissions_access_all=Tudo (público, privado e limitado)
884889
select_permissions=Escolher permissões
890+
permission_not_set=Não definido
885891
permission_no_access=Sem acesso
886892
permission_read=Lidas
887893
permission_write=Leitura e escrita
@@ -1286,6 +1292,7 @@ editor.or=ou
12861292
editor.cancel_lower=Cancelar
12871293
editor.commit_signed_changes=Cometer modificações assinadas
12881294
editor.commit_changes=Cometer modificações
1295+
editor.add_tmpl=Adicionar '{filename}'
12891296
editor.add=Adicionar %s
12901297
editor.update=Modificar %s
12911298
editor.delete=Eliminar %s
@@ -2092,6 +2099,7 @@ settings.advanced_settings=Configurações avançadas
20922099
settings.wiki_desc=Habilitar wiki do repositório
20932100
settings.use_internal_wiki=Usar o wiki nativo
20942101
settings.default_wiki_branch_name=Nome do ramo predefinido do wiki
2102+
settings.default_wiki_everyone_access=Permissão de acesso predefinida para utilizadores registados:
20952103
settings.failed_to_change_default_wiki_branch=Falhou ao mudar o nome do ramo predefinido do wiki.
20962104
settings.use_external_wiki=Usar um wiki externo
20972105
settings.external_wiki_url=URL do wiki externo
@@ -3083,12 +3091,14 @@ auths.tips=Dicas
30833091
auths.tips.oauth2.general=Autenticação OAuth2
30843092
auths.tips.oauth2.general.tip=Ao registar uma nova autenticação OAuth2, o URL da ligação de retorno ou do reencaminhamento deve ser:
30853093
auths.tip.oauth2_provider=Fornecedor OAuth2
3094+
auths.tip.bitbucket=Registe um novo consumidor de OAuth em https://bitbucket.org/account/user/{your-username}/oauth-consumers/new e adicione a permissão 'Account' - 'Read'
30863095
auths.tip.nextcloud=`Registe um novo consumidor OAuth na sua instância usando o seguinte menu "Configurações → Segurança → Cliente OAuth 2.0"`
30873096
auths.tip.dropbox=Crie uma nova aplicação em https://www.dropbox.com/developers/apps
30883097
auths.tip.facebook=`Registe uma nova aplicação em https://developers.facebook.com/apps e adicione o produto "Facebook Login"`
30893098
auths.tip.github=Registe uma nova aplicação OAuth em https://github.com/settings/applications/new
30903099
auths.tip.gitlab_new=Registe uma nova aplicação em https://gitlab.com/-/profile/applications
30913100
auths.tip.google_plus=Obtenha credenciais de cliente OAuth2 a partir da consola do Google API em https://console.developers.google.com/
3101+
auths.tip.openid_connect=Use o URL da descoberta de conexão OpenID "https://{server}/.well-known/openid-configuration" para especificar os extremos
30923102
auths.tip.twitter=`Vá a https://dev.twitter.com/apps, crie uma aplicação e certifique-se de que está habilitada a opção "Allow this application to be used to Sign in with Twitter"`
30933103
auths.tip.discord=Registe uma nova aplicação em https://discordapp.com/developers/applications/me
30943104
auths.tip.gitea=Registe uma nova aplicação OAuth2. O guia pode ser encontrado em https://docs.gitea.com/development/oauth2-provider

0 commit comments

Comments
 (0)