Skip to content

Commit 35bb7e7

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 6f1b199 + 55d5a74 commit 35bb7e7

Some content is hidden

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

42 files changed

+357
-420
lines changed

go.mod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ module code.gitea.io/gitea
22

33
go 1.23
44

5+
// rfc5280 said: "The serial number is an integer assigned by the CA to each certificate."
6+
// But some CAs use negative serial number, just relax the check. related:
7+
// Default TLS cert uses negative serial number #895 https://github.com/microsoft/mssql-docker/issues/895
8+
godebug x509negativeserial=1
9+
510
require (
611
code.gitea.io/actions-proto-go v0.4.0
712
code.gitea.io/gitea-vet v0.2.3

models/issues/review.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (r *Review) TooltipContent() string {
247247
}
248248
return "repo.issues.review.official"
249249
case ReviewTypeComment:
250-
return "repo.issues.review.comment"
250+
return "repo.issues.review.commented"
251251
case ReviewTypeReject:
252252
return "repo.issues.review.rejected"
253253
case ReviewTypeRequest:

models/repo/release.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ type FindReleasesOptions struct {
234234
IsDraft optional.Option[bool]
235235
TagNames []string
236236
HasSha1 optional.Option[bool] // useful to find draft releases which are created with existing tags
237+
NamePattern optional.Option[string]
237238
}
238239

239240
func (opts FindReleasesOptions) ToConds() builder.Cond {
@@ -261,6 +262,11 @@ func (opts FindReleasesOptions) ToConds() builder.Cond {
261262
cond = cond.And(builder.Eq{"sha1": ""})
262263
}
263264
}
265+
266+
if opts.NamePattern.Has() && opts.NamePattern.Value() != "" {
267+
cond = cond.And(builder.Like{"lower_tag_name", strings.ToLower(opts.NamePattern.Value())})
268+
}
269+
264270
return cond
265271
}
266272

modules/templates/util_avatar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func AvatarHTML(src string, size int, class, name string) template.HTML {
3434
name = "avatar"
3535
}
3636

37-
return template.HTML(`<img class="` + class + `" src="` + src + `" title="` + html.EscapeString(name) + `" width="` + sizeStr + `" height="` + sizeStr + `"/>`)
37+
return template.HTML(`<img loading="lazy" class="` + class + `" src="` + src + `" title="` + html.EscapeString(name) + `" width="` + sizeStr + `" height="` + sizeStr + `"/>`)
3838
}
3939

4040
// Avatar renders user avatars. args: user, size (int), class (string)

options/locale/locale_cs-CZ.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ string.desc=Z – A
218218

219219
[error]
220220
occurred=Došlo k chybě
221-
missing_csrf=Špatný požadavek: Neexistuje CSRF token
222-
invalid_csrf=Špatný požadavek: Neplatný CSRF token
223221
not_found=Cíl nebyl nalezen.
224222
network_error=Chyba sítě
225223

@@ -1701,7 +1699,6 @@ issues.dependency.add_error_dep_not_same_repo=Oba úkoly musí být ve stejném
17011699
issues.review.self.approval=Nemůžete schválit svůj pull request.
17021700
issues.review.self.rejection=Nemůžete požadovat změny ve svém vlastním pull requestu.
17031701
issues.review.approve=schválil tyto změny %s
1704-
issues.review.comment=Okomentovat
17051702
issues.review.dismissed=zamítl/a posouzení od %s %s
17061703
issues.review.dismissed_label=Zamítnuto
17071704
issues.review.left_comment=zanechal komentář
@@ -1726,6 +1723,7 @@ issues.review.hide_resolved=Skrýt vyřešené
17261723
issues.review.resolve_conversation=Vyřešit konverzaci
17271724
issues.review.un_resolve_conversation=Nevyřešit konverzaci
17281725
issues.review.resolved_by=označil tuto konverzaci jako vyřešenou
1726+
issues.review.commented=Okomentovat
17291727
issues.assignee.error=Ne všichni zpracovatelé byli přidáni z důvodu neočekávané chyby.
17301728
issues.reference_issue.body=Tělo zprávy
17311729
issues.content_history.deleted=vymazáno

