diff options
| author | Unknwon <u@gogs.io> | 2017-02-08 18:43:46 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-02-08 18:43:46 -0500 |
| commit | afab38b0d74c65e1deb4348a411cd3a13a641b74 (patch) | |
| tree | 02f9083504b354c41812f30cd6d52677b12c6c60 /cmd | |
| parent | ede58ade4c5f5729ae225e3330802aa645973d54 (diff) | |
routers/repo/pull: fix 404 on PR compare (#4074)
Due to recent code refactor, ctx.PullRequest is not initialized for
route repo.CompareAndPullRequest, which leads the UI thinks the
compare is not happening inside the same repository.
The current fix is to allow compare URL to include redundant head
user name so everything works fine again, but code logic isn't
as clean as before.
Made comments about possible future fix.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/web.go | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -525,6 +525,10 @@ func runWeb(ctx *cli.Context) error { ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount }) + // FIXME: Should use ctx.Repo.PullRequest to unify template, currently we have inconsistent URL + // for PR in same repository. After select branch on the page, the URL contains redundant head user name. + // e.g. /org1/test-repo/compare/master...org1:develop + // which should be /org1/test-repo/compare/master...develop m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest). Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost) |