From 9eb247b4a98a3db14e91e3bd83cab7d77f2516d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Sat, 26 May 2018 18:57:56 +0200
Subject: [PATCH 1/8] add rebase with merge commit merge style (#3844)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
---
 integrations/pull_merge_test.go             | 14 ++++++
 models/fixtures/repo_unit.yml               |  4 +-
 models/migrations/migrations.go             |  2 +
 models/migrations/v67.go                    | 49 +++++++++++++++++++++
 models/pull.go                              | 28 ++++++++++++
 models/repo_unit.go                         |  2 +
 modules/auth/repo_form.go                   |  3 +-
 options/locale/locale_en-US.ini             |  2 +
 routers/repo/issue.go                       |  2 +
 routers/repo/pull.go                        |  3 ++
 routers/repo/setting.go                     |  1 +
 templates/repo/issue/view_content/pull.tmpl | 21 ++++++++-
 templates/repo/settings/options.tmpl        |  6 +++
 13 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 models/migrations/v67.go

diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index 27f3586406ccb..14fd97653832f 100644
--- a/integrations/pull_merge_test.go
+++ b/integrations/pull_merge_test.go
@@ -76,6 +76,20 @@ func TestPullRebase(t *testing.T) {
 	testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebase)
 }
 
+func TestPullRebaseMergeCommit(t *testing.T) {
+	// TODO
+	prepareTestEnv(t)
+	session := loginUser(t, "user1")
+	testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
+	testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+	// TODO
+	resp := testPullCreate(t, session, "user1", "repo1", "master", "This is a pull title")
+
+	elem := strings.Split(test.RedirectURL(resp), "/")
+	assert.EqualValues(t, "pulls", elem[3])
+	testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebaseMergeCommit)
+}
+
 func TestPullSquash(t *testing.T) {
 	prepareTestEnv(t)
 	session := loginUser(t, "user1")
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml
index 6780de7531ef7..e8aaf7293bb3e 100644
--- a/models/fixtures/repo_unit.yml
+++ b/models/fixtures/repo_unit.yml
@@ -30,7 +30,7 @@
   id: 5
   repo_id: 1
   type: 3
-  config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}"
+  config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMergeCommit\":true,\"AllowSquash\":true}"
   created_unix: 946684810
 
 -
@@ -51,7 +51,7 @@
   id: 8
   repo_id: 3
   type: 3
-  config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowSquash\":false}"
+  config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMergeCommit\":true,\"AllowSquash\":false}"
   created_unix: 946684810
 
 -
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 1300065ab4c75..2051237558149 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -186,6 +186,8 @@ var migrations = []Migration{
 	NewMigration("add u2f", addU2FReg),
 	// v66 -> v67
 	NewMigration("add login source id column for public_key table", addLoginSourceIDToPublicKeyTable),
+	// v67 -> v68
+	NewMigration("add pull request rebase with merge commit", addPullRequestRebaseWithMergeCommit),
 }
 
 // Migrate database to current version
diff --git a/models/migrations/v67.go b/models/migrations/v67.go
new file mode 100644
index 0000000000000..7db69f7072e5f
--- /dev/null
+++ b/models/migrations/v67.go
@@ -0,0 +1,49 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"code.gitea.io/gitea/modules/util"
+
+	"github.com/go-xorm/xorm"
+)
+
+func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error {
+	// RepoUnit describes all units of a repository
+	type RepoUnit struct {
+		ID          int64
+		RepoID      int64                  `xorm:"INDEX(s)"`
+		Type        int                    `xorm:"INDEX(s)"`
+		Config      map[string]interface{} `xorm:"JSON"`
+		CreatedUnix util.TimeStamp         `xorm:"INDEX CREATED"`
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	//Updating existing issue units
+	units := make([]*RepoUnit, 0, 100)
+	if err := sess.Where("`type` = ?", V16UnitTypePRs).Find(&units); err != nil {
+		return fmt.Errorf("Query repo units: %v", err)
+	}
+	for _, unit := range units {
+		if unit.Config == nil {
+			unit.Config = make(map[string]interface{})
+		}
+		if _, ok := unit.Config["AllowRebaseMergeCommit"]; !ok {
+			unit.Config["AllowRebaseMergeCommit"] = true
+		}
+		if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil {
+			return err
+		}
+	}
+	return sess.Commit()
+
+}
diff --git a/models/pull.go b/models/pull.go
index 90b341907d2be..c75c901e67c47 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -270,6 +270,8 @@ const (
 	MergeStyleMerge MergeStyle = "merge"
 	// MergeStyleRebase rebase before merging
 	MergeStyleRebase MergeStyle = "rebase"
+	// MergeStyleRebaseMergeCommit rebase before merging with merge commit (--no-ff)
+	MergeStyleRebaseMergeCommit MergeStyle = "rebase-merge-commit"
 	// MergeStyleSquash squash commits into single commit before merging
 	MergeStyleSquash MergeStyle = "squash"
 )
@@ -407,6 +409,32 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
 			"git", "merge", "--ff-only", "-q", "head_repo_"+pr.HeadBranch); err != nil {
 			return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
 		}
