From 34c2e52bd5523a2c6bafd5026817c8d51387f370 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 15 Nov 2017 23:27:52 -0500 Subject: repo/pull: allow rebase before merging (#4805) --- routes/repo/pull.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'routes/repo/pull.go') diff --git a/routes/repo/pull.go b/routes/repo/pull.go index 48eb76e7..c6652c7f 100644 --- a/routes/repo/pull.go +++ b/routes/repo/pull.go @@ -389,7 +389,7 @@ func MergePullRequest(c *context.Context) { return } if issue.IsClosed { - c.Handle(404, "MergePullRequest", nil) + c.NotFound() return } @@ -400,13 +400,13 @@ func MergePullRequest(c *context.Context) { } if !pr.CanAutoMerge() || pr.HasMerged { - c.Handle(404, "MergePullRequest", nil) + c.NotFound() return } pr.Issue = issue pr.Issue.Repo = c.Repo.Repository - if err = pr.Merge(c.User, c.Repo.GitRepo); err != nil { + if err = pr.Merge(c.User, c.Repo.GitRepo, models.MergeStyle(c.Query("merge_style"))); err != nil { c.ServerError("Merge", err) return } -- cgit v1.2.3