diff options
author | Julian <julian.toelle97@gmail.com> | 2018-12-27 11:27:08 +0100 |
---|---|---|
committer | Lauris BH <lauris@nix.lv> | 2018-12-27 12:27:08 +0200 |
commit | 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch) | |
tree | 7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /models/repo.go | |
parent | 58bdff53cd98e33791f91584d02887864aabc5c4 (diff) | |
download | gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip |
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
Diffstat (limited to 'models/repo.go')
-rw-r--r-- | models/repo.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/repo.go b/models/repo.go index 564790e57a..cd861d7500 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1298,7 +1298,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{ |