options/locale/locale_de-DE.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ string.desc=Z–A
213213

214214
[error]
215215
occurred=Ein Fehler ist aufgetreten
216-
missing_csrf=Fehlerhafte Anfrage: Kein CSRF Token verfügbar
217-
invalid_csrf=Fehlerhafte Anfrage: Ungültiger CSRF Token
218216
not_found=Das Ziel konnte nicht gefunden werden.
219217
network_error=Netzwerkfehler
220218

@@ -1681,7 +1679,6 @@ issues.dependency.add_error_dep_not_same_repo=Beide Issues müssen sich im selbe
16811679
issues.review.self.approval=Du kannst nicht dein eigenen Pull-Request genehmigen.
16821680
issues.review.self.rejection=Du kannst keine Änderungen an deinem eigenen Pull-Request anfragen.
16831681
issues.review.approve=hat die Änderungen %s genehmigt
1684-
issues.review.comment=Kommentieren
16851682
issues.review.dismissed=verwarf %ss Review %s
16861683
issues.review.dismissed_label=Verworfen
16871684
issues.review.left_comment=hat einen Kommentar hinterlassen
@@ -1706,6 +1703,7 @@ issues.review.hide_resolved=Gelöste ausblenden
17061703
issues.review.resolve_conversation=Diskussion als "erledigt" markieren
17071704
issues.review.un_resolve_conversation=Diskussion als "nicht-erledigt" markieren
17081705
issues.review.resolved_by=markierte diese Unterhaltung als gelöst
1706+
issues.review.commented=Kommentieren
17091707
issues.assignee.error=Aufgrund eines unerwarteten Fehlers konnten nicht alle Beauftragten hinzugefügt werden.
17101708
issues.reference_issue.body=Beschreibung
17111709
issues.content_history.deleted=gelöscht

options/locale/locale_el-GR.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ string.desc=Z - A
184184

185185
[error]
186186
occurred=Παρουσιάστηκε ένα σφάλμα
187-
missing_csrf=Bad Request: δεν υπάρχει διακριτικό CSRF
188-
invalid_csrf=Λάθος Αίτημα: μη έγκυρο διακριτικό CSRF
189187
not_found=Ο προορισμός δεν βρέθηκε.
190188
network_error=Σφάλμα δικτύου
191189

@@ -1603,7 +1601,6 @@ issues.dependency.add_error_dep_not_same_repo=Και τα δύο ζητήματ
16031601
issues.review.self.approval=Δεν μπορείτε να εγκρίνετε το δικό σας pull request.
16041602
issues.review.self.rejection=Δεν μπορείτε να ζητήσετε αλλαγές στο δικό σας pull request.
16051603
issues.review.approve=ενέκρινε αυτές τις αλλαγές %s
1606-
issues.review.comment=Σχόλιο
16071604
issues.review.dismissed=απέρριψε την αξιολόγηση %s %s
16081605
issues.review.dismissed_label=Απορρίφθηκε
16091606
issues.review.left_comment=άφησε ένα σχόλιο
@@ -1628,6 +1625,7 @@ issues.review.hide_resolved=Απόκρυψη επιλυμένων
16281625
issues.review.resolve_conversation=Επίλυση συνομιλίας
16291626
issues.review.un_resolve_conversation=Ανεπίλυτη συνομιλία
16301627
issues.review.resolved_by=σημείωση αυτή την συνομιλία ως επιλυμένη
1628+
issues.review.commented=Σχόλιο
16311629
issues.assignee.error=Δεν προστέθηκαν όλοι οι παραλήπτες λόγω απροσδόκητου σφάλματος.
16321630
issues.reference_issue.body=Σώμα
16331631
issues.content_history.deleted=διαγράφηκε

