mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Pull Requests: setting to allow edits by maintainers by default, tweak UI (#22862)
Add setting to allow edits by maintainers by default, to avoid having to often ask contributors to enable this. This also reorganizes the pull request settings UI to improve clarity. It was unclear which checkbox options were there to control available merge styles and which merge styles they correspond to. Now there is a "Merge Styles" label followed by the merge style options with the same name as in other menus. The remaining checkboxes were moved to the bottom, ordered rougly by typical order of operations. --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							b6d77229cf
						
					
				
				
					commit
					49919c636e
				
			@@ -96,6 +96,7 @@ type Repository struct {
 | 
			
		||||
	AllowRebaseUpdate             bool             `json:"allow_rebase_update"`
 | 
			
		||||
	DefaultDeleteBranchAfterMerge bool             `json:"default_delete_branch_after_merge"`
 | 
			
		||||
	DefaultMergeStyle             string           `json:"default_merge_style"`
 | 
			
		||||
	DefaultAllowMaintainerEdit    bool             `json:"default_allow_maintainer_edit"`
 | 
			
		||||
	AvatarURL                     string           `json:"avatar_url"`
 | 
			
		||||
	Internal                      bool             `json:"internal"`
 | 
			
		||||
	MirrorInterval                string           `json:"mirror_interval"`
 | 
			
		||||
@@ -187,6 +188,8 @@ type EditRepoOption struct {
 | 
			
		||||
	DefaultDeleteBranchAfterMerge *bool `json:"default_delete_branch_after_merge,omitempty"`
 | 
			
		||||
	// set to a merge style to be used by this repository: "merge", "rebase", "rebase-merge", or "squash".
 | 
			
		||||
	DefaultMergeStyle *string `json:"default_merge_style,omitempty"`
 | 
			
		||||
	// set to `true` to allow edits from maintainers by default
 | 
			
		||||
	DefaultAllowMaintainerEdit *bool `json:"default_allow_maintainer_edit,omitempty"`
 | 
			
		||||
	// set to `true` to archive this repository.
 | 
			
		||||
	Archived *bool `json:"archived,omitempty"`
 | 
			
		||||
	// set to a string like `8h30m0s` to set the mirror interval time
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user