diff options
| author | Unknwon <u@gogs.io> | 2015-08-08 22:43:14 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-08 22:43:14 +0800 |
| commit | dea3a8c6a42ea7e4921c0e4beee5d4fd0437dbe5 (patch) | |
| tree | 773b28a72cee24e4a02f3d162de8a37a8f912f59 /cmd | |
| parent | d015d951bd6959f9585d8a83acfe7bba07b7eaad (diff) | |
| download | gitea-dea3a8c6a42ea7e4921c0e4beee5d4fd0437dbe5.tar.gz gitea-dea3a8c6a42ea7e4921c0e4beee5d4fd0437dbe5.zip | |
WIP: create PR - choose branch
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/serve.go | 6 | ||||
| -rw-r--r-- | cmd/web.go | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmd/serve.go b/cmd/serve.go index 9638da8bae..ec1da3beef 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -146,12 +146,12 @@ func runServ(c *cli.Context) { fail("Key permission denied", "Cannot push with deployment key: %d", key.ID) } // Check if this deploy key belongs to current repository. - if !models.HasDeployKey(key.ID, repo.Id) { - fail("Key access denied", "Key access denied: %d-%d", key.ID, repo.Id) + if !models.HasDeployKey(key.ID, repo.ID) { + fail("Key access denied", "Key access denied: %d-%d", key.ID, repo.ID) } // Update deploy key activity. - deployKey, err := models.GetDeployKeyByRepo(key.ID, repo.Id) + deployKey, err := models.GetDeployKeyByRepo(key.ID, repo.ID) if err != nil { fail("Internal error", "GetDeployKey: %v", err) } diff --git a/cmd/web.go b/cmd/web.go index 850dc84b51..2c931a59ba 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -449,6 +449,8 @@ func runWeb(ctx *cli.Context) { m.Get("/edit/:tagname", repo.EditRelease) m.Post("/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) }, reqRepoAdmin, middleware.RepoRef()) + + m.Combo("/compare/*").Get(repo.CompareAndPullRequest) }, reqSignIn, middleware.RepoAssignment(true)) m.Group("/:username/:reponame", func() { @@ -469,7 +471,7 @@ func runWeb(ctx *cli.Context) { m.Get("/commit/*", repo.Diff) }, middleware.RepoRef()) - m.Get("/compare/:before([a-z0-9]+)...:after([a-z0-9]+)", repo.CompareDiff) + m.Get("/compare/:before([a-z0-9]{40})...:after([a-z0-9]{40})", repo.CompareDiff) }, ignSignIn, middleware.RepoAssignment(true)) m.Group("/:username", func() { |