Add default merge options when adding new repository (#4369) (#4373)

2018-07-05 17:12:09 +03:00 · 2018-07-05 17:12:09 +03:00 · f096e69e0a
parent 768b41adba
commit f096e69e0a
1 changed files with 6 additions and 0 deletions
--- a/models/repo.go
+++ b/models/repo.go
@ -1347,6 +1347,12 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
 				Type:   tp,
 				Config: &IssuesConfig{EnableTimetracker: setting.Service.DefaultEnableTimetracking, AllowOnlyContributorsToTrackTime: setting.Service.DefaultAllowOnlyContributorsToTrackTime},
 			})
+		} else if tp == UnitTypePullRequests {
+			units = append(units, RepoUnit{
+				RepoID: repo.ID,
+				Type:   tp,
+				Config: &PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowSquash: true},
+			})
 		} else {
 			units = append(units, RepoUnit{
 				RepoID: repo.ID,