diff options
| author | Lauris BH <lauris@nix.lv> | 2018-07-05 17:12:09 +0300 |
|---|---|---|
| committer | Jonas Franz <info@jonasfranz.software> | 2018-07-05 16:12:09 +0200 |
| commit | f096e69e0a1847d8d651dc24ffdd3366e30e0b23 (patch) | |
| tree | cccf505645d3c9033d9a5e609d098cf24593c295 /models | |
| parent | 768b41adba9ca76961816df5561281481e4848b5 (diff) | |
| download | gitea-f096e69e0a1847d8d651dc24ffdd3366e30e0b23.tar.gz gitea-f096e69e0a1847d8d651dc24ffdd3366e30e0b23.zip | |
Add default merge options when adding new repository (#4369) (#4373)
Diffstat (limited to 'models')
| -rw-r--r-- | models/repo.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/models/repo.go b/models/repo.go index d1cc290c44..b126c7e3bb 100644 --- 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, |