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 }