From 9eb247b4a98a3db14e91e3bd83cab7d77f2516d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= 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 --- 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 @@ {{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}}
{{if $prUnit.PullRequestsConfig.AllowMerge}} {{end}} + {{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}} + + {{end}} {{if $prUnit.PullRequestsConfig.AllowSquash}} +
+
+ + +
+
From 801decda01c4d7b44767e6e2f66f65c42ec2dc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= 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?= 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 @@
{{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}}
{{if $prUnit.PullRequestsConfig.AllowMerge}} {{end}} - {{if $prUnit.PullRequestsConfig.AllowRebaseMergeCommit}} -