Merge branch 'main' into lunny/project_workflow

lunny · lunny · commit b04d42b00f70 · 2025-10-27T09:30:40.000-07:00
diff --git a/go.mod b/go.mod
@@ -109,7 +109,7 @@ require (
 	github.com/ulikunitz/xz v0.5.15
 	github.com/urfave/cli-docs/v3 v3.0.0-alpha6
 	github.com/urfave/cli/v3 v3.4.1
-	github.com/wneessen/go-mail v0.7.1
+	github.com/wneessen/go-mail v0.7.2
 	github.com/xeipuuv/gojsonschema v1.2.0
 	github.com/yohcop/openid-go v1.0.1
 	github.com/yuin/goldmark v1.7.13
diff --git a/go.sum b/go.sum
@@ -768,8 +768,8 @@ github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZ
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
-github.com/wneessen/go-mail v0.7.1 h1:rvy63sp14N06/kdGqCYwW8Na5gDCXjTQM1E7So4PuKk=
-github.com/wneessen/go-mail v0.7.1/go.mod h1:+TkW6QP3EVkgTEqHtVmnAE/1MRhmzb8Y9/W3pweuS+k=
+github.com/wneessen/go-mail v0.7.2 h1:xxPnhZ6IZLSgxShebmZ6DPKh1b6OJcoHfzy7UjOkzS8=
+github.com/wneessen/go-mail v0.7.2/go.mod h1:+TkW6QP3EVkgTEqHtVmnAE/1MRhmzb8Y9/W3pweuS+k=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -3586,6 +3586,7 @@ variables.update.success=Proměnná byla upravena.
 logs.always_auto_scroll=Vždy automaticky posouvat logy
 logs.always_expand_running=Vždy rozšířit běžící logy
 
+
 [projects]
 deleted.display_name=Odstraněný projekt
 type-1.display_name=Samostatný projekt
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -3645,6 +3645,7 @@ variables.update.success=Die Variable wurde bearbeitet.
 logs.always_auto_scroll=Autoscroll für Logs immer aktivieren
 logs.always_expand_running=Laufende Logs immer erweitern
 
+
 [projects]
 deleted.display_name=Gelöschtes Projekt
 type-1.display_name=Individuelles Projekt
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -3280,6 +3280,7 @@ variables.update.failed=Αποτυχία επεξεργασίας μεταβλη
 variables.update.success=Η μεταβλητή έχει τροποποιηθεί.
 
 
+
 [projects]
 type-1.display_name=Ατομικό Έργο
 type-2.display_name=Έργο Αποθετηρίου
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -3257,6 +3257,7 @@ variables.update.failed=Error al editar la variable.
 variables.update.success=La variable ha sido editada.
 
 
+
 [projects]
 type-1.display_name=Proyecto individual
 type-2.display_name=Proyecto repositorio
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -2446,6 +2446,7 @@ runs.commit=کامیت
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
@@ -1693,6 +1693,7 @@ runs.commit=Commit
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -3906,6 +3906,7 @@ variables.update.success=La variable a bien été modifiée.
 logs.always_auto_scroll=Toujours faire défiler les journaux automatiquement
 logs.always_expand_running=Toujours développer les journaux en cours
 
+
 [projects]
 deleted.display_name=Projet supprimé
 type-1.display_name=Projet personnel
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -3914,6 +3914,15 @@ variables.update.success=Tá an t-athróg curtha in eagar.
 logs.always_auto_scroll=Logchomhaid scrollaithe uathoibríoch i gcónaí
 logs.always_expand_running=Leathnaigh logs reatha i gcónaí
 
+general=Ginearálta
+general.enable_actions=Cumasaigh Gníomhartha
+general.collaborative_owners_management=Bainistíocht Chomhoibríoch Úinéirí
+general.collaborative_owners_management_help=Is úsáideoir nó eagraíocht é úinéir comhoibríoch a bhfuil rochtain ag a stór príobháideach ar ghníomhartha agus ar shreafaí oibre an stórais sin.
+general.add_collaborative_owner=Cuir Úinéir Comhoibríoch leis
+general.collaborative_owner_not_exist=Níl an t-úinéir comhoibríoch ann.
+general.remove_collaborative_owner=Bain Úinéir Comhoibríoch
+general.remove_collaborative_owner_desc=Má bhaintear úinéir comhoibríoch, cuirfidh sé sin cosc ​​ar stórtha an úinéara rochtain a fháil ar na gníomhartha sa stór seo. An bhfuil tú ag iarraidh leanúint ar aghaidh?
+
 [projects]
 deleted.display_name=Tionscadal scriosta
 type-1.display_name=Tionscadal Aonair
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -1605,6 +1605,7 @@ runs.commit=Commit
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
@@ -1428,6 +1428,7 @@ variables.update.failed=Gagal mengedit variabel.
 variables.update.success=Variabel telah diedit.
 
 
+
 [projects]
 type-1.display_name=Proyek Individu
 type-2.display_name=Proyek Repositori
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
@@ -1334,6 +1334,7 @@ runs.commit=Framlag
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -2706,6 +2706,7 @@ runs.commit=Commit
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -1969,6 +1969,9 @@ pulls.status_checks_requested=必須
 pulls.status_checks_details=詳細
 pulls.status_checks_hide_all=すべてのチェックを隠す
 pulls.status_checks_show_all=すべてのチェックを表示
+pulls.status_checks_approve_all=ワークフローをすべて承認
+pulls.status_checks_need_approvals=%d 件のワークフローが承認待ちです
+pulls.status_checks_need_approvals_helper=ワークフローはリポジトリ管理者が承認した後にのみ実行されます。
 pulls.update_branch=マージでブランチを更新
 pulls.update_branch_rebase=リベースでブランチを更新
 pulls.update_branch_success=ブランチの更新が成功しました
@@ -3890,6 +3893,7 @@ workflow.has_workflow_dispatch=このワークフローには workflow_dispatch
 workflow.has_no_workflow_dispatch=ワークフロー '%s' には workflow_dispatch イベントトリガーがありません。
 
 need_approval_desc=フォークプルリクエストのワークフローを実行するには承認が必要です。
+approve_all_success=すべてのワークフローの実行が正常に承認されました。
 
 variables=変数
 variables.management=変数の管理
@@ -3910,6 +3914,7 @@ variables.update.success=変数を更新しました。
 logs.always_auto_scroll=常にログを自動スクロール
 logs.always_expand_running=常に実行中のログを展開
 
+
 [projects]
 deleted.display_name=削除されたプロジェクト
 type-1.display_name=個人プロジェクト
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
@@ -1554,6 +1554,7 @@ runs.commit=커밋
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -3282,6 +3282,7 @@ variables.update.failed=Neizdevās labot mainīgo.
 variables.update.success=Mainīgais tika labots.
 
 
+
 [projects]
 type-1.display_name=Individuālais projekts
 type-2.display_name=Repozitorija projekts
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -2458,6 +2458,7 @@ runs.commit=Commit
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -2347,6 +2347,7 @@ runs.commit=Commit
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -3615,6 +3615,7 @@ variables.update.failed=Falha ao editar a variável.
 variables.update.success=A variável foi editada.
 
 
+
 [projects]
 deleted.display_name=Excluir Projeto
 type-1.display_name=Projeto Individual
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -3914,6 +3914,15 @@ variables.update.success=A variável foi editada.
 logs.always_auto_scroll=Rolar registos de forma automática e permanente
 logs.always_expand_running=Expandir sempre os registos que vão rolando
 
+general=Geral
+general.enable_actions=Habilitar Operações
+general.collaborative_owners_management=Gestão de proprietários colaborativos
+general.collaborative_owners_management_help=Um proprietário colaborativo é um utilizador ou uma organização cujo repositório privado tem acesso às operações e às sequências de trabalho deste repositório.
+general.add_collaborative_owner=Adicionar proprietário colaborativo
+general.collaborative_owner_not_exist=O proprietário colaborativo não existe.
+general.remove_collaborative_owner=Remover proprietário colaborativo
+general.remove_collaborative_owner_desc=A remoção de um proprietário colaborativo impedirá que os repositórios do proprietário acedam às operações neste repositório. Continuamos?
+
 [projects]
 deleted.display_name=Planeamento eliminado
 type-1.display_name=Planeamento individual
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -3225,6 +3225,7 @@ variables.update.failed=Не удалось изменить переменну
 variables.update.success=Переменная изменена.
 
 
+
 [projects]
 type-1.display_name=Индивидуальный проект
 type-2.display_name=Проект репозитория
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
@@ -2391,6 +2391,7 @@ runs.commit=කැප
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
@@ -1292,6 +1292,7 @@ runners.labels=Štítky
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -1968,6 +1968,7 @@ runs.commit=Commit
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -3907,6 +3907,7 @@ variables.update.success=Değişken düzenlendi.
 logs.always_auto_scroll=Günlükleri her zaman otomatik kaydır
 logs.always_expand_running=Çalıştırma günlüklerini her zaman genişlet
 
+
 [projects]
 deleted.display_name=Silinmiş Proje
 type-1.display_name=Kişisel Proje
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -3428,6 +3428,7 @@ variables.update.success=Змінну відредаговано.
 logs.always_auto_scroll=Завжди автоматично прокручувати журнали
 logs.always_expand_running=Завжди розгортати поточні журнали
 
+
 [projects]
 deleted.display_name=Видалений проєкт
 type-1.display_name=Індивідуальний проєкт
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -3911,6 +3911,7 @@ variables.update.success=变量已编辑。
 logs.always_auto_scroll=总是自动滚动日志
 logs.always_expand_running=总是展开运行日志
 
+
 [projects]
 deleted.display_name=已删除项目
 type-1.display_name=个人项目
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
@@ -980,6 +980,7 @@ runners.task_list.repository=儲存庫
 
 
 
+
 [projects]
 
 [git.filemode]
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -3554,6 +3554,7 @@ variables.update.failed=編輯變數失敗。
 variables.update.success=已編輯變數。
 
 
+
 [projects]
 deleted.display_name=已刪除的專案
 type-1.display_name=個人專案
diff --git a/routers/web/web.go b/routers/web/web.go
@@ -308,13 +308,6 @@ func registerWebRoutes(m *web.Router) {
 
 	validation.AddBindingRules()
 
-	linkAccountEnabled := func(ctx *context.Context) {
-		if !setting.Service.EnableOpenIDSignIn && !setting.Service.EnableOpenIDSignUp && !setting.OAuth2.Enabled {
-			ctx.HTTPError(http.StatusForbidden)
-			return
-		}
-	}
-
 	openIDSignInEnabled := func(ctx *context.Context) {
 		if !setting.Service.EnableOpenIDSignIn {
 			ctx.HTTPError(http.StatusForbidden)
@@ -546,9 +539,9 @@ func registerWebRoutes(m *web.Router) {
 		}, openIDSignInEnabled)
 		m.Get("/sign_up", auth.SignUp)
 		m.Post("/sign_up", web.Bind(forms.RegisterForm{}), auth.SignUpPost)
-		m.Get("/link_account", linkAccountEnabled, auth.LinkAccount)
-		m.Post("/link_account_signin", linkAccountEnabled, web.Bind(forms.SignInForm{}), auth.LinkAccountPostSignIn)
-		m.Post("/link_account_signup", linkAccountEnabled, web.Bind(forms.RegisterForm{}), auth.LinkAccountPostRegister)
+		m.Get("/link_account", auth.LinkAccount)
+		m.Post("/link_account_signin", web.Bind(forms.SignInForm{}), auth.LinkAccountPostSignIn)
+		m.Post("/link_account_signup", web.Bind(forms.RegisterForm{}), auth.LinkAccountPostRegister)
 		m.Group("/two_factor", func() {
 			m.Get("", auth.TwoFactor)
 			m.Post("", web.Bind(forms.TwoFactorAuthForm{}), auth.TwoFactorPost)
@@ -623,7 +616,7 @@ func registerWebRoutes(m *web.Router) {
 				m.Post("/delete", security.DeleteOpenID)
 				m.Post("/toggle_visibility", security.ToggleOpenIDVisibility)
 			}, openIDSignInEnabled)
-			m.Post("/account_link", linkAccountEnabled, security.DeleteAccountLink)
+			m.Post("/account_link", security.DeleteAccountLink)
 		})
 
 		m.Group("/applications", func() {
diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl
@@ -36,7 +36,6 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
 			copy_success: {{ctx.Locale.Tr "copy_success"}},
 			copy_error: {{ctx.Locale.Tr "copy_error"}},
 			error_occurred: {{ctx.Locale.Tr "error.occurred"}},
-			network_error: {{ctx.Locale.Tr "error.network_error"}},
 			remove_label_str: {{ctx.Locale.Tr "remove_label_str"}},
 			modal_confirm: {{ctx.Locale.Tr "modal.confirm"}},
 			modal_cancel: {{ctx.Locale.Tr "modal.cancel"}},
diff --git a/web_src/js/components/ContextPopup.vue b/web_src/js/components/ContextPopup.vue
diff --git a/web_src/js/features/contextpopup.ts b/web_src/js/features/contextpopup.ts
diff --git a/web_src/js/features/repo-diff.ts b/web_src/js/features/repo-diff.ts
diff --git a/web_src/js/features/repo-editor.ts b/web_src/js/features/repo-editor.ts
diff --git a/web_src/js/features/repo-issue-edit.ts b/web_src/js/features/repo-issue-edit.ts
diff --git a/web_src/js/index-domready.ts b/web_src/js/index-domready.ts
diff --git a/web_src/js/markup/content.ts b/web_src/js/markup/content.ts
diff --git a/web_src/js/markup/refissue.ts b/web_src/js/markup/refissue.ts
diff --git a/web_src/js/modules/tippy.ts b/web_src/js/modules/tippy.ts

Original file line number	Diff line number	Diff line change
`@@ -2446,6 +2446,7 @@ runs.commit=کامیت`
`2446`	`2446`
`2447`	`2447`
`2448`	`2448`
	`2449`	`+`
`2449`	`2450`	`[projects]`
`2450`	`2451`
`2451`	`2452`	`[git.filemode]`
Original file line number	Diff line number	Diff line change
`@@ -1693,6 +1693,7 @@ runs.commit=Commit`
`1693`	`1693`
`1694`	`1694`
`1695`	`1695`
	`1696`	`+`
`1696`	`1697`	`[projects]`
`1697`	`1698`
`1698`	`1699`	`[git.filemode]`