Browse Source

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

for-closed-social
Lauris BH 6 years ago
committed by Lunny Xiao
parent
commit
54fedd4070
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      models/repo.go

+ 6
- 0
models/repo.go 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,

Loading…
Cancel
Save