Skip to content

Commit 6b2b9ca

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: add `timetzdata` build tag to binary releases (go-gitea#33463) Fix unnecessary comment when moving issue on the same project column (go-gitea#33496) [skip ci] Updated translations via Crowdin Refactor web route handler (go-gitea#33488) Reject star-related requests if stars are disabled (go-gitea#33208) Fix commit status events (go-gitea#33320) [skip ci] Updated translations via Crowdin Disable cron task to update license (go-gitea#33486)
2 parents 6462e8f + 7e596bd commit 6b2b9ca

Some content is hidden

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

62 files changed

+649
-309
lines changed

.github/workflows/cron-licenses.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: cron-licenses
22

33
on:
4-
schedule:
5-
- cron: "7 0 * * 1" # every Monday at 00:07 UTC
4+
#schedule:
5+
# - cron: "7 0 * * 1" # every Monday at 00:07 UTC
66
workflow_dispatch:
77

88
jobs:

main_timezones.go

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2025 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
//go:build windows
5+
6+
package main
7+
8+
// Golang has the ability to load OS's timezone data from most UNIX systems (https://github.com/golang/go/blob/master/src/time/zoneinfo_unix.go)
9+
// Even if the timezone data is missing, users could install the related packages to get it.
10+
// But on Windows, although `zoneinfo_windows.go` tries to load the timezone data from Windows registry,
11+
// some users still suffer from the issue that the timezone data is missing: https://github.com/go-gitea/gitea/issues/33235
12+
// So we import the tzdata package to make sure the timezone data is included in the binary.
13+
//
14+
// For non-Windows package builders, they could still use the "TAGS=timetzdata" to include the tzdata package in the binary.
15+
// If we decided to add the tzdata for other platforms, modify the "go:build" directive above.
16+
import _ "time/tzdata"

models/issues/issue_project.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ func (issue *Issue) projectID(ctx context.Context) int64 {
3838
}
3939

4040
// ProjectColumnID return project column id if issue was assigned to one
41-
func (issue *Issue) ProjectColumnID(ctx context.Context) int64 {
41+
func (issue *Issue) ProjectColumnID(ctx context.Context) (int64, error) {
4242
var ip project_model.ProjectIssue
4343
has, err := db.GetEngine(ctx).Where("issue_id=?", issue.ID).Get(&ip)
44-
if err != nil || !has {
45-
return 0
44+
if err != nil {
45+
return 0, err
46+
} else if !has {
47+
return 0, nil
4648
}
47-
return ip.ProjectColumnID
49+
return ip.ProjectColumnID, nil
4850
}
4951

5052
// LoadIssuesFromColumn load issues assigned to this column

modules/indexer/issues/util.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ func getIssueIndexerData(ctx context.Context, issueID int64) (*internal.IndexerD
9292
projectID = issue.Project.ID
9393
}
9494

95+
projectColumnID, err := issue.ProjectColumnID(ctx)
96+
if err != nil {
97+
return nil, false, err
98+
}
99+
95100
return &internal.IndexerData{
96101
ID: issue.ID,
97102
RepoID: issue.RepoID,
@@ -106,7 +111,7 @@ func getIssueIndexerData(ctx context.Context, issueID int64) (*internal.IndexerD
106111
NoLabel: len(labels) == 0,
107112
MilestoneID: issue.MilestoneID,
108113
ProjectID: projectID,
109-
ProjectColumnID: issue.ProjectColumnID(ctx),
114+
ProjectColumnID: projectColumnID,
110115
PosterID: issue.PosterID,
111116
AssigneeID: issue.AssigneeID,
112117
MentionIDs: mentionIDs,

options/locale/locale_cs-CZ.ini

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ webauthn_reload=Znovu načíst
5454
repository=Repozitář
5555
organization=Organizace
5656
mirror=Zrcadlo
57+
issue_milestone=Milník
5758
new_repo=Nový repozitář
5859
new_migrate=Nová migrace
5960
new_mirror=Nové zrcadlo
@@ -1253,6 +1254,7 @@ labels=Štítky
12531254
org_labels_desc=Štítky na úrovni organizace, které mohou být použity se <strong>všemi repozitáři</strong> v rámci této organizace
12541255
org_labels_desc_manage=spravovat
12551256

1257+
milestone=Milník
12561258
milestones=Milníky
12571259
commits=Commity
12581260
commit=Commit
@@ -2873,6 +2875,7 @@ view_as_role=Zobrazit jako: %s
28732875
view_as_public_hint=Prohlížíte README jako veřejný uživatel.
28742876
view_as_member_hint=Prohlížíte README jako člen této organizace.
28752877

2878+
28762879
[admin]
28772880
maintenance=Údržba
28782881
dashboard=Přehled

options/locale/locale_de-DE.ini

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ webauthn_reload=Neu laden
5454
repository=Repository
5555
organization=Organisation
5656
mirror=Mirror
57+
issue_milestone=Meilenstein
5758
new_repo=Neues Repository
5859
new_migrate=Neue Migration
5960
new_mirror=Neuer Mirror
@@ -1247,6 +1248,7 @@ labels=Label
12471248
org_labels_desc=Labels der Organisationsebene, die mit <strong>allen Repositories</strong> in dieser Organisation verwendet werden können
12481249
org_labels_desc_manage=verwalten
12491250
1251+
milestone=Meilenstein
12501252
milestones=Meilensteine
12511253
commits=Commits
12521254
commit=Commit
@@ -2854,6 +2856,7 @@ teams.invite.by=Von %s eingeladen
28542856
teams.invite.description=Bitte klicke auf die folgende Schaltfläche, um dem Team beizutreten.
28552857

28562858

2859+
28572860
[admin]
28582861
maintenance=Wartung
28592862
dashboard=Dashboard

options/locale/locale_el-GR.ini

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ webauthn_reload=Ανανέωση
5353
repository=Αποθετήριο
5454
organization=Οργανισμός
5555
mirror=Αντίγραφο
56+
issue_milestone=Ορόσημο
5657
new_repo=Νέο Αποθετήριο
5758
new_migrate=Νέα Μεταφορά
5859
new_mirror=Νέο Είδωλο
@@ -1119,6 +1120,7 @@ labels=Σήματα
11191120
org_labels_desc=Τα σήματα στο επίπεδο οργανισμού, που μπορούν να χρησιμοποιηθούν με <strong>όλα τα αποθετήρια</strong> κάτω από αυτόν τον οργανισμό
11201121
org_labels_desc_manage=διαχείριση
11211122

1123+
milestone=Ορόσημο
11221124
milestones=Ορόσημα
11231125
commits=Υποβολές
11241126
commit=Υποβολή
@@ -2590,6 +2592,7 @@ teams.invite.by=Προσκλήθηκε από %s
25902592
teams.invite.description=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για συμμετοχή στην ομάδα.
25912593

25922594

2595+
25932596
[admin]
25942597
dashboard=Πίνακας Ελέγχου
25952598
identity_access=Ταυτότητα & Πρόσβαση

options/locale/locale_en-US.ini

+2
Original file line numberDiff line numberDiff line change
@@ -2331,6 +2331,8 @@ settings.event_fork = Fork
23312331
settings.event_fork_desc = Repository forked.
23322332
settings.event_wiki = Wiki
23332333
settings.event_wiki_desc = Wiki page created, renamed, edited or deleted.
2334+
settings.event_statuses = Statuses
2335+
settings.event_statuses_desc = Commit Status updated from the API.
23342336
settings.event_release = Release
23352337
settings.event_release_desc = Release published, updated or deleted in a repository.
23362338
settings.event_push = Push

options/locale/locale_es-ES.ini

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ webauthn_reload=Recargar
5252
repository=Repositorio
5353
organization=Organización
5454
mirror=Réplica
55+
issue_milestone=Hito
5556
new_repo=Nuevo repositorio
5657
new_migrate=Nueva migración
5758
new_mirror=Nueva réplica
@@ -1109,6 +1110,7 @@ labels=Etiquetas
11091110
org_labels_desc=Etiquetas de nivel de la organización que pueden ser utilizadas con <strong>todos los repositorios</strong> bajo esta organización
11101111
org_labels_desc_manage=gestionar
11111112

1113+
milestone=Hito
11121114
milestones=Hitos
11131115
commits=Commits
11141116
commit=Commit
@@ -2571,6 +2573,7 @@ teams.invite.by=Invitado por %s
25712573
teams.invite.description=Por favor, haga clic en el botón de abajo para unirse al equipo.
25722574
25732575
2576+
25742577
[admin]
25752578
dashboard=Panel de control
25762579
identity_access=Identidad y acceso

options/locale/locale_fa-IR.ini

+1
Original file line numberDiff line numberDiff line change
@@ -1993,6 +1993,7 @@ teams.all_repositories_write_permission_desc=این تیم دسترسی<strong>
19931993
teams.all_repositories_admin_permission_desc=این تیم دسترسی<strong> مدیر </strong> به <strong> مخازن همه</strong> را می بخشد: اعضا می توانند مخازن را بخواند، همکار و مخزن اضافه کنند.
19941994

19951995

1996+
19961997
[admin]
19971998
dashboard=پیشخوان
19981999
users=حساب کاربران

options/locale/locale_fi-FI.ini

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ webauthn_reload=Päivitä
4949
repository=Repo
5050
organization=Organisaatio
5151
mirror=Peili
52+
issue_milestone=Merkkipaalu
5253
new_repo=Uusi repo
5354
new_migrate=Uusi migraatio
5455
new_mirror=Uusi peilaus
@@ -720,6 +721,7 @@ projects=Projektit
720721
packages=Paketit
721722
labels=Tunnisteet
722723

724+
milestone=Merkkipaalu
723725
milestones=Merkkipaalut
724726
commits=Commitit
725727
commit=Commit
@@ -1361,6 +1363,7 @@ teams.members.none=Ei jäseniä tässä tiimissä.
13611363
teams.all_repositories=Kaikki repot
13621364

13631365

1366+
13641367
[admin]
13651368
dashboard=Kojelauta
13661369
users=Käyttäjätilit

options/locale/locale_fr-FR.ini

+4-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ webauthn_reload=Recharger
5454
repository=Dépôt
5555
organization=Organisation
5656
mirror=Miroir
57+
issue_milestone=Jalon
5758
new_repo=Nouveau dépôt
5859
new_migrate=Nouvelle migration
5960
new_mirror=Nouveau miroir
@@ -1172,7 +1173,7 @@ migrate_items_releases=Publications
11721173
migrate_repo=Migrer le dépôt
11731174
migrate.clone_address=Migrer/Cloner depuis une URL
11741175
migrate.clone_address_desc=L'URL HTTP(S) ou Git "clone" d'un dépôt existant
1175-
migrate.github_token_desc=Vous pouvez mettre un ou plusieurs jetons séparés par des virgules ici pour rendre la migration plus rapide en raison de la limite de débit de l'API GitHub. ATTENTION : Abuser de cette fonctionnalité peut enfreindre la politique du fournisseur de services et entraîner un blocage de compte.
1176+
migrate.github_token_desc=Vous pouvez mettre un ou plusieurs jetons séparés par des virgules ici pour rendre la migration plus rapide et contourner la limite de débit de lAPI GitHub. ATTENTION : Abuser de cette fonctionnalité peut enfreindre la politique du fournisseur de service et entraîner un blocage de votre compte.
11761177
migrate.clone_local_path=ou un chemin serveur local
11771178
migrate.permission_denied=Vous n'êtes pas autorisé à importer des dépôts locaux.
11781179
migrate.permission_denied_blocked=Vous ne pouvez pas importer depuis des hôtes interdits, veuillez demander à l'administrateur de vérifier les paramètres ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS.
@@ -1253,6 +1254,7 @@ labels=Labels
12531254
org_labels_desc=Les labels d'une organisation peuvent être utilisés avec <strong>tous les dépôts</strong> de cette organisation.
12541255
org_labels_desc_manage=gérer
12551256

1257+
milestone=Jalon
12561258
milestones=Jalons
12571259
commits=Révisions
12581260
commit=Révision
@@ -2875,6 +2877,7 @@ view_as_role=Voir en tant que %s
28752877
view_as_public_hint=Vous visualisez le README en tant qu’utilisateur public.
28762878
view_as_member_hint=Vous visualisez le README en tant que membre de cette organisation.
28772879

2880+
28782881
[admin]
28792882
maintenance=Maintenance
28802883
dashboard=Tableau de bord

options/locale/locale_ga-IE.ini

+13
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ webauthn_reload=Athlódáil
5454
repository=Stór
5555
organization=Eagraíocht
5656
mirror=Scáthán
57+
issue_milestone=Cloch Mhíle
5758
new_repo=Stór Nua
5859
new_migrate=Imirce Nua
5960
new_mirror=Scáthán Nua
@@ -1253,6 +1254,7 @@ labels=Lipéid
12531254
org_labels_desc=Lipéid ar leibhéal eagraíochta is féidir a úsáid le <strong>gach stóras</strong> faoin eagraíocht seo
12541255
org_labels_desc_manage=bainistigh
12551256

1257+
milestone=Cloch Mhíle
12561258
milestones=Clocha míle
12571259
commits=Tiomáintí
12581260
commit=Tiomantas
@@ -1345,6 +1347,8 @@ editor.new_branch_name_desc=Ainm brainse nua…
13451347
editor.cancel=Cealaigh
13461348
editor.filename_cannot_be_empty=Ní féidir ainm an chomhaid a bheith folamh.
13471349
editor.filename_is_invalid=Tá ainm an chomhaid neamhbhailí: "%s".
1350+
editor.commit_email=Tiomantas ríomhphost
1351+
editor.invalid_commit_email=Tá an ríomhphost don ghealltanas neamhbhailí.
13481352
editor.branch_does_not_exist=Níl brainse "%s" ann sa stóras seo.
13491353
editor.branch_already_exists=Tá brainse "%s" ann cheana féin sa stóras seo.
13501354
editor.directory_is_a_file=Úsáidtear ainm eolaire "%s" cheana féin mar ainm comhaid sa stóras seo.
@@ -2873,6 +2877,15 @@ view_as_role=Féach mar: %s
28732877
view_as_public_hint=Tá tú ag féachaint ar an README mar úsáideoir poiblí.
28742878
view_as_member_hint=Tá tú ag féachaint ar an README mar bhall den eagraíocht seo.
28752879

2880+
worktime=Am oibre
2881+
worktime.date_range_start=Dáta tosaithe
2882+
worktime.date_range_end=Dáta deiridh
2883+
worktime.query=Ceist
2884+
worktime.time=Am
2885+
worktime.by_repositories=De réir stórtha
2886+
worktime.by_milestones=De réir clocha míle
2887+
worktime.by_members=Ag baill
2888+
28762889
[admin]
28772890
maintenance=Cothabháil
28782891
dashboard=Deais

options/locale/locale_hu-HU.ini

+1
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,7 @@ teams.specific_repositories=Meghatározott tárolók
12291229
teams.all_repositories=Minden tároló
12301230

12311231

1232+
12321233
[admin]
12331234
dashboard=Műszerfal
12341235
users=Felhasználói fiókok

options/locale/locale_id-ID.ini

+1
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,7 @@ teams.delete_team_success=Tim sudah di hapus.
10841084
teams.repositories=Tim repositori
10851085

10861086

1087+
10871088
[admin]
10881089
dashboard=Dasbor
10891090
organizations=Organisasi

options/locale/locale_is-IS.ini

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ webauthn_reload=Endurhlaða
4949
repository=Hugbúnaðarsafn
5050
organization=Stofnun
5151
mirror=Speglun
52+
issue_milestone=Tímamót
5253
new_repo=Nýtt Hugbúnaðarsafn
5354
new_migrate=Nýr Flutningur
5455
new_mirror=Ný Speglun
@@ -652,6 +653,7 @@ projects=Verkefni
652653
packages=Pakkar
653654
labels=Skýringar
654655

656+
milestone=Tímamót
655657
milestones=Tímamót
656658
commits=Framlög
657659
commit=Framlag
@@ -1137,6 +1139,7 @@ teams.update_settings=Uppfæra Stillingar
11371139
teams.all_repositories=Öll hugbúnaðarsöfn
11381140

11391141

1142+
11401143
[admin]
11411144
repositories=Hugbúnaðarsöfn
11421145
config=Stilling

options/locale/locale_it-IT.ini

+3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ webauthn_reload=Ricarica
5050
repository=Repository
5151
organization=Organizzazione
5252
mirror=Mirror
53+
issue_milestone=Traguardo
5354
new_repo=Nuovo Repository
5455
new_migrate=Nuova Migrazione
5556
new_mirror=Nuovo Mirror
@@ -942,6 +943,7 @@ labels=Etichette
942943
org_labels_desc=Etichette a livello di organizzazione che possono essere utilizzate con <strong>tutti i repository</strong> sotto questa organizzazione
943944
org_labels_desc_manage=gestisci
944945
946+
milestone=Traguardo
945947
milestones=Traguardi
946948
commits=Commit
947949
commit=Commit
@@ -2154,6 +2156,7 @@ teams.all_repositories_write_permission_desc=Questo team concede <strong>permess
21542156
teams.all_repositories_admin_permission_desc=Questo team concede a <strong>Amministratore</strong> l'accesso a <strong>tutte le repository</strong>: i membri possono leggere, pushare e aggiungere collaboratori alle repository.
21552157
21562158
2159+
21572160
[admin]
21582161
dashboard=Pannello di Controllo
21592162
users=Account utenti

options/locale/locale_ja-JP.ini

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ webauthn_reload=リロード
5454
repository=リポジトリ
5555
organization=組織
5656
mirror=ミラー
57+
issue_milestone=マイルストーン
5758
new_repo=新しいリポジトリ
5859
new_migrate=新しい移行
5960
new_mirror=新しいミラー
@@ -1253,6 +1254,7 @@ labels=ラベル
12531254
org_labels_desc=組織で定義されているラベル (組織の<strong>すべてのリポジトリ</strong>で使用可能なもの)
12541255
org_labels_desc_manage=編集
12551256

1257+
milestone=マイルストーン
12561258
milestones=マイルストーン
12571259
commits=コミット
12581260
commit=コミット
@@ -2873,6 +2875,7 @@ view_as_role=表示: %s
28732875
view_as_public_hint=READMEを公開ユーザーとして見ています。
28742876
view_as_member_hint=READMEをこの組織のメンバーとして見ています。
28752877

2878+
28762879
[admin]
28772880
maintenance=メンテナンス
28782881
dashboard=ダッシュボード

options/locale/locale_ko-KR.ini

+1
Original file line numberDiff line numberDiff line change
@@ -1191,6 +1191,7 @@ teams.add_duplicate_users=사용자가 이미 팀 멤버입니다.
11911191
teams.members.none=이 팀에 멤버가 없습니다.
11921192

11931193

1194+
11941195
[admin]
11951196
dashboard=대시보드
11961197
users=사용자 계정

options/locale/locale_lv-LV.ini

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ webauthn_reload=Pārlādēt
5454
repository=Repozitorijs
5555
organization=Organizācija
5656
mirror=Spogulis
57+
issue_milestone=Atskaites punktus
5758
new_repo=Jauns repozitorijs
5859
new_migrate=Jauna migrācija
5960
new_mirror=Jauns spogulis
@@ -1125,6 +1126,7 @@ labels=Iezīmes
11251126
org_labels_desc=Organizācijas līmeņa iezīmes var tikt izmantotas <strong>visiem repozitorijiem</strong> šajā organizācijā
11261127
org_labels_desc_manage=pārvaldīt
11271128

1129+
milestone=Atskaites punktus
11281130
milestones=Atskaites punkti
11291131
commits=Revīzijas
11301132
commit=Revīzija
@@ -2593,6 +2595,7 @@ teams.invite.by=Uzaicināja %s
25932595
teams.invite.description=Nospiediet pogu zemāk, lai pievienotos komandai.
25942596
25952597
2598+
25962599
[admin]
25972600
dashboard=Infopanelis
25982601
self_check=Pašpārbaude

0 commit comments

Comments
 (0)