loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request '[BUG] Use correct SHA in `GetCommitPullRequest`' (#4377) from gusted/commit-to-pull into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4377
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>

+15 -1
+1 -1
routers/api/v1/repo/commits.go
··· 354 354 // "404": 355 355 // "$ref": "#/responses/notFound" 356 356 357 - pr, err := issues_model.GetPullRequestByMergedCommit(ctx, ctx.Repo.Repository.ID, ctx.Params(":sha")) 357 + pr, err := issues_model.GetPullRequestByMergedCommit(ctx, ctx.Repo.Repository.ID, ctx.Params("ref")) 358 358 if err != nil { 359 359 if issues_model.IsErrPullRequestNotExist(err) { 360 360 ctx.Error(http.StatusNotFound, "GetPullRequestByMergedCommit", err)
+14
tests/integration/api_repo_test.go
··· 749 749 DecodeJSON(t, resp, &repo) 750 750 assert.EqualValues(t, "sha1", repo.ObjectFormatName) 751 751 } 752 + 753 + func TestAPIRepoCommitPull(t *testing.T) { 754 + defer tests.PrepareTestEnv(t)() 755 + 756 + var pr api.PullRequest 757 + req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/commits/1a8823cd1a9549fde083f992f6b9b87a7ab74fb3/pull") 758 + resp := MakeRequest(t, req, http.StatusOK) 759 + 760 + DecodeJSON(t, resp, &pr) 761 + assert.EqualValues(t, 1, pr.ID) 762 + 763 + req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/commits/not-a-commit/pull") 764 + MakeRequest(t, req, http.StatusNotFound) 765 + }