aboutsummaryrefslogtreecommitdiffstats
path: root/web.go
diff options
context:
space:
mode:
authorskyblue <ssx205@gmail.com>2014-04-12 09:42:15 +0800
committerskyblue <ssx205@gmail.com>2014-04-12 09:42:15 +0800
commitf8e97b75fbe7201830413fabead33967fb690827 (patch)
tree5a1234fdbc527799913c4eaf691f97769dc2fe8b /web.go
parent5c1312f38e8968e068125a1b1dd59060f3f29bfe (diff)
parentd6dac160dfcac068b31bda9316ddc3d4919e3288 (diff)
downloadgitea-f8e97b75fbe7201830413fabead33967fb690827.tar.gz
gitea-f8e97b75fbe7201830413fabead33967fb690827.zip
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'web.go')
-rw-r--r--web.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/web.go b/web.go
index e7b048bcd3..4a49a44843 100644
--- a/web.go
+++ b/web.go
@@ -152,6 +152,7 @@ func runWeb(*cli.Context) {
r.Post("/issues/new", bindIgnErr(auth.CreateIssueForm{}), repo.CreateIssuePost)
r.Post("/issues/:index", bindIgnErr(auth.CreateIssueForm{}), repo.UpdateIssue)
r.Post("/comment/:action", repo.Comment)
+ r.Post("/import", repo.Import)
}, reqSignIn, middleware.RepoAssignment(true))
m.Group("/:username/:reponame", func(r martini.Router) {
@@ -168,6 +169,7 @@ func runWeb(*cli.Context) {
r.Get("/src/:branchname/**", repo.Single)
r.Get("/raw/:branchname/**", repo.SingleDownload)
r.Get("/commits/:branchname", repo.Commits)
+ r.Get("/commits/:branchname/search", repo.SearchCommits)
r.Get("/commit/:branchname", repo.Diff)
r.Get("/commit/:branchname/**", repo.Diff)
}, ignSignIn, middleware.RepoAssignment(true, true))