summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyborus <cyborus@cyborus.xyz>2024-04-26 18:50:37 +0200
committerCyborus <cyborus@cyborus.xyz>2024-04-26 18:50:37 +0200
commitde7754073b4a26a7fca953332472206f5a877b30 (patch)
tree4bee45e5bb2c559f59a21e0aa9569d57c85c99b6
parentMerge pull request 'fix `repo_get_raw_file{_or_lfs}` not returning `Vec<u8>`'... (diff)
downloadforgejo-api-de7754073b4a26a7fca953332472206f5a877b30.tar.xz
forgejo-api-de7754073b4a26a7fca953332472206f5a877b30.zip
strongly type repository default merge style in swagger file
-rw-r--r--swagger.v1.json17
1 files changed, 12 insertions, 5 deletions
diff --git a/swagger.v1.json b/swagger.v1.json
index 274063a..299afd3 100644
--- a/swagger.v1.json
+++ b/swagger.v1.json
@@ -17622,6 +17622,16 @@
},
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
+ "DefaultMergeStyle": {
+ "type": "string",
+ "enum": [
+ "merge",
+ "rebase",
+ "rebase-merge",
+ "squash",
+ "fast-forward-only"
+ ]
+ },
"DeleteEmailOption": {
"description": "DeleteEmailOption options when deleting email addresses",
"type": "object",
@@ -18269,9 +18279,7 @@
"x-go-name": "DefaultDeleteBranchAfterMerge"
},
"default_merge_style": {
- "description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", or \"fast-forward-only\".",
- "type": "string",
- "x-go-name": "DefaultMergeStyle"
+ "$ref": "#/definitions/DefaultMergeStyle"
},
"description": {
"description": "a short description of the repository.",
@@ -21151,8 +21159,7 @@
"x-go-name": "DefaultDeleteBranchAfterMerge"
},
"default_merge_style": {
- "type": "string",
- "x-go-name": "DefaultMergeStyle"
+ "$ref": "#/definitions/DefaultMergeStyle"
},
"description": {
"type": "string",