options/locale/locale_en-US.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ code_search_by_git_grep = Current code search results are provided by "git grep"
178178
package_kind = Search packages...
179179
project_kind = Search projects...
180180
branch_kind = Search branches...
181+
tag_kind = Search tags...
182+
tag_tooltip = Search for matching tags. Use '%' to match any sequence of numbers.
181183
commit_kind = Search commits...
182184
runner_kind = Search runners...
183185
no_results = No matching results found.
@@ -220,8 +222,6 @@ string.desc = Z - A
220222
[error]
221223
occurred = An error occurred
222224
report_message = If you believe that this is a Gitea bug, please search for issues on <a href="%s" target="_blank">GitHub</a> or open a new issue if necessary.
223-
missing_csrf = Bad Request: no CSRF token present
224-
invalid_csrf = Bad Request: invalid CSRF token
225225
not_found = The target couldn't be found.
226226
network_error = Network error
227227
@@ -1757,7 +1757,7 @@ issues.review.hide_resolved = Hide resolved
17571757
issues.review.resolve_conversation = Resolve conversation
17581758
issues.review.un_resolve_conversation = Unresolve conversation
17591759
issues.review.resolved_by = marked this conversation as resolved
1760-
issues.review.comment = Comment
1760+
issues.review.commented = Comment
17611761
issues.review.official = Approved
17621762
issues.review.requested = Review pending
17631763
issues.review.rejected = Changes requested

options/locale/locale_es-ES.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@ string.desc=Z - A
182182

183183
[error]
184184
occurred=Ha ocurrido un error
185-
missing_csrf=Solicitud incorrecta: sin token CSRF
186-
invalid_csrf=Solicitud incorrecta: el token CSRF no es válido
187185
not_found=El objetivo no pudo ser encontrado.
188186
network_error=Error de red
189187

@@ -1593,7 +1591,6 @@ issues.dependency.add_error_dep_not_same_repo=Ambas incidencias deben estar en e
15931591
issues.review.self.approval=No puede aprobar su propio pull request.
15941592
issues.review.self.rejection=No puede sugerir cambios en su propio pull request.
15951593
issues.review.approve=aprobado estos cambios %s
1596-
issues.review.comment=Comentario
15971594
issues.review.dismissed=descartó la revisión de %s %s
15981595
issues.review.dismissed_label=Descartado
15991596
issues.review.left_comment=dejó un comentario
@@ -1618,6 +1615,7 @@ issues.review.hide_resolved=Ocultar resueltos
16181615
issues.review.resolve_conversation=Resolver conversación
16191616
issues.review.un_resolve_conversation=Marcar conversación sin resolver
16201617
issues.review.resolved_by=ha marcado esta conversación como resuelta
1618+
issues.review.commented=Comentario
16211619
issues.assignee.error=No todos los asignados fueron añadidos debido a un error inesperado.
16221620
issues.reference_issue.body=Cuerpo
16231621
issues.content_history.deleted=borrado

options/locale/locale_fa-IR.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ filter.private=خصوصی
118118
[filter]
119119

120120
[error]
121-
missing_csrf=درخواست بد: بلیط CSRF ندارد
122121

123122
[startpage]
124123
app_desc=یک سرویس گیت بی‌درد سر و راحت
@@ -1235,7 +1234,6 @@ issues.dependency.add_error_dep_not_same_repo=هر دو موضوع باید از
12351234
issues.review.self.approval=شما نمی‌توانید تقاضای واکشی خود را تایید کنید.
12361235
issues.review.self.rejection=شما نمی‌توانید تقاضا تغییرات تقاضای واکشی خود را تغییر دهید.
12371236
issues.review.approve=این تغییرات را تایید شدند %s
1238-
issues.review.comment=دیدگاه
12391237
issues.review.dismissed=بررسی %s %s را رد شده
12401238
issues.review.dismissed_label=رها شده
12411239
issues.review.left_comment=یک نظر ثبت کرد
@@ -1256,6 +1254,7 @@ issues.review.hide_resolved=مخفی کردن حل شده ها
12561254
issues.review.resolve_conversation=مکالمه را بعنوان حل شده علامت گذاری کردن
12571255
issues.review.un_resolve_conversation=مکالمه را بعنوان حل نشده علامت گذاری کردن
12581256
issues.review.resolved_by=علامت گذاری این مکالمه بعنوان حل شده
1257+
issues.review.commented=دیدگاه
12591258
issues.assignee.error=به دلیل خطای غیرمنتظره همه تکالیف اضافه نشد.
12601259
issues.reference_issue.body=Body
12611260
issues.content_history.deleted=حذف شده

0 commit comments

Comments
 (0)