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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 16 additions & 0 deletions
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

Lines changed: 6 additions & 4 deletions
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

Lines changed: 6 additions & 1 deletion
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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=حساب کاربران

0 commit comments

Comments
 (0)