Skip to content

Commit 0d2c650

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix the runs will not be displayed bug when the main branch have no workflows but other branches have (go-gitea#28359) [skip ci] Updated translations via Crowdin Render PyPi long description as document (go-gitea#28272) handle repository.size column being NULL in migration v263 (go-gitea#28336) Fix migration panic due to an empty review comment diff (go-gitea#28334) Add `HEAD` support for rpm repo files (go-gitea#28309) Remove deprecated query condition in ListReleases (go-gitea#28339)
2 parents 8fcd936 + 09d5028 commit 0d2c650

File tree

11 files changed

+46
-20
lines changed

11 files changed

+46
-20
lines changed

models/migrations/v1_21/v263.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ func AddGitSizeAndLFSSizeToRepositoryTable(x *xorm.Engine) error {
3232
return err
3333
}
3434

35-
_, err = sess.Exec(`UPDATE repository SET git_size = size - lfs_size`)
35+
_, err = sess.Exec(`UPDATE repository SET size = 0 WHERE size IS NULL`)
36+
if err != nil {
37+
return err
38+
}
39+
40+
_, err = sess.Exec(`UPDATE repository SET git_size = size - lfs_size WHERE size > lfs_size`)
3641
if err != nil {
3742
return err
3843
}

modules/templates/util_render.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ func RenderMarkdownToHtml(ctx context.Context, input string) template.HTML { //n
230230
output, err := markdown.RenderString(&markup.RenderContext{
231231
Ctx: ctx,
232232
URLPrefix: setting.AppSubURL,
233+
Metas: map[string]string{"mode": "document"},
233234
}, input)
234235
if err != nil {
235236
log.Error("RenderString: %v", err)

options/locale/locale_pt-PT.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3305,7 +3305,7 @@ error.unit_not_allowed=Não tem permissão para aceder a esta parte do repositó
33053305
title=Pacotes
33063306
desc=Gerir pacotes do repositório.
33073307
empty=Ainda não há pacotes.
3308-
empty.documentation=Para obter mais informação sobre o registo de pacotes, veja <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/usage/packages/overview/">a documentação</a>.
3308+
empty.documentation=Para obter mais informação sobre o registo de pacotes, veja <a target="_blank" rel="noopener noreferrer" href="%s">a documentação</a>.
33093309
empty.repo=Carregou um pacote mas este não é apresentado aqui? Vá às <a href="%[1]s">configurações do pacote</a> e ligue-o a este repositório.
33103310
registry.documentation=Para mais informação sobre o registo %s, veja <a target="_blank" rel="noopener noreferrer" href="%s">a documentação</a>.
33113311
filter.type=Tipo

routers/api/packages/api.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,10 @@ func CommonRoutes() *web.Route {
520520
r.Get("", rpm.DownloadPackageFile)
521521
r.Delete("", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
522522
})
523-
r.Get("/repodata/{filename}", rpm.GetRepositoryFile)
523+
r.Group("/repodata/{filename}", func() {
524+
r.Head("", rpm.CheckRepositoryFileExistence)
525+
r.Get("", rpm.GetRepositoryFile)
526+
})
524527
}, reqPackageAccess(perm.AccessModeRead))
525528
r.Group("/rubygems", func() {
526529
r.Get("/specs.4.8.gz", rubygems.EnumeratePackages)

routers/api/packages/rpm/rpm.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,30 @@ func GetRepositoryKey(ctx *context.Context) {
5757
})
5858
}
5959

60+
func CheckRepositoryFileExistence(ctx *context.Context) {
61+
pv, err := rpm_service.GetOrCreateRepositoryVersion(ctx, ctx.Package.Owner.ID)
62+
if err != nil {
63+
apiError(ctx, http.StatusInternalServerError, err)
64+
return
65+
}
66+
67+
pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, ctx.Params("filename"), packages_model.EmptyFileKey)
68+
if err != nil {
69+
if errors.Is(err, util.ErrNotExist) {
70+
ctx.Status(http.StatusNotFound)
71+
} else {
72+
apiError(ctx, http.StatusInternalServerError, err)
73+
}
74+
return
75+
}
76+
77+
ctx.SetServeHeaders(&context.ServeHeaderOptions{
78+
Filename: pf.Name,
79+
LastModified: pf.CreatedUnix.AsLocalTime(),
80+
})
81+
ctx.Status(http.StatusOK)
82+
}
83+
6084
// Gets a pre-generated repository metadata file
6185
func GetRepositoryFile(ctx *context.Context) {
6286
pv, err := rpm_service.GetOrCreateRepositoryVersion(ctx, ctx.Package.Owner.ID)

routers/api/v1/repo/release.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@ func ListReleases(ctx *context.APIContext) {
133133
// in: query
134134
// description: filter (exclude / include) pre-releases
135135
// type: boolean
136-
// - name: per_page
137-
// in: query
138-
// description: page size of results, deprecated - use limit
139-
// type: integer
140-
// deprecated: true
141136
// - name: page
142137
// in: query
143138
// description: page number of results to return (1-based)
@@ -152,9 +147,6 @@ func ListReleases(ctx *context.APIContext) {
152147
// "404":
153148
// "$ref": "#/responses/notFound"
154149
listOptions := utils.GetListOptions(ctx)
155-
if listOptions.PageSize == 0 && ctx.FormInt("per_page") != 0 {
156-
listOptions.PageSize = ctx.FormInt("per_page")
157-
}
158150

159151
opts := repo_model.FindReleasesOptions{
160152
ListOptions: listOptions,

routers/web/repo/actions/actions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ func List(ctx *context.Context) {
200200
pager.AddParamString("actor", fmt.Sprint(actorID))
201201
pager.AddParamString("status", fmt.Sprint(status))
202202
ctx.Data["Page"] = pager
203+
ctx.Data["HasWorkflowsOrRuns"] = len(workflows) > 0 || len(runs) > 0
203204

204205
ctx.HTML(http.StatusOK, tplListActions)
205206
}

services/migrations/gitea_uploader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
862862
line := comment.Line
863863
if line != 0 {
864864
comment.Position = 1
865-
} else {
865+
} else if comment.DiffHunk != "" {
866866
_, _, line, _ = git.ParseDiffHunkString(comment.DiffHunk)
867867
}
868868

templates/repo/actions/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui container">
55
{{template "base/alert" .}}
66

7-
{{if .workflows}}
7+
{{if .HasWorkflowsOrRuns}}
88
<div class="ui stackable grid">
99
<div class="four wide column">
1010
<div class="ui fluid vertical menu">

templates/swagger/v1_json.tmpl

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)