From eb67c4c109e10724efe9651d241bae5d82aa94e7 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 18 Apr 2025 22:56:50 +0800 Subject: [PATCH] Fix some trivial problems (#34237) 1. Using existing "content" variable in `swift.go` 2. Do not report 500 server error in `GetPullDiffStats` middleware, otherwise a PR missing ref won't be able to view. 3. Fix the abused "label button" when listing commits, there was too much padding space, see the screenshot below. (cherry picked from commit ba0deab6167236db89c975123570089452776599) --- routers/api/packages/swift/swift.go | 2 +- routers/web/repo/pull.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index 2c6db75de1..a65bd31cd9 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -304,7 +304,7 @@ func formFileOptionalReadCloser(ctx *context.Context, formKey string) (io.ReadCl if content == "" { return nil, nil } - return io.NopCloser(strings.NewReader(ctx.Req.FormValue(formKey))), nil + return io.NopCloser(strings.NewReader(content)), nil } // UploadPackageFile refers to https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#endpoint-6 diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 7ae7fd416c..e43ce9945a 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -401,6 +401,7 @@ func setMergeTarget(ctx *context.Context, pull *issues_model.PullRequest) { // GetPullDiffStats get Pull Requests diff stats func GetPullDiffStats(ctx *context.Context) { + // FIXME: this getPullInfo seems to be a duplicate call with other route handlers issue, ok := getPullInfo(ctx) if !ok { return @@ -408,15 +409,15 @@ func GetPullDiffStats(ctx *context.Context) { pull := issue.PullRequest mergeBaseCommitID := GetMergedBaseCommitID(ctx, issue) - if mergeBaseCommitID == "" { ctx.NotFound("PullFiles", nil) return } + // do not report 500 server error to end users if error occurs, otherwise a PR missing ref won't be able to view. headCommitID, err := ctx.Repo.GitRepo.GetRefCommitID(pull.GetGitRefName()) if err != nil { - ctx.ServerError("GetRefCommitID", err) + log.Error("Failed to GetRefCommitID: %v, repo: %v", err, ctx.Repo.Repository.FullName()) return }