diff options
| author | Unknwon <u@gogs.io> | 2017-11-15 23:27:52 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-11-15 23:28:31 -0500 |
| commit | 34c2e52bd5523a2c6bafd5026817c8d51387f370 (patch) | |
| tree | 289fd3ca1b3ee7aafe49915cc57032ddea856591 /routes | |
| parent | 5cd1fdeb9ee1af1179a859dc5ed65561bfe5a6d6 (diff) | |
repo/pull: allow rebase before merging (#4805)
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/repo/pull.go | 6 | ||||
| -rw-r--r-- | routes/repo/setting.go | 2 |
2 files changed, 4 insertions, 4 deletions
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 } diff --git a/routes/repo/setting.go b/routes/repo/setting.go index 8e244b6e..e66c29e6 100644 --- a/routes/repo/setting.go +++ b/routes/repo/setting.go @@ -147,7 +147,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { repo.ExternalTrackerFormat = f.TrackerURLFormat repo.ExternalTrackerStyle = f.TrackerIssueStyle repo.EnablePulls = f.EnablePulls - repo.PullUseRebase = f.PullUseRebase + repo.PullsAllowRebase = f.PullsAllowRebase if err := models.UpdateRepository(repo, false); err != nil { c.ServerError("UpdateRepository", err) |