+	case MergeStyleRebaseMergeCommit:
+		// Checkout head branch
+		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
+			fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
+			"git", "checkout", "-b", "head_repo_"+pr.HeadBranch, "head_repo/"+pr.HeadBranch); err != nil {
+			return fmt.Errorf("git checkout: %s", stderr)
+		}
+		// Rebase before merging
+		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
+			fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
+			"git", "rebase", "-q", pr.BaseBranch); err != nil {
+			return fmt.Errorf("git rebase [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
+		}
+		// Checkout base branch again
+		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
+			fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
+			"git", "checkout", pr.BaseBranch); err != nil {
+			return fmt.Errorf("git checkout: %s", stderr)
+		}
+		// Merge with commit
+		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
+			fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
+			"git", "merge", "--no-ff", "-q", "head_repo_"+pr.HeadBranch); err != nil {
+			return fmt.Errorf("git merge --no-ff [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
+		}
+
 	case MergeStyleSquash:
 		// Merge with squash
 		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
diff --git a/models/repo_unit.go b/models/repo_unit.go
index 49b62ec9cd15c..3ab641ff65b6c 100644
--- a/models/repo_unit.go
+++ b/models/repo_unit.go
@@ -90,6 +90,7 @@ type PullRequestsConfig struct {
 	IgnoreWhitespaceConflicts bool
 	AllowMerge                bool
 	AllowRebase               bool
+	AllowRebaseMergeCommit    bool
 	AllowSquash               bool
 }
 
@@ -107,6 +108,7 @@ func (cfg *PullRequestsConfig) ToDB() ([]byte, error) {
 func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool {
 	return mergeStyle == MergeStyleMerge && cfg.AllowMerge ||
 		mergeStyle == MergeStyleRebase && cfg.AllowRebase ||
+		mergeStyle == MergeStyleRebaseMergeCommit && cfg.AllowRebaseMergeCommit ||
 		mergeStyle == MergeStyleSquash && cfg.AllowSquash
 }
 
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index e3471fff5d447..c1e4dc08df6ad 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -110,6 +110,7 @@ type RepoSettingForm struct {
 	PullsIgnoreWhitespace            bool
 	PullsAllowMerge                  bool
 	PullsAllowRebase                 bool
+	PullsAllowRebaseMergeCommit      bool
 	PullsAllowSquash                 bool
 	EnableTimetracker                bool
 	AllowOnlyContributorsToTrackTime bool
@@ -352,7 +353,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
 
 // MergePullRequestForm form for merging Pull Request
 type MergePullRequestForm struct {
-	Do                string `binding:"Required;In(merge,rebase,squash)"`
+	Do                string `binding:"Required;In(merge,rebase,rebase-merge-commit,squash)"`
 	MergeTitleField   string
 	MergeMessageField string
 }
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index f2862bde80cb1..f839102ca7164 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -810,6 +810,7 @@ pulls.no_merge_desc = This pull request cannot be merged because all repository
 pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
 pulls.merge_pull_request = Merge Pull Request
 pulls.rebase_merge_pull_request = Rebase and Merge
+pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff)
 pulls.squash_merge_pull_request = Squash and Merge
 pulls.invalid_merge_option = You cannot use this merge option for this pull request.
 pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
@@ -953,6 +954,7 @@ settings.pulls_desc = Enable Repository Pull Requests
 settings.pulls.ignore_whitespace = Ignore Whitespace for Conflicts
 settings.pulls.allow_merge_commits = Enable Commit Merging
 settings.pulls.allow_rebase_merge = Enable Rebasing to Merge Commits
+settings.pulls.allow_rebase_merge_commit = Enable Rebasing with explicit merge commits (--no-ff)
 settings.pulls.allow_squash_commits = Enable Squashing to Merge Commits
 settings.admin_settings = Administrator Settings
 settings.admin_enable_health_check = Enable Repository Health Checks (git fsck)
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 18ab1691cd332..d6688e31418a8 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -765,6 +765,8 @@ func ViewIssue(ctx *context.Context) {
 				ctx.Data["MergeStyle"] = models.MergeStyleMerge
 			} else if prConfig.AllowRebase {
 				ctx.Data["MergeStyle"] = models.MergeStyleRebase
+			} else if prConfig.AllowRebaseMergeCommit {
+				ctx.Data["MergeStyle"] = models.MergeStyleRebaseMergeCommit
 			} else if prConfig.AllowSquash {
 				ctx.Data["MergeStyle"] = models.MergeStyleSquash
 			} else {
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index dfe07ca44aac3..dbbc3da2950f4 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -512,6 +512,9 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
 		if models.MergeStyle(form.Do) == models.MergeStyleMerge {
 			message = pr.GetDefaultMergeMessage()
 		}
+		if models.MergeStyle(form.Do) == models.MergeStyleRebaseMergeCommit {
+			message = pr.GetDefaultMergeMessage()
+		}
 		if models.MergeStyle(form.Do) == models.MergeStyleSquash {
 			message = pr.GetDefaultSquashMessage()
 		}
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 0d44cb50a8f69..8092eca6cdfa5 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -215,6 +215,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 					IgnoreWhitespaceConflicts: form.PullsIgnoreWhitespace,
 					AllowMerge:                form.PullsAllowMerge,
 					AllowRebase:               form.PullsAllowRebase,
+					AllowRebaseMergeCommit:    form.PullsAllowRebaseMergeCommit,
 					AllowSquash:               form.PullsAllowSquash,
 				},
 			})
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index d4bf5a32775ef..d3abc1e5fd1b0 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -39,7 +39,7 @@
 				</div>
 				{{if .AllowMerge}}
 					{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
-					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowSquash}}
+					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMergeCommit $prUnit.PullRequestsConfig.AllowSquash}}
 						<div class="ui divider"></div>
 						{{if $prUnit.PullRequestsConfig.AllowMerge}}
 						<div class="ui form merge-fields" style="display: none">
