From 953bb06857f59f5c6987f68a08a94cf5a885b456 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Wed, 2 Sep 2015 09:26:56 -0400
Subject: basic PR feature
---
cmd/web.go | 1 +
1 file changed, 1 insertion(+)
(limited to 'cmd/web.go')
diff --git a/cmd/web.go b/cmd/web.go
index aa814bed..d3d339de 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() {
--
cgit v1.2.3