Fix SHA regexp and commit comparisons

tokarchuk/v1.17
Thibault Meyer 8 years ago
parent 6bcff7828f
commit a79eb48de3
No known key found for this signature in database
GPG Key ID: C52D76D2CCF24933
  1. 8
      cmd/web.go

@ -99,7 +99,7 @@ func checkVersion() {
for _, c := range checkers { for _, c := range checkers {
if !version.Compare(c.Version(), c.Expected, ">=") { if !version.Compare(c.Version(), c.Expected, ">=") {
log.Fatal(4, `Dependency outdated! log.Fatal(4, `Dependency outdated!
Package '%s' current version (%s) is below requirement (%s), Package '%s' current version (%s) is below requirement (%s),
please use following command to update this package and recompile Gogs: please use following command to update this package and recompile Gogs:
go get -u %[1]s`, c.ImportPath, c.Version(), c.Expected) go get -u %[1]s`, c.ImportPath, c.Version(), c.Expected)
} }
@ -585,12 +585,12 @@ func runWeb(ctx *cli.Context) error {
m.Get("/src/*", repo.Home) m.Get("/src/*", repo.Home)
m.Get("/raw/*", repo.SingleDownload) m.Get("/raw/*", repo.SingleDownload)
m.Get("/commits/*", repo.RefCommits) m.Get("/commits/*", repo.RefCommits)
m.Get("/commit/:sha([a-z0-9]{7,40})$", repo.Diff) m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.Diff)
m.Get("/forks", repo.Forks) m.Get("/forks", repo.Forks)
}, context.RepoRef()) }, context.RepoRef())
m.Get("/commit/:sha([a-z0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff) m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff)
m.Get("/compare/:before([a-z0-9]{7,40})\\.\\.\\.:after([a-z0-9]{7,40})", repo.CompareDiff) m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.CompareDiff)
}, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare) }, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare)
m.Group("/:username/:reponame", func() { m.Group("/:username/:reponame", func() {
m.Get("/stars", repo.Stars) m.Get("/stars", repo.Stars)

Loading…
Cancel
Save