mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-08-19 17:01:12 +00:00
[v12.0/forgejo] fix: redirect from /{username}/{reponame}/pulls/{index} to issue if index is a issue (#8876)
Some checks failed
testing-integration / test-unit (push) Has been skipped
testing-integration / test-sqlite (push) Has been skipped
testing / backend-checks (push) Has been skipped
testing / frontend-checks (push) Has been skipped
testing / test-unit (push) Has been skipped
testing / test-e2e (push) Has been skipped
testing / test-mysql (push) Has been skipped
testing / test-pgsql (push) Has been skipped
testing / test-sqlite (push) Has been skipped
testing / test-remote-cacher (redis) (push) Has been skipped
testing / test-remote-cacher (valkey) (push) Has been skipped
testing / test-remote-cacher (garnet) (push) Has been skipped
testing / test-remote-cacher (redict) (push) Has been skipped
testing / security-check (push) Has been skipped
/ release (push) Has been cancelled
Some checks failed
testing-integration / test-unit (push) Has been skipped
testing-integration / test-sqlite (push) Has been skipped
testing / backend-checks (push) Has been skipped
testing / frontend-checks (push) Has been skipped
testing / test-unit (push) Has been skipped
testing / test-e2e (push) Has been skipped
testing / test-mysql (push) Has been skipped
testing / test-pgsql (push) Has been skipped
testing / test-sqlite (push) Has been skipped
testing / test-remote-cacher (redis) (push) Has been skipped
testing / test-remote-cacher (valkey) (push) Has been skipped
testing / test-remote-cacher (garnet) (push) Has been skipped
testing / test-remote-cacher (redict) (push) Has been skipped
testing / security-check (push) Has been skipped
/ release (push) Has been cancelled
**Backport:** !8874 conflict resolved by accepting the incomming hunk and removing TestIssueTimelineLabels-func Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8876 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: floss4good <floss4good@noreply.codeberg.org> Co-authored-by: zokki <zokki.softwareschmiede@gmail.com> Co-committed-by: zokki <zokki.softwareschmiede@gmail.com>
This commit is contained in:
parent
2941adfd11
commit
100ddf45a7
2 changed files with 33 additions and 1 deletions
|
@ -360,7 +360,7 @@ func getPullInfo(ctx *context.Context) (issue *issues_model.Issue, ok bool) {
|
||||||
ctx.Data["Issue"] = issue
|
ctx.Data["Issue"] = issue
|
||||||
|
|
||||||
if !issue.IsPull {
|
if !issue.IsPull {
|
||||||
ctx.NotFound("ViewPullCommits", nil)
|
ctx.Redirect(issue.Link())
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1526,3 +1526,35 @@ func TestIssuePostersSearch(t *testing.T) {
|
||||||
assert.EqualValues(t, 1, data.Results[0].UserID)
|
assert.EqualValues(t, 1, data.Results[0].UserID)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestIssueAndPullRedirect(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
req := NewRequest(t, "GET", "/user2/repo1/issues/1")
|
||||||
|
MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/pulls/2")
|
||||||
|
MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/pulls/1")
|
||||||
|
resp := MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
assert.Equal(t, "/user2/repo1/issues/1", resp.Header().Get("Location"))
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/pulls/1/commits")
|
||||||
|
resp = MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
assert.Equal(t, "/user2/repo1/issues/1", resp.Header().Get("Location"))
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/pulls/1/files")
|
||||||
|
resp = MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
assert.Equal(t, "/user2/repo1/issues/1", resp.Header().Get("Location"))
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/issues/2")
|
||||||
|
resp = MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
assert.Equal(t, "/user2/repo1/pulls/2", resp.Header().Get("Location"))
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/issues/9999999")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
|
||||||
|
req = NewRequest(t, "GET", "/user2/repo1/pulls/9999999")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue