diff options
author | Unknwon <u@gogs.io> | 2015-09-02 09:26:56 -0400 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-09-02 09:26:56 -0400 |
commit | 953bb06857f59f5c6987f68a08a94cf5a885b456 (patch) | |
tree | 196a45fa4e7f8808b35790981eb0e417bbfa1a61 /cmd | |
parent | 6ea28f2a4759c5192811b12de054e7ad62f080f6 (diff) | |
download | gitea-953bb06857f59f5c6987f68a08a94cf5a885b456.tar.gz gitea-953bb06857f59f5c6987f68a08a94cf5a885b456.zip |
basic PR feature
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/web.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/web.go b/cmd/web.go index aa814bed81..d3d339de43 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -531,6 +531,7 @@ func runWeb(ctx *cli.Context) { m.Group("/pulls/:index", func() { m.Get("/commits", repo.ViewPullCommits) m.Get("/files", repo.ViewPullFiles) + m.Post("/merge", reqRepoAdmin, repo.MergePullRequest) }) m.Group("", func() { |