Skip to content

Commit 54fedd4

Browse files
lafrikslunny
authored andcommitted
Add default merge options when adding new repository (#4369)
1 parent 07063e3 commit 54fedd4

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

models/repo.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,6 +1347,12 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
13471347
Type: tp,
13481348
Config: &IssuesConfig{EnableTimetracker: setting.Service.DefaultEnableTimetracking, AllowOnlyContributorsToTrackTime: setting.Service.DefaultAllowOnlyContributorsToTrackTime},
13491349
})
1350+
} else if tp == UnitTypePullRequests {
1351+
units = append(units, RepoUnit{
1352+
RepoID: repo.ID,
1353+
Type: tp,
1354+
Config: &PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowSquash: true},
1355+
})
13501356
} else {
13511357
units = append(units, RepoUnit{
13521358
RepoID: repo.ID,

0 commit comments

Comments
 (0)