Add default merge options when adding new repository

This commit is contained in:
Lauris Bukšis-Haberkorns 2018-07-05 01:42:40 +03:00
parent b46066f17c
commit e4bfd5fc8c
No known key found for this signature in database
GPG Key ID: AECE216D007B1CCC

View File

@ -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,