mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 05:18:25 +00:00 
			
		
		
		
	Add default merge options when adding new repository (#4369)
This commit is contained in:
		@@ -1347,6 +1347,12 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
 | 
				
			|||||||
				Type:   tp,
 | 
									Type:   tp,
 | 
				
			||||||
				Config: &IssuesConfig{EnableTimetracker: setting.Service.DefaultEnableTimetracking, AllowOnlyContributorsToTrackTime: setting.Service.DefaultAllowOnlyContributorsToTrackTime},
 | 
									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 {
 | 
							} else {
 | 
				
			||||||
			units = append(units, RepoUnit{
 | 
								units = append(units, RepoUnit{
 | 
				
			||||||
				RepoID: repo.ID,
 | 
									RepoID: repo.ID,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user