@@ -73,6 +73,19 @@
 							</form>
 						</div>
 						{{end}}
+						{{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}}
+						<div class="ui form rebase-merge-commit-fields" style="display: none">
+							<form action="{{.Link}}/merge" method="post">
+								{{.CsrfTokenHtml}}
+								<button class="ui green button" type="submit" name="do" value="rebase-merge-commit">
+									{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
+								</button>
+								<button class="ui button merge-cancel">
+									{{$.i18n.Tr "cancel"}}
+								</button>
+							</form>
+						</div>
+						{{end}}
 						{{if $prUnit.PullRequestsConfig.AllowSquash}}
 						<div class="ui form squash-fields" style="display: none">
 							<form action="{{.Link}}/merge" method="post">
@@ -102,6 +115,9 @@
 								{{if eq .MergeStyle "rebase"}}
 									{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
 								{{end}}
+								{{if eq .MergeStyle "rebase-merge-commit"}}
+									{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
+								{{end}}
 								{{if eq .MergeStyle "squash"}}
 									{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
 								{{end}}
@@ -116,6 +132,9 @@
 									{{if $prUnit.PullRequestsConfig.AllowRebase}}
 									<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
 									{{end}}
+									{{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}}
+									<div class="item{{if eq .MergeStyle "rebase-merge-commit"}} active selected{{end}}" data-do="rebase-merge-commit">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
+									{{end}}
 									{{if $prUnit.PullRequestsConfig.AllowSquash}}
 									<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
 									{{end}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index f8ba4137c210a..6b85885481038 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -221,6 +221,12 @@
 								<label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge"}}</label>
 							</div>
 						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input name="pulls_allow_rebase_merge_commit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMergeCommit)}}checked{{end}}>
+								<label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge_commit"}}</label>
+							</div>
+						</div>
 						<div class="field">
 							<div class="ui checkbox">
 								<input name="pulls_allow_squash" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowSquash)}}checked{{end}}>

From 801decda01c4d7b44767e6e2f66f65c42ec2dc8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Mon, 23 Jul 2018 19:00:13 +0200
Subject: [PATCH 2/8] fix merge

---
 models/migrations/v67.go | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/models/migrations/v67.go b/models/migrations/v67.go
index 96344c78b3dcc..27822191911ef 100644
--- a/models/migrations/v67.go
+++ b/models/migrations/v67.go
@@ -5,27 +5,11 @@
 package migrations
 
 import (
-<<<<<<< HEAD
-	"fmt"
-
-	"code.gitea.io/gitea/modules/util"
-=======
 	"code.gitea.io/gitea/modules/setting"
->>>>>>> origin/master
 
 	"github.com/go-xorm/xorm"
 )
 
-<<<<<<< HEAD
-func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error {
-	// RepoUnit describes all units of a repository
-	type RepoUnit struct {
-		ID          int64
-		RepoID      int64                  `xorm:"INDEX(s)"`
-		Type        int                    `xorm:"INDEX(s)"`
-		Config      map[string]interface{} `xorm:"JSON"`
-		CreatedUnix util.TimeStamp         `xorm:"INDEX CREATED"`
-=======
 func removeStaleWatches(x *xorm.Engine) error {
 	type Watch struct {
 		ID     int64
@@ -78,7 +62,6 @@ func removeStaleWatches(x *xorm.Engine) error {
 			return mode, err
 		}
 		return a.Mode, nil
->>>>>>> origin/master
 	}
 
 	sess := x.NewSession()
@@ -87,26 +70,6 @@ func removeStaleWatches(x *xorm.Engine) error {
 		return err
 	}
 
-<<<<<<< HEAD
-	//Updating existing issue units
-	units := make([]*RepoUnit, 0, 100)
-	if err := sess.Where("`type` = ?", V16UnitTypePRs).Find(&units); err != nil {
-		return fmt.Errorf("Query repo units: %v", err)
-	}
-	for _, unit := range units {
-		if unit.Config == nil {
-			unit.Config = make(map[string]interface{})
-		}
-		if _, ok := unit.Config["AllowRebaseMergeCommit"]; !ok {
-			unit.Config["AllowRebaseMergeCommit"] = true
-		}
-		if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil {
-			return err
-		}
-	}
-	return sess.Commit()
-
-=======
 	repoCache := make(map[int64]*Repository)
 	err := x.BufferSize(setting.IterateBufferSize).Iterate(new(Watch),
 		func(idx int, bean interface{}) error {
@@ -192,5 +155,4 @@ func removeStaleWatches(x *xorm.Engine) error {
 	}
 
 	return sess.Commit()
->>>>>>> origin/master
 }

From 9a4aefa07670e158abcea2b237a0c934554cea2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Mon, 23 Jul 2018 19:19:29 +0200
Subject: [PATCH 3/8] rename MergeStyleRebaseMergeCommit to
 MergeStyleRebaseMerge

as requested by @lafriks
---
 integrations/pull_merge_test.go             |  4 ++--
 models/fixtures/repo_unit.yml               |  4 ++--
 models/migrations/migrations.go             |  2 +-
 models/migrations/v71.go                    |  6 +++---
 models/pull.go                              |  6 +++---
 models/repo_unit.go                         |  4 ++--
 modules/auth/repo_form.go                   |  4 ++--
 routers/repo/issue.go                       |  4 ++--
 routers/repo/pull.go                        |  2 +-
 routers/repo/setting.go                     |  2 +-
 templates/repo/issue/view_content/pull.tmpl | 14 +++++++-------
 templates/repo/settings/options.tmpl        |  2 +-
 12 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index 14fd97653832f..8c62c31abf9ce 100644
--- a/integrations/pull_merge_test.go
+++ b/integrations/pull_merge_test.go
@@ -76,7 +76,7 @@ func TestPullRebase(t *testing.T) {
 	testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebase)
 }
 
-func TestPullRebaseMergeCommit(t *testing.T) {
+func TestPullRebaseMerge(t *testing.T) {
 	// TODO
 	prepareTestEnv(t)
 	session := loginUser(t, "user1")
@@ -87,7 +87,7 @@ func TestPullRebaseMergeCommit(t *testing.T) {
 
 	elem := strings.Split(test.RedirectURL(resp), "/")
 	assert.EqualValues(t, "pulls", elem[3])
-	testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebaseMergeCommit)
+	testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebaseMerge)
 }
 
 func TestPullSquash(t *testing.T) {
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml
index e8aaf7293bb3e..4c874bd0da4eb 100644
--- a/models/fixtures/repo_unit.yml
+++ b/models/fixtures/repo_unit.yml
@@ -30,7 +30,7 @@
   id: 5
   repo_id: 1
   type: 3
-  config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMergeCommit\":true,\"AllowSquash\":true}"
+  config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
   created_unix: 946684810
 
 -
@@ -51,7 +51,7 @@
   id: 8
   repo_id: 3
   type: 3
-  config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMergeCommit\":true,\"AllowSquash\":false}"
+  config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMerge\":true,\"AllowSquash\":false}"
   created_unix: 946684810
 
 -
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index ef966405d49b4..631b126c573f5 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -195,7 +195,7 @@ var migrations = []Migration{
 	// v70 -> v71
 	NewMigration("add issue_dependencies", addIssueDependencies),
 	// v71 -> v72
-	NewMigration("add pull request rebase with merge commit", addPullRequestRebaseWithMergeCommit),
+	NewMigration("add pull request rebase with merge commit", addPullRequestRebaseWithMerge),
 }
 
 // Migrate database to current version
diff --git a/models/migrations/v71.go b/models/migrations/v71.go
index 3270a0f5a604b..8bf59418f9d37 100644
--- a/models/migrations/v71.go
+++ b/models/migrations/v71.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-xorm/xorm"
 )
 
-func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error {
+func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
 	// RepoUnit describes all units of a repository
 	type RepoUnit struct {
 		ID          int64
@@ -37,8 +37,8 @@ func addPullRequestRebaseWithMergeCommit(x *xorm.Engine) error {
 		if unit.Config == nil {
 			unit.Config = make(map[string]interface{})
 		}
-		if _, ok := unit.Config["AllowRebaseMergeCommit"]; !ok {
-			unit.Config["AllowRebaseMergeCommit"] = true
+		if _, ok := unit.Config["AllowRebaseMerge"]; !ok {
+			unit.Config["AllowRebaseMerge"] = true
 		}
 		if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil {
 			return err
diff --git a/models/pull.go b/models/pull.go
index c75c901e67c47..03261f586e5bd 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -270,8 +270,8 @@ const (
 	MergeStyleMerge MergeStyle = "merge"
 	// MergeStyleRebase rebase before merging
 	MergeStyleRebase MergeStyle = "rebase"
-	// MergeStyleRebaseMergeCommit rebase before merging with merge commit (--no-ff)
-	MergeStyleRebaseMergeCommit MergeStyle = "rebase-merge-commit"
+	// MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff)
+	MergeStyleRebaseMerge MergeStyle = "rebase-merge"
 	// MergeStyleSquash squash commits into single commit before merging
 	MergeStyleSquash MergeStyle = "squash"
 )
@@ -409,7 +409,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
 			"git", "merge", "--ff-only", "-q", "head_repo_"+pr.HeadBranch); err != nil {
 			return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
 		}
-	case MergeStyleRebaseMergeCommit:
+	case MergeStyleRebaseMerge:
 		// Checkout head branch
 		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
 			fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
diff --git a/models/repo_unit.go b/models/repo_unit.go
index e8f9ab6657627..235fde0fd17d8 100644
--- a/models/repo_unit.go
+++ b/models/repo_unit.go
@@ -91,7 +91,7 @@ type PullRequestsConfig struct {
 	IgnoreWhitespaceConflicts bool
 	AllowMerge                bool
 	AllowRebase               bool
-	AllowRebaseMergeCommit    bool
+	AllowRebaseMerge          bool
 	AllowSquash               bool
 }
 
@@ -109,7 +109,7 @@ func (cfg *PullRequestsConfig) ToDB() ([]byte, error) {
 func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool {
 	return mergeStyle == MergeStyleMerge && cfg.AllowMerge ||
 		mergeStyle == MergeStyleRebase && cfg.AllowRebase ||
-		mergeStyle == MergeStyleRebaseMergeCommit && cfg.AllowRebaseMergeCommit ||
+		mergeStyle == MergeStyleRebaseMerge && cfg.AllowRebaseMerge ||
 		mergeStyle == MergeStyleSquash && cfg.AllowSquash
 }
 
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index eb610255f8f9e..58ea143b6bca0 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -110,7 +110,7 @@ type RepoSettingForm struct {
 	PullsIgnoreWhitespace            bool
 	PullsAllowMerge                  bool
 	PullsAllowRebase                 bool
-	PullsAllowRebaseMergeCommit      bool
+	PullsAllowRebaseMerge            bool
 	PullsAllowSquash                 bool
 	EnableTimetracker                bool
 	AllowOnlyContributorsToTrackTime bool
@@ -354,7 +354,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
 
 // MergePullRequestForm form for merging Pull Request
 type MergePullRequestForm struct {
-	Do                string `binding:"Required;In(merge,rebase,rebase-merge-commit,squash)"`
+	Do                string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
 	MergeTitleField   string
 	MergeMessageField string
 }
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index e8fafeb699970..bf3a5ccc200dc 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -777,8 +777,8 @@ func ViewIssue(ctx *context.Context) {
 				ctx.Data["MergeStyle"] = models.MergeStyleMerge
 			} else if prConfig.AllowRebase {
 				ctx.Data["MergeStyle"] = models.MergeStyleRebase
-			} else if prConfig.AllowRebaseMergeCommit {
-				ctx.Data["MergeStyle"] = models.MergeStyleRebaseMergeCommit
+			} else if prConfig.AllowRebaseMerge {
+				ctx.Data["MergeStyle"] = models.MergeStyleRebaseMerge
 			} else if prConfig.AllowSquash {
 				ctx.Data["MergeStyle"] = models.MergeStyleSquash
 			} else {
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 4ff66ee61e9ed..62080ef90e5f1 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -512,7 +512,7 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
 		if models.MergeStyle(form.Do) == models.MergeStyleMerge {
 			message = pr.GetDefaultMergeMessage()
 		}
-		if models.MergeStyle(form.Do) == models.MergeStyleRebaseMergeCommit {
+		if models.MergeStyle(form.Do) == models.MergeStyleRebaseMerge {
 			message = pr.GetDefaultMergeMessage()
 		}
 		if models.MergeStyle(form.Do) == models.MergeStyleSquash {
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index d50d891cd186f..b62d81d1fc507 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -216,7 +216,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 					IgnoreWhitespaceConflicts: form.PullsIgnoreWhitespace,
 					AllowMerge:                form.PullsAllowMerge,
 					AllowRebase:               form.PullsAllowRebase,
-					AllowRebaseMergeCommit:    form.PullsAllowRebaseMergeCommit,
+					AllowRebaseMerge:          form.PullsAllowRebaseMerge,
 					AllowSquash:               form.PullsAllowSquash,
 				},
 			})
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index d3abc1e5fd1b0..e5a8570c9e906 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -39,7 +39,7 @@
 				</div>
 				{{if .AllowMerge}}
 					{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
-					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMergeCommit $prUnit.PullRequestsConfig.AllowSquash}}
+					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
 						<div class="ui divider"></div>
 						{{if $prUnit.PullRequestsConfig.AllowMerge}}
 						<div class="ui form merge-fields" style="display: none">
@@ -73,11 +73,11 @@
 							</form>
 						</div>
 						{{end}}
-						{{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}}
-						<div class="ui form rebase-merge-commit-fields" style="display: none">
+						{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
+						<div class="ui form rebase-merge-fields" style="display: none">
 							<form action="{{.Link}}/merge" method="post">
 								{{.CsrfTokenHtml}}
-								<button class="ui green button" type="submit" name="do" value="rebase-merge-commit">
+								<button class="ui green button" type="submit" name="do" value="rebase-merge">
 									{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
 								</button>
 								<button class="ui button merge-cancel">
@@ -115,7 +115,7 @@
 								{{if eq .MergeStyle "rebase"}}
 									{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
 								{{end}}
-								{{if eq .MergeStyle "rebase-merge-commit"}}
+								{{if eq .MergeStyle "rebase-merge"}}
 									{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
 								{{end}}
 								{{if eq .MergeStyle "squash"}}
@@ -132,8 +132,8 @@
 									{{if $prUnit.PullRequestsConfig.AllowRebase}}
 									<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
 									{{end}}
-									{{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}}
-									<div class="item{{if eq .MergeStyle "rebase-merge-commit"}} active selected{{end}}" data-do="rebase-merge-commit">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
+									{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
+									<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
 									{{end}}
 									{{if $prUnit.PullRequestsConfig.AllowSquash}}
 									<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index d104cd74b725e..e302ab3405707 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -229,7 +229,7 @@
 						</div>
 						<div class="field">
 							<div class="ui checkbox">
-								<input name="pulls_allow_rebase_merge_commit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMergeCommit)}}checked{{end}}>
+								<input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge_commit"}}</label>
 							</div>
 						</div>

From 90a7c966563a9464dd6b89fbf0394342d1d455e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Tue, 24 Jul 2018 14:06:41 +0200
Subject: [PATCH 4/8] enable RebaseMerge by default for new repositories

---
 models/repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/repo.go b/models/repo.go
index 3c4908b0d847e..839f675856d00 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -1355,7 +1355,7 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
 			units = append(units, RepoUnit{
 				RepoID: repo.ID,
 				Type:   tp,
-				Config: &PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowSquash: true},
+				Config: &PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true},
 			})
 		} else {
 			units = append(units, RepoUnit{

From 4d8d3e1055985c4b30a53b88f173b3794d05d3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Sun, 9 Dec 2018 15:54:19 +0100
Subject: [PATCH 5/8] enable MergeRebase if all other merge styles are enabled

---
 models/migrations/v74.go | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/models/migrations/v74.go b/models/migrations/v74.go
index 8bf59418f9d37..efab7e0cf07c9 100644
--- a/models/migrations/v74.go
+++ b/models/migrations/v74.go
@@ -37,8 +37,23 @@ func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
 		if unit.Config == nil {
 			unit.Config = make(map[string]interface{})
 		}
+		// Allow the new merge style if all other merge styles are allowed
+		allowMergeRebase := true
+
+		if allowMerge, ok := unit.Config["AllowMerge"]; ok {
+			allowMergeRebase = allowMergeRebase && allowMerge.(bool)
+		}
+
+		if allowRebase, ok := unit.Config["AllowRebase"]; ok {
+			allowMergeRebase = allowMergeRebase && allowRebase.(bool)
+		}
+
+		if allowSquash, ok := unit.Config["AllowSquash"]; ok {
+			allowMergeRebase = allowMergeRebase && allowSquash.(bool)
+		}
+
 		if _, ok := unit.Config["AllowRebaseMerge"]; !ok {
-			unit.Config["AllowRebaseMerge"] = true
+			unit.Config["AllowRebaseMerge"] = allowMergeRebase
 		}
 		if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil {
 			return err

From a910dbb6550b99374665e590b1c58c0e75226217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Mon, 10 Dec 2018 14:17:49 +0100
Subject: [PATCH 6/8] remove test todo note

---
 integrations/pull_merge_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index fdca39cbfd244..f466515eb4084 100644
--- a/integrations/pull_merge_test.go
+++ b/integrations/pull_merge_test.go
@@ -78,12 +78,11 @@ func TestPullRebase(t *testing.T) {
 }
 
 func TestPullRebaseMerge(t *testing.T) {
-	// TODO
 	prepareTestEnv(t)
 	session := loginUser(t, "user1")
 	testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
 	testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-	// TODO
+
 	resp := testPullCreate(t, session, "user1", "repo1", "master", "This is a pull title")
 
 	elem := strings.Split(test.RedirectURL(resp), "/")

From 710bc8de2d60f55488c398170367cf2051d9475e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Sat, 15 Dec 2018 17:07:59 +0100
Subject: [PATCH 7/8] add custom message and set author to user doing merge

---
 models/pull.go                              | 15 ++++++++++++---
 templates/repo/issue/view_content/pull.tmpl |  6 ++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/models/pull.go b/models/pull.go
index fc9a7df1d3f57..e7d6bce69b8a1 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -446,13 +446,22 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
 			"git", "checkout", pr.BaseBranch); err != nil {
 			return fmt.Errorf("git checkout: %s", stderr)
 		}
-		// Merge with commit
+		// Prepare merge with commit
 		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
-			fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
-			"git", "merge", "--no-ff", "-q", "head_repo_"+pr.HeadBranch); err != nil {
+			fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
+			"git", "merge", "--no-ff", "--no-commit", "-q", "head_repo_"+pr.HeadBranch); err != nil {
 			return fmt.Errorf("git merge --no-ff [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
 		}
 
+		// Set custom message and author and create merge commit
+		sig := doer.NewGitSig()
+		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
+			fmt.Sprintf("PullRequest.Merge (git commit): %s", tmpBasePath),
+			"git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
+			"-m", message); err != nil {
+			return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
+		}
+
 	case MergeStyleSquash:
 		// Merge with squash
 		if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 972763404dd31..72808d089b783 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -124,6 +124,12 @@
 						<div class="ui form rebase-merge-fields" style="display: none">
 							<form action="{{.Link}}/merge" method="post">
 								{{.CsrfTokenHtml}}
+								<div class="field">
+									<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}">
+								</div>
+								<div class="field">
+									<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}"></textarea>
+								</div>
 								<button class="ui green button" type="submit" name="do" value="rebase-merge">
 									{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
 								</button>

From 7da356b6f3a511b58822bbabdf629c97199ffa84 Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Thu, 27 Dec 2018 11:47:23 +0200
Subject: [PATCH 8/8] Fix migration after conflict

---
 models/migrations/v76.go | 63 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 models/migrations/v76.go

diff --git a/models/migrations/v76.go b/models/migrations/v76.go
new file mode 100644
index 0000000000000..efab7e0cf07c9
--- /dev/null
+++ b/models/migrations/v76.go
@@ -0,0 +1,63 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"code.gitea.io/gitea/modules/util"
+
+	"github.com/go-xorm/xorm"
+)
+
+func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
+	// RepoUnit describes all units of a repository
+	type RepoUnit struct {
+		ID          int64
+		RepoID      int64                  `xorm:"INDEX(s)"`
+		Type        int                    `xorm:"INDEX(s)"`
+		Config      map[string]interface{} `xorm:"JSON"`
+		CreatedUnix util.TimeStamp         `xorm:"INDEX CREATED"`
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	//Updating existing issue units
+	units := make([]*RepoUnit, 0, 100)
+	if err := sess.Where("`type` = ?", V16UnitTypePRs).Find(&units); err != nil {
+		return fmt.Errorf("Query repo units: %v", err)
+	}
+	for _, unit := range units {
+		if unit.Config == nil {
+			unit.Config = make(map[string]interface{})
+		}
+		// Allow the new merge style if all other merge styles are allowed
+		allowMergeRebase := true
+
+		if allowMerge, ok := unit.Config["AllowMerge"]; ok {
+			allowMergeRebase = allowMergeRebase && allowMerge.(bool)
+		}
+
+		if allowRebase, ok := unit.Config["AllowRebase"]; ok {
+			allowMergeRebase = allowMergeRebase && allowRebase.(bool)
+		}
+
+		if allowSquash, ok := unit.Config["AllowSquash"]; ok {
+			allowMergeRebase = allowMergeRebase && allowSquash.(bool)
+		}
+
+		if _, ok := unit.Config["AllowRebaseMerge"]; !ok {
+			unit.Config["AllowRebaseMerge"] = allowMergeRebase
+		}
+		if _, err := sess.ID(unit.ID).Cols("config").Update(unit); err != nil {
+			return err
+		}
+	}
+	return sess.Commit()
+}