tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Add DefaultMergeStyle option to repository (#14789)

Browse Source 
Fixes #12293
This commit is contained in:
parnic
2021-03-27 09:55:40 -05:00
committed by GitHub
parent 6b836ac5f7
commit f4d27498bd
11 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/swagger/v1_json.tmpl
View File

@@ -13626,6 +13626,11 @@
"type": "string",
"x-go-name": "DefaultBranch"
},
"default_merge_style": {
"description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", or \"squash\". `has_pull_requests` must be `true`.",
"type": "string",
"x-go-name": "DefaultMergeStyle"
},
"description": {
"description": "a short description of the repository.",
"type": "string",
@@ -15676,6 +15681,10 @@
"type": "string",
"x-go-name": "DefaultBranch"
},
"default_merge_style": {
"type": "string",
"x-go-name": "DefaultMergeStyle"
},
"description": {
"type": "string",
"x-go-name": "Description"